[Libreoffice-commits] core.git: 2 commits - sc/source

[Stephan Bergmann]

 sc/source/filter/inc/xestyle.hxx        |    1 -
 sc/source/ui/sidebar/ScPanelFactory.hxx |    9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit c4cfd7ca0d4f4f605d76df39fe2b3ca5a79908c0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 21 15:01:29 2016 +0100

    Unused declaration of 'Font'
    
    ...used to be a declaration of vcl::Font prior to
    60e78fbb806bb45e635ba1de45ceffe187938ac0 "fdo#82577: Handle Font"
    
    Change-Id: I8db61c2e6aa0a6a2931aafb6a4c0f51000ce9415

diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 544b128..0f041bc 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -120,7 +120,6 @@ private:
 
 // FONT record - font information =============================================
 
-namespace { class Font; }
 class SvxFont;
 
 const size_t EXC_FONTLIST_NOTFOUND = static_cast< size_t >( -1 );
commit 533633ded9038798dac60df3bdd53c48c85bba55
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 21 14:59:59 2016 +0100

    ODR violation (base class must be the same across compilation units)
    
    Change-Id: Ie95a45429cf2b512a302a50c701db9d8ac030c53

diff --git a/sc/source/ui/sidebar/ScPanelFactory.hxx b/sc/source/ui/sidebar/ScPanelFactory.hxx
index c04ff22..476dd6da2 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.hxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.hxx
@@ -28,12 +28,9 @@
 
 namespace sc { namespace sidebar {
 
-namespace
-{
-    typedef ::cppu::WeakComponentImplHelper <
-        css::ui::XUIElementFactory, css::lang::XServiceInfo
-        > PanelFactoryInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::ui::XUIElementFactory, css::lang::XServiceInfo
+    > PanelFactoryInterfaceBase;
 
 class ScPanelFactory
     : private ::cppu::BaseMutex,