[Libreoffice-commits] .: 4 commits - binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svx binfilter/bf_sw binfilter/inc
Pierre-André Jacquod
pjacquod at kemper.freedesktop.org
Mon Mar 28 12:20:44 PDT 2011
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 14 --
binfilter/bf_sc/source/ui/inc/docsh.hxx | 3
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx | 25 ---
binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx | 16 --
binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx | 23 ---
binfilter/bf_sfx2/source/doc/sfx2_interno.cxx | 13 --
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 20 ---
binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx | 11 -
binfilter/bf_so3/source/inplace/applet2.cxx | 26 ----
binfilter/bf_so3/source/inplace/outplace.cxx | 54 --------
binfilter/bf_so3/source/inplace/plugin.cxx | 26 ----
binfilter/bf_so3/source/persist/persist.cxx | 120 -------------------
binfilter/bf_starmath/source/starmath_document.cxx | 13 --
binfilter/bf_svx/source/xml/svx_xmleohlp.cxx | 4
binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx | 7 -
binfilter/bf_sw/source/ui/app/sw_docsh.cxx | 51 --------
binfilter/inc/bf_sch/docshell.hxx | 1
binfilter/inc/bf_sd/docshell.hxx | 1
binfilter/inc/bf_sfx2/frameobj.hxx | 1
binfilter/inc/bf_sfx2/interno.hxx | 1
binfilter/inc/bf_sfx2/objsh.hxx | 2
binfilter/inc/bf_so3/applet.hxx | 1
binfilter/inc/bf_so3/outplace.hxx | 1
binfilter/inc/bf_so3/persist.hxx | 1
binfilter/inc/bf_so3/plugin.hxx | 1
binfilter/inc/bf_starmath/document.hxx | 1
binfilter/inc/bf_sw/docsh.hxx | 1
binfilter/inc/bf_sw/sw3io.hxx | 1
28 files changed, 8 insertions(+), 431 deletions(-)
New commits:
commit 6297a38a77582ccbfde3909e90cac34d1c2f470c
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Mon Mar 28 20:30:53 2011 +0200
remove function DoSave_Impl from binfilter
body was already only return sal_False; hence code adapted
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index 7905636..b5af065 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -1030,12 +1030,6 @@ sal_Bool DocSh::ConvertTo( SfxMedium &rMedium )
//-------------------------------------------------------------------------
-/*?*/ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* /*pArgs*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
-/*?*/ }
-
-//-------------------------------------------------------------------------
-
/*N*/ sal_Bool SfxObjectShell::CommonSaveAs_Impl
/*N*/ (
/*N*/ const INetURLObject& aURL,
@@ -1091,7 +1085,7 @@ sal_Bool DocSh::ConvertTo( SfxMedium &rMedium )
/*?*/ pSet->ClearItem( SID_PASSWORD );
/*?*/ pSet->Put( *aParams );
/*?*/ }
-/*?*/ return DoSave_Impl();
+/*?*/ return sal_False;
/*?*/ }
/*N*/ }
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index 604451d..38fe4f6 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -371,7 +371,6 @@ public:
// Laden-speichern public internals
void Reload_Impl();
- sal_Bool DoSave_Impl( const SfxItemSet* pSet=0 );
void UpdatePickList_Impl();
sal_Bool PreDoSaveAs_Impl(const String &rFileName, const String &rFiltName, SfxItemSet *);
sal_Bool APISaveAs_Impl ( const String& aFileName, SfxItemSet* aParams );
commit ca979eab4acfc6d9e1c12646e8a7b2f20feec900
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Mon Mar 28 20:28:06 2011 +0200
remove function Save_Impl from binfilter
its body was only return sal_False, hence code also adapted
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index c69d279..7905636 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -1036,12 +1036,6 @@ sal_Bool DocSh::ConvertTo( SfxMedium &rMedium )
//-------------------------------------------------------------------------
-/*?*/ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* /*pSet*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
-/*?*/ }
-
-//-------------------------------------------------------------------------
-
/*N*/ sal_Bool SfxObjectShell::CommonSaveAs_Impl
/*N*/ (
/*N*/ const INetURLObject& aURL,
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
index fd2d818..0d3e436 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
@@ -962,9 +962,7 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const REFERENCE< XCLOSELISTENER
/*N*/ if ( m_pData->m_pObjectShell.Is() )
/*N*/ {
/*N*/ if ( ! ( m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) )
-/*N*/ {
-/*N*/ m_pData->m_pObjectShell->Save_Impl();
- }
+/*N*/ {}
/*N*/ }
/*N*/ }
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index 20c69da..604451d 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -372,7 +372,6 @@ public:
// Laden-speichern public internals
void Reload_Impl();
sal_Bool DoSave_Impl( const SfxItemSet* pSet=0 );
- sal_Bool Save_Impl( const SfxItemSet* pSet=0 );
void UpdatePickList_Impl();
sal_Bool PreDoSaveAs_Impl(const String &rFileName, const String &rFiltName, SfxItemSet *);
sal_Bool APISaveAs_Impl ( const String& aFileName, SfxItemSet* aParams );
commit d99f78b83ba7b4f73bb3481903eb5b1522c1c7a2
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Mar 27 21:14:06 2011 +0200
remove dead branches in binfilter
due to the return values previously set to false, some branches are
now unconditionnal. Cleaning of them, removing if (false) branches.
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
index ae6060b..fd2d818 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
@@ -961,15 +961,10 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const REFERENCE< XCLOSELISTENER
/*N*/
/*N*/ if ( m_pData->m_pObjectShell.Is() )
/*N*/ {
-/*N*/ if ( m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
+/*N*/ if ( ! ( m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) )
/*N*/ {
-/*N*/ if ( false)
-/*N*/ {
- // was m_pData->m_pObjectShell->DoSaveCompleted(); but return value not checked
- }
-/*N*/ }
-/*N*/ else
-/*N*/ m_pData->m_pObjectShell->Save_Impl();
+/*N*/ m_pData->m_pObjectShell->Save_Impl();
+ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 082cbec..90864b5 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -539,14 +539,6 @@ BOOL SvPersist::Move( SvInfoObject * pInfoObj, const String & rStorName, BOOL bC
DBG_ASSERT( !bCopyStorage, "Impossible to copy storage!" );
aRealName = ::utl::TempFile().GetURL();
SvStorageRef aNewStor( new SvStorage( FALSE, aRealName, STREAM_STD_READWRITE, 0 ) );
- if ( false)
- {
- bRet = false;
- if ( !bRet )
- {
- //was pChild->DoSaveCompleted() but return value is not checked;
- }
- }
}
else
{
@@ -591,14 +583,6 @@ SvPersistRef SvPersist::CopyObject( const String& rObjName, const String& rNewNa
SvStorageRef xNewStor( new SvStorage( FALSE, aRealName, STREAM_STD_READWRITE, 0 ) );
if ( false)
{
- // was xOldObject->DoSaveCompleted(); but return value is not checked
- xNewInfo->SetObjName( rNewName );
- xNewInfo->pImp->aRealStorageName = xNewStor->GetName();
- GetInfoList()->Append( xNewInfo );
- SetModified( TRUE );
-
- // create and load new object
- xNewObject = CreateObjectFromStorage( xNewInfo, xNewStor );
}
else
::utl::UCBContentHelper::Kill( aRealName );
@@ -729,10 +713,6 @@ BOOL SvPersist::ImplCopy( SvPersist* pSrc, const String& rStorageName, BOOL bMov
if( bSave )
{
bRet = false;
- if ( bRet && !bMoving )
- {
- // was pSrc->DoSaveCompleted(); but return value is not checked
- }
}
else
{
@@ -1364,12 +1344,6 @@ BOOL SvPersist::SaveChilds()
// save it into my storage
bRet = SaveElement( GetStorage(), pEle );
}
- else if( false)
- {
- // always commit child objects
- if( !pEle->GetPersist()->GetStorage()->Commit() )
- bRet = FALSE;
- }
else
bRet = FALSE;
}
diff --git a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
index c5a4c56..6dd288a 100644
--- a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
@@ -89,9 +89,7 @@ public:
/*N*/ // the object should not be stored in 5.2 storage since the alien objects are stored in a wrapped way in this case
/*N*/ aTempStor->SetVersion( SOFFICE_FILEFORMAT_31 );
/*N*/ if( false )
-/*N*/ {
-/*N*/ aTempStor->Commit();
-/*N*/ }
+/*N*/ {}
/*N*/ else
/*N*/ {
/*?*/ aTempStor.Clear();
commit 895586b54c35cba2039eed55eee7fb4b89e100e4
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Mar 26 18:00:07 2011 +0100
remove function bool SaveCompleted in binfilter
and replaced, where this is checked, with the return value false.
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 5b057ea..bb523f2 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -801,20 +801,6 @@ DBG_BF_ASSERT(0, "STRIP");
// Xcl-like column width measured in characters of standard font.
-
-
-
-
-
-
-
-
-/*N*/ BOOL ScDocShell::SaveCompleted( SvStorage * pStor )
-/*N*/ {
-/*N*/ return SfxInPlaceObject::SaveCompleted( pStor );
-/*N*/ }
-
-
/*N*/ String ScDocShell::GetOwnFilterName() // static
/*N*/ {
/*N*/ return String::CreateFromAscii(pFilterSc50);
diff --git a/binfilter/bf_sc/source/ui/inc/docsh.hxx b/binfilter/bf_sc/source/ui/inc/docsh.hxx
index 271efec..b6467fd 100644
--- a/binfilter/bf_sc/source/ui/inc/docsh.hxx
+++ b/binfilter/bf_sc/source/ui/inc/docsh.hxx
@@ -161,9 +161,6 @@ public:
virtual void HandsOff();
virtual BOOL Save();
- virtual BOOL SaveCompleted( SvStorage * pNewStor ); // SfxInPlaceObject
-
-
virtual void SetVisArea( const Rectangle & rVisArea );
virtual Rectangle GetVisArea( USHORT nAspect ) const;
diff --git a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
index f479ad3..3d3c2e9 100644
--- a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
+++ b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
@@ -728,31 +728,6 @@ using namespace ::com::sun::star;
/*N*/ return bRet;
/*N*/ }
-/************************************************************************/
-
-
-/*N*/ BOOL SchChartDocShell::SaveCompleted( SvStorage * pStor ) throw()
-/*N*/ {
-/*N*/ CHART_TRACE( "SchChartDocShell::SaveCompleted" );
-/*N*/
-/*N*/ BOOL bRet = SfxInPlaceObject::SaveCompleted( pStor );
-/*N*/
-/*N*/ if( bRet )
-/*N*/ {
-/*N*/ if( pStor && pChDoc )
-/*N*/ {
-/*N*/ // #99758# SetChanged was called here which called SetModified(). I
-/*N*/ // removed this, since it is not clear why this was introduced in
-/*N*/ // rev. 1.48 (loading of files with additional graphics does not set
-/*N*/ // the modified flag to true)
-/*N*/
-/*N*/ // throw away old graphics streams
-/*N*/ pChDoc->HandsOff();
-/*N*/ }
-/*N*/ }
-/*N*/ return bRet;
-/*N*/ }
-
/*************************************************************************
|*
|* Tabellenzeiger auffrischen
diff --git a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
index 33dcc67..f31e0da 100644
--- a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
+++ b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
@@ -380,22 +380,6 @@ BOOL SdDrawDocShell::Load( SvStorage* pStore )
}
-BOOL SdDrawDocShell::SaveCompleted( SvStorage * pStor )
-{
- BOOL bRet = FALSE;
-
- if( SfxInPlaceObject::SaveCompleted(pStor) )
- {
- pDoc->NbcSetChanged( FALSE );
-
- bRet = TRUE;
-
- if( pDoc )
- pDoc->HandsOff();
- }
- return bRet;
-}
-
void SdDrawDocShell::HandsOff()
{
SfxInPlaceObject::HandsOff();
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx b/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx
index c076762..3aaa43e 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx
@@ -185,30 +185,7 @@ namespace binfilter {
*/
//=========================================================================
-/*N*/ BOOL SfxFrameObject::SaveCompleted
-/*N*/ (
-/*N*/ SvStorage * pStor /* Storage auf dem das Objekt arbeitet. Der kann
- auch NULL sein. Dies Bedeutet, es wird auf
- dem alten Storage weiter gearbeitet */
-/*N*/ )
-/* [Beschreibung]
-
- Nach dem Aufruf dieser Methode ist das Verhalten des Objektes
- wieder definiert.
-
- [R"uckgabewert]
- BOOL TRUE, es kann auf dem neuen Storage gearbeitet werden.
- FALSE, es kann nicht auf dem neuen Storage gearbeitet
- werden
-
- [Querverweise]
-
- <SvPersist::SaveCompleted>
-*/
-/*N*/ {
-/*N*/ return SvInPlaceObject::SaveCompleted( pStor );
-/*N*/ }
//=========================================================================
/* [Beschreibung]
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
index c746e08..874d16d 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
@@ -175,19 +175,6 @@ namespace binfilter {
//--------------------------------------------------------------------
-/*N*/ BOOL SfxInPlaceObject::SaveCompleted( SvStorage * pStor )
-/*N*/ {
-/*N*/ if( !SaveCompletedChilds( pStor ) )
-/*N*/ return FALSE;
-/*N*/ if( SvInPlaceObject::SaveCompleted( pStor ) )
-/*N*/ {
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ return FALSE;
-/*N*/ }
-
-//--------------------------------------------------------------------
-
/*N*/ void SfxInPlaceObject::SetVisArea( const Rectangle & rRect )
/*N*/ {
/*N*/ if( GetVisArea() != rRect )
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index 155f444..c69d279 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -813,8 +813,10 @@ sal_Bool SfxObjectShell::SaveTo_Impl
// watch: if the document was successfully saved into an own format, no "SaveCompleted" was called,
// this must be done by the caller ( because they want to do different calls )
if( xNewTempRef.Is() && xNewTempRef != GetStorage() )
+ {
// if the new object storage is a temporary one, because the target format is an alien format
- SaveCompleted( xNewTempRef );
+ //SaveCompleted( xNewTempRef );
+ }
}
else
{
@@ -907,7 +909,7 @@ den neuen Storage connected. SaveCompleted tut dann nichts.
}
SetError(GetMedium()->GetErrorCode());
- SaveCompleted(aTmpMed); // neuer temp. Storage; gibt alten frei
+ //SaveCompleted(aTmpMed); // neuer temp. Storage; gibt alten frei
return sal_True;
}
diff --git a/binfilter/bf_so3/source/inplace/applet2.cxx b/binfilter/bf_so3/source/inplace/applet2.cxx
index a6a28bb..66e3b7a 100644
--- a/binfilter/bf_so3/source/inplace/applet2.cxx
+++ b/binfilter/bf_so3/source/inplace/applet2.cxx
@@ -692,32 +692,6 @@ void SvAppletObject::HandsOff()
}
//=========================================================================
-BOOL SvAppletObject::SaveCompleted
-(
- SvStorage * pStor /* Storage auf dem das Objekt arbeitet. Der kann
- auch NULL sein. Dies Bedeutet, es wird auf
- dem alten Storage weiter gearbeitet */
-)
-/* [Beschreibung]
-
- Nach dem Aufruf dieser Methode ist das Verhalten des Objektes
- wieder definiert.
-
- [R"uckgabewert]
-
- BOOL TRUE, es kann auf dem neuen Storage gearbeitet werden.
- FALSE, es kann nicht auf dem neuen Storage gearbeitet
- werden
-
- [Querverweise]
-
- <SvPersist::SaveCompleted>
-*/
-{
- return SvInPlaceObject::SaveCompleted( pStor );
-}
-
-//=========================================================================
ULONG SvAppletObject::GetMiscStatus() const
/* [Beschreibung]
diff --git a/binfilter/bf_so3/source/inplace/outplace.cxx b/binfilter/bf_so3/source/inplace/outplace.cxx
index 2af6d09..800ae53 100644
--- a/binfilter/bf_so3/source/inplace/outplace.cxx
+++ b/binfilter/bf_so3/source/inplace/outplace.cxx
@@ -1401,60 +1401,6 @@ void SvOutPlaceObject::HandsOff()
SvInPlaceObject::HandsOff();
}
-//=========================================================================
-BOOL SvOutPlaceObject::SaveCompleted( SvStorage * pStor )
-{
- BOOL bResult = TRUE;
-
- if( pStor )
- {
- if( !pImpl->xWorkingStg.Is() )
- {
- pImpl->xWorkingStg = pStor;
- BOOL bNewVersion = pStor->IsStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Ole-Object" ) ) );
- if( bNewVersion )
- {
- SvStorageStreamRef xStm;
- xStm = pImpl->xWorkingStg->OpenStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( DOCNAME ) ), STREAM_STD_READ );
- xStm->SetVersion( pImpl->xWorkingStg->GetVersion() );
- xStm->SetBufferSize( 8192 );
-
- // nicht vorhandener Stream ist kein Fehler
- if( xStm->GetError() != SVSTREAM_FILE_NOT_FOUND )
- {
- UINT16 nLen;
- *xStm >> nLen;
- *xStm >> pImpl->dwAspect;
- BOOL b;
- *xStm >> b;
- pImpl->bSetExtent = b;
-
- if( pStor->GetVersion() <= SOFFICE_FILEFORMAT_40 || pStor->GetVersion() >= SOFFICE_FILEFORMAT_60 )
- {
- pImpl->xWorkingStg = new SvStorage( FALSE, String(), STREAM_STD_READWRITE, STORAGE_DELETEONRELEASE );
- pStor->CopyTo( pImpl->xWorkingStg );
- }
-
- bResult = ( xStm->GetError() == ERRCODE_NONE );
- }
- }
- else
- bResult = MakeWorkStorageWrap_Impl( pStor );
- }
- else if( !IsHandsOff() )
- {
- BOOL bNewVersion = pStor->IsStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Ole-Object" ) ) );
- if( bNewVersion )
- // Full storage in 5.0 or newer format
- pImpl->xWorkingStg = pStor;
- else
- bResult = MakeWorkStorageWrap_Impl( pStor );
- }
- }
-
- return SvInPlaceObject::SaveCompleted( pStor ) && bResult;
-}
-
BOOL SvOutPlaceObject::MakeWorkStorageWrap_Impl( SvStorage * pStor )
{
BOOL bResult = FALSE;
diff --git a/binfilter/bf_so3/source/inplace/plugin.cxx b/binfilter/bf_so3/source/inplace/plugin.cxx
index ef68281..a3f9e14 100644
--- a/binfilter/bf_so3/source/inplace/plugin.cxx
+++ b/binfilter/bf_so3/source/inplace/plugin.cxx
@@ -808,32 +808,6 @@ void SvPlugInObject::HandsOff()
}
//=========================================================================
-BOOL SvPlugInObject::SaveCompleted
-(
- SvStorage * pStor /* Storage auf dem das Objekt arbeitet. Der kann
- auch NULL sein. Dies Bedeutet, es wird auf
- dem alten Storage weiter gearbeitet */
-)
-/* [Beschreibung]
-
- Nach dem Aufruf dieser Methode ist das Verhalten des Objektes
- wieder definiert.
-
- [R"uckgabewert]
-
- BOOL TRUE, es kann auf dem neuen Storage gearbeitet werden.
- FALSE, es kann nicht auf dem neuen Storage gearbeitet
- werden
-
- [Querverweise]
-
- <SvPersist::SaveCompleted>
-*/
-{
- return SvInPlaceObject::SaveCompleted( pStor );
-}
-
-//=========================================================================
ULONG SvPlugInObject::GetMiscStatus() const
/* [Beschreibung]
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index c96434d..082cbec 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -1238,57 +1238,6 @@ void SvPersist::HandsOff()
aStorage.Clear();
}
-BOOL SvPersist::SaveCompleted( SvStorage * pStor )
-{
- //DBG_ASSERT( bOpHandsOff | bOpSaveAs | bOpSave, aTest );
- ASSERT_INIT()
-
- if( !pStor && aStorage.Is() )
- // falls beim Save ein Fehler aufgetreten ist, muss er zurueckgesetzt
- // werden
- aStorage->ResetError();
-
- BOOL bRet = TRUE;
-
- if( pStor )
- {
- aStorage = pStor;
- SvGlobalName aNoName; // wegen MAC
- if( pStor->GetClassName() == aNoName )
- // kein Typ im Storage gesetzt
- SetupStorage( pStor );
- bCreateTempStor=FALSE;
- }
-
- if( Owner() )
- {
- if( !bSaveFailed )
- {
- if( bOpSave )
- {
- if ( IsModified() && GetParent() )
- GetParent()->SetModified( TRUE );
-
- SetModified( FALSE );
- DBG_ASSERT( !nModifyCount, "IsModified() == TRUE after save" );
- }
- if( bOpSaveAs )
- {
- if( pStor )
- { // nur wenn SaveAs und danach der Storage umgesetzt wird,
- // sonst war es z.B. ein SaveAs fuers Clipboard
- if ( IsModified() && GetParent() )
- GetParent()->SetModified( TRUE );
- SetModified( FALSE );
- DBG_ASSERT( !IsModified(), "SvPersist::SaveCompleted: IsModified() == TRUE" );
- }
- }
- }
- }
- bOpSaveAs = bOpSave = bOpHandsOff = bSaveFailed = FALSE;
- return bRet;
-}
-
#define PERSIST_STREAM "persist elements"
BOOL SvPersist::DoLoadContent( SvStorage * pStor, BOOL bOwner_ )
{
@@ -1591,49 +1540,6 @@ BOOL SvPersist::SaveAsChilds( SvStorage * pStor )
return bRet;
}
-BOOL SvPersist::SaveCompletedChilds( SvStorage * pStor )
-{
- BOOL bRet = TRUE;
- if( pChildList && pChildList->Count() )
- {
- for( ULONG i = 0; i < pChildList->Count(); i++ )
- {
- SvInfoObject * pEle = pChildList->GetObject( i );
- if( pEle->GetPersist() && !pEle->IsDeleted() )
- {
- ULONG nVersion = pStor ? pStor->GetVersion() : GetStorage()->GetVersion();
- SvEmbeddedObjectRef xEmb( pEle->GetPersist() );
- if ( xEmb.Is() && nVersion >= SOFFICE_FILEFORMAT_60 && ( xEmb->GetMiscStatus() & SVOBJ_MISCSTATUS_SPECIALOBJECT ) )
- {
- xEmb->SetModified( FALSE );
- continue;
- }
-
- if( pStor )
- {
- SvStorageRef aEleStor;
- aEleStor = pStor->OpenStorage( pEle->GetStorageName() );
- if( !aEleStor.Is() || !false )
- return FALSE;
-
- // the object now is definitely part of the container
- pEle->pImp->SetRealStorageName( String() );
- }
- else
- {
- // set objects on their old storage again
- if( !false)
- return FALSE;
- }
- }
-
- pEle = pChildList->Next();
- }
- }
-
- return bRet;
-}
-
/*************************************************************************
|* SvPersist::CleanUp()
|*
diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx
index 82a3f54..c72c6a8 100644
--- a/binfilter/bf_starmath/source/starmath_document.cxx
+++ b/binfilter/bf_starmath/source/starmath_document.cxx
@@ -559,19 +559,6 @@ static const char pStarMathDoc[] = "StarMathDocument";
/*N*/ }
-/*N*/ BOOL SmDocShell::SaveCompleted(SvStorage * pStor)
-/*N*/ {
-/*N*/ if( SfxInPlaceObject::SaveCompleted( pStor ))
-/*N*/ {
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ return FALSE;
-/*N*/ }
-
-
-
-
-
/*N*/ void SmDocShell::HandsOff()
/*N*/ {
/*N*/ SfxInPlaceObject::HandsOff();
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
index d40a133..0e269d9 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
@@ -155,13 +155,6 @@ namespace binfilter {
// neu geoeffnet werden.
- BOOL Sw3Io::SaveCompleted( SvStorage* pNew )
- {
- OSL_ASSERT("method removed");
- return TRUE;
- }
-
-
/*N*/ SvStorage* Sw3Io::GetStorage()
/*N*/ {
/*N*/ if( !pImp->pRoot.Is() )
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
index 992e84e..5503948 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
@@ -96,7 +96,6 @@ using namespace ::com::sun::star::container;
/*N*/ String * pUserName,
/*N*/ long nFileFormat=SOFFICE_FILEFORMAT_CURRENT ) const;
/*N*/ virtual BOOL Save();
-/*N*/ virtual BOOL SaveCompleted( SvStorage * );
/*N*/ public:
/*N*/ SwTmpPersist( SwDocShell& rDSh ) : pDShell( &rDSh ) {}
/*N*/};
@@ -310,47 +309,6 @@ BOOL SwDocShell::Save()
/*N*/ SfxInPlaceObject::HandsOff();
/*N*/ }
-/*--------------------------------------------------------------------
- Beschreibung: ??? noch nicht zu aktivieren, muss TRUE liefern
- --------------------------------------------------------------------*/
-
-
-/*N*/ BOOL SwDocShell::SaveCompleted( SvStorage * pStor )
-/*N*/ {
-/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SaveCompleted" );
-/*N*/ BOOL bRet = SfxInPlaceObject::SaveCompleted( pStor );
-/*N*/ if( bRet )
-/*N*/ {
-/*N*/ // erst hier entscheiden, ob das Speichern geklappt hat oder nicht
-/*N*/ if( IsModified() )
-/*?*/ pDoc->SetModified();
-/*N*/ else
-/*N*/ pDoc->ResetModified();
-/*N*/
-/*N*/ bRet = pIo->SaveCompleted( pStor );
-/*N*/ }
-
-/*N*/ if( xOLEChildList.Is() )
-/*N*/ {
-/*N*/ BOOL bResetModified = IsEnableSetModified();
-/*N*/ if( bResetModified )
-/*N*/ EnableSetModified( FALSE );
-/*N*/
-/*N*/ SvPersist* pPersist = this;
-/*N*/ const SvInfoObjectMemberList* pInfList = xOLEChildList->GetObjectList();
-/*N*/
-/*N*/ for( ULONG n = pInfList->Count(); n; )
-/*N*/ {
-/*N*/ SvInfoObjectRef aRef( pInfList->GetObject( --n ));
-/*N*/ pPersist->Move( &aRef, aRef->GetStorageName() );
-/*N*/ }
-/*N*/
-/*N*/ xOLEChildList.Clear();
-/*N*/ if( bResetModified )
-/*N*/ EnableSetModified( TRUE );
-/*N*/ }
-/*N*/ return bRet;
-/*N*/ }
/*--------------------------------------------------------------------
Beschreibung: Draw()-Overload fuer OLE2 (Sfx)
@@ -670,15 +628,6 @@ BOOL SwDocShell::Save()
/*N*/ return FALSE;
/*N*/}
-/*N*/ BOOL SwTmpPersist::SaveCompleted( SvStorage * pStor )
-/*N*/{
-/*N*/ if( SaveCompletedChilds( pStor ) )
-/*N*/ return SvPersist::SaveCompleted( pStor );
-/*N*/ return FALSE;
-/*N*/}
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sch/docshell.hxx b/binfilter/inc/bf_sch/docshell.hxx
index 12dfa99..4bb4b6a 100644
--- a/binfilter/inc/bf_sch/docshell.hxx
+++ b/binfilter/inc/bf_sch/docshell.hxx
@@ -104,7 +104,6 @@ class SchChartDocShell: public SfxObjectShell, public SfxInPlaceObject
virtual BOOL InitNew(SvStorage*) throw();
virtual BOOL Load(SvStorage*) throw();
virtual BOOL Save() throw();
- virtual BOOL SaveCompleted(SvStorage* pNewStor) throw();
virtual Rectangle GetVisArea(USHORT nAspect) const throw();
virtual void SetVisArea(const Rectangle& rRect) throw();
diff --git a/binfilter/inc/bf_sd/docshell.hxx b/binfilter/inc/bf_sd/docshell.hxx
index ab81ed6..ffa7bb0 100644
--- a/binfilter/inc/bf_sd/docshell.hxx
+++ b/binfilter/inc/bf_sd/docshell.hxx
@@ -94,7 +94,6 @@ public:
virtual BOOL Load( SvStorage * );
virtual void HandsOff();
virtual BOOL Save();
- virtual BOOL SaveCompleted( SvStorage * pNewStor );
virtual void SetVisArea(const Rectangle& rRect);
virtual Rectangle GetVisArea(USHORT nAspect) const;
virtual Printer* GetDocumentPrinter();
diff --git a/binfilter/inc/bf_sfx2/frameobj.hxx b/binfilter/inc/bf_sfx2/frameobj.hxx
index 3f1adb9..d11cf14 100644
--- a/binfilter/inc/bf_sfx2/frameobj.hxx
+++ b/binfilter/inc/bf_sfx2/frameobj.hxx
@@ -66,7 +66,6 @@ protected:
// Laden speichern
virtual BOOL Load( SvStorage * );
virtual BOOL Save();
- virtual BOOL SaveCompleted( SvStorage * );
~SfxFrameObject();
public:
diff --git a/binfilter/inc/bf_sfx2/interno.hxx b/binfilter/inc/bf_sfx2/interno.hxx
index 1a9c212..024f3b3 100644
--- a/binfilter/inc/bf_sfx2/interno.hxx
+++ b/binfilter/inc/bf_sfx2/interno.hxx
@@ -74,7 +74,6 @@ protected:
virtual BOOL Load( SvStorage * ); // Rekursiv
virtual BOOL Save(); // Rekursiv
virtual void HandsOff(); // Rekursiv
- virtual BOOL SaveCompleted( SvStorage * ); // Rekursiv
virtual ErrCode Verb( long nVerbPos,
SvEmbeddedClient *pCaller,
diff --git a/binfilter/inc/bf_so3/applet.hxx b/binfilter/inc/bf_so3/applet.hxx
index 7a2747e..c77ce16 100644
--- a/binfilter/inc/bf_so3/applet.hxx
+++ b/binfilter/inc/bf_so3/applet.hxx
@@ -88,7 +88,6 @@ protected:
SO3_DLLPRIVATE virtual BOOL Load( SvStorage * );
SO3_DLLPRIVATE virtual BOOL Save();
SO3_DLLPRIVATE virtual void HandsOff();
- SO3_DLLPRIVATE virtual BOOL SaveCompleted( SvStorage * );
SO3_DLLPRIVATE ~SvAppletObject();
public:
diff --git a/binfilter/inc/bf_so3/outplace.hxx b/binfilter/inc/bf_so3/outplace.hxx
index 3f624a5..fd575de 100644
--- a/binfilter/inc/bf_so3/outplace.hxx
+++ b/binfilter/inc/bf_so3/outplace.hxx
@@ -83,7 +83,6 @@ protected:
SO3_DLLPRIVATE virtual BOOL Load( SvStorage * );
SO3_DLLPRIVATE virtual BOOL Save();
SO3_DLLPRIVATE virtual void HandsOff();
- SO3_DLLPRIVATE virtual BOOL SaveCompleted( SvStorage * );
SO3_DLLPRIVATE ~SvOutPlaceObject();
public:
diff --git a/binfilter/inc/bf_so3/persist.hxx b/binfilter/inc/bf_so3/persist.hxx
index 3fa0a87..2b17021 100644
--- a/binfilter/inc/bf_so3/persist.hxx
+++ b/binfilter/inc/bf_so3/persist.hxx
@@ -162,7 +162,6 @@ protected:
virtual BOOL Load( SvStorage * ); // Rekursiv
virtual BOOL Save(); // Rekursiv
virtual void HandsOff(); // Rekursiv
- virtual BOOL SaveCompleted( SvStorage * ); // Rekursiv
SO3_DLLPRIVATE BOOL DoLoadContent( SvStorage *, BOOL bOwner );
virtual void LoadContent( SvStream & rStm, BOOL bOwner );
diff --git a/binfilter/inc/bf_so3/plugin.hxx b/binfilter/inc/bf_so3/plugin.hxx
index 0ab3da1..12f272b 100644
--- a/binfilter/inc/bf_so3/plugin.hxx
+++ b/binfilter/inc/bf_so3/plugin.hxx
@@ -100,7 +100,6 @@ protected:
SO3_DLLPRIVATE virtual BOOL Load( SvStorage * );
SO3_DLLPRIVATE virtual BOOL Save();
SO3_DLLPRIVATE virtual void HandsOff();
- SO3_DLLPRIVATE virtual BOOL SaveCompleted( SvStorage * );
// Spaeter gerne mal virtuell...
SO3_DLLPRIVATE void SetMIMEDetectedLink( const Link& rLink );
diff --git a/binfilter/inc/bf_starmath/document.hxx b/binfilter/inc/bf_starmath/document.hxx
index eae4598..6ccbe32 100644
--- a/binfilter/inc/bf_starmath/document.hxx
+++ b/binfilter/inc/bf_starmath/document.hxx
@@ -149,7 +149,6 @@ class SmDocShell : public SfxObjectShell, public SfxInPlaceObject,
virtual BOOL Load(SvStorage *);
void ImplSave( SvStorageStreamRef xStrm );
virtual BOOL Save();
- virtual BOOL SaveCompleted( SvStorage *pNewStor );
virtual void HandsOff();
Printer *GetPrt();
diff --git a/binfilter/inc/bf_sw/docsh.hxx b/binfilter/inc/bf_sw/docsh.hxx
index fc8b7f2..22ea91e 100644
--- a/binfilter/inc/bf_sw/docsh.hxx
+++ b/binfilter/inc/bf_sw/docsh.hxx
@@ -95,7 +95,6 @@ class SwDocShell: public SfxObjectShell, public SfxInPlaceObject,
virtual BOOL LoadFrom(SvStorage* pStor);
virtual BOOL ConvertFrom( SfxMedium &rMedium );
virtual void HandsOff();
- virtual BOOL SaveCompleted(SvStorage * pNewStor );
// DocInfo dem Doc melden
//
diff --git a/binfilter/inc/bf_sw/sw3io.hxx b/binfilter/inc/bf_sw/sw3io.hxx
index a6ad1b0..a5e426b 100644
--- a/binfilter/inc/bf_sw/sw3io.hxx
+++ b/binfilter/inc/bf_sw/sw3io.hxx
@@ -64,7 +64,6 @@ public:
SvStorage* GetStorage();
void HandsOff();
- BOOL SaveCompleted( SvStorage* );
ULONG SaveStyles();
// Erzeugen eines eindeutigen Streamnamens im gegebenen Storage
More information about the Libreoffice-commits
mailing list