[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svx binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Sep 11 15:38:31 PDT 2011
binfilter/bf_sc/source/ui/inc/viewdata.hxx | 1
binfilter/bf_sfx2/source/appl/makefile.mk | 7 -
binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx | 100 --------------
binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx | 20 +-
binfilter/bf_sfx2/source/appl/sfx2_module.cxx | 32 ++--
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx | 41 +----
binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx | 45 +-----
binfilter/bf_sfx2/source/bastyp/fltlst.hxx | 2
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx | 19 --
binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx | 17 +-
binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx | 6
binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx | 52 -------
binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx | 21 ---
binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx | 10 -
binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx | 16 --
binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx | 31 +---
binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx | 23 ---
binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx | 31 ++--
binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 41 +----
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 11 -
binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx | 146 +++------------------
binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx | 15 --
binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 11 -
binfilter/bf_sfx2/source/inc/cfgmgr.hxx | 8 -
binfilter/bf_sfx2/source/inc/dlgcont.hxx | 1
binfilter/bf_sfx2/source/inc/namecont.hxx | 9 -
binfilter/bf_sfx2/source/inc/scriptcont.hxx | 9 -
binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx | 131 ------------------
binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx | 17 --
binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx | 3
binfilter/inc/bf_sfx2/cfgitem.hxx | 1
binfilter/inc/bf_sfx2/docfile.hxx | 3
binfilter/inc/bf_sfx2/docinf.hxx | 4
binfilter/inc/bf_sfx2/evntconf.hxx | 1
binfilter/inc/bf_sfx2/frameobj.hxx | 7 -
binfilter/inc/bf_sfx2/frmdescr.hxx | 13 -
binfilter/inc/bf_sfx2/macrconf.hxx | 15 --
binfilter/inc/bf_sfx2/minarray.hxx | 4
binfilter/inc/bf_sfx2/misccfg.hxx | 1
binfilter/inc/bf_sfx2/objsh.hxx | 10 -
binfilter/inc/bf_sfx2/progress.hxx | 1
43 files changed, 166 insertions(+), 774 deletions(-)
New commits:
commit b6f6d1a3043bd0a2fe49a9b8a2af3e0842f59ada
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Sep 11 15:37:08 2011 -0700
Misc cleanup of DBG_BF_ASSERT() in bf_sfx2
diff --git a/binfilter/bf_sc/source/ui/inc/viewdata.hxx b/binfilter/bf_sc/source/ui/inc/viewdata.hxx
index a1b16d4..17f50ee 100644
--- a/binfilter/bf_sc/source/ui/inc/viewdata.hxx
+++ b/binfilter/bf_sc/source/ui/inc/viewdata.hxx
@@ -74,7 +74,6 @@ class ScEditEngineDefaulter;
class EditView;
class EditStatus;
class Outliner;
-class SfxObjectShell;
class ScPatternAttr;
class ScRangeListRef;
class ScExtDocOptions;
diff --git a/binfilter/bf_sfx2/source/appl/makefile.mk b/binfilter/bf_sfx2/source/appl/makefile.mk
index fa3e0eb..4263eae 100644
--- a/binfilter/bf_sfx2/source/appl/makefile.mk
+++ b/binfilter/bf_sfx2/source/appl/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -61,12 +61,11 @@ SLOFILES = \
$(SLO)$/sfx2_appdata.obj \
$(SLO)$/sfx2_app.obj \
$(SLO)$/sfx2_appbas.obj \
- $(SLO)$/sfx2_appdde.obj \
$(SLO)$/sfx2_module.obj \
$(SLO)$/sfx2_dlgcont.obj \
$(SLO)$/sfx2_namecont.obj \
$(SLO)$/sfx2_scriptcont.obj \
- $(SLO)$/sfx2_imestatuswindow.obj
+ $(SLO)$/sfx2_imestatuswindow.obj
.IF "$(GUI)"=="WNT"
SLOFILES += \
@@ -78,7 +77,7 @@ EXCEPTIONSFILES=\
$(SLO)$/sfx2_appmain.obj \
$(SLO)$/sfx2_appmisc.obj \
$(SLO)$/sfx2_appinit.obj \
- $(SLO)$/sfx2_appcfg.obj
+ $(SLO)$/sfx2_appcfg.obj
# --- Targets -------------------------------------------------------
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx
deleted file mode 100644
index a7d172f..0000000
--- a/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <bf_svtools/svdde.hxx>
-#include <tools/urlobj.hxx>
-#include <bf_svtools/pathoptions.hxx>
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include "app.hxx"
-#include "appdata.hxx"
-#include "objsh.hxx"
-#include "sfxsids.hrc"
-
-#include <bf_sfx2/sfxuno.hxx>
-
-namespace binfilter {
-
-//========================================================================
-
-/*?*/ long SfxObjectShell::DdeExecute
-/*?*/ (
-/*?*/ const String& /*rCmd*/ // in unserer BASIC-Syntax formuliert
-/*?*/ )
-
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-//--------------------------------------------------------------------
-
-/*?*/ long SfxObjectShell::DdeGetData
-/*?*/ (
-/*?*/ const String& /*rItem*/, // das anzusprechende Item
-/*?*/ const String& /*rMimeType*/, // in: Format
-/*?*/ ::com::sun::star::uno::Any & /*rValue*/ // out: angeforderte Daten
-/*?*/ )
-{DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-//--------------------------------------------------------------------
-
-/*?*/ long SfxObjectShell::DdeSetData
-/*?*/ (
-/*?*/ const String& /*rItem*/, // das anzusprechende Item
-/*?*/ const String& /*rMimeType*/, // in: Format
-/*?*/ const ::com::sun::star::uno::Any & /*rValue*/ // out: angeforderte Daten
-/*?*/ )
-/*?*/
-/* [Beschreibung]
-
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxObjectShell-Subklasse gerichtete DDE-Daten
- zu empfangen.
-
- Die Basisimplementierung nimmt keine Daten entgegen und liefert 0 zur"uck.
-*/
-/*?*/
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-//--------------------------------------------------------------------
-
-/*?*/ ::binfilter::SvLinkSource* SfxObjectShell::DdeCreateLinkSource
-/*?*/ (
-/*?*/ const String& /*rItem*/ // das zu erzeugende Item
-/*?*/ )
-
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-//--------------------------------------------------------------------
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx
index 68d2fbe..65ab8cd 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx
@@ -142,16 +142,16 @@ SfxDialogLibraryContainer::SfxDialogLibraryContainer( void )
/*?*/ }
-/*?*/ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
-/*?*/ ( const OUString& /*aFile*/, SotStorageStreamRef /*xElementStream*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); Any aAny; return aAny;
-/*?*/ }
-
-/*?*/ void SAL_CALL SfxDialogLibraryContainer::importFromOldStorage( const ::rtl::OUString& /*aFile*/ )
-/*?*/ {
-/*?*/ // Nothing to do here, old dialogs cannot be imported
-/*?*/ }
-
+Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
+(
+ const OUString& /*aFile*/,
+ SotStorageStreamRef /*xElementStream*/
+)
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ Any aAny;
+ return aAny;
+}
//============================================================================
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_module.cxx b/binfilter/bf_sfx2/source/appl/sfx2_module.cxx
index fbb7d06..091428d 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_module.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_module.cxx
@@ -45,24 +45,28 @@ static SfxModuleArr_Impl* pModules=0;
/*N*/ TYPEINIT1(SfxModule, SfxShell);
-/*?*/ BOOL SfxModule::QueryUnload()
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*?*/ }
+BOOL SfxModule::QueryUnload()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return FALSE;
+}
-/*?*/ SfxModule* SfxModule::Load()
-/*?*/ {
-/*?*/ return 0;
-/*?*/ }
+SfxModule* SfxModule::Load()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return 0;
+}
-/*?*/ void SfxModule::Free()
-/*?*/ {
-/*?*/ }
+void SfxModule::Free()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ ResMgr* SfxModule::GetResMgr()
-/*N*/ {
-/*N*/ return pResMgr;
-/*N*/ }
+ResMgr* SfxModule::GetResMgr()
+{
+ return pResMgr;
+}
//====================================================================
/*N*/ SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index 7e19151..938212d 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -333,8 +333,7 @@ namespace SfxContainer_Impl
/*?*/ sal_Bool bOldStorage = SotStorage::IsOLEStorage( aInitFileName );
/*?*/ if( bOldStorage )
/*?*/ {
-/*?*/ meInitMode = OLD_BASIC_STORAGE;
-/*?*/ importFromOldStorage( aInitFileName );
+/*?*/ meInitMode = OLD_BASIC_STORAGE;
/*?*/ return sal_True;
/*?*/ }
/*?*/ else
@@ -720,23 +719,6 @@ namespace SfxContainer_Impl
/*N*/ }
-// Storing with password encryption
-
-// Empty implementation, avoids unneccesary implementation in dlgcont.cxx
-/*?*/ sal_Bool SfxLibraryContainer_Impl::implStorePasswordLibrary( SfxLibrary_Impl* /*pLib*/,
-/*?*/ const OUString& /*aName*/, SotStorageRef /*xStorage*/ )
-/*?*/ {
-/*?*/ return sal_False;
-/*?*/ }
-
-/*?*/ sal_Bool SfxLibraryContainer_Impl::implLoadPasswordLibrary
-/*?*/ ( SfxLibrary_Impl* /*pLib*/, const OUString& /*Name*/, sal_Bool /*bVerifyPasswordOnly*/ )
-/*?*/ throw(WrappedTargetException, RuntimeException)
-/*?*/ {
-/*?*/ return sal_True;
-/*?*/ }
-
-
#define EXPAND_PROTOCOL "vnd.sun.star.expand"
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
@@ -1159,10 +1141,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
if( bComplete )
loadLibrary( rLib.aName );
- if( pImplLib->mbPasswordProtected )
- implStorePasswordLibrary( pImplLib, rLib.aName, xLibraryStor );
- // TODO: Check return value
- else
+ if( !pImplLib->mbPasswordProtected )
implStoreLibrary( pImplLib, rLib.aName, xLibraryStor );
implStoreLibraryIndexFile( pImplLib, rLib, xLibraryStor );
@@ -1375,10 +1354,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ if( !bLoaded && xNameAccess->hasElements() )
/*N*/ {
/*N*/ if( pImplLib->mbPasswordProtected )
-/*N*/ {
-/*N*/ implLoadPasswordLibrary( pImplLib, Name );
/*N*/ return;
-/*N*/ }
/*N*/
/*N*/ sal_Bool bLink = pImplLib->mbLink;
/*N*/ sal_Bool bStorage = mxStorage.Is() && !bLink;
@@ -1505,11 +1481,14 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& N
/*?*/ { return sal_False;
/*?*/ }
-/*?*/ void SAL_CALL SfxLibraryContainer_Impl::changeLibraryPassword( const OUString& /*Name*/,
-/*?*/ const OUString& /*OldPassword*/, const OUString& /*NewPassword*/ )
-/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {
-/*?*/ }
+void SAL_CALL SfxLibraryContainer_Impl::changeLibraryPassword(
+ const OUString& /*Name*/,
+ const OUString& /*OldPassword*/,
+ const OUString& /*NewPassword*/
+) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
// Methods XContainer
/*N*/ void SAL_CALL SfxLibraryContainer_Impl::addContainerListener( const Reference< XContainerListener >& xListener )
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
index 7d07041..0386d63 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
@@ -268,12 +268,6 @@ void SfxScriptLibraryContainer::setLibraryPassword(
/*N*/ }
-/*?*/ void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const ::rtl::OUString& /*aFile*/ )
-/*?*/ {
- OSL_FAIL("Strip");
-/*?*/ }
-
-
// Storing with password encryption
// Methods XLibraryContainerPassword
@@ -314,43 +308,20 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
else
{
pImplLib->maPassword = Password;
- bSuccess = implLoadPasswordLibrary( pImplLib, Name, sal_True );
- if( bSuccess )
- {
- // The library gets modified by verifiying the password, because other-
- // wise for saving the storage would be copied and that doesn't work
- // with mtg's storages when the password is verified
- pImplLib->mbModified = sal_True;
- pImplLib->mbPasswordVerified = sal_True;
-
- // Reload library to get source
- if( pImplLib->mbLoaded )
- implLoadPasswordLibrary( pImplLib, Name );
- }
}
return bSuccess;
/*?*/ }
-/*?*/ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& /*Name*/,
-/*?*/ const OUString& /*OldPassword*/, const OUString& /*NewPassword*/ )
-/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
-
-
+void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword(
+ const OUString& /*Name*/,
+ const OUString& /*OldPassword*/,
+ const OUString& /*NewPassword*/
+) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-// Impl methods
-/*?*/ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary_Impl* /*pLib*/,
-/*?*/ const ::rtl::OUString& /*aName*/, SotStorageRef /*xStorage*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*?*/ }
-/*?*/ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
-/*?*/ ( SfxLibrary_Impl* /*pLib*/, const OUString& /*Name*/, sal_Bool /*bVerifyPasswordOnly*/ )
-/*?*/ throw(WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*?*/ }
//============================================================================
diff --git a/binfilter/bf_sfx2/source/bastyp/fltlst.hxx b/binfilter/bf_sfx2/source/bastyp/fltlst.hxx
index 064d0f0..5db0bf8 100644
--- a/binfilter/bf_sfx2/source/bastyp/fltlst.hxx
+++ b/binfilter/bf_sfx2/source/bastyp/fltlst.hxx
@@ -62,7 +62,7 @@ class SfxFilterListener : public ::cppu::WeakImplHelper1< ::com::sun::star::util
public:
SfxFilterListener( const ::rtl::OUString& sFactory ,
SfxFilterContainer* pContainer );
- ~SfxFilterListener( );
+ ~SfxFilterListener() {};
// uno interface
public:
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index 1d90864..a877c0a 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -180,9 +180,11 @@ public:
//----------------------------------------------------------------
-/*?*/ ULONG SfxFilterContainer::Execute( SfxMedium& /*rMedium*/, SfxFrame*& /*pFrame*/) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
+ULONG SfxFilterContainer::Execute( SfxMedium& /*rMedium*/, SfxFrame*& /*pFrame*/) const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return 0;
+}
//----------------------------------------------------------------
@@ -488,8 +490,6 @@ void SfxFilterMatcher::AddContainer( SfxFilterContainer* pC )
/*?*/ if ( aMime.EqualsAscii(CONTENT_TYPE_STR_X_CNT_HTTPFILE) )
/*?*/ // FilterDetection nur "uber den Content
/*?*/ return ERRCODE_NONE;
-/*?*/ else
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*?*/
/*?*/ if ( pFilter && aMime.EqualsAscii(CONTENT_TYPE_STR_APP_OCTSTREAM) )
/*?*/ {
@@ -678,21 +678,12 @@ if( nErr == 1 || nErr == USHRT_MAX || nErr == ULONG_MAX ) \
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ // Jetzt einmal drueberiterieren und nur die perfekten Filter nehmen
-/*N*/ if( !pFilter )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ // Letzte Moeglichkeit ist die Befragung aller ObjectFactories.
/*N*/ if( !pFilter )
/*N*/ {
/*N*/ // Achtung: hier k"onnte auch asynchron detected werden!
/*?*/ if ( !rMedium.IsDownloadDone_Impl() )
/*?*/ return ERRCODE_IO_PENDING;
-/*?*/
-/*?*/ //DV !!!! don't close InStream when using the new Medium
-/*?*/ //rMedium.CloseInStream();
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/
/*N*/ *ppFilter = pFilter;
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx
index 10299e7..77fbede 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx
@@ -126,17 +126,16 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
-/*?*/ SfxFilterListener::~SfxFilterListener()
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
+void SAL_CALL SfxFilterListener::flushed( const lang::EventObject& /*aSource*/ ) throw( uno::RuntimeException )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*?*/ void SAL_CALL SfxFilterListener::flushed( const lang::EventObject& /*aSource*/ ) throw( uno::RuntimeException )
-/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }
-/*?*/ }
+void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& /*aSource*/ ) throw( uno::RuntimeException )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*?*/ void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& /*aSource*/ ) throw( uno::RuntimeException )
-/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }
-/*?*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
index 3551161..bacb3f7 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
@@ -151,12 +151,6 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*?*/ BOOL SfxPtrArr::Replace( void* /*aOldElem*/, void* /*aNewElem*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
/*N*/ {
/*N*/ DBG_MEMTEST();
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
index defb7e9..cd08a60 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
@@ -74,8 +74,6 @@ struct SfxProgress_Impl : public SfxCancellable
SfxObjectShellRef xObjSh;
SfxProgress_Impl( const String& );
- void Enable_Impl( BOOL );
-
};
//========================================================================
@@ -91,7 +89,6 @@ struct SfxProgress_Impl : public SfxCancellable
#define aTypeLibInfo aProgressTypeLibImpl
//========================================================================
-//#if (_MSC_VER < 1300)
inline ULONG Get10ThSec()
{
#if defined (MSC) && defined (WIN)
@@ -102,21 +99,6 @@ inline ULONG Get10ThSec()
return n10Ticks / CLOCKS_PER_SEC;
}
-//#else
-//extern ULONG Get10ThSec();
-//#endif
-// -----------------------------------------------------------------------
-
-/*N*/ void SfxProgress_Impl::Enable_Impl( BOOL /*bEnable*/ )
-/*N*/ {
-/*N*/ SfxObjectShell* pDoc = bAllDocs ? NULL : (SfxObjectShell*) xObjSh;
-/*N*/
-/*N*/ if ( pDoc )
-/*N*/ {
-/*N*/ }
-/*N*/ else
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
// -----------------------------------------------------------------------
@@ -178,8 +160,6 @@ inline ULONG Get10ThSec()
/*N*/ pImp->pActiveProgress = GetActiveProgress( pObjSh );
/*N*/ if ( pObjSh )
/*N*/ pObjSh->SetProgress_Impl(this);
-/*N*/ else if( !pImp->pActiveProgress )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ Resume();
/*N*/ }
@@ -229,36 +209,14 @@ inline ULONG Get10ThSec()
/*N*/ Suspend();
/*N*/ if ( pImp->xObjSh.Is() )
/*N*/ pImp->xObjSh->SetProgress_Impl(0);
-/*N*/ else
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ if ( pImp->bLocked )
-/*N*/ pImp->Enable_Impl(TRUE);
/*N*/ }
// -----------------------------------------------------------------------
-
-/*?*/ void SfxProgress::SetText
-/*?*/ (
-/*?*/ const String& /*rText*/ /* neuer Text */
-/*?*/ )
-
-/* [Beschreibung]
-
- "Andert den Text, der links neben dem Fortschritts-Balken
- angezeigt wird.
-*/
-
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
-/*N*/ BOOL SfxProgress::SetState
-/*N*/ (
-/*N*/ ULONG nNewVal, /* neuer Wert f"ur die Fortschritts-Anzeige */
-/*N*/
-/*N*/ ULONG nNewRange /* neuer Maximalwert, 0 f"ur Beibehaltung des alten */
-/*N*/ )
+BOOL SfxProgress::SetState
+(
+ ULONG nNewVal, /* neuer Wert f"ur die Fortschritts-Anzeige */
+ ULONG nNewRange /* neuer Maximalwert, 0 f"ur Beibehaltung des alten */
+)
/* [Beschreibung]
Setzen des aktuellen Status; nach einem zeitlichen Versatz
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx
index de0d6d5..0801706 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx
@@ -68,14 +68,11 @@ namespace binfilter {
/*N*/ }
// ----------------------------------------------------------------------
-/*N*/ BOOL SfxConfigItem::StoreConfig()
-/*N*/ {
-/*N*/ BOOL bRet = FALSE;
-/*N*/ if ( m_pCfgMgr && m_bModified )
-/*?*/ bRet = m_pCfgMgr->StoreConfigItem( *this );
-/*N*/ m_bModified = FALSE;
-/*N*/ return bRet;
-/*N*/ }
+BOOL SfxConfigItem::StoreConfig()
+{
+ m_bModified = FALSE;
+ return FALSE;;
+}
// ------------------------------------------------------------------------
/*N*/ void SfxConfigItem::SetDefault( BOOL bOn )
@@ -89,17 +86,9 @@ namespace binfilter {
/*N*/ void SfxConfigItem::SetModified( BOOL bMod )
/*N*/ {
/*N*/ if ( m_bInitialized )
-/*N*/ {
/*N*/ m_bModified = bMod;
-/*N*/ if ( bMod && m_pCfgMgr )
-/*?*/ m_pCfgMgr->SetModified( bMod );
-/*N*/ }
/*N*/ }
-/*?*/ BOOL SfxConfigItem::ReInitialize()
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*?*/ }
-
/*?*/ String SfxConfigItem::GetStreamName( USHORT /*nType*/ )
/*?*/ {
/*?*/ return String();
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
index 12acd67..bc763ce 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -64,7 +64,6 @@ static const char pStorageName[] = "Configurations";
/*N*/ SfxConfigManager::SfxConfigManager( SotStorage* pStorage )
/*N*/ : pObjShell( NULL )
/*N*/ , nErrno( ERR_NO )
-/*N*/ , bModified( FALSE )
/*N*/ {
/*N*/ DBG_CTOR(SfxConfigManager, 0);
/*N*/
@@ -102,7 +101,6 @@ static const char pStorageName[] = "Configurations";
/*N*/ SfxConfigManager::SfxConfigManager( SfxObjectShell& rShell )
/*N*/ : pObjShell( &rShell )
/*N*/ , nErrno( ERR_NO )
-/*N*/ , bModified( FALSE )
/*N*/ {
/*N*/ DBG_CTOR(SfxConfigManager, 0);
/*N*/
@@ -154,10 +152,6 @@ static const char pStorageName[] = "Configurations";
// ------------------------------------------------------------------------
-/*?*/ void SfxConfigManager::SetModified(BOOL /*bMod*/)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
/*N*/ BOOL SfxConfigManager::HasConfiguration( SotStorage& rStorage )
/*N*/ {
/*N*/ if ( rStorage.IsOLEStorage() )
@@ -336,10 +330,6 @@ static const char pStorageName[] = "Configurations";
/*N*/ return FALSE;
/*N*/ }
-/*?*/ BOOL SfxConfigManager::StoreConfigItem( SfxConfigItem& /*rCItem*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE;
-/*?*/ }
-
/*N*/ static const char pHeader[] = "Star Framework Config File";
/*N*/ #define CFG_STREAM_BUFFER_SIZE 5000
/*N*/ static const USHORT nVersion = 26;
diff --git a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
index f01a862..e13318e 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
@@ -187,7 +187,7 @@ void SfxEventConfiguration::RegisterEvent(USHORT nId, const String& rName)
/*?*/ USHORT nEventId = (*pEvConfig->pEventArr)[n+1]->nEventId;
/*?*/ if ( nEventId == nId )
/*?*/ {
-/*?*/ SvxMacro *pMacro = new SvxMacro( aInfo.GetQualifiedName(), aInfo.GetBasicName(), STARBASIC );
+/*?*/ SvxMacro *pMacro = new SvxMacro( String(), String(), STARBASIC );
/*?*/ aLocalMacroTable.Insert( nEventId, pMacro );
/*?*/ break;
/*?*/ }
@@ -228,15 +228,11 @@ void SfxEventConfiguration::RegisterEvent(USHORT nId, const String& rName)
/*N*/ pEvConfig->PropagateEvents_Impl( pObjShell, aMacroTable );
/*N*/ }
-/*?*/ int SfxEventConfigItem_Impl::Load( SotStorage& /*rStorage*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-//==========================================================================
-
-/*N*/ SfxEventConfigItem_Impl::~SfxEventConfigItem_Impl()
-/*N*/ {
-/*N*/ }
+int SfxEventConfigItem_Impl::Load( SotStorage& /*rStorage*/ )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return 0;
+}
//==========================================================================
diff --git a/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx b/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx
index d0ba363..c64cf74 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx
@@ -45,12 +45,11 @@ using namespace ::com::sun::star::uno;
using ::rtl::OUString;
-#define C2U(cChar) OUString::createFromAscii(cChar)
/*--------------------------------------------------------------------
Beschreibung:
--------------------------------------------------------------------*/
/*N*/ SfxMiscCfg::SfxMiscCfg() :
-/*N*/ ConfigItem(C2U("Office.Common") ),
+/*N*/ ConfigItem(OUString::createFromAscii("Office.Common") ),
/*N*/ bPaperSize(FALSE),
/*N*/ bPaperOrientation (FALSE),
/*N*/ bNotFound (FALSE),
@@ -60,11 +59,6 @@ using ::rtl::OUString;
/*N*/ }
-/*N*/ SfxMiscCfg::~SfxMiscCfg()
-/*N*/ {
-/*N*/ }
-
-
/*N*/ const Sequence<OUString>& SfxMiscCfg::GetPropertyNames()
/*N*/ {
/*N*/ static Sequence<OUString> aNames;
@@ -72,12 +66,12 @@ using ::rtl::OUString;
/*N*/ {
/*N*/ static const char* aPropNames[] =
/*N*/ {
-/*N*/ "Print/Warning/PaperSize", // 0
-/*N*/ "Print/Warning/PaperOrientation", // 1
-/*N*/ "Print/Warning/NotFound", // 2
+/*N*/ "Print/Warning/PaperSize", // 0
+/*N*/ "Print/Warning/PaperOrientation", // 1
+/*N*/ "Print/Warning/NotFound", // 2
/*N*/ "DateFormat/TwoDigitYear", // 3
/*N*/ };
-/*N*/ const int nCount = 4;
+/*N*/ const int nCount = 4;
/*N*/ aNames.realloc(nCount);
/*N*/ OUString* pNames = aNames.getArray();
/*N*/ for(int i = 0; i < nCount; i++)
@@ -102,10 +96,10 @@ using ::rtl::OUString;
/*N*/ {
/*N*/ switch(nProp)
/*N*/ {
-/*N*/ case 0: bPaperSize = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperSize",
-/*N*/ case 1: bPaperOrientation = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperOrientation",
-/*N*/ case 2: bNotFound = *(sal_Bool*)pValues[nProp].getValue() ; break; //"Print/Warning/NotFound",
-/*N*/ case 3: pValues[nProp] >>= nYear2000;break; //"DateFormat/TwoDigitYear",
+/*N*/ case 0: bPaperSize = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperSize",
+/*N*/ case 1: bPaperOrientation = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperOrientation",
+/*N*/ case 2: bNotFound = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/NotFound",
+/*N*/ case 3: pValues[nProp] >>= nYear2000; break; //"DateFormat/TwoDigitYear",
/*N*/ }
/*N*/ }
/*N*/ }
@@ -119,9 +113,10 @@ using ::rtl::OUString;
/*?*/ }
-/*?*/ void SfxMiscCfg::Commit()
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
+void SfxMiscCfg::Commit()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
}
diff --git a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
index 1f7b233..45c3377 100644
--- a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
+++ b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
@@ -81,24 +81,6 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
//==========================================================================
-/*?*/ sal_Bool SfxMacroInfo::operator==(const SfxMacroInfo&) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*?*/ }
-
-//==========================================================================
-
-/*?*/ String SfxMacroInfo::GetQualifiedName() const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String();
-/*?*/ }
-
-//==========================================================================
-
-/*?*/ String SfxMacroInfo::GetBasicName() const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String();
-/*?*/ }
-
-//==========================================================================
-
/*?*/ SvStream& operator >> (SvStream& rStream, SfxMacroInfo& rInfo)
/*?*/ {
/*?*/ sal_uInt16 nAppBasic, nFileVersion;
@@ -149,7 +131,6 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
/*?*/ {
/*?*/ rStream << nVersion
/*?*/ << (sal_uInt16) rInfo.bAppBasic;
-/*?*/ rStream.WriteByteString(rInfo.GetBasicName(),RTL_TEXTENCODING_UTF8);
/*?*/ rStream.WriteByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
/*?*/ rStream.WriteByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
/*?*/ rStream.WriteByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
@@ -176,10 +157,6 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
/*?*/ delete pImp;
/*?*/ }
-/*?*/ ErrCode SfxMacroConfig::Call(SbxObject*,
-/*?*/ const String&, BasicManager*, SbxArray *, SbxValue *)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
index 833fd61..e0f83f9 100644
--- a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
+++ b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
@@ -199,9 +199,10 @@ using ::rtl::OUString;
// -----------------------------------------------------------------------
-/*N*/ SvxSearchItem::~SvxSearchItem()
-/*N*/ {
-/*N*/ }
+SvxSearchItem::~SvxSearchItem()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
// -----------------------------------------------------------------------
/*N*/ SfxPoolItem* SvxSearchItem::Clone( SfxItemPool * /*pPool*/) const
@@ -257,22 +258,28 @@ using ::rtl::OUString;
/*N*/ return SFX_ITEM_PRESENTATION_NONE;
/*N*/ }
-/*N*/ void SvxSearchItem::Notify( const Sequence< OUString > & /*rPropertyNames*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void SvxSearchItem::Notify( const Sequence< OUString > & /*rPropertyNames*/ )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ bool SvxSearchItem::QueryValue( ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMemberId*/ ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return true;
-/*N*/ }
+bool SvxSearchItem::QueryValue( ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMemberId*/ ) const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return true;
+}
// -----------------------------------------------------------------------
-/*N*/ bool SvxSearchItem::PutValue( const ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMemberId*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return true;
-/*N*/ }
+bool SvxSearchItem::PutValue( const ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMemberId*/ )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return true;
+}
void SvxSearchItem::Commit()
{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
}
}
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx
index 1d71034..769e55a 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx
@@ -249,7 +249,7 @@ DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 )
/*N*/ }
/*?*/ const SfxObjectFactory* SfxObjectFactory::GetFactory( const String& rFactoryURL )
-/*?*/ { // #dochnoetig# DBG_BF_ASSERT(0, "STRIP"); return 0;
+/*?*/ {
/*N*/ const SfxObjectFactory* pFactory = 0;
/*N*/ String aFact( rFactoryURL );
/*N*/ String aPrefix( DEFINE_CONST_UNICODE( "private:factory/" ) );
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 227916f..0e3d56f 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -149,7 +149,6 @@ namespace binfilter {
/*N*/ {
/*N*/ break;
/*N*/ case DATA_AVAILABLE :
-/*?*/ m_pMedium->DataAvailable_Impl();
/*N*/ break;
/*N*/ case DONE :
/*N*/ m_pMedium->Done_Impl( xLockBytes->GetError() );
@@ -193,17 +192,15 @@ namespace binfilter {
/*N*/ : m_xInter( xInteraction )
/*N*/ {}
/*N*/
-/*N*/ ~SfxMediumHandler_Impl();
+/*N*/ ~SfxMediumHandler_Impl() {};
/*N*/ };
-/*N*/ SfxMediumHandler_Impl::~SfxMediumHandler_Impl()
-/*N*/ {
-/*N*/ }
-
-/*N*/ void SAL_CALL SfxMediumHandler_Impl::handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& /*xRequest*/ )
-/*N*/ throw( ::com::sun::star::uno::RuntimeException )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void SAL_CALL SfxMediumHandler_Impl::handle(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& /*xRequest*/
+) throw( ::com::sun::star::uno::RuntimeException )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
/*?*/ String ConvertDateTime_Impl(const SfxStamp &rTime, const LocaleDataWrapper& rWrapper);
@@ -335,10 +332,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void SfxMedium::DataAvailable_Impl()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void SfxMedium::Cancel_Impl()
/*N*/ {
/*N*/ SetError( ERRCODE_IO_GENERAL );
@@ -692,12 +685,6 @@ namespace binfilter {
/*N*/ }
//------------------------------------------------------------------
-/*N*/ sal_Bool SfxMedium::TryStorage()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-
-//------------------------------------------------------------------
/*N*/ SvStorage* SfxMedium::GetOutputStorage( BOOL bUCBStorage )
/*N*/ {
/*N*/ // if the medium was constructed with a SvStorage: use this one, not a temp. storage
@@ -887,7 +874,6 @@ namespace binfilter {
/*?*/
/*?*/ String aTemp;
/*?*/ ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTmpName, aTemp );
-/*?*/ SetPhysicalName_Impl( aTemp );
/*?*/
/*?*/ pImp->bIsTemp = sal_True;
/*?*/ GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
@@ -954,12 +940,12 @@ namespace binfilter {
/*N*/ {
/*N*/ if( pImp->pTempFile && ( !eError || eError & ERRCODE_WARNING_MASK ) )
/*N*/ {
-/*N*/ Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
+/*N*/ Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
/*N*/ Reference< XOutputStream > rOutStream;
/*N*/
/*N*/ // in case an output stream is provided from outside and the URL is correct
/*N*/ // commit to the stream
-/*N*/ if( aLogicName.CompareToAscii( "private:stream", 14 ) == COMPARE_EQUAL )
+/*N*/ if( aLogicName.CompareToAscii( "private:stream", 14 ) == COMPARE_EQUAL )
/*N*/ {
/*N*/ SFX_ITEMSET_ARG( pSet, pOutStreamItem, SfxUnoAnyItem, SID_OUTPUTSTREAM, sal_False);
/*N*/ if( pOutStreamItem && ( pOutStreamItem->GetValue() >>= rOutStream ) )
@@ -994,7 +980,7 @@ namespace binfilter {
/*N*/ catch( Exception& )
/*N*/ {}
/*N*/ }
-/*N*/ }
+/*N*/ }
/*N*/ else
/*N*/ {
/*N*/ OSL_FAIL( "Illegal Output stream parameter!\n" );
@@ -1006,7 +992,7 @@ namespace binfilter {
/*N*/
/*N*/ return;
/*N*/ }
-/*N*/ DBG_BF_ASSERT(0, "STRIP"); return;
+ return;
/*?*/ }
/*N*/ }
@@ -1420,11 +1406,6 @@ namespace binfilter {
/*N*/ }
//----------------------------------------------------------------
-/*N*/ void SfxMedium::SetPhysicalName_Impl( const String& /*rNameP*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-//------------------------------------------------------------------
/*N*/ sal_Bool SfxMedium::IsTemporary() const
/*N*/ {
/*N*/ return pImp->bIsTemp;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index 0ee6ff5..7875b2f 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -42,15 +42,6 @@ namespace binfilter {
/*N*/ TYPEINIT1_AUTOFACTORY(SfxDocumentInfoItem, SfxStringItem);
-//------------------------------------------------------------------------
-
-/*?*/ SfxDocumentInfoItem::SfxDocumentInfoItem() :
-/*?*/
-/*?*/ SfxStringItem()
-/*?*/
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
//========================================================================
static const char pDocInfoSlot[] = "SfxDocumentInfo";
@@ -391,6 +382,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ aTitle( rTitle ), aWord( rWord )
/*N*/ {
/*N*/ }
+
//------------------------------------------------------------------------
/*N*/ const SfxDocUserKey& SfxDocUserKey::operator=(const SfxDocUserKey &rCopy)
/*N*/ {
@@ -398,6 +390,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ aWord = rCopy.aWord;
/*N*/ return *this;
/*N*/ }
+
// SfxDocumentInfo -------------------------------------------------------
/*N*/ sal_Bool TestValidity_Impl( const String& rString, sal_Bool bURL )
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx b/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx
index d7aab3b..34087fa 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx
@@ -78,137 +78,43 @@ namespace binfilter {
/*N*/ };
-
-
-
-//=========================================================================
-/* [Beschreibung]
-
- Das Environment wird im <SfxFrameObject::InPlaceActivate()> angelegt.
- Durch die Verbindung mit dem Container Environment kann "uber die
- UI-Tools und Fenster verhandelt werden.
-
- [Querverweise]
-
- <SvInPlaceEnvironment>, <SvContainerEnvironment>
-*/
-
-//=========================================================================
-/* [Beschreibung]
-
- Die angelegten Fenster werden zerst"ort.
-*/
-
-
//=========================================================================
//============== SfxFrameObject ===========================================
//=========================================================================
-/*N*/ SO2_IMPL_BASIC_CLASS1_DLL( SfxFrameObject, SvFactory, SvInPlaceObject,
-/*N*/ SvGlobalName( BF_SO3_IFRAME_CLASSID ) )
+SO2_IMPL_BASIC_CLASS1_DLL(
+ SfxFrameObject,
+ SvFactory,
+ SvInPlaceObject,
+ SvGlobalName( BF_SO3_IFRAME_CLASSID )
+)
//=========================================================================
-/*?*/ SfxFrameObject::SfxFrameObject()
-/*?*/ : pImpl( new SfxFrameObject_Impl )
-/* [Beschreibung]
-
- Konstruktor der Klasse SfxFrameObject. Die Verbliste und das
- Format werden global initialisiert.
-*/
-/*?*/ {
-/*?*/ }
-
-//=========================================================================
-/*?*/ SfxFrameObject::~SfxFrameObject()
-/* [Beschreibung]
-
- Destruktor der Klasse SfxFrameObject.
-*/
-/*?*/ {
-/*?*/ delete pImpl;
-/*?*/ }
-
-/*N*/ BOOL SfxFrameObject::Load
-/*N*/ (
-/*N*/ SvStorage * /*pStor*/ /* Storage aus dem das Objekt geladen wird. */
-/*N*/ )
-/* [Beschreibung]
-
- Nach dem Konstruktor muss diese Methode oder InitNew gerufen werden,
- um das Objekt zu initialisieren.
-
- [R"uckgabewert]
-
- BOOL TRUE, das Objekt wurde geladen.
- FALSE, das Objekt wurde nicht geladen, es
- muss sofort freigegeben werden.
-
- [Querverweise]
-
- <SvPersist::Load>
-*/
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return FALSE;
-/*N*/ }
-
-//=========================================================================
-/* [Beschreibung]
-
- Ab diesen Zeitpunkt, bis zum <SfxFrameObject::SaveCompleted>,
- darf auf den Storage im Objekt nicht zugegriffen werden.
-
- [Querverweise]
-
- <SvPersist::HandsOff>
-*/
-
-//=========================================================================
-
+SfxFrameObject::SfxFrameObject()
+ : pImpl( new SfxFrameObject_Impl )
+{
+}
//=========================================================================
-/* [Beschreibung]
-
- Da ein Applet immer aktiviert wird, es ein Link ist und er
- keine UI-Tools braucht, muss dieser Status zur"uckgegeben werden.
-
- [R"uckgabewert]
-
- ULONG Es wird immer SVOBJ_MISCSTATUS_LINK,
- SVOBJ_MISCSTATUS_INSIDEOUT und
- SVOBJ_MISCSTATUS_ACTIVATEWHENVISIBLE zur"uckgegeben
-
- [Querverweise]
+SfxFrameObject::~SfxFrameObject()
+{
+ delete pImpl;
+}
- <SvPseudoObject::GetMiscStatus()>
-*/
+BOOL SfxFrameObject::Load
+(
+ SvStorage* /*pStor*/
+)
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return FALSE;
+}
//=========================================================================
-/* [Beschreibung]
-
- Dieser Typ von Objekt ist immer ein Link.
- [R"uckgabewert]
-
- BOOL Immer TRUE.
-
- [Querverweise]
-
- <SvPseudoObject::IsLink()>
-*/
-
-/*?*/ void SfxFrameObject::SetFrameDescriptor( const SfxFrameDescriptor * /*pD*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
-/*?*/ const SfxFrameDescriptor* SfxFrameObject::GetFrameDescriptor() const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*?*/ }
-
-
-
-/*N*/ SfxFrameObjectFactoryPtr* SfxFrameObject::GetFactoryPtr()
-/*N*/ {
-/*N*/ return SFX_APP()->Get_Impl()->pSfxFrameObjectFactoryPtr;
-/*N*/ }
+SfxFrameObjectFactoryPtr* SfxFrameObject::GetFactoryPtr()
+{
+ return SFX_APP()->Get_Impl()->pSfxFrameObjectFactoryPtr;
+}
}
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx b/binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx
index a63d172..c27189a 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx
@@ -81,8 +81,6 @@ namespace binfilter {
/*N*/ DBG_CTOR(SfxFrameDescriptor, 0);
/*N*/
/*N*/ pImp = new SfxFrameDescriptor_Impl;
-/*N*/ if ( pParentFrameSet )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
/*N*/ SfxFrameDescriptor::~SfxFrameDescriptor()
@@ -91,20 +89,9 @@ namespace binfilter {
/*N*/
/*N*/ if ( pFrameSet )
/*N*/ delete pFrameSet;
-/*N*/ if ( pParentFrameSet )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ delete pImp;
/*N*/ }
-/*?*/ void SfxFrameDescriptor::SetURL( const String& /*rURL*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
-/*N*/ SfxFrameDescriptor* SfxFrameDescriptor::Clone(
-/*N*/ SfxFrameSetDescriptor * /*pSet*/, BOOL /*bWithIds*/ ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
/*N*/ SfxFrameProperties& SfxFrameProperties::operator =(
/*N*/ const SfxFrameProperties &rProp )
/*N*/ {
@@ -126,7 +113,7 @@ namespace binfilter {
/*N*/ bIsRootSet = rProp.bIsRootSet;
/*N*/ bIsInColSet = rProp.bIsInColSet;
/*N*/ bHasBorderInherited = rProp.bHasBorderInherited;
-/*N*/ pFrame = rProp.pFrame->Clone();
+/*N*/ pFrame = NULL;
/*N*/ return *this;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
index f970f68..70742bd 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
@@ -783,7 +783,7 @@ namespace binfilter {
/*?*/ BasicManager *pMgr = GetBasicManager();
/*?*/ if( pApp->GetName() == rBasic )
/*?*/ pMgr = pApp->GetBasicManager();
-/*?*/ ErrCode nRet = SfxMacroConfig::Call( pVCtrl, rMacro, pMgr, pArgs, pRet );
+/*?*/ ErrCode nRet = 0;
/*?*/ pApp->LeaveBasicCall();
/*?*/ return nRet;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index eb91c7d..4eb5dbe 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -298,7 +298,6 @@ sal_False Das Objekt konnte nicht geladen werden
pMedium = pMed;
sal_Bool bOk = sal_False;
- const SfxFilter* pFilter = pMed->GetFilter();
SfxItemSet* pSet = pMedium->GetItemSet();
if( !pImp->nEventId )
{
@@ -335,16 +334,6 @@ sal_False Das Objekt konnte nicht geladen werden
/*SfxApplication* pApp =*/ SFX_APP();
pImp->nLoadedFlags = 0;
- sal_Bool bHasStorage = !pFilter || ( pFilter->IsOwnFormat() && pFilter->UsesStorage() );
- if ( !bHasStorage && pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_PACKED ) )
- {
- bHasStorage = pMed->TryStorage();
- if ( bHasStorage )
- {
- String aLclName( pMed->GetPhysicalName() );
- ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aLclName, aBaseURL );
- }
- }
if ( pMedium->GetFilter() )
{
diff --git a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
index 9ff129a..67865a7 100644
--- a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
+++ b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
@@ -44,7 +44,6 @@ private:
SfxObjectShell* pObjShell;
SfxConfigItemArr_Impl* pItemArr;
USHORT nErrno;
- BOOL bModified;
// to prevent from using
SfxConfigManager( const SfxConfigManager& );
@@ -82,15 +81,8 @@ public:
{ return nErrno; }
BOOL LoadConfigItem( SfxConfigItem& );
- BOOL StoreConfigItem( SfxConfigItem& );
BOOL StoreAlwaysConfigItem( SfxConfigItem& );
- // Reload all items using a special stream
- void ReInitialize( const String& rStreamName );
-
- void SetModified(BOOL);
- BOOL IsModified()
- { return bModified; }
SfxObjectShell* GetObjectShell() const
{ return pObjShell; }
};
diff --git a/binfilter/bf_sfx2/source/inc/dlgcont.hxx b/binfilter/bf_sfx2/source/inc/dlgcont.hxx
index 97b86a9..546f605 100644
--- a/binfilter/bf_sfx2/source/inc/dlgcont.hxx
+++ b/binfilter/bf_sfx2/source/inc/dlgcont.hxx
@@ -53,7 +53,6 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer_Impl
throw(::com::sun::star::uno::Exception);
virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement
( const ::rtl::OUString& aFile, SotStorageStreamRef xElementStream );
- virtual void SAL_CALL importFromOldStorage( const ::rtl::OUString& aFile );
virtual SfxLibraryContainer_Impl* createInstanceImpl( void ){DBG_BF_ASSERT(0, "STRIP");return NULL;}
diff --git a/binfilter/bf_sfx2/source/inc/namecont.hxx b/binfilter/bf_sfx2/source/inc/namecont.hxx
index e8bceef..41ac247 100644
--- a/binfilter/bf_sfx2/source/inc/namecont.hxx
+++ b/binfilter/bf_sfx2/source/inc/namecont.hxx
@@ -237,19 +237,10 @@ protected:
virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement
( const ::rtl::OUString& aFile, SotStorageStreamRef xElementStream ) = 0;
- virtual void SAL_CALL importFromOldStorage( const ::rtl::OUString& aFile ) = 0;
void implStoreLibrary( SfxLibrary_Impl* pLib,
const ::rtl::OUString& aName, SotStorageRef xStorage );
- // Password encryption
- virtual sal_Bool implStorePasswordLibrary( SfxLibrary_Impl* pLib, const ::rtl::OUString& aName,
- SotStorageRef xStorage );
- virtual sal_Bool implLoadPasswordLibrary( SfxLibrary_Impl* pLib, const ::rtl::OUString& Name,
- sal_Bool bVerifyPasswordOnly=false )
- throw(::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
-
// #56666, Creates another library container
// instance of the same derived class
virtual SfxLibraryContainer_Impl* createInstanceImpl( void ) = 0;
diff --git a/binfilter/bf_sfx2/source/inc/scriptcont.hxx b/binfilter/bf_sfx2/source/inc/scriptcont.hxx
index d97c0a8..056a4a1 100644
--- a/binfilter/bf_sfx2/source/inc/scriptcont.hxx
+++ b/binfilter/bf_sfx2/source/inc/scriptcont.hxx
@@ -60,19 +60,10 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer_Impl, public OldBas
throw(::com::sun::star::uno::Exception);
virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement
( const ::rtl::OUString& aFile, SotStorageStreamRef xElementStream );
- virtual void SAL_CALL importFromOldStorage( const ::rtl::OUString& aFile );
virtual SfxLibraryContainer_Impl* createInstanceImpl( void ){DBG_BF_ASSERT(0, "STRIP");return NULL;}
- // Password encryption
- virtual sal_Bool implStorePasswordLibrary( SfxLibrary_Impl* pLib, const ::rtl::OUString& aName,
- SotStorageRef xStorage );
- virtual sal_Bool implLoadPasswordLibrary( SfxLibrary_Impl* pLib, const ::rtl::OUString& Name,
- sal_Bool bVerifyPasswordOnly=false )
- throw(::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
-
// OldBasicPassword interface
virtual void setLibraryPassword( const String& rLibraryName, const String& rPassword );
virtual String getLibraryPassword( const String& rLibraryName );
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
index eef9602..2964776 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
@@ -714,99 +714,7 @@ void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, co
{
if( pMap->nWID >= OWN_ATTR_FRAME_URL && pMap->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT )
{
- SfxFrameObjectRef xFrame = SfxFrameObjectRef( ((SdrOle2Obj*)pObj)->GetObjRef() );
- DBG_ASSERT( xFrame.Is(), "wrong ole object inside frame" );
- if( !xFrame.Is() )
- return;
-
- SfxFrameDescriptor *pDescriptor = xFrame->GetFrameDescriptor()->Clone( NULL );
- DBG_ASSERT( pDescriptor, "no descriptor for frame!" );
- if( !pDescriptor )
- return;
-
- switch( pMap->nWID )
- {
- case OWN_ATTR_FRAME_URL:
- {
- OUString aURL;
- if( aValue >>= aURL )
- {
- const String aStrURL( aURL );
- pDescriptor->SetURL( aStrURL );
- xFrame->SetFrameDescriptor( pDescriptor );
- bOwn = sal_True;
- }
- }
- break;
- case OWN_ATTR_FRAME_NAME:
- {
- OUString aName;
- if( aValue >>= aName )
- {
- const String aStrName( aName );
- pDescriptor->SetName( aStrName );
- xFrame->SetFrameDescriptor( pDescriptor );
- bOwn = sal_True;
- }
- }
- break;
- case OWN_ATTR_FRAME_ISAUTOSCROLL:
- {
- sal_Bool bScroll = sal_False;;
- if( !aValue.hasValue() )
- {
- pDescriptor->SetScrollingMode( ScrollingAuto );
- xFrame->SetFrameDescriptor( pDescriptor );
- bOwn = sal_True;
- }
- else if( aValue >>= bScroll )
- {
- pDescriptor->SetScrollingMode( bScroll ? ScrollingYes : ScrollingNo );
- xFrame->SetFrameDescriptor( pDescriptor );
- bOwn = sal_True;
- }
- }
- break;
- case OWN_ATTR_FRAME_ISBORDER:
- {
- sal_Bool bBorder = sal_False;
- if( aValue >>= bBorder )
- {
- pDescriptor->SetFrameBorder( bBorder );
- xFrame->SetFrameDescriptor( pDescriptor );
- bOwn = sal_True;
- }
- }
- break;
-
- case OWN_ATTR_FRAME_MARGIN_WIDTH:
- {
- sal_Int32 nMargin = 0;
- if( aValue >>= nMargin )
- {
- const Size aNewMargin( nMargin, pDescriptor->GetMargin().Height() );
- pDescriptor->SetMargin( aNewMargin );
- xFrame->SetFrameDescriptor( pDescriptor );
- bOwn = sal_True;
- }
- }
- break;
- case OWN_ATTR_FRAME_MARGIN_HEIGHT:
- {
- sal_Int32 nMargin = 0;
- if( aValue >>= nMargin )
- {
- const Size aNewMargin( pDescriptor->GetMargin().Width(), nMargin );
- pDescriptor->SetMargin( aNewMargin );
- xFrame->SetFrameDescriptor( pDescriptor );
- bOwn = sal_True;
- }
- }
- break;
- }
-
- if( !bOwn )
- throw IllegalArgumentException();
+ return;
}
}
@@ -841,41 +749,8 @@ Any SAL_CALL SvxFrameShape::getPropertyValue( const OUString& PropertyName ) thr
{
if( pMap->nWID >= OWN_ATTR_FRAME_URL && pMap->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT )
{
- SfxFrameObjectRef xFrame = SfxFrameObjectRef( ((SdrOle2Obj*)pObj)->GetObjRef() );
- DBG_ASSERT( xFrame.Is(), "wrong ole object inside frame" );
- if( !xFrame.Is() )
- {
- Any aLclAny;
- return aLclAny;
- }
-
- const SfxFrameDescriptor *pDescriptor = xFrame->GetFrameDescriptor();
- DBG_ASSERT( pDescriptor, "no descriptor for frame!" );
-
- switch( pMap->nWID )
- {
- case OWN_ATTR_FRAME_URL:
- return makeAny( OUString( pDescriptor->GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) );
- case OWN_ATTR_FRAME_NAME:
- return makeAny( OUString( pDescriptor->GetName() ) );
- case OWN_ATTR_FRAME_ISAUTOSCROLL:
- if( pDescriptor->GetScrollingMode() == ScrollingAuto )
- {
- Any aLclAny;
- return aLclAny;
- }
- else
- {
- return makeAny( (sal_Bool)(pDescriptor->GetScrollingMode() == ScrollingYes) );
- }
- case OWN_ATTR_FRAME_ISBORDER:
- return makeAny( (sal_Bool)pDescriptor->IsFrameBorderOn() );
- case OWN_ATTR_FRAME_MARGIN_WIDTH:
- return makeAny( (sal_Int32)pDescriptor->GetMargin().Width() );
- case OWN_ATTR_FRAME_MARGIN_HEIGHT:
- return makeAny( (sal_Int32)pDescriptor->GetMargin().Height() );
- }
- throw IllegalArgumentException();
+ Any aLclAny;
+ return aLclAny;
}
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx
index 7cc1043..fa312e5 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx
@@ -360,8 +360,7 @@ void SwXMLTextParagraphExport::_collectTextEmbeddedAutoStyles(
SfxFrameObjectRef xFrame( rOLEObj.GetOleRef() );
OSL_ENSURE( xFrame.Is(), "wrong class id for frame" );
- lcl_addFrameProperties( xFrame->GetFrameDescriptor(), aStates,
- GetAutoFramePropMapper()->getPropertySetMapper() );
+ lcl_addFrameProperties( NULL, aStates, GetAutoFramePropMapper()->getPropertySetMapper() );
}
Add( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet, aStates );
@@ -433,8 +432,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
switch( nType )
{
case SV_EMBEDDED_FRAME:
- lcl_addFrameProperties( xFrame->GetFrameDescriptor(), aStates,
- GetAutoFramePropMapper()->getPropertySetMapper() );
+ lcl_addFrameProperties( NULL, aStates, GetAutoFramePropMapper()->getPropertySetMapper() );
break;
case SV_EMBEDDED_OUTPLACE:
lcl_addOutplaceProperties( pInfo, aStates,
@@ -553,17 +551,6 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
}
break;
case SV_EMBEDDED_FRAME:
- {
- // It's a floating frame!
- const SfxFrameDescriptor *pDescriptor = xFrame->GetFrameDescriptor();
-
- lcl_addURL( rLclExport, pDescriptor->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
-
- const String &rName = pDescriptor->GetName();
- if (rName.Len())
- rLclExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FRAME_NAME, rName );
- eElementName = XML_FLOATING_FRAME;
- }
break;
default:
OSL_ENSURE( !this, "unknown object type! Base class should have been called!" );
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
index 5935c45..0f6572b 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
@@ -564,7 +564,6 @@ Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFrame(
SfxFrameDescriptor *pFrameDesc = new SfxFrameDescriptor( 0 );
- pFrameDesc->SetURL( ::binfilter::StaticBaseUrl::RelToAbs( rHRef ) );
pFrameDesc->SetName( rName );
ScrollingMode eScrollMode = ScrollingAuto;
@@ -638,8 +637,6 @@ Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFrame(
SfxFrameObjectRef pFrame = new SfxFrameObject();
pFrame->DoInitNew( pStor );
- pFrame->EnableSetModified( FALSE );
- pFrame->SetFrameDescriptor( pFrameDesc );
pFrame->EnableSetModified( TRUE );
SwFrmFmt *pFrmFmt = pDoc->Insert( *pTxtCrsr->GetPaM(),
diff --git a/binfilter/inc/bf_sfx2/cfgitem.hxx b/binfilter/inc/bf_sfx2/cfgitem.hxx
index 9e27a3a..3eb37c4 100644
--- a/binfilter/inc/bf_sfx2/cfgitem.hxx
+++ b/binfilter/inc/bf_sfx2/cfgitem.hxx
@@ -88,7 +88,6 @@ public:
virtual BOOL Store(SotStorage& rStorage) = 0;
virtual String GetStreamName() const = 0;
virtual void UseDefault() = 0;
- virtual BOOL ReInitialize();
void SetDefault( BOOL bOn = TRUE );
void SetModified( BOOL bSet = TRUE );
diff --git a/binfilter/inc/bf_sfx2/docfile.hxx b/binfilter/inc/bf_sfx2/docfile.hxx
index 21173e7..c79c94e 100644
--- a/binfilter/inc/bf_sfx2/docfile.hxx
+++ b/binfilter/inc/bf_sfx2/docfile.hxx
@@ -240,7 +240,6 @@ public:
SvStream* GetOutStream();
sal_Bool Commit();
- sal_Bool TryStorage();
sal_Bool IsStorage();
SvStorage* GetStorage();
SvStorage* GetOutputStorage( BOOL bUCBStorage = FALSE );
@@ -294,9 +293,7 @@ public:
sal_Bool IsDownloadDone_Impl();
void ClearBackup_Impl();
void Done_Impl( ErrCode );
- void DataAvailable_Impl();
void Cancel_Impl();
- void SetPhysicalName_Impl(const String& rName);
void DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalContent,
const String& aPrefix,
diff --git a/binfilter/inc/bf_sfx2/docinf.hxx b/binfilter/inc/bf_sfx2/docinf.hxx
index c5ca2e2..fd72b0b 100644
--- a/binfilter/inc/bf_sfx2/docinf.hxx
+++ b/binfilter/inc/bf_sfx2/docinf.hxx
@@ -246,13 +246,13 @@ DECL_PTRHINT(/*empty*/, SfxDocumentInfoHint, SfxDocumentInfo);
class SfxDocumentInfoItem : public SfxStringItem
{
private:
- SfxDocumentInfo aDocInfo;
+ SfxDocumentInfo aDocInfo;
bool bHasTemplate;
bool bOwnFormat;
public:
TYPEINFO();
- SfxDocumentInfoItem();
+ SfxDocumentInfoItem() : SfxStringItem() {}
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_sfx2/evntconf.hxx b/binfilter/inc/bf_sfx2/evntconf.hxx
index 5191710..4391bfd 100644
--- a/binfilter/inc/bf_sfx2/evntconf.hxx
+++ b/binfilter/inc/bf_sfx2/evntconf.hxx
@@ -151,7 +151,6 @@ public:
SfxEventConfigItem_Impl( USHORT,
SfxEventConfiguration*,
SfxObjectShell* pObjSh = NULL );
- ~SfxEventConfigItem_Impl();
void Init( SfxConfigManager* );
virtual int Load(SotStorage&);
diff --git a/binfilter/inc/bf_sfx2/frameobj.hxx b/binfilter/inc/bf_sfx2/frameobj.hxx
index 7830101..c98da7f 100644
--- a/binfilter/inc/bf_sfx2/frameobj.hxx
+++ b/binfilter/inc/bf_sfx2/frameobj.hxx
@@ -83,13 +83,6 @@ public:
SO2_DECL_BASIC_CLASS_DLL(SfxFrameObject, GetFactoryPtr())
SfxFrameObject();
-
- void SetFrameDescriptor( const SfxFrameDescriptor*);
- const SfxFrameDescriptor*
- GetFrameDescriptor() const;
-
-#if _SOLAR__PRIVATE
-#endif
};
inline SfxFrameObjectFactoryPtr::SfxFrameObjectFactoryPtr()
diff --git a/binfilter/inc/bf_sfx2/frmdescr.hxx b/binfilter/inc/bf_sfx2/frmdescr.hxx
index 40dca7b..b82a779 100644
--- a/binfilter/inc/bf_sfx2/frmdescr.hxx
+++ b/binfilter/inc/bf_sfx2/frmdescr.hxx
@@ -108,8 +108,6 @@ friend class SfxFrameSetDescriptor;
SfxFrameSetDescriptor* pParentFrameSet; // Der Vater
SfxFrameSetDescriptor* pFrameSet; // Wenn Kinder da sind, die
// Set-Daten dazu
- INetURLObject aURL;
- INetURLObject aActualURL;
String aName;
Size aMargin;
long nWidth;
@@ -129,14 +127,6 @@ public:
SfxFrameDescriptor(SfxFrameSetDescriptor* pSet);
~SfxFrameDescriptor();
- // Eigenschaften
-
- // FileName/URL
- const INetURLObject& GetURL() const
- { return aURL; }
- void SetURL( const String& rURL );
- const INetURLObject& GetActualURL() const
- { return aActualURL; }
void SetReadOnly( BOOL bSet ) { bReadOnly = bSet;}
BOOL IsReadOnly( ) const { return bReadOnly;}
@@ -213,9 +203,6 @@ public:
pSet->pParentFrame = this;
}
- // Kopie z.B. f"ur die Views
- SfxFrameDescriptor* Clone(SfxFrameSetDescriptor *pFrame=NULL, BOOL bWithIds = TRUE ) const;
-
};
// Kein Bock, einen operator= zu implementieren...
diff --git a/binfilter/inc/bf_sfx2/macrconf.hxx b/binfilter/inc/bf_sfx2/macrconf.hxx
index c042972..37ba6e0 100644
--- a/binfilter/inc/bf_sfx2/macrconf.hxx
+++ b/binfilter/inc/bf_sfx2/macrconf.hxx
@@ -63,22 +63,21 @@ friend SvStream& operator << (SvStream& rStream, const SfxMacroInfo& rInfo);
SfxObjectShell* pDocShell; // nur noch wg. Kompatib. drin
String* pHelpText;
- sal_uInt16 nRefCnt;
- sal_Bool bAppBasic;
+ sal_uInt16 nRefCnt;
+ sal_Bool bAppBasic;
String aLibName;
String aModuleName;
String aMethodName;
- sal_uInt16 nSlotId;
+ sal_uInt16 nSlotId;
SfxSlot* pSlot;
public:
SfxMacroInfo(SfxObjectShell *pDoc=NULL);
~SfxMacroInfo();
- sal_Bool operator==(const SfxMacroInfo& rOther) const;
+
int Store (SvStream&);
- String GetQualifiedName() const;
- String GetBasicName() const;
- sal_Bool IsAppMacro() const
+
+ sal_Bool IsAppMacro() const
{ return bAppBasic; }
const String& GetModuleName() const
{ return aModuleName; }
@@ -104,8 +103,6 @@ friend class SfxEventConfiguration;
public:
~SfxMacroConfig();
- static ErrCode Call( SbxObject*, const String&, BasicManager*,
- SbxArray *pArgs=NULL, SbxValue *pRet=NULL );
static SbMethod* GetMethod_Impl( const String&, BasicManager* );
#if _SOLAR__PRIVATE
diff --git a/binfilter/inc/bf_sfx2/minarray.hxx b/binfilter/inc/bf_sfx2/minarray.hxx
index 2ce6825..24154d5 100644
--- a/binfilter/inc/bf_sfx2/minarray.hxx
+++ b/binfilter/inc/bf_sfx2/minarray.hxx
@@ -329,7 +329,6 @@ public:
void* GetObject( USHORT nPos ) const { return operator[](nPos); }
void*& GetObject( USHORT nPos ) { return operator[](nPos); }
void Insert( USHORT nPos, void* rElem );
- BOOL Replace( void* pOldElem, void* pNewElem );
BOOL Remove( void* rElem );
USHORT Remove( USHORT nPos, USHORT nLen );
USHORT Count() const { return nUsed; }
@@ -371,9 +370,6 @@ public:\
void Insert( USHORT nPos, T aElement ) {\
SfxPtrArr::Insert(nPos,(void *)aElement);\
}\
- BOOL Replace( T aOldElem, T aNewElem ) {\
- return SfxPtrArr::Replace((void *)aOldElem, (void*) aNewElem);\
- }\
void Remove( T aElement ) {\
SfxPtrArr::Remove((void*)aElement);\
}\
diff --git a/binfilter/inc/bf_sfx2/misccfg.hxx b/binfilter/inc/bf_sfx2/misccfg.hxx
index 2d99754..25531e8 100644
--- a/binfilter/inc/bf_sfx2/misccfg.hxx
+++ b/binfilter/inc/bf_sfx2/misccfg.hxx
@@ -49,7 +49,6 @@ class SfxMiscCfg : public ::utl::ConfigItem
public:
SfxMiscCfg( );
- ~SfxMiscCfg( );
virtual void Notify( const ::com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
virtual void Commit();
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index a5511c6..a1ae21f 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -292,16 +292,6 @@ public:
String GetTitle( sal_uInt16 nMaxLen = 0 ) const;
void InvalidateName(); // Zuruecksetzen auf unbenannt
- // DDE-Interface
- virtual long DdeExecute( const String& rCmd );
- virtual long DdeGetData( const String& rItem,
- const String& rMimeType,
- ::com::sun::star::uno::Any & rValue );
- virtual long DdeSetData( const String& rItem,
- const String& rMimeType,
- const ::com::sun::star::uno::Any & rValue );
- virtual ::binfilter::SvLinkSource* DdeCreateLinkSource( const String& rItem );
-
// Contents
virtual SfxStyleSheetBasePool* GetStyleSheetPool();
void SetStyleSheetPool( SfxStyleSheetBasePool *pPoolIn ) {
diff --git a/binfilter/inc/bf_sfx2/progress.hxx b/binfilter/inc/bf_sfx2/progress.hxx
index 0ddd292..73bacc1 100644
--- a/binfilter/inc/bf_sfx2/progress.hxx
+++ b/binfilter/inc/bf_sfx2/progress.hxx
@@ -57,7 +57,6 @@ public:
BOOL bWait = TRUE );
virtual ~SfxProgress();
- virtual void SetText( const String& rText );
virtual BOOL SetState( ULONG nVal, ULONG nNewRange = 0 );
ULONG GetState() const { return nVal; }
More information about the Libreoffice-commits
mailing list