summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorFelix Zhang <fezhang@suse.com>2011-10-24 17:50:01 +0800
committerJan Holesovsky <kendy@suse.cz>2011-10-25 11:12:54 +0200
commita38cbc58bbe3b385830a5287ea272e28a8ae3652 (patch)
tree0dc304166274847acf6b95755a4c4e0ac6d3e887 /sdext
parent605369eec7236f36c73ede5fdb8cba478db0e291 (diff)
remove unused methods from sdext:presenter
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx8
-rw-r--r--sdext/source/presenter/PresenterAccessibility.hxx5
-rw-r--r--sdext/source/presenter/PresenterAnimation.cxx10
-rw-r--r--sdext/source/presenter/PresenterAnimation.hxx5
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx56
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.hxx20
-rw-r--r--sdext/source/presenter/PresenterController.cxx26
-rw-r--r--sdext/source/presenter/PresenterController.hxx2
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.cxx15
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.hxx15
-rw-r--r--sdext/source/presenter/PresenterPaneAnimator.cxx48
-rw-r--r--sdext/source/presenter/PresenterPaneAnimator.hxx21
-rw-r--r--sdext/source/presenter/PresenterPaneBase.cxx13
-rw-r--r--sdext/source/presenter/PresenterPaneBase.hxx2
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.cxx8
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.hxx2
-rw-r--r--sdext/source/presenter/PresenterScrollBar.cxx8
-rw-r--r--sdext/source/presenter/PresenterScrollBar.hxx2
-rw-r--r--sdext/source/presenter/PresenterSprite.cxx32
-rw-r--r--sdext/source/presenter/PresenterSprite.hxx4
-rw-r--r--sdext/source/presenter/PresenterTextView.cxx35
-rw-r--r--sdext/source/presenter/PresenterTextView.hxx4
-rw-r--r--sdext/source/presenter/PresenterTheme.cxx18
-rw-r--r--sdext/source/presenter/PresenterTheme.hxx4
-rw-r--r--sdext/source/presenter/PresenterTimer.cxx18
-rw-r--r--sdext/source/presenter/PresenterTimer.hxx5
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx90
-rw-r--r--sdext/source/presenter/PresenterToolBar.hxx7
-rw-r--r--sdext/source/presenter/PresenterWindowManager.cxx152
-rw-r--r--sdext/source/presenter/PresenterWindowManager.hxx1
30 files changed, 0 insertions, 636 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 35c17c0da0bd..a614fbcba205 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -789,14 +789,6 @@ void PresenterAccessible::NotifyCurrentSlideChange (
-bool PresenterAccessible::IsAccessibilityActive (void) const
-{
- return mpAccessibleConsole.is();
-}
-
-
-
-
void SAL_CALL PresenterAccessible::disposing (void)
{
UpdateAccessibilityHierarchy(
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index 16e19abc1695..9868db5a35cc 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -85,11 +85,6 @@ public:
const sal_Int32 nCurrentSlideIndex,
const sal_Int32 nSlideCount);
- /** Return whether accessibility support is active, i.e. whether
- somebody has called getAccessibleContext() yet.
- */
- bool IsAccessibilityActive (void) const;
-
virtual void SAL_CALL disposing (void);
diff --git a/sdext/source/presenter/PresenterAnimation.cxx b/sdext/source/presenter/PresenterAnimation.cxx
index 0be27e813b38..40b321b26dcc 100644
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ b/sdext/source/presenter/PresenterAnimation.cxx
@@ -93,16 +93,6 @@ sal_uInt64 PresenterAnimation::GetStepDuration (void)
-void PresenterAnimation::AddStartCallback (const Callback& rCallback)
-{
- if (mpStartCallbacks.get() == NULL)
- mpStartCallbacks.reset(new ::std::vector<Callback>());
- mpStartCallbacks->push_back(rCallback);
-}
-
-
-
-
void PresenterAnimation::AddEndCallback (const Callback& rCallback)
{
if (mpEndCallbacks.get() == NULL)
diff --git a/sdext/source/presenter/PresenterAnimation.hxx b/sdext/source/presenter/PresenterAnimation.hxx
index 76d102a20758..20819b514e70 100644
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ b/sdext/source/presenter/PresenterAnimation.hxx
@@ -83,11 +83,6 @@ public:
typedef ::boost::function<void(void)> Callback;
- /** Add a callback that is executed before Run() is called for the first
- time.
- */
- void AddStartCallback (const Callback& rCallback);
-
/** Add a callback that is executed after Run() is called for the last
time.
*/
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index acba65b233a9..c47e3a5f7f30 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -128,17 +128,6 @@ Any PresenterConfigurationAccess::GetConfigurationNode (const OUString& sPathToN
-Reference<beans::XPropertySet> PresenterConfigurationAccess::GetNodeProperties (
- const OUString& sPathToNode)
-{
- return GetNodeProperties(
- Reference<container::XHierarchicalNameAccess>(mxRoot, UNO_QUERY),
- sPathToNode);
-}
-
-
-
-
bool PresenterConfigurationAccess::GoToChild (const ::rtl::OUString& rsPathToNode)
{
if ( ! IsValid())
@@ -241,22 +230,6 @@ void PresenterConfigurationAccess::CommitChanges (void)
-Any PresenterConfigurationAccess::GetValue (const rtl::OUString& sKey)
-{
- Reference<container::XNameAccess> xAccess (GetConfigurationNode(sKey), UNO_QUERY);
- if (xAccess.is())
- {
- return xAccess->getByName(sKey);
- }
- else
- {
- return Any();
- }
-}
-
-
-
-
void PresenterConfigurationAccess::ForAll (
const Reference<container::XNameAccess>& rxContainer,
const ::std::vector<OUString>& rArguments,
@@ -316,35 +289,6 @@ void PresenterConfigurationAccess::ForAll (
-void PresenterConfigurationAccess::FillList(
- const Reference<container::XNameAccess>& rxContainer,
- const ::rtl::OUString& rsArgument,
- ::std::vector<OUString>& rList)
-{
- try
- {
- if (rxContainer.is())
- {
- Sequence<OUString> aKeys (rxContainer->getElementNames());
- rList.resize(aKeys.getLength());
- for (sal_Int32 nItemIndex=0; nItemIndex<aKeys.getLength(); ++nItemIndex)
- {
- Reference<container::XNameAccess> xSetItem (
- rxContainer->getByName(aKeys[nItemIndex]), UNO_QUERY);
- if (xSetItem.is())
- {
- xSetItem->getByName(rsArgument) >>= rList[nItemIndex];
- }
- }
- }
- }
- catch (RuntimeException&)
- {}
-}
-
-
-
-
Any PresenterConfigurationAccess::Find (
const Reference<container::XNameAccess>& rxContainer,
const Predicate& rPredicate)
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx
index 81f1130e696b..e00b17892f8e 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.hxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx
@@ -86,8 +86,6 @@ public:
*/
css::uno::Any GetConfigurationNode (
const ::rtl::OUString& rsPathToNode);
- css::uno::Reference<css::beans::XPropertySet> GetNodeProperties (
- const ::rtl::OUString& rsPathToNode);
/** Return <TRUE/> when opening the configuration (via creating a new
PresenterConfigurationAccess object) or previous calls to
@@ -134,8 +132,6 @@ public:
*/
void CommitChanges (void);
- css::uno::Any GetValue (const rtl::OUString& sKey);
-
typedef ::boost::function<void(
const ::rtl::OUString&,
const ::std::vector<css::uno::Any>&) > ItemProcessor;
@@ -163,22 +159,6 @@ public:
const css::uno::Reference<css::container::XNameAccess>& rxContainer,
const PropertySetProcessor& rProcessor);
- /** Fill a list with the string contents of all sub-elements in the given container.
- @param rxContainer
- The container is a XNameAccess to a list of the configuration.
- This can be a node returned by GetConfigurationNode().
- @param rsArgument
- This specifies which string children of the elements in the
- container are to be inserted into the list. The specified child
- has to be of type string.
- @param rList
- The list to be filled.
- */
- static void FillList(
- const css::uno::Reference<css::container::XNameAccess>& rxContainer,
- const ::rtl::OUString& rsArgument,
- ::std::vector<rtl::OUString>& rList);
-
static css::uno::Any Find (
const css::uno::Reference<css::container::XNameAccess>& rxContainer,
const Predicate& rPredicate);
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index d37f0d966db8..f54016d160ce 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -627,24 +627,6 @@ void PresenterController::HideView (const OUString& rsViewURL)
-bool PresenterController::IsViewVisible (const OUString& rsViewURL) const
-{
- PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
- mpPaneContainer->FindViewURL(rsViewURL));
- if (pDescriptor.get() != NULL)
- {
- return mxConfigurationController->getResource(
- ResourceId::createWithAnchor(
- mxComponentContext,
- rsViewURL,
- pDescriptor->mxPaneId)).is();
- }
- return false;
-}
-
-
-
-
void PresenterController::DispatchUnoCommand (const OUString& rsCommand) const
{
if ( ! mxUrlTransformer.is())
@@ -715,14 +697,6 @@ Reference<drawing::XDrawPage> PresenterController::GetCurrentSlide (void) const
-::rtl::Reference<PresenterAccessible> PresenterController::GetAccessible (void) const
-{
- return mpAccessibleObject;
-}
-
-
-
-
void PresenterController::SetAccessibilityActiveState (const bool bIsActive)
{
if ( mbIsAccessibilityActive != bIsActive)
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index b0fe117a47b0..895df7ab7a66 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -126,7 +126,6 @@ public:
double GetSlideAspectRatio (void) const;
void ShowView (const ::rtl::OUString& rsViewURL);
void HideView (const ::rtl::OUString& rsViewURL);
- bool IsViewVisible (const ::rtl::OUString& rsViewURL) const;
void DispatchUnoCommand (const ::rtl::OUString& rsCommand) const;
css::uno::Reference<css::frame::XDispatch> GetDispatch (
const css::util::URL& rURL) const;
@@ -134,7 +133,6 @@ public:
css::uno::Reference<css::drawing::framework::XConfigurationController>
GetConfigurationController (void) const;
css::uno::Reference<css::drawing::XDrawPage> GetCurrentSlide (void) const;
- ::rtl::Reference<PresenterAccessible> GetAccessible (void) const;
void SetAccessibilityActiveState (const bool bIsActive);
bool IsAccessibilityActive (void) const;
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 3142d7606fb2..747da91a9e83 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -86,21 +86,6 @@ PresenterFrameworkObserver::~PresenterFrameworkObserver (void)
-void PresenterFrameworkObserver::RunOnResourceActivation (
- const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId,
- const Action& rAction)
-{
- new PresenterFrameworkObserver(
- rxController,
- A2S("ResourceActivation"),
- ::boost::bind(&PresenterFrameworkObserver::HasResource, rxController, rxResourceId),
- rAction);
-}
-
-
-
-
void PresenterFrameworkObserver::RunOnUpdateEnd (
const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
const Action& rAction)
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index 422055830d6e..3612f5471a8e 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -57,21 +57,6 @@ public:
typedef ::boost::function<bool(void)> Predicate;
typedef ::boost::function<void(bool)> Action;
- /** Register an action callback to be run when the specified resource is
- activated. The action may be called synchronously when the resource
- is already active or asynchronously when the resource is actived in
- the future.
- @param rxController
- The controller gives access to the drawing framework.
- @param rxResourceId
- The id of the resource to watch for activation.
- @param rAction
- The callback that is called when the resource is activated.
- */
- static void RunOnResourceActivation (
- const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId,
- const Action& rAction);
static void RunOnUpdateEnd (
const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
const Action& rAction);
diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx b/sdext/source/presenter/PresenterPaneAnimator.cxx
index dc1c0f5df1cc..868693847d5e 100644
--- a/sdext/source/presenter/PresenterPaneAnimator.cxx
+++ b/sdext/source/presenter/PresenterPaneAnimator.cxx
@@ -269,54 +269,6 @@ namespace {
-//=============================================================================
-
-
-::boost::shared_ptr<PresenterPaneAnimator> CreateUnfoldInCenterAnimator (
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
- const ::rtl::Reference<PresenterController>& rpPresenterController,
- const bool bAnimate,
- const EndActions& rShowEndActions,
- const EndActions& rEndEndActions)
-{
- return ::boost::shared_ptr<PresenterPaneAnimator>(
- new UnfoldInCenterAnimator(rxPaneId, rpPresenterController, bAnimate,
- rShowEndActions, rEndEndActions));
-}
-
-
-
-
-::boost::shared_ptr<PresenterPaneAnimator> CreateMoveInFromBottomAnimator (
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
- const ::rtl::Reference<PresenterController>& rpPresenterController,
- const bool bAnimate,
- const EndActions& rShowEndActions,
- const EndActions& rEndEndActions)
-{
- return ::boost::shared_ptr<PresenterPaneAnimator>(
- new MoveInFromBottomAnimator(rxPaneId, rpPresenterController, bAnimate,
- rShowEndActions, rEndEndActions));
-}
-
-
-
-
-::boost::shared_ptr<PresenterPaneAnimator> CreateTransparentOverlay (
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
- const ::rtl::Reference<PresenterController>& rpPresenterController,
- const bool bAnimate,
- const EndActions& rShowEndActions,
- const EndActions& rEndEndActions)
-{
- return ::boost::shared_ptr<PresenterPaneAnimator>(
- new TransparentOverlayAnimator(rxPaneId, rpPresenterController, bAnimate,
- rShowEndActions, rEndEndActions));
-}
-
-
-
-
//===== PresenterPaneAnimator =================================================
namespace {
diff --git a/sdext/source/presenter/PresenterPaneAnimator.hxx b/sdext/source/presenter/PresenterPaneAnimator.hxx
index 1e044b4a647b..6d3ab9ea44ee 100644
--- a/sdext/source/presenter/PresenterPaneAnimator.hxx
+++ b/sdext/source/presenter/PresenterPaneAnimator.hxx
@@ -69,27 +69,6 @@ protected:
typedef ::std::vector< ::boost::function<void()> > EndActions;
-::boost::shared_ptr<PresenterPaneAnimator> CreateUnfoldInCenterAnimator (
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
- const ::rtl::Reference<PresenterController>& rpPresenterController,
- const bool bAnimate,
- const EndActions& rShowEndActions,
- const EndActions& rEndEndActions);
-
-::boost::shared_ptr<PresenterPaneAnimator> CreateMoveInFromBottomAnimator (
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
- const ::rtl::Reference<PresenterController>& rpPresenterController,
- const bool bAnimate,
- const EndActions& rShowEndActions,
- const EndActions& rEndEndActions);
-
-::boost::shared_ptr<PresenterPaneAnimator> CreateTransparentOverlay (
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
- const ::rtl::Reference<PresenterController>& rpPresenterController,
- const bool bAnimate,
- const EndActions& rShowEndActions,
- const EndActions& rEndEndActions);
-
} }
#endif
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 39283673c23d..9ab561d3ca57 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -198,19 +198,6 @@ awt::Point PresenterPaneBase::GetCalloutAnchor (void) const
-::boost::shared_ptr<PresenterTextView> PresenterPaneBase::GetTextViewForTitle (void)
-{
- ::boost::shared_ptr<PresenterTextView> pTextView(
- new PresenterTextView(
- mxComponentContext,
- mxBorderCanvas));
- pTextView->SetText(msTitle);
- return pTextView;
-}
-
-
-
-
//----- XInitialization -------------------------------------------------------
void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 16ea4e515299..3b3662393872 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -93,8 +93,6 @@ public:
void SetCalloutAnchor (const css::awt::Point& rAnchorPosition);
css::awt::Point GetCalloutAnchor (void) const;
- ::boost::shared_ptr<PresenterTextView> GetTextViewForTitle (void);
-
// XInitialization
virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 7a27dda1806b..aa63fc2f75dc 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -388,14 +388,6 @@ bool PresenterPaneBorderPainter::ProvideTheme (void)
-bool PresenterPaneBorderPainter::HasTheme (void) const
-{
- return mpTheme.get()!=NULL && mpRenderer.get()!=NULL;
-}
-
-
-
-
void PresenterPaneBorderPainter::SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme)
{
mpTheme = rpTheme;
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index 0084d567e478..d46b2259901a 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -99,8 +99,6 @@ public:
const css::awt::Rectangle& rOuterBox,
const css::drawing::framework::BorderType eBorderType) const;
- bool HasTheme (void) const;
-
void SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme);
class Renderer;
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index 7b78acaed7aa..2efa0523d0b5 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -271,14 +271,6 @@ void PresenterScrollBar::SetTotalSize (const double nTotalSize)
-double PresenterScrollBar::GetTotalSize (void) const
-{
- return mnTotalSize;
-}
-
-
-
-
void PresenterScrollBar::SetThumbSize (const double nThumbSize)
{
OSL_ASSERT(nThumbSize>=0);
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index bd2462387078..6fdaeda8acab 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -91,8 +91,6 @@ public:
*/
void SetTotalSize (const double nTotalSize);
- double GetTotalSize (void) const;
-
/** Set the size of the movable thumb.
@param nThumbSize
A value not larger than the last value given to SetTotalSize().
diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx
index 467fb5830dd5..9d05a37b74a6 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -121,14 +121,6 @@ void PresenterSprite::Hide (void)
-bool PresenterSprite::IsVisible (void) const
-{
- return mbIsVisible;
-}
-
-
-
-
void PresenterSprite::SetPriority (const double nPriority)
{
mnPriority = nPriority;
@@ -139,14 +131,6 @@ void PresenterSprite::SetPriority (const double nPriority)
-double PresenterSprite::GetPriority (void) const
-{
- return mnPriority;
-}
-
-
-
-
void PresenterSprite::Resize (const css::geometry::RealSize2D& rSize)
{
maSize = rSize;
@@ -205,14 +189,6 @@ void PresenterSprite::Transform (const css::geometry::AffineMatrix2D& rTransform
-css::geometry::AffineMatrix2D PresenterSprite::GetTransform (void) const
-{
- return maTransform;
-}
-
-
-
-
void PresenterSprite::SetAlpha (const double nAlpha)
{
mnAlpha = nAlpha;
@@ -223,14 +199,6 @@ void PresenterSprite::SetAlpha (const double nAlpha)
-double PresenterSprite::GetAlpha (void) const
-{
- return mnAlpha;
-}
-
-
-
-
void PresenterSprite::Update (void)
{
if (mxSpriteFactory.is())
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx
index e6be8e46ebad..c55d4dba42da 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -62,10 +62,8 @@ public:
void Show (void);
void Hide (void);
- bool IsVisible (void) const;
void SetPriority (const double nPriority);
- double GetPriority (void) const;
void Resize (const css::geometry::RealSize2D& rSize);
css::geometry::RealSize2D GetSize (void) const;
@@ -74,10 +72,8 @@ public:
css::geometry::RealPoint2D GetLocation (void) const;
void Transform (const css::geometry::AffineMatrix2D& rTransform);
- css::geometry::AffineMatrix2D GetTransform (void) const;
void SetAlpha (const double nAlpha);
- double GetAlpha (void) const;
void Update (void);
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index 1fe02450cf9b..2b9dd6513b86 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -523,17 +523,6 @@ SharedPresenterTextCaret PresenterTextView::GetCaret (void) const
-sal_Int32 PresenterTextView::GetCharacterOffset (const sal_Int32 nParagraphIndex) const
-{
- sal_Int32 nCharacterOffset (0);
- for (sal_Int32 nIndex=0; nIndex<nParagraphIndex; ++nIndex)
- nCharacterOffset += maParagraphs[nIndex]->GetCharacterCount();
- return nCharacterOffset;
-}
-
-
-
-
awt::Rectangle PresenterTextView::GetCaretBounds (
sal_Int32 nParagraphIndex,
const sal_Int32 nCharacterIndex) const
@@ -976,14 +965,6 @@ void PresenterTextParagraph::AddLine (
-sal_Int32 PresenterTextParagraph::GetParagraphIndex (void) const
-{
- return mnParagraphIndex;
-}
-
-
-
-
double PresenterTextParagraph::GetTotalTextHeight (void)
{
return maLines.size() * mnLineHeight;
@@ -992,14 +973,6 @@ double PresenterTextParagraph::GetTotalTextHeight (void)
-sal_Int32 PresenterTextParagraph::GetCharacterOffset (void) const
-{
- return mnCharacterOffset;
-}
-
-
-
-
void PresenterTextParagraph::SetCharacterOffset (const sal_Int32 nCharacterOffset)
{
mnCharacterOffset = nCharacterOffset;
@@ -1535,14 +1508,6 @@ PresenterTextParagraph::Line::Line (
-sal_Int32 PresenterTextParagraph::Line::GetLength (void) const
-{
- return mnLineEndCharacterIndex-mnLineStartCharacterIndex;
-}
-
-
-
-
void PresenterTextParagraph::Line::ProvideCellBoxes (void)
{
if ( ! IsEmpty() && maCellBoxes.getLength()==0)
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index d8bf260443c1..66dd154b8fd0 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -125,10 +125,8 @@ public:
const double nClipTop,
const double nClipBottom);
- sal_Int32 GetParagraphIndex (void) const;
double GetTotalTextHeight (void);
- sal_Int32 GetCharacterOffset (void) const;
void SetCharacterOffset (const sal_Int32 nCharacterOffset);
sal_Int32 GetCharacterCount (void) const;
sal_Unicode GetCharacter (const sal_Int32 nGlobalCharacterIndex) const;
@@ -194,7 +192,6 @@ private:
double mnWidth;
cssu::Sequence<css::geometry::RealRectangle2D> maCellBoxes;
- sal_Int32 GetLength (void) const;
void ProvideLayoutedLine (
const ::rtl::OUString& rsParagraphText,
const PresenterTheme::SharedFontDescriptor& rpFont,
@@ -309,7 +306,6 @@ private:
void RequestFormat (void);
void Format (void);
SharedPresenterTextParagraph GetParagraphForCharacterIndex (const sal_Int32 nCharacterIndex) const;
- sal_Int32 GetCharacterOffset (const sal_Int32 nParagraphIndex) const;
css::awt::Rectangle GetCaretBounds (
const sal_Int32 nParagraphIndex,
const sal_Int32 nCharacterIndex) const;
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 6688f7e8b679..6380d882528d 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -328,13 +328,6 @@ PresenterTheme::~PresenterTheme (void)
-void SAL_CALL PresenterTheme::disposing (void)
-{
-}
-
-
-
-
::boost::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme (void)
{
ReadContext aReadContext(mxContext, mxCanvas);
@@ -471,17 +464,6 @@ bool PresenterTheme::ConvertToColor (
-::rtl::OUString PresenterTheme::GetThemeName (void) const
-{
- if (mpTheme.get() != NULL)
- return mpTheme->msThemeName;
- else
- return OUString();
-}
-
-
-
-
SharedBitmapDescriptor PresenterTheme::GetBitmap (
const OUString& rsStyleName,
const OUString& rsBitmapName) const
diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx
index e76cabcf28d0..14c647e728b7 100644
--- a/sdext/source/presenter/PresenterTheme.hxx
+++ b/sdext/source/presenter/PresenterTheme.hxx
@@ -76,8 +76,6 @@ public:
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas);
~PresenterTheme (void);
- void SAL_CALL disposing (void);
-
bool HasCanvas (void) const;
void ProvideCanvas (const css::uno::Reference<css::rendering::XCanvas>& rxCanvas);
@@ -116,8 +114,6 @@ public:
};
typedef ::boost::shared_ptr<FontDescriptor> SharedFontDescriptor;
- ::rtl::OUString GetThemeName (void) const;
-
SharedBitmapDescriptor GetBitmap (
const ::rtl::OUString& rsStyleName,
const ::rtl::OUString& rsBitmapName) const;
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 4668cddf570a..d0b30cecee49 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -575,24 +575,6 @@ oslDateTime PresenterClockTimer::GetCurrentTime (void)
-sal_Int64 PresenterClockTimer::GetTimeDifference (
- const oslDateTime& rNow,
- const oslDateTime& rThen)
-{
- TimeValue aNow;
- TimeValue aThen;
- if (osl_getTimeValueFromDateTime(const_cast<oslDateTime*>(&rNow),&aNow)
- && osl_getTimeValueFromDateTime(const_cast<oslDateTime*>(&rThen),&aThen))
- {
- return TimerScheduler::GetTimeDifference(aNow, aThen);
- }
- else
- return -1;
-}
-
-
-
-
void PresenterClockTimer::CheckCurrentTime (const TimeValue& rCurrentTime)
{
css::uno::Reference<css::awt::XRequestCallback> xRequestCallback;
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index 89232e686d47..601b27e5379e 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -103,11 +103,6 @@ public:
static oslDateTime GetCurrentTime (void);
- /** Return the difference between the two different times in
- nanoseconds.
- */
- static sal_Int64 GetTimeDifference (const oslDateTime& rNow, const oslDateTime& rThen);
-
// XCallback
virtual void SAL_CALL notify (const css::uno::Any& rUserData)
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 1eb04a8e4171..9b1a2d064441 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -213,8 +213,6 @@ namespace {
const Reference<rendering::XCanvas>& rxCanvas) = 0;
bool IsEnabled (void) const;
- void SetEnabledState (const bool bIsEnabled);
-
private:
bool mbIsEnabled;
};
@@ -293,13 +291,6 @@ namespace {
// Some specialized controls.
- class ProgressLabel : public Label
- {
- public:
- ProgressLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar);
- virtual void CurrentSlideHasChanged (void);
- };
-
class TimeFormatter
{
public:
@@ -555,18 +546,6 @@ void PresenterToolBar::RequestLayout (void)
-geometry::RealSize2D PresenterToolBar::GetSize (void)
-{
- if (mbIsLayoutPending)
- Layout(mxCanvas);
- return geometry::RealSize2D(
- maBoundingBox.X2 - maBoundingBox.X1,
- maBoundingBox.Y2 - maBoundingBox.Y1);
-}
-
-
-
-
geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
{
if (mbIsLayoutPending)
@@ -585,14 +564,6 @@ geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
-Reference<awt::XWindow> PresenterToolBar::GetWindow (void) const
-{
- return mxWindow;
-}
-
-
-
-
Reference<XComponentContext> PresenterToolBar::GetComponentContext (void) const
{
return mxComponentContext;
@@ -1325,23 +1296,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage (voi
-//-----------------------------------------------------------------------------
-
-void PresenterToolBarView::ThrowIfDisposed (void) const
- throw (::com::sun::star::lang::DisposedException)
-{
- if (rBHelper.bDisposed || rBHelper.bInDispose)
- {
- throw lang::DisposedException (
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "PresenterToolBarView has already been disposed")),
- const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
- }
-}
-
-
-
-
//===== PresenterToolBar::Element =============================================
namespace {
@@ -1530,14 +1484,6 @@ bool Element::IsEnabled (void) const
-void Element::SetEnabledState (const bool bIsEnabled)
-{
- mbIsEnabled = bIsEnabled;
-}
-
-
-
-
bool Element::IsFilling (void) const
{
return false;
@@ -2070,42 +2016,6 @@ geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanv
-//===== ProgressLabel =========================================================
-
-ProgressLabel::ProgressLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar)
- : Label(rpToolBar)
-{
- SetText(A2S("-/-"));
-}
-
-
-
-
-void ProgressLabel::CurrentSlideHasChanged (void)
-{
- Label::CurrentSlideHasChanged();
- OSL_ASSERT(mpToolBar.is());
- try
- {
- const sal_Int32 nCurrentSlideIndex (mpToolBar->GetCurrentSlideIndex() + 1);
- const sal_Int32 nSlideCount (mpToolBar->GetSlideCount());
- if (nCurrentSlideIndex >= 0 && nSlideCount > 0)
- SetText(
- OUString::valueOf(nCurrentSlideIndex)
- + OUString(RTL_CONSTASCII_USTRINGPARAM(" / "))
- + OUString::valueOf(nSlideCount));
- else
- SetText(A2S(""));
- Invalidate();
- }
- catch (RuntimeException&)
- {
- }
-}
-
-
-
-
//===== TimeFormatter =========================================================
TimeFormatter::TimeFormatter (void)
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index d4dbf2ac1048..116d5437d304 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -112,10 +112,8 @@ public:
sal_Int32 GetSlideCount (void);
sal_Int32 GetCurrentSlideIndex (void);
void RequestLayout (void);
- css::geometry::RealSize2D GetSize (void);
css::geometry::RealSize2D GetMinimalSize (void);
::rtl::Reference<PresenterController> GetPresenterController (void) const;
- css::uno::Reference<css::awt::XWindow> GetWindow (void) const;
css::uno::Reference<css::uno::XComponentContext> GetComponentContext (void) const;
// lang::XEventListener
@@ -304,11 +302,6 @@ private:
css::uno::Reference<css::presentation::XSlideShowController> mxSlideShowController;
::rtl::Reference<PresenterToolBar> mpToolBar;
- /** This method throws a DisposedException when the object has already been
- disposed.
- */
- void ThrowIfDisposed (void) const
- throw (css::lang::DisposedException);
};
} } // end of namespace ::sdext::presenter
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 1414e6e5e5e3..78acb124c50b 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -77,50 +77,6 @@ using ::rtl::OUString;
namespace sdext { namespace presenter {
-namespace {
-
- typedef ::cppu::WeakComponentImplHelper1<
- css::drawing::framework::XConfigurationChangeListener
- > ModeChangeAnimationStarterInterfaceBase;
-
- class ModeChangeAnimationStarter
- : protected ::cppu::BaseMutex,
- public ModeChangeAnimationStarterInterfaceBase
- {
- public:
- ModeChangeAnimationStarter (
- const Reference<drawing::framework::XConfigurationController>& rxConfigurationController,
- const Reference<awt::XWindow>& rxWindow,
- const Reference<rendering::XSpriteCanvas>& rxCanvas,
- const ::boost::shared_ptr<PresenterAnimator>& rpAnimator);
- virtual ~ModeChangeAnimationStarter (void);
- virtual void SAL_CALL disposing (void);
-
- // XConfigurationChangeListener
-
- virtual void SAL_CALL notifyConfigurationChange (
- 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);
-
- private:
- Reference<drawing::framework::XConfigurationController> mxConfigurationController;
- ::boost::shared_ptr<PresenterAnimator> mpAnimator;
- ::boost::shared_ptr<PresenterSprite> mpSprite;
- Reference<rendering::XSpriteCanvas> mxCanvas;
- };
-
-}
-
-
-
-
//===== PresenterWindowManager ================================================
PresenterWindowManager::PresenterWindowManager (
@@ -570,14 +526,6 @@ void PresenterWindowManager::SetLayoutMode (const LayoutMode eMode)
-PresenterWindowManager::LayoutMode PresenterWindowManager::GetLayoutMode (void) const
-{
- return meLayoutMode;
-}
-
-
-
-
void PresenterWindowManager::SetSlideSorterState (bool bIsActive)
{
if (mbIsSlideSorterActive != bIsActive)
@@ -1419,106 +1367,6 @@ private:
-ModeChangeAnimationStarter::ModeChangeAnimationStarter (
- const Reference<drawing::framework::XConfigurationController>& rxConfigurationController,
- const Reference<awt::XWindow>& rxWindow,
- const Reference<rendering::XSpriteCanvas>& rxCanvas,
- const ::boost::shared_ptr<PresenterAnimator>& rpAnimator)
- : ModeChangeAnimationStarterInterfaceBase(m_aMutex),
- mxConfigurationController(rxConfigurationController),
- mpAnimator(rpAnimator),
- mpSprite(new PresenterSprite()),
- mxCanvas(rxCanvas)
-{
- OSL_ASSERT(rxWindow.is());
- OSL_ASSERT(rxCanvas.is());
-
- // Get the bitmap of the background.
- Reference<rendering::XBitmap> xBackgroundBitmap (rxCanvas, UNO_QUERY);
- if ( ! xBackgroundBitmap.is())
- return;
-
- // Create the sprite.
- const awt::Rectangle aWindowSize (rxWindow->getPosSize());
- mpSprite->SetFactory(rxCanvas);
- mpSprite->Resize(geometry::RealSize2D(aWindowSize.Width, aWindowSize.Height));
- mpSprite->SetPriority(10);
-
- // Fill it with the background inside the bounding box.
- const rendering::ViewState aViewState (
- geometry::AffineMatrix2D(1,0,0, 0,1,0),
- NULL);
- const rendering::RenderState aRenderState (
- geometry::AffineMatrix2D(1,0,0, 0,1,0),
- NULL,
- Sequence<double>(4),
- rendering::CompositeOperation::SOURCE);
- Reference<rendering::XCanvas> xSpriteCanvas (mpSprite->GetCanvas());
- if (xSpriteCanvas.is())
- {
- xSpriteCanvas->drawBitmap(xBackgroundBitmap, aViewState, aRenderState);
- mpSprite->Show();
- }
-
- // Register as listener to be notified when the new panes are visible
- // and the sprite can be faded out.
- mxConfigurationController->addConfigurationChangeListener(
- this,
- A2S("ConfigurationUpdateEnd"),
- Any());
-}
-
-
-
-
-ModeChangeAnimationStarter::~ModeChangeAnimationStarter (void)
-{
-}
-
-
-
-
-void SAL_CALL ModeChangeAnimationStarter::disposing (void)
-{
- mxConfigurationController = NULL;
- mpAnimator.reset();
- mpSprite.reset();
-}
-
-
-
-
-// XConfigurationChangeListener
-
-void SAL_CALL ModeChangeAnimationStarter::notifyConfigurationChange (
- const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent)
- throw (com::sun::star::uno::RuntimeException)
-{
- (void)rEvent;
-
- // Start the actual animation.
- mpAnimator->AddAnimation(SharedPresenterAnimation(new ModeChangeAnimation(
- mpSprite,
- mxCanvas)));
-
- mxConfigurationController->removeConfigurationChangeListener(this);
-}
-
-
-
-
-// XEventListener
-
-void SAL_CALL ModeChangeAnimationStarter::disposing (
- const com::sun::star::lang::EventObject& rEvent)
- throw (com::sun::star::uno::RuntimeException)
-{
- if (rEvent.Source == mxConfigurationController)
- mxConfigurationController = NULL;
-}
-
-
-
} // end of anonymous namespace
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index d4e919da5c36..58d55638f9de 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -109,7 +109,6 @@ public:
enum LayoutMode { LM_Standard, LM_Notes, LM_Generic };
private:
void SetLayoutMode (const LayoutMode eMode);
- LayoutMode GetLayoutMode (void) const;
public:
enum ViewMode { VM_Standard, VM_Notes, VM_SlideOverview, VM_Help };