[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

[Joseph Powers]

 binfilter/bf_sw/source/ui/app/sw_docstyle.cxx |   23 -----------------------
 binfilter/inc/bf_sw/docstyle.hxx              |    7 +++----
 2 files changed, 3 insertions(+), 27 deletions(-)

New commits:
commit 38b105497dac1ff7c523744a02a6a9be18fa9de2
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu Sep 22 06:58:42 2011 -0700

    Move some virtual metheds to the class to make cleanup easyer latter.

diff --git a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
index ef67450..b53a4ed 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
@@ -1143,9 +1143,6 @@ namespace binfilter {
 /*N*/   bOrganizer = bOrg;
 /*N*/ }
 
-/*N*/ SwDocStyleSheetPool::~SwDocStyleSheetPool()
-/*N*/ {
-/*N*/ }
 
 /*N*/ SfxStyleSheetBase& SwDocStyleSheetPool::Make(
 /*N*/       const String&   rName,
@@ -1166,9 +1163,6 @@ namespace binfilter {
 
 
 
-
-
-
 /*N*/ SfxStyleSheetIterator*  SwDocStyleSheetPool::CreateIterator(
 /*N*/                       SfxStyleFamily eFam, USHORT nInMask )
 /*N*/ {
@@ -1176,18 +1170,6 @@ namespace binfilter {
 /*N*/ }
 
 
-
-
-BOOL  SwDocStyleSheetPool::SetParent(
-    SfxStyleFamily /*eFam*/,
-    const String& /*rStyle*/,
-    const String& /*rParent*/
-)
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    return FALSE;
-}
-
 /*N*/ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const String& rName,
 /*N*/                                           SfxStyleFamily eFam, USHORT n )
 /*N*/ {
@@ -1595,11 +1577,6 @@ BOOL  SwDocStyleSheetPool::SetParent(
 /*N*/           aLst.Append( cType, *rList[i] );
 /*N*/ }
 
-void  SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& )
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
 
 }
 
diff --git a/binfilter/inc/bf_sw/docstyle.hxx b/binfilter/inc/bf_sw/docstyle.hxx
index a58680e..5fb9407 100644
--- a/binfilter/inc/bf_sw/docstyle.hxx
+++ b/binfilter/inc/bf_sw/docstyle.hxx
@@ -163,7 +163,7 @@ public:
     virtual SfxStyleSheetBase* First();
     virtual SfxStyleSheetBase* Next();
 
-    virtual void Notify( SfxBroadcaster&, const SfxHint& );
+    virtual void Notify( SfxBroadcaster&, const SfxHint& ) { DBG_BF_ASSERT(0, "STRIP"); }
 };
 
 /*--------------------------------------------------------------------
@@ -179,13 +179,12 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool
 
 public:
     SwDocStyleSheetPool( SwDoc&, BOOL bOrganizer = FALSE );
-    virtual ~SwDocStyleSheetPool();
+    virtual ~SwDocStyleSheetPool() {}
 
     virtual SfxStyleSheetBase& Make(const String&, SfxStyleFamily, USHORT nMask, USHORT nPos = 0xffff);
     virtual SfxStyleSheetBase* Find( const String&, SfxStyleFamily eFam,
                                     USHORT n=0xFFFF );
-    virtual BOOL SetParent( SfxStyleFamily eFam, const String &rStyle,
-                            const String &rParent );
+    virtual BOOL SetParent( SfxStyleFamily, const String&, const String& ) { DBG_BF_ASSERT(0, "STRIP"); return FALSE; }
 
     void    SetItemSet(const SfxItemSet& rSet) { aStyleSheet.SetItemSet(rSet); }