summaryrefslogtreecommitdiffstats
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/lnkbase2.cxx4
-rw-r--r--sfx2/source/control/statcach.cxx4
-rw-r--r--sfx2/source/control/templateabstractview.cxx8
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx4
-rw-r--r--sfx2/source/doc/docfilt.cxx4
-rw-r--r--sfx2/source/inc/statcach.hxx2
-rw-r--r--sfx2/source/sidebar/Deck.cxx8
-rw-r--r--sfx2/source/sidebar/Deck.hxx4
-rw-r--r--sfx2/source/sidebar/Panel.cxx8
-rw-r--r--sfx2/source/sidebar/Panel.hxx4
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx8
-rw-r--r--sfx2/source/sidebar/SidebarController.hxx4
-rw-r--r--sfx2/source/view/frame2.cxx4
13 files changed, 7 insertions, 59 deletions
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 1e33b0d60f14..6da226519c48 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -268,10 +268,6 @@ void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm )
-OUString SvBaseLink::GetLinkSourceName() const
-{
- return aLinkName;
-}
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index d69f34efd450..940be5f191c4 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -161,10 +161,6 @@ void BindDispatch_Impl::Release()
release();
}
-const ::com::sun::star::frame::FeatureStateEvent& BindDispatch_Impl::GetStatus() const
-{
- return aStatus;
-}
void BindDispatch_Impl::Dispatch( const uno::Sequence < beans::PropertyValue >& aProps, bool bForceSynchron )
{
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index 32994450d410..cbda6e69f991 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -208,15 +208,7 @@ void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties>
}
-const OUString &TemplateAbstractView::getCurRegionName() const
-{
- return maCurRegionName;
-}
-bool TemplateAbstractView::isNonRootRegionVisible () const
-{
- return mnCurRegionId;
-}
void TemplateAbstractView::setOpenRegionHdl(const Link &rLink)
{
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 38f9045cdb40..65bea0b060b2 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -479,10 +479,6 @@ void SfxDocumentInfoItem::AddCustomProperty( const OUString& sName, const Any& r
m_aCustomProperties.push_back( pProp );
}
-uno::Sequence< document::CmisProperty > SfxDocumentInfoItem::GetCmisProperties() const
-{
- return m_aCmisProperties;
-}
void SfxDocumentInfoItem::SetCmisProperties( const Sequence< document::CmisProperty >& cmisProps)
{
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index d1b4ae07414c..2e8e65ff75fb 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -107,10 +107,6 @@ OUString SfxFilter::GetDefaultExtension() const
return comphelper::string::getToken(GetWildcard().getGlob(), 0, ';');
}
-const OUString& SfxFilter::GetProviderName() const
-{
- return maProvider;
-}
void SfxFilter::SetURLPattern( const OUString& rStr )
{
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 2e9757334862..65fdb57c5e60 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -55,7 +55,7 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void Release();
- const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const;
+ const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const { return aStatus;}
void Dispatch( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aProps, bool bForceSynchron = false );
};
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 8cb6e834edfc..c7777dd053d9 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -118,10 +118,6 @@ void Deck::Dispose (void)
-const ::rtl::OUString& Deck::GetId (void) const
-{
- return msId;
-}
@@ -263,10 +259,6 @@ void Deck::SetPanels (const SharedPanelContainer& rPanels)
-const SharedPanelContainer& Deck::GetPanels (void) const
-{
- return maPanels;
-}
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index 65aa238d9148..ea33fa287286 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -51,11 +51,11 @@ public:
void Dispose (void);
- const ::rtl::OUString& GetId (void) const;
+ const ::rtl::OUString& GetId (void) const { return msId;}
DeckTitleBar* GetTitleBar (void) const;
Rectangle GetContentArea (void) const;
void SetPanels (const SharedPanelContainer& rPanels);
- const SharedPanelContainer& GetPanels (void) const;
+ const SharedPanelContainer& GetPanels (void) const { return maPanels;}
void RequestLayout (void);
::Window* GetPanelParentWindow (void);
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 04c8c9746d53..083d15bfdf51 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -160,10 +160,6 @@ bool Panel::HasIdPredicate (const ::rtl::OUString& rsId) const
-const ::rtl::OUString& Panel::GetId (void) const
-{
- return msPanelId;
-}
@@ -212,10 +208,6 @@ void Panel::DataChanged (const DataChangedEvent& rEvent)
SetBackground(Theme::GetPaint(Theme::Paint_PanelBackground).GetWallpaper());
}
-Reference<ui::XSidebarPanel> Panel::GetPanelComponent (void) const
-{
- return mxPanelComponent;
-}
Reference<awt::XWindow> Panel::GetElementWindow (void)
{
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index ef47c2060aa7..ee64df3aa2af 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -56,12 +56,12 @@ public:
PanelTitleBar* GetTitleBar (void) const;
bool IsTitleBarOptional (void) const { return mbIsTitleBarOptional;}
void SetUIElement (const cssu::Reference<css::ui::XUIElement>& rxElement);
- cssu::Reference<css::ui::XSidebarPanel> GetPanelComponent (void) const;
+ cssu::Reference<css::ui::XSidebarPanel> GetPanelComponent (void) const { return mxPanelComponent;}
cssu::Reference<css::awt::XWindow> GetElementWindow (void);
void SetExpanded (const bool bIsExpanded);
bool IsExpanded (void) const { return mbIsExpanded;}
bool HasIdPredicate (const ::rtl::OUString& rsId) const;
- const ::rtl::OUString& GetId (void) const;
+ const ::rtl::OUString& GetId (void) const { return msPanelId;}
virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
virtual void Resize (void) SAL_OVERRIDE;
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 7701879683d0..a5dbcfda7e2b 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1053,10 +1053,6 @@ void SidebarController::UpdateDeckOpenState (void)
-FocusManager& SidebarController::GetFocusManager (void)
-{
- return maFocusManager;
-}
@@ -1240,10 +1236,6 @@ void SidebarController::ShowPanel (const Panel& rPanel)
-Context SidebarController::GetCurrentContext (void) const
-{
- return maCurrentContext;
-}
} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 69f724254cda..a2397cf7ce60 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -136,7 +136,7 @@ public:
*/
void RequestOpenDeck (void);
- FocusManager& GetFocusManager (void);
+ FocusManager& GetFocusManager (void) { return maFocusManager;}
private:
typedef ::std::map<
@@ -246,7 +246,7 @@ private:
*/
void ShowPanel (const Panel& rPanel);
- Context GetCurrentContext (void) const;
+ Context GetCurrentContext (void) const { return maCurrentContext;}
virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
};
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 6cc50b40c3e9..79cc49193902 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -353,10 +353,6 @@ SystemWindow* SfxFrame::GetTopWindow_Impl() const
return NULL;
}
-Window& SfxFrame::GetWindow() const
-{
- return *pWindow;
-}
bool SfxFrame::Close()
{