[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Sep 13 06:12:11 PDT 2011
binfilter/bf_sfx2/source/inc/dlgcont.hxx | 2
binfilter/bf_sfx2/source/inc/eventsupplier.hxx | 10 +--
binfilter/bf_sfx2/source/inc/scriptcont.hxx | 2
binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx | 28 ++--------
binfilter/bf_sfx2/source/view/sfx2_printer.cxx | 25 ---------
binfilter/bf_sw/source/ui/app/sw_docshini.cxx | 45 +++++------------
binfilter/inc/bf_sfx2/printer.hxx | 2
7 files changed, 28 insertions(+), 86 deletions(-)
New commits:
commit f085839aed2bd0be43c559a8057f661f4e58808e
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Sep 12 22:05:18 2011 -0700
I missed some DBG_BF_ASSERT()s in sfx2
diff --git a/binfilter/bf_sfx2/source/inc/dlgcont.hxx b/binfilter/bf_sfx2/source/inc/dlgcont.hxx
index 546f605..b798565 100644
--- a/binfilter/bf_sfx2/source/inc/dlgcont.hxx
+++ b/binfilter/bf_sfx2/source/inc/dlgcont.hxx
@@ -54,7 +54,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer_Impl
virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement
( const ::rtl::OUString& aFile, SotStorageStreamRef xElementStream );
- virtual SfxLibraryContainer_Impl* createInstanceImpl( void ){DBG_BF_ASSERT(0, "STRIP");return NULL;}
+ virtual SfxLibraryContainer_Impl* createInstanceImpl( void ) {return NULL; }
sal_Bool init( const ::rtl::OUString& aInitialisationParam,
SotStorage* pStor=NULL );
diff --git a/binfilter/bf_sfx2/source/inc/eventsupplier.hxx b/binfilter/bf_sfx2/source/inc/eventsupplier.hxx
index c0c37f9..00e6d65 100644
--- a/binfilter/bf_sfx2/source/inc/eventsupplier.hxx
+++ b/binfilter/bf_sfx2/source/inc/eventsupplier.hxx
@@ -107,15 +107,15 @@ public:
throw( NOSUCHELEMENTEXCEPTION, WRAPPEDTARGETEXCEPTION,
RUNTIMEEXCEPTION );
virtual SEQUENCE< OUSTRING > SAL_CALL getElementNames() throw ( RUNTIMEEXCEPTION );
- virtual sal_Bool SAL_CALL hasByName( const OUSTRING& aName ) throw ( RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL hasByName( const OUSTRING& /* aName */ ) throw ( RUNTIMEEXCEPTION ) { return FALSE; }
// --- XElementAccess ( parent of XNameAccess ) ---
virtual UNOTYPE SAL_CALL getElementType() throw ( RUNTIMEEXCEPTION );
- virtual sal_Bool SAL_CALL hasElements() throw ( RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL hasElements() throw ( RUNTIMEEXCEPTION ) { return FALSE; }
// --- ::document::XEventListener ---
- virtual void SAL_CALL notifyEvent( const DOCEVENTOBJECT& aEvent )
- throw( RUNTIMEEXCEPTION );
+ virtual void SAL_CALL notifyEvent( const DOCEVENTOBJECT& /* aEvent */ )
+ throw( RUNTIMEEXCEPTION ) {} ;
// --- ::lang::XEventListener ---
virtual void SAL_CALL disposing( const EVENTOBJECT& Source )
@@ -142,7 +142,7 @@ public:
SFX_DECL_XSERVICEINFO
virtual REFERENCE< XNAMEREPLACE > SAL_CALL getEvents() throw( RUNTIMEEXCEPTION );
virtual void SAL_CALL addEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
- virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& /*xListener*/ ) throw( RUNTIMEEXCEPTION ) {DBG_BF_ASSERT(0, "STRIP");}
+ virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& /*xListener*/ ) throw( RUNTIMEEXCEPTION ) {}
};
}//end of namespace binfilter
diff --git a/binfilter/bf_sfx2/source/inc/scriptcont.hxx b/binfilter/bf_sfx2/source/inc/scriptcont.hxx
index 056a4a1..2908f10 100644
--- a/binfilter/bf_sfx2/source/inc/scriptcont.hxx
+++ b/binfilter/bf_sfx2/source/inc/scriptcont.hxx
@@ -61,7 +61,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer_Impl, public OldBas
virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement
( const ::rtl::OUString& aFile, SotStorageStreamRef xElementStream );
- virtual SfxLibraryContainer_Impl* createInstanceImpl( void ){DBG_BF_ASSERT(0, "STRIP");return NULL;}
+ virtual SfxLibraryContainer_Impl* createInstanceImpl( void ){ return NULL; }
// OldBasicPassword interface
diff --git a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
index 49a476d..11f78ea 100644
--- a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
+++ b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
@@ -157,28 +157,14 @@ namespace binfilter {
/*N*/ }
//--------------------------------------------------------------------------------------------------------
-/*?*/ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUSTRING& /*rName*/ ) throw ( RUNTIMEEXCEPTION )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*?*/ }
-
-//--------------------------------------------------------------------------------------------------------
// --- XElementAccess ( parent of XNameAccess ) ---
//--------------------------------------------------------------------------------------------------------
-/*?*/ UNOTYPE SAL_CALL SfxEvents_Impl::getElementType() throw ( RUNTIMEEXCEPTION )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); UNOTYPE aUNOTYPE; return aUNOTYPE;
-/*?*/ }
-
-//--------------------------------------------------------------------------------------------------------
-/*?*/ sal_Bool SAL_CALL SfxEvents_Impl::hasElements() throw ( RUNTIMEEXCEPTION )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*?*/ }
-
-//--------------------------------------------------------------------------------------------------------
-// --- ::document::XEventListener ---
-//--------------------------------------------------------------------------------------------------------
-/*N*/ void SAL_CALL SfxEvents_Impl::notifyEvent( const DOCEVENTOBJECT& /*aEvent*/ ) throw( RUNTIMEEXCEPTION )
-/*N*/ {
-/*N*/ }
+UNOTYPE SAL_CALL SfxEvents_Impl::getElementType() throw ( RUNTIMEEXCEPTION )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ UNOTYPE aUNOTYPE;
+ return aUNOTYPE;
+}
//--------------------------------------------------------------------------------------------------------
// --- ::lang::XEventListener ---
@@ -437,8 +423,6 @@ namespace binfilter {
/*N*/ REFERENCE < XEVENTSSUPPLIER > xSup;
/*N*/ if ( pNamedHint->GetObjShell() )
/*N*/ xSup = REFERENCE < XEVENTSSUPPLIER >( pNamedHint->GetObjShell()->GetModel(), UNO_QUERY );
-/*N*/ // else
-/*N*/ // xSup = (XEVENTSSUPPLIER*) this;
/*N*/
/*N*/ DOCEVENTOBJECT aEvent( xSup, aName );
/*N*/
diff --git a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
index 136bd99..f78891b 100644
--- a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
+++ b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
@@ -34,36 +34,29 @@ namespace binfilter {
//--------------------------------------------------------------------
-/*N*/ SV_DECL_PTRARR_DEL(SfxFontArr_Impl,SfxFont*,10,5)
-
// struct SfxPrinter_Impl ------------------------------------------------
/*N*/ struct SfxPrinter_Impl
/*N*/ {
-/*N*/ SfxFontArr_Impl* mpFonts;
/*N*/ BOOL mbAll;
/*N*/ BOOL mbSelection;
/*N*/ BOOL mbFromTo;
/*N*/ BOOL mbRange;
/*N*/
/*N*/ SfxPrinter_Impl() :
-/*N*/ mpFonts ( NULL ),
/*N*/ mbAll ( TRUE ),
/*N*/ mbSelection ( TRUE ),
/*N*/ mbFromTo ( TRUE ),
/*N*/ mbRange ( TRUE ) {}
-/*N*/ ~SfxPrinter_Impl() { delete mpFonts; }
/*N*/ };
-/*N*/ #define FONTS() pImpl->mpFonts
-
//--------------------------------------------------------------------
/*N*/ SfxFont::SfxFont( const FontFamily eFontFamily, const String& aFontName,
/*N*/ const FontPitch eFontPitch, const CharSet eFontCharSet ):
/*N*/ aName( aFontName ),
/*N*/ eFamily( eFontFamily ),
-/*N*/ ePitch( eFontPitch ),
+/*N*/ ePitch( eFontPitch ),
/*N*/ eCharSet( eFontCharSet )
/*N*/ {
/*N*/ }
@@ -149,12 +142,6 @@ namespace binfilter {
//--------------------------------------------------------------------
-
-//--------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------
-
/*N*/ SfxPrinter::~SfxPrinter()
/*N*/ {
/*N*/ delete pOptions;
@@ -168,16 +155,6 @@ namespace binfilter {
/*N*/ pOptions->Set(rNewOptions);
/*N*/ }
-//--------------------------------------------------------------------
-
-/*N*/ SV_IMPL_PTRARR(SfxFontArr_Impl,SfxFont*)
-
-//--------------------------------------------------------------------
-
-/*?*/ const SfxFont* SfxPrinter::GetFontByName( const String & )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*?*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
index 1889bb8..0b17be2 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
@@ -162,7 +162,6 @@ using namespace ::rtl;
// fuer alle
/*N*/ SwStdFontConfig* pStdFont = SW_MOD()->GetStdFontConfig();
-/*N*/ SfxPrinter* pPrt = pDoc->GetPrt();
/*N*/ String sEntry;
/*N*/ USHORT aFontWhich[] =
@@ -197,21 +196,13 @@ using namespace ::rtl;
/*N*/ if(!pStdFont->IsFontDefault(nFontId))
/*N*/ {
/*?*/ sEntry = pStdFont->GetFontFor(nFontId);
-/*?*/ sal_Bool bDelete = sal_False;
-/*?*/ const SfxFont* pFnt = pPrt ? pPrt->GetFontByName(sEntry): 0;
-/*?*/ if(!pFnt)
-/*?*/ {
-/*?*/ pFnt = new SfxFont( FAMILY_DONTKNOW, sEntry, PITCH_DONTKNOW,
-/*?*/ ::gsl_getSystemTextEncoding() );
-/*?*/ bDelete = sal_True;
-/*?*/ }
+/*?*/ const SfxFont* pFnt = NULL;
+/*?*/ pFnt = new SfxFont( FAMILY_DONTKNOW, sEntry, PITCH_DONTKNOW,
+/*?*/ ::gsl_getSystemTextEncoding() );
/*?*/ pFontItem = new SvxFontItem(pFnt->GetFamily(), pFnt->GetName(),
-/*?*/ aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(), nFontWhich);
-/*?*/ if(bDelete)
-/*?*/ {
-/*?*/ delete (SfxFont*) pFnt;
-/*?*/ bDelete = sal_False;
-/*?*/ }
+/*?*/ aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(),
+ nFontWhich);
+/*?*/ delete (SfxFont*) pFnt;
/*?*/ }
/*N*/ else
/*M*/ {
@@ -271,26 +262,18 @@ using namespace ::rtl;
/*M*/ if(!pStdFont->IsFontDefault(aFontIdPoolId[nIdx]))
/*M*/ {
/*M*/ sEntry = pStdFont->GetFontFor(aFontIdPoolId[nIdx]);
-/*M*/ sal_Bool bDelete = sal_False;
-/*M*/ const SfxFont* pFnt = pPrt ? pPrt->GetFontByName(sEntry): 0;
-/*M*/ if(!pFnt)
-/*M*/ {
-/*M*/ pFnt = new SfxFont( FAMILY_DONTKNOW, sEntry, PITCH_DONTKNOW,
-/*M*/ ::gsl_getSystemTextEncoding() );
-/*M*/ bDelete = sal_True;
-/*M*/ }
+/*M*/ const SfxFont* pFnt = NULL;
+/*M*/ pFnt = new SfxFont( FAMILY_DONTKNOW, sEntry, PITCH_DONTKNOW,
+/*M*/ ::gsl_getSystemTextEncoding() );
/*M*/ SwTxtFmtColl *pColl = pDoc->GetTxtCollFromPool(aFontIdPoolId[nIdx + 1]);
-/*M*/ if( !bHTMLTemplSet ||
-/*M*/ SFX_ITEM_SET != pColl->GetAttrSet().GetItemState(
+/*M*/ if( !bHTMLTemplSet ||
+/*M*/ SFX_ITEM_SET != pColl->GetAttrSet().GetItemState(
/*M*/ nFontWhich, sal_False ) )
-/*M*/ {
-/*M*/ pColl->SetAttr(SvxFontItem(pFnt->GetFamily(), pFnt->GetName(),
-/*M*/ aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(), nFontWhich));
-/*M*/ }
-/*M*/ if(bDelete)
/*M*/ {
-/*M*/ delete (SfxFont*) pFnt;
+/*M*/ pColl->SetAttr(SvxFontItem(pFnt->GetFamily(), pFnt->GetName(),
+/*M*/ aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(), nFontWhich));
/*M*/ }
+/*M*/ delete (SfxFont*) pFnt;
/*M*/ }
/*M*/ }
/*N*/ }
diff --git a/binfilter/inc/bf_sfx2/printer.hxx b/binfilter/inc/bf_sfx2/printer.hxx
index 147f916..519f1d4 100644
--- a/binfilter/inc/bf_sfx2/printer.hxx
+++ b/binfilter/inc/bf_sfx2/printer.hxx
@@ -112,8 +112,6 @@ public:
BOOL IsKnown() const { return bKnown; }
BOOL IsOriginal() const { return bKnown; }
- const SfxFont* GetFontByName( const String &rFontName );
-
};
}//end of namespace binfilter
More information about the Libreoffice-commits
mailing list