[Libreoffice-commits] .: 3 commits - binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_sw
Joseph Powers
jpowers at kemper.freedesktop.org
Wed Jan 12 07:56:24 PST 2011
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 239 +++----
binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx | 4
binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx | 1
binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx | 11
binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx | 3
binfilter/bf_sfx2/source/doc/sfx2_dinfobj.cxx | 3
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 1
binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx | 3
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 3
binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx | 3
binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx | 1
binfilter/bf_sfx2/source/inc/dinfobj.hxx | 3
binfilter/bf_sw/source/core/doc/sw_doc.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 2
binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx | 90 +-
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 294 ++++----
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 508 +++++++--------
binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx | 2
binfilter/bf_sw/source/core/swg/sw_rdswg.cxx | 2
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx | 2
binfilter/bf_sw/source/ui/app/sw_docsh2.cxx | 8
binfilter/bf_sw/source/ui/inc/docinf.hxx | 164 ----
binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx | 2
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 17
24 files changed, 595 insertions(+), 773 deletions(-)
New commits:
commit 46c856344ff2af3fde0e814e07ab5df6f0a42b1b
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Jan 12 07:52:34 2011 -0800
Remove unused header file
diff --git a/binfilter/bf_sw/source/ui/inc/docinf.hxx b/binfilter/bf_sw/source/ui/inc/docinf.hxx
deleted file mode 100644
index 534c3f7..0000000
--- a/binfilter/bf_sw/source/ui/inc/docinf.hxx
+++ /dev/null
@@ -1,164 +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.
- *
- ************************************************************************/
-#ifndef _DOCINF_HXX
-#define _DOCINF_HXX
-
-#include <tools/list.hxx>
-
-#include <tools/datetime.hxx>
-
-#include <tools/string.hxx>
-class Date;
-class Time;
-class DateTime;
-class SvStream;
-
-namespace binfilter {
-
-
-// EXTERN ----------------------------------------------------------------
-struct DataTupel;
-
-// ENUM -----------------------------------------------------------------
-enum InfoType
-{
- INFOTYPE_DATE, INFOTYPE_TIME, INFOTYPE_DATETIME,
- INFOTYPE_MODIFYINFO,
- INFOTYPE_STRING, INFOTYPE_STRINGLIST,
- INFOTYPE_BOOL, INFOTYPE_LONG,
- INFOTYPE_TEMPLATE
-};
-
-
-// CLASS -----------------------------------------------------------------
-DECLARE_LIST( DataTupelList, DataTupel* )
-
-// CLASS -----------------------------------------------------------------
-class VarDocInfos
-{
-public:
- VarDocInfos();
- ~VarDocInfos();
-
- void AddDate( String& rName, Date& rDate );
- void AddTime( String& rName, Time& rTime );
- void AddDateTime( String& rName, DateTime& rDateTime );
-
- void AddString( String& rName, String& rString );
- void AddStringList( String& rName, String& rStringList );
- void AddBool( String& rName, BOOL bBool );
- void AddLong( String& rName, long lLong );
-
- USHORT GetCount();
- InfoType GetType( USHORT nPos );
- const String& GetName( USHORT nPos );
-
- const Date& GetDate( USHORT nPos );
- const Time& GetTime( USHORT nPos );
- const DateTime& GetDateTime( USHORT nPos );
-
- const String& GetString( USHORT nPos );
- const String& GetStringList( USHORT nPos );
- BOOL GetBool( USHORT nPos );
- long GetLong( USHORT nPos );
-
-friend SvStream& operator<<( SvStream&, VarDocInfos& ); //$ ostream
-friend SvStream& operator>>( SvStream&, VarDocInfos& ); //$ istream
-
-private:
- DataTupelList* pInfoList;
-};
-
-// CLASS -----------------------------------------------------------------
-struct ModifyInfo {
- DateTime aModifiedDateTime;
- String aModifiedById;
- String aModifiedByName;
-
- friend SvStream& operator<<( SvStream&, ModifyInfo& ); //$ ostream
- friend SvStream& operator>>( SvStream&, ModifyInfo& ); //$ istream
-};
-
-// CLASS -----------------------------------------------------------------
-class FixDocInfos
-{
-public:
- FixDocInfos();
- ~FixDocInfos();
-
- void SetTitle( String& rTitle );
- const String& GetTitle() const;
-
- void SetCreated( ModifyInfo& rInfo );
- const ModifyInfo& GetCreated() const;
-
- void SetLastChanged( ModifyInfo& rInfo );
- const ModifyInfo& GetLastChanged() const;
-
- void SetLastPrinted( ModifyInfo& rInfo );
- const ModifyInfo& GetLastPrinted() const;
-
- void SetTotalEditingTime( Time& rTime );
- const Time& GetTotalEditingTime() const;
-
-friend SvStream& operator<<( SvStream&, FixDocInfos& ); //$ ostream
-friend SvStream& operator>>( SvStream&, FixDocInfos& ); //$ istream
-
-private:
- String aTitle;
-
- ModifyInfo aCreated;
- ModifyInfo aLastChanged;
- ModifyInfo aLastPrinted;
- Time aTotalEditingTime;
-};
-
-// CLASS -----------------------------------------------------------------
-struct TemplateInfo {
- String aTitle;
- ULONG lTemplateId;
-
- TemplateInfo() {}
- TemplateInfo( String& rName, ULONG lId ) :
- aTitle( rName ),
- lTemplateId( lId ) {}
-
- friend SvStream& operator<<( SvStream&, TemplateInfo& ); //$ ostream
- friend SvStream& operator>>( SvStream&, TemplateInfo& ); //$ istream
-};
-
-// CLASS -----------------------------------------------------------------
-DECLARE_LIST( TemplateInfos, TemplateInfo* )
-
-SvStream& operator<<( SvStream&, TemplateInfos& ); //$ ostream
-SvStream& operator>>( SvStream&, TemplateInfos& ); //$ istream
-
-} //namespace binfilter
-#endif // _DOCINF_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7602404ed92cd5128eb1f6c21384638221181928
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Jan 12 07:52:18 2011 -0800
Quite compiler warnings
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
index b65bd84..3ceb6e2 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
@@ -2,7 +2,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
@@ -148,7 +148,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
aViewOpt.SetOption(VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if ( aPropertyName.compareToAscii( SC_UNO_GRIDCOLOR ) == 0 )
{
- sal_Int64 nColor;
+ sal_Int64 nColor(0);
if (aValue >>= nColor)
{
String aColorName;
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
index c91b072..4a61cce 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
@@ -2,7 +2,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
@@ -41,8 +41,6 @@
#include <bf_svtools/zforlist.hxx>
#include <bf_svtools/zformat.hxx>
#include <bf_svtools/pathoptions.hxx>
-#include <bf_sfx2/docinf.hxx>
-#include <bf_sfx2/docinf.hxx>
#include <bf_sfx2/request.hxx>
#include <bf_sfx2/printer.hxx>
#include <bf_sfx2/evntconf.hxx>
@@ -138,7 +136,7 @@ using namespace ::rtl;
/*N*/
/*N*/ if( nAction )
/*N*/ {
-/*N*/ BOOL bUnlockView;
+/*N*/ BOOL bUnlockView(false);
/*N*/ if( pWrtShell )
/*N*/ {
/*N*/ bUnlockView = !pWrtShell->IsViewLocked();
@@ -232,7 +230,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pDocShell )
/*N*/
/*N*/ if( bSet )
/*N*/ {
-/*N*/ BOOL bOld = pDoc->IsModified();
+/*N*/ pDoc->IsModified();
/*N*/ pDoc->SetModified();
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index 57c434a..a22e16b 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -2,7 +2,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
@@ -59,7 +59,6 @@
#include <unoredlines.hxx>
#include <unosrch.hxx>
#include <toolkit/awt/vclxdevice.hxx>
-#include <bf_sfx2/docinf.hxx>
#include <bf_sfx2/objsh.hxx> // SfxObjectShellRef <-> SV_DECL_REF(SfxObjectShell)
#include <unoprnms.hxx>
#include <unostyle.hxx>
@@ -880,27 +879,27 @@ sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, sal_Bool& bException)
sal_uInt32 nRet = 0;
if( eType == TypeClass_LONG )
{
- sal_Int32 nVal;
+ sal_Int32 nVal(0);
rValue >>= nVal;
if(nVal >=0 )
nRet = (sal_uInt32)nVal;
}
else if( eType == TypeClass_UNSIGNED_SHORT )
{
- sal_uInt16 nVal;
+ sal_uInt16 nVal(0);
rValue >>= nVal;
nRet = nVal;
}
else if( eType == TypeClass_SHORT )
{
- sal_Int16 nVal;
+ sal_Int16 nVal(0);
rValue >>= nVal;
if(nVal >=0)
nRet = (sal_uInt32)nVal;
}
else if( eType == TypeClass_BYTE )
{
- BYTE nVal;
+ BYTE nVal(0);
rValue >>= nVal;
nRet = nVal;
}
@@ -1249,7 +1248,7 @@ void SwXTextDocument::InitNewDoc()
if(pxXDrawPage)
{
- drawing::XDrawPage* pxPage = pxXDrawPage->get();
+ pxXDrawPage->get();
pDrawPage->Invalidate();
delete pxXDrawPage;
pxXDrawPage = 0;
@@ -1606,7 +1605,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
{
sal_Int16 eRedMode = pDocShell->GetDoc()->GetRedlineMode();
eRedMode = eRedMode & (~REDLINE_SHOW_MASK);
- sal_Int16 nSet;
+ sal_Int16 nSet(0);
aValue >>= nSet;
switch(nSet)
{
@@ -1623,7 +1622,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
break;
case WID_DOC_TWO_DIGIT_YEAR:
{
- sal_Int16 nYear;
+ sal_Int16 nYear(0);
aValue >>= nYear;
pDocShell->GetDoc()->GetNumberFormatter(TRUE)->SetYear2000(nYear);
}
commit 9e69e34cb0531d900815f0c84c8c0f0c00a75bf8
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Jan 12 07:51:42 2011 -0800
Remove #include & whitespace
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index e6d4d95..42ff911 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -2,7 +2,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
@@ -36,7 +36,6 @@
#include <bf_svtools/ctrltool.hxx>
#include <bf_svtools/sfxecode.hxx>
-#include <bf_sfx2/docinf.hxx>
#include <bf_sfx2/docfile.hxx>
#include <bf_sfx2/docfilt.hxx>
#include <bf_sfx2/sfx.hrc>
@@ -141,7 +140,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ {
/*N*/ SfxInPlaceObject::FillClass( pClassName, pFormat, pAppName,
/*N*/ pFullTypeName, pShortTypeName, nFileFormat );
-/*N*/
+/*N*/
/*N*/ if ( nFileFormat == SOFFICE_FILEFORMAT_31 )
/*N*/ {
/*N*/ *pClassName = SvGlobalName( BF_SO3_SC_CLASSID_30 );
@@ -174,7 +173,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ *pClassName = SvGlobalName( BF_SO3_SC_CLASSID_60 );
/*N*/ *pFormat = SOT_FORMATSTR_ID_STARCALC_60;
/*N*/ *pAppName = String( ScResId( SCSTR_APPLICATION ) );
-/*N*/
+/*N*/
/*N*/ *pFullTypeName = String( ScResId( SCSTR_LONG_SCDOC_NAME ) );
/*N*/ *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) );
@@ -187,14 +186,14 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ BOOL ScDocShell::LoadCalc( SvStorage* pStor ) // StarCalc 3, 4 or 5 file
/*N*/ {
/*N*/ // MacroCallMode is no longer needed, state is kept in SfxObjectShell now
-/*N*/
+/*N*/
/*N*/ BOOL bRet = TRUE;
-/*N*/
+/*N*/
/*N*/ SvStorageStreamRef aPoolStm = pStor->OpenStream( String::CreateFromAscii(pStyleName), STREAM_STD_READ );
/*N*/ SvStorageStreamRef aDocStm = pStor->OpenStream( String::CreateFromAscii(pStarCalcDoc), STREAM_STD_READ );
/*N*/ ULONG nPoolErr = aPoolStm->GetError();
/*N*/ ULONG nDocErr = aDocStm->GetError();
-/*N*/
+/*N*/
/*N*/ ScProgress* pProgress = NULL;
/*N*/ SfxObjectCreateMode eShellMode = GetCreateMode();
/*N*/ if ( eShellMode == SFX_CREATE_MODE_STANDARD && !nDocErr )
@@ -205,11 +204,11 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ ULONG nRange = nEndPos - nCurPos;
/*N*/ pProgress = new ScProgress( this, ScGlobal::GetRscString(STR_LOAD_DOC), nRange );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( nPoolErr == ERRCODE_IO_NOTEXISTS && nDocErr == ERRCODE_IO_NOTEXISTS )
/*N*/ {
/*?*/ // leerer Storage = leeres Dokument -> wie InitNew
-/*?*/
+/*?*/
/*?*/ aDocument.MakeTable(0);
/*?*/ Size aSize( (long) ( STD_COL_WIDTH * HMM_PER_TWIPS * OLE_STD_CELLS_X ),
/*?*/ (long) ( ScGlobal::nStdRowHeight * HMM_PER_TWIPS * OLE_STD_CELLS_Y ) );
@@ -222,9 +221,9 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ {
/*N*/ aPoolStm->SetVersion(pStor->GetVersion());
/*N*/ aDocStm->SetVersion(pStor->GetVersion());
-/*N*/
+/*N*/
/*N*/ aDocument.Clear(); // keine Referenzen auf Pool behalten!
-/*N*/
+/*N*/
/*N*/ RemoveItem( SID_ATTR_CHAR_FONTLIST );
/*N*/ RemoveItem( ITEMID_COLOR_TABLE );
/*N*/ RemoveItem( ITEMID_GRADIENT_LIST );
@@ -232,10 +231,10 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ RemoveItem( ITEMID_BITMAP_LIST );
/*N*/ RemoveItem( ITEMID_DASH_LIST );
/*N*/ RemoveItem( ITEMID_LINEEND_LIST );
-/*N*/
+/*N*/
/*N*/ aDocument.LoadPool( *aPoolStm, FALSE ); // FALSE: RefCounts nicht laden
/*N*/ bRet = (aPoolStm->GetError() == 0);
-/*N*/
+/*N*/
/*N*/ if ( !bRet )
/*N*/ {
/*N*/ pStor->SetError( aPoolStm->GetError() );
@@ -246,24 +245,24 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ // ViewOptions are not completely stored (to avoid warnings),
/*N*/ // so must be initialized from global settings.
/*N*/ //! This can be removed if a new file format loads all ViewOptions !!!
-/*N*/
+/*N*/
/*N*/ aDocument.SetViewOptions( SC_MOD()->GetViewOptions() );
-/*N*/
+/*N*/
/*N*/ ULONG nErrCode = aPoolStm->GetErrorCode();
/*N*/ const ByteString aStrKey = pStor->GetKey();
/*N*/ const BOOL bKeySet = (aStrKey.Len() > 0);
-/*N*/
+/*N*/
/*N*/ if ( bKeySet )
/*?*/ aDocStm->SetKey( aStrKey ); // Passwort setzen
-/*N*/
+/*N*/
/*N*/ bRet = aDocument.Load( *aDocStm, pProgress );
-/*N*/
+/*N*/
/*N*/ if ( !bRet && bKeySet ) // Passwort falsch
/*N*/ {
/*?*/ SetError( ERRCODE_SFX_WRONGPASSWORD );
/*?*/ pStor->SetError( ERRCODE_SFX_WRONGPASSWORD );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( aDocStm->GetError() )
/*N*/ {
/*?*/ // Zeile-8192-Meldung braucht nur zu kommen, wenn die Zeilen
@@ -284,11 +283,11 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ if ( nErrCode & ERRCODE_WARNING_MASK )
/*?*/ SetError( nErrCode );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if (bRet)
/*N*/ {
/*N*/ aDocument.UpdateFontCharSet();
-/*N*/
+/*N*/
/*N*/ UpdateLinks(); // verknuepfte Tabellen in Link-Manager
/*N*/ RemoveUnknownObjects(); // unbekannte Ole-Objekte loeschen
@@ -341,7 +340,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*?*/ if (pStylePool)
/*?*/ pStylePool->UpdateStdNames(); // correct style names for different languages
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if (bRet)
/*N*/ aDocument.GetPool()->MyLoadCompleted();
/*N*/ }
@@ -350,10 +349,10 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*?*/ DBG_ERROR( "Stream-Fehler");
/*?*/ bRet = FALSE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if (!aDocument.HasTable(0))
/*?*/ aDocument.MakeTable(0);
-/*N*/
+/*N*/
/*N*/ if (eShellMode == SFX_CREATE_MODE_EMBEDDED)
/*N*/ {
/*N*/ USHORT nVisTab = aDocument.GetVisibleTab();
@@ -378,9 +377,9 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*?*/ TRUE );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ delete pProgress;
-/*N*/
+/*N*/
/*N*/ return bRet;
/*N*/ }
@@ -388,7 +387,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ BOOL ScDocShell::SaveCalc( SvStorage* pStor ) // Calc 3, 4 or 5 file
/*N*/ {
/*N*/ BOOL bRet = TRUE;
-/*N*/
+/*N*/
/*N*/ ScProgress* pProgress = NULL;
/*N*/ SfxObjectCreateMode eShellMode = GetCreateMode();
/*N*/ if ( eShellMode == SFX_CREATE_MODE_STANDARD )
@@ -396,7 +395,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ ULONG nRange = aDocument.GetWeightedCount() + 1;
/*N*/ pProgress = new ScProgress( this, ScGlobal::GetRscString(STR_SAVE_DOC), nRange );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ SvStorageStreamRef aPoolStm = pStor->OpenStream( String::CreateFromAscii(pStyleName) );
/*N*/ if( !aPoolStm->GetError() )
/*N*/ {
@@ -411,7 +410,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*?*/ DBG_ERROR( "Stream Error" );
/*?*/ bRet = FALSE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( bRet && eShellMode != SFX_CREATE_MODE_ORGANIZER )
/*N*/ {
/*N*/ SvStorageStreamRef aDocStm = pStor->OpenStream( String::CreateFromAscii(pStarCalcDoc) );
@@ -422,11 +421,11 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ aDocStm->SetSize(0);
/*N*/ bRet = aDocument.Save( *aDocStm, pProgress );
/*N*/ DBG_ASSERT( bRet, "Error while saving" );
-/*N*/
+/*N*/
/*N*/ if ( aDocument.HasLostData() )
/*N*/ {
/*?*/ // Warnung, dass nicht alles gespeichert wurde
-/*?*/
+/*?*/
/*?*/ if (!pStor->GetError())
/*?*/ pStor->SetError(SCWARN_EXPORT_MAXROW);
/*?*/ }
@@ -497,9 +496,9 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
}
}
/*N*/ }
-/*N*/
+/*N*/
/*N*/ delete pProgress;
-/*N*/
+/*N*/
/*N*/ return bRet;
/*N*/ }
@@ -508,18 +507,18 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ // prevent unnecessary broadcasts and updates
/*N*/ DBG_ASSERT(pModificator == NULL, "The Modificator should not exist");
/*N*/ pModificator = new ScDocShellModificator( *this );
-/*N*/
+/*N*/
/*N*/ aDocument.SetImportingXML( TRUE );
/*N*/ // prevent unnecessary broadcasts and "half way listeners"
/*N*/ aDocument.SetInsertingFromOtherDoc( TRUE );
-/*N*/
+/*N*/
/*N*/ if (GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
/*N*/ ScColumn::bDoubleAlloc = sal_True;
/*N*/ }
/*N*/ void ScDocShell::AfterXMLLoading(sal_Bool /*bRet*/)
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+ DBG_BF_ASSERT(0, "STRIP"); //STRIP001
aDocument.SetInsertingFromOtherDoc( FALSE );
aDocument.SetImportingXML( FALSE );
@@ -535,32 +534,32 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ BOOL ScDocShell::LoadXML( SfxMedium* pInMedium, SvStorage* pStor )
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::LoadXML" );
-/*N*/
+/*N*/
/*N*/ // MacroCallMode is no longer needed, state is kept in SfxObjectShell now
-/*N*/
+/*N*/
/*N*/ // no Seek(0) here - always loading from storage, GetInStream must not be called
-/*N*/
+/*N*/
/*N*/ BeforeXMLLoading();
-/*N*/
+/*N*/
/*N*/ ScXMLImportWrapper aImport( aDocument, pInMedium, pStor );
-/*N*/
+/*N*/
/*N*/ sal_Bool bRet(sal_False);
/*N*/ if (GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
/*N*/ bRet = aImport.Import(sal_False);
/*N*/ else
/*N*/ bRet = aImport.Import(sal_True);
-/*N*/
+/*N*/
/*N*/ AfterXMLLoading(bRet);
-/*N*/
+/*N*/
/*N*/ //! row heights...
-/*N*/
+/*N*/
/*N*/ return bRet;
/*N*/ }
/*N*/ BOOL ScDocShell::SaveXML( SfxMedium* pInMedium, SvStorage* pStor )
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::SaveXML" );
-/*N*/
+/*N*/
/*N*/ ScXMLImportWrapper aImport( aDocument, pInMedium, pStor );
/*N*/ sal_Bool bRet(sal_False);
/*N*/ if (GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
@@ -573,16 +572,16 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ BOOL ScDocShell::Load( SvStorage* pStor )
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" );
-/*N*/
+/*N*/
/*N*/ ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
-/*N*/
+/*N*/
/*N*/ DBG_ASSERT( pStor, "Load without storage?" );
/*N*/ BOOL bXML = ( pStor->GetVersion() >= SOFFICE_FILEFORMAT_60 );
-/*N*/
+/*N*/
/*N*/ // only the latin script language is loaded
/*N*/ // -> initialize the others from options (before loading)
/*N*/ InitOptions();
-/*N*/
+/*N*/
/*N*/ BOOL bRet = SfxInPlaceObject::Load( pStor );
/*N*/ if( bRet )
/*N*/ {
@@ -591,7 +590,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
/*N*/ nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : ::com::sun::star::document::UpdateDocMode::NO_UPDATE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if (bXML)
/*N*/ {
/*N*/ // prepare a valid document for XML filter
@@ -599,26 +598,26 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ aDocument.MakeTable(0);
/*N*/ aDocument.GetStyleSheetPool()->CreateStandardStyles();
/*N*/ aDocument.UpdStlShtPtrsFrmNms();
-/*N*/
+/*N*/
/*N*/ bRet = LoadXML( GetMedium(), pStor );
/*N*/ }
/*N*/ else
/*N*/ bRet = LoadCalc( pStor );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if (!bRet && !pStor->GetError())
/*?*/ pStor->SetError( SVSTREAM_FILEFORMAT_ERROR );
-/*N*/
+/*N*/
/*N*/ if (pStor->GetError())
/*?*/ SetError( pStor->GetError() );
-/*N*/
+/*N*/
/*N*/ InitItems();
/*N*/ CalcOutputFactor();
-/*N*/
+/*N*/
/*N*/ // #73762# invalidate eventually temporary table areas
/*N*/ if ( bRet )
/*N*/ aDocument.InvalidateTableArea();
-/*N*/
+/*N*/
/*N*/ bIsEmpty = FALSE;
/*N*/ FinishedLoading( SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES );
/*N*/ return bRet;
@@ -645,11 +644,11 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ else if (rHint.ISA(ScAutoStyleHint))
/*N*/ {
/*?*/ //! direct call for AutoStyles
-/*?*/
+/*?*/
/*?*/ // this is called synchronously from ScInterpreter::ScStyle,
/*?*/ // modifying the document must be asynchronous
/*?*/ // (handled by AddInitial)
-/*?*/
+/*?*/
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScAutoStyleHint& rStlHint = (ScAutoStyleHint&)rHint;
/*N*/ }
/*N*/ }
@@ -662,12 +661,12 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium )
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertFrom" );
-/*N*/
+/*N*/
/*N*/ BOOL bRet = FALSE; // FALSE heisst Benutzerabbruch !!
/*N*/ // bei Fehler: Fehler am Stream setzen!!
-/*N*/
+/*N*/
/*N*/ ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
-/*N*/
+/*N*/
/*N*/ // ob nach dem Import optimale Spaltenbreiten gesetzt werden sollen
/*N*/ BOOL bSetColWidths = FALSE;
/*N*/ BOOL bSetSimpleTextColWidths = FALSE;
@@ -676,29 +675,29 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ ScRange aColWidthRange;
/*N*/ // ob nach dem Import optimale Zeilenhoehen gesetzt werden sollen
/*N*/ BOOL bSetRowHeights = FALSE;
-/*N*/
+/*N*/
/*N*/ aConvFilterName.Erase(); //@ #BugId 54198
-/*N*/
+/*N*/
/*N*/ // Alle Filter brauchen die komplette Datei am Stueck (nicht asynchron),
/*N*/ // darum vorher per CreateFileStream dafuer sorgen, dass die komplette
/*N*/ // Datei uebertragen wird.
/*N*/ rMedium.GetPhysicalName(); //! CreateFileStream direkt rufen, wenn verfuegbar
-/*N*/
+/*N*/
/*N*/ SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
/*N*/ nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : ::com::sun::star::document::UpdateDocMode::NO_UPDATE;
-/*N*/
+/*N*/
/*N*/ const SfxFilter* pFilter = rMedium.GetFilter();
/*N*/ if (pFilter)
/*N*/ {
/*N*/ String aFltName = pFilter->GetFilterName();
-/*N*/
+/*N*/
/*N*/ aConvFilterName=aFltName; //@ #BugId 54198
-/*N*/
+/*N*/
/*N*/ BOOL bCalc3 = ( aFltName.EqualsAscii(pFilterSc30) );
/*N*/ BOOL bCalc4 = ( aFltName.EqualsAscii(pFilterSc40) );
/*N*/ if (!bCalc3 && !bCalc4)
/*N*/ aDocument.SetInsertingFromOtherDoc( TRUE );
-/*N*/
+/*N*/
/*N*/ if (bCalc3 || bCalc4) // Calc3/4 - "Import"
/*N*/ {
/*?*/ // wait cursor is handled with progress bar
@@ -737,32 +736,32 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ const SfxPoolItem* pItem;
/*N*/ ScAsciiOptions aOptions;
/*N*/ BOOL bOptInit = FALSE;
-/*N*/
+/*N*/
/*N*/ if ( pSet && SFX_ITEM_SET ==
/*N*/ pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
/*N*/ {
/*N*/ aOptions.ReadFromString( ((const SfxStringItem*)pItem)->GetValue() );
/*N*/ bOptInit = TRUE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( !bOptInit )
/*N*/ {
/*?*/ // default for ascii import (from API without options):
/*?*/ // ISO8859-1/MS_1252 encoding, comma, double quotes
-/*?*/
+/*?*/
/*?*/ aOptions.SetCharSet( RTL_TEXTENCODING_MS_1252 );
/*?*/ aOptions.SetFieldSeps( (sal_Unicode) ',' );
/*?*/ aOptions.SetTextSep( (sal_Unicode) '"' );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ FltError eError = eERR_OK;
/*N*/ BOOL bOverflow = FALSE;
-/*N*/
+/*N*/
/*N*/ if( ! rMedium.IsStorage() )
/*N*/ {
/*N*/ ScImportExport aImpEx( &aDocument );
/*N*/ aImpEx.SetExtOptions( aOptions );
-/*N*/
+/*N*/
/*N*/ SvStream* pInStream = rMedium.GetInStream();
/*N*/ if (pInStream)
/*N*/ {
@@ -777,7 +776,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ else
/*N*/ DBG_ERROR( "No Stream" );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if (eError != eERR_OK)
/*N*/ {
/*N*/ if (!GetError())
@@ -811,7 +810,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*?*/ if( !rMedium.IsStorage() )
/*?*/ {
/*?*/ ScImportExport aImpEx( &aDocument );
-/*?*/
+/*?*/
/*?*/ SvStream* pInStream = rMedium.GetInStream();
/*?*/ if (pInStream)
/*?*/ {
@@ -824,7 +823,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*?*/ else
/*?*/ DBG_ERROR( "No Stream" );
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if ( eError != eERR_OK && !GetError() )
/*?*/ SetError(eError);
/*?*/ bSetColWidths = TRUE;
@@ -843,13 +842,13 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ if (!GetError())
/*N*/ SetError(SCERR_IMPORT_NI);
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if (!bCalc3)
/*N*/ aDocument.SetInsertingFromOtherDoc( FALSE );
/*N*/ }
/*N*/ else
/*N*/ DBG_ERROR("Kein Filter bei ConvertFrom");
-/*N*/
+/*N*/
/*N*/ InitItems();
/*N*/ CalcOutputFactor();
/*N*/ if ( bRet && (bSetColWidths || bSetRowHeights) )
@@ -887,13 +886,13 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 UpdateAllRowHeights(); // with vdev or printer, depending on configuration
/*N*/ }
/*N*/ FinishedLoading( SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES );
-/*N*/
+/*N*/
/*N*/ // #73762# invalidate eventually temporary table areas
/*N*/ if ( bRet )
/*N*/ aDocument.InvalidateTableArea();
-/*N*/
+/*N*/
/*N*/ bIsEmpty = FALSE;
-/*N*/
+/*N*/
/*N*/ return bRet;
/*N*/ }
@@ -901,9 +900,9 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ void ScDocShell::HandsOff()
/*N*/ {
/*N*/ ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
-/*N*/
+/*N*/
/*N*/ SfxInPlaceObject::HandsOff();
-/*N*/
+/*N*/
/*N*/ if( pDrawLayer )
/*N*/ pDrawLayer->ReleasePictureStorage();
/*N*/ }
@@ -912,15 +911,15 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ BOOL ScDocShell::Save()
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Save" );
-/*N*/
+/*N*/
/*N*/ ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
-/*N*/
+/*N*/
/*N*/ SvStorage* pStor = GetStorage();
/*N*/ DBG_ASSERT( pStor, "Save: no storage" );
/*N*/ BOOL bXML = ( pStor->GetVersion() >= SOFFICE_FILEFORMAT_60 );
-/*N*/
+/*N*/
/*N*/ // DoEnterHandler hier nicht (wegen AutoSave), ist im ExecuteSave
-/*N*/
+/*N*/
/*N*/ ScChartListenerCollection* pCharts = aDocument.GetChartListenerCollection();
/*N*/ if (pCharts)
/*N*/ pCharts->UpdateDirtyCharts(); // Charts, die noch upgedated werden muessen
@@ -928,11 +927,11 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren
/*N*/ if (GetCreateMode()== SFX_CREATE_MODE_STANDARD)
/*N*/ SvInPlaceObject::SetVisArea( Rectangle() ); // normal bearbeitet -> keine VisArea
-/*N*/
+/*N*/
/*N*/ // #77577# save additionally XML in storage
/*N*/ if ( GetCreateMode() != SFX_CREATE_MODE_EMBEDDED && !bXML )
/*N*/ AddXMLAsZipToTheStorage( *pStor );
-/*N*/
+/*N*/
/*N*/ // wait cursor is handled with progress bar
/*N*/ BOOL bRet = SfxInPlaceObject::Save();
/*N*/ if( bRet )
@@ -949,14 +948,14 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ BOOL ScDocShell::SaveAs( SvStorage* pStor )
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::SaveAs" );
-/*N*/
+/*N*/
/*N*/ ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
-/*N*/
+/*N*/
/*N*/ DBG_ASSERT( pStor, "SaveAs without storage?" );
/*N*/ BOOL bXML = ( pStor->GetVersion() >= SOFFICE_FILEFORMAT_60 );
-/*N*/
+/*N*/
/*N*/ // DoEnterHandler hier nicht (wegen AutoSave), ist im ExecuteSave
-/*N*/
+/*N*/
/*N*/ ScChartListenerCollection* pCharts = aDocument.GetChartListenerCollection();
/*N*/ if (pCharts)
/*N*/ pCharts->UpdateDirtyCharts(); // Charts, die noch upgedated werden muessen
@@ -964,11 +963,11 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren
/*N*/ if (GetCreateMode()== SFX_CREATE_MODE_STANDARD)
/*N*/ SvInPlaceObject::SetVisArea( Rectangle() ); // normal bearbeitet -> keine VisArea
-/*N*/
+/*N*/
/*N*/ // #77577# save additionally XML in storage
/*N*/ if ( GetCreateMode() != SFX_CREATE_MODE_EMBEDDED && !bXML )
/*N*/ AddXMLAsZipToTheStorage( *pStor );
-/*N*/
+/*N*/
/*N*/ // wait cursor is handled with progress bar
/*N*/ BOOL bRet = SfxInPlaceObject::SaveAs( pStor );
/*N*/ if( bRet )
@@ -978,7 +977,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ else
/*N*/ bRet = SaveCalc( pStor );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return bRet;
/*N*/ }
@@ -1005,7 +1004,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ BOOL ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
/*N*/ {
/*N*/ BOOL bRet = SfxObjectShell::DoSaveCompleted( pNewStor );
-/*N*/
+/*N*/
/*N*/ // SC_HINT_DOC_SAVED fuer Wechsel ReadOnly -> Read/Write
/*N*/ Broadcast( SfxSimpleHint( SC_HINT_DOC_SAVED ) );
/*N*/ return bRet;
@@ -1049,7 +1048,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ {
/*N*/ // TRUE for those filters that keep the default table name
/*N*/ // (which is language specific)
-/*N*/
+/*N*/
/*N*/ return rFilter.EqualsAscii( pFilterAscii )
/*N*/ || rFilter.EqualsAscii( pFilterLotus )
/*N*/ || rFilter.EqualsAscii( pFilterExcel4 )
@@ -1104,18 +1103,18 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ __SCDOCSHELL_INIT
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" );
-/*N*/
+/*N*/
/*N*/ SetPool( &SC_MOD()->GetPool() );
-/*N*/
+/*N*/
/*N*/ SetShell(this);
/*N*/ bIsInplace = (eMode == SFX_CREATE_MODE_EMBEDDED);
/*N*/ // wird zurueckgesetzt, wenn nicht inplace
-/*N*/
+/*N*/
/*N*/ pDocFunc = new ScDocFunc(*this);
-/*N*/
+/*N*/
/*N*/ // SetBaseModel needs exception handling
/*N*/ ScModelObj::CreateAndSet( this );
-/*N*/
+/*N*/
/*N*/ StartListening(*this);
/*N*/ SfxStyleSheetPool* pStlPool = aDocument.GetStyleSheetPool();
/*N*/ if (pStlPool)
@@ -1123,7 +1122,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ aDocument.GetDBCollection()->SetRefreshHandler(
/*N*/ LINK( this, ScDocShell, RefreshDBDataHdl ) );
-/*N*/
+/*N*/
/*N*/ // InitItems und CalcOutputFactor werden jetzt nach bei Load/ConvertFrom/InitNew gerufen
/*N*/ }
@@ -1132,23 +1131,23 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ ScDocShell::~ScDocShell()
/*N*/ {
/*N*/ ResetDrawObjectShell(); // #55570# falls der Drawing-Layer noch versucht, darauf zuzugreifen
-/*N*/
+/*N*/
/*N*/ SfxStyleSheetPool* pStlPool = aDocument.GetStyleSheetPool();
/*N*/ if (pStlPool)
/*N*/ EndListening(*pStlPool);
/*N*/ EndListening(*this);
-/*N*/
+/*N*/
/*N*/ delete pAutoStyleList;
-/*N*/
+/*N*/
/*N*/ delete pDocFunc;
/*N*/ delete pFontList;
-/*N*/
+/*N*/
/*N*/ delete pPaintLockData;
-/*N*/
+/*N*/
/*N*/ delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob()
-/*N*/
+/*N*/
/*N*/ delete pVirtualDevice_100th_mm;
-/*N*/
+/*N*/
/*N*/ if (pModificator)
/*N*/ {
/*N*/ DBG_ERROR("The Modificator should not exist");
@@ -1171,18 +1170,18 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ // BroadcastUno muss auch mit pPaintLockData sofort passieren
/*N*/ //! auch bei SetDrawModified, wenn Drawing angebunden ist
/*N*/ //! dann eigener Hint???
-/*N*/
+/*N*/
/*N*/ if (bInIsModified)
/*N*/ aDocument.BroadcastUno( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
-/*N*/
+/*N*/
/*N*/ if ( pPaintLockData && bInIsModified )
/*N*/ {
/*N*/ pPaintLockData->SetModified(); // spaeter...
/*N*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ SetDrawModified( bInIsModified );
-/*N*/
+/*N*/
/*N*/ if ( bInIsModified )
/*N*/ {
/*N*/ if ( aDocument.IsAutoCalcShellDisabled() )
@@ -1197,12 +1196,12 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ if ( aDocument.IsForcedFormulaPending() && aDocument.GetAutoCalc() )
/*?*/ { DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aDocument.CalcFormulaTree( TRUE );
/*N*/ PostDataChanged();
-/*N*/
+/*N*/
/*N*/ // Detective AutoUpdate:
/*N*/ // Update if formulas were modified (DetectiveDirty) or the list contains
/*N*/ // "Trace Error" entries (#75362# - Trace Error can look completely different
/*N*/ // after changes to non-formula cells).
-/*N*/
+/*N*/
/*N*/ ScDetOpList* pList = aDocument.GetDetOpList();
/*N*/ if ( pList && ( aDocument.IsDetectiveDirty() || pList->HasAddError() ) &&
/*N*/ pList->Count() && !IsInUndo() && SC_MOD()->GetAppOptions().GetDetectiveAuto() )
@@ -1220,9 +1219,9 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ void ScDocShell::SetDrawModified( BOOL bInIsModified /* = TRUE */ )
/*N*/ {
-/*N*/
+/*N*/
/*N*/ SetModified( bInIsModified );
-/*N*/
+/*N*/
/*N*/ if (bInIsModified)
/*N*/ {
/*N*/ if ( aDocument.IsChartListenerCollectionNeedsUpdate() )
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
index 0abf450..a19a960 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
@@ -43,7 +43,6 @@
#pragma hdrstop
#endif
-#include "docinf.hxx"
#include "appuno.hxx"
#include "objsh.hxx"
#include "app.hxx"
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
index bb4ae9d..cfe7f18 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
@@ -2,7 +2,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
@@ -86,14 +86,13 @@
#include "request.hxx"
#include "evntconf.hxx"
#include "cfgmgr.hxx"
-#include "docinf.hxx"
#include "appdata.hxx"
#include "misccfg.hxx"
#include "appimp.hxx"
#include "helper.hxx" // SfxContentHelper::...
#include "app.hxx"
-#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
namespace binfilter {
using namespace ::com::sun::star::uno;
@@ -115,7 +114,7 @@ using namespace ::com::sun::star::beans;
/*N*/ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
/*N*/ {
/*N*/ DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!");
-/*N*/
+/*N*/
/*N*/ SfxObjectShell *pDoc = rEventHint.GetObjShell();
/*N*/ if ( pDoc )
/*N*/ {
@@ -125,7 +124,7 @@ using namespace ::com::sun::star::beans;
/*N*/ if ( pItem && pItem->GetValue() )
/*N*/ bSynchron = TRUE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ {
/*N*/ Broadcast(rEventHint);
/*N*/ if ( pDoc )
@@ -137,7 +136,7 @@ using namespace ::com::sun::star::beans;
/*N*/ {
/*N*/ if ( !pAppData_Impl->pMiscConfig )
/*N*/ pAppData_Impl->pMiscConfig = new SfxMiscCfg;
-/*N*/
+/*N*/
/*N*/ return pAppData_Impl->pMiscConfig;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
index 087a28e..2280525 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
@@ -2,7 +2,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
@@ -76,7 +76,6 @@
#include "appdata.hxx"
#include "cfgmgr.hxx"
#include "docfile.hxx"
-#include "docinf.hxx"
#include "fcontnr.hxx"
#include "objitem.hxx"
#include "objsh.hxx"
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_dinfobj.cxx b/binfilter/bf_sfx2/source/doc/sfx2_dinfobj.cxx
index 9d87f63..b95abba 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_dinfobj.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_dinfobj.cxx
@@ -2,7 +2,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
@@ -33,7 +33,6 @@
#include "app.hxx"
#include "objface.hxx"
#include "sfxsids.hrc"
-#include "docinf.hxx"
#include "docfile.hxx"
#include "openflag.hxx"
#include "dinfobj.hxx"
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
index c804765..039f1f7 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
@@ -55,7 +55,6 @@
#include <unotools/localfilehelper.hxx>
#include <bf_so3/svstor.hxx>
-#include "docinf.hxx"
#include "fltfnc.hxx"
#include "docfac.hxx"
#include "cfgmgr.hxx"
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx
index 80fde41..72ca4c4 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx
@@ -2,7 +2,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
@@ -39,7 +39,6 @@
#include "request.hxx"
#include "docfile.hxx"
#include "app.hxx"
-#include "docinf.hxx"
#include "objshimp.hxx"
#include "interno.hxx"
#include "docfac.hxx"
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index f67cf4f..dcf4f24 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -2,7 +2,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
@@ -86,7 +86,6 @@
#include "docfile.hxx"
#include "fltfnc.hxx"
#include "docfilt.hxx"
-#include "docinf.hxx"
#include "docfac.hxx"
#include "cfgmgr.hxx"
#include "objshimp.hxx"
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
index 0118e8f..5a9a2eb 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
@@ -2,7 +2,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
@@ -53,7 +53,6 @@
#include "sfxsids.hrc"
#include "printer.hxx"
#include "objsh.hxx"
-#include "docinf.hxx"
#include "docfile.hxx"
#include "openflag.hxx"
#include "app.hxx"
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
index 6a549a9..0400866 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
@@ -69,7 +69,6 @@
#include "sfxtypes.hxx"
#include "evntconf.hxx"
#include "request.hxx"
-#include "docinf.hxx"
#include "objuno.hxx"
#include "appdata.hxx"
#include "appuno.hxx"
diff --git a/binfilter/bf_sfx2/source/inc/dinfobj.hxx b/binfilter/bf_sfx2/source/inc/dinfobj.hxx
index dcf42b0..aebfd92 100644
--- a/binfilter/bf_sfx2/source/inc/dinfobj.hxx
+++ b/binfilter/bf_sfx2/source/inc/dinfobj.hxx
@@ -2,7 +2,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
@@ -30,7 +30,6 @@
#include <bf_so3/auto.hxx>
-#include "docinf.hxx"
#include "dinfdlg.hxx"
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/doc/sw_doc.cxx b/binfilter/bf_sw/source/core/doc/sw_doc.cxx
index c5bfcc0..f15654b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doc.cxx
@@ -2,7 +2,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
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index ee00fe5..4dfdb5a 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -2,7 +2,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
diff --git a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
index 7098497..23905c4 100644
--- a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
+++ b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
@@ -2,7 +2,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
@@ -82,7 +82,7 @@ namespace binfilter {
/*N*/ : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr )
/*N*/ {
/*N*/ aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
-/*N*/ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf =
+/*N*/ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf =
/*N*/ bFrameInPaint = bScaleImageMap = FALSE;
/*N*/ bGrafikArrived = TRUE;
/*N*/ ReRead( rGrfName, rFltName, pGraphic, 0, FALSE );
@@ -97,7 +97,7 @@ namespace binfilter {
/*N*/ aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
/*N*/ if( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() )
/*?*/ aGrfObj.SetSwapState();
-/*N*/ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf =
+/*N*/ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf =
/*N*/ bFrameInPaint = bScaleImageMap = FALSE;
/*N*/ bGrafikArrived = TRUE;
/*N*/ }
@@ -113,14 +113,14 @@ namespace binfilter {
/*N*/ : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr )
/*N*/ {
/*N*/ aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
-/*N*/
+/*N*/
/*N*/ Graphic aGrf; aGrf.SetDefaultType();
/*N*/ aGrfObj.SetGraphic( aGrf, rGrfName );
-/*N*/
-/*N*/ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf =
+/*N*/
+/*N*/ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf =
/*N*/ bFrameInPaint = bScaleImageMap = FALSE;
/*N*/ bGrafikArrived = TRUE;
-/*N*/
+/*N*/
/*N*/ InsertLink( rGrfName, rFltName );
/*N*/ if( IsLinkedFile() )
/*N*/ {
@@ -143,10 +143,10 @@ namespace binfilter {
/*N*/ BOOL bNewGrf )
/*N*/ {
/*N*/ BOOL bReadGrf = FALSE, bSetTwipSize = TRUE;
-/*N*/
+/*N*/
/*N*/ ASSERT( pGraphic || pGrfObj || rGrfName.Len(),
/*N*/ "GraphicNode without a name, Graphic or GraphicObject" );
-/*N*/
+/*N*/
/*N*/ // ReadRead mit Namen
/*N*/ if( refLink.Is() )
/*N*/ {
@@ -166,14 +166,14 @@ namespace binfilter {
/*?*/ ::binfilter::MakeLnkName( sCmd, 0, rGrfName, aEmptyStr, &rFltName );
/*?*/ nNewType = OBJECT_CLIENT_GRF;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( nNewType != refLink->GetObjType() )
/*?*/ {
/*?*/ refLink->Disconnect();
/*?*/ ((SwBaseLink*)&refLink)->SetObjType( nNewType );
/*?*/ }
/*?*/ }
-/*?*/
+/*?*/
/*?*/ refLink->SetLinkSourceName( sCmd );
/*?*/ }
/*?*/ else // kein Name mehr, Link aufheben
@@ -181,7 +181,7 @@ namespace binfilter {
/*?*/ GetDoc()->GetLinkManager().Remove( refLink );
/*?*/ refLink.Clear();
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( pGraphic )
/*?*/ {
/*?*/ aGrfObj.SetGraphic( *pGraphic, rGrfName );
@@ -202,7 +202,7 @@ namespace binfilter {
/*?*/ // der neue Link nicht geladen werden konnte.
/*?*/ Graphic aGrf; aGrf.SetDefaultType();
/*?*/ aGrfObj.SetGraphic( aGrf, rGrfName );
-/*?*/
+/*?*/
/*?*/ if( refLink.Is() )
/*?*/ {
/*?*/ if( GetFrm() )
@@ -221,7 +221,7 @@ namespace binfilter {
/*N*/ // MIB 27.02.2001: Old stream must be deleted before the new one is set.
/*N*/ if( HasStreamName() )
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName();
-/*N*/
+/*N*/
/*N*/ aGrfObj.SetGraphic( *pGraphic );
/*N*/ bReadGrf = TRUE;
/*N*/ }
@@ -230,7 +230,7 @@ namespace binfilter {
/*N*/ // MIB 27.02.2001: Old stream must be deleted before the new one is set.
/*?*/ if( HasStreamName() )
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName();
-/*?*/
+/*?*/
/*?*/ aGrfObj = *pGrfObj;
/*?*/ if( pGrfObj->HasUserData() && pGrfObj->IsSwappedOut() )
/*?*/ aGrfObj.SetSwapState();
@@ -240,15 +240,15 @@ namespace binfilter {
/*N*/ // Ist die Grafik bereits geladen?
/*N*/ else if( !bNewGrf && GRAPHIC_NONE != aGrfObj.GetType() )
/*N*/ return TRUE;
-/*N*/
+/*N*/
/*N*/ else
/*N*/ {
/*N*/ if( HasStreamName() )
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName();
-/*N*/
+/*N*/
/*N*/ // einen neuen Grafik-Link anlegen
/*N*/ InsertLink( rGrfName, rFltName );
-/*N*/
+/*N*/
/*N*/ if( GetNodes().IsDocNodes() )
/*N*/ {
/*N*/ if( pGraphic )
@@ -277,19 +277,19 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Bug 39281: Size nicht sofort loeschen - Events auf ImageMaps
/*N*/ // sollten nicht beim Austauschen nicht ins "leere greifen"
/*N*/ if( bSetTwipSize )
/*N*/ SetTwipSize( ::binfilter::GetGraphicSizeTwip( aGrfObj.GetGraphic(), 0 ) );
-/*N*/
+/*N*/
/*N*/ // erzeuge noch einen Update auf die Frames
/*N*/ if( bReadGrf && bNewGrf )
/*N*/ {
/*?*/ SwMsgPoolItem aMsgHint( RES_UPDATE_ATTR );
/*?*/ Modify( &aMsgHint, &aMsgHint );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return bReadGrf;
/*N*/ }
@@ -489,7 +489,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ pRoot = pDocStg;
/*N*/ ASSERT( SOFFICE_FILEFORMAT_60 > pRoot->GetVersion(),
/*N*/ "SwGrfNode::StoreGraphic called for 6.0+ file format" );
-/*N*/
+/*N*/
/*N*/ String aDstPicStgName(
/*N*/ RTL_CONSTASCII_USTRINGPARAM( "EmbeddedPictures" ) );
/*N*/ String aDstStrmName( aSrcStrmName );
@@ -507,9 +507,9 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ ? pDocStg->OpenStorage( aSrcPicStgName,
/*N*/ STREAM_READ | STREAM_SHARE_DENYWRITE )
/*N*/ : pDocStg;
-/*N*/
+/*N*/
/*N*/ SvStorageStreamRef refStrm;
-/*N*/
+/*N*/
/*N*/ BOOL bWriteNew = pDocStg->GetVersion() != pRoot->GetVersion() ||
/*N*/ !bGraphic;
/*N*/ if( !bWriteNew &&
@@ -530,7 +530,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ if( SOFFICE_FILEFORMAT_40 < pRoot->GetVersion() &&
/*N*/ GetDoc()->GetInfo()->IsSaveOriginalGraphics() )
/*N*/ nNewCmprsMode |= COMPRESSMODE_NATIVE;
-/*N*/
+/*N*/
/*N*/ if( nCmprsMode != nNewCmprsMode )
/*N*/ {
/*N*/ // der Kompressedmode stimmt nicht, also muss
@@ -541,7 +541,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( bWriteNew )
/*N*/ {
/*N*/ if( aGrfObj.IsSwappedOut() &&
@@ -574,7 +574,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ if( refDstPics->IsContained( aDstStrmName ) )
/*N*/ // nur neu erzeugen, wenn Name schon vorhanden ist!
/*?*/ aDstStrmName = Sw3Io::UniqueName( refDstPics, "Pic" );
-/*N*/
+/*N*/
/*N*/ if( refSrcPics->CopyTo( aSrcStrmName, refDstPics,
/*N*/ aDstStrmName )
/*N*/ && refDstPics->Commit() )
@@ -584,7 +584,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( !aDstStrmName.Len() )
/*N*/ {
/*N*/ ASSERT( pRoot, "Kein Storage gegeben" );
@@ -607,9 +607,9 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ bool bIsSwapOut = aGrfObj.IsSwappedOut();
/*N*/ if( bIsSwapOut && !aGrfObj.SwapIn() )
/*N*/ return FALSE;
-/*N*/
+/*N*/
/*N*/ refStrm->SetVersion( pRoot->GetVersion() );
-/*N*/
+/*N*/
/*N*/ //JP 04.05.98: laut ChangesMail vom KA und Bug 49617
/*N*/ //JP 21.06.98: laut ChangesMail vom KA, natives Save
/*N*/ USHORT nComprMode = refStrm->GetCompressMode();
@@ -619,7 +619,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ nComprMode |= COMPRESSMODE_ZBITMAP;
/*N*/ else
/*N*/ nComprMode &= ~COMPRESSMODE_ZBITMAP;
-/*N*/
+/*N*/
/*N*/ //JP 21.06.98: laut ChangesMail vom KA, natives Save
/*N*/ if( SOFFICE_FILEFORMAT_40 < refStrm->GetVersion() &&
/*N*/ GetDoc()->GetInfo()->IsSaveOriginalGraphics() )
@@ -627,7 +627,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ else
/*N*/ nComprMode &= ~COMPRESSMODE_NATIVE;
/*N*/ refStrm->SetCompressMode( nComprMode );
-/*N*/
+/*N*/
/*N*/ BOOL bRes = FALSE;
/*N*/ if( pRoot == pDocStg )
/*N*/ {
@@ -725,7 +725,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ BOOL bSync = rFltName.EqualsAscii( "SYNCHRON" );
/*N*/ refLink->SetSynchron( bSync );
/*N*/ refLink->SetContentType( SOT_FORMATSTR_ID_SVXB );
-/*N*/
+/*N*/
/*N*/ pDoc->GetLinkManager().InsertFileLink( *refLink,
/*N*/ OBJECT_CLIENT_GRF, rGrfName,
/*N*/ (!bSync && rFltName.Len() ? &rFltName : 0) );
@@ -760,11 +760,11 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ BOOL bGraphic = FALSE;
/*N*/ rStorName.Erase();
/*N*/ rStrmName.Erase();
-/*N*/
+/*N*/
/*N*/ String aUserData( aGrfObj.GetUserData() );
/*N*/ if( !aUserData.Len() )
/*N*/ return FALSE;
-/*N*/
+/*N*/
/*N*/ String aProt( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
/*N*/ if( 0 == aUserData.CompareTo( aProt, aProt.Len() ) )
/*N*/ {
@@ -789,7 +789,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ }
/*N*/ ASSERT( STRING_NOTFOUND == rStrmName.Search( '/' ),
/*N*/ "invalid graphic stream name" );
-/*N*/
+/*N*/
/*N*/ return bGraphic;
/*N*/ }
@@ -797,9 +797,9 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ {
/*N*/ // kopiere die Formate in das andere Dokument:
/*N*/ SwGrfFmtColl* pColl = pDoc->CopyGrfColl( *GetGrfColl() );
-/*N*/
+/*N*/
/*N*/ SwGrfNode* pThis = (SwGrfNode*)this;
-/*N*/
+/*N*/
/*N*/ Graphic aTmpGrf;
/*N*/ SwBaseLink* pLink = (SwBaseLink*)(::binfilter::SvBaseLink*) refLink;
/*N*/ if( !pLink && HasStreamName() )
@@ -836,7 +836,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pThis->SwapIn();
/*N*/ aTmpGrf = aGrfObj.GetGraphic();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ const ::binfilter::SvLinkManager& rMgr = GetDoc()->GetLinkManager();
/*N*/ String sFile, sFilter;
/*N*/ if( IsLinkedFile() )
@@ -848,7 +848,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*?*/ ::binfilter::MakeLnkName( sFile, &sTmp1, sTmp2, sFilter );
/*?*/ sFilter.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "DDE" ));
/*N*/ }
-/*N*/
+/*N*/
/*N*/ SwGrfNode* pGrfNd = pDoc->GetNodes().MakeGrfNode( rIdx, sFile, sFilter,
/*N*/ &aTmpGrf, pColl,
/*N*/ (SwAttrSet*)GetpSwAttrSet() );
@@ -860,19 +860,19 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*M*/ IMPL_LINK( SwGrfNode, SwapGraphic, BfGraphicObject*, pGrfObj )
/*M*/ {
/*M*/ SvStream* pRet = NULL;
-/*M*/
+/*M*/
/*M*/ // #101174#: Keep graphic while in swap in. That's at least important
/*M*/ // when breaking links, because in this situation a reschedule call and
-/*M*/ // a DataChanged call lead to a paint of the graphic.
+/*M*/ // a DataChanged call lead to a paint of the graphic.
/*M*/ if( pGrfObj->IsInSwapOut() && (IsSelected() || bInSwapIn) )
/*M*/ pRet = GRFMGR_AUTOSWAPSTREAM_NONE;
/*M*/ else if( refLink.Is() )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*M*/ }
/*M*/ else
/*M*/ {
/*M*/ pRet = GRFMGR_AUTOSWAPSTREAM_TEMP;
-/*M*/
+/*M*/
/*M*/ if( HasStreamName() )
/*M*/ {
/*M*/ SvStorageRef refRoot = GetDoc()->GetDocStorage();
@@ -915,7 +915,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*M*/ }
/*M*/ }
/*M*/ }
-/*M*/
+/*M*/
/*M*/ return (long)pRet;
/*M*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 6c476fe..3a0aee1 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -2,7 +2,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
@@ -193,7 +193,7 @@ public:
/*N*/ hBatsFontConv = 0;
hMathFontConv = 0;
/*N*/ Reset();
-/*N*/
+/*N*/
/*N*/ {
/*N*/ const sal_Char* aNames[1] = { "Writer/SW3Imp" };
/*N*/ sal_uInt32 aVal[1];
@@ -244,7 +244,7 @@ public:
/*N*/ pStrm = 0; // wg. Assert in IsSw.*Export
/*N*/ Reset2();
/*N*/ nGblFlags = SW3F_NODRAWING;
-/*N*/
+/*N*/
/*N*/ #ifdef DBG_UTIL
/*N*/ delete pRefSdrObjects;
/*N*/ pRefSdrObjects = 0;
@@ -274,16 +274,16 @@ public:
/*N*/ else if( pRoot.Is() )
/*N*/ eSrcSet = GetSOStoreTextEncoding( eSrcSet, pRoot->GetVersion() );
/*N*/ nVersion = SWG_VERSION;
-/*N*/
+/*N*/
/*N*/ aRecTypes.Remove( 0, aRecTypes.Count() );
/*N*/ aRecSizes.Remove( 0, aRecSizes.Count() );
/*N*/ aValPositions.Remove( 0, aValPositions.Count() );
/*N*/ eStartNodeType = SwNormalStartNode;
-/*N*/
+/*N*/
/*N*/ aINetFldText.Erase();
/*N*/ pFmtINetFmt = 0;
/*N*/ bDrawFmtSkipped = sal_False;
-/*N*/
+/*N*/
/*N*/ memset( cPasswd, 0, 16 );
/*N*/ aStringPool.Clear();
/*N*/ if( pExportInfo && pExportInfo->pTblLineBoxFmtNames40 )
@@ -293,16 +293,16 @@ public:
/*N*/ }
/*N*/ // Hier ggf das Passwort neu setzen
/*N*/ SetPasswd();
-/*N*/
+/*N*/
/*N*/ delete pRecSizes;
/*N*/ pRecSizes = 0;
-/*N*/
+/*N*/
/*N*/ delete pAuthorityMap;
/*N*/ pAuthorityMap = 0;
-/*N*/
+/*N*/
/*N*/ delete pSectionDepths;
/*N*/ pSectionDepths = 0;
-/*N*/
+/*N*/
/*N*/ if( hBatsFontConv )
/*N*/ {
/*N*/ DestroyFontToSubsFontConverter( hBatsFontConv );
@@ -335,7 +335,7 @@ public:
/*N*/ {
/*N*/ nRes = nCode ? nCode : ERR_SWG_FILE_FORMAT_ERROR;
/*N*/ }
-
+
/*N*/ void Sw3IoImp::Warning( ULONG nCode )
/*N*/ {
/*N*/ nWarn = nCode ? nCode : WARN_SWG_FEATURES_LOST;
@@ -370,15 +370,15 @@ public:
/*N*/ {
/*N*/ if( !pDoc->GetDrawModel() )
/*N*/ return;
-/*N*/
+/*N*/
/*N*/ const SwSpzFrmFmts* pFlys = pDoc->GetSpzFrmFmts();
/*N*/ sal_uInt16 nArrLen = pFlys->Count();
-/*N*/
+/*N*/
/*N*/ SdrPage *pPage = pDoc->GetDrawModel()->GetPage( 0 );
/*N*/ ASSERT( !pHiddenDrawObjs, "hidden obj list exists" );
/*N*/ delete pHiddenDrawObjs;
/*N*/ pHiddenDrawObjs = 0;
-/*N*/
+/*N*/
/*N*/ sal_uInt16 nCount = pPage->GetObjCount();
/*N*/ nHiddenDrawObjs = nCount;
/*N*/ for( sal_uInt16 i=0; i<nArrLen; i++ )
@@ -386,12 +386,12 @@ public:
/*N*/ const SwFrmFmt* pFmt = (*pFlys)[ i ];
/*N*/ if( RES_DRAWFRMFMT != pFmt->Which() )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ SwClientIter aIter( *(SwFrmFmt*)pFmt );
/*N*/ if( aIter.First( TYPE(SwDrawContact) ) )
/*N*/ {
/*N*/ SdrObject *pObj = ((SwDrawContact*)aIter())->GetMaster();
-/*N*/
+/*N*/
/*N*/ // Nowadays, all objects have to be in a page, while in earlier
/*N*/ // version, hidden objects were not in the page.
/*N*/ ASSERT( pObj->GetPage(), "draw objects have to be in a page" );
@@ -401,11 +401,11 @@ public:
/*N*/ }
/*N*/ if( nHiddenDrawObjs == pPage->GetObjCount() )
/*N*/ nHiddenDrawObjs = ULONG_MAX;
-/*N*/
+/*N*/
/*N*/ for( sal_uInt16 j=0; j<nCount; j++ )
/*N*/ {
/*N*/ SdrObject *pObj = pPage->GetObj( j );
-/*N*/
+/*N*/
/*N*/ SdrLayerID nLayerId = pObj->GetLayer();
/*N*/ if( !pDoc->IsVisibleLayerId( nLayerId ) )
/*N*/ {
@@ -438,7 +438,7 @@ public:
/*N*/ delete pHiddenDrawObjs;
/*N*/ pHiddenDrawObjs = 0;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( ULONG_MAX != nHiddenDrawObjs )
/*N*/ {
/*N*/ if( pDoc->GetDrawModel() )
@@ -448,7 +448,7 @@ public:
/*N*/ while( nPos > nHiddenDrawObjs )
/*N*/ pPage->RemoveObject( --nPos );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ nHiddenDrawObjs = ULONG_MAX;
/*N*/ }
/*N*/ }
@@ -465,7 +465,7 @@ public:
/*N*/ {
/*N*/ if( !rDoc.GetDrawModel() )
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ const SdrPage *pPage = rDoc.GetDrawModel()->GetPage( 0 );
/*N*/ for ( sal_uInt32 i = 0; i < pPage->GetObjCount(); i++ )
/*N*/ {
@@ -474,26 +474,26 @@ public:
/*N*/ !pObj->ISA(SwFlyDrawObj) )
/*N*/ return sal_True;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ SwDocShell *pDocSh = rDoc.GetDocShell();
/*N*/ if( !pDocSh )
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ Reference< drawing::XDrawPageSupplier > xDPSupp( pDocSh->GetBaseModel(),
/*N*/ UNO_QUERY );
/*N*/ ASSERT( xDPSupp.is(), "XDrawPageSupplier missing" );
-/*N*/
+/*N*/
/*N*/ Reference< drawing::XDrawPage > xDrawPage = xDPSupp->getDrawPage();
/*N*/ ASSERT( xDrawPage.is(), "XDrawPage missing" );
/*N*/ if( !xDrawPage.is() )
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ Reference< form::XFormsSupplier > xFormsSupplier( xDrawPage, UNO_QUERY );
/*N*/ ASSERT( xFormsSupplier.is(), "XFormsSupplier missing" );
-/*N*/
+/*N*/
/*N*/ Reference< container::XNameContainer > xForms = xFormsSupplier->getForms();
/*N*/ ASSERT( xForms.is(), "XForms missing" );
-/*N*/
+/*N*/
/*N*/ return xForms->hasElements();
/*N*/ }
@@ -514,12 +514,12 @@ public:
/*N*/ else
/*N*/ nMode |= STREAM_NOCREATE;
/*N*/ Reset();
-/*N*/
+/*N*/
/*N*/ pCurIosys = this;
-/*N*/
+/*N*/
/*N*/ if( !pRoot.Is() || pRoot->GetError() != SVSTREAM_OK )
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ // Der Doc-Teil kann Storage oder Stream sein!
/*N*/ // Der DocStream fehlt natuerlich auch bei Textbausteinen
/*N*/ if( !bBlock )
@@ -531,18 +531,18 @@ public:
/*N*/ return sal_False;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ long nFFVersion = pRoot->GetVersion();
/*N*/ ASSERT( nFFVersion == SOFFICE_FILEFORMAT_31 ||
/*N*/ nFFVersion == SOFFICE_FILEFORMAT_40 ||
/*N*/ nFFVersion == SOFFICE_FILEFORMAT_50,
/*N*/ "Am Root-Storage ist keine FF-Version gesetzt!" );
-/*N*/
+/*N*/
/*N*/ // Solange wie noch ein Flag fuer den 3.1-Export haben, muessen wir
/*N*/ // es auch noch setzen. Der Sw3Writer macht das nicht mehr fuer uns.
/*N*/ if( bRdWr && nFFVersion == SOFFICE_FILEFORMAT_31 )
/*N*/ SetSw31Export( sal_True );
-/*N*/
+/*N*/
/*N*/ // Wenn eine 3.1-Clipboard-ID gesetzt ist, die Fileformat-Version
/*N*/ // auf 3.1 setzten.
/*N*/ if( SOT_FORMATSTR_ID_STARWRITER_30 == pRoot->GetFormat() &&
@@ -573,13 +573,13 @@ public:
/*?*/ pRoot->SetVersion( SOFFICE_FILEFORMAT_50 );
/*?*/ nFFVersion = SOFFICE_FILEFORMAT_50;
/*N*/ }
-/*N*/
-/*N*/
+/*N*/
+/*N*/
/*N*/ // The drawing layer stream will be opened for reading if it exists only
/*N*/ // and for writing if it contains some (non virtual) objects or forms.
/*N*/ sal_Bool bDraw = bRdWr && bUseDrawStream && pDoc->GetDrawModel() &&
/*N*/ lcl_sw3io_doesDrawingLayerNeedSaving( *pDoc );
-/*N*/
+/*N*/
/*N*/ sal_Bool bPresent = pRoot->IsStream( N_DRAWING );
/*N*/ if( bDraw || ( !bRdWr && bPresent ) )
/*N*/ {
@@ -592,7 +592,7 @@ public:
/*?*/ pRoot->Remove( N_DRAWING );
/*N*/ pDrawing.Clear();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Absatzvorlagen
/*N*/ if( bRdWr || pRoot->IsStream( SfxStyleSheetBasePool::GetStreamName() ) )
/*N*/ pStyles = pRoot->OpenStream
@@ -624,20 +624,20 @@ public:
/*N*/ // saving files.
/*N*/ if( pDrawing.Is() )
/*N*/ pDrawing->SetVersion( nFFVersion );
-/*N*/
+/*N*/
/*N*/ pStyles->SetVersion( nFFVersion );
/*N*/ if( pNumRules.Is() )
/*N*/ {
/*N*/ pNumRules->SetVersion( nFFVersion );
/*N*/ pNumRules->SetStreamCharSet( eSrcSet );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ pPageStyles->SetVersion( nFFVersion );
/*N*/ pPageStyles->SetStreamCharSet( eSrcSet );
-/*N*/
+/*N*/
/*N*/ pContents->SetVersion( nFFVersion );
/*N*/ pContents->SetStreamCharSet( eSrcSet );
-/*N*/
+/*N*/
/*N*/ if( bRdWr )
/*N*/ {
/*N*/ sal_uInt16 nComprMode = COMPRESSMODE_NONE;
@@ -658,7 +658,7 @@ public:
/*N*/ pContents->SetCompressMode( nComprMode );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Exort-Information anlegen
/*N*/ delete pExportInfo;
/*N*/ if( bRdWr && nFFVersion <= SOFFICE_FILEFORMAT_40 )
@@ -695,7 +695,7 @@ public:
/*N*/ // Nach dem Einlesen alle nicht benutzten Marks loeschen
/*N*/ // (kann auch nach dem Schreiben passieren, ist egal)
/*N*/ CleanupMarks();
-/*N*/
+/*N*/
/*N*/ // Brauchen wir nicht mehr
/*N*/ delete pExportInfo; pExportInfo = NULL;
/*N*/ delete pTOXs; pTOXs = NULL;
@@ -705,7 +705,7 @@ public:
/*N*/ delete pBookmarks; pBookmarks = NULL;
/*N*/ delete p30OLENodes; p30OLENodes = NULL;
/*N*/ delete pTblLineBoxFmts; pTblLineBoxFmts = NULL;
-/*N*/
+/*N*/
/*N*/ // der Returncode sollte so bleiben, wie er ist
/*N*/ sal_uInt32 n = nRes;
/*N*/ Reset();
@@ -754,7 +754,7 @@ public:
/*?*/ if( nTmp != SAL_MAX_UINT32 )
/*?*/ nSize = nTmp;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aRecSizes.Insert( nPos + nSize, nLvl );
/*N*/ if( !nVal || cRecTyp != cType )
/*N*/ {
@@ -850,7 +850,7 @@ public:
/*?*/ Error( ERR_SWG_READ_ERROR );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aRecTypes.Remove( nLvl, 1 );
/*N*/ aRecSizes.Remove( nLvl, 1 );
/*N*/ }
@@ -898,7 +898,7 @@ void Sw3IoImp::FlushRecSizes()
/*N*/ if( nEndPos > nPos )
/*N*/ n = nEndPos - nPos;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return n;
/*N*/ }
@@ -1127,23 +1127,23 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ sal_uInt32 n32;
/*N*/ sal_uInt16 n16;
/*N*/ sal_uInt8 n8;
-/*N*/
+/*N*/
/*N*/ rStrm >> n8;
/*N*/ if( (n8 & 0x80) == 0x00 )
/*N*/ {
/*N*/ // 0x0www wwww
/*N*/ // --> 0x0000 0000 0000 0000 0000 0000 0www wwww
-/*N*/
+/*N*/
/*N*/ n32 = (sal_uInt32)(n8 & 0x7F);
/*N*/ }
/*N*/ else if( (n8 & 0xC0) == 0x80 )
/*N*/ {
/*N*/ // 0x10xx xxxx wwww wwww
/*N*/ // --> 0x0000 0000 0000 0000 00xx xxxx wwww wwww
-/*N*/
+/*N*/
/*?*/ n32 = (sal_uInt32)(n8 & 0x3F);
/*?*/ n32 <<= 8;
-/*?*/
+/*?*/
/*?*/ rStrm >> n8;
/*?*/ n32 += (sal_uInt32)n8;
/*?*/ }
@@ -1151,10 +1151,10 @@ ULONG Sw3IoImp::OutRecSizes()
/*?*/ {
/*?*/ // 0x110y yyyy wwww wwww xxxx xxxx
/*?*/ // --> 0x0000 0000 000y yyyy xxxx xxxx wwww wwww
-/*?*/
+/*?*/
/*?*/ n32 = (sal_uInt32)(n8 & 0x1F);
/*?*/ n32 <<= 16;
-/*?*/
+/*?*/
/*?*/ rStrm >> n16;
/*?*/ n32 += (sal_uInt32)n16;
/*?*/ }
@@ -1162,14 +1162,14 @@ ULONG Sw3IoImp::OutRecSizes()
/*?*/ {
/*?*/ // 0x1110 zzzz yyyy yyyy wwww wwww xxxx xxxx
/*?*/ // --> 0x0000 zzzz yyyy yyyy xxxx xxxx wwww wwww
-/*?*/
+/*?*/
/*?*/ n32 = (sal_uInt32)(n8 & 0x0F);
/*?*/ n32 <<= 8;
-/*?*/
+/*?*/
/*?*/ rStrm >> n8;
/*?*/ n32 += (sal_uInt32)n8;
/*?*/ n32 <<= 16;
-/*?*/
+/*?*/
/*?*/ rStrm >> n16;
/*?*/ n32 += (sal_uInt32)n16;
/*?*/ }
@@ -1184,7 +1184,7 @@ ULONG Sw3IoImp::OutRecSizes()
/*?*/ // Error( ERR_SWG_READ_ERROR );
/*?*/ n32 = 0xABADCAFE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return (sal_uInt32)n32;
/*N*/ }
@@ -1194,14 +1194,14 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ {
/*N*/ // 0w0000 0000 0000 0000 0000 0000 0www wwww
/*N*/ // -> 0w0www wwww
-/*N*/
+/*N*/
/*N*/ rStrm << (sal_uInt8)n32;
/*N*/ }
/*N*/ else if( n32 < 0x00004000 )
/*N*/ {
/*N*/ // 0x0000 0000 0000 0000 00xx xxxx wwww wwww
/*N*/ // --> 0x10xx xxxx wwww wwww
-/*N*/
+/*N*/
/*?*/ n32 |= 0x00008000;
/*?*/ rStrm << (sal_uInt8)(n32 >> 8);
/*?*/ rStrm << (sal_uInt8)n32;
@@ -1210,7 +1210,7 @@ ULONG Sw3IoImp::OutRecSizes()
/*?*/ {
/*?*/ // 0x110y yyyy xxxx xxxx wwww wwww
/*?*/ // --> 0x0000 0000 000y yyyy wwww wwww xxxx xxxx
-/*?*/
+/*?*/
/*?*/ n32 |= 0x00C00000;
/*?*/ rStrm << (sal_uInt8)(n32 >> 16);
/*?*/ rStrm << (sal_uInt16)n32;
@@ -1219,7 +1219,7 @@ ULONG Sw3IoImp::OutRecSizes()
/*?*/ {
/*?*/ // 0x1110 zzzz yyyy yyyy xxxx xxxx wwww wwww
/*?*/ // --> 0x0000 zzzz yyyy yyyy wwww wwww xxxx xxxx
-/*?*/
+/*?*/
/*?*/ n32 |= 0xE0000000;
/*?*/ rStrm << (sal_uInt8)(n32 >> 24);
/*?*/ rStrm << (sal_uInt8)(n32 >> 16);
@@ -1229,7 +1229,7 @@ ULONG Sw3IoImp::OutRecSizes()
/*?*/ {
/*?*/ // zzzz zzzz yyyy yyyy xxxx xxxx wwww wwww
/*?*/ // --> 0x1111 00000 wwww wwww xxxx xxxx yyyy yyyy zzzz zzzz
-/*?*/
+/*?*/
/*?*/ rStrm << (sal_uInt8)0xF0;
/*?*/ rStrm << (sal_uInt32)n32;
/*N*/ }
@@ -1251,7 +1251,7 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ n1, n2, pDoc->GetDocShell() );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ void Sw3IoImp::ClosePercentBar()
/*N*/ {
/*N*/ if( !bBlock )
@@ -1286,12 +1286,12 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ // nGblFlags |= SW3F_NODRAWING;
/*N*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Wenn der erste Stream gelesen wird, kann es noch keine RecSizes geben
/*N*/ ASSERT( !HasRecSizes(), "Hier darf es noch keine RecSizes geben" );
/*N*/ if( HasRecSizes() )
FlushRecSizes();
-/*N*/
+/*N*/
/*N*/ pDrawing->Seek( 0L );
/*N*/ pDrawing->SetBufferSize( SW3_BSR_DRAWING );
/*N*/ SdrModel* pModel = NULL;
@@ -1319,7 +1319,7 @@ ULONG Sw3IoImp::OutRecSizes()
/*?*/ SdrPage* pPage = pModel->GetPage( 0 );
/*?*/ pPage->RecalcObjOrdNums();
/*?*/ nZOrderOff = pPage->GetObjCount();
-/*?*/
+/*?*/
/*?*/ for( sal_uInt32 n = pInsPage->GetObjCount(); n--; )
/*?*/ {
/*?*/ SdrObject* pObj = pInsPage->RemoveObject( 0 );
@@ -1400,7 +1400,7 @@ ULONG Sw3IoImp::OutRecSizes()
// nHiddenDrawObjs = nCount - n;
// }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ CheckIoError( pDrawing );
/*N*/ pDrawing->SetBufferSize( 0 );
/*N*/ }
@@ -1410,28 +1410,28 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ // Wenn kein Stream da ist, gibt es im Layer nix zu saven.
/*N*/ if( !pDrawing.Is() )
/*N*/ return;
-/*N*/
+/*N*/
/*N*/ if( HasRecSizes() ) // sicher ist sicher
/*?*/ FlushRecSizes();
-/*N*/
+/*N*/
/*N*/ pDrawing->SetSize( 0L );
/*N*/ // Stream weg, wenn wir kein OLE-Objekt sind
/*N*/ //if( pRoot->IsRoot() )
/*N*/ // pRoot->Commit();
/*N*/ pDrawing->SetBufferSize( SW3_BSW_DRAWING );
-/*N*/
+/*N*/
/*N*/ // Den Pool nicht vergessen...
/*N*/ SdrModel* pModel = pDoc->GetDrawModel();
/*N*/ ASSERT( pModel, "SaveDrawingLayer without DrawModel" );
/*N*/ //Auf die Korrektheit der OrdNums sind wir schon angewiesen.
/*N*/ pModel->GetPage( 0 )->RecalcObjOrdNums();
-/*N*/
+/*N*/
/*N*/ //-/ pModel->PrepareStore();
/*N*/ pModel->PreSave();
-/*N*/
+/*N*/
/*N*/ SfxItemPool *pDrawIPool = pModel->GetItemPool().GetSecondaryPool();
/*N*/ ASSERT( pDrawIPool, "DrawPool not found" );
-/*N*/
+/*N*/
/*N*/ // Die FF-Version muss an einem Master-Pool stehen
/*N*/ long nFFVersion = pDrawing->GetVersion();
/*N*/ long nOldFFVersion = pModel->GetItemPool().GetFileFormatVersion();
@@ -1440,13 +1440,13 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ nFFVersion==SOFFICE_FILEFORMAT_50),
/*N*/ "FF-Version am Drawing-Layer-Stream stimmt nicht" );
/*N*/ pModel->GetItemPool().SetFileFormatVersion( (sal_uInt16)nFFVersion );
-/*N*/
+/*N*/
/*N*/ pDrawIPool->Store( *pDrawing );
/*N*/ *pDrawing << *pModel;
-/*N*/
+/*N*/
/*N*/ pModel->GetItemPool().SetFileFormatVersion( nOldFFVersion );
-/*N*/
-/*N*/
+/*N*/
+/*N*/
/*N*/ // Nun noch die Liste der frame::Frame-Z-IDs
/*N*/ sal_uInt16 nFrmIds = 0;
/*N*/ sal_uInt32 nIdPos = 0;
@@ -1479,7 +1479,7 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ pRefSdrObjects[--nArrSz] = 0;
/*N*/ }
/*N*/ #endif
-/*N*/
+/*N*/
/*N*/ if( nFrmIds )
/*N*/ {
/*N*/ sal_uInt32 nPos = pDrawing->Tell();
@@ -1495,12 +1495,12 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ {
/*N*/ *pDrawing << 0; // was nHiddenDrawObjs!!!
/*N*/ }
-/*N*/
+/*N*/
/*N*/ ASSERT( !pModel->GetStyleSheetPool(), "SdrModel hat StyleSheet-Pool" );
/*N*/ pDrawing->Commit();
/*N*/ CheckIoError( pDrawing );
/*N*/ pDrawing->SetBufferSize( 0 );
-/*N*/
+/*N*/
/*N*/ pModel->PostSave();
/*N*/ }
@@ -1535,17 +1535,17 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ // pRoot->Commit();
/*N*/ pPageStyles->SetBufferSize( SW3_BSW_PAGESTYLES );
/*N*/ OutPageDescs( bUsed );
-/*N*/
+/*N*/
/*N*/ sal_uInt32 nRecSzPos = 0;
/*N*/ if( !nRes && HasRecSizes() && !IsSw31Or40Export() )
/*?*/ nRecSzPos = OutRecSizes();
-/*N*/
+/*N*/
/*N*/ OpenRec( SWG_EOF );
/*N*/ CloseRec( SWG_EOF );
-/*N*/
+/*N*/
/*N*/ if( nRecSzPos )
/*?*/ OutRecordSizesPos( nRecSzPos );
-/*N*/
+/*N*/
/*N*/ pStrm = pOld;
/*N*/ pPageStyles->Commit();
/*N*/ CheckIoError( pPageStyles );
@@ -1562,7 +1562,7 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ {
/*N*/ if( !pNumRules.Is() )
/*N*/ return;
-/*N*/
+/*N*/
/*N*/ pNumRules->Seek( 0L );
/*N*/ pNumRules->SetBufferSize( SW3_BSR_NUMRULES );
/*N*/ SvStream* pOld = pStrm;
@@ -1578,23 +1578,23 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ {
/*N*/ if( !pNumRules.Is() )
/*N*/ return;
-/*N*/
+/*N*/
/*N*/ SvStream* pOld = pStrm;
/*N*/ pStrm = pNumRules;
/*N*/ pNumRules->SetSize( 0L );
/*N*/ pNumRules->SetBufferSize( SW3_BSW_NUMRULES );
/*N*/ OutNumRules( bUsed );
-/*N*/
+/*N*/
/*N*/ sal_uInt32 nRecSzPos = 0;
/*N*/ if( !nRes && HasRecSizes() && !IsSw31Or40Export() )
/*?*/ nRecSzPos = OutRecSizes();
-/*N*/
+/*N*/
/*N*/ OpenRec( SWG_EOF );
/*N*/ CloseRec( SWG_EOF );
-/*N*/
+/*N*/
/*N*/ if( nRecSzPos )
/*?*/ OutRecordSizesPos( nRecSzPos );
-/*N*/
+/*N*/
/*N*/ pStrm = pOld;
/*N*/ pNumRules->Commit();
/*N*/ CheckIoError( pNumRules );
@@ -1667,14 +1667,14 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*?*/ case RES_POOLCOLL_HTML_XMP_40:
/*?*/ nId |= USER_FMT;
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case RES_POOLCOLL_HTML_HR_40: nId = RES_POOLCOLL_HTML_HR; break;
/*?*/ case RES_POOLCOLL_HTML_H6_40: nId = RES_POOLCOLL_HEADLINE6; break;
/*?*/ case RES_POOLCOLL_HTML_DD_40: nId = RES_POOLCOLL_HTML_DD; break;
/*?*/ case RES_POOLCOLL_HTML_DT_40: nId = RES_POOLCOLL_HTML_DT; break;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return nId;
/*N*/ }
@@ -1690,7 +1690,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*?*/ case RES_POOLCOLL_HEADLINE6:nId = RES_POOLCOLL_HTML_H6_40; break;
/*?*/ case RES_POOLCOLL_HTML_DD: nId = RES_POOLCOLL_HTML_DD_40; break;
/*?*/ case RES_POOLCOLL_HTML_DT: nId = RES_POOLCOLL_HTML_DT_40; break;
-/*N*/
+/*N*/
/*N*/ //JP 05.05.98: im 3.1/4.0 war ein Bug im sw3style bei der Abfrage
/*N*/ // ob die PoolID einer Zeichenvorlage eine Benutzer-
/*N*/ // definierte ID ist. Alles zwischen
@@ -1703,7 +1703,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ nId = USHRT_MAX;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return nId;
/*N*/ }
@@ -1718,13 +1718,13 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ {
/*N*/ Clear();
/*N*/ nExpFFVersion = nFFVersion;
-/*N*/
+/*N*/
/*N*/ // Das Written-Flag wird gleich mit geknackt!
/*N*/ // Das ist wichtig, da Formate (theoretisch) in verschiedenen
/*N*/ // Streams landen koennen.
/*N*/ SwMsgPoolItem aMsgHint( RES_RESET_FMTWRITTEN );
/*N*/ rDoc.GetDfltFrmFmt()->Modify( &aMsgHint, &aMsgHint );
-/*N*/
+/*N*/
/*N*/ bFixed = sal_False;
/*N*/ // Defaultformate:
/*N*/ Setup( rDoc, *rDoc.GetDfltFrmFmt() );
@@ -1769,7 +1769,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ const SwPageDesc& rPg = rDoc.GetPageDesc( n );
/*N*/ Add( rPg.GetName(), rPg.GetPoolFmtId() );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( nExpFFVersion <= SOFFICE_FILEFORMAT_40 )
/*N*/ {
/*N*/ Add( String::CreateFromAscii(sSW3IO_FixedField), USHRT_MAX );
@@ -1777,7 +1777,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ }
/*N*/ /* #108791# */
/*N*/ Add( String::CreateFromAscii(sSW3IO_DropDownField), USHRT_MAX );
-/*N*/
+/*N*/
/*N*/ // fix #26064#: Namen der 3 Label Numernkreise: Hier wird zusaetzlich
/*N*/ // noch die Pool-Id des dazugehoerigen Formats gespeichert
/*N*/ {
@@ -1785,7 +1785,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ String aTable( SW_RES(STR_POOLCOLL_LABEL_TABLE) );
/*N*/ String aFrame( SW_RES(STR_POOLCOLL_LABEL_FRAME) );
/*N*/ String aDrawing( SW_RES(STR_POOLCOLL_LABEL_DRAWING) );
-/*N*/
+/*N*/
/*N*/ for( n = 0; n < INIT_FLDTYPES; n++ )
/*N*/ {
/*N*/ SwFieldType *pFldType = (*rDoc.GetFldTypes())[n];
@@ -1805,12 +1805,12 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ nPoolId = RES_POOLCOLL_LABEL_FRAME;
/*N*/ else if( aDrawing == rName )
/*N*/ nPoolId = RES_POOLCOLL_LABEL_DRAWING;
-/*N*/
+/*N*/
/*N*/ Add( rName, nPoolId );
/*N*/ }
/*N*/ }
/*N*/ break;
-/*N*/
+/*N*/
/*N*/ case RES_DBSETNUMBERFLD:
/*N*/ case RES_DBNUMSETFLD:
/*N*/ case RES_DBNEXTSETFLD:
@@ -1818,7 +1818,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ if( nExpFFVersion > SOFFICE_FILEFORMAT_31 )
/*N*/ {
/*N*/ SwClientIter aIter( *pFldType );
-/*N*/
+/*N*/
/*N*/ for( SwFmtFld* pFmtFld = (SwFmtFld*)aIter.First( TYPE(SwFmtFld) );
/*N*/ pFmtFld; pFmtFld = (SwFmtFld*)aIter.Next() )
/*N*/ {
@@ -1835,7 +1835,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ }
/*N*/ break;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ }
/*N*/ }
/*N*/ // Namen benutzerdefinierter Felder
@@ -1845,7 +1845,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ for( n = INIT_FLDTYPES; n < nArrLen; n++ )
/*N*/ {
/*N*/ SwFieldType *pFldType = (*rDoc.GetFldTypes())[n];
-/*N*/
+/*N*/
/*N*/ switch (pFldType->Which())
/*N*/ {
/*N*/ case RES_DBFLD:
@@ -1859,14 +1859,14 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ Add( sDBName, IDX_NOCONV_FF );
/*N*/ }
/*N*/ break;
-/*N*/
+/*N*/
/*N*/ default:
/*N*/ Add( pFldType->GetName(), USHRT_MAX );
/*N*/ break;
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Ab dem 5.0-FF stehen auch die Benutzer-definierten Verzeichnisnamen
/*N*/ // im String-Pool
/*N*/ if( nExpFFVersion > SOFFICE_FILEFORMAT_40 )
@@ -1966,7 +1966,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ const SwTOXMark* pItem;
/*N*/ nArrLen = nExpFFVersion > SOFFICE_FILEFORMAT_40
/*N*/ ? rDoc.GetAttrPool().GetItemCount( RES_TXTATR_TOXMARK )
@@ -1984,7 +1984,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ const SwFmtINetFmt* pINetFmt;
/*N*/ nArrLen = nExpFFVersion > SOFFICE_FILEFORMAT_31
/*N*/ ? rDoc.GetAttrPool().GetItemCount( RES_TXTATR_INETFMT )
@@ -2000,11 +2000,11 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*?*/ Add( pINetFmt->GetVisitedFmt(), pINetFmt->GetVisitedFmtId() );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Seit der 5.0 gibt es Redlines. Die Autoren stehen dann im String-Pool
/*N*/ if( nExpFFVersion > SOFFICE_FILEFORMAT_40 )
/*N*/ SetupRedlines( rDoc );
-/*N*/
+/*N*/
/*N*/ // Beim 3.1/4.0-Export standen die Tabellen-Line/Box-Formate noch
/*N*/ // im FrmFmt-Array und wurden ueber den String-Pool dort eingetragen.
/*N*/ // Deshalb muessen sie jetzt auch dort eingetragen werden. Die
@@ -2016,11 +2016,11 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ {
/*N*/ if( !pExportInfo->pTblLineBoxFmtNames40 )
/*N*/ pExportInfo->pTblLineBoxFmtNames40 = new SvStringsDtor;
-/*N*/
+/*N*/
/*N*/ SvStringsDtor *pNames = pExportInfo->pTblLineBoxFmtNames40;
/*N*/ if( pNames->Count() )
/*?*/ pNames->DeleteAndDestroy( 0, pNames->Count() );
-/*N*/
+/*N*/
/*N*/ Sw3FrmFmts *pFmts = pExportInfo->pTblLineBoxFmts40;
/*N*/ sal_uInt16 nArrLen = pFmts->Count();
/*N*/ for( n=0; n<nArrLen; n++ )
@@ -2032,7 +2032,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ pNames->Insert( pName, pNames->Count() );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Und danach darf nix mehr in den Pool hinein!
/*N*/ bFixed = sal_True;
/*N*/ }
@@ -2042,7 +2042,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ Clear();
/*N*/ nExpFFVersion = nFFVersion;
/*N*/ bFixed = sal_False;
-/*N*/
+/*N*/
/*N*/ // Die Namen von Zeichenvorlagen werden benoetigt, weil in den
/*N*/ // Numerierungen auuf sie verwiesen werden kann.
/*N*/ sal_uInt16 nArrLen = rDoc.GetCharFmts()->Count();
@@ -2050,7 +2050,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
sal_uInt16 n;
/*N*/ for( n = 1; n < nArrLen; n++ )
/*N*/ Setup( rDoc, *(*rDoc.GetCharFmts())[ n ] );
-/*N*/
+/*N*/
/*N*/ // Die Namen der Numerierungen werden sowieso benoetigt.
/*N*/ nArrLen = rDoc.GetNumRuleTbl().Count();
/*N*/ for( n=0; n<nArrLen; n++ )
@@ -2058,12 +2058,12 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ const SwNumRule *pNumRule = rDoc.GetNumRuleTbl()[n];
/*N*/ Add( pNumRule->GetName(), pNumRule->GetPoolFmtId() );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Und die Outline-Numerierung hat auch einen Namen.
/*N*/ const SwNumRule *pOutline = rDoc.GetOutlineNumRule();
/*N*/ if( pOutline )
/*N*/ Add( pOutline->GetName(), pOutline->GetPoolFmtId() );
-/*N*/
+/*N*/
/*N*/ // Und danach darf nix mehr in den Pool hinein!
/*N*/ bFixed = sal_True;
/*N*/ }
@@ -2132,7 +2132,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ // Streams landen koennen.
/*N*/ ASSERT( !rFmt.IsWritten(), "Written-Flag am Format ist gesetzt" );
/*N*/ // ((SwFmt&)rFmt).ResetWritten();
-/*N*/
+/*N*/
/*N*/ String aName( rFmt.GetName() );
/*N*/ if( nId )
/*N*/ {
@@ -2154,7 +2154,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ {
/*N*/ if( !rName.Len() )
/*N*/ return;
-/*N*/
+/*N*/
/*N*/ const SwTxtFmtColl *pColl = rDoc.FindTxtFmtCollByName( rName );
/*N*/ sal_uInt16 nPoolId = pColl ? pColl->GetPoolFmtId()
/*N*/ : SwStyleNameMapper::GetPoolIdFromUIName( rName, GET_POOLID_TXTCOLL );
@@ -2164,11 +2164,11 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ sal_uInt16 Sw3StringPool::Add( const String& r, sal_uInt16 n, sal_Bool bDontSearch )
/*N*/ {
/*N*/ sal_uInt16 i = bDontSearch ? aPool.Count() : 0;
-/*N*/
+/*N*/
/*N*/ ASSERT( nExpFFVersion, "String-Pool: FF-Version nicht gesetzt" );
/*N*/ if( nExpFFVersion <= SOFFICE_FILEFORMAT_40 && n && n<IDX_SPEC_VALUE )
/*N*/ n = ConvertToOldPoolId( n, nExpFFVersion );
-/*N*/
+/*N*/
/*N*/ for( ; i < aPool.Count(); i++ )
/*N*/ {
/*N*/ const Sw3String* p3Str = aPool.GetObject( i );
@@ -2194,7 +2194,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ ASSERT( nExpFFVersion, "String-Pool: FF-Version nicht gesetzt" );
/*N*/ if( nExpFFVersion <= SOFFICE_FILEFORMAT_40 && nPoolId && nPoolId<IDX_SPEC_VALUE )
/*N*/ nPoolId = ConvertToOldPoolId( nPoolId, nExpFFVersion );
-/*N*/
+/*N*/
/*N*/ xub_StrLen nOff = r.Search( EXT_SEPARATOR );
/*N*/ if( nOff != STRING_NOTFOUND )
/*N*/ {
@@ -2207,7 +2207,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ }
/*N*/ ASSERT( !this, "String-Pool-Position ungueltig" );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ xub_StrLen nLen = r.Len();
/*N*/ for( sal_uInt16 i = 0; i < aPool.Count(); i++ )
/*N*/ {
@@ -2225,7 +2225,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ break;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( bFound )
/*N*/ return i;
/*N*/ }
@@ -2317,7 +2317,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ sal_uInt16 n;
/*N*/ String s;
/*N*/ r >> cSet >> n;
-/*N*/
+/*N*/
/*N*/ // MIB 8.4.97: Datenbank-Felder enthalten ein 0xff, das auf keinen
/*N*/ // Fall mit konvertiert werden darf. Wir erkennen sie am Wert
/*N*/ // IDX_NOCONV_FF.
@@ -2333,7 +2333,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ s = Sw3IoImp::ConvertStringNoDbDelim( s8, eSrcEnc );
/*N*/ else
/*N*/ s = String( s8, eSrcEnc );
-/*N*/
+/*N*/
/*N*/ // Ggf. alte Pool-Ids auf neue mappen.
/*N*/ if( nSVersion < SWG_HTMLCOLLCHG && nId && nId < IDX_SPEC_VALUE )
/*N*/ {
@@ -2350,11 +2350,11 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ }
/*N*/ nId = ConvertFromOldPoolId( nId, nSVersion );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Id und ist PoolFormat ?
/*N*/ if( nId && !(USER_FMT & nId))
/*N*/ SwStyleNameMapper::FillUIName( nId, s ); // dann String vom Pool erfragen
-/*N*/
+/*N*/
/*N*/ Sw3String* p = new Sw3String( s, nId );
/*N*/ aPool.Insert( p, aPool.Count() );
/*N*/ }
@@ -2393,7 +2393,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ {
/*N*/ return ConvertStringNoDelim( rStr, DB_DELIM, '\xff', eSource );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ String Sw3IoImp::ConvertStringNoDbDelim( const ByteString& rStr,
/*N*/ rtl_TextEncoding eSource )
/*N*/ {
@@ -2413,16 +2413,16 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ nPos = rStr.Search( cSrcDelim, nStart );
/*N*/ if( STRING_NOTFOUND == nPos )
/*N*/ nPos = rStr.Len();
-/*N*/
+/*N*/
/*N*/ if( nStart > 0 )
/*N*/ sDest += cDelim;
-/*N*/
+/*N*/
/*N*/ if( nPos > nStart )
/*N*/ sDest += ByteString( rStr.Copy( nStart, nPos-nStart ), eSource );
/*N*/ nStart = nPos+1;
/*N*/ }
/*N*/ while( nPos < rStr.Len() );
-/*N*/
+/*N*/
/*N*/ return sDest;
/*N*/ }
@@ -2439,16 +2439,16 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ nPos = rStr.Search( cSrcDelim, nStart );
/*N*/ if( STRING_NOTFOUND == nPos )
/*N*/ nPos = rStr.Len();
-/*N*/
+/*N*/
/*N*/ if( nStart > 0 )
/*N*/ sDest += cDelim;
-/*N*/
+/*N*/
/*N*/ if( nPos > nStart )
/*N*/ sDest += String( rStr.Copy( nStart, nPos-nStart ), eSource );
/*N*/ nStart = nPos+1;
/*N*/ }
/*N*/ while( nPos < rStr.Len() );
-/*N*/
+/*N*/
/*N*/ return sDest;
/*N*/ }
@@ -2499,20 +2499,20 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*?*/ ConnectPageDescAttrs();
/*N*/ // Temporaere Namenserweiterungen entfernen
/*N*/ aStringPool.RemoveExtensions( *pDoc );
-/*N*/
+/*N*/
/*N*/ rtl_TextEncoding eSysEnc = gsl_getSystemTextEncoding();
/*N*/ if( eSysEnc != eSrcSet )
/*N*/ {
/*N*/ // Bug 9714: Der CharSet an den Fonts muss geaendert werden, wenn
/*N*/ // es der globale CharSet ist
/*N*/ ChangeFontItemCharSet();
-/*N*/
+/*N*/
/*N*/ SvxFontItem *pItem = (SvxFontItem*) pDoc->GetAttrPool().GetPoolDefaultItem(RES_CHRATR_FONT);
/*N*/ if( pItem && pItem->GetCharSet() == eSrcSet )
/*N*/ pItem->GetCharSet() = eSysEnc;
/*N*/ }
/*N*/ ConvertFmtsToStarSymbol();
-/*N*/
+/*N*/
/*N*/ // Unbenutzte SwDrawFlyObjs aus dem Drawing Layer entfernen
/*N*/ // Dies sind vor allem jene, die vor dem Speichern in den
/*N*/ // Seitenkoepfen auftraten
@@ -2534,17 +2534,17 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ i++;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ //if( nVersion < SWG_DBTABLE )
/*N*/ if( !IsVersion( SWG_DBTABLE, SWG_EXPORT31, SWG_DESKTOP40 ) )
/*N*/ pDoc->SetInitDBFields(sal_True);
-/*N*/
+/*N*/
/*N*/ // Unbenutzte DB-Feldtypen loeschen
/*N*/ const SwFldTypes *pFldTypes = pDoc->GetFldTypes();
/*N*/ sal_uInt16 i = INIT_FLDTYPES;
-/*N*/
+/*N*/
/*N*/ SwFieldType* pFnd;
-/*N*/
+/*N*/
/*N*/ while (i < pFldTypes->Count())
/*N*/ {
/*N*/ if (RES_DBFLD == (pFnd = pFldTypes->GetObject(i))->Which() &&
@@ -2555,7 +2555,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ else
/*N*/ i++;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Unbenutzte automatische NumRules loeschen.
/*N*/ // Kann hier geschehen, denn der NumRules-Stream wird nur bei normalen
/*N*/ // Dokumenten und beim Laden von NumRules und beim Laden von
@@ -2580,11 +2580,11 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ "unbenutzte NumRule wurde nicht geloescht" );
/*N*/ #endif
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aNumRuleInfos.Remove( (sal_uInt16)0, 1 );
/*N*/ delete pInfo;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ CleanupRedlines();
/*N*/ }
@@ -2638,13 +2638,13 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ {
/*N*/ ASSERT( nVersion<=SWG_SHORTFIELDS && bNormal && !bInsert,
/*N*/ "ungueltiger Aufruf von RomoveUnusedObjects" );
-/*N*/
+/*N*/
/*N*/ if( pDoc->GetPersist()->GetObjectList() )
/*N*/ {
/*N*/ SvPersistRef rpDoc( pDoc->GetPersist() );
/*N*/ SvInfoObject* pIO = NULL;
/*N*/ String aObjName;
-/*N*/
+/*N*/
/*N*/ // alle Objekte in SvPersist betrachten
/*N*/ for( sal_uInt32 i=0; i < rpDoc->GetObjectList()->Count(); i++ )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index ace282f..c573172 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -2,7 +2,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
@@ -77,7 +77,7 @@
#include <cmdid.h>
#include <swerror.h>
#include <SwStyleNameMapper.hxx>
-#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
#include "bf_so3/staticbaseurl.hxx"
namespace binfilter {
using namespace ::com::sun::star;
@@ -167,7 +167,7 @@ public:
/*N*/ {
/*N*/ delete pStartNodeIdx;
/*N*/ delete pEndNodeIdx;
-/*N*/
+/*N*/
/*N*/ // Section formats must not be deleted by delete.
/*N*/ SwDoc *pDoc = 0;
/*N*/ if( pTitleSectFmt )
@@ -210,7 +210,7 @@ public:
/*N*/ } break;
/*N*/ default:
/*N*/ // Holen des Namens und suchen im Doc
-/*N*/
+/*N*/
/*N*/ // OPT: Cache fuer Formate im StringPool
/*N*/ if( nIdx < IDX_SPEC_VALUE )
/*N*/ {
@@ -225,7 +225,7 @@ public:
/*N*/ }
/*N*/ }
/*N*/ // /OPT: Cache fuer Formate im StringPool
-/*N*/
+/*N*/
/*N*/ pFmt = FindNamedFmt( nIdx, cKind );
/*N*/ }
/*N*/ ASSERT( pFmt, "Format-ID unbekannt" );
@@ -286,7 +286,7 @@ public:
/*N*/ return pFmt;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*?*/ if( 0 != ( pFmt = pDoc->FindSpzFrmFmtByName( rName )) ||
/*?*/ 0 != ( pFmt = pDoc->FindTblFmtByName( rName )) )
/*?*/ return pFmt;
@@ -311,7 +311,7 @@ public:
/*?*/ return pDoc->GetFmtFromPool( RES_POOLFRM_FRAME );
/*?*/ else if( cKind==SWG_SDRFMT )
/*?*/ return pDoc->GetDfltFrmFmt();
-/*?*/
+/*?*/
/*?*/ Error(); // alle anderen erzeugen einen Fehler
/*?*/ return NULL;
/*N*/ }
@@ -343,7 +343,7 @@ public:
/*?*/ if( bPageDescs && !bTxtColls )
/*?*/ return pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
/*?*/ ASSERT( !this, "TextColl nicht gefunden" );
-/*?*/
+/*?*/
/*?*/ // Falls ueber den Organizer, die Styles veraendert wurden, kein Fehler
/*?*/ // melden, sonder auf Standard zurueck fallen
/*?*/ // Error();
@@ -414,7 +414,7 @@ void Sw3IoImp::InMacroTbl()
/*N*/ SvxMacro* pMac = ((SvxMacroTableDtor&) rTbl).First();
/*N*/ if( !pMac )
/*N*/ return;
-/*N*/
+/*N*/
/*?*/ ASSERT( SOFFICE_FILEFORMAT_31 == pStrm->GetVersion() ||
/*?*/ SOFFICE_FILEFORMAT_40 == pStrm->GetVersion() ||
/*?*/ SOFFICE_FILEFORMAT_50 == pStrm->GetVersion(),
@@ -427,7 +427,7 @@ void Sw3IoImp::InMacroTbl()
/*?*/ if( !pMac )
/*?*/ return ;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ OpenRec( SWG_MACROTBL );
/*?*/ while( pMac && Good() )
/*?*/ {
@@ -435,7 +435,7 @@ void Sw3IoImp::InMacroTbl()
/*?*/ *pStrm << (sal_uInt16) rTbl.GetCurKey();
/*?*/ OutString( *pStrm, pMac->GetLibName() );
/*?*/ OutString( *pStrm, pMac->GetMacName() );
-/*?*/
+/*?*/
/*?*/ if( SOFFICE_FILEFORMAT_31 == pStrm->GetVersion() )
/*?*/ {
/*?*/ do {
@@ -447,7 +447,7 @@ void Sw3IoImp::InMacroTbl()
/*?*/ *pStrm << (sal_uInt16)pMac->GetScriptType();
/*?*/ pMac = ((SvxMacroTableDtor&) rTbl).Next();
/*?*/ }
-/*?*/
+/*?*/
/*?*/ CloseRec( SWG_MACRO );
/*?*/ }
/*?*/ CloseRec( SWG_MACROTBL );
@@ -464,7 +464,7 @@ void Sw3IoImp::InMacroTbl()
/*N*/ OpenRec( SWG_JOBSETUP );
/*N*/ OpenFlagRec();
/*N*/ CloseFlagRec();
-/*N*/
+/*N*/
/*N*/ //JP 13.10.95: laut Changes-Mail von MI
/*N*/ static sal_uInt16 const nRange[] =
/*N*/ {
@@ -476,20 +476,20 @@ void Sw3IoImp::InMacroTbl()
/*N*/ };
/*N*/ SfxItemSet *pItemSet = new SfxItemSet( pDoc->GetAttrPool(), nRange );
/*N*/ SfxPrinter *pPrinter = SfxPrinter::Create( *pStrm, pItemSet );
-/*N*/
+/*N*/
/*N*/ if ( !IsVersion(SWG_VIRTUAL_DEVICE) )
/*N*/ pDoc->_SetUseVirtualDevice( sal_False );
/*N*/ pDoc->_SetPrt( pPrinter );
-/*N*/
+/*N*/
/*N*/ if ( !pPrinter->IsOriginal() )
/*N*/ {
/*N*/ pDoc->GetDocShell()->UpdateFontList();
/*N*/ if ( pDoc->pDrawModel )
/*N*/ pDoc->pDrawModel->SetRefDevice( pPrinter );
-/*N*/
+/*N*/
/*N*/ pDoc->SetOLEPrtNotifyPending( sal_True );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ CloseRec( SWG_JOBSETUP );
/*N*/ }
@@ -581,7 +581,7 @@ void Sw3IoImp::InPasswd()
/*N*/ nRet = -1;
/*N*/ else if( r1.nId > r2.nId || r1.eType != r2.eType )
/*N*/ nRet = 1;
-/*N*/
+/*N*/
/*N*/ return nRet;
/*N*/ }
@@ -591,7 +591,7 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ void Sw3IoImp::CollectMarks( SwPaM* pPaM, sal_Bool bPageOnly )
/*N*/ {
/*N*/ sal_uInt32 nEndOfIcons = pDoc->GetNodes().GetEndOfExtras().GetIndex();
-/*N*/
+/*N*/
/*N*/ // Bereich bestimmen
/*N*/ sal_uInt32 nStart, nEnd;
/*N*/ if( !bSaveAll && pPaM )
@@ -608,11 +608,11 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ // Array anlegen
/*N*/ delete pMarks;
/*N*/ pMarks = 0;
-/*N*/
+/*N*/
/*N*/ delete pBookmarks;
/*N*/ pBookmarks = new Sw3Bookmarks;
/*N*/ nCntntBkmkStart = 0;
-/*N*/
+/*N*/
/*N*/ Sw3Mark aMark;
/*N*/ // text::Bookmarks absammeln (nicht, wenn Konversion SW2-Textbausteine auf SW3)
/*N*/ if( !( nGblFlags & SW3F_CONVBLOCK ) )
@@ -621,13 +621,13 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ // den Sonderbereichen mit nehmen!!
/*N*/ const SwBookmarks& rMarks = pDoc->GetBookmarks();
/*N*/ sal_uInt16 nArrLen = rMarks.Count();
-/*N*/
+/*N*/
/*N*/ for( sal_uInt16 n = 0; n < nArrLen; ++n )
/*N*/ {
/*N*/ SwBookmark* pMark = rMarks.GetObject( n );
/*N*/ if( !pMark->IsBookMark() )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ const SwPosition& rPos1 = pMark->GetPos();
/*N*/ const SwPosition* pPos2 = pMark->GetOtherPos();
/*N*/ if( rPos1.nContent.GetIndex() > STRING_MAXLEN52 &&
@@ -635,7 +635,7 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ (rPos1.nNode.GetIndex() == pPos2->nNode.GetIndex() &&
/*N*/ pPos2->nContent.GetIndex() > STRING_MAXLEN52) ) )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ if( pDoc->IsInHeaderFooter( rPos1.nNode ) )
/*N*/ {
/*?*/ pBookmarks->Insert( pMark, nCntntBkmkStart );
@@ -650,7 +650,7 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ if( nArrLen )
/*N*/ {
/*N*/ pMarks = new Sw3Marks( nArrLen + nArrLen / 4, nArrLen / 4 );
-/*N*/
+/*N*/
/*N*/ if( pPaM )
/*N*/ {
/*N*/ for( sal_uInt16 n = 0; n < nArrLen; ++n )
@@ -658,7 +658,7 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ const SwBookmark* pMark = pBookmarks->GetObject( n );
/*N*/ ASSERT( pMark->IsBookMark(),
/*N*/ "Wo kommt da die Nicht text::Bookmark her?" );
-/*N*/
+/*N*/
/*N*/ if( !IsSw31Export() && n >= nCntntBkmkStart )
/*N*/ aMark.SetId( n - nCntntBkmkStart );
/*N*/ else
@@ -697,21 +697,21 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*?*/ const SwBookmark* pMark = pBookmarks->GetObject( n );
/*?*/ ASSERT( pMark->IsBookMark(),
/*?*/ "Wo kommt da die Nicht Bookmark her?" );
-/*?*/
+/*?*/
/*?*/ if( !IsSw31Export() && n >= nCntntBkmkStart )
/*?*/ aMark.SetId( n - nCntntBkmkStart );
/*?*/ else
/*?*/ aMark.SetId( n );
-/*?*/
+/*?*/
/*?*/ const SwPosition* pPos = &pMark->GetPos();
/*?*/ ASSERT( pPos->nNode.GetNode().IsTxtNode(),
/*?*/ "Bookmark position outside text node" );
-/*?*/
+/*?*/
/*?*/ aMark.SetNodePos( pPos->nNode.GetIndex() );
/*?*/ aMark.SetNodeOff( pPos->nContent.GetIndex() );
/*?*/ aMark.SetType( SW3_BOOK_POINT );
/*?*/ pMarks->Insert( new Sw3Mark(aMark) );
-/*?*/
+/*?*/
/*?*/ pPos = pMark->GetOtherPos();
/*?*/ if( pPos )
/*?*/ {
@@ -726,45 +726,45 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Collect TOX sections. To be compatible with the 5.0 file format and
/*N*/ // earlier file format versions, TOX section are not exported directly.
/*N*/ // Instead of this, the start and end positions of this sections is
/*N*/ // exported.
/*N*/ // MIB 01.09.97: wenn Selektion geschrieben wird, dann auch alle aus
/*N*/ // den Sonderbereichen mit nehmen (##)
-/*N*/
+/*N*/
/*N*/ aMark.SetId( 0 );
/*N*/ const SwSectionFmts& rSectFmts = pDoc->GetSections();
-/*N*/
+/*N*/
/*N*/ for( sal_uInt16 i=0; i < rSectFmts.Count(); i++ )
/*N*/ {
/*N*/ const SwSectionFmt* pSectFmt = rSectFmts[i];
-/*N*/
+/*N*/
/*N*/ // Skip TOXs that are somehow incomplete.
/*N*/ const SwSection* pSect = pSectFmt->GetSection();
/*N*/ if( !pSect || TOX_CONTENT_SECTION != pSect->GetType() )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ const SwSectionNode *pSectNd = pSectFmt->GetSectionNode();
/*N*/ if( !pSectNd )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ const SwTOXBaseSection *pTOXBaseSect =
/*N*/ PTR_CAST( SwTOXBaseSection, pSect );
/*N*/ if( !pTOXBaseSect || !pTOXBaseSect->GetTOXType() )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ ULONG nStartIdx = pSectNd->GetIndex();
/*N*/ ULONG nEndIdx = pSectNd->EndOfSectionIndex();
-/*N*/
+/*N*/
/*N*/ // Skip TOXs that are not contained within the saved area completely.
/*N*/ if( nStart >= nEndOfIcons && (nStartIdx < nStart || nEndIdx > nEnd) )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ if( !pMarks )
/*N*/ pMarks = new Sw3Marks( 16, 4 );
-/*N*/
+/*N*/
/*N*/ // The start pos is the first section node. If this is the start node
/*N*/ // of a TOX header section that starts with a text node, the start pos
/*N*/ // is the second node. See Sw3IoImp::OutSection in sw3sect.cxx.
@@ -773,12 +773,12 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ if( pSttNd && lcl_sw3io_isTOXHeaderSection( *pSttNd ) &&
/*N*/ pDoc->GetNodes()[nStartIdx+1]->IsTxtNode() ) // could be a start nd
/*N*/ nStartIdx++;
-/*N*/
+/*N*/
/*N*/ aMark.SetNodePos( nStartIdx );
/*N*/ aMark.SetNodeOff( 0 );
/*N*/ aMark.SetType( SW3_TOX_POINT );
/*N*/ pMarks->Insert( new Sw3Mark(aMark) );
-/*N*/
+/*N*/
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list