[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_sfx2
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Jan 9 20:00:12 PST 2011
binfilter/bf_basic/source/classes/sbintern.cxx | 1
binfilter/bf_basic/source/classes/sbunoobj.cxx | 1
binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx | 2 -
binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx | 3 --
binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx | 1
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx | 28 ++++++++++------------
binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx | 4 ---
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 15 +++++------
8 files changed, 20 insertions(+), 35 deletions(-)
New commits:
commit e7c9fe6ac7e2d8f695cb0f7b826a15772af9203c
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jan 9 19:59:52 2011 -0800
Remove some extra includes & white space.
diff --git a/binfilter/bf_basic/source/classes/sbintern.cxx b/binfilter/bf_basic/source/classes/sbintern.cxx
index 7406b4b..9ad2336 100644
--- a/binfilter/bf_basic/source/classes/sbintern.cxx
+++ b/binfilter/bf_basic/source/classes/sbintern.cxx
@@ -30,7 +30,6 @@
#include "sbunoobj.hxx"
#include "token.hxx" // Tokenizer
#include "codegen.hxx" // Code-Generator
-#include "basmgr.hxx"
namespace binfilter {
diff --git a/binfilter/bf_basic/source/classes/sbunoobj.cxx b/binfilter/bf_basic/source/classes/sbunoobj.cxx
index 742bc2f..c31f836 100644
--- a/binfilter/bf_basic/source/classes/sbunoobj.cxx
+++ b/binfilter/bf_basic/source/classes/sbunoobj.cxx
@@ -83,7 +83,6 @@ using namespace rtl;
#include "sberrors.hxx"
#include "sbunoobj.hxx"
#include "sbjsmod.hxx"
-#include "basmgr.hxx"
#include "sbintern.hxx"
#include<math.h>
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
index 3a14e24..2d1701d 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
@@ -51,8 +51,6 @@
#include "appimp.hxx"
#include "dlgcont.hxx"
-#include "bf_basic/basmgr.hxx"
-
#include "scriptcont.hxx"
#define ITEMID_SEARCH SID_SEARCH_ITEM
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx
index 1a4ec4e..ca1a30f 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx
@@ -25,8 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "bf_basic/basmgr.hxx"
-
#ifdef WIN
#define _TL_LANG_SPECIAL
#endif
@@ -58,7 +56,6 @@
namespace binfilter {
-DECLARE_LIST( SfxFrameWindowFactoryArray_Impl, SfxFrameWindowFactory* )
SV_DECL_PTRARR(SfxInitLinkList, Link*, 2, 2)//STRIP008 ;
//-------------------------------------------------------------------------
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
index 65b7cf2..fc34120 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
@@ -35,7 +35,6 @@
#include <bf_svtools/rectitem.hxx>
#include <tools/urlobj.hxx>
#include <bf_basic/sbmeth.hxx>
-#include <bf_basic/basmgr.hxx>
#include <bf_basic/sbxcore.hxx>
#include <bf_basic/sbx.hxx>
#include <bf_svtools/stritem.hxx>
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index ad251e0..7cf5896 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -26,11 +26,8 @@
*
************************************************************************/
-
-
#include <rtl/uri.hxx>
-
#include "namecont.hxx"
#include <tools/urlobj.hxx>
@@ -46,6 +43,7 @@
#include <com/sun/star/uno/DeploymentException.hpp>
#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+
namespace binfilter {
using namespace ::com::sun::star::container;
@@ -202,7 +200,7 @@ namespace SfxContainer_Impl
/*?*/ void NameContainer_Impl::removeByName( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
@@ -677,7 +675,7 @@ namespace SfxContainer_Impl
/*?*/ aFolder60 = aUserBasic60InetObj.GetMainURL( INetURLObject::NO_DECODE );
/*N*/ }
/*N*/ if( mxSFI->isFolder( aFolder60 ) )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
+/*?*/ {
/*?*/ }
/*N*/ }
/*N*/
@@ -1351,7 +1349,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::removeLibrary( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
/*N*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryLoaded( const OUString& Name )
@@ -1467,7 +1465,7 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryLink( const OUString& Name
/*?*/ OUString SAL_CALL SfxLibraryContainer_Impl::getLibraryLinkURL( const OUString& /*Name*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); OUString aRetStr;return aRetStr;
+/*?*/ { OUString aRetStr; return aRetStr;
/*?*/ }
sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& Name )
@@ -1480,36 +1478,36 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& N
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::setLibraryReadOnly( const OUString& /*Name*/, sal_Bool /*bReadOnly*/ )
/*?*/ throw (NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::renameLibrary( const OUString& /*Name*/, const OUString& /*NewName*/ )
/*?*/ throw (NoSuchElementException, ElementExistException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
// Methods XLibraryContainerPassword
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordProtected( const OUString& /*Name*/ )
/*?*/ throw (NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
+/*?*/ { return sal_False;
/*?*/ }
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordVerified( const OUString& /*Name*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
+/*?*/ { return sal_False;
/*?*/ }
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::verifyLibraryPassword
/*?*/ ( const OUString& /*Name*/, const OUString& /*Password*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
+/*?*/ { return sal_False;
/*?*/ }
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::changeLibraryPassword( const OUString& /*Name*/,
/*?*/ const OUString& /*OldPassword*/, const OUString& /*NewPassword*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
// Methods XContainer
@@ -1699,7 +1697,7 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
// Methods XNameReplace
/*?*/ void SfxLibrary_Impl::replaceByName( const OUString& /*aName*/, const Any& /*aElement*/ )
/*?*/ throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*?*/ {
/*?*/ }
@@ -1716,7 +1714,7 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
/*?*/ void SfxLibrary_Impl::removeByName( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
// XTypeProvider
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
index c80801b..f2beca5 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
@@ -34,8 +34,6 @@
#include "namecont.hxx"
-#include "bf_basic/basmgr.hxx"
-
#include "scriptcont.hxx"
#include <unotools/streamwrap.hxx>
@@ -43,10 +41,8 @@
// For password functionality
-
#include <bf_svtools/sfxecode.hxx>
#include <bf_svtools/ehdl.hxx>
-#include "bf_basic/basmgr.hxx"
#include <xmlscript/xmlmod_imexp.hxx>
#include <app.hxx>
namespace binfilter {
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
index 7fe1796..c804765 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
@@ -93,7 +93,7 @@ using namespace ::com::sun::star::uno;
//====================================================================
/*?*/ GDIMetaFile* SfxObjectShell::GetPreviewMetaFile( sal_Bool /*bFullContent*/ ) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
+/*?*/ { return NULL;
/*?*/ }
/*N*/ bool SfxObjectShell::SaveWindows_Impl( SvStorage & /*rStor*/ ) const
@@ -167,7 +167,7 @@ using namespace ::com::sun::star::uno;
/*N*/ #endif
/*N*/ if( nMaxSize && !GetDocInfo().IsPasswd() &&
/*N*/ SFX_CREATE_MODE_STANDARD == eCreateMode )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ {
/*N*/ }
/*N*/ if( pImp->bIsSaving )
@@ -337,8 +337,7 @@ using namespace ::com::sun::star::uno;
/*?*/ SvEmbeddedObject* /*pObj*/,
/*?*/ const String& /*rName*/
/*?*/ )
-
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
+/*?*/ { return NULL;
/*?*/ }
//-------------------------------------------------------------------------
@@ -389,7 +388,7 @@ using namespace ::com::sun::star::uno;
/*N*/ USHORT SfxObjectShell::GetContentCount(USHORT /*nIdx1*/,
/*N*/ USHORT /*nIdx2*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
+/*N*/ { return 0;
/*N*/ }
//--------------------------------------------------------------------
@@ -401,7 +400,7 @@ using namespace ::com::sun::star::uno;
/*N*/ USHORT /*i*/,
/*N*/ USHORT /*nIdx1*/,
/*N*/ USHORT /*nIdx2*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
+/*N*/ {
/*N*/ }
//--------------------------------------------------------------------
@@ -414,7 +413,7 @@ using namespace ::com::sun::star::uno;
/*N*/ USHORT /*i*/,
/*N*/ USHORT /*nIdx1*/,
/*N*/ USHORT /*nIdx2*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
+/*N*/ {
/*N*/ }
//--------------------------------------------------------------------
@@ -435,7 +434,7 @@ using namespace ::com::sun::star::uno;
rufen.
*/
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ {
/*N*/ }
//--------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list