ooo-build r13579 - in trunk: . patches/dev300 patches/vba
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13579 - in trunk: . patches/dev300 patches/vba
- Date: Thu, 14 Aug 2008 18:57:56 +0000 (UTC)
Author: kyoshida
Date: Thu Aug 14 18:57:55 2008
New Revision: 13579
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13579&view=rev
Log:
2008-08-14 Kohei Yoshida <kyoshida novell com>
* patches/dev300/cws-scsheetprotection02-sc.diff: added #include
"tabprotection.hxx" to documen2.cxx to fix build breakage on win32.
The build failed because the compiler couldn't find the destructor of
ScDocProtection which is needed by ScDocument's destructor.
* patches/dev300/calc-external-defined-names.diff:
* patches/vba/vba-workbook-worksheet-events.diff: adjusted to make them
apply.
* patches/dev300/apply:
* patches/dev300/cws-scsheetprotection02-windowsfix.diff: removed since
this isn't necessary anymore.
Removed:
trunk/patches/dev300/cws-scsheetprotection02-windowsfix.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/calc-external-defined-names.diff
trunk/patches/dev300/cws-scsheetprotection02-sc.diff
trunk/patches/vba/vba-workbook-worksheet-events.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Thu Aug 14 18:57:55 2008
@@ -677,7 +677,6 @@
# and use that information to constrain cell cursor movement when the sheet is
# protected. Also to support encryption on Excel file export.
cws-scsheetprotection02-sc.diff, i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-windowsfix.diff, noelp
cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
cws-scsheetprotection02-svx.diff, i#60305, i#71468, i#84766, kohei
Modified: trunk/patches/dev300/calc-external-defined-names.diff
==============================================================================
--- trunk/patches/dev300/calc-external-defined-names.diff (original)
+++ trunk/patches/dev300/calc-external-defined-names.diff Thu Aug 14 18:57:55 2008
@@ -697,9 +697,9 @@
--- sc/source/core/data/documen2.cxx
+++ sc/source/core/data/documen2.cxx
@@ -93,6 +93,7 @@
- #include "listenercalls.hxx"
#include "recursionhelper.hxx"
#include "lookupcache.hxx"
+ #include "tabprotection.hxx"
+#include "externalrefmgr.hxx"
#include <com/sun/star/document/XVbaEventsHelper.hpp>
Modified: trunk/patches/dev300/cws-scsheetprotection02-sc.diff
==============================================================================
--- trunk/patches/dev300/cws-scsheetprotection02-sc.diff (original)
+++ trunk/patches/dev300/cws-scsheetprotection02-sc.diff Thu Aug 14 18:57:55 2008
@@ -1,8 +1,12 @@
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 24fdc1d..dbd59c0 100644
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -89,6 +89,7 @@ class ScDBData;
+? sc/sc.vpj
+Index: sc/inc/document.hxx
+===================================================================
+RCS file: /cvs/sc/sc/inc/document.hxx,v
+retrieving revision 1.115
+diff -u -I $Revision.*$ -I $Author.*$ -r1.115 document.hxx
+--- sc/inc/document.hxx 8 Jul 2008 07:19:13 -0000 1.115
++++ sc/inc/document.hxx 14 Aug 2008 17:05:40 -0000
+@@ -89,6 +89,7 @@
class ScDetOpData;
class ScDetOpList;
class ScDocOptions;
@@ -10,7 +14,7 @@
class ScDocumentPool;
class ScDrawLayer;
class ScExtDocOptions;
-@@ -104,6 +105,7 @@ class ScRangeName;
+@@ -104,6 +105,7 @@
class ScStyleSheet;
class ScStyleSheetPool;
class ScTable;
@@ -18,7 +22,7 @@
class ScTokenArray;
class ScValidationData;
class ScValidationDataList;
-@@ -276,7 +278,7 @@ private:
+@@ -276,7 +278,7 @@
ScFieldEditEngine* pCacheFieldEditEngine;
@@ -27,7 +31,7 @@
String aDocName; // opt: Dokumentname
ScRangePairListRef xColNameRanges;
ScRangePairListRef xRowNameRanges;
-@@ -340,7 +342,6 @@ private:
+@@ -340,7 +342,6 @@
ScLkUpdMode eLinkMode;
@@ -35,7 +39,7 @@
BOOL bAutoCalc; // Automatisch Berechnen
BOOL bAutoCalcShellDisabled; // in/von/fuer ScDocShell disabled
// ob noch ForcedFormulas berechnet werden muessen,
-@@ -526,13 +527,16 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
+@@ -524,13 +525,16 @@
inline SCTAB GetTableCount() const { return nMaxTableNumber; }
SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }
@@ -56,7 +60,7 @@
void LockTable(SCTAB nTab);
void UnlockTable(SCTAB nTab);
-@@ -1504,6 +1508,8 @@ SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
+@@ -1495,6 +1499,8 @@
private:
@@ -65,11 +69,15 @@
void SetAutoFilterFlags();
void FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount,
SCCOL nX1, SCCOL nX2 ) const;
-diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index 7753e5b..25bd2f2 100644
---- sc/inc/sc.hrc
-+++ sc/inc/sc.hrc
-@@ -1625,7 +1625,12 @@
+Index: sc/inc/sc.hrc
+===================================================================
+RCS file: /cvs/sc/sc/inc/sc.hrc,v
+retrieving revision 1.63
+retrieving revision 1.62.30.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.63 -r1.62.30.4
+--- sc/inc/sc.hrc 1 Jul 2008 16:22:11 -0000 1.63
++++ sc/inc/sc.hrc 17 Jul 2008 00:59:45 -0000 1.62.30.4
+@@ -1626,7 +1626,12 @@
#define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145)
#define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146)
@@ -83,11 +91,15 @@
#ifndef STD_MASKCOLOR
#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
-diff --git sc/inc/scextopt.hxx sc/inc/scextopt.hxx
-index 772b77c..dac5afa 100644
---- sc/inc/scextopt.hxx
-+++ sc/inc/scextopt.hxx
-@@ -46,8 +46,6 @@ struct ScExtDocSettings
+Index: sc/inc/scextopt.hxx
+===================================================================
+RCS file: /cvs/sc/sc/inc/scextopt.hxx,v
+retrieving revision 1.13
+retrieving revision 1.12.694.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.13 -r1.12.694.4
+--- sc/inc/scextopt.hxx 10 Apr 2008 18:50:45 -0000 1.13
++++ sc/inc/scextopt.hxx 22 May 2008 21:44:02 -0000 1.12.694.4
+@@ -46,8 +46,6 @@
double mfTabBarWidth; /// Width of the tabbar, relative to frame window width (0.0 ... 1.0).
sal_uInt32 mnLinkCnt; /// Recursive counter for loading external documents.
SCTAB mnDisplTab; /// Index of displayed sheet.
@@ -96,10 +108,14 @@
explicit ScExtDocSettings();
};
-diff --git sc/inc/table.hxx sc/inc/table.hxx
-index 9bf6396..3f46d4c 100644
---- sc/inc/table.hxx
-+++ sc/inc/table.hxx
+Index: sc/inc/table.hxx
+===================================================================
+RCS file: /cvs/sc/sc/inc/table.hxx,v
+retrieving revision 1.35
+retrieving revision 1.34.28.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.35 -r1.34.28.3
+--- sc/inc/table.hxx 10 Apr 2008 18:57:06 -0000 1.35
++++ sc/inc/table.hxx 8 May 2008 23:23:38 -0000 1.34.28.3
@@ -39,6 +39,8 @@
#include "sortparam.hxx"
#include "compressedarray.hxx"
@@ -109,7 +125,7 @@
namespace utl {
class SearchParam;
class TextSearch;
-@@ -65,6 +67,7 @@ class ScRangeList;
+@@ -65,6 +67,7 @@
class ScSortInfoArray;
class ScStyleSheet;
class ScTableLink;
@@ -117,7 +133,7 @@
class ScUserListData;
class ScIndexMap;
struct RowInfo;
-@@ -102,8 +105,7 @@ private:
+@@ -102,8 +105,7 @@
SCROW nRepeatStartY;
SCROW nRepeatEndY;
@@ -127,7 +143,7 @@
USHORT* pColWidth;
ScSummableCompressedArray< SCROW, USHORT>* pRowHeight;
-@@ -218,10 +220,11 @@ public:
+@@ -218,10 +220,11 @@
void SetPageStyle( const String& rName );
void PageStyleModified( const String& rNewName );
@@ -143,11 +159,12 @@
Size GetPageSize() const;
void SetPageSize( const Size& rSize );
-diff --git sc/inc/tabprotection.hxx sc/inc/tabprotection.hxx
-new file mode 100644
-index 0000000..a0fe748
---- /dev/null
-+++ sc/inc/tabprotection.hxx
+Index: sc/inc/tabprotection.hxx
+===================================================================
+RCS file: sc/inc/tabprotection.hxx
+diff -N sc/inc/tabprotection.hxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/inc/tabprotection.hxx 13 Aug 2008 20:55:29 -0000 1.1.4.5
@@ -0,0 +1,178 @@
+/*************************************************************************
+ *
@@ -327,10 +344,14 @@
+
+
+#endif
-diff --git sc/inc/warnpassword.hxx sc/inc/warnpassword.hxx
-index fbb405f..f7e3595 100644
---- sc/inc/warnpassword.hxx
-+++ sc/inc/warnpassword.hxx
+Index: sc/inc/warnpassword.hxx
+===================================================================
+RCS file: /cvs/sc/sc/inc/warnpassword.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.30.1
+diff -u -I $Revision.*$ -I $Author.*$ -r1.4 -r1.4.30.1
+--- sc/inc/warnpassword.hxx 10 Apr 2008 19:02:48 -0000 1.4
++++ sc/inc/warnpassword.hxx 22 May 2008 21:47:09 -0000 1.4.30.1
@@ -31,7 +31,7 @@
#ifndef SC_WARNPASSWORD_HXX
#define SC_WARNPASSWORD_HXX
@@ -340,7 +361,7 @@
class SfxMedium;
/** Static API helper functions. */
-@@ -46,6 +46,7 @@ public:
+@@ -46,6 +46,7 @@
static bool WarningOnPassword( SfxMedium& rMedium );
};
@@ -348,11 +369,23 @@
#endif
-diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
-index b7fcea0..da5791d 100644
---- sc/source/core/data/documen2.cxx
-+++ sc/source/core/data/documen2.cxx
-@@ -150,6 +150,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
+Index: sc/source/core/data/documen2.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/documen2.cxx,v
+retrieving revision 1.75
+retrieving revision 1.71.28.7
+diff -u -I $Revision.*$ -I $Author.*$ -r1.75 -r1.71.28.7
+--- sc/source/core/data/documen2.cxx 22 Jul 2008 14:43:18 -0000 1.75
++++ sc/source/core/data/documen2.cxx 14 Aug 2008 17:04:31 -0000 1.71.28.7
+@@ -93,6 +93,7 @@
+ #include "listenercalls.hxx"
+ #include "recursionhelper.hxx"
+ #include "lookupcache.hxx"
++#include "tabprotection.hxx"
+
+ // pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
+ // dtor plus helpers are convenient.
+@@ -150,6 +151,7 @@
pChangeViewSettings( NULL ),
pScriptTypeData( NULL ),
pCacheFieldEditEngine( NULL ),
@@ -360,7 +393,7 @@
pViewOptions( NULL ),
pDocOptions( NULL ),
pExtDocOptions( NULL ),
-@@ -173,7 +174,6 @@ ScDocument::ScDocument( ScDocumentMode eMode,
+@@ -173,7 +175,6 @@
nHardRecalcState(0),
nVisibleTab( 0 ),
eLinkMode(LM_UNKNOWN),
@@ -368,7 +401,7 @@
bAutoCalc( eMode == SCDOCMODE_DOCUMENT ),
bAutoCalcShellDisabled( FALSE ),
bForcedFormulaPending( FALSE ),
-@@ -614,6 +614,7 @@ List& ScDocument::GetLoadedSymbolStringCellsList()
+@@ -614,6 +615,7 @@
BOOL ScDocument::Load( SvStream& rStream, ScProgress* pProgress )
{
@@ -376,7 +409,7 @@
bLoadingDone = FALSE;
//----------------------------------------------------
-@@ -968,10 +969,13 @@ BOOL ScDocument::Load( SvStream& rStream, ScProgress* pProgress )
+@@ -968,10 +970,13 @@
bLoadingDone = TRUE;
return !bError;
@@ -390,7 +423,7 @@
((ScDocument*)this)->bLoadingDone = FALSE; // nicht zwischendrin reinpfuschen lassen
((ScDocument*)this)->bLostData = FALSE; // wird beim Speichern gesetzt
-@@ -1205,6 +1209,8 @@ BOOL ScDocument::Save( SvStream& rStream, ScProgress* pProgress ) const
+@@ -1205,6 +1210,8 @@
((ScDocument*)this)->bLoadingDone = TRUE;
return ( rStream.GetError() == SVSTREAM_OK );
@@ -399,10 +432,14 @@
}
void ScDocument::SetLostData()
-diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
-index f898cc9..7e66c6e 100644
---- sc/source/core/data/documen3.cxx
-+++ sc/source/core/data/documen3.cxx
+Index: sc/source/core/data/documen3.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/documen3.cxx,v
+retrieving revision 1.42
+retrieving revision 1.40.80.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.42 -r1.40.80.3
+--- sc/source/core/data/documen3.cxx 14 May 2008 09:51:05 -0000 1.42
++++ sc/source/core/data/documen3.cxx 23 May 2008 01:50:53 -0000 1.40.80.3
@@ -78,6 +78,8 @@
#include "listenercalls.hxx"
#include "editutil.hxx" // ScPostIt EditTextObject
@@ -412,7 +449,7 @@
using namespace com::sun::star;
-@@ -1690,28 +1692,37 @@ void ScDocument::SnapVisArea( Rectangle& rRect ) const
+@@ -1690,28 +1692,37 @@
ScDrawLayer::MirrorRectRTL( rRect ); // back to real rectangle
}
@@ -459,7 +496,7 @@
}
BOOL ScDocument::IsTabProtected( SCTAB nTab ) const
-@@ -1724,19 +1735,34 @@ BOOL ScDocument::IsTabProtected( SCTAB nTab ) const
+@@ -1724,19 +1735,34 @@
return FALSE;
}
@@ -502,10 +539,14 @@
}
const ScDocOptions& ScDocument::GetDocOptions() const
-diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index b727ffe..c93c1a7 100644
---- sc/source/core/data/document.cxx
-+++ sc/source/core/data/document.cxx
+Index: sc/source/core/data/document.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/document.cxx,v
+retrieving revision 1.90
+retrieving revision 1.86.28.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.90 -r1.86.28.3
+--- sc/source/core/data/document.cxx 8 Jul 2008 07:19:49 -0000 1.90
++++ sc/source/core/data/document.cxx 17 Jul 2008 01:00:23 -0000 1.86.28.3
@@ -90,6 +90,7 @@
#include "autonamecache.hxx"
#include "bcaslot.hxx"
@@ -514,11 +555,15 @@
struct ScDefaultAttr
{
-diff --git sc/source/core/data/makefile.mk sc/source/core/data/makefile.mk
-index c8ed91b..1cad27e 100644
---- sc/source/core/data/makefile.mk
-+++ sc/source/core/data/makefile.mk
-@@ -108,6 +108,7 @@ SLOFILES = \
+Index: sc/source/core/data/makefile.mk
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/makefile.mk,v
+retrieving revision 1.26
+retrieving revision 1.23.26.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.26 -r1.23.26.3
+--- sc/source/core/data/makefile.mk 23 May 2008 08:35:53 -0000 1.26
++++ sc/source/core/data/makefile.mk 7 Jun 2008 03:36:43 -0000 1.23.26.3
+@@ -108,6 +108,7 @@
$(SLO)$/table4.obj \
$(SLO)$/table5.obj \
$(SLO)$/table6.obj \
@@ -526,10 +571,14 @@
$(SLO)$/userdat.obj \
$(SLO)$/validat.obj \
$(SLO)$/postit.obj
-diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx
-index 87de93f..9739af3 100644
---- sc/source/core/data/table1.cxx
-+++ sc/source/core/data/table1.cxx
+Index: sc/source/core/data/table1.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/table1.cxx,v
+retrieving revision 1.25
+retrieving revision 1.24.28.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.25 -r1.24.28.2
+--- sc/source/core/data/table1.cxx 10 Apr 2008 19:34:43 -0000 1.25
++++ sc/source/core/data/table1.cxx 6 May 2008 23:27:26 -0000 1.24.28.2
@@ -114,6 +114,7 @@
#include "progress.hxx"
#include "hints.hxx" // fuer Paint-Broadcast
@@ -538,7 +587,7 @@
// STATIC DATA -----------------------------------------------------------
-@@ -132,7 +133,7 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
+@@ -132,7 +133,7 @@
bPageSizeValid( FALSE ),
nRepeatStartX( SCCOL_REPEAT_NONE ),
nRepeatStartY( SCROW_REPEAT_NONE ),
@@ -547,11 +596,15 @@
pColWidth( NULL ),
pRowHeight( NULL ),
pColFlags( NULL ),
-diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index eda656d..6d1ecf9 100644
---- sc/source/core/data/table2.cxx
-+++ sc/source/core/data/table2.cxx
-@@ -294,7 +294,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH
+Index: sc/source/core/data/table2.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/table2.cxx,v
+retrieving revision 1.40
+retrieving revision 1.39.78.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.40 -r1.39.78.2
+--- sc/source/core/data/table2.cxx 10 Apr 2008 19:35:09 -0000 1.40
++++ sc/source/core/data/table2.cxx 6 May 2008 23:27:37 -0000 1.39.78.2
+@@ -294,7 +294,7 @@
// Zellschutz auf geschuetzter Tabelle nicht setzen
//
@@ -560,7 +613,7 @@
{
ScPatternAttr aPattern(pDocument->GetPool());
aPattern.GetItemSet().Put( ScProtectionAttr( FALSE ) );
-@@ -320,7 +320,7 @@ void ScTable::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
+@@ -320,7 +320,7 @@
// Zellschutz auf geschuetzter Tabelle nicht setzen
//
@@ -569,7 +622,7 @@
{
ScDocumentPool* pPool = pDocument->GetPool();
SfxItemSet aSet( *pPool, ATTR_PATTERN_START, ATTR_PATTERN_END );
-@@ -363,7 +363,7 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+@@ -363,7 +363,7 @@
// ggf. Formeln durch Werte ersetzen
@@ -578,7 +631,7 @@
for (i = nCol1; i <= nCol2; i++)
pTable->aCol[i].RemoveProtected(nRow1, nRow2);
}
-@@ -408,7 +408,7 @@ void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+@@ -408,7 +408,7 @@
// Zellschutz auf geschuetzter Tabelle nicht setzen
//
@@ -587,7 +640,7 @@
{
ScPatternAttr aPattern(pDocument->GetPool());
aPattern.GetItemSet().Put( ScProtectionAttr( FALSE ) );
-@@ -1438,7 +1438,7 @@ BOOL ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
+@@ -1438,7 +1438,7 @@
BOOL bIsEditable = TRUE;
if ( nLockCount )
bIsEditable = FALSE;
@@ -596,7 +649,7 @@
{
if((bIsEditable = !HasAttrib( nCol1, nRow1, nCol2, nRow2, HASATTR_PROTECTED )) != FALSE)
{
-@@ -1505,7 +1505,7 @@ BOOL ScTable::IsSelectionEditable( const ScMarkData& rMark,
+@@ -1505,7 +1505,7 @@
BOOL bIsEditable = TRUE;
if ( nLockCount )
bIsEditable = FALSE;
@@ -605,7 +658,7 @@
{
if((bIsEditable = !HasAttribSelection( rMark, HASATTR_PROTECTED )) != FALSE)
{
-@@ -2815,11 +2815,16 @@ BOOL ScTable::Load( SvStream& rStream, USHORT /* nVersion */, ScProgress* /* pPr
+@@ -2809,11 +2809,16 @@
rStream >> bScenario;
rStream.ReadByteString( aComment, rStream.GetStreamCharSet() );
@@ -622,7 +675,7 @@
BOOL bOutline;
rStream >> bOutline;
-@@ -3091,6 +3096,7 @@ BOOL ScTable::Save( SvStream& rStream, long& /* rSavedDocCells */, ScProgress* /
+@@ -3085,6 +3090,7 @@
rStream << bScenario;
rStream.WriteByteString( aComment, rStream.GetStreamCharSet() );
@@ -630,10 +683,14 @@
rStream << bProtected;
String aPass;
//rStream.WriteByteString( aProtectPass, rStream.GetStreamCharSet() );
-diff --git sc/source/core/data/table5.cxx sc/source/core/data/table5.cxx
-index e557c56..e773776 100644
---- sc/source/core/data/table5.cxx
-+++ sc/source/core/data/table5.cxx
+Index: sc/source/core/data/table5.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/table5.cxx,v
+retrieving revision 1.14
+retrieving revision 1.13.324.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.14 -r1.13.324.3
+--- sc/source/core/data/table5.cxx 10 Apr 2008 19:36:13 -0000 1.14
++++ sc/source/core/data/table5.cxx 8 May 2008 23:23:44 -0000 1.13.324.3
@@ -51,8 +51,11 @@
#include "stlpool.hxx"
#include "stlsheet.hxx"
@@ -646,7 +703,7 @@
// STATIC DATA -----------------------------------------------------------
#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue()
-@@ -273,6 +276,42 @@ void ScTable::SetPageSize( const Size& rSize )
+@@ -273,6 +276,42 @@
bPageSizeValid = FALSE;
}
@@ -689,11 +746,12 @@
Size ScTable::GetPageSize() const
{
if ( bPageSizeValid )
-diff --git sc/source/core/data/tabprotection.cxx sc/source/core/data/tabprotection.cxx
-new file mode 100644
-index 0000000..d4f983b
---- /dev/null
-+++ sc/source/core/data/tabprotection.cxx
+Index: sc/source/core/data/tabprotection.cxx
+===================================================================
+RCS file: sc/source/core/data/tabprotection.cxx
+diff -N sc/source/core/data/tabprotection.cxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/source/core/data/tabprotection.cxx 13 Aug 2008 20:55:29 -0000 1.1.4.7
@@ -0,0 +1,463 @@
+/*************************************************************************
+ *
@@ -1158,10 +1216,14 @@
+ mpImpl->setOption(eOption, bEnabled);
+}
+
-diff --git sc/source/filter/excel/excdoc.cxx sc/source/filter/excel/excdoc.cxx
-index 837c972..d28222f 100644
---- sc/source/filter/excel/excdoc.cxx
-+++ sc/source/filter/excel/excdoc.cxx
+Index: sc/source/filter/excel/excdoc.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/excdoc.cxx,v
+retrieving revision 1.69
+retrieving revision 1.67.284.7
+diff -u -I $Revision.*$ -I $Author.*$ -r1.69 -r1.67.284.7
+--- sc/source/filter/excel/excdoc.cxx 13 May 2008 12:07:58 -0000 1.69
++++ sc/source/filter/excel/excdoc.cxx 23 May 2008 01:51:00 -0000 1.67.284.7
@@ -73,7 +73,6 @@
#include "excdoc.hxx"
#include "namebuff.hxx"
@@ -1179,7 +1241,7 @@
static String lcl_GetVbaTabName( SCTAB n )
{
-@@ -151,7 +152,16 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
+@@ -151,7 +152,16 @@
Add( new ExcDummy_00 );
else
{
@@ -1197,7 +1259,7 @@
rR.pTabId = new XclExpChTrTabId( Max( nExcTabCount, nCodenames ) );
Add( rR.pTabId );
if( HasVbaStorage() )
-@@ -161,7 +171,8 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
+@@ -161,7 +171,8 @@
if( rCodeName.Len() )
Add( new XclCodename( rCodeName ) );
}
@@ -1207,7 +1269,7 @@
}
// erst Namen- und Tabellen-Eintraege aufbauen
-@@ -181,15 +192,29 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
+@@ -181,15 +192,29 @@
aRecList.AppendRecord( CreateRecord( EXC_ID_NAME ) );
}
@@ -1241,7 +1303,7 @@
if( GetBiff() <= EXC_BIFF5 )
{
Add( new ExcDummy_040 );
-@@ -198,9 +223,11 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
+@@ -198,9 +223,11 @@
}
else
{
@@ -1254,7 +1316,7 @@
}
// Formatting: FONT, FORMAT, XF, STYLE, PALETTE
-@@ -259,10 +286,14 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
+@@ -259,10 +286,14 @@
aRecList.AppendRecord( CreateRecord( EXC_ID_EXTERNSHEET ) );
aRecList.AppendRecord( CreateRecord( EXC_ID_NAME ) );
@@ -1269,7 +1331,7 @@
}
Add( new ExcEof );
-@@ -304,7 +335,7 @@ void ExcTable::FillAsTable( size_t nCodeNameIdx )
+@@ -304,7 +335,7 @@
Add( new XclRefmode( rDoc ) );
Add( new XclIteration( rDoc ) );
Add( new XclDelta( rDoc ) );
@@ -1278,7 +1340,7 @@
}
// GUTS (count & size of outline icons)
-@@ -321,8 +352,14 @@ void ExcTable::FillAsTable( size_t nCodeNameIdx )
+@@ -321,8 +352,14 @@
// page settings (SETUP and various other records)
aRecList.AppendRecord( xPageSett );
@@ -1295,7 +1357,7 @@
// local link table: EXTERNCOUNT, EXTERNSHEET
if( eBiff <= EXC_BIFF5 )
-@@ -368,6 +405,9 @@ void ExcTable::FillAsTable( size_t nCodeNameIdx )
+@@ -368,6 +405,9 @@
if( eBiff == EXC_BIFF8 )
{
@@ -1305,11 +1367,15 @@
// web queries
Add( new XclExpWebQueryBuffer( GetRoot() ) );
-diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
-index 77fde45..d42738d 100644
---- sc/source/filter/excel/excimp8.cxx
-+++ sc/source/filter/excel/excimp8.cxx
-@@ -161,12 +161,6 @@ void ImportExcel8::Iteration( void )
+Index: sc/source/filter/excel/excimp8.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/excimp8.cxx,v
+retrieving revision 1.127
+retrieving revision 1.123.38.5
+diff -u -I $Revision.*$ -I $Author.*$ -r1.127 -r1.123.38.5
+--- sc/source/filter/excel/excimp8.cxx 8 Jul 2008 07:21:58 -0000 1.127
++++ sc/source/filter/excel/excimp8.cxx 17 Jul 2008 01:00:43 -0000 1.123.38.5
+@@ -161,12 +161,6 @@
}
@@ -1322,7 +1388,7 @@
void ImportExcel8::Note( void )
{
GetObjectManager().ReadNote( maStrm );
-@@ -256,6 +250,11 @@ void ImportExcel8::Codename( BOOL bWorkbookGlobals )
+@@ -256,6 +250,11 @@
}
}
@@ -1334,7 +1400,7 @@
bool lcl_hasVBAEnabled()
{
uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY);
-@@ -302,6 +301,8 @@ void ImportExcel8::PostDocLoad( void )
+@@ -302,6 +301,8 @@
pExcRoot->pAutoFilterBuffer->Apply();
GetWebQueryBuffer().Apply(); //! test if extant
@@ -1343,10 +1409,14 @@
ImportExcel::PostDocLoad();
-diff --git sc/source/filter/excel/excrecds.cxx sc/source/filter/excel/excrecds.cxx
-index 16c04f1..81b97f0 100644
---- sc/source/filter/excel/excrecds.cxx
-+++ sc/source/filter/excel/excrecds.cxx
+Index: sc/source/filter/excel/excrecds.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/excrecds.cxx,v
+retrieving revision 1.88
+retrieving revision 1.87.286.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.88 -r1.87.286.4
+--- sc/source/filter/excel/excrecds.cxx 10 Apr 2008 20:06:49 -0000 1.88
++++ sc/source/filter/excel/excrecds.cxx 22 May 2008 23:33:21 -0000 1.87.286.4
@@ -99,6 +99,7 @@
#include "xcl97rec.hxx"
@@ -1355,7 +1425,7 @@
//--------------------------------------------------------- class ExcDummy_00 -
const BYTE ExcDummy_00::pMyData[] = {
-@@ -418,7 +419,9 @@ ExcBundlesheetBase::ExcBundlesheetBase() :
+@@ -418,7 +419,9 @@
void ExcBundlesheetBase::UpdateStreamPos( XclExpStream& rStrm )
{
rStrm.SetSvStreamPos( nOwnPos );
@@ -1365,7 +1435,7 @@
}
-@@ -494,19 +497,41 @@ XclExpWsbool::XclExpWsbool( bool bFitToPages ) :
+@@ -494,19 +497,41 @@
// XclExpWindowProtection ===============================================================
XclExpWindowProtection::XclExpWindowProtection(bool bValue) :
@@ -1410,10 +1480,14 @@
XclExpFiltermode::XclExpFiltermode() :
XclExpEmptyRecord( EXC_ID_FILTERMODE )
{
-diff --git sc/source/filter/excel/impop.cxx sc/source/filter/excel/impop.cxx
-index ab1ca87..258a7c7 100644
---- sc/source/filter/excel/impop.cxx
-+++ sc/source/filter/excel/impop.cxx
+Index: sc/source/filter/excel/impop.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/impop.cxx,v
+retrieving revision 1.95
+retrieving revision 1.93.26.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.95 -r1.93.26.3
+--- sc/source/filter/excel/impop.cxx 8 Jul 2008 07:22:25 -0000 1.95
++++ sc/source/filter/excel/impop.cxx 17 Jul 2008 01:00:46 -0000 1.93.26.3
@@ -90,6 +90,7 @@
#include "xiview.hxx"
#include "xilink.hxx"
@@ -1422,7 +1496,7 @@
#include "excimp8.hxx"
#include "excform.hxx"
-@@ -418,14 +419,9 @@ void ImportExcel::Eof( void )
+@@ -418,14 +419,9 @@
}
@@ -1439,7 +1513,7 @@
}
-@@ -439,6 +435,12 @@ void ImportExcel::Externsheet( void )
+@@ -439,6 +435,12 @@
}
@@ -1452,7 +1526,7 @@
void ImportExcel::Note( void )
{
XclAddress aXclPos;
-@@ -584,27 +586,24 @@ void ImportExcel::Defrowheight2( void )
+@@ -584,27 +586,24 @@
}
@@ -1488,11 +1562,15 @@
SetCodePage( maStrm.ReaduInt16() );
}
-diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
-index 1a263d9..af1a2cc 100644
---- sc/source/filter/excel/read.cxx
-+++ sc/source/filter/excel/read.cxx
-@@ -363,7 +363,7 @@ FltError ImportExcel::Read( void )
+Index: sc/source/filter/excel/read.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/read.cxx,v
+retrieving revision 1.70
+retrieving revision 1.69.80.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.70 -r1.69.80.2
+--- sc/source/filter/excel/read.cxx 10 Apr 2008 20:09:20 -0000 1.70
++++ sc/source/filter/excel/read.cxx 6 May 2008 23:28:32 -0000 1.69.80.2
+@@ -363,7 +363,7 @@
Eof();
eAkt = Z_Ende;
break;
@@ -1501,7 +1579,7 @@
case 0x14:
case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break;
case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
-@@ -477,7 +477,7 @@ FltError ImportExcel::Read( void )
+@@ -477,7 +477,7 @@
Eof();
eAkt = Z_Biff4E;
break;
@@ -1510,7 +1588,7 @@
case 0x14:
case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break;
case 0x1A:
-@@ -603,7 +603,7 @@ FltError ImportExcel::Read( void )
+@@ -603,7 +603,7 @@
eAkt = Z_Biff5T;
aIn.SeekGlobalPosition(); // und zurueck an alte Position
break;
@@ -1519,7 +1597,7 @@
case 0x1A:
case 0x1B: rPageSett.ReadPageBreaks( maStrm ); break;
case 0x1D: rTabViewSett.ReadSelection( maStrm ); break;
-@@ -902,6 +902,7 @@ FltError ImportExcel8::Read( void )
+@@ -902,6 +902,7 @@
}
break;
case 0x12: DocProtect(); break; // PROTECT [ 5678]
@@ -1527,7 +1605,7 @@
case 0x19: WinProtection(); break;
case 0x2F: // FILEPASS [ 2345 ]
eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm );
-@@ -1046,7 +1047,8 @@ FltError ImportExcel8::Read( void )
+@@ -1046,7 +1047,8 @@
eAkt = EXC_STATE_SHEET;
aIn.SeekGlobalPosition(); // und zurueck an alte Position
break;
@@ -1537,7 +1615,7 @@
case 0x42: Codepage(); break; // CODEPAGE [ 2345 ]
case 0x55: DefColWidth(); break;
case 0x7D: Colinfo(); break; // COLINFO [ 345 ]
-@@ -1062,6 +1064,7 @@ FltError ImportExcel8::Read( void )
+@@ -1062,6 +1064,7 @@
case 0x0221: Array34(); break; // ARRAY [ 34 ]
case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345 ]
case 0x04BC: Shrfmla(); break; // SHRFMLA [ 5 ]
@@ -1545,10 +1623,20 @@
}
}
break;
-diff --git sc/source/filter/excel/xeroot.cxx sc/source/filter/excel/xeroot.cxx
-index aa0e713..0c32b52 100644
---- sc/source/filter/excel/xeroot.cxx
-+++ sc/source/filter/excel/xeroot.cxx
+Index: sc/source/filter/excel/xecontent.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/xecontent.cxx,v
+retrieving revision 1.23
+retrieving revision 1.22.80.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.23 -r1.22.80.4
+Index: sc/source/filter/excel/xeroot.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/xeroot.cxx,v
+retrieving revision 1.23
+retrieving revision 1.22.152.6
+diff -u -I $Revision.*$ -I $Author.*$ -r1.23 -r1.22.152.6
+--- sc/source/filter/excel/xeroot.cxx 10 Apr 2008 20:13:37 -0000 1.23
++++ sc/source/filter/excel/xeroot.cxx 22 May 2008 21:42:34 -0000 1.22.152.6
@@ -32,7 +32,11 @@
#include "precompiled_sc.hxx"
#include "xeroot.hxx"
@@ -1574,7 +1662,7 @@
// Global data ================================================================
-@@ -221,6 +227,40 @@ XclExpRecordRef XclExpRoot::CreateRecord( sal_uInt16 nRecId ) const
+@@ -221,6 +227,40 @@
return xRec;
}
@@ -1615,10 +1703,14 @@
XclExpRootData::XclExpLinkMgrRef XclExpRoot::GetLocalLinkMgrRef() const
{
return IsInGlobals() ? mrExpData.mxGlobLinkMgr : mrExpData.mxLocLinkMgr;
-diff --git sc/source/filter/excel/xestream.cxx sc/source/filter/excel/xestream.cxx
-index 3a277dd..9e1a658 100644
---- sc/source/filter/excel/xestream.cxx
-+++ sc/source/filter/excel/xestream.cxx
+Index: sc/source/filter/excel/xestream.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/xestream.cxx,v
+retrieving revision 1.11
+retrieving revision 1.10.324.6
+diff -u -I $Revision.*$ -I $Author.*$ -r1.11 -r1.10.324.6
+--- sc/source/filter/excel/xestream.cxx 10 Apr 2008 20:13:53 -0000 1.11
++++ sc/source/filter/excel/xestream.cxx 22 May 2008 23:34:37 -0000 1.10.324.6
@@ -34,6 +34,9 @@
#include "xlstring.hxx"
#include "xeroot.hxx"
@@ -1629,7 +1721,7 @@
// ============================================================================
-@@ -63,16 +66,19 @@ XclExpStream::~XclExpStream()
+@@ -63,16 +66,19 @@
void XclExpStream::StartRecord( sal_uInt16 nRecId, sal_Size nRecSize )
{
DBG_ASSERT( !mbInRec, "XclExpStream::StartRecord - another record still open" );
@@ -1649,7 +1741,7 @@
UpdateRecSize();
mrStrm.Seek( STREAM_SEEK_TO_END );
mbInRec = false;
-@@ -84,6 +90,86 @@ void XclExpStream::SetSliceSize( sal_uInt16 nSize )
+@@ -84,6 +90,86 @@
mnSliceSize = 0;
}
@@ -1736,7 +1828,7 @@
sal_Size XclExpStream::Write( const void* pData, sal_Size nBytes )
{
sal_Size nRet = 0;
-@@ -98,9 +184,21 @@ sal_Size XclExpStream::Write( const void* pData, sal_Size nBytes )
+@@ -98,9 +184,21 @@
while( bValid && (nBytesLeft > 0) )
{
sal_Size nWriteLen = ::std::min< sal_Size >( PrepareWrite(), nBytesLeft );
@@ -1759,7 +1851,7 @@
pBuffer += nWriteRet;
nRet += nWriteRet;
nBytesLeft -= nWriteRet;
-@@ -236,6 +334,26 @@ void XclExpStream::WriteCharBuffer( const ScfUInt8Vec& rBuffer )
+@@ -236,6 +334,26 @@
Write( &rBuffer[ 0 ], rBuffer.size() );
}
@@ -1786,7 +1878,7 @@
sal_Size XclExpStream::SetSvStreamPos( sal_Size nPos )
{
DBG_ASSERT( !mbInRec, "XclExpStream::SetSvStreamPos - not allowed inside of a record" );
-@@ -327,3 +445,187 @@ void XclExpStream::WriteRawZeroBytes( sal_Size nBytes )
+@@ -327,3 +445,187 @@
// ============================================================================
@@ -1974,10 +2066,20 @@
+ }
+ mnOldPos = nStrmPos;
+}
-diff --git sc/source/filter/excel/xicontent.cxx sc/source/filter/excel/xicontent.cxx
-index 6792e93..5d711d0 100644
---- sc/source/filter/excel/xicontent.cxx
-+++ sc/source/filter/excel/xicontent.cxx
+Index: sc/source/filter/excel/xetable.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/xetable.cxx,v
+retrieving revision 1.18
+retrieving revision 1.17.80.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.18 -r1.17.80.3
+Index: sc/source/filter/excel/xicontent.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/xicontent.cxx,v
+retrieving revision 1.32
+retrieving revision 1.30.80.7
+diff -u -I $Revision.*$ -I $Author.*$ -r1.32 -r1.30.80.7
+--- sc/source/filter/excel/xicontent.cxx 8 Jul 2008 07:22:54 -0000 1.32
++++ sc/source/filter/excel/xicontent.cxx 17 Jul 2008 01:00:50 -0000 1.30.80.7
@@ -41,6 +41,7 @@
#include "scitems.hxx"
#include <svx/eeitem.hxx>
@@ -1999,7 +2101,7 @@
// Shared string table ========================================================
-@@ -1069,11 +1076,182 @@ ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm )
+@@ -1069,11 +1076,182 @@
};
// set decrypter at import stream
rStrm.SetDecrypter( xDecr );
@@ -2184,11 +2286,15 @@
+
// ============================================================================
-diff --git sc/source/filter/excel/xilink.cxx sc/source/filter/excel/xilink.cxx
-index 264e796..01932a5 100644
---- sc/source/filter/excel/xilink.cxx
-+++ sc/source/filter/excel/xilink.cxx
-@@ -264,6 +264,7 @@ void XclImpTabInfo::ReadTabid( XclImpStream& rStrm )
+Index: sc/source/filter/excel/xilink.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/xilink.cxx,v
+retrieving revision 1.25
+retrieving revision 1.23.28.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.25 -r1.23.28.3
+--- sc/source/filter/excel/xilink.cxx 8 Jul 2008 07:23:09 -0000 1.25
++++ sc/source/filter/excel/xilink.cxx 17 Jul 2008 01:00:53 -0000 1.23.28.3
+@@ -264,6 +264,7 @@
DBG_ASSERT_BIFF( rStrm.GetRoot().GetBiff() == EXC_BIFF8 );
if( rStrm.GetRoot().GetBiff() == EXC_BIFF8 )
{
@@ -2196,10 +2302,14 @@
sal_Size nReadCount = rStrm.GetRecLeft() / 2;
DBG_ASSERT( nReadCount <= 0xFFFF, "XclImpTabInfo::ReadTabid - record too long" );
maTabIdVec.clear();
-diff --git sc/source/filter/excel/xiroot.cxx sc/source/filter/excel/xiroot.cxx
-index 4e5173f..21e071a 100644
---- sc/source/filter/excel/xiroot.cxx
-+++ sc/source/filter/excel/xiroot.cxx
+Index: sc/source/filter/excel/xiroot.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/xiroot.cxx,v
+retrieving revision 1.24
+retrieving revision 1.23.286.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.24 -r1.23.286.3
+--- sc/source/filter/excel/xiroot.cxx 10 Apr 2008 20:18:01 -0000 1.24
++++ sc/source/filter/excel/xiroot.cxx 6 May 2008 23:28:52 -0000 1.23.286.3
@@ -52,6 +52,7 @@
XclImpRootData::XclImpRootData( XclBiff eBiff, SfxMedium& rMedium,
SotStorageRef xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc ) :
@@ -2208,7 +2318,7 @@
mbHasCodePage( false )
{
}
-@@ -86,6 +87,8 @@ XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) :
+@@ -86,6 +87,8 @@
GetOldRoot().pAutoFilterBuffer = new XclImpAutoFilterBuffer;
mrImpData.mxWebQueryBfr.reset( new XclImpWebQueryBuffer( GetRoot() ) );
mrImpData.mxPTableMgr.reset( new XclImpPivotTableManager( GetRoot() ) );
@@ -2217,7 +2327,7 @@
}
mrImpData.mxPageSett.reset( new XclImpPageSettings( GetRoot() ) );
-@@ -224,6 +227,18 @@ XclImpPivotTableManager& XclImpRoot::GetPivotTableManager() const
+@@ -224,6 +227,18 @@
return *mrImpData.mxPTableMgr;
}
@@ -2236,7 +2346,7 @@
XclImpPageSettings& XclImpRoot::GetPageSettings() const
{
return *mrImpData.mxPageSett;
-@@ -247,5 +262,18 @@ String XclImpRoot::GetScAddInName( const String& rXclName ) const
+@@ -247,5 +262,18 @@
return rXclName;
}
@@ -2255,10 +2365,14 @@
+
// ============================================================================
-diff --git sc/source/filter/excel/xistream.cxx sc/source/filter/excel/xistream.cxx
-index 745bc8a..176d2fd 100644
---- sc/source/filter/excel/xistream.cxx
-+++ sc/source/filter/excel/xistream.cxx
+Index: sc/source/filter/excel/xistream.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/xistream.cxx,v
+retrieving revision 1.22
+retrieving revision 1.21.322.5
+diff -u -I $Revision.*$ -I $Author.*$ -r1.22 -r1.21.322.5
+--- sc/source/filter/excel/xistream.cxx 10 Apr 2008 20:18:15 -0000 1.22
++++ sc/source/filter/excel/xistream.cxx 22 May 2008 23:56:02 -0000 1.21.322.5
@@ -36,6 +36,8 @@
#include "xlstring.hxx"
#include "xiroot.hxx"
@@ -2268,7 +2382,7 @@
// ============================================================================
// Decryption
// ============================================================================
-@@ -97,11 +99,21 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte
+@@ -97,11 +99,21 @@
return nRet;
}
@@ -2290,7 +2404,7 @@
// ----------------------------------------------------------------------------
XclImpBiff5Decrypter::XclImpBiff5Decrypter( const XclImpRoot& rRoot, sal_uInt16 nKey, sal_uInt16 nHash )
-@@ -157,6 +169,9 @@ void XclImpBiff5Decrypter::Init( const ByteString& rPass, sal_uInt16 nKey, sal_u
+@@ -157,6 +169,9 @@
// init codec
maCodec.InitKey( mpnPassw );
bValid = maCodec.VerifyKey( nKey, nHash );
@@ -2300,7 +2414,7 @@
}
SetHasValidPassword( bValid );
-@@ -255,6 +270,8 @@ void XclImpBiff8Decrypter::Init(
+@@ -255,6 +270,8 @@
// init codec
maCodec.InitKey( mpnPassw, mpnDocId );
bValid = maCodec.VerifyKey( pnSaltData, pnSaltHash );
@@ -2309,11 +2423,15 @@
}
SetHasValidPassword( bValid );
-diff --git sc/source/filter/excel/xlroot.cxx sc/source/filter/excel/xlroot.cxx
-index d9ff647..cfe73d1 100644
---- sc/source/filter/excel/xlroot.cxx
-+++ sc/source/filter/excel/xlroot.cxx
-@@ -91,8 +91,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
+Index: sc/source/filter/excel/xlroot.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/excel/xlroot.cxx,v
+retrieving revision 1.32
+retrieving revision 1.31.238.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.32 -r1.31.238.3
+--- sc/source/filter/excel/xlroot.cxx 10 Apr 2008 20:22:11 -0000 1.32
++++ sc/source/filter/excel/xlroot.cxx 6 May 2008 23:29:13 -0000 1.31.238.3
+@@ -91,8 +91,7 @@
mxRD( new RootData ),//!
mnCharWidth( 110 ),
mnScTab( 0 ),
@@ -2323,7 +2441,7 @@
{
// default script type, e.g. for empty cells
switch( ScGlobal::GetDefaultScriptType() )
-@@ -198,17 +197,6 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData )
+@@ -198,17 +197,6 @@
}
}
@@ -2341,11 +2459,15 @@
bool XclRoot::HasVbaStorage() const
{
SotStorageRef xRootStrg = GetRootStorage();
-diff --git sc/source/filter/inc/excimp8.hxx sc/source/filter/inc/excimp8.hxx
-index 838d3b7..c1d18f9 100644
---- sc/source/filter/inc/excimp8.hxx
-+++ sc/source/filter/inc/excimp8.hxx
-@@ -62,7 +62,6 @@ class ImportExcel8 : public ImportExcel
+Index: sc/source/filter/inc/excimp8.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/excimp8.hxx,v
+retrieving revision 1.71
+retrieving revision 1.69.80.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.71 -r1.69.80.3
+--- sc/source/filter/inc/excimp8.hxx 2 Jul 2008 09:11:00 -0000 1.71
++++ sc/source/filter/inc/excimp8.hxx 17 Jul 2008 01:00:29 -0000 1.69.80.3
+@@ -62,7 +62,6 @@
void Delta( void ); // 0x10
void Iteration( void ); // 0x11
void Note( void ); // 0x1C
@@ -2353,7 +2475,7 @@
void Boundsheet( void ); // 0x85
void FilterMode( void ); // 0x9B
void AutoFilterInfo( void ); // 0x9D
-@@ -74,6 +73,7 @@ class ImportExcel8 : public ImportExcel
+@@ -74,6 +73,7 @@
void Hlink( void ); // 0x01B8
void Codename( BOOL bWBGlobals ); // 0x01BA
@@ -2361,11 +2483,15 @@
virtual void EndSheet( void );
virtual void PostDocLoad( void );
-diff --git sc/source/filter/inc/excrecds.hxx sc/source/filter/inc/excrecds.hxx
-index 0d85d9b..78f60c0 100644
---- sc/source/filter/inc/excrecds.hxx
-+++ sc/source/filter/inc/excrecds.hxx
-@@ -244,10 +244,23 @@ class XclExpWindowProtection : public XclExpBoolRecord
+Index: sc/source/filter/inc/excrecds.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/excrecds.hxx,v
+retrieving revision 1.51
+retrieving revision 1.49.324.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.51 -r1.49.324.3
+--- sc/source/filter/inc/excrecds.hxx 2 Jul 2008 09:11:27 -0000 1.51
++++ sc/source/filter/inc/excrecds.hxx 17 Jul 2008 01:00:26 -0000 1.49.324.3
+@@ -244,10 +244,23 @@
};
// EXC_ID_PROTECT Document Protection
@@ -2391,11 +2517,21 @@
};
-diff --git sc/source/filter/inc/imp_op.hxx sc/source/filter/inc/imp_op.hxx
-index 274696f..4a7e8c6 100644
---- sc/source/filter/inc/imp_op.hxx
-+++ sc/source/filter/inc/imp_op.hxx
-@@ -134,9 +134,11 @@ protected:
+Index: sc/source/filter/inc/fdumper.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/fdumper.hxx,v
+retrieving revision 1.10
+retrieving revision 1.7.320.5
+diff -u -I $Revision.*$ -I $Author.*$ -r1.10 -r1.7.320.5
+Index: sc/source/filter/inc/imp_op.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/imp_op.hxx,v
+retrieving revision 1.43
+retrieving revision 1.41.286.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.43 -r1.41.286.3
+--- sc/source/filter/inc/imp_op.hxx 2 Jul 2008 09:14:54 -0000 1.43
++++ sc/source/filter/inc/imp_op.hxx 17 Jul 2008 01:00:35 -0000 1.41.286.3
+@@ -134,9 +134,11 @@
void Bof2( void ); // 0x09
void Eof( void ); // 0x0A
void DocProtect( void ); // 0x12
@@ -2409,10 +2545,14 @@
void Note( void ); // 0x1C
void Columndefault( void ); // 0x20
void Array25( void ); // 0x21
-diff --git sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx
-index 2f7382a..b2f7346 100644
---- sc/source/filter/inc/xcl97rec.hxx
-+++ sc/source/filter/inc/xcl97rec.hxx
+Index: sc/source/filter/inc/xcl97rec.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/xcl97rec.hxx,v
+retrieving revision 1.49
+retrieving revision 1.47.338.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.49 -r1.47.338.4
+--- sc/source/filter/inc/xcl97rec.hxx 2 Jul 2008 09:24:16 -0000 1.49
++++ sc/source/filter/inc/xcl97rec.hxx 17 Jul 2008 01:00:32 -0000 1.47.338.4
@@ -35,6 +35,8 @@
#include "xcl97esc.hxx"
#include "xlstyle.hxx"
@@ -2422,7 +2562,7 @@
// --- class XclMsodrawing_Base --------------------------------------
class XclMsodrawing_Base
-@@ -57,29 +59,26 @@ public:
+@@ -57,29 +59,26 @@
// --- class XclMsodrawinggroup --------------------------------------
@@ -2456,7 +2596,7 @@
public:
XclMsodrawing(
-@@ -87,9 +86,6 @@ public:
+@@ -87,9 +86,6 @@
UINT16 nEscherType = 0,
sal_Size nInitialSize = 0 );
virtual ~XclMsodrawing();
@@ -2466,7 +2606,7 @@
};
-@@ -484,23 +480,24 @@ public:
+@@ -484,23 +480,24 @@
virtual sal_Size GetLen() const;
};
@@ -2502,7 +2642,7 @@
class XclCalccount : public ExcRecord
{
-@@ -556,5 +553,162 @@ public:
+@@ -556,5 +553,162 @@
XclRefmode( const ScDocument& );
};
@@ -2665,11 +2805,15 @@
+
#endif // _XCL97REC_HXX
-diff --git sc/source/filter/inc/xeroot.hxx sc/source/filter/inc/xeroot.hxx
-index 7e97e92..f4e1d25 100644
---- sc/source/filter/inc/xeroot.hxx
-+++ sc/source/filter/inc/xeroot.hxx
-@@ -154,7 +154,12 @@ public:
+Index: sc/source/filter/inc/xeroot.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/xeroot.hxx,v
+retrieving revision 1.21
+retrieving revision 1.20.380.5
+diff -u -I $Revision.*$ -I $Author.*$ -r1.21 -r1.20.380.5
+--- sc/source/filter/inc/xeroot.hxx 10 Apr 2008 20:45:28 -0000 1.21
++++ sc/source/filter/inc/xeroot.hxx 22 May 2008 21:42:40 -0000 1.20.380.5
+@@ -154,7 +154,12 @@
@param nRecId Identifier that specifies which record is returned. */
XclExpRecordRef CreateRecord( sal_uInt16 nRecId ) const;
@@ -2682,10 +2826,14 @@
/** Returns the local or global link manager, depending on current context. */
XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const;
-diff --git sc/source/filter/inc/xestream.hxx sc/source/filter/inc/xestream.hxx
-index 514c65c..5d0e3a8 100644
---- sc/source/filter/inc/xestream.hxx
-+++ sc/source/filter/inc/xestream.hxx
+Index: sc/source/filter/inc/xestream.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/xestream.hxx,v
+retrieving revision 1.8
+retrieving revision 1.7.494.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.8 -r1.7.494.3
+--- sc/source/filter/inc/xestream.hxx 10 Apr 2008 20:45:44 -0000 1.8
++++ sc/source/filter/inc/xestream.hxx 6 May 2008 23:28:00 -0000 1.7.494.3
@@ -35,6 +35,9 @@
#include "xlstream.hxx"
@@ -2696,7 +2844,7 @@
/* ============================================================================
Output stream class for Excel export
- CONTINUE record handling
-@@ -42,6 +45,8 @@ Output stream class for Excel export
+@@ -42,6 +45,8 @@
============================================================================ */
class XclExpRoot;
@@ -2705,7 +2853,7 @@
/** This class is used to export Excel record streams.
@descr An instance is constructed with an SvStream and the maximum size of Excel
-@@ -100,14 +105,14 @@ public:
+@@ -100,14 +105,14 @@
/** Sets data slice length. 0 = no slices. */
void SetSliceSize( sal_uInt16 nSize );
@@ -2728,7 +2876,7 @@
/** Writes nBytes bytes from memory. */
sal_Size Write( const void* pData, sal_Size nBytes );
-@@ -148,6 +153,14 @@ public:
+@@ -148,6 +153,14 @@
/** Returns the absolute position of the system stream. */
inline sal_Size GetSvStreamPos() const { return mrStrm.Tell(); }
@@ -2743,7 +2891,7 @@
private:
/** Writes header data, internal setup. */
void InitRecord( sal_uInt16 nRecId );
-@@ -170,6 +183,9 @@ private:
+@@ -170,6 +183,9 @@
SvStream& mrStrm; /// Reference to the system output stream.
const XclExpRoot& mrRoot; /// Filter root data.
@@ -2753,7 +2901,7 @@
// length data
sal_uInt16 mnMaxRecSize; /// Maximum size of record content.
sal_uInt16 mnMaxContSize; /// Maximum size of CONTINUE content.
-@@ -187,64 +203,51 @@ private:
+@@ -187,64 +203,51 @@
// ----------------------------------------------------------------------------
@@ -2853,11 +3001,15 @@
#endif
-diff --git sc/source/filter/inc/xetable.hxx sc/source/filter/inc/xetable.hxx
-index b565289..8efd337 100644
---- sc/source/filter/inc/xetable.hxx
-+++ sc/source/filter/inc/xetable.hxx
-@@ -1069,7 +1069,5 @@ private:
+Index: sc/source/filter/inc/xetable.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/xetable.hxx,v
+retrieving revision 1.11
+retrieving revision 1.10.80.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.11 -r1.10.80.2
+--- sc/source/filter/inc/xetable.hxx 10 Apr 2008 20:46:38 -0000 1.11
++++ sc/source/filter/inc/xetable.hxx 6 May 2008 23:27:41 -0000 1.10.80.2
+@@ -1069,7 +1069,5 @@
XclExpDvalRef mxDval; /// Data validation with DVAL and DV records.
};
@@ -2865,10 +3017,14 @@
-
#endif
-diff --git sc/source/filter/inc/xicontent.hxx sc/source/filter/inc/xicontent.hxx
-index 48f6917..07b237a 100644
---- sc/source/filter/inc/xicontent.hxx
-+++ sc/source/filter/inc/xicontent.hxx
+Index: sc/source/filter/inc/xicontent.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/xicontent.hxx,v
+retrieving revision 1.16
+retrieving revision 1.15.80.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.16 -r1.15.80.2
+--- sc/source/filter/inc/xicontent.hxx 10 Apr 2008 20:47:26 -0000 1.16
++++ sc/source/filter/inc/xicontent.hxx 6 May 2008 23:28:03 -0000 1.15.80.2
@@ -37,6 +37,8 @@
#include "xistring.hxx"
#include "xiroot.hxx"
@@ -2878,7 +3034,7 @@
/* ============================================================================
Classes to import the big Excel document contents (related to several cells or
globals for the document).
-@@ -249,5 +251,64 @@ public:
+@@ -249,5 +251,64 @@
// ============================================================================
@@ -2943,11 +3099,15 @@
+
#endif
-diff --git sc/source/filter/inc/xiroot.hxx sc/source/filter/inc/xiroot.hxx
-index 4e598b2..661d5cf 100644
---- sc/source/filter/inc/xiroot.hxx
-+++ sc/source/filter/inc/xiroot.hxx
-@@ -61,6 +61,8 @@ class XclImpPivotTableManager;
+Index: sc/source/filter/inc/xiroot.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/xiroot.hxx,v
+retrieving revision 1.22
+retrieving revision 1.21.380.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.22 -r1.21.380.3
+--- sc/source/filter/inc/xiroot.hxx 10 Apr 2008 20:49:45 -0000 1.22
++++ sc/source/filter/inc/xiroot.hxx 6 May 2008 23:28:11 -0000 1.21.380.3
+@@ -61,6 +61,8 @@
class XclImpPageSettings;
class XclImpDocViewSettings;
class XclImpTabViewSettings;
@@ -2956,7 +3116,7 @@
class _ScRangeListTabs;
class ExcelToSc;
-@@ -87,6 +89,8 @@ struct XclImpRootData : public XclRootData
+@@ -87,6 +89,8 @@
typedef ScfRef< XclImpPageSettings > XclImpPageSettRef;
typedef ScfRef< XclImpDocViewSettings > XclImpDocViewSettRef;
typedef ScfRef< XclImpTabViewSettings > XclImpTabViewSettRef;
@@ -2965,7 +3125,7 @@
XclImpAddrConvRef mxAddrConv; /// The address converter.
XclImpFmlaCompRef mxFmlaComp; /// The formula compiler.
-@@ -110,6 +114,11 @@ struct XclImpRootData : public XclRootData
+@@ -110,6 +114,11 @@
XclImpPageSettRef mxPageSett; /// Page settings for current sheet.
XclImpDocViewSettRef mxDocViewSett; /// View settings for entire document.
XclImpTabViewSettRef mxTabViewSett; /// View settings for current sheet.
@@ -2977,7 +3137,7 @@
bool mbHasCodePage; /// true = CODEPAGE record exists.
-@@ -181,6 +190,10 @@ public:
+@@ -181,6 +190,10 @@
XclImpWebQueryBuffer& GetWebQueryBuffer() const;
/** Returns the pivot table manager. */
XclImpPivotTableManager& GetPivotTableManager() const;
@@ -2988,7 +3148,7 @@
/** Returns the page settings of the current sheet. */
XclImpPageSettings& GetPageSettings() const;
-@@ -192,6 +205,9 @@ public:
+@@ -192,6 +205,9 @@
/** Returns the Calc add-in function name for an Excel function name. */
String GetScAddInName( const String& rXclName ) const;
@@ -2998,11 +3158,15 @@
private:
mutable XclImpRootData& mrImpData; /// Reference to the global import data struct.
};
-diff --git sc/source/filter/inc/xistream.hxx sc/source/filter/inc/xistream.hxx
-index 1f73cde..2e024c1 100644
---- sc/source/filter/inc/xistream.hxx
-+++ sc/source/filter/inc/xistream.hxx
-@@ -73,6 +73,8 @@ public:
+Index: sc/source/filter/inc/xistream.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/xistream.hxx,v
+retrieving revision 1.13
+retrieving revision 1.12.324.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.13 -r1.12.324.4
+--- sc/source/filter/inc/xistream.hxx 10 Apr 2008 20:50:03 -0000 1.13
++++ sc/source/filter/inc/xistream.hxx 22 May 2008 23:56:25 -0000 1.12.324.4
+@@ -73,6 +73,8 @@
@return Count of bytes really read. */
sal_uInt16 Read( SvStream& rStrm, void* pData, sal_uInt16 nBytes );
@@ -3011,7 +3175,7 @@
protected:
/** Protected copy c'tor for OnClone(). */
explicit XclImpDecrypter( const XclImpDecrypter& rSrc );
-@@ -80,6 +82,8 @@ protected:
+@@ -80,6 +82,8 @@
/** Sets the decrypter to a state showing whether the password was correct. */
void SetHasValidPassword( bool bValid );
@@ -3020,7 +3184,7 @@
private:
/** Implementation of cloning this object. */
virtual XclImpDecrypter* OnClone() const = 0;
-@@ -89,6 +93,7 @@ private:
+@@ -89,6 +93,7 @@
virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) = 0;
private:
@@ -3028,11 +3192,15 @@
ErrCode mnError; /// Decrypter error code.
sal_Size mnOldPos; /// Last known stream position.
sal_uInt16 mnRecSize; /// Current record size.
-diff --git sc/source/filter/inc/xlroot.hxx sc/source/filter/inc/xlroot.hxx
-index a09f5d0..38506c5 100644
---- sc/source/filter/inc/xlroot.hxx
-+++ sc/source/filter/inc/xlroot.hxx
-@@ -91,7 +91,6 @@ struct XclRootData
+Index: sc/source/filter/inc/xlroot.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/inc/xlroot.hxx,v
+retrieving revision 1.31
+retrieving revision 1.30.238.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.31 -r1.30.238.2
+--- sc/source/filter/inc/xlroot.hxx 10 Apr 2008 20:54:26 -0000 1.31
++++ sc/source/filter/inc/xlroot.hxx 6 May 2008 23:27:47 -0000 1.30.238.2
+@@ -91,7 +91,6 @@
ScDocument& mrDoc; /// The source or destination document.
String maDocUrl; /// Document URL of imported/exported file.
String maBasePath; /// Base path of imported/exported file (path of maDocUrl).
@@ -3040,7 +3208,7 @@
rtl_TextEncoding meTextEnc; /// Text encoding to import/export byte strings.
LanguageType meSysLang; /// System language.
LanguageType meDocLang; /// Document language (import: from file, export: from system).
-@@ -115,7 +114,6 @@ struct XclRootData
+@@ -115,7 +114,6 @@
long mnCharWidth; /// Width of '0' in default font (twips).
SCTAB mnScTab; /// Current Calc sheet index.
const bool mbExport; /// false = Import, true = Export.
@@ -3048,7 +3216,7 @@
explicit XclRootData( XclBiff eBiff, SfxMedium& rMedium,
SotStorageRef xRootStrg, ScDocument& rDoc,
-@@ -181,8 +179,6 @@ public:
+@@ -181,8 +179,6 @@
inline const String& GetDocUrl() const { return mrData.maDocUrl; }
/** Returns the base path of the imported/exported file. */
inline const String& GetBasePath() const { return mrData.maBasePath; }
@@ -3057,11 +3225,15 @@
/** Returns the OLE2 root storage of the imported/exported file.
@return Pointer to root storage or 0, if the file is a simple stream. */
-diff --git sc/source/filter/starcalc/scflt.cxx sc/source/filter/starcalc/scflt.cxx
-index e94cc27..b91c61f 100644
---- sc/source/filter/starcalc/scflt.cxx
-+++ sc/source/filter/starcalc/scflt.cxx
-@@ -1148,9 +1148,9 @@ void Sc10Import::LoadProtect()
+Index: sc/source/filter/starcalc/scflt.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/starcalc/scflt.cxx,v
+retrieving revision 1.25
+retrieving revision 1.24.26.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.25 -r1.24.26.2
+--- sc/source/filter/starcalc/scflt.cxx 10 Apr 2008 21:04:01 -0000 1.25
++++ sc/source/filter/starcalc/scflt.cxx 6 May 2008 23:29:31 -0000 1.24.26.2
+@@ -1148,9 +1148,9 @@
//rStream.Read(&SheetProtect, sizeof(SheetProtect));
lcl_ReadSheetProtect(rStream, SheetProtect);
nError = rStream.GetError();
@@ -3074,7 +3246,7 @@
}
-@@ -1502,10 +1502,10 @@ void Sc10Import::LoadTables()
+@@ -1502,10 +1502,10 @@
//rStream.Read(&TabProtect, sizeof(TabProtect));
lcl_ReadTabProtect(rStream, TabProtect);
@@ -3088,11 +3260,15 @@
rStream >> TabNo;
-diff --git sc/source/filter/xcl97/XclExpChangeTrack.cxx sc/source/filter/xcl97/XclExpChangeTrack.cxx
-index 4aec3d6..5b90f44 100644
---- sc/source/filter/xcl97/XclExpChangeTrack.cxx
-+++ sc/source/filter/xcl97/XclExpChangeTrack.cxx
-@@ -491,6 +491,7 @@ void XclExpChTrTabId::Copy( const XclExpChTrTabIdBuffer& rBuffer )
+Index: sc/source/filter/xcl97/XclExpChangeTrack.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/xcl97/XclExpChangeTrack.cxx,v
+retrieving revision 1.26
+retrieving revision 1.25.324.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.26 -r1.25.324.2
+--- sc/source/filter/xcl97/XclExpChangeTrack.cxx 10 Apr 2008 21:04:41 -0000 1.26
++++ sc/source/filter/xcl97/XclExpChangeTrack.cxx 6 May 2008 23:29:27 -0000 1.25.324.2
+@@ -491,6 +491,7 @@
void XclExpChTrTabId::SaveCont( XclExpStream& rStrm )
{
@@ -3100,11 +3276,15 @@
if( pBuffer )
for( sal_uInt16* pElem = pBuffer; pElem < (pBuffer + nTabCount); pElem++ )
rStrm << *pElem;
-diff --git sc/source/filter/xcl97/makefile.mk sc/source/filter/xcl97/makefile.mk
-index 3620621..ecfc547 100644
---- sc/source/filter/xcl97/makefile.mk
-+++ sc/source/filter/xcl97/makefile.mk
-@@ -50,7 +50,6 @@ PROJECTPCHSOURCE=..\pch\filt_pch
+Index: sc/source/filter/xcl97/makefile.mk
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/xcl97/makefile.mk,v
+retrieving revision 1.16
+retrieving revision 1.15.324.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.16 -r1.15.324.2
+--- sc/source/filter/xcl97/makefile.mk 10 Apr 2008 21:05:15 -0000 1.16
++++ sc/source/filter/xcl97/makefile.mk 6 May 2008 23:29:23 -0000 1.15.324.2
+@@ -50,7 +50,6 @@
# --- Files --------------------------------------------------------
SLOFILES = \
@@ -3112,10 +3292,14 @@
$(SLO)$/xcl97esc.obj \
$(SLO)$/xcl97rec.obj \
$(SLO)$/XclImpChangeTrack.obj \
-diff --git sc/source/filter/xcl97/xcl97rec.cxx sc/source/filter/xcl97/xcl97rec.cxx
-index c1a4568..f0d45ea 100644
---- sc/source/filter/xcl97/xcl97rec.cxx
-+++ sc/source/filter/xcl97/xcl97rec.cxx
+Index: sc/source/filter/xcl97/xcl97rec.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/xcl97/xcl97rec.cxx,v
+retrieving revision 1.88
+retrieving revision 1.86.292.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.88 -r1.86.292.4
+--- sc/source/filter/xcl97/xcl97rec.cxx 2 Jul 2008 09:27:32 -0000 1.88
++++ sc/source/filter/xcl97/xcl97rec.cxx 17 Jul 2008 01:00:57 -0000 1.86.292.4
@@ -78,6 +78,7 @@
#include "scextopt.hxx"
#include "docoptio.hxx"
@@ -3124,7 +3308,7 @@
using ::rtl::OUString;
using namespace ::com::sun::star;
-@@ -132,9 +133,9 @@ sal_Size XclMsodrawing_Base::GetDataLen() const
+@@ -132,9 +133,9 @@
// --- class XclMsodrawinggroup --------------------------------------
@@ -3137,7 +3321,7 @@
{
if ( nEscherType )
{
-@@ -179,7 +180,7 @@ XclMsodrawinggroup::~XclMsodrawinggroup()
+@@ -179,7 +180,7 @@
}
@@ -3146,7 +3330,7 @@
{
DBG_ASSERT( GetEscherEx()->GetStreamPos() == GetEscherEx()->GetOffsetFromMap( nStartPos ),
"XclMsodrawinggroup::SaveCont: Escher stream position mismatch" );
-@@ -187,23 +188,11 @@ void XclMsodrawinggroup::SaveCont( XclExpStream& rStrm )
+@@ -187,23 +188,11 @@
}
@@ -3172,7 +3356,7 @@
{
if ( nEscherType )
{
-@@ -229,7 +218,7 @@ XclMsodrawing::~XclMsodrawing()
+@@ -229,7 +218,7 @@
}
@@ -3181,7 +3365,7 @@
{
DBG_ASSERT( GetEscherEx()->GetStreamPos() == GetEscherEx()->GetOffsetFromMap( nStartPos ),
"XclMsodrawing::SaveCont: Escher stream position mismatch" );
-@@ -237,16 +226,6 @@ void XclMsodrawing::SaveCont( XclExpStream& rStrm )
+@@ -237,16 +226,6 @@
}
@@ -3198,7 +3382,7 @@
// --- class XclObjList ----------------------------------------------
-@@ -883,6 +862,7 @@ ExcBof8_Base::ExcBof8_Base()
+@@ -883,6 +862,7 @@
void ExcBof8_Base::SaveCont( XclExpStream& rStrm )
{
@@ -3206,7 +3390,7 @@
rStrm << nVers << nDocType << nRupBuild << nRupYear
<< nFileHistory << nLowestBiffVer;
}
-@@ -943,7 +923,10 @@ void ExcBundlesheet8::SaveCont( XclExpStream& rStrm )
+@@ -943,7 +923,10 @@
{
nOwnPos = rStrm.GetSvStreamPos();
// write dummy position, real position comes later
@@ -3218,7 +3402,7 @@
}
-@@ -1223,33 +1206,73 @@ sal_Size ExcEScenarioManager::GetLen() const
+@@ -1223,33 +1206,73 @@
return 8;
}
@@ -3243,6 +3427,8 @@
+ XclExpRecord( 0x0867, 23 )
{
- return nMyLen;
+-}
+-
+ static const XclExpTabProtectOption aTable[] =
+ {
+ { ScTableProtection::OBJECTS, 0x0001 },
@@ -3269,7 +3455,10 @@
+ ScTableProtection* pProtect = rRoot.GetDoc().GetTabProtection(nTab);
+ if (!pProtect)
+ return;
-+
+
+-const BYTE* XclProtection::GetData( void ) const
+-{
+- return pMyData;
+ for (int i = 0; aTable[i].nMask != 0x0000; ++i)
+ {
+ if ( pProtect->isOptionEnabled(aTable[i].eOption) )
@@ -3277,13 +3466,8 @@
+ }
}
--
--const BYTE* XclProtection::GetData( void ) const
+void XclExpSheetProtectOptions::WriteBody( XclExpStream& rStrm )
- {
-- return pMyData;
--}
--
++{
+ sal_uInt16 nBytes = 0x0867;
+ rStrm << nBytes;
@@ -3307,7 +3491,7 @@
-@@ -1337,3 +1360,250 @@ XclRefmode::XclRefmode( const ScDocument& rDoc ) :
+@@ -1337,3 +1360,250 @@
XclExpBoolRecord( 0x000F, rDoc.GetAddressConvention() != ScAddress::CONV_XL_R1C1 )
{
}
@@ -3558,10 +3742,14 @@
+{
+}
+
-diff --git sc/source/filter/xml/xmlbodyi.cxx sc/source/filter/xml/xmlbodyi.cxx
-index 87245d5..5f3545a 100644
---- sc/source/filter/xml/xmlbodyi.cxx
-+++ sc/source/filter/xml/xmlbodyi.cxx
+Index: sc/source/filter/xml/xmlbodyi.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/xml/xmlbodyi.cxx,v
+retrieving revision 1.32
+retrieving revision 1.29.324.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.32 -r1.29.324.4
+--- sc/source/filter/xml/xmlbodyi.cxx 21 Jul 2008 12:03:57 -0000 1.32
++++ sc/source/filter/xml/xmlbodyi.cxx 9 Aug 2008 21:48:56 -0000 1.29.324.4
@@ -52,6 +52,7 @@
#include "XMLTrackedChangesContext.hxx"
#include "XMLEmptyContext.hxx"
@@ -3579,7 +3767,7 @@
using namespace com::sun::star;
using namespace xmloff::token;
-@@ -280,10 +283,17 @@ void ScXMLBodyContext::EndElement()
+@@ -280,10 +283,17 @@
// #i37959# handle document protection after the sheet settings
if (bProtected)
{
@@ -3598,10 +3786,14 @@
}
}
GetScImport().UnlockSolarMutex();
-diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index 951e00a..52f5145 100644
---- sc/source/filter/xml/xmlexprt.cxx
-+++ sc/source/filter/xml/xmlexprt.cxx
+Index: sc/source/filter/xml/xmlexprt.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/xml/xmlexprt.cxx,v
+retrieving revision 1.213
+retrieving revision 1.211.28.5
+diff -u -I $Revision.*$ -I $Author.*$ -r1.213 -r1.211.28.5
+--- sc/source/filter/xml/xmlexprt.cxx 28 May 2008 10:18:09 -0000 1.213
++++ sc/source/filter/xml/xmlexprt.cxx 13 Aug 2008 20:52:42 -0000 1.211.28.5
@@ -67,6 +67,7 @@
#include "rangeutl.hxx"
#include "convuno.hxx"
@@ -3610,7 +3802,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
-@@ -1399,7 +1400,11 @@ void ScXMLExport::SetBodyAttributes()
+@@ -1399,7 +1400,11 @@
{
AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE);
rtl::OUStringBuffer aBuffer;
@@ -3623,7 +3815,7 @@
if (aBuffer.getLength())
AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
}
-@@ -1417,11 +1422,13 @@ void ScXMLExport::_ExportContent()
+@@ -1417,11 +1422,13 @@
DBG_ERROR("no shared data setted");
}
ScXMLExportDatabaseRanges aExportDatabaseRanges(*this);
@@ -3641,7 +3833,7 @@
uno::Reference<container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY );
if ( xIndex.is() )
{
-@@ -1471,7 +1478,11 @@ void ScXMLExport::_ExportContent()
+@@ -1471,7 +1478,11 @@
AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE);
rtl::OUStringBuffer aBuffer;
if (pDoc)
@@ -3654,7 +3846,7 @@
if (aBuffer.getLength())
AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
}
-@@ -1585,8 +1596,6 @@ void ScXMLExport::_ExportContent()
+@@ -1585,8 +1596,6 @@
aExportDDELinks.WriteDDELinks(xSpreadDoc);
IncrementProgressBar(sal_True, 0);
GetProgressBarHelper()->SetValue(GetProgressBarHelper()->GetReference());
@@ -3663,10 +3855,14 @@
}
void ScXMLExport::_ExportStyles( sal_Bool bUsed )
-diff --git sc/source/filter/xml/xmlsubti.cxx sc/source/filter/xml/xmlsubti.cxx
-index 8d45478..ab00932 100644
---- sc/source/filter/xml/xmlsubti.cxx
-+++ sc/source/filter/xml/xmlsubti.cxx
+Index: sc/source/filter/xml/xmlsubti.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/filter/xml/xmlsubti.cxx,v
+retrieving revision 1.50
+retrieving revision 1.49.28.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.50 -r1.49.28.2
+--- sc/source/filter/xml/xmlsubti.cxx 10 Apr 2008 21:36:36 -0000 1.50
++++ sc/source/filter/xml/xmlsubti.cxx 6 May 2008 23:28:28 -0000 1.49.28.2
@@ -42,6 +42,7 @@
#include "docuno.hxx"
#include "cellsuno.hxx"
@@ -3686,7 +3882,7 @@
//------------------------------------------------------------------
using namespace com::sun::star;
-@@ -639,13 +644,10 @@ void ScMyTables::DeleteTable()
+@@ -639,13 +644,10 @@
{
uno::Sequence<sal_Int8> aPass;
SvXMLUnitConverter::decodeBase64(aPass, sPassword);
@@ -3704,10 +3900,14 @@
}
rImport.UnlockSolarMutex();
-diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
-index 8b9b366..a5801d9 100644
---- sc/source/ui/docshell/docfunc.cxx
-+++ sc/source/ui/docshell/docfunc.cxx
+Index: sc/source/ui/docshell/docfunc.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/docshell/docfunc.cxx,v
+retrieving revision 1.70
+retrieving revision 1.68.28.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.70 -r1.68.28.4
+--- sc/source/ui/docshell/docfunc.cxx 14 May 2008 09:56:37 -0000 1.70
++++ sc/source/ui/docshell/docfunc.cxx 23 May 2008 01:50:45 -0000 1.68.28.4
@@ -92,7 +92,12 @@
#include "editable.hxx"
#include "compiler.hxx"
@@ -3721,7 +3921,7 @@
// STATIC DATA -----------------------------------------------------------
-@@ -2601,103 +2606,152 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
+@@ -2601,103 +2606,152 @@
//------------------------------------------------------------------------
@@ -3940,10 +4140,14 @@
}
//------------------------------------------------------------------------
-diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index 8591efa..65f9b8b 100644
---- sc/source/ui/docshell/docsh.cxx
-+++ sc/source/ui/docshell/docsh.cxx
+Index: sc/source/ui/docshell/docsh.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/docshell/docsh.cxx,v
+retrieving revision 1.103
+retrieving revision 1.98.28.8
+diff -u -I $Revision.*$ -I $Author.*$ -r1.103 -r1.98.28.8
+--- sc/source/ui/docshell/docsh.cxx 8 Jul 2008 09:43:20 -0000 1.103
++++ sc/source/ui/docshell/docsh.cxx 13 Aug 2008 20:55:29 -0000 1.98.28.8
@@ -79,11 +79,6 @@
#include <sot/formats.hxx>
#define SOT_FORMATSTR_ID_STARCALC_30 SOT_FORMATSTR_ID_STARCALC
@@ -3972,7 +4176,7 @@
#include "docsh.hxx"
#include "docshimp.hxx"
-@@ -1496,6 +1491,14 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
+@@ -1496,6 +1491,14 @@
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::SaveAs" );
@@ -3987,7 +4191,7 @@
ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
// DoEnterHandler hier nicht (wegen AutoSave), ist im ExecuteSave
-@@ -1970,7 +1973,6 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
+@@ -1970,7 +1973,6 @@
rStream.SetNumberFormatInt( nOldNumberFormatInt );
}
@@ -3995,7 +4199,7 @@
BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertTo" );
-@@ -2023,6 +2025,14 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
+@@ -2023,6 +2025,14 @@
aDocument.SetExtDocOptions( pExtDocOpt = new ScExtDocOptions );
pViewShell->GetViewData()->WriteExtOptions( *pExtDocOpt );
@@ -4010,7 +4214,7 @@
/* #115980 #If the imported document contained an encrypted password -
determine if we should save without it. */
ScExtDocSettings& rDocSett = pExtDocOpt->GetDocSettings();
-@@ -2032,6 +2042,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
+@@ -2032,6 +2042,7 @@
// #i42858# warn only on time
rDocSett.mbEncrypted = false;
}
@@ -4018,11 +4222,15 @@
}
if( bDoSave )
-diff --git sc/source/ui/docshell/docsh5.cxx sc/source/ui/docshell/docsh5.cxx
-index 259b6bd..62c11ca 100644
---- sc/source/ui/docshell/docsh5.cxx
-+++ sc/source/ui/docshell/docsh5.cxx
-@@ -821,7 +821,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
+Index: sc/source/ui/docshell/docsh5.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/docshell/docsh5.cxx,v
+retrieving revision 1.21
+retrieving revision 1.19.28.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.21 -r1.19.28.3
+--- sc/source/ui/docshell/docsh5.cxx 11 Jul 2008 07:09:32 -0000 1.21
++++ sc/source/ui/docshell/docsh5.cxx 17 Jul 2008 01:00:14 -0000 1.19.28.3
+@@ -821,7 +821,7 @@
++nAdjSource; // new position of source table after CopyTab
if ( aDocument.IsTabProtected( nAdjSource ) )
@@ -4031,11 +4239,15 @@
if (bRecord)
{
-diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx
-index f95d833..00928c1 100644
---- sc/source/ui/inc/docfunc.hxx
-+++ sc/source/ui/inc/docfunc.hxx
-@@ -47,7 +47,7 @@ class ScRangeName;
+Index: sc/source/ui/inc/docfunc.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/docfunc.hxx,v
+retrieving revision 1.19
+retrieving revision 1.18.28.2
+diff -u -I $Revision.*$ -I $Author.*$ -r1.19 -r1.18.28.2
+--- sc/source/ui/inc/docfunc.hxx 14 May 2008 09:58:47 -0000 1.19
++++ sc/source/ui/inc/docfunc.hxx 23 May 2008 01:50:16 -0000 1.18.28.2
+@@ -47,7 +47,7 @@
class ScBaseCell;
class ScTokenArray;
struct ScTabOpParam;
@@ -4044,7 +4256,7 @@
// ---------------------------------------------------------------------------
-@@ -129,6 +129,8 @@ public:
+@@ -129,6 +129,8 @@
BOOL RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
BOOL bRecord, BOOL bSetModified, BOOL bApi );
@@ -4053,11 +4265,12 @@
BOOL Protect( SCTAB nTab, const String& rPassword, BOOL bApi );
BOOL Unprotect( SCTAB nTab, const String& rPassword, BOOL bApi );
-diff --git sc/source/ui/inc/protectiondlg.hrc sc/source/ui/inc/protectiondlg.hrc
-new file mode 100644
-index 0000000..2eed38b
---- /dev/null
-+++ sc/source/ui/inc/protectiondlg.hrc
+Index: sc/source/ui/inc/protectiondlg.hrc
+===================================================================
+RCS file: sc/source/ui/inc/protectiondlg.hrc
+diff -N sc/source/ui/inc/protectiondlg.hrc
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/inc/protectiondlg.hrc 7 May 2008 22:15:40 -0000 1.1.2.1
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
@@ -4106,11 +4319,12 @@
+
+#define ST_SELECT_LOCKED_CELLS 50
+#define ST_SELECT_UNLOCKED_CELLS 51
-diff --git sc/source/ui/inc/protectiondlg.hxx sc/source/ui/inc/protectiondlg.hxx
-new file mode 100644
-index 0000000..263931f
---- /dev/null
-+++ sc/source/ui/inc/protectiondlg.hxx
+Index: sc/source/ui/inc/protectiondlg.hxx
+===================================================================
+RCS file: sc/source/ui/inc/protectiondlg.hxx
+diff -N sc/source/ui/inc/protectiondlg.hxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/inc/protectiondlg.hxx 23 May 2008 00:05:23 -0000 1.1.2.4
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
@@ -4197,11 +4411,12 @@
+};
+
+#endif
-diff --git sc/source/ui/inc/retypepassdlg.hrc sc/source/ui/inc/retypepassdlg.hrc
-new file mode 100644
-index 0000000..da24d64
---- /dev/null
-+++ sc/source/ui/inc/retypepassdlg.hrc
+Index: sc/source/ui/inc/retypepassdlg.hrc
+===================================================================
+RCS file: sc/source/ui/inc/retypepassdlg.hrc
+diff -N sc/source/ui/inc/retypepassdlg.hrc
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/inc/retypepassdlg.hrc 20 May 2008 00:25:53 -0000 1.1.2.2
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
@@ -4277,11 +4492,12 @@
+#define BTN_MATCH_OLD_PASSWORD 305
+#define BTN_RETYPE_PASSWORD 306
+#define BTN_REMOVE_PASSWORD 307
-diff --git sc/source/ui/inc/retypepassdlg.hxx sc/source/ui/inc/retypepassdlg.hxx
-new file mode 100644
-index 0000000..4899d8f
---- /dev/null
-+++ sc/source/ui/inc/retypepassdlg.hxx
+Index: sc/source/ui/inc/retypepassdlg.hxx
+===================================================================
+RCS file: sc/source/ui/inc/retypepassdlg.hxx
+diff -N sc/source/ui/inc/retypepassdlg.hxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/inc/retypepassdlg.hxx 23 May 2008 00:09:48 -0000 1.1.2.7
@@ -0,0 +1,177 @@
+/*************************************************************************
+ *
@@ -4460,10 +4676,14 @@
+};
+
+#endif
-diff --git sc/source/ui/inc/tabvwsh.hxx sc/source/ui/inc/tabvwsh.hxx
-index da23875..e966fa6 100644
---- sc/source/ui/inc/tabvwsh.hxx
-+++ sc/source/ui/inc/tabvwsh.hxx
+Index: sc/source/ui/inc/tabvwsh.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/tabvwsh.hxx,v
+retrieving revision 1.31
+retrieving revision 1.30.30.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.31 -r1.30.30.3
+--- sc/source/ui/inc/tabvwsh.hxx 22 Jul 2008 14:44:01 -0000 1.31
++++ sc/source/ui/inc/tabvwsh.hxx 9 Aug 2008 21:48:36 -0000 1.30.30.3
@@ -38,6 +38,7 @@
#include "target.hxx"
#include "rangelst.hxx" // ScRangeListRef
@@ -4472,7 +4692,7 @@
class FmFormShell;
class SbxObject;
-@@ -431,6 +432,8 @@ public:
+@@ -431,6 +432,8 @@
void BroadcastAccessibility( const SfxHint &rHint );
BOOL HasAccessibilityObjects();
@@ -4481,10 +4701,14 @@
using ScTabView::ShowCursor;
};
-diff --git sc/source/ui/inc/undotab.hxx sc/source/ui/inc/undotab.hxx
-index 1a976fe..0ed95c4 100644
---- sc/source/ui/inc/undotab.hxx
-+++ sc/source/ui/inc/undotab.hxx
+Index: sc/source/ui/inc/undotab.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/undotab.hxx,v
+retrieving revision 1.12
+retrieving revision 1.9.424.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.12 -r1.9.424.4
+--- sc/source/ui/inc/undotab.hxx 11 Jul 2008 07:09:44 -0000 1.12
++++ sc/source/ui/inc/undotab.hxx 17 Jul 2008 00:59:51 -0000 1.9.424.4
@@ -52,11 +52,15 @@
#include <com/sun/star/uno/Sequence.hxx>
@@ -4501,7 +4725,7 @@
//----------------------------------------------------------------------------
-@@ -335,14 +339,15 @@ private:
+@@ -335,14 +339,15 @@
void DoChange( BOOL bShow ) const;
};
@@ -4522,7 +4746,7 @@
virtual void Undo();
virtual void Redo();
-@@ -352,11 +357,34 @@ public:
+@@ -352,11 +357,34 @@
virtual String GetComment() const;
private:
@@ -4561,11 +4785,15 @@
};
-diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
-index 097b353..57b92dc 100644
---- sc/source/ui/inc/viewfunc.hxx
-+++ sc/source/ui/inc/viewfunc.hxx
-@@ -69,6 +69,7 @@ class Exchange;
+Index: sc/source/ui/inc/viewfunc.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/viewfunc.hxx,v
+retrieving revision 1.34
+retrieving revision 1.34.30.1
+diff -u -I $Revision.*$ -I $Author.*$ -r1.34 -r1.34.30.1
+--- sc/source/ui/inc/viewfunc.hxx 10 Apr 2008 23:37:14 -0000 1.34
++++ sc/source/ui/inc/viewfunc.hxx 8 May 2008 21:53:47 -0000 1.34.30.1
+@@ -69,6 +69,7 @@
class ScRangeList;
class SvxHyperlinkItem;
class ScTransferObj;
@@ -4573,7 +4801,7 @@
namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } }
-@@ -199,6 +200,8 @@ public:
+@@ -199,6 +200,8 @@
void ChangeIndent( BOOL bIncrement );
@@ -4582,11 +4810,15 @@
void Protect( SCTAB nTab, const String& rPassword );
BOOL Unprotect( SCTAB nTab, const String& rPassword );
-diff --git sc/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
-index bb81bba..c24e83d 100644
---- sc/source/ui/miscdlgs/makefile.mk
-+++ sc/source/ui/miscdlgs/makefile.mk
-@@ -79,7 +79,9 @@ SLOFILES = \
+Index: sc/source/ui/miscdlgs/makefile.mk
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/miscdlgs/makefile.mk,v
+retrieving revision 1.14
+retrieving revision 1.13.30.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.14 -r1.13.30.3
+--- sc/source/ui/miscdlgs/makefile.mk 16 May 2008 10:09:52 -0000 1.14
++++ sc/source/ui/miscdlgs/makefile.mk 23 May 2008 01:50:39 -0000 1.13.30.3
+@@ -78,7 +78,9 @@
$(SLO)$/warnbox.obj \
$(SLO)$/scuiautofmt.obj \
$(SLO)$/conflictsdlg.obj \
@@ -4597,7 +4829,7 @@
EXCEPTIONSFILES = \
$(SLO)$/acredlin.obj \
-@@ -88,7 +90,9 @@ EXCEPTIONSFILES = \
+@@ -87,7 +89,9 @@
$(SLO)$/optsolver.obj \
$(SLO)$/solveroptions.obj \
$(SLO)$/crnrdlg.obj \
@@ -4608,7 +4840,7 @@
SRS1NAME=$(TARGET)
SRC1FILES = \
-@@ -97,7 +101,9 @@ SRC1FILES = \
+@@ -96,7 +100,9 @@
highred.src \
linkarea.src \
conflictsdlg.src \
@@ -4619,22 +4851,24 @@
LIB1TARGET = $(SLB)$/$(TARGET).lib
-@@ -119,7 +125,9 @@ LIB1OBJFILES = \
+@@ -116,7 +122,9 @@
$(SLO)$/conflictsdlg.obj \
- $(SLO)$/sharedocdlg.obj \
+ $(SLO)$/sharedocdlg.obj
+ $(SLO)$/sharedocdlg.obj \
$(SLO)$/scuiautofmt.obj \
- $(SLO)$/strindlg.obj
-+ $(SLO)$/strindlg.obj \
-+ $(SLO)$/protectiondlg.obj \
-+ $(SLO)$/retypepassdlg.obj
++ $(SLO)$/strindlg.obj \
++ $(SLO)$/protectiondlg.obj \
++ $(SLO)$/retypepassdlg.obj
# --- Tagets -------------------------------------------------------
-diff --git sc/source/ui/miscdlgs/protectiondlg.cxx sc/source/ui/miscdlgs/protectiondlg.cxx
-new file mode 100644
-index 0000000..ab77209
---- /dev/null
-+++ sc/source/ui/miscdlgs/protectiondlg.cxx
+Index: sc/source/ui/miscdlgs/protectiondlg.cxx
+===================================================================
+RCS file: sc/source/ui/miscdlgs/protectiondlg.cxx
+diff -N sc/source/ui/miscdlgs/protectiondlg.cxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/miscdlgs/protectiondlg.cxx 23 May 2008 17:39:36 -0000 1.1.2.6
@@ -0,0 +1,161 @@
+/*************************************************************************
+ *
@@ -4797,11 +5031,12 @@
+ maBtnOk.Enable(aPass1.Equals(aPass2));
+ return 0;
+}
-diff --git sc/source/ui/miscdlgs/protectiondlg.src sc/source/ui/miscdlgs/protectiondlg.src
-new file mode 100644
-index 0000000..14a1c85
---- /dev/null
-+++ sc/source/ui/miscdlgs/protectiondlg.src
+Index: sc/source/ui/miscdlgs/protectiondlg.src
+===================================================================
+RCS file: sc/source/ui/miscdlgs/protectiondlg.src
+diff -N sc/source/ui/miscdlgs/protectiondlg.src
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/miscdlgs/protectiondlg.src 23 May 2008 00:07:53 -0000 1.1.2.6
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
@@ -4933,11 +5168,12 @@
+ Text [ en-US ] = "Select unlocked cells";
+ };
+};
-diff --git sc/source/ui/miscdlgs/retypepassdlg.cxx sc/source/ui/miscdlgs/retypepassdlg.cxx
-new file mode 100644
-index 0000000..28b41b8
---- /dev/null
-+++ sc/source/ui/miscdlgs/retypepassdlg.cxx
+Index: sc/source/ui/miscdlgs/retypepassdlg.cxx
+===================================================================
+RCS file: sc/source/ui/miscdlgs/retypepassdlg.cxx
+diff -N sc/source/ui/miscdlgs/retypepassdlg.cxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/miscdlgs/retypepassdlg.cxx 23 May 2008 00:10:22 -0000 1.1.2.7
@@ -0,0 +1,544 @@
+/*************************************************************************
+ *
@@ -5483,11 +5719,12 @@
+ CheckPasswordInput();
+ return 0;
+}
-diff --git sc/source/ui/miscdlgs/retypepassdlg.src sc/source/ui/miscdlgs/retypepassdlg.src
-new file mode 100644
-index 0000000..4c45fbf
---- /dev/null
-+++ sc/source/ui/miscdlgs/retypepassdlg.src
+Index: sc/source/ui/miscdlgs/retypepassdlg.src
+===================================================================
+RCS file: sc/source/ui/miscdlgs/retypepassdlg.src
+diff -N sc/source/ui/miscdlgs/retypepassdlg.src
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/miscdlgs/retypepassdlg.src 23 May 2008 00:11:30 -0000 1.1.2.3
@@ -0,0 +1,316 @@
+/*************************************************************************
+ *
@@ -5805,10 +6042,14 @@
+};
+
+
-diff --git sc/source/ui/undo/undotab.cxx sc/source/ui/undo/undotab.cxx
-index ff50b1e..37210df 100644
---- sc/source/ui/undo/undotab.cxx
-+++ sc/source/ui/undo/undotab.cxx
+Index: sc/source/ui/undo/undotab.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/undo/undotab.cxx,v
+retrieving revision 1.21
+retrieving revision 1.18.56.5
+diff -u -I $Revision.*$ -I $Author.*$ -r1.21 -r1.18.56.5
+--- sc/source/ui/undo/undotab.cxx 11 Jul 2008 07:09:57 -0000 1.21
++++ sc/source/ui/undo/undotab.cxx 17 Jul 2008 00:59:55 -0000 1.18.56.5
@@ -61,6 +61,7 @@
#include "prnsave.hxx"
#include "printfun.hxx"
@@ -5826,7 +6067,7 @@
// STATIC DATA -----------------------------------------------------------
-@@ -85,7 +88,6 @@ TYPEINIT1(ScUndoMakeScenario, SfxUndoAction);
+@@ -85,7 +88,6 @@
TYPEINIT1(ScUndoImportTab, SfxUndoAction);
TYPEINIT1(ScUndoRemoveLink, SfxUndoAction);
TYPEINIT1(ScUndoShowHideTab, SfxUndoAction);
@@ -5834,7 +6075,7 @@
TYPEINIT1(ScUndoPrintRange, SfxUndoAction);
TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction);
TYPEINIT1(ScUndoRenameObject, SfxUndoAction);
-@@ -112,12 +114,12 @@ ScUndoInsertTab::ScUndoInsertTab( ScDocShell* pNewDocShell,
+@@ -112,12 +114,12 @@
SetChangeTrack();
}
@@ -5849,7 +6090,7 @@
{
if (bAppend)
return ScGlobal::GetRscString( STR_UNDO_APPEND_TAB );
-@@ -138,7 +140,7 @@ void ScUndoInsertTab::SetChangeTrack()
+@@ -138,7 +140,7 @@
nEndChangeAction = 0;
}
@@ -5858,7 +6099,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo(nTab);
-@@ -159,7 +161,7 @@ void __EXPORT ScUndoInsertTab::Undo()
+@@ -159,7 +161,7 @@
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -5867,7 +6108,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-@@ -180,14 +182,14 @@ void __EXPORT ScUndoInsertTab::Redo()
+@@ -180,14 +182,14 @@
SetChangeTrack();
}
@@ -5884,7 +6125,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -211,7 +213,7 @@ ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell,
+@@ -211,7 +213,7 @@
SetChangeTrack();
}
@@ -5893,7 +6134,7 @@
{
String *pStr=NULL;
if(pNameList!=NULL)
-@@ -227,7 +229,7 @@ __EXPORT ScUndoInsertTables::~ScUndoInsertTables()
+@@ -227,7 +229,7 @@
DeleteSdrUndoAction( pDrawUndo );
}
@@ -5902,7 +6143,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
}
-@@ -252,7 +254,7 @@ void ScUndoInsertTables::SetChangeTrack()
+@@ -252,7 +254,7 @@
nStartChangeAction = nEndChangeAction = 0;
}
@@ -5911,7 +6152,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo(nTab);
-@@ -282,7 +284,7 @@ void __EXPORT ScUndoInsertTables::Undo()
+@@ -282,7 +284,7 @@
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -5920,7 +6161,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-@@ -299,14 +301,14 @@ void __EXPORT ScUndoInsertTables::Redo()
+@@ -299,14 +301,14 @@
SetChangeTrack();
}
@@ -5937,7 +6178,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -327,12 +329,12 @@ ScUndoDeleteTab::ScUndoDeleteTab( ScDocShell* pNewDocShell,const SvShorts &aTab,
+@@ -327,12 +329,12 @@
SetChangeTrack();
}
@@ -5952,7 +6193,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_DELETE_TAB );
}
-@@ -366,7 +368,7 @@ SCTAB lcl_GetVisibleTabBefore( ScDocument& rDoc, SCTAB nTab )
+@@ -366,7 +368,7 @@
return nTab;
}
@@ -5961,7 +6202,7 @@
{
BeginUndo();
int i=0;
-@@ -414,7 +416,7 @@ void __EXPORT ScUndoDeleteTab::Undo()
+@@ -414,7 +416,7 @@
pDoc->SetVisible( nTab, pRefUndoDoc->IsVisible( nTab ) );
if ( pRefUndoDoc->IsTabProtected( nTab ) )
@@ -5970,7 +6211,7 @@
// Drawing-Layer passiert beim MoveUndo::EndUndo
// pDoc->TransferDrawPage(pRefUndoDoc, nTab,nTab);
-@@ -450,7 +452,7 @@ void __EXPORT ScUndoDeleteTab::Undo()
+@@ -450,7 +452,7 @@
// EndUndo();
}
@@ -5979,7 +6220,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDocShell->GetDocument(), theTabs[0] ) );
-@@ -469,7 +471,7 @@ void __EXPORT ScUndoDeleteTab::Redo()
+@@ -469,7 +471,7 @@
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -5988,7 +6229,7 @@
{
if (rTarget.ISA(ScTabViewTarget))
{
-@@ -478,7 +480,7 @@ void __EXPORT ScUndoDeleteTab::Repeat(SfxRepeatTarget& rTarget)
+@@ -478,7 +480,7 @@
}
}
@@ -5997,7 +6238,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -500,11 +502,11 @@ ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell,
+@@ -500,11 +502,11 @@
sNewName = rNewName;
}
@@ -6011,7 +6252,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_RENAME_TAB );
}
-@@ -526,22 +528,22 @@ void ScUndoRenameTab::DoChange( SCTAB nTabP, const String& rName ) const
+@@ -526,22 +528,22 @@
pViewShell->UpdateInputHandler();
}
@@ -6038,7 +6279,7 @@
{
return FALSE;
}
-@@ -565,13 +567,13 @@ ScUndoMoveTab::ScUndoMoveTab( ScDocShell* pNewDocShell,
+@@ -565,13 +567,13 @@
theNewTabs.Insert(aNewTab[sal::static_int_cast<USHORT>(i)],theNewTabs.Count());
}
@@ -6054,7 +6295,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_MOVE_TAB );
}
-@@ -618,22 +620,22 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
+@@ -618,22 +620,22 @@
pDocShell->PostDataChanged();
}
@@ -6081,7 +6322,7 @@
{
return FALSE;
}
-@@ -660,12 +662,12 @@ ScUndoCopyTab::ScUndoCopyTab( ScDocShell* pNewDocShell,
+@@ -660,12 +662,12 @@
theNewTabs.Insert(aNewTab[sal::static_int_cast<USHORT>(i)],theNewTabs.Count());
}
@@ -6096,7 +6337,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_COPY_TAB );
}
-@@ -684,7 +686,7 @@ void ScUndoCopyTab::DoChange() const
+@@ -684,7 +686,7 @@
pDocShell->PostDataChanged();
}
@@ -6105,7 +6346,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
-@@ -717,7 +719,7 @@ void __EXPORT ScUndoCopyTab::Undo()
+@@ -717,7 +719,7 @@
DoChange();
}
@@ -6114,7 +6355,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-@@ -756,7 +758,7 @@ void __EXPORT ScUndoCopyTab::Redo()
+@@ -756,7 +758,7 @@
}
if ( pDoc->IsTabProtected( nAdjSource ) )
@@ -6123,7 +6364,7 @@
}
RedoSdrUndoAction( pDrawUndo ); // after the sheets are inserted
-@@ -767,12 +769,12 @@ void __EXPORT ScUndoCopyTab::Redo()
+@@ -767,12 +769,12 @@
}
@@ -6138,7 +6379,7 @@
{
return FALSE;
}
-@@ -801,17 +803,17 @@ ScUndoMakeScenario::ScUndoMakeScenario( ScDocShell* pNewDocShell,
+@@ -801,17 +803,17 @@
pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() );
}
@@ -6159,7 +6400,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
-@@ -836,7 +838,7 @@ void __EXPORT ScUndoMakeScenario::Undo()
+@@ -836,7 +838,7 @@
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -6168,7 +6409,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
-@@ -858,7 +860,7 @@ void __EXPORT ScUndoMakeScenario::Redo()
+@@ -858,7 +860,7 @@
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
}
@@ -6177,7 +6418,7 @@
{
if (rTarget.ISA(ScTabViewTarget))
{
-@@ -866,7 +868,7 @@ void __EXPORT ScUndoMakeScenario::Repeat(SfxRepeatTarget& rTarget)
+@@ -866,7 +868,7 @@
}
}
@@ -6186,7 +6427,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -889,13 +891,13 @@ ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell,
+@@ -889,13 +891,13 @@
pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() );
}
@@ -6202,7 +6443,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
}
-@@ -922,7 +924,7 @@ void ScUndoImportTab::DoChange() const
+@@ -922,7 +924,7 @@
PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS );
}
@@ -6211,7 +6452,7 @@
{
//! eingefuegte Bereichsnamen etc.
-@@ -958,7 +960,7 @@ void __EXPORT ScUndoImportTab::Undo()
+@@ -958,7 +960,7 @@
}
if ( pDoc->IsTabProtected( nTabPos ) )
@@ -6220,7 +6461,7 @@
}
}
-@@ -973,7 +975,7 @@ void __EXPORT ScUndoImportTab::Undo()
+@@ -973,7 +975,7 @@
DoChange();
}
@@ -6229,7 +6470,7 @@
{
if (!pRedoDoc)
{
-@@ -1012,7 +1014,7 @@ void __EXPORT ScUndoImportTab::Redo()
+@@ -1012,7 +1014,7 @@
}
if ( pRedoDoc->IsTabProtected( nTabPos ) )
@@ -6238,7 +6479,7 @@
}
RedoSdrUndoAction( pDrawUndo ); // after the sheets are inserted
-@@ -1020,14 +1022,14 @@ void __EXPORT ScUndoImportTab::Redo()
+@@ -1020,14 +1022,14 @@
DoChange();
}
@@ -6255,7 +6496,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -1075,14 +1077,14 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
+@@ -1075,14 +1077,14 @@
}
}
@@ -6272,7 +6513,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_REMOVELINK );
}
-@@ -1099,22 +1101,22 @@ void ScUndoRemoveLink::DoChange( BOOL bLink ) const
+@@ -1099,22 +1101,22 @@
pDocShell->UpdateLinks();
}
@@ -6299,7 +6540,7 @@
{
return FALSE;
}
-@@ -1132,7 +1134,7 @@ ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, BOOL bN
+@@ -1132,7 +1134,7 @@
{
}
@@ -6308,7 +6549,7 @@
{
}
-@@ -1149,17 +1151,17 @@ void ScUndoShowHideTab::DoChange( BOOL bShowP ) const
+@@ -1149,17 +1151,17 @@
pDocShell->SetDocumentModified();
}
@@ -6329,7 +6570,7 @@
{
if (rTarget.ISA(ScTabViewTarget))
((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData()->GetDispatcher().
-@@ -1167,53 +1169,44 @@ void __EXPORT ScUndoShowHideTab::Repeat(SfxRepeatTarget& rTarget)
+@@ -1167,53 +1169,44 @@
SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
}
@@ -6398,7 +6639,7 @@
}
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-@@ -1226,37 +1219,103 @@ void ScUndoProtect::DoProtect( BOOL bDo )
+@@ -1226,37 +1219,103 @@
pDocShell->PostPaintGridAll();
}
@@ -6513,7 +6754,7 @@
return ScGlobal::GetRscString( nId );
}
-@@ -1274,7 +1333,7 @@ ScUndoPrintRange::ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
+@@ -1274,7 +1333,7 @@
{
}
@@ -6522,7 +6763,7 @@
{
delete pOldRanges;
delete pNewRanges;
-@@ -1297,31 +1356,31 @@ void ScUndoPrintRange::DoChange(BOOL bUndo)
+@@ -1297,31 +1356,31 @@
pDocShell->PostPaint( ScRange(0,0,nTab,MAXCOL,MAXROW,nTab), PAINT_GRID );
}
@@ -6559,7 +6800,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_PRINTRANGES );
}
-@@ -1350,16 +1409,16 @@ ScUndoScenarioFlags::ScUndoScenarioFlags( ScDocShell* pNewDocShell, SCTAB nT,
+@@ -1350,16 +1409,16 @@
{
}
@@ -6579,7 +6820,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
-@@ -1376,7 +1435,7 @@ void __EXPORT ScUndoScenarioFlags::Undo()
+@@ -1376,7 +1435,7 @@
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
}
@@ -6588,7 +6829,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
-@@ -1393,12 +1452,12 @@ void __EXPORT ScUndoScenarioFlags::Redo()
+@@ -1393,12 +1452,12 @@
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
}
@@ -6603,7 +6844,7 @@
{
return FALSE;
}
-@@ -1498,7 +1557,7 @@ ScUndoLayoutRTL::ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRT
+@@ -1498,7 +1557,7 @@
{
}
@@ -6612,7 +6853,7 @@
{
}
-@@ -1518,29 +1577,29 @@ void ScUndoLayoutRTL::DoChange( BOOL bNew )
+@@ -1518,29 +1577,29 @@
pDocShell->SetInUndo( FALSE );
}
@@ -6647,7 +6888,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_TAB_RTL );
}
-@@ -1560,7 +1619,7 @@ ScUndoSetGrammar::ScUndoSetGrammar( ScDocShell* pShell,
+@@ -1560,7 +1619,7 @@
meOldGrammar = pDocShell->GetDocument()->GetGrammar();
}
@@ -6656,7 +6897,7 @@
{
}
-@@ -1573,17 +1632,17 @@ void ScUndoSetGrammar::DoChange( ScGrammar::Grammar eGrammar )
+@@ -1573,17 +1632,17 @@
pDocShell->SetInUndo( FALSE );
}
@@ -6677,7 +6918,7 @@
{
#if 0
// erAck: 2006-09-07T23:00+0200 commented out in CWS scr1c1
-@@ -1593,12 +1652,12 @@ void __EXPORT ScUndoSetGrammar::Repeat(SfxRepeatTarget& /* rTarget */)
+@@ -1593,12 +1652,12 @@
#endif
}
@@ -6692,10 +6933,14 @@
{
return ScGlobal::GetRscString( STR_UNDO_TAB_R1C1 );
}
-diff --git sc/source/ui/unoobj/warnpassword.cxx sc/source/ui/unoobj/warnpassword.cxx
-index 78f355d..659e372 100644
---- sc/source/ui/unoobj/warnpassword.cxx
-+++ sc/source/ui/unoobj/warnpassword.cxx
+Index: sc/source/ui/unoobj/warnpassword.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/unoobj/warnpassword.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.30.1
+diff -u -I $Revision.*$ -I $Author.*$ -r1.5 -r1.5.30.1
+--- sc/source/ui/unoobj/warnpassword.cxx 11 Apr 2008 00:46:26 -0000 1.5
++++ sc/source/ui/unoobj/warnpassword.cxx 22 May 2008 21:47:22 -0000 1.5.30.1
@@ -32,6 +32,9 @@
#include "precompiled_sc.hxx"
@@ -6706,17 +6951,21 @@
#include "warnpassword.hxx"
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
-@@ -95,3 +98,5 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium )
+@@ -95,3 +98,5 @@
}
return bReturn;
}
+
+#endif
-diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index cb57c92..b44c164 100644
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -140,6 +140,7 @@
+Index: sc/source/ui/view/gridwin.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/gridwin.cxx,v
+retrieving revision 1.96
+retrieving revision 1.92.26.5
+diff -u -I $Revision.*$ -I $Author.*$ -r1.96 -r1.92.26.5
+--- sc/source/ui/view/gridwin.cxx 1 Jul 2008 16:27:56 -0000 1.96
++++ sc/source/ui/view/gridwin.cxx 17 Jul 2008 01:00:06 -0000 1.92.26.5
+@@ -139,6 +139,7 @@
#include "drwlayer.hxx"
#include "attrib.hxx"
#include "cellsh.hxx"
@@ -6724,7 +6973,7 @@
// #114409#
#include <vcl/salbtype.hxx> // FRound
-@@ -2033,8 +2034,9 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
+@@ -2014,8 +2015,9 @@
Point aPos = rMEvt.GetPosPixel();
SCsCOL nPosX;
SCsROW nPosY;
@@ -6735,7 +6984,7 @@
if ( pDPObj && pDPObj->GetSaveData()->GetDrillDown() )
{
ScAddress aCellPos( nPosX, nPosY, pViewData->GetTabNo() );
-@@ -2076,19 +2078,37 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
+@@ -2057,19 +2059,37 @@
return;
}
@@ -6785,11 +7034,15 @@
//
// Links in edit cells
-diff --git sc/source/ui/view/scextopt.cxx sc/source/ui/view/scextopt.cxx
-index 8ac6382..586f934 100644
---- sc/source/ui/view/scextopt.cxx
-+++ sc/source/ui/view/scextopt.cxx
-@@ -42,9 +42,7 @@ ScExtDocSettings::ScExtDocSettings() :
+Index: sc/source/ui/view/scextopt.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/scextopt.cxx,v
+retrieving revision 1.5
+retrieving revision 1.4.486.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.5 -r1.4.486.3
+--- sc/source/ui/view/scextopt.cxx 11 Apr 2008 01:37:36 -0000 1.5
++++ sc/source/ui/view/scextopt.cxx 22 May 2008 21:44:08 -0000 1.4.486.3
+@@ -42,9 +42,7 @@
maOleSize( ScAddress::INITIALIZE_INVALID ),
mfTabBarWidth( -1.0 ),
mnLinkCnt( 0 ),
@@ -6800,10 +7053,14 @@
{
}
-diff --git sc/source/ui/view/select.cxx sc/source/ui/view/select.cxx
-index f6d5704..fdc4fc5 100644
---- sc/source/ui/view/select.cxx
-+++ sc/source/ui/view/select.cxx
+Index: sc/source/ui/view/select.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/select.cxx,v
+retrieving revision 1.20
+retrieving revision 1.18.324.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.20 -r1.18.324.3
+--- sc/source/ui/view/select.cxx 22 Jul 2008 14:44:44 -0000 1.20
++++ sc/source/ui/view/select.cxx 9 Aug 2008 21:48:44 -0000 1.18.324.3
@@ -47,6 +47,7 @@
//#include "dataobj.hxx"
#include "transobj.hxx"
@@ -6812,7 +7069,7 @@
extern USHORT nScFillModeMouseModifier; // global.cxx
-@@ -322,6 +323,26 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
+@@ -322,6 +323,26 @@
{
ScTabView* pView = pViewData->GetView();
SCTAB nTab = pViewData->GetTabNo();
@@ -6839,7 +7096,7 @@
ScModule* pScMod = SC_MOD();
ScTabViewShell* pViewShell = pViewData->GetViewShell();
bool bRefMode = ( pViewShell ? pViewShell->IsRefInputMode() : false );
-@@ -375,7 +396,6 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
+@@ -375,7 +396,6 @@
ScRange aDelRange;
BOOL bOldDelMark = pViewData->GetDelMark( aDelRange );
@@ -6847,7 +7104,7 @@
if ( nPosX+1 >= (SCsCOL) nStartX && nPosX <= (SCsCOL) nEndX &&
nPosY+1 >= (SCsROW) nStartY && nPosY <= (SCsROW) nEndY &&
-@@ -511,7 +531,6 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
+@@ -511,7 +531,6 @@
BYTE nMode = pViewData->GetFillMode();
if ( nMode == SC_FILL_EMBED_LT || nMode == SC_FILL_EMBED_RB )
{
@@ -6855,10 +7112,14 @@
DBG_ASSERT( pDoc->IsEmbedded(), "!pDoc->IsEmbedded()" );
ScRange aRange;
pDoc->GetEmbedded( aRange);
-diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
-index f36d6ee..3830de6 100644
---- sc/source/ui/view/tabview3.cxx
-+++ sc/source/ui/view/tabview3.cxx
+Index: sc/source/ui/view/tabview3.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/tabview3.cxx,v
+retrieving revision 1.69
+retrieving revision 1.65.56.4
+diff -u -I $Revision.*$ -I $Author.*$ -r1.69 -r1.65.56.4
+--- sc/source/ui/view/tabview3.cxx 22 Jul 2008 14:44:57 -0000 1.69
++++ sc/source/ui/view/tabview3.cxx 9 Aug 2008 21:48:41 -0000 1.65.56.4
@@ -79,6 +79,7 @@
#include "AccessibilityHints.hxx"
#include "rangeutl.hxx"
@@ -6867,7 +7128,7 @@
#include <com/sun/star/chart2/data/HighlightedRange.hpp>
-@@ -1023,6 +1024,17 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+@@ -1023,6 +1024,17 @@
ScDocument* pDoc = aViewData.GetDocument();
SCTAB nTab = aViewData.GetTabNo();
@@ -6885,7 +7146,7 @@
SCsCOL nOldX;
SCsROW nOldY;
SCsCOL nCurX;
-@@ -1042,7 +1054,7 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+@@ -1042,7 +1054,7 @@
nCurY = (nMovY != 0) ? nOldY+nMovY : (SCsROW) aViewData.GetOldCurY();
}
@@ -6894,7 +7155,7 @@
aViewData.ResetOldCursor();
if (nMovX != 0 && VALIDCOLROW(nCurX,nCurY))
-@@ -1051,15 +1063,20 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+@@ -1051,15 +1063,20 @@
do
{
BYTE nColFlags = pDoc->GetColFlags( nCurX, nTab );
@@ -6918,7 +7179,7 @@
}
else
{
-@@ -1072,7 +1089,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+@@ -1072,7 +1089,8 @@
if (nMovX > 0) ++nCurX; else --nCurX;
}
}
@@ -6928,7 +7189,7 @@
if (pDoc->IsVerOverlapped( nCurX, nCurY, nTab ))
{
aViewData.SetOldCursor( nCurX,nCurY );
-@@ -1087,15 +1105,20 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+@@ -1087,15 +1105,20 @@
do
{
BYTE nRowFlags = pDoc->GetRowFlags( nCurY, nTab );
@@ -6952,7 +7213,7 @@
}
else
{
-@@ -1108,7 +1131,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+@@ -1108,7 +1131,8 @@
if (nMovY > 0) ++nCurY; else --nCurY;
}
}
@@ -6962,10 +7223,14 @@
if (pDoc->IsHorOverlapped( nCurX, nCurY, nTab ))
{
aViewData.SetOldCursor( nCurX,nCurY );
-diff --git sc/source/ui/view/tabvwsh3.cxx sc/source/ui/view/tabvwsh3.cxx
-index acfbb36..1f0743f 100644
---- sc/source/ui/view/tabvwsh3.cxx
-+++ sc/source/ui/view/tabvwsh3.cxx
+Index: sc/source/ui/view/tabvwsh3.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/tabvwsh3.cxx,v
+retrieving revision 1.40
+retrieving revision 1.38.80.5
+diff -u -I $Revision.*$ -I $Author.*$ -r1.40 -r1.38.80.5
+--- sc/source/ui/view/tabvwsh3.cxx 14 May 2008 10:05:09 -0000 1.40
++++ sc/source/ui/view/tabvwsh3.cxx 31 May 2008 01:31:54 -0000 1.38.80.5
@@ -75,6 +75,8 @@
#include "autofmt.hxx"
#include "dwfunctr.hxx"
@@ -6986,7 +7251,7 @@
#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
#define IS_AVAILABLE(WhichId,ppItem) \
(pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
-@@ -972,12 +978,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
+@@ -972,12 +978,13 @@
}
}
@@ -7002,7 +7267,7 @@
{
String aText( ScResId(SCSTR_PASSWORD) );
-@@ -1027,89 +1034,84 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
+@@ -1027,89 +1034,84 @@
case FID_PROTECT_TABLE:
@@ -7025,10 +7290,6 @@
- if( IS_AVAILABLE( FID_PROTECT_TABLE, &pItem ) )
- bNewProtection = ((const SfxBoolItem*)pItem)->GetValue();
- if( bNewProtection == bOldProtection )
-- {
-- rReq.Ignore();
-- break;
-- }
+ if( pReqArgs )
+ {
+ const SfxPoolItem* pItem;
@@ -7039,14 +7300,13 @@
+ {
+ rReq.Ignore();
+ break;
- }
++ }
+ }
+
+ if (bOldProtection)
+ {
+ // Unprotect a protected sheet.
-
-- if ( bOldProtection)
++
+ ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
+ if (pProtect && pProtect->isProtectedWithPass())
+ {
@@ -7059,6 +7319,18 @@
+
+ if (pDlg->Execute() == RET_OK)
{
+- rReq.Ignore();
+- break;
++ String aPassword = pDlg->GetPassword();
++ Unprotect(nTab, aPassword);
+ }
+ }
++ else
++ // this sheet is not password-protected.
++ Unprotect(nTab, String());
+
+- if ( bOldProtection)
+- {
- if (pDoc->GetTabPassword(nTab).getLength())
- {
- String aText( ScResId(SCSTR_PASSWORD) );
@@ -7073,20 +7345,6 @@
- aPassword = pDlg->GetPassword();
- else
- bCancel = TRUE;
--
-- delete pDlg;
-- }
-+ String aPassword = pDlg->GetPassword();
-+ Unprotect(nTab, aPassword);
- }
-- else
-- {
-- String aText( ScResId(SCSTR_PASSWORDOPT) );
-+ }
-+ else
-+ // this sheet is not password-protected.
-+ Unprotect(nTab, String());
-+
+ if (!pReqArgs)
+ {
+ rReq.AppendItem( SfxBoolItem(FID_PROTECT_TABLE, false) );
@@ -7097,14 +7355,21 @@
+ {
+ // Protect a current sheet.
+- delete pDlg;
+- }
+- }
+- else
+- {
+- String aText( ScResId(SCSTR_PASSWORDOPT) );
++ auto_ptr<ScTableProtectionDlg> pDlg(new ScTableProtectionDlg(GetDialogParent()));
+
- pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
- pDlg->SetText( ScResId(SCSTR_PROTECTTAB) );
- pDlg->SetMinLen( 0 );
- pDlg->SetHelpId( FID_PROTECT_TABLE );
- pDlg->SetEditHelpId( HID_PASSWD_TABLE );
- pDlg->ShowExtras( SHOWEXTRAS_CONFIRM );
-+ auto_ptr<ScTableProtectionDlg> pDlg(new ScTableProtectionDlg(GetDialogParent()));
-
+-
- if (pDlg->Execute() == RET_OK)
- aPassword = pDlg->GetPassword();
- else
@@ -7158,10 +7423,14 @@
case SID_OPT_LOCALE_CHANGED :
{ // locale changed, SYSTEM number formats changed => repaint cell contents
-diff --git sc/source/ui/view/tabvwshh.cxx sc/source/ui/view/tabvwshh.cxx
-index fb9408b..52c8fc4 100644
---- sc/source/ui/view/tabvwshh.cxx
-+++ sc/source/ui/view/tabvwshh.cxx
+Index: sc/source/ui/view/tabvwshh.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/tabvwshh.cxx,v
+retrieving revision 1.16
+retrieving revision 1.16.30.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.16 -r1.16.30.3
+--- sc/source/ui/view/tabvwshh.cxx 11 Apr 2008 01:45:43 -0000 1.16
++++ sc/source/ui/view/tabvwshh.cxx 21 May 2008 04:37:42 -0000 1.16.30.3
@@ -43,6 +43,7 @@
#include <sfx2/request.hxx>
#include <basic/sbxcore.hxx>
@@ -7181,7 +7450,7 @@
using namespace com::sun::star;
-@@ -270,6 +275,22 @@ BOOL ScTabViewShell::HasAccessibilityObjects()
+@@ -270,6 +275,22 @@
return pAccessibilityBroadcaster != NULL;
}
@@ -7204,11 +7473,15 @@
-diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx
-index 9a216b4..1970245 100644
---- sc/source/ui/view/viewfun2.cxx
-+++ sc/source/ui/view/viewfun2.cxx
-@@ -2150,7 +2150,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
+Index: sc/source/ui/view/viewfun2.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/viewfun2.cxx,v
+retrieving revision 1.41
+retrieving revision 1.38.28.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.41 -r1.38.28.3
+--- sc/source/ui/view/viewfun2.cxx 14 May 2008 10:05:47 -0000 1.41
++++ sc/source/ui/view/viewfun2.cxx 23 May 2008 01:50:28 -0000 1.38.28.3
+@@ -2150,7 +2150,7 @@
pUndoDoc->SetVisible( nTab, pDoc->IsVisible( nTab ) );
if ( pDoc->IsTabProtected( nTab ) )
@@ -7217,7 +7490,7 @@
// Drawing-Layer muss sein Undo selbst in der Hand behalten !!!
// pUndoDoc->TransferDrawPage(pDoc, nTab,nTab);
-@@ -2565,7 +2565,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
+@@ -2565,7 +2565,7 @@
}
if ( nErrVal > 0 && pDoc->IsTabProtected( TheTabs[i] ) )
@@ -7226,11 +7499,15 @@
nDestTab1++;
}
-diff --git sc/source/ui/view/viewfunc.cxx sc/source/ui/view/viewfunc.cxx
-index f49b6cd..46a9b7c 100644
---- sc/source/ui/view/viewfunc.cxx
-+++ sc/source/ui/view/viewfunc.cxx
-@@ -2400,6 +2400,36 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
+Index: sc/source/ui/view/viewfunc.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/viewfunc.cxx,v
+retrieving revision 1.46
+retrieving revision 1.44.20.3
+diff -u -I $Revision.*$ -I $Author.*$ -r1.46 -r1.44.20.3
+--- sc/source/ui/view/viewfunc.cxx 22 Jul 2008 14:45:24 -0000 1.46
++++ sc/source/ui/view/viewfunc.cxx 9 Aug 2008 21:48:49 -0000 1.44.20.3
+@@ -2394,6 +2394,36 @@
ShowAllCursors();
}
Modified: trunk/patches/vba/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events.diff (original)
+++ trunk/patches/vba/vba-workbook-worksheet-events.diff Thu Aug 14 18:57:55 2008
@@ -1467,9 +1467,9 @@
--- /home/feng/work/ooo-build/build/dev300-m14/sc/source/core/data/documen2.cxx 2008-06-16 21:30:17.000000000 +0800
+++ sc/source/core/data/documen2.cxx 2008-06-16 14:35:26.000000000 +0800
@@ -93,6 +93,7 @@
- #include "listenercalls.hxx"
#include "recursionhelper.hxx"
#include "lookupcache.hxx"
+ #include "tabprotection.hxx"
+#include <com/sun/star/document/XVbaEventsHelper.hpp>
// pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
