[Libreoffice-commits] .: sdext/source
Michael Meeks
michael at kemper.freedesktop.org
Thu Jan 12 06:44:00 PST 2012
sdext/source/presenter/PresenterAccessibility.cxx | 365 ---------------
sdext/source/presenter/PresenterAccessibility.hxx | 9
sdext/source/presenter/PresenterAnimation.cxx | 27 -
sdext/source/presenter/PresenterAnimation.hxx | 1
sdext/source/presenter/PresenterAnimator.cxx | 22
sdext/source/presenter/PresenterBitmapContainer.cxx | 47 -
sdext/source/presenter/PresenterBitmapContainer.hxx | 2
sdext/source/presenter/PresenterButton.cxx | 81 ---
sdext/source/presenter/PresenterButton.hxx | 4
sdext/source/presenter/PresenterCanvasHelper.cxx | 23
sdext/source/presenter/PresenterClock.cxx | 156 ------
sdext/source/presenter/PresenterClock.hxx | 6
sdext/source/presenter/PresenterComponent.cxx | 11
sdext/source/presenter/PresenterComponent.hxx | 1
sdext/source/presenter/PresenterConfigurationAccess.cxx | 46 -
sdext/source/presenter/PresenterController.cxx | 147 ------
sdext/source/presenter/PresenterController.hxx | 8
sdext/source/presenter/PresenterCurrentSlideObserver.cxx | 1
sdext/source/presenter/PresenterFrameworkObserver.cxx | 13
sdext/source/presenter/PresenterFrameworkObserver.hxx | 2
sdext/source/presenter/PresenterGeometryHelper.cxx | 53 --
sdext/source/presenter/PresenterHelpView.cxx | 91 ---
sdext/source/presenter/PresenterHelpView.hxx | 3
sdext/source/presenter/PresenterHelper.cxx | 5
sdext/source/presenter/PresenterNotesView.cxx | 85 ---
sdext/source/presenter/PresenterNotesView.hxx | 7
sdext/source/presenter/PresenterPaintManager.cxx | 16
sdext/source/presenter/PresenterPane.cxx | 37 -
sdext/source/presenter/PresenterPane.hxx | 5
sdext/source/presenter/PresenterPaneBase.cxx | 78 ---
sdext/source/presenter/PresenterPaneBase.hxx | 6
sdext/source/presenter/PresenterPaneBorderManager.cxx | 57 --
sdext/source/presenter/PresenterPaneBorderManager.hxx | 8
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 99 ----
sdext/source/presenter/PresenterPaneContainer.cxx | 53 --
sdext/source/presenter/PresenterPaneContainer.hxx | 1
sdext/source/presenter/PresenterPaneFactory.cxx | 31 -
sdext/source/presenter/PresenterPaneFactory.hxx | 1
sdext/source/presenter/PresenterProtocolHandler.cxx | 9
sdext/source/presenter/PresenterProtocolHandler.hxx | 4
sdext/source/presenter/PresenterScreen.cxx | 91 ---
sdext/source/presenter/PresenterScreen.hxx | 7
sdext/source/presenter/PresenterScrollBar.cxx | 213 --------
sdext/source/presenter/PresenterScrollBar.hxx | 14
sdext/source/presenter/PresenterSlidePreview.cxx | 51 --
sdext/source/presenter/PresenterSlidePreview.hxx | 5
sdext/source/presenter/PresenterSlideShowView.cxx | 132 -----
sdext/source/presenter/PresenterSlideShowView.hxx | 9
sdext/source/presenter/PresenterSlideSorter.cxx | 229 ---------
sdext/source/presenter/PresenterSlideSorter.hxx | 9
sdext/source/presenter/PresenterSprite.cxx | 4
sdext/source/presenter/PresenterSpritePane.cxx | 45 -
sdext/source/presenter/PresenterSpritePane.hxx | 4
sdext/source/presenter/PresenterTextView.cxx | 144 -----
sdext/source/presenter/PresenterTextView.hxx | 7
sdext/source/presenter/PresenterTheme.cxx | 160 ------
sdext/source/presenter/PresenterTimer.cxx | 80 ---
sdext/source/presenter/PresenterTimer.hxx | 6
sdext/source/presenter/PresenterToolBar.cxx | 222 ---------
sdext/source/presenter/PresenterToolBar.hxx | 12
sdext/source/presenter/PresenterUIPainter.cxx | 1
sdext/source/presenter/PresenterUIPainter.hxx | 1
sdext/source/presenter/PresenterViewFactory.cxx | 68 --
sdext/source/presenter/PresenterViewFactory.hxx | 4
sdext/source/presenter/PresenterWindowManager.cxx | 138 -----
sdext/source/presenter/PresenterWindowManager.hxx | 5
66 files changed, 3282 deletions(-)
New commits:
commit 15fd86b9753cf201e7893618cb442ecc06c5385d
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date: Thu Jan 12 12:05:37 2012 +0000
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
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index d96e8cf..dcafc7d 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterAccessibility.hxx"
#include "PresenterTextView.hxx"
#include "PresenterConfigurationAccess.hxx"
@@ -126,7 +125,6 @@ public:
getAccessibleContext (void)
throw (cssu::RuntimeException);
-
//----- XAccessibleContext ----------------------------------------------
virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
@@ -163,7 +161,6 @@ public:
throw (cssu::RuntimeException,
cssa::IllegalAccessibleComponentStateException);
-
//----- XAccessibleComponent --------------------------------------------
virtual sal_Bool SAL_CALL containsPoint (
@@ -196,7 +193,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground (void)
throw (cssu::RuntimeException);
-
//----- XAccessibleEventBroadcaster --------------------------------------
virtual void SAL_CALL addEventListener (
@@ -221,13 +217,11 @@ public:
virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
throw (cssu::RuntimeException);
-
//----- XEventListener ----------------------------------------------------
virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
throw (cssu::RuntimeException);
-
protected:
::rtl::OUString msName;
cssu::Reference<css::awt::XWindow2> mxContentWindow;
@@ -257,9 +251,6 @@ protected:
void ThrowException (const sal_Char* pMessage, const ExceptionType eExceptionType) const;
};
-
-
-
//===== AccessibleStateSet ====================================================
namespace {
@@ -296,9 +287,6 @@ private:
const sal_Int32 mnStateSet;
};
-
-
-
//===== AccessibleRelationSet =================================================
namespace {
@@ -319,7 +307,6 @@ public:
const sal_Int16 nRelationType,
const Reference<XInterface>& rxObject);
-
//----- XAccessibleRelationSet --------------------------------------------
virtual sal_Int32 SAL_CALL getRelationCount (void)
@@ -338,9 +325,6 @@ private:
::std::vector<AccessibleRelation> maRelations;
};
-
-
-
//===== PresenterAccessibleParagraph ==========================================
namespace {
@@ -350,9 +334,6 @@ typedef ::cppu::ImplInheritanceHelper1 <
> PresenterAccessibleParagraphInterfaceBase;
}
-
-
-
class PresenterAccessible::AccessibleParagraph
: public PresenterAccessibleParagraphInterfaceBase
{
@@ -366,14 +347,12 @@ public:
virtual ~AccessibleParagraph (void);
-
//----- XAccessibleContext ------------------------------------------------
virtual cssu::Reference<cssa::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
throw (cssu::RuntimeException);
-
//----- XAccessibleText ---------------------------------------------------
virtual sal_Int32 SAL_CALL getCaretPosition (void)
@@ -444,7 +423,6 @@ public:
virtual ::sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex)
throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException);
-
protected:
virtual awt::Point GetRelativeLocation (void);
virtual awt::Size GetSize (void);
@@ -456,9 +434,6 @@ private:
const sal_Int32 mnParagraphIndex;
};
-
-
-
//===== AccessibleConsole =====================================================
class AccessibleConsole
@@ -486,9 +461,6 @@ public:
}
};
-
-
-
//===== AccessiblePreview =====================================================
class AccessiblePreview
@@ -523,9 +495,6 @@ public:
}
};
-
-
-
//===== AccessibleNotes =======================================================
class AccessibleNotes : public PresenterAccessible::AccessibleObject
@@ -536,7 +505,6 @@ public:
const sal_Int16 nRole,
const ::rtl::OUString& rsName);
-
static rtl::Reference<PresenterAccessible::AccessibleObject> Create (
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const lang::Locale aLocale,
@@ -561,9 +529,6 @@ private:
void HandleTextChange (void);
};
-
-
-
//===== AccessibleFocusManager ================================================
/** A singleton class that makes sure that only one accessibility object in
@@ -586,9 +551,6 @@ private:
AccessibleFocusManager (void);
};
-
-
-
//===== PresenterAccessible ===================================================
PresenterAccessible::PresenterAccessible (
@@ -614,16 +576,10 @@ PresenterAccessible::PresenterAccessible (
mxMainPane->setAccessible(this);
}
-
-
-
PresenterAccessible::~PresenterAccessible (void)
{
}
-
-
-
PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane (void) const
{
PresenterPaneContainer::SharedPaneDescriptor pPreviewPane;
@@ -646,9 +602,6 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane
return pPreviewPane;
}
-
-
-
void PresenterAccessible::UpdateAccessibilityHierarchy (void)
{
if ( ! mpPresenterController.is())
@@ -699,10 +652,6 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (void)
: ::boost::shared_ptr<PresenterTextView>());
}
-
-
-
-
void PresenterAccessible::UpdateAccessibilityHierarchy (
const Reference<awt::XWindow>& rxPreviewContentWindow,
const Reference<awt::XWindow>& rxPreviewBorderWindow,
@@ -761,9 +710,6 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (
}
}
-
-
-
void PresenterAccessible::NotifyCurrentSlideChange (
const sal_Int32 nCurrentSlideIndex,
const sal_Int32 nSlideCount)
@@ -785,9 +731,6 @@ void PresenterAccessible::NotifyCurrentSlideChange (
AccessibleFocusManager::Instance()->FocusObject(mpAccessiblePreview);
}
-
-
-
void SAL_CALL PresenterAccessible::disposing (void)
{
UpdateAccessibilityHierarchy(
@@ -811,9 +754,6 @@ void SAL_CALL PresenterAccessible::disposing (void)
mpAccessibleConsole = NULL;
}
-
-
-
//----- XAccessible -----------------------------------------------------------
Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void)
@@ -838,10 +778,6 @@ Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext
return mpAccessibleConsole->getAccessibleContext();
}
-
-
-
-
//----- XFocusListener ----------------------------------------------------
void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEvent)
@@ -857,9 +793,6 @@ void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEve
AccessibleFocusManager::Instance()->FocusObject(mpAccessibleConsole);
}
-
-
-
void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent)
throw (cssu::RuntimeException)
{
@@ -872,9 +805,6 @@ void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent
AccessibleFocusManager::Instance()->FocusObject(NULL);
}
-
-
-
//----- XEventListener ----------------------------------------------------
void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEvent)
@@ -884,9 +814,6 @@ void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEve
mxMainWindow = NULL;
}
-
-
-
//----- XInitialize -----------------------------------------------------------
void SAL_CALL PresenterAccessible::initialize (const cssu::Sequence<cssu::Any>& rArguments)
@@ -900,9 +827,6 @@ void SAL_CALL PresenterAccessible::initialize (const cssu::Sequence<cssu::Any>&
}
}
-
-
-
//===== PresenterAccessible::AccessibleObject =========================================
PresenterAccessible::AccessibleObject::AccessibleObject (
@@ -923,24 +847,15 @@ PresenterAccessible::AccessibleObject::AccessibleObject (
{
}
-
-
-
void PresenterAccessible::AccessibleObject::LateInitialization (void)
{
AccessibleFocusManager::Instance()->AddFocusableObject(this);
}
-
-
-
PresenterAccessible::AccessibleObject::~AccessibleObject (void)
{
}
-
-
-
void PresenterAccessible::AccessibleObject::SetWindow (
const Reference<awt::XWindow>& rxContentWindow,
const Reference<awt::XWindow>& rxBorderWindow)
@@ -966,27 +881,18 @@ void PresenterAccessible::AccessibleObject::SetWindow (
}
}
-
-
-
void PresenterAccessible::AccessibleObject::SetAccessibleParent (
const Reference<XAccessible>& rxAccessibleParent)
{
mxParentAccessible = rxAccessibleParent;
}
-
-
-
void SAL_CALL PresenterAccessible::AccessibleObject::disposing (void)
{
AccessibleFocusManager::Instance()->RemoveFocusableObject(this);
SetWindow(NULL, NULL);
}
-
-
-
//----- XAccessible -------------------------------------------------------
Reference<XAccessibleContext> SAL_CALL
@@ -998,9 +904,6 @@ Reference<XAccessibleContext> SAL_CALL
return this;
}
-
-
-
//----- XAccessibleContext ----------------------------------------------
sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount (void)
@@ -1013,9 +916,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCoun
return nChildCount;
}
-
-
-
Reference<XAccessible> SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleChild (sal_Int32 nIndex)
throw (lang::IndexOutOfBoundsException, RuntimeException)
@@ -1028,9 +928,6 @@ Reference<XAccessible> SAL_CALL
return Reference<XAccessible>(maChildren[nIndex].get());
}
-
-
-
Reference<XAccessible> SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleParent (void)
throw (RuntimeException)
@@ -1040,9 +937,6 @@ Reference<XAccessible> SAL_CALL
return mxParentAccessible;
}
-
-
-
sal_Int32 SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleIndexInParent (void)
throw (RuntimeException)
@@ -1065,9 +959,6 @@ sal_Int32 SAL_CALL
return 0;
}
-
-
-
sal_Int16 SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleRole (void)
throw (RuntimeException)
@@ -1077,9 +968,6 @@ sal_Int16 SAL_CALL
return mnRole;
}
-
-
-
OUString SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleDescription (void)
throw (RuntimeException)
@@ -1089,9 +977,6 @@ OUString SAL_CALL
return msName;
}
-
-
-
OUString SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleName (void)
throw (cssu::RuntimeException)
@@ -1101,9 +986,6 @@ OUString SAL_CALL
return msName;
}
-
-
-
Reference<XAccessibleRelationSet> SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleRelationSet (void)
throw (RuntimeException)
@@ -1113,9 +995,6 @@ Reference<XAccessibleRelationSet> SAL_CALL
return NULL;
}
-
-
-
Reference<XAccessibleStateSet> SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleStateSet (void)
throw (RuntimeException)
@@ -1125,9 +1004,6 @@ Reference<XAccessibleStateSet> SAL_CALL
return Reference<XAccessibleStateSet>(new AccessibleStateSet(mnStateSet));
}
-
-
-
lang::Locale SAL_CALL
PresenterAccessible::AccessibleObject::getLocale (void)
throw (RuntimeException,
@@ -1144,9 +1020,6 @@ lang::Locale SAL_CALL
return maLocale;
}
-
-
-
//----- XAccessibleComponent ------------------------------------------------
sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint (
@@ -1167,9 +1040,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint (
return false;
}
-
-
-
Reference<XAccessible> SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const awt::Point& rPoint)
throw (RuntimeException)
@@ -1180,9 +1050,6 @@ Reference<XAccessible> SAL_CALL
return Reference<XAccessible>();
}
-
-
-
awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void)
throw (RuntimeException)
{
@@ -1196,9 +1063,6 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void)
return awt::Rectangle (aLocation.X, aLocation.Y, aSize.Width, aSize.Height);
}
-
-
-
awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void)
throw (RuntimeException)
{
@@ -1209,9 +1073,6 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void)
return aLocation;
}
-
-
-
awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (void)
throw (RuntimeException)
{
@@ -1225,9 +1086,6 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (
aRelativeLocation.Y + aParentLocationOnScreen.Y);
}
-
-
-
awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void)
throw (RuntimeException)
{
@@ -1238,9 +1096,6 @@ awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void)
return aSize;
}
-
-
-
void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void)
throw (RuntimeException)
{
@@ -1251,9 +1106,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void)
mxContentWindow->setFocus();
}
-
-
-
sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void)
throw (RuntimeException)
{
@@ -1262,9 +1114,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void)
return 0x00ffffff;
}
-
-
-
sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void)
throw (RuntimeException)
{
@@ -1273,9 +1122,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void)
return 0x00000000;
}
-
-
-
//----- XAccessibleEventBroadcaster -------------------------------------------
void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
@@ -1298,9 +1144,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
}
}
-
-
-
void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener (
const Reference<XAccessibleEventListener>& rxListener)
throw (RuntimeException)
@@ -1314,9 +1157,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener (
}
}
-
-
-
//----- XWindowListener ---------------------------------------------------
void SAL_CALL PresenterAccessible::AccessibleObject::windowResized (
@@ -1328,9 +1168,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowResized (
FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any());
}
-
-
-
void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved (
const css::awt::WindowEvent& rEvent)
throw (cssu::RuntimeException)
@@ -1340,9 +1177,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved (
FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any());
}
-
-
-
void SAL_CALL PresenterAccessible::AccessibleObject::windowShown (
const css::lang::EventObject& rEvent)
throw (cssu::RuntimeException)
@@ -1351,9 +1185,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowShown (
UpdateStateSet();
}
-
-
-
void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden (
const css::lang::EventObject& rEvent)
throw (cssu::RuntimeException)
@@ -1362,9 +1193,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden (
UpdateStateSet();
}
-
-
-
//----- XEventListener --------------------------------------------------------
void SAL_CALL PresenterAccessible::AccessibleObject::disposing (const css::lang::EventObject& rEvent)
@@ -1381,9 +1209,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::disposing (const css::lang:
}
}
-
-
-
//----- private ---------------------------------------------------------------
bool PresenterAccessible::AccessibleObject::GetWindowState (const sal_Int16 nType) const
@@ -1407,9 +1232,6 @@ bool PresenterAccessible::AccessibleObject::GetWindowState (const sal_Int16 nTyp
}
}
-
-
-
void PresenterAccessible::AccessibleObject::UpdateStateSet (void)
{
UpdateState(AccessibleStateType::FOCUSABLE, true);
@@ -1424,9 +1246,6 @@ void PresenterAccessible::AccessibleObject::UpdateStateSet (void)
// UpdateState(AccessibleStateType::ACTIVE, GetWindowState(AccessibleStateType::ACTIVE));
}
-
-
-
void PresenterAccessible::AccessibleObject::UpdateState(
const sal_Int16 nState,
const bool bValue)
@@ -1447,9 +1266,6 @@ void PresenterAccessible::AccessibleObject::UpdateState(
}
}
-
-
-
void PresenterAccessible::AccessibleObject::AddChild (
const ::rtl::Reference<AccessibleObject>& rpChild)
{
@@ -1458,9 +1274,6 @@ void PresenterAccessible::AccessibleObject::AddChild (
FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any());
}
-
-
-
void PresenterAccessible::AccessibleObject::RemoveChild (
const ::rtl::Reference<AccessibleObject>& rpChild)
{
@@ -1469,9 +1282,6 @@ void PresenterAccessible::AccessibleObject::RemoveChild (
FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any());
}
-
-
-
void PresenterAccessible::AccessibleObject::SetIsFocused (const bool bIsFocused)
{
if (mbIsFocused != bIsFocused)
@@ -1481,9 +1291,6 @@ void PresenterAccessible::AccessibleObject::SetIsFocused (const bool bIsFocused)
}
}
-
-
-
void PresenterAccessible::AccessibleObject::SetAccessibleName (const ::rtl::OUString& rsName)
{
if (msName != rsName)
@@ -1494,9 +1301,6 @@ void PresenterAccessible::AccessibleObject::SetAccessibleName (const ::rtl::OUSt
}
}
-
-
-
void PresenterAccessible::AccessibleObject::FireAccessibleEvent (
const sal_Int16 nEventId,
const uno::Any& rOldValue,
@@ -1534,8 +1338,6 @@ void PresenterAccessible::AccessibleObject::FireAccessibleEvent (
}
}
-
-
awt::Point PresenterAccessible::AccessibleObject::GetRelativeLocation (void)
{
awt::Point aLocation;
@@ -1554,9 +1356,6 @@ awt::Point PresenterAccessible::AccessibleObject::GetRelativeLocation (void)
return aLocation;
}
-
-
-
awt::Size PresenterAccessible::AccessibleObject::GetSize (void)
{
if (mxContentWindow.is())
@@ -1568,9 +1367,6 @@ awt::Size PresenterAccessible::AccessibleObject::GetSize (void)
return awt::Size();
}
-
-
-
awt::Point PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation (void)
{
Reference<XAccessibleComponent> xParentComponent;
@@ -1583,17 +1379,11 @@ awt::Point PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation (voi
return awt::Point();
}
-
-
-
sal_Bool PresenterAccessible::AccessibleObject::IsDisposed (void) const
{
return (rBHelper.bDisposed || rBHelper.bInDispose);
}
-
-
-
void PresenterAccessible::AccessibleObject::ThrowIfDisposed (void) const
throw (lang::DisposedException)
{
@@ -1601,9 +1391,6 @@ void PresenterAccessible::AccessibleObject::ThrowIfDisposed (void) const
ThrowException("object has already been disposed", ET_Disposed);
}
-
-
-
void PresenterAccessible::AccessibleObject::ThrowException (
const sal_Char* pMessage,
const ExceptionType eExceptionType) const
@@ -1623,10 +1410,6 @@ void PresenterAccessible::AccessibleObject::ThrowException (
}
}
-
-
-
-
//===== AccessibleStateSet ====================================================
AccessibleStateSet::AccessibleStateSet (const sal_Int32 nStateSet)
@@ -1635,16 +1418,10 @@ AccessibleStateSet::AccessibleStateSet (const sal_Int32 nStateSet)
{
}
-
-
-
AccessibleStateSet::~AccessibleStateSet (void)
{
}
-
-
-
sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState)
{
if (nState<0 || nState>=sal_Int16(sizeof(sal_uInt32)*8))
@@ -1655,9 +1432,6 @@ sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState)
return 1<<nState;
}
-
-
-
//----- XAccessibleStateSet ---------------------------------------------------
sal_Bool SAL_CALL AccessibleStateSet::isEmpty (void)
@@ -1666,18 +1440,12 @@ sal_Bool SAL_CALL AccessibleStateSet::isEmpty (void)
return mnStateSet==0;
}
-
-
-
sal_Bool SAL_CALL AccessibleStateSet::contains (sal_Int16 nState)
throw (cssu::RuntimeException)
{
return (mnStateSet & GetStateMask(nState)) != 0;
}
-
-
-
sal_Bool SAL_CALL AccessibleStateSet::containsAll (const cssu::Sequence<sal_Int16>& rStateSet)
throw (cssu::RuntimeException)
{
@@ -1689,9 +1457,6 @@ sal_Bool SAL_CALL AccessibleStateSet::containsAll (const cssu::Sequence<sal_Int1
return sal_True;
}
-
-
-
cssu::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void)
throw (cssu::RuntimeException)
{
@@ -1703,9 +1468,6 @@ cssu::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void)
return Sequence<sal_Int16>(&aStates.front(), aStates.size());
}
-
-
-
//===== AccessibleRelationSet =================================================
AccessibleRelationSet::AccessibleRelationSet (void)
@@ -1714,16 +1476,10 @@ AccessibleRelationSet::AccessibleRelationSet (void)
{
}
-
-
-
AccessibleRelationSet::~AccessibleRelationSet (void)
{
}
-
-
-
void AccessibleRelationSet::AddRelation (
const sal_Int16 nRelationType,
const Reference<XInterface>& rxObject)
@@ -1734,9 +1490,6 @@ void AccessibleRelationSet::AddRelation (
maRelations.back().TargetSet[0] = rxObject;
}
-
-
-
//----- XAccessibleRelationSet ------------------------------------------------
sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount (void)
@@ -1745,9 +1498,6 @@ sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount (void)
return maRelations.size();
}
-
-
-
AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex)
throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException)
{
@@ -1757,9 +1507,6 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex
return maRelations[nIndex];
}
-
-
-
sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationType)
throw (cssu::RuntimeException)
{
@@ -1773,9 +1520,6 @@ sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationTy
return sal_False;
}
-
-
-
AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 nRelationType)
throw (cssu::RuntimeException)
{
@@ -1789,9 +1533,6 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16
return AccessibleRelation();
}
-
-
-
//===== PresenterAccessible::AccessibleParagraph ==============================
PresenterAccessible::AccessibleParagraph::AccessibleParagraph (
@@ -1806,16 +1547,10 @@ PresenterAccessible::AccessibleParagraph::AccessibleParagraph (
{
}
-
-
-
PresenterAccessible::AccessibleParagraph::~AccessibleParagraph (void)
{
}
-
-
-
//----- XAccessibleContext ----------------------------------------------------
Reference<XAccessibleRelationSet> SAL_CALL
@@ -1846,11 +1581,6 @@ Reference<XAccessibleRelationSet> SAL_CALL
return Reference<XAccessibleRelationSet>(pSet.get());
}
-
-
-
-
-
//----- XAccessibleText -------------------------------------------------------
sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (void)
@@ -1865,9 +1595,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (v
return nPosition;
}
-
-
-
sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sal_Int32 nIndex)
throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException)
{
@@ -1882,9 +1609,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sa
return sal_False;
}
-
-
-
sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal_Int32 nIndex)
throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException)
{
@@ -1902,9 +1626,6 @@ sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal
}
}
-
-
-
Sequence<css::beans::PropertyValue> SAL_CALL
PresenterAccessible::AccessibleParagraph::getCharacterAttributes (
::sal_Int32 nIndex,
@@ -1932,9 +1653,6 @@ Sequence<css::beans::PropertyValue> SAL_CALL
return Sequence<css::beans::PropertyValue>();
}
-
-
-
awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBounds (
sal_Int32 nIndex)
throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException)
@@ -1963,9 +1681,6 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo
return aCharacterBox;
}
-
-
-
sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount (void)
throw (cssu::RuntimeException)
{
@@ -1978,9 +1693,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount (
return nCount;
}
-
-
-
sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
const css::awt::Point& rPoint)
throw (cssu::RuntimeException)
@@ -1994,9 +1706,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
return nIndex;
}
-
-
-
::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void)
throw (cssu::RuntimeException)
{
@@ -2005,9 +1714,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
return getTextRange(getSelectionStart(), getSelectionEnd());
}
-
-
-
sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart (void)
throw (cssu::RuntimeException)
{
@@ -2016,9 +1722,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart (
return getCaretPosition();
}
-
-
-
sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (void)
throw (cssu::RuntimeException)
{
@@ -2027,9 +1730,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (vo
return getCaretPosition();
}
-
-
-
sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
sal_Int32 nStartIndex,
sal_Int32 nEndIndex)
@@ -2041,9 +1741,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
return setCaretPosition(nStartIndex);
}
-
-
-
::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void)
throw (cssu::RuntimeException)
{
@@ -2056,9 +1753,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
return sText;
}
-
-
-
::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange (
sal_Int32 nLocalStartIndex,
sal_Int32 nLocalEndIndex)
@@ -2077,9 +1771,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
return sText;
}
-
-
-
TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex (
sal_Int32 nLocalCharacterIndex,
sal_Int16 nTextType)
@@ -2096,9 +1787,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex (
return aSegment;
}
-
-
-
TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeIndex (
sal_Int32 nLocalCharacterIndex,
sal_Int16 nTextType)
@@ -2115,9 +1803,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeInde
return aSegment;
}
-
-
-
TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindIndex (
sal_Int32 nLocalCharacterIndex,
sal_Int16 nTextType)
@@ -2134,9 +1819,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindInde
return aSegment;
}
-
-
-
sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText (
sal_Int32 nStartIndex,
sal_Int32 nEndIndex)
@@ -2152,9 +1834,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText (
return sal_False;
}
-
-
-
//----- protected -------------------------------------------------------------
awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation (void)
@@ -2170,9 +1849,6 @@ awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation (void)
return aLocation;
}
-
-
-
awt::Size PresenterAccessible::AccessibleParagraph::GetSize (void)
{
if (mpParagraph)
@@ -2181,9 +1857,6 @@ awt::Size PresenterAccessible::AccessibleParagraph::GetSize (void)
return AccessibleObject::GetSize();
}
-
-
-
awt::Point PresenterAccessible::AccessibleParagraph::GetAbsoluteParentLocation (void)
{
if (mxParentAccessible.is())
@@ -2202,9 +1875,6 @@ awt::Point PresenterAccessible::AccessibleParagraph::GetAbsoluteParentLocation (
return awt::Point();
}
-
-
-
bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 nType) const
{
switch (nType)
@@ -2220,11 +1890,6 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n
}
}
-
-
-
-
-
//===== AccessibleNotes =======================================================
AccessibleNotes::AccessibleNotes (
@@ -2236,9 +1901,6 @@ AccessibleNotes::AccessibleNotes (
{
}
-
-
-
rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const lang::Locale aLocale,
@@ -2269,9 +1931,6 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
return rtl::Reference<PresenterAccessible::AccessibleObject>(pObject.get());
}
-
-
-
void AccessibleNotes::SetTextView (
const ::boost::shared_ptr<PresenterTextView>& rpTextView)
{
@@ -2334,9 +1993,6 @@ void AccessibleNotes::SetTextView (
}
}
-
-
-
void AccessibleNotes::SetWindow (
const cssu::Reference<css::awt::XWindow>& rxContentWindow,
const cssu::Reference<css::awt::XWindow>& rxBorderWindow)
@@ -2355,9 +2011,6 @@ void AccessibleNotes::SetWindow (
}
}
-
-
-
void AccessibleNotes::NotifyCaretChange (
const sal_Int32 nOldParagraphIndex,
const sal_Int32 nOldCharacterIndex,
@@ -2399,17 +2052,11 @@ void AccessibleNotes::NotifyCaretChange (
}
}
-
-
-
void AccessibleNotes::HandleTextChange (void)
{
SetTextView(mpTextView);
}
-
-
-
//===== AccessibleFocusManager ================================================
::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance;
@@ -2423,17 +2070,11 @@ void AccessibleNotes::HandleTextChange (void)
return mpInstance;
}
-
-
-
AccessibleFocusManager::AccessibleFocusManager (void)
: maFocusableObjects()
{
}
-
-
-
void AccessibleFocusManager::AddFocusableObject (
const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
{
@@ -2443,9 +2084,6 @@ void AccessibleFocusManager::AddFocusableObject (
maFocusableObjects.push_back(rpObject);
}
-
-
-
void AccessibleFocusManager::RemoveFocusableObject (
const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
{
@@ -2460,9 +2098,6 @@ void AccessibleFocusManager::RemoveFocusableObject (
}
}
-
-
-
void AccessibleFocusManager::FocusObject (
const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
{
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index 9868db5..4eb7c3d 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -52,7 +52,6 @@ namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
namespace cssa = ::com::sun::star::accessibility;
-
namespace sdext { namespace presenter {
class PresenterController;
@@ -87,14 +86,12 @@ public:
virtual void SAL_CALL disposing (void);
-
//----- XAccessible -------------------------------------------------------
virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL
getAccessibleContext (void)
throw (cssu::RuntimeException);
-
//----- XFocusListener ----------------------------------------------------
virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent)
@@ -103,19 +100,16 @@ public:
virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
throw (cssu::RuntimeException);
-
//----- XEventListener ----------------------------------------------------
virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
throw (cssu::RuntimeException);
-
//----- XInitialization ---------------------------------------------------
virtual void SAL_CALL initialize (const cssu::Sequence<cssu::Any>& rArguments)
throw (cssu::RuntimeException);
-
class AccessibleObject;
class AccessibleParagraph;
@@ -144,9 +138,6 @@ private:
PresenterPaneContainer::SharedPaneDescriptor GetPreviewPane (void) const;
};
-
-
-
} } // end of namespace ::sd::presenter
#endif
diff --git a/sdext/source/presenter/PresenterAnimation.cxx b/sdext/source/presenter/PresenterAnimation.cxx
index 8f274ea..cacf98d 100644
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ b/sdext/source/presenter/PresenterAnimation.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterAnimation.hxx"
#include <osl/time.h>
@@ -42,9 +41,6 @@ sal_uInt64 GetCurrentTime (void)
return 0;
}
-
-
-
PresenterAnimation::PresenterAnimation (
const sal_uInt64 nStartDelay,
const sal_uInt64 nTotalDuration,
@@ -57,40 +53,25 @@ PresenterAnimation::PresenterAnimation (
{
}
-
-
-
PresenterAnimation::~PresenterAnimation (void)
{
}
-
-
-
sal_uInt64 PresenterAnimation::GetStartTime (void)
{
return mnStartTime;
}
-
-
-
sal_uInt64 PresenterAnimation::GetEndTime (void)
{
return mnStartTime + mnTotalDuration;
}
-
-
-
sal_uInt64 PresenterAnimation::GetStepDuration (void)
{
return mnStepDuration;
}
-
-
-
void PresenterAnimation::AddEndCallback (const Callback& rCallback)
{
if (mpEndCallbacks.get() == NULL)
@@ -98,8 +79,6 @@ void PresenterAnimation::AddEndCallback (const Callback& rCallback)
mpEndCallbacks->push_back(rCallback);
}
-
-
void PresenterAnimation::RunStartCallbacks (void)
{
if (mpStartCallbacks.get() != NULL)
@@ -110,9 +89,6 @@ void PresenterAnimation::RunStartCallbacks (void)
}
}
-
-
-
void PresenterAnimation::RunEndCallbacks (void)
{
if (mpEndCallbacks.get() != NULL)
@@ -123,9 +99,6 @@ void PresenterAnimation::RunEndCallbacks (void)
}
}
-
-
-
} } // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterAnimation.hxx b/sdext/source/presenter/PresenterAnimation.hxx
index 20819b5..fdd8de6 100644
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ b/sdext/source/presenter/PresenterAnimation.hxx
@@ -120,7 +120,6 @@ inline sal_uInt32 GetNanoSeconds (const sal_uInt64 nTime) { return sal_uInt32((n
typedef ::boost::shared_ptr<PresenterAnimation> SharedPresenterAnimation;
-
} } // end of namespace ::sdext::presenter
#endif
diff --git a/sdext/source/presenter/PresenterAnimator.cxx b/sdext/source/presenter/PresenterAnimator.cxx
index dbb07dc..55c9fd5 100644
--- a/sdext/source/presenter/PresenterAnimator.cxx
+++ b/sdext/source/presenter/PresenterAnimator.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterAnimator.hxx"
#include "PresenterTimer.hxx"
@@ -38,8 +37,6 @@
namespace sdext { namespace presenter {
-
-
//===== PresenterAnimator =====================================================
PresenterAnimator::PresenterAnimator (void)
@@ -50,18 +47,11 @@ PresenterAnimator::PresenterAnimator (void)
{
}
-
-
-
PresenterAnimator::~PresenterAnimator (void)
{
PresenterTimer::CancelTask(mnCurrentTaskId);
}
-
-
-
-
void PresenterAnimator::AddAnimation (const SharedPresenterAnimation& rpAnimation)
{
::osl::MutexGuard aGuard (m_aMutex);
@@ -70,9 +60,6 @@ void PresenterAnimator::AddAnimation (const SharedPresenterAnimation& rpAnimatio
ScheduleNextRun();
}
-
-
-
void PresenterAnimator::Process (void)
{
::osl::MutexGuard aGuard (m_aMutex);
@@ -116,9 +103,6 @@ void PresenterAnimator::Process (void)
ScheduleNextRun();
}
-
-
-
void PresenterAnimator::ActivateAnimations (const sal_uInt64 nCurrentTime)
{
while ( ! maFutureAnimations.empty()
@@ -131,9 +115,6 @@ void PresenterAnimator::ActivateAnimations (const sal_uInt64 nCurrentTime)
}
}
-
-
-
void PresenterAnimator::ScheduleNextRun (void)
{
sal_uInt64 nStartTime (0);
@@ -152,9 +133,6 @@ void PresenterAnimator::ScheduleNextRun (void)
ScheduleNextRun(nStartTime);
}
-
-
-
void PresenterAnimator::ScheduleNextRun (const sal_uInt64 nStartTime)
{
if (mnNextTime==0 || nStartTime<mnNextTime)
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx
index 9661065..e4267c3 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterBitmapContainer.hxx"
#include "PresenterComponent.hxx"
#include "PresenterConfigurationAccess.hxx"
@@ -46,7 +45,6 @@ using ::rtl::OUString;
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
namespace sdext { namespace presenter {
namespace {
@@ -94,10 +92,6 @@ PresenterBitmapContainer::PresenterBitmapContainer (
LoadBitmaps(xBitmapList);
}
-
-
-
-
PresenterBitmapContainer::PresenterBitmapContainer (
const css::uno::Reference<css::container::XNameAccess>& rxRootNode,
const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
@@ -116,9 +110,6 @@ PresenterBitmapContainer::PresenterBitmapContainer (
LoadBitmaps(rxRootNode);
}
-
-
-
void PresenterBitmapContainer::Initialize (
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext)
{
@@ -138,17 +129,11 @@ void PresenterBitmapContainer::Initialize (
}
}
-
-
-
PresenterBitmapContainer::~PresenterBitmapContainer (void)
{
maIconContainer.clear();
}
-
-
-
SharedBitmapDescriptor PresenterBitmapContainer::GetBitmap (
const OUString& rsName) const
{
@@ -161,9 +146,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::GetBitmap (
return SharedBitmapDescriptor();
}
-
-
-
void PresenterBitmapContainer::LoadBitmaps (
const css::uno::Reference<css::container::XNameAccess>& rxBitmapList)
{
@@ -189,9 +171,6 @@ void PresenterBitmapContainer::LoadBitmaps (
}
}
-
-
-
SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
const ::rtl::OUString& rsPath,
@@ -226,9 +205,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
return pBitmap;
}
-
-
-
void PresenterBitmapContainer::ProcessBitmap (
const OUString& rsKey,
const Reference<beans::XPropertySet>& rxProperties)
@@ -245,9 +221,6 @@ void PresenterBitmapContainer::ProcessBitmap (
SharedBitmapDescriptor());
}
-
-
-
SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
const Reference<beans::XPropertySet>& rxProperties,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
@@ -312,7 +285,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
catch (Exception&)
{}
-
PresenterConfigurationAccess::GetProperty(rxProperties, gsXOffsetProperty) >>= pBitmap->mnXOffset;
PresenterConfigurationAccess::GetProperty(rxProperties, gsYOffsetProperty) >>= pBitmap->mnYOffset;
@@ -330,9 +302,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
return pBitmap;
}
-
-
-
PresenterBitmapContainer::BitmapDescriptor::TexturingMode
PresenterBitmapContainer::StringToTexturingMode (const OUString& rsTexturingMode)
{
@@ -346,9 +315,6 @@ PresenterBitmapContainer::BitmapDescriptor::TexturingMode
return PresenterBitmapContainer::BitmapDescriptor::Once;
}
-
-
-
//===== PresenterBitmapContainer::BitmapSet ===================================
PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (void)
@@ -369,9 +335,6 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (void)
{
}
-
-
-
PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (
const ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault)
: mnWidth(0),
@@ -408,16 +371,12 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (
}
}
-
css::uno::Reference<css::rendering::XBitmap>
PresenterBitmapContainer::BitmapDescriptor::GetNormalBitmap (void) const
{
return mxNormalBitmap;
}
-
-
-
css::uno::Reference<css::rendering::XBitmap>
PresenterBitmapContainer::BitmapDescriptor::GetBitmap (
const Mode eMode,
@@ -452,9 +411,6 @@ css::uno::Reference<css::rendering::XBitmap>
}
}
-
-
-
void PresenterBitmapContainer::BitmapDescriptor::SetBitmap (
const Mode eMode,
const css::uno::Reference<css::rendering::XBitmap>& rxBitmap)
@@ -490,9 +446,6 @@ void PresenterBitmapContainer::BitmapDescriptor::SetBitmap (
}
}
-
-
-
} } // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx
index 5008999..5402e40 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -45,7 +45,6 @@
namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** Manage a set of bitmap groups as they are used for buttons: three
@@ -157,7 +156,6 @@ private:
StringToTexturingMode (const ::rtl::OUString& rsTexturingMode);
};
-
typedef PresenterBitmapContainer::BitmapDescriptor PresenterBitmapDescriptor;
typedef ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> SharedBitmapDescriptor;
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 7a578d6..64649b4 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterButton.hxx"
#include "PresenterCanvasHelper.hxx"
#include "PresenterController.hxx"
@@ -51,8 +50,6 @@ namespace sdext { namespace presenter {
const static double gnHorizontalBorder (15);
const static double gnVerticalBorder (5);
-
-
::rtl::Reference<PresenterButton> PresenterButton::Create (
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
const ::rtl::Reference<PresenterController>& rpPresenterController,
@@ -96,9 +93,6 @@ const static double gnVerticalBorder (5);
return NULL;
}
-
-
-
PresenterButton::PresenterButton (
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
const ::rtl::Reference<PresenterController>& rpPresenterController,
@@ -161,16 +155,10 @@ PresenterButton::PresenterButton (
}
}
-
-
-
PresenterButton::~PresenterButton (void)
{
}
-
-
-
void SAL_CALL PresenterButton::disposing (void)
{
if (mxCanvas.is())
@@ -194,9 +182,6 @@ void SAL_CALL PresenterButton::disposing (void)
}
}
-
-
-
void PresenterButton::SetCenter (const css::geometry::RealPoint2D& rLocation)
{
if (mxCanvas.is())
@@ -220,9 +205,6 @@ void PresenterButton::SetCenter (const css::geometry::RealPoint2D& rLocation)
}
}
-
-
-
void PresenterButton::SetCanvas (
const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas,
const css::uno::Reference<css::awt::XWindow>& rxParentWindow)
@@ -251,9 +233,6 @@ void PresenterButton::SetCanvas (
}
}
-
-
-
css::geometry::IntegerSize2D PresenterButton::GetSize (void)
{
if (maButtonSize.Width < 0)
@@ -261,9 +240,6 @@ css::geometry::IntegerSize2D PresenterButton::GetSize (void)
return maButtonSize;
}
-
-
-
//----- XWindowListener -------------------------------------------------------
void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEvent)
@@ -273,10 +249,6 @@ void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEven
ThrowIfDisposed();
}
-
-
-
-
void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent)
throw (css::uno::RuntimeException)
{
@@ -284,9 +256,6 @@ void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent)
ThrowIfDisposed();
}
-
-
-
void SAL_CALL PresenterButton::windowShown (const css::lang::EventObject& rEvent)
throw (css::uno::RuntimeException)
{
@@ -294,9 +263,6 @@ void SAL_CALL PresenterButton::windowShown (const css::lang::EventObject& rEvent
ThrowIfDisposed();
}
-
-
-
void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEvent)
throw (css::uno::RuntimeException)
{
@@ -304,9 +270,6 @@ void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEven
ThrowIfDisposed();
}
-
-
-
//----- XPaintListener --------------------------------------------------------
void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent)
@@ -340,9 +303,6 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent)
}
}
-
-
-
//----- XMouseListener --------------------------------------------------------
void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent)
@@ -354,9 +314,6 @@ void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent)
meState = PresenterBitmapDescriptor::ButtonDown;
}
-
-
-
void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent)
throw(css::uno::RuntimeException)
{
@@ -373,9 +330,6 @@ void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent
}
}
-
-
-
void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent)
throw(css::uno::RuntimeException)
{
@@ -385,9 +339,6 @@ void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent)
Invalidate();
}
-
-
-
void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent)
throw(css::uno::RuntimeException)
{
@@ -397,10 +348,6 @@ void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent)
Invalidate();
}
-
-
-
-
//----- XMouseMotionListener --------------------------------------------------
void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent& rEvent)
@@ -410,9 +357,6 @@ void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent& rEvent)
ThrowIfDisposed();
}
-
-
-
void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException)
{
@@ -420,9 +364,6 @@ void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent)
ThrowIfDisposed();
}
-
-
-
//----- lang::XEventListener --------------------------------------------------
void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent)
@@ -432,9 +373,6 @@ void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent)
mxWindow = NULL;
}
-
-
-
//-----------------------------------------------------------------------------
css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize (void)
@@ -451,9 +389,6 @@ css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize (void)
sal_Int32(0.5 + aTextSize.Height + 2*gnVerticalBorder));
}
-
-
-
void PresenterButton::RenderButton (
const Reference<rendering::XCanvas>& rxCanvas,
const geometry::IntegerSize2D& rSize,
@@ -498,17 +433,11 @@ void PresenterButton::RenderButton (
rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
}
-
-
-
void PresenterButton::Invalidate (void)
{
mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
}
-
-
-
Reference<rendering::XBitmap> PresenterButton::GetBitmap (
const SharedBitmapDescriptor& mpIcon,
const PresenterBitmapDescriptor::Mode eMode)
@@ -522,9 +451,6 @@ Reference<rendering::XBitmap> PresenterButton::GetBitmap (
}
}
-
-
-
void PresenterButton::SetupButtonBitmaps (void)
{
if ( ! mxCanvas.is())
@@ -569,9 +495,6 @@ void PresenterButton::SetupButtonBitmaps (void)
pRightBitmap);
}
-
-
-
Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties (
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
const OUString& rsConfgurationName)
@@ -592,9 +515,6 @@ Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties (
UNO_QUERY);
}
-
-
-
void PresenterButton::ThrowIfDisposed (void) const
throw (::com::sun::star::lang::DisposedException)
{
@@ -607,7 +527,6 @@ void PresenterButton::ThrowIfDisposed (void) const
}
}
-
} } // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index b952a9b..e1f281e 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -99,13 +99,11 @@ public:
virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
throw (css::uno::RuntimeException);
-
// XPaintListener
virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
throw (css::uno::RuntimeException);
-
// XMouseListener
virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
@@ -120,7 +118,6 @@ public:
virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
throw(css::uno::RuntimeException);
-
// XMouseMotionListener
virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
@@ -129,7 +126,6 @@ public:
virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException);
-
// lang::XEventListener
virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
throw (css::uno::RuntimeException);
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx
index ffc1d99..0bf9ceb 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterCanvasHelper.hxx"
#include "PresenterController.hxx"
@@ -136,9 +135,6 @@ void PresenterCanvasHelper::PaintRectangle (
}
}
-
-
-
void PresenterCanvasHelper::PaintTiledBitmap (
const css::uno::Reference<css::rendering::XBitmap>& rxTexture,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
@@ -164,7 +160,6 @@ void PresenterCanvasHelper::PaintTiledBitmap (
// set.
rendering::RenderState aRenderState (rDefaultRenderState);
-
// Tile the bitmap over the repaint box.
const geometry::IntegerSize2D aBitmapSize (rxTexture->getSize());
const sal_Int32 nLeft = (rRepaintBox.X / aBitmapSize.Width) * aBitmapSize.Width;
@@ -192,9 +187,6 @@ void PresenterCanvasHelper::PaintTiledBitmap (
}
}
-
-
-
void PresenterCanvasHelper::PaintBitmap (
const css::uno::Reference<css::rendering::XBitmap>& rxBitmap,
const awt::Point& rLocation,
@@ -217,7 +209,6 @@ void PresenterCanvasHelper::PaintBitmap (
rendering::ViewState aViewState (rDefaultViewState);
aViewState.Clip = PresenterGeometryHelper::CreatePolygon(rRepaintBox, rxCanvas->getDevice());
-
// Setup the rendering state so that the bitmap is painted top left in
// the polygon bounding box.
rendering::RenderState aRenderState (rDefaultRenderState);
@@ -230,9 +221,6 @@ void PresenterCanvasHelper::PaintBitmap (
aRenderState);
}
-
-
-
void PresenterCanvasHelper::PaintColor (
const css::util::Color nColor,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
@@ -251,7 +239,6 @@ void PresenterCanvasHelper::PaintColor (
rendering::ViewState aViewState (rDefaultViewState);
aViewState.Clip = PresenterGeometryHelper::CreatePolygon(rRepaintBox, rxCanvas->getDevice());
-
// Setup the rendering state to use the given color.
rendering::RenderState aRenderState (rDefaultRenderState);
SetDeviceColor(aRenderState, nColor);
@@ -262,9 +249,6 @@ void PresenterCanvasHelper::PaintColor (
aRenderState);
}
-
-
-
void PresenterCanvasHelper::SetDeviceColor(
rendering::RenderState& rRenderState,
const util::Color aColor)
@@ -281,9 +265,6 @@ void PresenterCanvasHelper::SetDeviceColor(
}
}
-
-
-
css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox (
const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
const ::rtl::OUString& rsText,
@@ -302,9 +283,6 @@ css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox (
}
}
-
-
-
css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize (
const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
const ::rtl::OUString& rsText,
@@ -314,7 +292,6 @@ css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize (
return css::geometry::RealSize2D(aTextBBox.X2 - aTextBBox.X1, aTextBBox.Y2 - aTextBBox.Y1);
}
-
} } // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx
index e3fb6b1..f176b8b 100644
--- a/sdext/source/presenter/PresenterClock.cxx
+++ b/sdext/source/presenter/PresenterClock.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterClock.hxx"
#include "PresenterComponent.hxx"
#include "PresenterConfigurationAccess.hxx"
@@ -59,7 +58,6 @@ using ::rtl::OUString;
namespace sdext { namespace presenter {
-
/** Wrapper around a library timer.
*/
class PresenterClock::Timer : public salhelper::Timer
@@ -77,9 +75,6 @@ private:
::rtl::Reference<PresenterClock> mpClock;
};
-
-
-
namespace {
bool GetDateTime (oslDateTime& rDateTime);
@@ -93,9 +88,6 @@ namespace {
};
}
-
-
-
class PresenterClock::Painter
{
public:
@@ -111,9 +103,6 @@ public:
virtual void Resize (const awt::Size& rSize) = 0;
};
-
-
-
namespace {
class AnalogDefaultPainter : public PresenterClock::Painter
{
@@ -162,7 +151,6 @@ namespace {
const rendering::RenderState& rRenderState);
};
-
class AnalogBitmapPainter : public PresenterClock::Painter
{
public:
@@ -210,7 +198,6 @@ namespace {
void ScaleBitmaps (void);
};
-
class DigitalDefaultPainter : public PresenterClock::Painter
{
public:
@@ -243,12 +230,8 @@ namespace {
const bool bIsShowSeconds);
};
-
} // end of anonymous namespace
-
-
-
//===== PresenterClock =================================================================
::rtl::Reference<PresenterClock> PresenterClock::Create (
@@ -266,9 +249,6 @@ namespace {
return pClock;
}
-
-
-
PresenterClock::PresenterClock (
const Reference<XComponentContext>& rxContext,
const Reference<XResourceId>& rxViewId,
@@ -328,24 +308,15 @@ PresenterClock::PresenterClock (
}
}
-
-
-
PresenterClock::~PresenterClock (void)
{
}
-
-
-
void PresenterClock::LateInit (void)
{
mpTimer = new Timer(this);
}
-
-
-
void SAL_CALL PresenterClock::disposing (void)
{
if (mpTimer != NULL)
@@ -363,9 +334,6 @@ void SAL_CALL PresenterClock::disposing (void)
mxViewId = NULL;
}
-
-
-
void PresenterClock::UpdateTime (void)
{
// Get current time and check whether it is different from last time.
@@ -387,9 +355,6 @@ void PresenterClock::UpdateTime (void)
}
}
-
-
-
//----- lang::XEventListener -------------------------------------------------
void SAL_CALL PresenterClock::disposing (const lang::EventObject& rEventObject)
@@ -403,9 +368,6 @@ void SAL_CALL PresenterClock::disposing (const lang::EventObject& rEventObject)
}
}
-
-
-
//----- XPaintListener --------------------------------------------------------
void SAL_CALL PresenterClock::windowPaint (const awt::PaintEvent& rEvent)
@@ -415,9 +377,6 @@ void SAL_CALL PresenterClock::windowPaint (const awt::PaintEvent& rEvent)
Paint(rEvent.UpdateRect);
}
-
-
-
//----- XWindowListener -------------------------------------------------------
void SAL_CALL PresenterClock::windowResized (const awt::WindowEvent& rEvent)
@@ -427,9 +386,6 @@ void SAL_CALL PresenterClock::windowResized (const awt::WindowEvent& rEvent)
mbIsResizePending = true;
}
-
-
-
void SAL_CALL PresenterClock::windowMoved (const awt::WindowEvent& rEvent)
throw (RuntimeException)
{
@@ -437,9 +393,6 @@ void SAL_CALL PresenterClock::windowMoved (const awt::WindowEvent& rEvent)
mbIsResizePending = true;
}
-
-
-
void SAL_CALL PresenterClock::windowShown (const lang::EventObject& rEvent)
throw (RuntimeException)
{
@@ -447,18 +400,12 @@ void SAL_CALL PresenterClock::windowShown (const lang::EventObject& rEvent)
mbIsResizePending = true;
}
-
-
-
void SAL_CALL PresenterClock::windowHidden (const lang::EventObject& rEvent)
throw (RuntimeException)
{
(void)rEvent;
}
-
-
-
//----- XMouseListener --------------------------------------------------------
void SAL_CALL PresenterClock::mousePressed (const css::awt::MouseEvent& rEvent)
@@ -470,36 +417,24 @@ void SAL_CALL PresenterClock::mousePressed (const css::awt::MouseEvent& rEvent)
}
}
-
-
-
void SAL_CALL PresenterClock::mouseReleased (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
void SAL_CALL PresenterClock::mouseEntered (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
void SAL_CALL PresenterClock::mouseExited (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
//----- XResourceId -----------------------------------------------------------
Reference<XResourceId> SAL_CALL PresenterClock::getResourceId (void)
@@ -508,18 +443,12 @@ Reference<XResourceId> SAL_CALL PresenterClock::getResourceId (void)
return mxViewId;
}
-
-
-
sal_Bool SAL_CALL PresenterClock::isAnchorOnly (void)
throw (RuntimeException)
{
return false;
}
-
-
-
//-----------------------------------------------------------------------------
void PresenterClock::Resize (void)
@@ -538,9 +467,6 @@ void PresenterClock::Resize (void)
}
}
-
-
-
void PresenterClock::Paint (const awt::Rectangle& rUpdateBox)
{
if ( ! mxCanvas.is() && mxPane.is())
@@ -594,9 +520,6 @@ void PresenterClock::Paint (const awt::Rectangle& rUpdateBox)
xSpriteCanvas->updateScreen(sal_False);
}
-
-
-
void PresenterClock::Clear (const Reference<rendering::XPolyPolygon2D>& rxUpdatePolygon)
{
rendering::RenderState aRenderState = maRenderState;
@@ -613,9 +536,6 @@ void PresenterClock::Clear (const Reference<rendering::XPolyPolygon2D>& rxUpdate
aRenderState);
}
-
-
-
void PresenterClock::SetMode (const sal_Int32 nMode)
{
mnMode = nMode % 3;
@@ -651,9 +571,6 @@ void PresenterClock::SetMode (const sal_Int32 nMode)
Resize();
}
-
-
-
void PresenterClock::ThrowIfDisposed (void)
throw (::com::sun::star::lang::DisposedException)
{
@@ -666,9 +583,6 @@ void PresenterClock::ThrowIfDisposed (void)
}
}
-
-
-
//===== Timer =================================================================
PresenterClock::Timer::Timer (const ::rtl::Reference<PresenterClock>& rpClock)
@@ -679,18 +593,12 @@ PresenterClock::Timer::Timer (const ::rtl::Reference<PresenterClock>& rpClock)
start();
}
-
-
-
PresenterClock::Timer::~Timer (void)
{
if (mpClock.is())
Stop();
}
-
-
-
void PresenterClock::Timer::Stop (void)
{
mpClock = NULL;
@@ -698,17 +606,12 @@ void PresenterClock::Timer::Stop (void)
release();
}
-
-
-
void SAL_CALL PresenterClock::Timer::onShot (void)
{
if (mpClock.get() != NULL)
mpClock->UpdateTime();
}
-
-
namespace {
//=============================================================================
@@ -724,9 +627,6 @@ bool GetDateTime (oslDateTime& rDateTime)
return false;
}
-
-
-
//===== AnalogDefaultPainter ==================================================
const double AnalogDefaultPainter::mnRelativeHourHandLength = 0.65;
@@ -747,9 +647,6 @@ AnalogDefaultPainter::AnalogDefaultPainter (void)
{
}
-
-
-
void AnalogDefaultPainter::Paint (
const Reference<rendering::XCanvas>& rxCanvas,
const rendering::ViewState& rViewState,
@@ -846,9 +743,6 @@ void AnalogDefaultPainter::Paint (
rxCanvas->drawBitmap(mxBitmap,rViewState,aRenderState);
}
-
-
-
void AnalogDefaultPainter::PaintAngledLine (
const double nAngle,
const double nInnerRadius,
@@ -891,9 +785,6 @@ void AnalogDefaultPainter::PaintAngledLine (
aStrokeAttributes);
}
-
-
-
void AnalogDefaultPainter::Resize (const awt::Size& rWindowSize)
{
maSize = rWindowSize;
@@ -902,9 +793,6 @@ void AnalogDefaultPainter::Resize (const awt::Size& rWindowSize)
mxBitmap = NULL;
}
-
-
-
//===== AnalogBitmapPainter ===================================================
AnalogBitmapPainter::AnalogBitmapPainter (
@@ -922,9 +810,6 @@ AnalogBitmapPainter::AnalogBitmapPainter (
{
}
-
-
-
void AnalogBitmapPainter::Paint (
const Reference<rendering::XCanvas>& rxCanvas,
const rendering::ViewState& rViewState,
@@ -996,9 +881,6 @@ void AnalogBitmapPainter::Paint (
}
}
-
-
-
void AnalogBitmapPainter::Resize (const awt::Size& rWindowSize)
{
maCenter = geometry::RealPoint2D(rWindowSize.Width/2.0, rWindowSize.Height/2.0);
@@ -1008,9 +890,6 @@ void AnalogBitmapPainter::Resize (const awt::Size& rWindowSize)
maMinuteHand.mxScaledBitmap = NULL;
}
-
-
-
void AnalogBitmapPainter::PrepareBitmaps (const Reference<rendering::XCanvas>& rxCanvas)
{
if (mbThemeLoadingFailed)
@@ -1045,9 +924,6 @@ void AnalogBitmapPainter::PrepareBitmaps (const Reference<rendering::XCanvas>& r
ScaleBitmaps();
}
-
-
-
Reference<container::XNameAccess> AnalogBitmapPainter::GetTheme (
PresenterConfigurationAccess& rConfiguration)
{
@@ -1084,9 +960,6 @@ Reference<container::XNameAccess> AnalogBitmapPainter::GetTheme (
return xTheme;
}
-
-
-
bool AnalogBitmapPainter::ThemeNameComparator (
const OUString& rsKey,
const Reference<container::XNameAccess>& rxCandidate,
@@ -1104,10 +977,6 @@ bool AnalogBitmapPainter::ThemeNameComparator (
return false;
}
-
-
-
-
void AnalogBitmapPainter::LoadBitmaps (
PresenterConfigurationAccess& rConfiguration,
const Reference<container::XNameAccess>& rxClockTheme,
@@ -1141,7 +1010,6 @@ void AnalogBitmapPainter::LoadBitmaps (
if ( ! xBitmapLoader.is())
return;
-
// Iterate over all entries in the bitmap list and load the bitmaps.
Reference<container::XNameAccess> xBitmaps (
rxClockTheme->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmaps"))),
@@ -1161,9 +1029,6 @@ void AnalogBitmapPainter::LoadBitmaps (
xBitmapLoader));
}
-
-
-
void AnalogBitmapPainter::LoadBitmap (
const OUString& rsKey,
const ::std::vector<Any>& rValues,
@@ -1198,9 +1063,6 @@ void AnalogBitmapPainter::LoadBitmap (
}
}
-
-
-
void AnalogBitmapPainter::ScaleBitmaps (void)
{
if (mbThemeLoadingFailed)
@@ -1229,9 +1091,6 @@ void AnalogBitmapPainter::ScaleBitmaps (void)
}
}
-
-
-
//===== DigitalDefaultPainter =================================================
DigitalDefaultPainter::DigitalDefaultPainter (
@@ -1246,16 +1105,10 @@ DigitalDefaultPainter::DigitalDefaultPainter (
{
}
-
-
-
DigitalDefaultPainter::~DigitalDefaultPainter (void)
{
}
-
-
-
void DigitalDefaultPainter::Paint (
const Reference<rendering::XCanvas>& rxCanvas,
const rendering::ViewState& rViewState,
@@ -1326,7 +1179,6 @@ void DigitalDefaultPainter::Paint (
return;
geometry::RealRectangle2D aBox (xLayout->queryTextBounds());
-
rendering::RenderState aRenderState(
geometry::AffineMatrix2D(1,0,0, 0,1,0),
NULL,
@@ -1347,9 +1199,6 @@ void DigitalDefaultPainter::Paint (
rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
}
-
-
-
void DigitalDefaultPainter::Resize (const awt::Size& rSize)
{
if (maWindowSize.Width != rSize.Width || maWindowSize.Height != rSize.Height)
@@ -1360,9 +1209,6 @@ void DigitalDefaultPainter::Resize (const awt::Size& rSize)
}
}
-
-
-
void DigitalDefaultPainter::CreateFont (
const Reference<rendering::XCanvas>& rxCanvas,
const bool bIsShowSeconds)
@@ -1434,10 +1280,8 @@ void DigitalDefaultPainter::CreateFont (
}
}
-
} // end of anonymous namespace
-
} } // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterClock.hxx b/sdext/source/presenter/PresenterClock.hxx
index 3526633..fcf6d1a 100644
--- a/sdext/source/presenter/PresenterClock.hxx
+++ b/sdext/source/presenter/PresenterClock.hxx
@@ -61,7 +61,6 @@ namespace {
namespace sdext { namespace presenter {
-
/** A clock that displays the current time. This class is work in
progress. Future extensions may include
other times like time since presentation started or remaining time.
@@ -90,20 +89,17 @@ public:
*/
class Painter;
-
// lang::XEventListener
virtual void SAL_CALL
disposing (const css::lang::EventObject& rEventObject)
throw (css::uno::RuntimeException);
-
// XPaintListener
virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
throw (css::uno::RuntimeException);
-
// XWindowListener
virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
@@ -118,7 +114,6 @@ public:
virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
throw (css::uno::RuntimeException);
-
// XMouseListener
virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
@@ -133,7 +128,6 @@ public:
virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException);
-
// XResourceId
virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index bef0bfa..b73d617 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterComponent.hxx"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implementationentry.hxx"
@@ -43,8 +42,6 @@ using namespace cppu;
using namespace osl;
using ::rtl::OUString;
-
-
namespace sdext { namespace presenter {
static OUString gsBasePath;
@@ -55,9 +52,6 @@ static OUString gsBasePath;
return GetBasePath(rxComponentContext, gsExtensionIdentifier);
}
-
-
-
::rtl::OUString PresenterComponent::GetBasePath (
const Reference<XComponentContext>& rxComponentContext,
const OUString& rsExtensionIdentifier)
@@ -86,8 +80,6 @@ static OUString gsBasePath;
return gsBasePath;
}
-
-
rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
static struct ImplementationEntry gServiceEntries[] =
@@ -107,9 +99,6 @@ static struct ImplementationEntry gServiceEntries[] =
{ 0, 0, 0, 0, 0, 0 }
};
-
-
-
extern "C"
{
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx
index 4334d53..99568b9 100644
--- a/sdext/source/presenter/PresenterComponent.hxx
+++ b/sdext/source/presenter/PresenterComponent.hxx
@@ -50,7 +50,6 @@ public:
const ::rtl::OUString& rsExtensionIdentifier);
};
-
} }
#endif
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 6fddb62..2a32d82 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterConfigurationAccess.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -98,24 +97,15 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
}
}
-
-
-
PresenterConfigurationAccess::~PresenterConfigurationAccess (void)
{
}
-
-
-
bool PresenterConfigurationAccess::IsValid (void) const
{
return mxRoot.is();
}
-
-
-
Any PresenterConfigurationAccess::GetConfigurationNode (const OUString& sPathToNode)
{
return GetConfigurationNode(
@@ -123,9 +113,6 @@ Any PresenterConfigurationAccess::GetConfigurationNode (const OUString& sPathToN
sPathToNode);
}
-
-
-
bool PresenterConfigurationAccess::GoToChild (const ::rtl::OUString& rsPathToNode)
{
if ( ! IsValid())
@@ -145,9 +132,6 @@ bool PresenterConfigurationAccess::GoToChild (const ::rtl::OUString& rsPathToNod
return false;
}
-
-
-
bool PresenterConfigurationAccess::GoToChild (const Predicate& rPredicate)
{
if ( ! IsValid())
@@ -161,9 +145,6 @@ bool PresenterConfigurationAccess::GoToChild (const Predicate& rPredicate)
return false;
}
-
-
-
bool PresenterConfigurationAccess::SetProperty (
const ::rtl::OUString& rsPropertyName,
const Any& rValue)
@@ -178,9 +159,6 @@ bool PresenterConfigurationAccess::SetProperty (
return false;
}
-
-
-
Any PresenterConfigurationAccess::GetConfigurationNode (
const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
const OUString& sPathToNode)
@@ -205,9 +183,6 @@ Any PresenterConfigurationAccess::GetConfigurationNode (
return Any();
}
-
-
-
Reference<beans::XPropertySet> PresenterConfigurationAccess::GetNodeProperties (
const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
const ::rtl::OUString& rsPathToNode)
@@ -215,9 +190,6 @@ Reference<beans::XPropertySet> PresenterConfigurationAccess::GetNodeProperties (
return Reference<beans::XPropertySet>(GetConfigurationNode(rxNode, rsPathToNode), UNO_QUERY);
}
-
-
-
void PresenterConfigurationAccess::CommitChanges (void)
{
Reference<util::XChangesBatch> xConfiguration (mxRoot, UNO_QUERY);
@@ -225,9 +197,6 @@ void PresenterConfigurationAccess::CommitChanges (void)
xConfiguration->commitChanges();
}
-
-
-
void PresenterConfigurationAccess::ForAll (
const Reference<container::XNameAccess>& rxContainer,
const ::std::vector<OUString>& rArguments,
@@ -264,9 +233,6 @@ void PresenterConfigurationAccess::ForAll (
}
}
-
-
-
void PresenterConfigurationAccess::ForAll (
const Reference<container::XNameAccess>& rxContainer,
const PropertySetProcessor& rProcessor)
@@ -284,9 +250,6 @@ void PresenterConfigurationAccess::ForAll (
}
}
-
-
-
Any PresenterConfigurationAccess::Find (
const Reference<container::XNameAccess>& rxContainer,
const Predicate& rPredicate)
@@ -307,9 +270,6 @@ Any PresenterConfigurationAccess::Find (
return Any();
}
-
-
-
bool PresenterConfigurationAccess::IsStringPropertyEqual (
const ::rtl::OUString& rsValue,
const ::rtl::OUString& rsPropertyName,
@@ -322,9 +282,6 @@ bool PresenterConfigurationAccess::IsStringPropertyEqual (
return false;
}
-
-
-
Any PresenterConfigurationAccess::GetProperty (
const Reference<beans::XPropertySet>& rxProperties,
const OUString& rsKey)
@@ -346,9 +303,6 @@ Any PresenterConfigurationAccess::GetProperty (
return Any();
}
-
-
-
} } // end of namespace sdext::tools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 7d3352c..9629aab 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterController.hxx"
#include "PresenterAccessibility.hxx"
@@ -80,10 +79,8 @@ namespace {
const sal_Int32 ConfigurationUpdateEndEventType = 2;
}
-
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
namespace sdext { namespace presenter {
PresenterController::InstanceContainer PresenterController::maInstances;
@@ -98,9 +95,6 @@ PresenterController::InstanceContainer PresenterController::maInstances;
return ::rtl::Reference<PresenterController>();
}
-
-
-
PresenterController::PresenterController (
const css::uno::WeakReference<css::lang::XEventListener> &rxScreen,
const Reference<XComponentContext>& rxContext,
@@ -211,16 +205,10 @@ PresenterController::PresenterController (
}
}
-
-
-
PresenterController::~PresenterController (void)
{
}
-
-
-
void PresenterController::disposing (void)
{
maInstances.erase(mxController->getFrame());
@@ -284,9 +272,6 @@ void PresenterController::disposing (void)
}
}
-
-
-
void PresenterController::UpdateCurrentSlide (const sal_Int32 nOffset)
{
GetSlides(nOffset);
@@ -304,9 +289,6 @@ void PresenterController::UpdateCurrentSlide (const sal_Int32 nOffset)
}
}
-
-
-
void PresenterController::GetSlides (const sal_Int32 nOffset)
{
if ( ! mxSlideShowController.is())
@@ -356,9 +338,6 @@ void PresenterController::GetSlides (const sal_Int32 nOffset)
}
}
-
-
-
void PresenterController::UpdatePaneTitles (void)
{
if ( ! mxSlideShowController.is())
@@ -455,9 +434,6 @@ void PresenterController::UpdatePaneTitles (void)
}
}
-
-
-
void PresenterController::UpdateViews (void)
{
// Tell all views about the slides they should display.
@@ -470,9 +446,6 @@ void PresenterController::UpdateViews (void)
}
}
-
-
-
SharedBitmapDescriptor
PresenterController::GetViewBackground (const ::rtl::OUString& rsViewURL) const
{
@@ -484,9 +457,6 @@ SharedBitmapDescriptor
return SharedBitmapDescriptor();
}
-
-
-
PresenterTheme::SharedFontDescriptor
PresenterController::GetViewFont (const ::rtl::OUString& rsViewURL) const
{
@@ -498,81 +468,52 @@ PresenterTheme::SharedFontDescriptor
return PresenterTheme::SharedFontDescriptor();
}
-
-
-
::boost::shared_ptr<PresenterTheme> PresenterController::GetTheme (void) const
{
return mpTheme;
}
-
-
-
::rtl::Reference<PresenterWindowManager> PresenterController::GetWindowManager (void) const
{
return mpWindowManager;
}
-
-
-
Reference<presentation::XSlideShowController>
PresenterController::GetSlideShowController(void) const
{
return mxSlideShowController;
}
-
-
-
rtl::Reference<PresenterPaneContainer> PresenterController::GetPaneContainer (void) const
{
return mpPaneContainer;
}
-
-
-
::rtl::Reference<PresenterPaneBorderPainter> PresenterController::GetPaneBorderPainter (void) const
{
return mpPaneBorderPainter;
}
-
-
-
::boost::shared_ptr<PresenterAnimator> PresenterController::GetAnimator (void) const
{
return mpAnimator;
}
-
-
-
::boost::shared_ptr<PresenterCanvasHelper> PresenterController::GetCanvasHelper (void) const
{
return mpCanvasHelper;
}
-
-
-
Reference<drawing::XPresenterHelper> PresenterController::GetPresenterHelper (void) const
{
return mxPresenterHelper;
}
-
-
-
::boost::shared_ptr<PresenterPaintManager> PresenterController::GetPaintManager (void) const
{
return mpPaintManager;
}
-
-
void PresenterController::ShowView (const OUString& rsViewURL)
{
PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
@@ -592,9 +533,6 @@ void PresenterController::ShowView (const OUString& rsViewURL)
}
}
-
-
-
void PresenterController::HideView (const OUString& rsViewURL)
{
PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
@@ -609,9 +547,6 @@ void PresenterController::HideView (const OUString& rsViewURL)
}
}
-
-
-
void PresenterController::DispatchUnoCommand (const OUString& rsCommand) const
{
if ( ! mxUrlTransformer.is())
@@ -628,9 +563,6 @@ void PresenterController::DispatchUnoCommand (const OUString& rsCommand) const
xDispatch->dispatch(aURL, Sequence<beans::PropertyValue>());
}
-
-
-
Reference<css::frame::XDispatch> PresenterController::GetDispatch (const util::URL& rURL) const
{
if ( ! mxController.is())
@@ -646,9 +578,6 @@ Reference<css::frame::XDispatch> PresenterController::GetDispatch (const util::U
frame::FrameSearchFlag::SELF);
}
-
-
-
util::URL PresenterController::CreateURLFromString (const ::rtl::OUString& rsURL) const
{
util::URL aURL;
@@ -662,26 +591,17 @@ util::URL PresenterController::CreateURLFromString (const ::rtl::OUString& rsURL
return aURL;
}
-
-
-
Reference<drawing::framework::XConfigurationController>
PresenterController::GetConfigurationController (void) const
{
return mxConfigurationController;
}
-
-
-
Reference<drawing::XDrawPage> PresenterController::GetCurrentSlide (void) const
{
return mxCurrentSlide;
}
-
-
-
void PresenterController::SetAccessibilityActiveState (const bool bIsActive)
{
if ( mbIsAccessibilityActive != bIsActive)
@@ -691,17 +611,11 @@ void PresenterController::SetAccessibilityActiveState (const bool bIsActive)
}
}
-
-
-
bool PresenterController::IsAccessibilityActive (void) const
{
return mbIsAccessibilityActive;
}
-
-
-
void PresenterController::HandleMouseClick (const awt::MouseEvent& rEvent)
{
if (mxSlideShowController.is())
@@ -726,9 +640,6 @@ void PresenterController::HandleMouseClick (const awt::MouseEvent& rEvent)
}
}
-
-
-
void PresenterController::RequestViews (
const bool bIsSlideSorterActive,
const bool bIsNotesViewActive,
@@ -769,9 +680,6 @@ void PresenterController::RequestViews (
}
}
-
-
-
//----- XConfigurationChangeListener ------------------------------------------
void SAL_CALL PresenterController::notifyConfigurationChange (
@@ -855,9 +763,6 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
}
}
-
-
-
//----- XEventListener --------------------------------------------------------
void SAL_CALL PresenterController::disposing (
@@ -874,9 +779,6 @@ void SAL_CALL PresenterController::disposing (
mxMainWindow = NULL;
}
-
-
-
//----- XFrameActionListener --------------------------------------------------
void SAL_CALL PresenterController::frameAction (
@@ -890,9 +792,6 @@ void SAL_CALL PresenterController::frameAction (
}
}
-
-
-
//----- XKeyListener ----------------------------------------------------------
void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent)
@@ -911,9 +810,6 @@ void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent)
}
}
-
-
-
void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
throw (RuntimeException)
{
@@ -1070,9 +966,6 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
}
}
-
-
-
void PresenterController::HandleNumericKeyPress (
const sal_Int32 nKey,
const sal_Int32 nModifiers)
@@ -1113,9 +1006,6 @@ void PresenterController::HandleNumericKeyPress (
}
}
-
-
-
//----- XFocusListener --------------------------------------------------------
void SAL_CALL PresenterController::focusGained (const css::awt::FocusEvent& rEvent)
@@ -1124,18 +1014,12 @@ void SAL_CALL PresenterController::focusGained (const css::awt::FocusEvent& rEve
(void)rEvent;
}
-
-
-
void SAL_CALL PresenterController::focusLost (const css::awt::FocusEvent& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
//----- XMouseListener --------------------------------------------------------
void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEvent)
@@ -1146,36 +1030,24 @@ void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEv
mxMainWindow->setFocus();
}
-
-
-
void SAL_CALL PresenterController::mouseReleased (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
void SAL_CALL PresenterController::mouseEntered (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
//----- XMouseMotionListener --------------------------------------------------
void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent& rEvent)
@@ -1184,18 +1056,12 @@ void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent& rEven
(void)rEvent;
}
-
-
-
void SAL_CALL PresenterController::mouseDragged (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
//-----------------------------------------------------------------------------
void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane)
@@ -1241,9 +1107,6 @@ void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane)
UpdateCurrentSlide(0);
}
-
-
-
void PresenterController::LoadTheme (const Reference<XPane>& rxPane)
{
// Create (load) the current theme.
@@ -1251,9 +1114,6 @@ void PresenterController::LoadTheme (const Reference<XPane>& rxPane)
mpTheme.reset(new PresenterTheme(mxComponentContext, OUString(), rxPane->getCanvas()));
}
-
-
-
double PresenterController::GetSlideAspectRatio (void) const
{
double nSlideAspectRatio (28.0/21.0);
@@ -1287,9 +1147,6 @@ double PresenterController::GetSlideAspectRatio (void) const
return nSlideAspectRatio;
}
-
-
-
void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlideNumber)
{
mnPendingSlideNumber = nPendingSlideNumber;
@@ -1318,9 +1175,6 @@ void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlid
0));
}
-
-
-
void PresenterController::ThrowIfDisposed (void) const
throw (::com::sun::star::lang::DisposedException)
{
@@ -1346,7 +1200,6 @@ void PresenterController::SwitchMonitors (void)
pScreen->SwitchMonitors();
}
-
} } // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index c9f1f16..196adb6 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -84,7 +84,6 @@ namespace {
> PresenterControllerInterfaceBase;
}
-
/** The controller of the presenter screen is responsible for telling the
individual views which slides to show. Additionally it provides access
to frequently used values of the current theme.
@@ -156,21 +155,18 @@ public:
const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent)
throw (com::sun::star::uno::RuntimeException);
-
// XEventListener
virtual void SAL_CALL disposing (
const com::sun::star::lang::EventObject& rEvent)
throw (com::sun::star::uno::RuntimeException);
-
// XFrameActionListener
virtual void SAL_CALL frameAction (
const css::frame::FrameActionEvent& rEvent)
throw (com::sun::star::uno::RuntimeException);
-
// XKeyListener
virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent)
@@ -178,7 +174,6 @@ public:
virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent)
throw (css::uno::RuntimeException);
-
// XFocusListener
virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent)
@@ -186,7 +181,6 @@ public:
virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
throw (css::uno::RuntimeException);
-
// XMouseListener
virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
@@ -201,7 +195,6 @@ public:
virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException);
-
// XMouseMotionListener
virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
@@ -264,7 +257,6 @@ private:
void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException);
};
-
} } // end of namespace ::sdext::presenter
#endif
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index 1226fe7..8405d28 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterCurrentSlideObserver.hxx"
using namespace ::com::sun::star;
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index babaadf..589e86b 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterFrameworkObserver.hxx"
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <boost/bind.hpp>
@@ -74,16 +73,10 @@ PresenterFrameworkObserver::PresenterFrameworkObserver (
}
}
-
-
-
PresenterFrameworkObserver::~PresenterFrameworkObserver (void)
{
}
-
-
-
void PresenterFrameworkObserver::RunOnUpdateEnd (
const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
const Action& rAction)
@@ -119,9 +112,6 @@ void PresenterFrameworkObserver::Shutdown (void)
}
}
-
-
-
void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rEvent)
throw (RuntimeException)
{
@@ -136,9 +126,6 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE
}
}
-
-
-
void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange (
const ConfigurationChangeEvent& rEvent)
throw (RuntimeException)
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index f0062b8..34af9ab 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -40,7 +40,6 @@ namespace css = ::com::sun::star;
namespace sdext { namespace presenter {
-
typedef ::cppu::WeakComponentImplHelper1 <
::com::sun::star::drawing::framework::XConfigurationChangeListener
> PresenterFrameworkObserverInterfaceBase;
@@ -99,7 +98,6 @@ private:
static bool True (void);
};
-
} } // end of namespace ::sdext::presenter
#endif
diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx
index 02c2887..af75dee 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.cxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterGeometryHelper.hxx"
#include <math.h>
@@ -57,11 +56,8 @@ sal_Int32 Height (const sal_Int32 nTop, const sal_Int32 nBottom)
return nBottom - nTop + 1;
}
-
} // end of anonymous namespace
-
-
namespace sdext { namespace presenter {
sal_Int32 PresenterGeometryHelper::Floor (const double nValue)
@@ -69,25 +65,16 @@ sal_Int32 PresenterGeometryHelper::Floor (const double nValue)
return sal::static_int_cast<sal_Int32>(floor(nValue));
}
-
-
-
sal_Int32 PresenterGeometryHelper::Ceil (const double nValue)
{
return sal::static_int_cast<sal_Int32>(ceil(nValue));
}
-
-
-
sal_Int32 PresenterGeometryHelper::Round (const double nValue)
{
return sal::static_int_cast<sal_Int32>(floor(0.5 + nValue));
}
-
-
-
awt::Rectangle PresenterGeometryHelper::ConvertRectangle (
const geometry::RealRectangle2D& rBox)
{
@@ -98,9 +85,6 @@ awt::Rectangle PresenterGeometryHelper::ConvertRectangle (
return awt::Rectangle (nLeft,nTop,nRight-nLeft,nBottom-nTop);
}
-
-
-
awt::Rectangle PresenterGeometryHelper::ConvertRectangleWithConstantSize (
const geometry::RealRectangle2D& rBox)
{
@@ -111,9 +95,6 @@ awt::Rectangle PresenterGeometryHelper::ConvertRectangleWithConstantSize (
Round(rBox.Y2 - rBox.Y1));
}
-
-
-
geometry::RealRectangle2D PresenterGeometryHelper::ConvertRectangle (
const css::awt::Rectangle& rBox)
{
@@ -124,9 +105,6 @@ geometry::RealRectangle2D PresenterGeometryHelper::ConvertRectangle (
rBox.Y + rBox.Height);
}
-
-
-
awt::Rectangle PresenterGeometryHelper::TranslateRectangle (
const css::awt::Rectangle& rBox,
const sal_Int32 nXOffset,
@@ -135,9 +113,6 @@ awt::Rectangle PresenterGeometryHelper::TranslateRectangle (
return awt::Rectangle(rBox.X + nXOffset, rBox.Y + nYOffset, rBox.Width, rBox.Height);
}
-
-
-
awt::Rectangle PresenterGeometryHelper::Intersection (
const css::awt::Rectangle& rBox1,
const css::awt::Rectangle& rBox2)
@@ -152,9 +127,6 @@ awt::Rectangle PresenterGeometryHelper::Intersection (
return awt::Rectangle(nLeft,nTop, Width(nLeft,nRight), Height(nTop,nBottom));
}
-
-
-
geometry::RealRectangle2D PresenterGeometryHelper::Intersection (
const geometry::RealRectangle2D& rBox1,
const geometry::RealRectangle2D& rBox2)
@@ -169,9 +141,6 @@ geometry::RealRectangle2D PresenterGeometryHelper::Intersection (
return geometry::RealRectangle2D(nLeft,nTop, nRight, nBottom);
}
-
-
-
bool PresenterGeometryHelper::IsInside (
const css::geometry::RealRectangle2D& rBox,
const css::geometry::RealPoint2D& rPoint)
@@ -182,9 +151,6 @@ bool PresenterGeometryHelper::IsInside (
&& rBox.Y2 >= rPoint.Y;
}
-
-
-
bool PresenterGeometryHelper::IsInside (
const css::awt::Rectangle& rBox1,
const css::awt::Rectangle& rBox2)
@@ -195,9 +161,6 @@ bool PresenterGeometryHelper::IsInside (
&& rBox1.Y+rBox1.Height <= rBox2.Y+rBox2.Height;
}
-
-
-
awt::Rectangle PresenterGeometryHelper::Union (
const css::awt::Rectangle& rBox1,
const css::awt::Rectangle& rBox2)
@@ -217,9 +180,6 @@ awt::Rectangle PresenterGeometryHelper::Union (
return awt::Rectangle(nLeft,nTop, Width(nLeft,nRight), Height(nTop,nBottom));
}
-
-
-
geometry::RealRectangle2D PresenterGeometryHelper::Union (
const geometry::RealRectangle2D& rBox1,
const geometry::RealRectangle2D& rBox2)
@@ -234,9 +194,6 @@ geometry::RealRectangle2D PresenterGeometryHelper::Union (
return geometry::RealRectangle2D(nLeft,nTop, nRight, nBottom);
}
-
-
-
bool PresenterGeometryHelper::AreRectanglesDisjoint (
const css::awt::Rectangle& rBox1,
const css::awt::Rectangle& rBox2)
@@ -247,9 +204,6 @@ bool PresenterGeometryHelper::AreRectanglesDisjoint (
|| rBox1.Y >= rBox2.Y+rBox2.Height;
}
-
-
-
Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
const awt::Rectangle& rBox,
const Reference<rendering::XGraphicDevice>& rxDevice)
@@ -272,9 +226,6 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
return xRectangle;
}
-
-
-
Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
const geometry::RealRectangle2D& rBox,
const Reference<rendering::XGraphicDevice>& rxDevice)
@@ -297,9 +248,6 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
return xRectangle;
}
-
-
-
Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
const ::std::vector<css::awt::Rectangle>& rBoxes,
const Reference<rendering::XGraphicDevice>& rxDevice)
@@ -329,7 +277,6 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
return xRectangle;
}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 253f39a..c7ca5c4 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterHelpView.hxx"
#include "PresenterButton.hxx"
#include "PresenterCanvasHelper.hxx"
@@ -52,7 +51,6 @@ using ::std::vector;
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
namespace sdext { namespace presenter {
namespace {
@@ -130,7 +128,6 @@ class PresenterHelpView::TextContainer : public vector<boost::shared_ptr<Block>
{
};
-
PresenterHelpView::PresenterHelpView (
const Reference<uno::XComponentContext>& rxContext,
const Reference<XResourceId>& rxViewId,
@@ -196,16 +193,10 @@ PresenterHelpView::PresenterHelpView (
}
}
-
-
-
PresenterHelpView::~PresenterHelpView (void)
{
}
-
-
-
void SAL_CALL PresenterHelpView::disposing (void)
{
mxViewId = NULL;
@@ -226,9 +217,6 @@ void SAL_CALL PresenterHelpView::disposing (void)
}
}
-
-
-
//----- lang::XEventListener --------------------------------------------------
void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObject)
@@ -245,9 +233,6 @@ void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObjec
}
}
-
-
-
//----- XWindowListener -------------------------------------------------------
void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent)
@@ -258,9 +243,6 @@ void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent)
Resize();
}
-
-
-
void SAL_CALL PresenterHelpView::windowMoved (const awt::WindowEvent& rEvent)
throw (uno::RuntimeException)
{
@@ -268,9 +250,6 @@ void SAL_CALL PresenterHelpView::windowMoved (const awt::WindowEvent& rEvent)
ThrowIfDisposed();
}
-
-
-
void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent)
throw (uno::RuntimeException)
{
@@ -279,9 +258,6 @@ void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent)
Resize();
}
-
-
-
void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent)
throw (uno::RuntimeException)
{
@@ -289,9 +265,6 @@ void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent)
ThrowIfDisposed();
}
-
-
-
//----- XPaintListener --------------------------------------------------------
void SAL_CALL PresenterHelpView::windowPaint (const css::awt::PaintEvent& rEvent)
@@ -300,9 +273,6 @@ void SAL_CALL PresenterHelpView::windowPaint (const css::awt::PaintEvent& rEvent
Paint(rEvent.UpdateRect);
}
-
-
-
void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox)
{
ProvideCanvas();
@@ -380,9 +350,6 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox)
xSpriteCanvas->updateScreen(sal_False);
}
-
-
-
void PresenterHelpView::ReadHelpStrings (void)
{
mpTextContainer.reset(new TextContainer());
@@ -398,9 +365,6 @@ void PresenterHelpView::ReadHelpStrings (void)
::boost::bind(&PresenterHelpView::ProcessString, this, _2));
}
-
-
-
void PresenterHelpView::ProcessString (
const Reference<beans::XPropertySet>& rsProperties)
{
@@ -418,9 +382,6 @@ void PresenterHelpView::ProcessString (
new Block(sLeftText, sRightText, mpFont->mxFont, mnMaximalWidth)));
}
-
-
-
void PresenterHelpView::CheckFontSize (void)
{
if (mpFont.get() == NULL)
@@ -491,9 +452,6 @@ void PresenterHelpView::CheckFontSize (void)
}
}
-
-
-
//----- XResourceId -----------------------------------------------------------
Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId (void)
@@ -503,18 +461,12 @@ Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId (void)
return mxViewId;
}
-
-
-
sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly (void)
throw (RuntimeException)
{
return false;
}
-
-
-
//-----------------------------------------------------------------------------
void PresenterHelpView::ProvideCanvas (void)
@@ -533,9 +485,6 @@ void PresenterHelpView::ProvideCanvas (void)
}
}
-
-
-
void PresenterHelpView::Resize (void)
{
if (mpCloseButton.get() != NULL && mxWindow.is())
@@ -555,9 +504,6 @@ void PresenterHelpView::Resize (void)
}
}
-
-
-
void PresenterHelpView::ThrowIfDisposed (void)
throw (lang::DisposedException)
{
@@ -570,9 +516,6 @@ void PresenterHelpView::ThrowIfDisposed (void)
}
}
-
-
-
//===== LineDescritor =========================================================
namespace {
@@ -584,9 +527,6 @@ LineDescriptor::LineDescriptor (void)
{
}
-
-
-
void LineDescriptor::AddPart (
const OUString& rsLine,
const css::uno::Reference<css::rendering::XCanvasFont>& rxFont)
@@ -596,17 +536,11 @@ void LineDescriptor::AddPart (
CalculateSize(rxFont);
}
-
-
-
bool LineDescriptor::IsEmpty (void) const
{
return msLine.isEmpty();
}
-
-
-
void LineDescriptor::CalculateSize (
const css::uno::Reference<css::rendering::XCanvasFont>& rxFont)
{
@@ -622,9 +556,6 @@ void LineDescriptor::CalculateSize (
} // end of anonymous namespace
-
-
-
//===== LineDescriptorList ====================================================
namespace {
@@ -638,9 +569,6 @@ LineDescriptorList::LineDescriptorList (
Update(rxFont, nMaximalWidth);
}
-
-
-
double LineDescriptorList::Paint(
const Reference<rendering::XCanvas>& rxCanvas,
const geometry::RealRectangle2D& rBBox,
@@ -678,9 +606,6 @@ double LineDescriptorList::Paint(
return nY - rBBox.Y1;
}
-
-
-
double LineDescriptorList::GetHeight (void) const
{
double nHeight (0);
@@ -692,9 +617,6 @@ double LineDescriptorList::GetHeight (void) const
return nHeight;
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list