summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/sfx2/sidebar/EnumContext.hxx7
-rw-r--r--sfx2/source/sidebar/ContextList.cxx6
-rw-r--r--sfx2/source/sidebar/ContextList.hxx5
-rw-r--r--sfx2/source/sidebar/Deck.cxx4
-rw-r--r--sfx2/source/sidebar/Deck.hxx2
-rw-r--r--sfx2/source/sidebar/EnumContext.cxx29
-rw-r--r--sfx2/source/sidebar/Paint.cxx9
-rw-r--r--sfx2/source/sidebar/Paint.hxx2
-rw-r--r--sfx2/source/sidebar/Panel.cxx4
-rw-r--r--sfx2/source/sidebar/Panel.hxx2
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.cxx8
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.hxx2
-rw-r--r--unusedcode.easy7
13 files changed, 8 insertions, 79 deletions
diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx
index 2eff3cfae34c..4cd58bd5c3c0 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -123,7 +123,6 @@ public:
Application GetApplication_DI (void) const;
const ::rtl::OUString& GetContextName (void) const;
- Context GetContext (void) const;
bool operator == (const EnumContext aOther);
bool operator != (const EnumContext aOther);
@@ -136,12 +135,6 @@ public:
const static sal_Int32 NoMatch;
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 const ::rtl::OUString& GetApplicationName (const Application eApplication);
diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx
index 8d39015c3e44..e1dd71169068 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -104,12 +104,6 @@ void ContextList::AddContextDescription (
-bool ContextList::IsEmpty (void)
-{
- return maEntries.empty();
-}
-
-
} } // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ContextList.hxx b/sfx2/source/sidebar/ContextList.hxx
index 5c5c4d9d5201..26b63caf19ba 100644
--- a/sfx2/source/sidebar/ContextList.hxx
+++ b/sfx2/source/sidebar/ContextList.hxx
@@ -56,11 +56,6 @@ public:
const bool bIsInitiallyVisible,
const ::rtl::OUString& rsMenuCommand);
- /** Returns <TRUE/> when no call to AddContextDescription() was made before.
- */
- bool IsEmpty (void);
-
-
private:
::std::vector<Entry> maEntries;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0df23ae41b98..8eaf4706d56c 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -374,14 +374,14 @@ void Deck::PrintWindowTree (void)
-
+#ifdef DEBUG
void Deck::PrintWindowTree (const ::std::vector<Panel*>& rPanels)
{
(void)rPanels;
PrintWindowTree();
}
-
+#endif
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index fb382a5b4ea4..63c014f4161b 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -70,7 +70,9 @@ public:
virtual bool Notify (NotifyEvent& rEvent);
void PrintWindowTree (void);
+#ifdef DEBUG
void PrintWindowTree (const ::std::vector<Panel*>& rPanels);
+#endif
static void PrintWindowSubTree (Window* pRoot, int nIndentation);
sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx
index 07ea96c7f8b8..94e62d87a5c8 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -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)
{
return meApplication==aOther.meApplication
@@ -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
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index d2819bc1f3f4..ac9082c50d43 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/sfx2/source/sidebar/Paint.cxx
@@ -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
{
return meType;
diff --git a/sfx2/source/sidebar/Paint.hxx b/sfx2/source/sidebar/Paint.hxx
index 4849a8b49aad..623b2cfaaf9e 100644
--- a/sfx2/source/sidebar/Paint.hxx
+++ b/sfx2/source/sidebar/Paint.hxx
@@ -59,8 +59,6 @@ public:
// Create a Paint object for the given gradient.
explicit Paint (const Gradient& rGradient);
- void Set (const ::sfx2::sidebar::Paint& rOther);
-
Type GetType (void) const;
const Color& GetColor (void) const;
const Gradient& GetGradient (void) const;
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 848bb4b37d70..9a9fd85741dc 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -234,9 +234,9 @@ Reference<ui::XSidebarPanel> Panel::GetPanelComponent (void) const
+#ifdef DEBUG
void Panel::PrintWindowTree (void)
{
-#ifdef DEBUG
Window* pElementWindow = VCLUnoHelper::GetWindow(GetElementWindow());
if (pElementWindow != NULL)
{
@@ -245,8 +245,8 @@ void Panel::PrintWindowTree (void)
}
else
OSL_TRACE(" panel is empty");
-#endif
}
+#endif
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index b88f8726474e..cd3e63512eac 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -68,7 +68,9 @@ public:
virtual void DataChanged (const DataChangedEvent& rEvent);
virtual void Activate (void);
+#ifdef DEBUG
void PrintWindowTree (void);
+#endif
private:
const ::rtl::OUString msPanelId;
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index a8c0441c41c0..259123dcca31 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -79,14 +79,6 @@ void SidebarDockingWindow::GetFocus()
-SfxChildWindow* SidebarDockingWindow::GetChildWindow (void)
-{
- return GetChildWindow_Impl();
-}
-
-
-
-
bool SidebarDockingWindow::Close (void)
{
if (mpSidebarController.is())
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx
index 5a1aea82d534..8a0dfa4c910b 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.hxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx
@@ -42,8 +42,6 @@ public:
virtual bool Close (void);
- SfxChildWindow* GetChildWindow (void);
-
protected:
// Window overridables
virtual void GetFocus (void);
diff --git a/unusedcode.easy b/unusedcode.easy
index 9829e4b4f5c3..c4cbfa8a186a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -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&)
sdr::table::Cell::getName()
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::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)