Kaydet (Commit) 7b2c8b97 authored tarafından Noel Grandin's avatar Noel Grandin

remove unused code in sfx2::sidebar

sfx2::sidebar::ContextList::IsEmpty()
sfx2::sidebar::Deck::PrintWindowTree(std::vector<sfx2::sidebar::Panel*> > const&)
sfx2::sidebar::EnumContext::EvaluateMatch(sfx2::sidebar::EnumContext const&) const
sfx2::sidebar::EnumContext::GetContext() const
sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
sfx2::sidebar::Panel::PrintWindowTree()
sfx2::sidebar::SidebarDockingWindow::GetChildWindow()

Change-Id: I285567320677a831b2b786f4f73b000eed39987b
üst e395801f
...@@ -123,7 +123,6 @@ public: ...@@ -123,7 +123,6 @@ public:
Application GetApplication_DI (void) const; Application GetApplication_DI (void) const;
const ::rtl::OUString& GetContextName (void) const; const ::rtl::OUString& GetContextName (void) const;
Context GetContext (void) const;
bool operator == (const EnumContext aOther); bool operator == (const EnumContext aOther);
bool operator != (const EnumContext aOther); bool operator != (const EnumContext aOther);
...@@ -136,12 +135,6 @@ public: ...@@ -136,12 +135,6 @@ public:
const static sal_Int32 NoMatch; const static sal_Int32 NoMatch;
const static sal_Int32 OptimalMatch; const static sal_Int32 OptimalMatch;
/** Return the numeric value that describes how good the match
between two contexts is.
Smaller values represent better matches.
*/
sal_Int32 EvaluateMatch (const EnumContext& rOther) const;
static Application GetApplicationEnum (const ::rtl::OUString& rsApplicationName); static Application GetApplicationEnum (const ::rtl::OUString& rsApplicationName);
static const ::rtl::OUString& GetApplicationName (const Application eApplication); static const ::rtl::OUString& GetApplicationName (const Application eApplication);
......
...@@ -104,12 +104,6 @@ void ContextList::AddContextDescription ( ...@@ -104,12 +104,6 @@ void ContextList::AddContextDescription (
bool ContextList::IsEmpty (void)
{
return maEntries.empty();
}
} } // end of namespace sfx2::sidebar } } // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -56,11 +56,6 @@ public: ...@@ -56,11 +56,6 @@ public:
const bool bIsInitiallyVisible, const bool bIsInitiallyVisible,
const ::rtl::OUString& rsMenuCommand); const ::rtl::OUString& rsMenuCommand);
/** Returns <TRUE/> when no call to AddContextDescription() was made before.
*/
bool IsEmpty (void);
private: private:
::std::vector<Entry> maEntries; ::std::vector<Entry> maEntries;
......
...@@ -374,14 +374,14 @@ void Deck::PrintWindowTree (void) ...@@ -374,14 +374,14 @@ void Deck::PrintWindowTree (void)
#ifdef DEBUG
void Deck::PrintWindowTree (const ::std::vector<Panel*>& rPanels) void Deck::PrintWindowTree (const ::std::vector<Panel*>& rPanels)
{ {
(void)rPanels; (void)rPanels;
PrintWindowTree(); PrintWindowTree();
} }
#endif
......
...@@ -70,7 +70,9 @@ public: ...@@ -70,7 +70,9 @@ public:
virtual bool Notify (NotifyEvent& rEvent); virtual bool Notify (NotifyEvent& rEvent);
void PrintWindowTree (void); void PrintWindowTree (void);
#ifdef DEBUG
void PrintWindowTree (const ::std::vector<Panel*>& rPanels); void PrintWindowTree (const ::std::vector<Panel*>& rPanels);
#endif
static void PrintWindowSubTree (Window* pRoot, int nIndentation); static void PrintWindowSubTree (Window* pRoot, int nIndentation);
sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; } sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
......
...@@ -119,14 +119,6 @@ const ::rtl::OUString& EnumContext::GetContextName (void) const ...@@ -119,14 +119,6 @@ const ::rtl::OUString& EnumContext::GetContextName (void) const
EnumContext::Context EnumContext::GetContext (void) const
{
return meContext;
}
bool EnumContext::operator== (const EnumContext aOther) bool EnumContext::operator== (const EnumContext aOther)
{ {
return meApplication==aOther.meApplication return meApplication==aOther.meApplication
...@@ -289,27 +281,6 @@ const ::rtl::OUString& EnumContext::GetContextName (const Context eContext) ...@@ -289,27 +281,6 @@ const ::rtl::OUString& EnumContext::GetContextName (const Context eContext)
} }
sal_Int32 EnumContext::EvaluateMatch (
const EnumContext& rOther) const
{
const bool bApplicationNameIsAny (rOther.meApplication == Application_Any);
if (rOther.meApplication==meApplication || bApplicationNameIsAny)
{
// Application name matches.
const bool bContextNameIsAny (rOther.meContext == Context_Any);
if (rOther.meContext==meContext || bContextNameIsAny)
{
// Context name matches.
return (bApplicationNameIsAny ? 1 : 0)
+ (bContextNameIsAny ? 2 : 0);
}
}
return NoMatch;
}
} } // end of namespace sfx2::sidebar } } // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -67,15 +67,6 @@ Paint Paint::Create (const cssu::Any& rValue) ...@@ -67,15 +67,6 @@ Paint Paint::Create (const cssu::Any& rValue)
void Paint::Set (const Paint& rOther)
{
meType = rOther.meType;
maValue = rOther.maValue;
}
Paint::Type Paint::GetType (void) const Paint::Type Paint::GetType (void) const
{ {
return meType; return meType;
......
...@@ -59,8 +59,6 @@ public: ...@@ -59,8 +59,6 @@ public:
// Create a Paint object for the given gradient. // Create a Paint object for the given gradient.
explicit Paint (const Gradient& rGradient); explicit Paint (const Gradient& rGradient);
void Set (const ::sfx2::sidebar::Paint& rOther);
Type GetType (void) const; Type GetType (void) const;
const Color& GetColor (void) const; const Color& GetColor (void) const;
const Gradient& GetGradient (void) const; const Gradient& GetGradient (void) const;
......
...@@ -234,9 +234,9 @@ Reference<ui::XSidebarPanel> Panel::GetPanelComponent (void) const ...@@ -234,9 +234,9 @@ Reference<ui::XSidebarPanel> Panel::GetPanelComponent (void) const
#ifdef DEBUG
void Panel::PrintWindowTree (void) void Panel::PrintWindowTree (void)
{ {
#ifdef DEBUG
Window* pElementWindow = VCLUnoHelper::GetWindow(GetElementWindow()); Window* pElementWindow = VCLUnoHelper::GetWindow(GetElementWindow());
if (pElementWindow != NULL) if (pElementWindow != NULL)
{ {
...@@ -245,8 +245,8 @@ void Panel::PrintWindowTree (void) ...@@ -245,8 +245,8 @@ void Panel::PrintWindowTree (void)
} }
else else
OSL_TRACE(" panel is empty"); OSL_TRACE(" panel is empty");
#endif
} }
#endif
......
...@@ -68,7 +68,9 @@ public: ...@@ -68,7 +68,9 @@ public:
virtual void DataChanged (const DataChangedEvent& rEvent); virtual void DataChanged (const DataChangedEvent& rEvent);
virtual void Activate (void); virtual void Activate (void);
#ifdef DEBUG
void PrintWindowTree (void); void PrintWindowTree (void);
#endif
private: private:
const ::rtl::OUString msPanelId; const ::rtl::OUString msPanelId;
......
...@@ -79,14 +79,6 @@ void SidebarDockingWindow::GetFocus() ...@@ -79,14 +79,6 @@ void SidebarDockingWindow::GetFocus()
SfxChildWindow* SidebarDockingWindow::GetChildWindow (void)
{
return GetChildWindow_Impl();
}
bool SidebarDockingWindow::Close (void) bool SidebarDockingWindow::Close (void)
{ {
if (mpSidebarController.is()) if (mpSidebarController.is())
......
...@@ -42,8 +42,6 @@ public: ...@@ -42,8 +42,6 @@ public:
virtual bool Close (void); virtual bool Close (void);
SfxChildWindow* GetChildWindow (void);
protected: protected:
// Window overridables // Window overridables
virtual void GetFocus (void); virtual void GetFocus (void);
......
...@@ -277,13 +277,6 @@ sd::framework::Pane::SetWindow(Window*) ...@@ -277,13 +277,6 @@ sd::framework::Pane::SetWindow(Window*)
sd::presenter::PresenterCanvas::copyRect(com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas> const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&) sd::presenter::PresenterCanvas::copyRect(com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas> const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&)
sdr::table::Cell::getName() sdr::table::Cell::getName()
sdr::table::SdrTableObj::getRowCount() const sdr::table::SdrTableObj::getRowCount() const
sfx2::sidebar::ContextList::IsEmpty()
sfx2::sidebar::Deck::PrintWindowTree(std::vector<sfx2::sidebar::Panel*, std::allocator<sfx2::sidebar::Panel*> > const&)
sfx2::sidebar::EnumContext::EvaluateMatch(sfx2::sidebar::EnumContext const&) const
sfx2::sidebar::EnumContext::GetContext() const
sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
sfx2::sidebar::Panel::PrintWindowTree()
sfx2::sidebar::SidebarDockingWindow::GetChildWindow()
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&) std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment