[Libreoffice-commits] core.git: 2 commits - include/editeng include/sfx2

[Stephan Bergmann]

 include/editeng/unotext.hxx |    4 ++--
 include/sfx2/objface.hxx    |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit be42330ae276219dee5b7ed3c7625f8da6121d1d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 21 15:35:24 2013 +0200

    Base class ctors/dtors can be protected
    
    Change-Id: I8b68b78042a980850d71a0f67ec520986d6085e4

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index dd56df8..90f5845 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -278,12 +278,12 @@ protected:
     virtual void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any& rAny, const SfxItemSet& rSet ) throw(::com::sun::star::beans::UnknownPropertyException );
     virtual void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const com::sun::star::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException );
 
-public:
     SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw();
     SvxUnoTextRangeBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw();
     SvxUnoTextRangeBase( const SvxUnoTextRangeBase& rRange ) throw();
     virtual ~SvxUnoTextRangeBase() throw();
 
+public:
     // Internal
     const ESelection&       GetSelection() const throw() { CheckSelection( ((SvxUnoTextRangeBase*)this)->maSelection, mpEditSource->GetTextForwarder() ); return maSelection; };
     void                    SetSelection( const ESelection& rSelection ) throw();
@@ -394,13 +394,13 @@ class EDITENG_DLLPUBLIC SvxUnoTextBase  : public SvxUnoTextRangeBase,
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >   xParentText;
 
-public:
     SvxUnoTextBase( ) throw();
     SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw();
     SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > xParent ) throw();
     SvxUnoTextBase( const SvxUnoTextBase& rText ) throw();
     virtual ~SvxUnoTextBase() throw();
 
+public:
     UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextBase )
 
     ESelection InsertField( const SvxFieldItem& rField ) throw();
commit 9775a3715498183ae6f5118fbaee1c5d488b6dc6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 21 14:37:44 2013 +0200

    Remove unused forward declaration
    
    Change-Id: I2b725ad476cbd9552a7e57a550945a1f227fc823

diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index f852a00..34ca4ba 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -26,7 +26,6 @@
 #include <sfx2/msg.hxx>
 #include <tools/resid.hxx>
 
-struct SfxFormalArgument;
 struct SfxInterface_Impl;
 class  SfxConfigItem;
 class  SfxModule;