[Libreoffice-commits] .: sdext/source svx/inc svx/source unusedcode.easy
Julien Nabet
serval2412 at kemper.freedesktop.org
Sat Oct 15 16:06:32 PDT 2011
sdext/source/presenter/PresenterWindowManager.cxx | 117 ----------------------
sdext/source/presenter/PresenterWindowManager.hxx | 10 -
svx/inc/svx/sdr/contact/viewcontactofe3d.hxx | 3
svx/source/sdr/contact/viewcontactofe3d.cxx | 14 --
unusedcode.easy | 6 -
5 files changed, 150 deletions(-)
New commits:
commit 9895d3169fb1a20b8e7fb0215acff71beabecdaa
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Oct 16 01:06:33 2011 +0200
Some callcatcher cleaning
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 466e3fe..1414e6e 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -242,45 +242,6 @@ void PresenterWindowManager::SetTheme (const ::boost::shared_ptr<PresenterTheme>
}
}
-
-
-
-void PresenterWindowManager::NotifyPaneCreation (
- const PresenterPaneContainer::SharedPaneDescriptor& rpDescriptor)
-{
- if (rpDescriptor.get()==NULL)
- {
- OSL_ASSERT(rpDescriptor.get()!=NULL);
- return;
- }
- if ( ! rpDescriptor->mxContentWindow.is())
- {
- OSL_ASSERT(rpDescriptor->mxContentWindow.is());
- return;
- }
-
- mbIsLayoutPending = true;
-
- Reference<awt::XWindow> xBorderWindow (rpDescriptor->mxBorderWindow);
- OSL_ASSERT(xBorderWindow.is());
- if (xBorderWindow.is() && ! rpDescriptor->mbIsSprite)
- {
- Invalidate();
-
- xBorderWindow->addWindowListener(this);
- xBorderWindow->addFocusListener(this);
-#ifndef ENABLE_PANE_RESIZING
- xBorderWindow->addMouseListener(this);
-#endif
- }
-
- UpdateWindowList();
- Layout();
-}
-
-
-
-
void PresenterWindowManager::NotifyViewCreation (const Reference<XView>& rxView)
{
PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
@@ -297,32 +258,6 @@ void PresenterWindowManager::NotifyViewCreation (const Reference<XView>& rxView)
}
}
-
-
-
-void PresenterWindowManager::SetPanePosSizeRelative (
- const Reference<XResourceId>& rxPaneId,
- const double nRelativeX,
- const double nRelativeY,
- const double nRelativeWidth,
- const double nRelativeHeight)
-{
- PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
- mpPaneContainer->FindPaneId(rxPaneId));
- if (pDescriptor.get() != NULL)
- {
- pDescriptor->mnLeft = nRelativeX;
- pDescriptor->mnTop = nRelativeY;
- pDescriptor->mnRight = nRelativeX + nRelativeWidth;
- pDescriptor->mnBottom = nRelativeY + nRelativeHeight;
-
- mpPaneContainer->ToTop(pDescriptor);
- }
-}
-
-
-
-
void PresenterWindowManager::SetPanePosSizeAbsolute (
const OUString& rsPaneURL,
const double nX,
@@ -661,17 +596,6 @@ void PresenterWindowManager::SetSlideSorterState (bool bIsActive)
}
}
-
-
-
-bool PresenterWindowManager::IsSlideSorterActive (void) const
-{
- return mbIsSlideSorterActive;
-}
-
-
-
-
void PresenterWindowManager::SetHelpViewState (bool bIsActive)
{
if (mbIsHelpViewActive != bIsActive)
@@ -690,17 +614,6 @@ void PresenterWindowManager::SetHelpViewState (bool bIsActive)
}
}
-
-
-
-bool PresenterWindowManager::IsHelpViewActive (void) const
-{
- return mbIsHelpViewActive;
-}
-
-
-
-
void PresenterWindowManager::SetViewMode (const ViewMode eMode)
{
switch (eMode)
@@ -1186,36 +1099,6 @@ void PresenterWindowManager::NotifyDisposing (void)
}
}
-
-
-
-void PresenterWindowManager::LayoutUnknownMode (void)
-{
- awt::Rectangle aBox = mxParentWindow->getPosSize();
-
- PresenterPaneContainer::PaneList::const_iterator iPane;
- PresenterPaneContainer::PaneList::const_iterator iEnd (mpPaneContainer->maPanes.end());
- for (iPane=mpPaneContainer->maPanes.begin(); iPane!=iEnd; ++iPane)
- {
- const PresenterPaneContainer::SharedPaneDescriptor& pDescriptor (*iPane);
- if ( ! pDescriptor->mxBorderWindow.is())
- continue;
-
- // Layout the border window.
- const sal_Int32 nX = (sal_Int32)(pDescriptor->mnLeft * aBox.Width);
- const sal_Int32 nY = (sal_Int32)(pDescriptor->mnTop * aBox.Height);
- const sal_Int32 nWidth = (sal_Int32)(pDescriptor->mnRight * aBox.Width) - nX;
- const sal_Int32 nHeight = (sal_Int32)(pDescriptor->mnBottom * aBox.Height) - nY;
-
- pDescriptor->mxBorderWindow->setPosSize(
- nX,nY,nWidth,nHeight,
- awt::PosSize::POSSIZE);
- }
-}
-
-
-
-
void PresenterWindowManager::UpdateWindowSize (const Reference<awt::XWindow>& rxBorderWindow)
{
PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 997565b..d4e919d 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -90,14 +90,7 @@ public:
void SetParentPane (const css::uno::Reference<css::drawing::framework::XPane>& rxPane);
void SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme);
- void NotifyPaneCreation (const PresenterPaneContainer::SharedPaneDescriptor& rpDescriptor);
void NotifyViewCreation (const css::uno::Reference<css::drawing::framework::XView>& rxView);
- void SetPanePosSizeRelative (
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
- const double nRelativeX,
- const double nRelativeY,
- const double nRelativeWidth,
- const double nRelativeHeight);
void SetPanePosSizeAbsolute (
const ::rtl::OUString& rsPaneURL,
const double nX,
@@ -118,8 +111,6 @@ private:
void SetLayoutMode (const LayoutMode eMode);
LayoutMode GetLayoutMode (void) const;
- bool IsSlideSorterActive (void) const;
- bool IsHelpViewActive (void) const;
public:
enum ViewMode { VM_Standard, VM_Notes, VM_SlideOverview, VM_Help };
/** The high-level method to switch the view mode. Use this instead of
@@ -234,7 +225,6 @@ private:
void LayoutStandardMode (void);
void LayoutNotesMode (void);
- void LayoutUnknownMode (void);
void LayoutSlideSorterMode (void);
void LayoutHelpMode (void);
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
index 950ef06..5dc37c5 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
@@ -97,9 +97,6 @@ namespace sdr
// when scene is known) which can then be used for 2D processing concerning ranges
virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const;
- // helper to enable test-visualisation of invisible 3D obects
- drawinglayer::attribute::SdrLineAttribute* impCreateFallbackLineAttribute(const basegfx::BColor& rBColor) const;
-
public:
// access to the local primitive without the object's local 3D transform. This is e.g. needed
// to get the not-yet transformed BoundVolume for e.g. interactions
diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx
index 9082821..b271d35 100644
--- a/svx/source/sdr/contact/viewcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3d.cxx
@@ -207,20 +207,6 @@ namespace sdr
return *pRetval;
}
-
- drawinglayer::attribute::SdrLineAttribute* ViewContactOfE3d::impCreateFallbackLineAttribute(const basegfx::BColor& rBColor) const
- {
- static bool bFallbackToCreateAsLineForTest(false);
-
- if(bFallbackToCreateAsLineForTest)
- {
- return new drawinglayer::attribute::SdrLineAttribute(rBColor);
- }
- else
- {
- return 0;
- }
- }
} // end of namespace contact
} // end of namespace sdr
diff --git a/unusedcode.easy b/unusedcode.easy
index 624eeb7..e5bed09 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2733,18 +2733,12 @@ sdext::presenter::PresenterToolBar::GetSize()
sdext::presenter::PresenterToolBar::GetWindow() const
sdext::presenter::PresenterToolBarView::ThrowIfDisposed() const
sdext::presenter::PresenterWindowManager::GetLayoutMode() const
-sdext::presenter::PresenterWindowManager::IsHelpViewActive() const
-sdext::presenter::PresenterWindowManager::IsSlideSorterActive() const
-sdext::presenter::PresenterWindowManager::LayoutUnknownMode()
-sdext::presenter::PresenterWindowManager::NotifyPaneCreation(boost::shared_ptr<sdext::presenter::PresenterPaneContainer::PaneDescriptor> const&)
-sdext::presenter::PresenterWindowManager::SetPanePosSizeRelative(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, double, double, double, double)
sdr::Comment::Comment(unsigned int, Date, rtl::OUString const&, rtl::OUString const&, basegfx::B2DPoint const&)
sdr::Comment::SetCreationDate(Date)
sdr::Comment::SetPosition(basegfx::B2DPoint const&)
sdr::Comment::SetText(rtl::OUString const&)
sdr::Comment::SetUserName(rtl::OUString const&)
sdr::animation::Scheduler::Reset(unsigned int)
-sdr::contact::ViewContactOfE3d::impCreateFallbackLineAttribute(basegfx::BColor const&) const
sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const
sdr::overlay::OverlayBitmapEx::setBitmapEx(BitmapEx const&)
More information about the Libreoffice-commits
mailing list