diff options
Diffstat (limited to 'svx/source/sidebar')
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.cxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.cxx | 8 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.hxx | 4 |
5 files changed, 3 insertions, 19 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 109cb5bdce99..bd152cf66849 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -1321,10 +1321,6 @@ IMPL_LINK(AreaPropertyPanel, ModifyTransparentHdl_Impl, void*, EMPTYARG) } -Color AreaPropertyPanel::GetLastColor (void) const -{ - return maLastColor; -} diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index bd6677d732fc..13f76b577a66 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -177,7 +177,7 @@ private: void Update(); void ImpUpdateTransparencies(); - Color GetLastColor (void) const; + const Color& GetLastColor (void) const { return maLastColor;} void SetColor ( const OUString& rsColorName, const Color aColor); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index b819b00833f0..eecb7d2c44ca 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -163,10 +163,6 @@ void NBOTypeMgrBase::StoreBulCharFmtName_impl() { } } } -OUString NBOTypeMgrBase::GetBulCharFmtName() -{ - return aNumCharFmtName; -} void NBOTypeMgrBase::ImplLoad(const OUString& filename) { bIsLoading = true; diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 4486cfe35950..dbcc1eb0206c 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -82,10 +82,6 @@ TextPropertyPanel* TextPropertyPanel::Create ( rContext); } -::sfx2::sidebar::ControllerItem& TextPropertyPanel::GetSpaceController() -{ - return maSpacingControl; -} TextPropertyPanel::TextPropertyPanel ( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ ) : PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame), @@ -298,10 +294,6 @@ void TextPropertyPanel::NotifyItemUpdate ( } } -Color& TextPropertyPanel::GetUnderlineColor() -{ - return meUnderlineColor; -} } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index a863e0848dc5..9bd78bc6a2d9 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -54,11 +54,11 @@ public: virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; - ::sfx2::sidebar::ControllerItem& GetSpaceController(); + ::sfx2::sidebar::ControllerItem& GetSpaceController() { return maSpacingControl;} long GetSelFontSize(); void EndSpacingPopupMode (void); void EndUnderlinePopupMode (void); - Color& GetUnderlineColor(); + Color& GetUnderlineColor() { return meUnderlineColor;} virtual void HandleContextChange ( |