[PATCH] Removed bug reporter and date
Christina Rossmanith
ChrRossmanith at web.de
Tue Feb 22 03:13:16 PST 2011
---
sw/source/ui/app/docsh.cxx | 25 +++++++++++--------------
sw/source/ui/app/docsh2.cxx | 23 +++++++++--------------
2 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index be6600a..57c42f8 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -94,10 +94,9 @@
#include <txtftn.hxx>
#include <ftnidx.hxx>
-// --> FME 2004-08-05 #i20883# Digital Signatures and Encryption
+// #i20883# Digital Signatures and Encryption
#include <fldbas.hxx>
#include <docary.hxx>
-// <--
#include <swerror.h> // Error messages
#include <helpid.h>
#include <cmdid.h>
@@ -617,10 +616,10 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
UpdateDocInfoForSave();
}
- // --> FME 2007-5-7 #i76360# Update document statistics
+ // #i76360# Update document statistics
SwDocStat aDocStat( pDoc->GetDocStat() );;
pDoc->UpdateDocStat( aDocStat );
- // <--
+
CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
@@ -944,7 +943,7 @@ ULONG SwDocShell::GetMiscStatus() const
return SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE;
}
-// --> FME 2004-08-05 #i20883# Digital Signatures and Encryption
+// #i20883# Digital Signatures and Encryption
sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates )
{
// get global state like HIDDENINFORMATION_DOCUMENTVERSIONS
@@ -978,7 +977,7 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates )
return nState;
}
-// <--
+
void SwDocShell::GetState(SfxItemSet& rSet)
{
@@ -1127,13 +1126,13 @@ void SwDocShell::PrepareReload()
::DelAllGrfCacheEntries( pDoc );
}
-// --> OD 2006-11-07 #i59688#
+// #i59688#
// linked graphics are now loaded on demand.
// Thus, loading of linked graphics no longer needed and necessary for
// the load of document being finished.
void SwDocShell::LoadingFinished()
{
- // --> OD 2007-10-08 #i38810#
+ // #i38810#
// Original fix fails after integration of cws xmlsec11:
// interface <SfxObjectShell::EnableSetModified(..)> no longer works, because
// <SfxObjectShell::FinishedLoading(..)> doesn't care about its status and
@@ -1141,7 +1140,7 @@ void SwDocShell::LoadingFinished()
// Thus, manuell modify the document, if its modified and its links are updated
// before <FinishedLoading(..)> is called.
const bool bHasDocToStayModified( pDoc->IsModified() && pDoc->LinksUpdated() );
- // <--
+
FinishedLoading( SFX_LOADED_ALL );
SfxViewFrame* pVFrame = SfxViewFrame::GetFirst(this);
if(pVFrame)
@@ -1217,26 +1216,24 @@ void SwDocShell::CalcLayoutForOLEObjects()
}
-// --> FME 2005-02-25 #i42634# Overwrites SfxObjectShell::UpdateLinks
+// #i42634# Overwrites SfxObjectShell::UpdateLinks
// This new function is necessary to trigger update of links in docs
// read by the binary filter:
void SwDocShell::UpdateLinks()
{
GetDoc()->UpdateLinks(TRUE);
- // --> FME 2005-07-27 #i50703# Update footnote numbers
+ // #i50703# Update footnote numbers
SwTxtFtn::SetUniqueSeqRefNo( *GetDoc() );
SwNodeIndex aTmp( GetDoc()->GetNodes() );
GetDoc()->GetFtnIdxs().UpdateFtn( aTmp );
- // <--
}
uno::Reference< frame::XController >
SwDocShell::GetController()
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > aRet;
- // --> FME 2007-10-15 #i82346# No view in page preview
+ // #i82346# No view in page preview
if ( GetView() )
- // <--
aRet = GetView()->GetController();
return aRet;
}
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index e614d89..5501b02 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -228,9 +228,8 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
else if( rHint.ISA(SfxEventHint) &&
((SfxEventHint&) rHint).GetEventId() == SFX_EVENT_LOADFINISHED )
{
- // --> OD 2004-12-03 #i38126# - own action id
+ // #i38126# - own action id
nAction = 3;
- // <--
}
if( nAction )
@@ -247,9 +246,9 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
case 2:
pDoc->GetSysFldType( RES_FILENAMEFLD )->UpdateFlds();
break;
- // --> OD 2004-12-03 #i38126# - own action for event LOADFINISHED
+ // #i38126# - own action for event LOADFINISHED
// in order to avoid a modified document.
- // --> OD 2005-02-01 #i41679# - Also for the instance of <SwDoc>
+ // #i41679# - Also for the instance of <SwDoc>
// it has to be assured, that it's not modified.
// Perform the same as for action id 1, but disable <SetModified>.
case 3:
@@ -269,7 +268,6 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
EnableSetModified( TRUE );
}
break;
- // <--
}
if( pWrtShell )
@@ -318,12 +316,11 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource,
USHORT &rIdx3, // ""
USHORT &rRemovedIdx ) // if doubles are being deleted, Pos back
{
- // --> OD 2005-05-10 #i48949# - actions aren't undoable. Thus, allow no undo
+ // #i48949# - actions aren't undoable. Thus, allow no undo
// actions
// Note: The undo action stack is cleared at the end of this method.
bool bDoesUndo( GetDoc()->DoesUndo() );
GetDoc()->DoUndo( sal_False );
- // <--
BOOL bRet = FALSE;
@@ -511,14 +508,13 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource,
rIdx3,
rRemovedIdx);
- // --> OD 2005-05-10 #i48949# - actions aren't undoable and could have change
+ // #i48949# - actions aren't undoable and could have change
// the document node array. Thus, clear the undo action stack.
if ( bDoesUndo )
{
GetDoc()->DelAllUndoObj();
}
GetDoc()->DoUndo( bDoesUndo );
- // <--
return bRet;
}
@@ -1631,7 +1627,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
const String& rMedname = GetMedium()->GetName();
- // fix #51032#: The HTML template still has to be set
+ // The HTML template still has to be set
SetHTMLTemplate( *GetDoc() ); //Styles from HTML.vor
SfxViewShell* pViewShell = GetView() ? (SfxViewShell*)GetView()
@@ -1642,12 +1638,12 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
SubInitNew();
SfxMedium aMed( rStreamName, STREAM_READ, FALSE );
- // --> OD 2005-08-01 #i48748# - use class <SwReloadFromHtmlReader>, because
+ // #i48748# - use class <SwReloadFromHtmlReader>, because
// the base URL has to be set to the filename of the document <rMedname>
// and not to the base URL of the temporary file <aMed> in order to get
// the URLs of the linked graphics correctly resolved.
SwReloadFromHtmlReader aReader( aMed, rMedname, pDoc );
- // <--
+
aReader.Read( *ReadHTML );
const SwView* pCurrView = GetView();
@@ -1690,10 +1686,9 @@ void SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* _pView )
SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP );
}
- // --> FME 2005-03-16 #i44963# Good occasion to check if page sizes in
+ // #i44963# Good occasion to check if page sizes in
// page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
GetDoc()->CheckDefaultPageFmt();
- // <--
// Currently there can be only one view (layout) if the document is viewed in Web layout
// So if there are more views we are in print layout and for toggling to Web layout all other views must be closed
--
1.7.0.4
--------------000908050803090705000804--
More information about the LibreOffice
mailing list