ooo-build r12730 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12730 - in trunk: . patches/dev300
- Date: Fri, 30 May 2008 18:45:29 +0000 (UTC)
Author: kyoshida
Date: Fri May 30 18:45:29 2008
New Revision: 12730
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12730&view=rev
Log:
2008-05-30 Kohei Yoshida <kyoshida novell com>
* patches/dev300/sc-hrc-ooo-build-resources.diff: added to consolidate
all ooo-build only resource IDs into its own section (to make it easier
to manage against upstream changes).
* patches/dev300/sc-dataform.diff:
* patches/dev300/sc-dataform-officecfg.diff: split into two separate
patches by module, and moved the new resource IDs into ooo-build only
section.
* patches/dev300/sc-datapilot-autoformat.diff: moved the new resource
ID into ooo-build only section.
* patches/dev300/cws-scsheetprotection02-sc.diff:
* patches/dev300/apply: added two new patches & re-enabled the sheet
and document protection & export encryption patches once again.
Added:
trunk/patches/dev300/sc-dataform-officecfg.diff
trunk/patches/dev300/sc-hrc-ooo-build-resources.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/cws-scsheetprotection02-sc.diff
trunk/patches/dev300/sc-dataform.diff
trunk/patches/dev300/sc-datapilot-autoformat.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Fri May 30 18:45:29 2008
@@ -9,7 +9,7 @@
OLDEST_SUPPORTED=dev300-m14
# -------- Functional sub-sets --------
-Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
+Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
Fixes, DefaultSettings, Features, VCL, Misc, \
Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, \
@@ -136,6 +136,12 @@
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
# -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
+[ PreprocessPatches ]
+# Collection of patches that must be applied before all the other patches.
+
+# Create a safe hash number interval for ooo-build only resources.
+sc-hrc-ooo-build-resources.diff, kohei
+
[ LinuxOnly ]
# Don't stat tons of config files we don't need to read on startup
@@ -188,6 +194,7 @@
#realize a new feature named as Show Data Form in OpenOffice
sc-dataform.diff, Amelia Wang
+sc-dataform-officecfg.diff, kohei
#realize extra piece of new feature named as Show Data Form about vba
sc-dataform-suppor-vba.diff, Amelia Wang
@@ -650,8 +657,7 @@
# keybindings: <ctrl> +/â to insert/delete a complete line in calc (X#62530)
calc-new-acceleration.diff, i#67029, michael
-# sc-dp-gridlayout.diff, i#68544 n#190970, jody
-sc-dp-gridlayout.diff, i#68544, n#190970, jody
+sc-dp-gridlayout.diff, i#68544 n#190970, jody
# Excel compatibility for handling of "string numbers".
sc-string-arg.diff, i#5658, kohei
@@ -706,9 +712,9 @@
# load, store and save the sheet protection options from and to an Excel file,
# and use that information to constrain cell cursor movement when the sheet is
# protected.
-#FIXME dev300-m14: cws-scsheetprotection02-sc.diff, i#60305, i#71468, i#84766, kohei
-#FIXME dev300-m14: cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
-#FIXME dev300-m14: cws-scsheetprotection02-svx.diff, i#60305, i#71468, i#84766, kohei
+cws-scsheetprotection02-sc.diff, i#60305, i#71468, i#84766, kohei
+cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
+cws-scsheetprotection02-svx.diff, i#60305, i#71468, i#84766, kohei
# Ensure that Print Preview is consistent with Print output.
sc-print-selected-sheets.diff, n#335684, i#45497, jonp
Modified: trunk/patches/dev300/cws-scsheetprotection02-sc.diff
==============================================================================
--- trunk/patches/dev300/cws-scsheetprotection02-sc.diff (original)
+++ trunk/patches/dev300/cws-scsheetprotection02-sc.diff Fri May 30 18:45:29 2008
@@ -1,13 +1,8 @@
-? sc/sc.vpj
-Index: sc/inc/document.hxx
-===================================================================
-RCS file: /cvs/sc/sc/inc/document.hxx,v
-retrieving revision 1.112
-retrieving revision 1.109.28.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.112 -r1.109.28.3
---- sc/inc/document.hxx 14 May 2008 09:49:46 -0000 1.112
-+++ sc/inc/document.hxx 23 May 2008 01:50:10 -0000 1.109.28.3
-@@ -88,6 +88,7 @@
+diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
+index e25da9d..220f0d9 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -88,6 +88,7 @@ class ScDBData;
class ScDetOpData;
class ScDetOpList;
class ScDocOptions;
@@ -15,7 +10,7 @@
class ScDocumentPool;
class ScDrawLayer;
class ScExtDocOptions;
-@@ -103,6 +104,7 @@
+@@ -103,6 +104,7 @@ class ScRangeName;
class ScStyleSheet;
class ScStyleSheetPool;
class ScTable;
@@ -23,16 +18,16 @@
class ScTokenArray;
class ScValidationData;
class ScValidationDataList;
-@@ -275,7 +277,7 @@
+@@ -276,7 +278,7 @@ private:
ScFieldEditEngine* pCacheFieldEditEngine;
- com::sun::star::uno::Sequence<sal_Int8> aProtectPass;
+ ::std::auto_ptr<ScDocProtection> pDocProtection;
String aDocName; // opt: Dokumentname
+ String aDocCodeName; // opt: Dokumentname
ScRangePairListRef xColNameRanges;
- ScRangePairListRef xRowNameRanges;
-@@ -339,7 +341,6 @@
+@@ -343,7 +345,6 @@ private:
ScLkUpdMode eLinkMode;
@@ -40,7 +35,7 @@
BOOL bAutoCalc; // Automatisch Berechnen
BOOL bAutoCalcShellDisabled; // in/von/fuer ScDocShell disabled
// ob noch ForcedFormulas berechnet werden muessen,
-@@ -518,13 +519,16 @@
+@@ -528,13 +529,16 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
inline SCTAB GetTableCount() const { return nMaxTableNumber; }
SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }
@@ -61,7 +56,7 @@
void LockTable(SCTAB nTab);
void UnlockTable(SCTAB nTab);
-@@ -1484,6 +1488,8 @@
+@@ -1505,6 +1509,8 @@ SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
private:
@@ -70,37 +65,27 @@
void SetAutoFilterFlags();
void FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount,
SCCOL nX1, SCCOL nX2 ) const;
-Index: sc/inc/sc.hrc
-===================================================================
-RCS file: /cvs/sc/sc/inc/sc.hrc,v
-retrieving revision 1.62
-retrieving revision 1.62.30.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.62 -r1.62.30.3
---- sc/inc/sc.hrc 10 Apr 2008 18:49:17 -0000 1.62
-+++ sc/inc/sc.hrc 20 May 2008 00:25:46 -0000 1.62.30.3
-@@ -1622,7 +1622,12 @@
- #define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145)
- #define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146)
-
--#define SC_DIALOGS_END (SC_DIALOGS_START + 150)
-+#define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 147)
-+#define RID_SCDLG_DOCPROTECTION (SC_DIALOGS_START + 148)
-+#define RID_SCDLG_RETYPEPASS (SC_DIALOGS_START + 149)
-+#define RID_SCDLG_RETYPEPASS_INPUT (SC_DIALOGS_START + 150)
-+
-+#define SC_DIALOGS_END (SC_DIALOGS_START + 151)
-
- #ifndef STD_MASKCOLOR
- #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
-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 -b -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 @@
+diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
+index ae82233..17cf7b0 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1649,6 +1649,11 @@
+ // Autoformat for DataPilot
+ #define SID_PIVOT_AFMT (SC_OOO_BUILD_START + 4)
+
++// Sheet and document protection with password
++#define RID_SCDLG_TABPROTECTION (SC_OOO_BUILD_START + 5)
++#define RID_SCDLG_DOCPROTECTION (SC_OOO_BUILD_START + 6)
++#define RID_SCDLG_RETYPEPASS (SC_OOO_BUILD_START + 7)
++#define RID_SCDLG_RETYPEPASS_INPUT (SC_OOO_BUILD_START + 8)
+
+
+ #endif
+diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
+index 273d108..3464fbb 100644
+--- sc/inc/scextopt.hxx
++++ sc/inc/scextopt.hxx
+@@ -46,8 +46,6 @@ struct ScExtDocSettings
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.
@@ -109,14 +94,10 @@
explicit ScExtDocSettings();
};
-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 -b -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
+diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
+index 1050532..570bdd3 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
@@ -39,6 +39,8 @@
#include "sortparam.hxx"
#include "compressedarray.hxx"
@@ -126,7 +107,7 @@
namespace utl {
class SearchParam;
class TextSearch;
-@@ -65,6 +67,7 @@
+@@ -66,6 +68,7 @@ class ScRangeList;
class ScSortInfoArray;
class ScStyleSheet;
class ScTableLink;
@@ -134,7 +115,7 @@
class ScUserListData;
class ScIndexMap;
struct RowInfo;
-@@ -102,8 +105,7 @@
+@@ -104,8 +107,7 @@ private:
SCROW nRepeatStartY;
SCROW nRepeatEndY;
@@ -144,7 +125,7 @@
USHORT* pColWidth;
ScSummableCompressedArray< SCROW, USHORT>* pRowHeight;
-@@ -218,10 +220,11 @@
+@@ -223,10 +225,11 @@ public:
void SetPageStyle( const String& rName );
void PageStyleModified( const String& rNewName );
@@ -160,12 +141,11 @@
Size GetPageSize() const;
void SetPageSize( const Size& rSize );
-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 20 May 2008 05:17:39 -0000 1.1.4.4
+diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
+new file mode 100644
+index 0000000..135a792
+--- /dev/null
++++ sc/inc/tabprotection.hxx
@@ -0,0 +1,166 @@
+/*************************************************************************
+ *
@@ -333,14 +313,10 @@
+
+
+#endif
-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 -b -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
+diff --git a/sc/inc/warnpassword.hxx b/sc/inc/warnpassword.hxx
+index fbb405f..f7e3595 100644
+--- sc/inc/warnpassword.hxx
++++ sc/inc/warnpassword.hxx
@@ -31,7 +31,7 @@
#ifndef SC_WARNPASSWORD_HXX
#define SC_WARNPASSWORD_HXX
@@ -350,7 +326,7 @@
class SfxMedium;
/** Static API helper functions. */
-@@ -46,6 +46,7 @@
+@@ -46,6 +46,7 @@ public:
static bool WarningOnPassword( SfxMedium& rMedium );
};
@@ -358,15 +334,11 @@
#endif
-Index: sc/source/core/data/documen2.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/core/data/documen2.cxx,v
-retrieving revision 1.73
-retrieving revision 1.71.28.4
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.73 -r1.71.28.4
---- sc/source/core/data/documen2.cxx 14 May 2008 09:50:52 -0000 1.73
-+++ sc/source/core/data/documen2.cxx 23 May 2008 01:50:49 -0000 1.71.28.4
-@@ -138,6 +138,7 @@
+diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
+index eef69a1..ed3c552 100644
+--- sc/source/core/data/documen2.cxx
++++ sc/source/core/data/documen2.cxx
+@@ -139,6 +139,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
pChangeViewSettings( NULL ),
pScriptTypeData( NULL ),
pCacheFieldEditEngine( NULL ),
@@ -374,7 +346,7 @@
pViewOptions( NULL ),
pDocOptions( NULL ),
pExtDocOptions( NULL ),
-@@ -161,7 +162,6 @@
+@@ -163,7 +164,6 @@ ScDocument::ScDocument( ScDocumentMode eMode,
nHardRecalcState(0),
nVisibleTab( 0 ),
eLinkMode(LM_UNKNOWN),
@@ -382,7 +354,7 @@
bAutoCalc( eMode == SCDOCMODE_DOCUMENT ),
bAutoCalcShellDisabled( FALSE ),
bForcedFormulaPending( FALSE ),
-@@ -602,6 +602,7 @@
+@@ -610,6 +610,7 @@ List& ScDocument::GetLoadedSymbolStringCellsList()
BOOL ScDocument::Load( SvStream& rStream, ScProgress* pProgress )
{
@@ -390,7 +362,7 @@
bLoadingDone = FALSE;
//----------------------------------------------------
-@@ -956,10 +957,13 @@
+@@ -964,10 +965,13 @@ BOOL ScDocument::Load( SvStream& rStream, ScProgress* pProgress )
bLoadingDone = TRUE;
return !bError;
@@ -404,7 +376,7 @@
((ScDocument*)this)->bLoadingDone = FALSE; // nicht zwischendrin reinpfuschen lassen
((ScDocument*)this)->bLostData = FALSE; // wird beim Speichern gesetzt
-@@ -1193,6 +1197,8 @@
+@@ -1201,6 +1205,8 @@ BOOL ScDocument::Save( SvStream& rStream, ScProgress* pProgress ) const
((ScDocument*)this)->bLoadingDone = TRUE;
return ( rStream.GetError() == SVSTREAM_OK );
@@ -413,14 +385,10 @@
}
void ScDocument::SetLostData()
-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 -b -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
+diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
+index 7febb73..541e2e4 100644
+--- sc/source/core/data/documen3.cxx
++++ sc/source/core/data/documen3.cxx
@@ -78,6 +78,8 @@
#include "listenercalls.hxx"
#include "editutil.hxx" // ScPostIt EditTextObject
@@ -430,7 +398,7 @@
using namespace com::sun::star;
-@@ -1690,28 +1692,37 @@
+@@ -1704,28 +1706,37 @@ void ScDocument::SnapVisArea( Rectangle& rRect ) const
ScDrawLayer::MirrorRectRTL( rRect ); // back to real rectangle
}
@@ -477,7 +445,7 @@
}
BOOL ScDocument::IsTabProtected( SCTAB nTab ) const
-@@ -1724,19 +1735,34 @@
+@@ -1738,19 +1749,34 @@ BOOL ScDocument::IsTabProtected( SCTAB nTab ) const
return FALSE;
}
@@ -520,14 +488,10 @@
}
const ScDocOptions& ScDocument::GetDocOptions() const
-Index: sc/source/core/data/document.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/core/data/document.cxx,v
-retrieving revision 1.88
-retrieving revision 1.86.28.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.88 -r1.86.28.2
---- sc/source/core/data/document.cxx 18 Apr 2008 11:32:11 -0000 1.88
-+++ sc/source/core/data/document.cxx 6 May 2008 23:27:32 -0000 1.86.28.2
+diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
+index b3d0607..b123ad7 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
@@ -90,6 +90,7 @@
#include "autonamecache.hxx"
#include "bcaslot.hxx"
@@ -536,15 +500,11 @@
struct ScDefaultAttr
{
-Index: sc/source/core/data/makefile.mk
-===================================================================
-RCS file: /cvs/sc/sc/source/core/data/makefile.mk,v
-retrieving revision 1.24
-retrieving revision 1.23.26.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.24 -r1.23.26.2
---- sc/source/core/data/makefile.mk 10 Apr 2008 19:30:13 -0000 1.24
-+++ sc/source/core/data/makefile.mk 6 May 2008 23:27:15 -0000 1.23.26.2
-@@ -107,6 +107,7 @@
+diff --git a/sc/source/core/data/makefile.mk b/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 = \
$(SLO)$/table4.obj \
$(SLO)$/table5.obj \
$(SLO)$/table6.obj \
@@ -552,14 +512,10 @@
$(SLO)$/userdat.obj \
$(SLO)$/validat.obj \
$(SLO)$/postit.obj
-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 -b -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
+diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
+index f8aed1d..ccac760 100644
+--- sc/source/core/data/table1.cxx
++++ sc/source/core/data/table1.cxx
@@ -114,6 +114,7 @@
#include "progress.hxx"
#include "hints.hxx" // fuer Paint-Broadcast
@@ -568,7 +524,7 @@
// STATIC DATA -----------------------------------------------------------
-@@ -132,7 +133,7 @@
+@@ -133,7 +134,7 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
bPageSizeValid( FALSE ),
nRepeatStartX( SCCOL_REPEAT_NONE ),
nRepeatStartY( SCROW_REPEAT_NONE ),
@@ -577,15 +533,11 @@
pColWidth( NULL ),
pRowHeight( NULL ),
pColFlags( NULL ),
-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 -b -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 @@
+diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
+index a08178e..6a55cb5 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
// Zellschutz auf geschuetzter Tabelle nicht setzen
//
@@ -594,7 +546,7 @@
{
ScPatternAttr aPattern(pDocument->GetPool());
aPattern.GetItemSet().Put( ScProtectionAttr( FALSE ) );
-@@ -320,7 +320,7 @@
+@@ -320,7 +320,7 @@ void ScTable::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
// Zellschutz auf geschuetzter Tabelle nicht setzen
//
@@ -603,7 +555,7 @@
{
ScDocumentPool* pPool = pDocument->GetPool();
SfxItemSet aSet( *pPool, ATTR_PATTERN_START, ATTR_PATTERN_END );
-@@ -363,7 +363,7 @@
+@@ -363,7 +363,7 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
// ggf. Formeln durch Werte ersetzen
@@ -612,7 +564,7 @@
for (i = nCol1; i <= nCol2; i++)
pTable->aCol[i].RemoveProtected(nRow1, nRow2);
}
-@@ -408,7 +408,7 @@
+@@ -408,7 +408,7 @@ void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
// Zellschutz auf geschuetzter Tabelle nicht setzen
//
@@ -621,7 +573,7 @@
{
ScPatternAttr aPattern(pDocument->GetPool());
aPattern.GetItemSet().Put( ScProtectionAttr( FALSE ) );
-@@ -1438,7 +1438,7 @@
+@@ -1438,7 +1438,7 @@ BOOL ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
BOOL bIsEditable = TRUE;
if ( nLockCount )
bIsEditable = FALSE;
@@ -630,7 +582,7 @@
{
if((bIsEditable = !HasAttrib( nCol1, nRow1, nCol2, nRow2, HASATTR_PROTECTED )) != FALSE)
{
-@@ -1505,7 +1505,7 @@
+@@ -1505,7 +1505,7 @@ BOOL ScTable::IsSelectionEditable( const ScMarkData& rMark,
BOOL bIsEditable = TRUE;
if ( nLockCount )
bIsEditable = FALSE;
@@ -639,7 +591,7 @@
{
if((bIsEditable = !HasAttribSelection( rMark, HASATTR_PROTECTED )) != FALSE)
{
-@@ -2809,11 +2809,16 @@
+@@ -2814,11 +2814,16 @@ BOOL ScTable::Load( SvStream& rStream, USHORT /* nVersion */, ScProgress* /* pPr
rStream >> bScenario;
rStream.ReadByteString( aComment, rStream.GetStreamCharSet() );
@@ -656,7 +608,7 @@
BOOL bOutline;
rStream >> bOutline;
-@@ -3085,6 +3090,7 @@
+@@ -3090,6 +3095,7 @@ BOOL ScTable::Save( SvStream& rStream, long& /* rSavedDocCells */, ScProgress* /
rStream << bScenario;
rStream.WriteByteString( aComment, rStream.GetStreamCharSet() );
@@ -664,14 +616,10 @@
rStream << bProtected;
String aPass;
//rStream.WriteByteString( aProtectPass, rStream.GetStreamCharSet() );
-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 -b -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
+diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
+index e557c56..e773776 100644
+--- sc/source/core/data/table5.cxx
++++ sc/source/core/data/table5.cxx
@@ -51,8 +51,11 @@
#include "stlpool.hxx"
#include "stlsheet.hxx"
@@ -684,7 +632,7 @@
// STATIC DATA -----------------------------------------------------------
#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue()
-@@ -273,6 +276,42 @@
+@@ -273,6 +276,42 @@ void ScTable::SetPageSize( const Size& rSize )
bPageSizeValid = FALSE;
}
@@ -727,12 +675,11 @@
Size ScTable::GetPageSize() const
{
if ( bPageSizeValid )
-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 22 May 2008 22:31:10 -0000 1.1.4.6
+diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
+new file mode 100644
+index 0000000..d96b6c8
+--- /dev/null
++++ sc/source/core/data/tabprotection.cxx
@@ -0,0 +1,436 @@
+/*************************************************************************
+ *
@@ -1170,14 +1117,10 @@
+ mpImpl->setOption(eOption, bEnabled);
+}
+
-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 -b -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
+diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
+index 837c972..d28222f 100644
+--- sc/source/filter/excel/excdoc.cxx
++++ sc/source/filter/excel/excdoc.cxx
@@ -73,7 +73,6 @@
#include "excdoc.hxx"
#include "namebuff.hxx"
@@ -1195,7 +1138,7 @@
static String lcl_GetVbaTabName( SCTAB n )
{
-@@ -151,7 +152,16 @@
+@@ -151,7 +152,16 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
Add( new ExcDummy_00 );
else
{
@@ -1213,7 +1156,7 @@
rR.pTabId = new XclExpChTrTabId( Max( nExcTabCount, nCodenames ) );
Add( rR.pTabId );
if( HasVbaStorage() )
-@@ -161,7 +171,8 @@
+@@ -161,7 +171,8 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
if( rCodeName.Len() )
Add( new XclCodename( rCodeName ) );
}
@@ -1223,7 +1166,7 @@
}
// erst Namen- und Tabellen-Eintraege aufbauen
-@@ -181,15 +192,29 @@
+@@ -181,15 +192,29 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
aRecList.AppendRecord( CreateRecord( EXC_ID_NAME ) );
}
@@ -1257,7 +1200,7 @@
if( GetBiff() <= EXC_BIFF5 )
{
Add( new ExcDummy_040 );
-@@ -198,9 +223,11 @@
+@@ -198,9 +223,11 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
}
else
{
@@ -1270,7 +1213,7 @@
}
// Formatting: FONT, FORMAT, XF, STYLE, PALETTE
-@@ -259,10 +286,14 @@
+@@ -259,10 +286,14 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
aRecList.AppendRecord( CreateRecord( EXC_ID_EXTERNSHEET ) );
aRecList.AppendRecord( CreateRecord( EXC_ID_NAME ) );
@@ -1285,7 +1228,7 @@
}
Add( new ExcEof );
-@@ -304,7 +335,7 @@
+@@ -304,7 +335,7 @@ void ExcTable::FillAsTable( size_t nCodeNameIdx )
Add( new XclRefmode( rDoc ) );
Add( new XclIteration( rDoc ) );
Add( new XclDelta( rDoc ) );
@@ -1294,7 +1237,7 @@
}
// GUTS (count & size of outline icons)
-@@ -321,8 +352,14 @@
+@@ -321,8 +352,14 @@ void ExcTable::FillAsTable( size_t nCodeNameIdx )
// page settings (SETUP and various other records)
aRecList.AppendRecord( xPageSett );
@@ -1311,7 +1254,7 @@
// local link table: EXTERNCOUNT, EXTERNSHEET
if( eBiff <= EXC_BIFF5 )
-@@ -368,6 +405,9 @@
+@@ -368,6 +405,9 @@ void ExcTable::FillAsTable( size_t nCodeNameIdx )
if( eBiff == EXC_BIFF8 )
{
@@ -1321,15 +1264,11 @@
// web queries
Add( new XclExpWebQueryBuffer( GetRoot() ) );
-Index: sc/source/filter/excel/excimp8.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/excimp8.cxx,v
-retrieving revision 1.124
-retrieving revision 1.123.38.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.124 -r1.123.38.3
---- sc/source/filter/excel/excimp8.cxx 10 Apr 2008 20:06:14 -0000 1.124
-+++ sc/source/filter/excel/excimp8.cxx 22 May 2008 23:32:47 -0000 1.123.38.3
-@@ -163,12 +163,6 @@
+diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
+index f700063..efd372d 100644
+--- sc/source/filter/excel/excimp8.cxx
++++ sc/source/filter/excel/excimp8.cxx
+@@ -163,12 +163,6 @@ void ImportExcel8::Iteration( void )
}
@@ -1342,7 +1281,7 @@
void ImportExcel8::Note( void )
{
GetObjectManager().ReadNote( maStrm );
-@@ -259,6 +253,11 @@
+@@ -264,6 +258,11 @@ void ImportExcel8::Codename( BOOL bWorkbookGlobals )
}
}
@@ -1354,7 +1293,7 @@
bool lcl_hasVBAEnabled()
{
uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY);
-@@ -303,6 +302,8 @@
+@@ -315,6 +314,8 @@ void ImportExcel8::PostDocLoad( void )
pExcRoot->pAutoFilterBuffer->Apply();
GetWebQueryBuffer().Apply(); //! test if extant
@@ -1363,14 +1302,10 @@
ImportExcel::PostDocLoad();
-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 -b -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
+diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
+index 16c04f1..81b97f0 100644
+--- sc/source/filter/excel/excrecds.cxx
++++ sc/source/filter/excel/excrecds.cxx
@@ -99,6 +99,7 @@
#include "xcl97rec.hxx"
@@ -1379,7 +1314,7 @@
//--------------------------------------------------------- class ExcDummy_00 -
const BYTE ExcDummy_00::pMyData[] = {
-@@ -418,7 +419,9 @@
+@@ -418,7 +419,9 @@ ExcBundlesheetBase::ExcBundlesheetBase() :
void ExcBundlesheetBase::UpdateStreamPos( XclExpStream& rStrm )
{
rStrm.SetSvStreamPos( nOwnPos );
@@ -1389,7 +1324,7 @@
}
-@@ -494,19 +497,41 @@
+@@ -494,19 +497,41 @@ XclExpWsbool::XclExpWsbool( bool bFitToPages ) :
// XclExpWindowProtection ===============================================================
XclExpWindowProtection::XclExpWindowProtection(bool bValue) :
@@ -1434,14 +1369,10 @@
XclExpFiltermode::XclExpFiltermode() :
XclExpEmptyRecord( EXC_ID_FILTERMODE )
{
-Index: sc/source/filter/excel/impop.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/impop.cxx,v
-retrieving revision 1.94
-retrieving revision 1.93.26.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.94 -r1.93.26.2
---- sc/source/filter/excel/impop.cxx 10 Apr 2008 20:08:24 -0000 1.94
-+++ sc/source/filter/excel/impop.cxx 6 May 2008 23:28:42 -0000 1.93.26.2
+diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
+index 6bcd443..5b5507d 100644
+--- sc/source/filter/excel/impop.cxx
++++ sc/source/filter/excel/impop.cxx
@@ -90,6 +90,7 @@
#include "xiview.hxx"
#include "xilink.hxx"
@@ -1450,7 +1381,7 @@
#include "excimp8.hxx"
#include "excform.hxx"
-@@ -418,14 +419,9 @@
+@@ -418,14 +419,9 @@ void ImportExcel::Eof( void )
}
@@ -1467,7 +1398,7 @@
}
-@@ -440,6 +436,12 @@
+@@ -439,6 +435,12 @@ void ImportExcel::Externsheet( void )
}
@@ -1480,7 +1411,7 @@
void ImportExcel::Note( void )
{
XclAddress aXclPos;
-@@ -585,27 +587,24 @@
+@@ -584,27 +586,24 @@ void ImportExcel::Defrowheight2( void )
}
@@ -1516,15 +1447,11 @@
SetCodePage( maStrm.ReaduInt16() );
}
-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 -b -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 @@
+diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
+index 10d671f..2cc592c 100644
+--- sc/source/filter/excel/read.cxx
++++ sc/source/filter/excel/read.cxx
+@@ -363,7 +363,7 @@ FltError ImportExcel::Read( void )
Eof();
eAkt = Z_Ende;
break;
@@ -1533,7 +1460,7 @@
case 0x14:
case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break;
case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
-@@ -477,7 +477,7 @@
+@@ -477,7 +477,7 @@ FltError ImportExcel::Read( void )
Eof();
eAkt = Z_Biff4E;
break;
@@ -1542,7 +1469,7 @@
case 0x14:
case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break;
case 0x1A:
-@@ -603,7 +603,7 @@
+@@ -603,7 +603,7 @@ FltError ImportExcel::Read( void )
eAkt = Z_Biff5T;
aIn.SeekGlobalPosition(); // und zurueck an alte Position
break;
@@ -1551,7 +1478,7 @@
case 0x1A:
case 0x1B: rPageSett.ReadPageBreaks( maStrm ); break;
case 0x1D: rTabViewSett.ReadSelection( maStrm ); break;
-@@ -902,6 +902,7 @@
+@@ -902,6 +902,7 @@ FltError ImportExcel8::Read( void )
}
break;
case 0x12: DocProtect(); break; // PROTECT [ 5678]
@@ -1559,7 +1486,7 @@
case 0x19: WinProtection(); break;
case 0x2F: // FILEPASS [ 2345 ]
eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm );
-@@ -1046,7 +1047,8 @@
+@@ -1047,7 +1048,8 @@ FltError ImportExcel8::Read( void )
eAkt = EXC_STATE_SHEET;
aIn.SeekGlobalPosition(); // und zurueck an alte Position
break;
@@ -1569,7 +1496,7 @@
case 0x42: Codepage(); break; // CODEPAGE [ 2345 ]
case 0x55: DefColWidth(); break;
case 0x7D: Colinfo(); break; // COLINFO [ 345 ]
-@@ -1062,6 +1064,7 @@
+@@ -1063,6 +1065,7 @@ FltError ImportExcel8::Read( void )
case 0x0221: Array34(); break; // ARRAY [ 34 ]
case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345 ]
case 0x04BC: Shrfmla(); break; // SHRFMLA [ 5 ]
@@ -1577,20 +1504,10 @@
}
}
break;
-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 -b -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 -b -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
+diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
+index aa0e713..0c32b52 100644
+--- sc/source/filter/excel/xeroot.cxx
++++ sc/source/filter/excel/xeroot.cxx
@@ -32,7 +32,11 @@
#include "precompiled_sc.hxx"
#include "xeroot.hxx"
@@ -1616,7 +1533,7 @@
// Global data ================================================================
-@@ -221,6 +227,40 @@
+@@ -221,6 +227,40 @@ XclExpRecordRef XclExpRoot::CreateRecord( sal_uInt16 nRecId ) const
return xRec;
}
@@ -1657,14 +1574,10 @@
XclExpRootData::XclExpLinkMgrRef XclExpRoot::GetLocalLinkMgrRef() const
{
return IsInGlobals() ? mrExpData.mxGlobLinkMgr : mrExpData.mxLocLinkMgr;
-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 -b -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
+diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
+index 3a277dd..9e1a658 100644
+--- sc/source/filter/excel/xestream.cxx
++++ sc/source/filter/excel/xestream.cxx
@@ -34,6 +34,9 @@
#include "xlstring.hxx"
#include "xeroot.hxx"
@@ -1675,7 +1588,7 @@
// ============================================================================
-@@ -63,16 +66,19 @@
+@@ -63,16 +66,19 @@ XclExpStream::~XclExpStream()
void XclExpStream::StartRecord( sal_uInt16 nRecId, sal_Size nRecSize )
{
DBG_ASSERT( !mbInRec, "XclExpStream::StartRecord - another record still open" );
@@ -1695,7 +1608,7 @@
UpdateRecSize();
mrStrm.Seek( STREAM_SEEK_TO_END );
mbInRec = false;
-@@ -84,6 +90,86 @@
+@@ -84,6 +90,86 @@ void XclExpStream::SetSliceSize( sal_uInt16 nSize )
mnSliceSize = 0;
}
@@ -1782,7 +1695,7 @@
sal_Size XclExpStream::Write( const void* pData, sal_Size nBytes )
{
sal_Size nRet = 0;
-@@ -98,9 +184,21 @@
+@@ -98,9 +184,21 @@ sal_Size XclExpStream::Write( const void* pData, sal_Size nBytes )
while( bValid && (nBytesLeft > 0) )
{
sal_Size nWriteLen = ::std::min< sal_Size >( PrepareWrite(), nBytesLeft );
@@ -1805,7 +1718,7 @@
pBuffer += nWriteRet;
nRet += nWriteRet;
nBytesLeft -= nWriteRet;
-@@ -236,6 +334,26 @@
+@@ -236,6 +334,26 @@ void XclExpStream::WriteCharBuffer( const ScfUInt8Vec& rBuffer )
Write( &rBuffer[ 0 ], rBuffer.size() );
}
@@ -1832,7 +1745,7 @@
sal_Size XclExpStream::SetSvStreamPos( sal_Size nPos )
{
DBG_ASSERT( !mbInRec, "XclExpStream::SetSvStreamPos - not allowed inside of a record" );
-@@ -327,3 +445,187 @@
+@@ -327,3 +445,187 @@ void XclExpStream::WriteRawZeroBytes( sal_Size nBytes )
// ============================================================================
@@ -2020,20 +1933,10 @@
+ }
+ mnOldPos = nStrmPos;
+}
-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 -b -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.31
-retrieving revision 1.30.80.6
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.31 -r1.30.80.6
---- sc/source/filter/excel/xicontent.cxx 10 Apr 2008 20:15:50 -0000 1.31
-+++ sc/source/filter/excel/xicontent.cxx 22 May 2008 23:35:38 -0000 1.30.80.6
+diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
+index abdb6ca..b2c740a 100644
+--- sc/source/filter/excel/xicontent.cxx
++++ sc/source/filter/excel/xicontent.cxx
@@ -41,6 +41,7 @@
#include "scitems.hxx"
#include <svx/eeitem.hxx>
@@ -2055,7 +1958,7 @@
// Shared string table ========================================================
-@@ -1074,11 +1081,182 @@
+@@ -1069,11 +1076,182 @@ ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm )
};
// set decrypter at import stream
rStrm.SetDecrypter( xDecr );
@@ -2240,15 +2143,11 @@
+
// ============================================================================
-Index: sc/source/filter/excel/xilink.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/xilink.cxx,v
-retrieving revision 1.24
-retrieving revision 1.23.28.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.24 -r1.23.28.2
---- sc/source/filter/excel/xilink.cxx 10 Apr 2008 20:16:58 -0000 1.24
-+++ sc/source/filter/excel/xilink.cxx 6 May 2008 23:28:59 -0000 1.23.28.2
-@@ -264,6 +264,7 @@
+diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
+index 03f988a..e351863 100644
+--- sc/source/filter/excel/xilink.cxx
++++ sc/source/filter/excel/xilink.cxx
+@@ -264,6 +264,7 @@ void XclImpTabInfo::ReadTabid( XclImpStream& rStrm )
DBG_ASSERT_BIFF( rStrm.GetRoot().GetBiff() == EXC_BIFF8 );
if( rStrm.GetRoot().GetBiff() == EXC_BIFF8 )
{
@@ -2256,14 +2155,10 @@
sal_Size nReadCount = rStrm.GetRecLeft() / 2;
DBG_ASSERT( nReadCount <= 0xFFFF, "XclImpTabInfo::ReadTabid - record too long" );
maTabIdVec.clear();
-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 -b -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
+diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
+index 4e5173f..21e071a 100644
+--- sc/source/filter/excel/xiroot.cxx
++++ sc/source/filter/excel/xiroot.cxx
@@ -52,6 +52,7 @@
XclImpRootData::XclImpRootData( XclBiff eBiff, SfxMedium& rMedium,
SotStorageRef xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc ) :
@@ -2272,7 +2167,7 @@
mbHasCodePage( false )
{
}
-@@ -86,6 +87,8 @@
+@@ -86,6 +87,8 @@ XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) :
GetOldRoot().pAutoFilterBuffer = new XclImpAutoFilterBuffer;
mrImpData.mxWebQueryBfr.reset( new XclImpWebQueryBuffer( GetRoot() ) );
mrImpData.mxPTableMgr.reset( new XclImpPivotTableManager( GetRoot() ) );
@@ -2281,7 +2176,7 @@
}
mrImpData.mxPageSett.reset( new XclImpPageSettings( GetRoot() ) );
-@@ -224,6 +227,18 @@
+@@ -224,6 +227,18 @@ XclImpPivotTableManager& XclImpRoot::GetPivotTableManager() const
return *mrImpData.mxPTableMgr;
}
@@ -2300,7 +2195,7 @@
XclImpPageSettings& XclImpRoot::GetPageSettings() const
{
return *mrImpData.mxPageSett;
-@@ -247,5 +262,18 @@
+@@ -247,5 +262,18 @@ String XclImpRoot::GetScAddInName( const String& rXclName ) const
return rXclName;
}
@@ -2319,14 +2214,10 @@
+
// ============================================================================
-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 -b -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
+diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
+index 745bc8a..176d2fd 100644
+--- sc/source/filter/excel/xistream.cxx
++++ sc/source/filter/excel/xistream.cxx
@@ -36,6 +36,8 @@
#include "xlstring.hxx"
#include "xiroot.hxx"
@@ -2336,7 +2227,7 @@
// ============================================================================
// Decryption
// ============================================================================
-@@ -97,11 +99,21 @@
+@@ -97,11 +99,21 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte
return nRet;
}
@@ -2358,7 +2249,7 @@
// ----------------------------------------------------------------------------
XclImpBiff5Decrypter::XclImpBiff5Decrypter( const XclImpRoot& rRoot, sal_uInt16 nKey, sal_uInt16 nHash )
-@@ -157,6 +169,9 @@
+@@ -157,6 +169,9 @@ void XclImpBiff5Decrypter::Init( const ByteString& rPass, sal_uInt16 nKey, sal_u
// init codec
maCodec.InitKey( mpnPassw );
bValid = maCodec.VerifyKey( nKey, nHash );
@@ -2368,7 +2259,7 @@
}
SetHasValidPassword( bValid );
-@@ -255,6 +270,8 @@
+@@ -255,6 +270,8 @@ void XclImpBiff8Decrypter::Init(
// init codec
maCodec.InitKey( mpnPassw, mpnDocId );
bValid = maCodec.VerifyKey( pnSaltData, pnSaltHash );
@@ -2377,15 +2268,11 @@
}
SetHasValidPassword( bValid );
-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 -b -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 @@
+diff --git a/sc/source/filter/excel/xlroot.cxx b/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,
mxRD( new RootData ),//!
mnCharWidth( 110 ),
mnScTab( 0 ),
@@ -2395,7 +2282,7 @@
{
// default script type, e.g. for empty cells
switch( ScGlobal::GetDefaultScriptType() )
-@@ -198,17 +197,6 @@
+@@ -198,17 +197,6 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData )
}
}
@@ -2413,15 +2300,11 @@
bool XclRoot::HasVbaStorage() const
{
SotStorageRef xRootStrg = GetRootStorage();
-Index: sc/source/filter/inc/excimp8.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/excimp8.hxx,v
-retrieving revision 1.70
-retrieving revision 1.69.80.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.70 -r1.69.80.2
---- sc/source/filter/inc/excimp8.hxx 10 Apr 2008 20:30:57 -0000 1.70
-+++ sc/source/filter/inc/excimp8.hxx 6 May 2008 23:27:53 -0000 1.69.80.2
-@@ -62,7 +62,6 @@
+diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
+index 6e11e84..58f908a 100644
+--- sc/source/filter/inc/excimp8.hxx
++++ sc/source/filter/inc/excimp8.hxx
+@@ -63,7 +63,6 @@ class ImportExcel8 : public ImportExcel
void Delta( void ); // 0x10
void Iteration( void ); // 0x11
void Note( void ); // 0x1C
@@ -2429,7 +2312,7 @@
void Boundsheet( void ); // 0x85
void FilterMode( void ); // 0x9B
void AutoFilterInfo( void ); // 0x9D
-@@ -74,6 +73,7 @@
+@@ -75,6 +74,7 @@ class ImportExcel8 : public ImportExcel
void Hlink( void ); // 0x01B8
void Codename( BOOL bWBGlobals ); // 0x01BA
@@ -2437,15 +2320,11 @@
virtual void EndSheet( void );
virtual void PostDocLoad( void );
-Index: sc/source/filter/inc/excrecds.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/excrecds.hxx,v
-retrieving revision 1.50
-retrieving revision 1.49.324.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.50 -r1.49.324.2
---- sc/source/filter/inc/excrecds.hxx 10 Apr 2008 20:31:14 -0000 1.50
-+++ sc/source/filter/inc/excrecds.hxx 6 May 2008 23:27:50 -0000 1.49.324.2
-@@ -244,10 +244,23 @@
+diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
+index 7cf6dc0..5a00517 100644
+--- sc/source/filter/inc/excrecds.hxx
++++ sc/source/filter/inc/excrecds.hxx
+@@ -244,10 +244,23 @@ class XclExpWindowProtection : public XclExpBoolRecord
};
// EXC_ID_PROTECT Document Protection
@@ -2471,21 +2350,11 @@
};
-Index: sc/source/filter/inc/fdumper.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/fdumper.hxx,v
-retrieving revision 1.9
-retrieving revision 1.7.320.4
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.7.320.4
-Index: sc/source/filter/inc/imp_op.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/imp_op.hxx,v
-retrieving revision 1.42
-retrieving revision 1.41.286.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.42 -r1.41.286.2
---- sc/source/filter/inc/imp_op.hxx 10 Apr 2008 20:35:51 -0000 1.42
-+++ sc/source/filter/inc/imp_op.hxx 6 May 2008 23:28:08 -0000 1.41.286.2
-@@ -136,9 +136,11 @@
+diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
+index 64468f0..1d120c1 100644
+--- sc/source/filter/inc/imp_op.hxx
++++ sc/source/filter/inc/imp_op.hxx
+@@ -136,9 +136,11 @@ protected:
void Bof2( void ); // 0x09
void Eof( void ); // 0x0A
void DocProtect( void ); // 0x12
@@ -2499,14 +2368,10 @@
void Note( void ); // 0x1C
void Columndefault( void ); // 0x20
void Array25( void ); // 0x21
-Index: sc/source/filter/inc/xcl97rec.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/xcl97rec.hxx,v
-retrieving revision 1.48
-retrieving revision 1.47.338.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.48 -r1.47.338.3
---- sc/source/filter/inc/xcl97rec.hxx 10 Apr 2008 20:42:30 -0000 1.48
-+++ sc/source/filter/inc/xcl97rec.hxx 6 May 2008 23:27:57 -0000 1.47.338.3
+diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
+index 12bd645..84c6504 100644
+--- sc/source/filter/inc/xcl97rec.hxx
++++ sc/source/filter/inc/xcl97rec.hxx
@@ -35,6 +35,8 @@
#include "xcl97esc.hxx"
#include "xlstyle.hxx"
@@ -2516,7 +2381,7 @@
// --- class XclMsodrawing_Base --------------------------------------
class XclMsodrawing_Base
-@@ -57,29 +59,26 @@
+@@ -57,29 +59,26 @@ public:
// --- class XclMsodrawinggroup --------------------------------------
@@ -2550,7 +2415,7 @@
public:
XclMsodrawing(
-@@ -87,9 +86,6 @@
+@@ -87,9 +86,6 @@ public:
UINT16 nEscherType = 0,
sal_Size nInitialSize = 0 );
virtual ~XclMsodrawing();
@@ -2560,7 +2425,7 @@
};
-@@ -484,23 +480,24 @@
+@@ -484,23 +480,24 @@ public:
virtual sal_Size GetLen() const;
};
@@ -2596,7 +2461,7 @@
class XclCalccount : public ExcRecord
{
-@@ -556,5 +553,162 @@
+@@ -556,5 +553,162 @@ public:
XclRefmode( const ScDocument& );
};
@@ -2759,15 +2624,11 @@
+
#endif // _XCL97REC_HXX
-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 -b -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 @@
+diff --git a/sc/source/filter/inc/xeroot.hxx b/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:
@param nRecId Identifier that specifies which record is returned. */
XclExpRecordRef CreateRecord( sal_uInt16 nRecId ) const;
@@ -2780,14 +2641,10 @@
/** Returns the local or global link manager, depending on current context. */
XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const;
-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 -b -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
+diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
+index 514c65c..5d0e3a8 100644
+--- sc/source/filter/inc/xestream.hxx
++++ sc/source/filter/inc/xestream.hxx
@@ -35,6 +35,9 @@
#include "xlstream.hxx"
@@ -2798,7 +2655,7 @@
/* ============================================================================
Output stream class for Excel export
- CONTINUE record handling
-@@ -42,6 +45,8 @@
+@@ -42,6 +45,8 @@ Output stream class for Excel export
============================================================================ */
class XclExpRoot;
@@ -2807,7 +2664,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 @@
+@@ -100,14 +105,14 @@ public:
/** Sets data slice length. 0 = no slices. */
void SetSliceSize( sal_uInt16 nSize );
@@ -2830,7 +2687,7 @@
/** Writes nBytes bytes from memory. */
sal_Size Write( const void* pData, sal_Size nBytes );
-@@ -148,6 +153,14 @@
+@@ -148,6 +153,14 @@ public:
/** Returns the absolute position of the system stream. */
inline sal_Size GetSvStreamPos() const { return mrStrm.Tell(); }
@@ -2845,7 +2702,7 @@
private:
/** Writes header data, internal setup. */
void InitRecord( sal_uInt16 nRecId );
-@@ -170,6 +183,9 @@
+@@ -170,6 +183,9 @@ private:
SvStream& mrStrm; /// Reference to the system output stream.
const XclExpRoot& mrRoot; /// Filter root data.
@@ -2855,7 +2712,7 @@
// length data
sal_uInt16 mnMaxRecSize; /// Maximum size of record content.
sal_uInt16 mnMaxContSize; /// Maximum size of CONTINUE content.
-@@ -187,64 +203,51 @@
+@@ -187,64 +203,51 @@ private:
// ----------------------------------------------------------------------------
@@ -2955,15 +2812,11 @@
#endif
-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 -b -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 @@
+diff --git a/sc/source/filter/inc/xetable.hxx b/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:
XclExpDvalRef mxDval; /// Data validation with DVAL and DV records.
};
@@ -2971,14 +2824,10 @@
-
#endif
-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 -b -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
+diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx
+index 48f6917..07b237a 100644
+--- sc/source/filter/inc/xicontent.hxx
++++ sc/source/filter/inc/xicontent.hxx
@@ -37,6 +37,8 @@
#include "xistring.hxx"
#include "xiroot.hxx"
@@ -2988,7 +2837,7 @@
/* ============================================================================
Classes to import the big Excel document contents (related to several cells or
globals for the document).
-@@ -249,5 +251,64 @@
+@@ -249,5 +251,64 @@ public:
// ============================================================================
@@ -3053,15 +2902,11 @@
+
#endif
-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 -b -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 @@
+diff --git a/sc/source/filter/inc/xiroot.hxx b/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;
class XclImpPageSettings;
class XclImpDocViewSettings;
class XclImpTabViewSettings;
@@ -3070,7 +2915,7 @@
class _ScRangeListTabs;
class ExcelToSc;
-@@ -87,6 +89,8 @@
+@@ -87,6 +89,8 @@ struct XclImpRootData : public XclRootData
typedef ScfRef< XclImpPageSettings > XclImpPageSettRef;
typedef ScfRef< XclImpDocViewSettings > XclImpDocViewSettRef;
typedef ScfRef< XclImpTabViewSettings > XclImpTabViewSettRef;
@@ -3079,7 +2924,7 @@
XclImpAddrConvRef mxAddrConv; /// The address converter.
XclImpFmlaCompRef mxFmlaComp; /// The formula compiler.
-@@ -110,6 +114,11 @@
+@@ -110,6 +114,11 @@ struct XclImpRootData : public XclRootData
XclImpPageSettRef mxPageSett; /// Page settings for current sheet.
XclImpDocViewSettRef mxDocViewSett; /// View settings for entire document.
XclImpTabViewSettRef mxTabViewSett; /// View settings for current sheet.
@@ -3091,7 +2936,7 @@
bool mbHasCodePage; /// true = CODEPAGE record exists.
-@@ -181,6 +190,10 @@
+@@ -181,6 +190,10 @@ public:
XclImpWebQueryBuffer& GetWebQueryBuffer() const;
/** Returns the pivot table manager. */
XclImpPivotTableManager& GetPivotTableManager() const;
@@ -3102,7 +2947,7 @@
/** Returns the page settings of the current sheet. */
XclImpPageSettings& GetPageSettings() const;
-@@ -192,6 +205,9 @@
+@@ -192,6 +205,9 @@ public:
/** Returns the Calc add-in function name for an Excel function name. */
String GetScAddInName( const String& rXclName ) const;
@@ -3112,15 +2957,11 @@
private:
mutable XclImpRootData& mrImpData; /// Reference to the global import data struct.
};
-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 -b -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 @@
+diff --git a/sc/source/filter/inc/xistream.hxx b/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:
@return Count of bytes really read. */
sal_uInt16 Read( SvStream& rStrm, void* pData, sal_uInt16 nBytes );
@@ -3129,7 +2970,7 @@
protected:
/** Protected copy c'tor for OnClone(). */
explicit XclImpDecrypter( const XclImpDecrypter& rSrc );
-@@ -80,6 +82,8 @@
+@@ -80,6 +82,8 @@ protected:
/** Sets the decrypter to a state showing whether the password was correct. */
void SetHasValidPassword( bool bValid );
@@ -3138,7 +2979,7 @@
private:
/** Implementation of cloning this object. */
virtual XclImpDecrypter* OnClone() const = 0;
-@@ -89,6 +93,7 @@
+@@ -89,6 +93,7 @@ private:
virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) = 0;
private:
@@ -3146,15 +2987,11 @@
ErrCode mnError; /// Decrypter error code.
sal_Size mnOldPos; /// Last known stream position.
sal_uInt16 mnRecSize; /// Current record size.
-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 -b -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 @@
+diff --git a/sc/source/filter/inc/xlroot.hxx b/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
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).
@@ -3162,7 +2999,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 @@
+@@ -115,7 +114,6 @@ struct XclRootData
long mnCharWidth; /// Width of '0' in default font (twips).
SCTAB mnScTab; /// Current Calc sheet index.
const bool mbExport; /// false = Import, true = Export.
@@ -3170,7 +3007,7 @@
explicit XclRootData( XclBiff eBiff, SfxMedium& rMedium,
SotStorageRef xRootStrg, ScDocument& rDoc,
-@@ -181,8 +179,6 @@
+@@ -181,8 +179,6 @@ public:
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; }
@@ -3179,15 +3016,11 @@
/** Returns the OLE2 root storage of the imported/exported file.
@return Pointer to root storage or 0, if the file is a simple stream. */
-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 -b -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 @@
+diff --git a/sc/source/filter/starcalc/scflt.cxx b/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()
//rStream.Read(&SheetProtect, sizeof(SheetProtect));
lcl_ReadSheetProtect(rStream, SheetProtect);
nError = rStream.GetError();
@@ -3200,7 +3033,7 @@
}
-@@ -1502,10 +1502,10 @@
+@@ -1502,10 +1502,10 @@ void Sc10Import::LoadTables()
//rStream.Read(&TabProtect, sizeof(TabProtect));
lcl_ReadTabProtect(rStream, TabProtect);
@@ -3214,15 +3047,11 @@
rStream >> TabNo;
-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 -b -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 @@
+diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/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 )
void XclExpChTrTabId::SaveCont( XclExpStream& rStrm )
{
@@ -3230,15 +3059,11 @@
if( pBuffer )
for( sal_uInt16* pElem = pBuffer; pElem < (pBuffer + nTabCount); pElem++ )
rStrm << *pElem;
-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 -b -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 @@
+diff --git a/sc/source/filter/xcl97/makefile.mk b/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
# --- Files --------------------------------------------------------
SLOFILES = \
@@ -3246,14 +3071,10 @@
$(SLO)$/xcl97esc.obj \
$(SLO)$/xcl97rec.obj \
$(SLO)$/XclImpChangeTrack.obj \
-Index: sc/source/filter/xcl97/xcl97rec.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/xcl97/xcl97rec.cxx,v
-retrieving revision 1.87
-retrieving revision 1.86.292.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.87 -r1.86.292.3
---- sc/source/filter/xcl97/xcl97rec.cxx 10 Apr 2008 21:06:48 -0000 1.87
-+++ sc/source/filter/xcl97/xcl97rec.cxx 6 May 2008 23:29:20 -0000 1.86.292.3
+diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
+index 1fd9040..7b10f01 100644
+--- sc/source/filter/xcl97/xcl97rec.cxx
++++ sc/source/filter/xcl97/xcl97rec.cxx
@@ -83,6 +83,7 @@
#include "scextopt.hxx"
#include "docoptio.hxx"
@@ -3262,7 +3083,7 @@
using ::rtl::OUString;
using namespace ::com::sun::star;
-@@ -137,9 +138,9 @@
+@@ -137,9 +138,9 @@ sal_Size XclMsodrawing_Base::GetDataLen() const
// --- class XclMsodrawinggroup --------------------------------------
@@ -3275,7 +3096,7 @@
{
if ( nEscherType )
{
-@@ -184,7 +185,7 @@
+@@ -184,7 +185,7 @@ XclMsodrawinggroup::~XclMsodrawinggroup()
}
@@ -3284,7 +3105,7 @@
{
DBG_ASSERT( GetEscherEx()->GetStreamPos() == GetEscherEx()->GetOffsetFromMap( nStartPos ),
"XclMsodrawinggroup::SaveCont: Escher stream position mismatch" );
-@@ -192,23 +193,11 @@
+@@ -192,23 +193,11 @@ void XclMsodrawinggroup::SaveCont( XclExpStream& rStrm )
}
@@ -3310,7 +3131,7 @@
{
if ( nEscherType )
{
-@@ -234,7 +223,7 @@
+@@ -234,7 +223,7 @@ XclMsodrawing::~XclMsodrawing()
}
@@ -3319,7 +3140,7 @@
{
DBG_ASSERT( GetEscherEx()->GetStreamPos() == GetEscherEx()->GetOffsetFromMap( nStartPos ),
"XclMsodrawing::SaveCont: Escher stream position mismatch" );
-@@ -242,16 +231,6 @@
+@@ -242,16 +231,6 @@ void XclMsodrawing::SaveCont( XclExpStream& rStrm )
}
@@ -3336,7 +3157,7 @@
// --- class XclObjList ----------------------------------------------
-@@ -888,6 +867,7 @@
+@@ -888,6 +867,7 @@ ExcBof8_Base::ExcBof8_Base()
void ExcBof8_Base::SaveCont( XclExpStream& rStrm )
{
@@ -3344,7 +3165,7 @@
rStrm << nVers << nDocType << nRupBuild << nRupYear
<< nFileHistory << nLowestBiffVer;
}
-@@ -948,7 +928,10 @@
+@@ -948,7 +928,10 @@ void ExcBundlesheet8::SaveCont( XclExpStream& rStrm )
{
nOwnPos = rStrm.GetSvStreamPos();
// write dummy position, real position comes later
@@ -3356,7 +3177,7 @@
}
-@@ -1228,33 +1211,73 @@
+@@ -1228,33 +1211,73 @@ sal_Size ExcEScenarioManager::GetLen() const
return 8;
}
@@ -3381,7 +3202,6 @@
+ XclExpRecord( 0x0867, 23 )
{
- return nMyLen;
--}
+ static const XclExpTabProtectOption aTable[] =
+ {
+ { ScTableProtection::OBJECTS, 0x0001 },
@@ -3400,13 +3220,10 @@
+ { ScTableProtection::AUTOFILTER, 0x1000 },
+ { ScTableProtection::PIVOT_TABLES, 0x2000 },
+ { ScTableProtection::SELECT_UNLOCKED_CELLS, 0x4000 },
-
++
+ { ScTableProtection::NONE, 0x0000 }
+ };
-
--const BYTE* XclProtection::GetData( void ) const
--{
-- return pMyData;
++
+ mnOptions = 0x0000;
+ ScTableProtection* pProtect = rRoot.GetDoc().GetTabProtection(nTab);
+ if (!pProtect)
@@ -3419,8 +3236,13 @@
+ }
}
+-
+-const BYTE* XclProtection::GetData( void ) const
+void XclExpSheetProtectOptions::WriteBody( XclExpStream& rStrm )
-+{
+ {
+- return pMyData;
+-}
+-
+ sal_uInt16 nBytes = 0x0867;
+ rStrm << nBytes;
@@ -3444,7 +3266,7 @@
-@@ -1342,3 +1365,250 @@
+@@ -1342,3 +1365,250 @@ XclRefmode::XclRefmode( const ScDocument& rDoc ) :
XclExpBoolRecord( 0x000F, rDoc.GetAddressConvention() != ScAddress::CONV_XL_R1C1 )
{
}
@@ -3695,14 +3517,10 @@
+{
+}
+
-Index: sc/source/filter/xml/xmlbodyi.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/xml/xmlbodyi.cxx,v
-retrieving revision 1.30
-retrieving revision 1.29.324.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.30 -r1.29.324.2
---- sc/source/filter/xml/xmlbodyi.cxx 10 Apr 2008 21:24:07 -0000 1.30
-+++ sc/source/filter/xml/xmlbodyi.cxx 6 May 2008 23:28:19 -0000 1.29.324.2
+diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
+index b510a70..8b89902 100644
+--- sc/source/filter/xml/xmlbodyi.cxx
++++ sc/source/filter/xml/xmlbodyi.cxx
@@ -50,6 +50,7 @@
#include "XMLTrackedChangesContext.hxx"
#include "XMLEmptyContext.hxx"
@@ -3720,7 +3538,7 @@
using namespace com::sun::star;
using namespace xmloff::token;
-@@ -252,10 +255,17 @@
+@@ -252,10 +255,17 @@ void ScXMLBodyContext::EndElement()
// #i37959# handle document protection after the sheet settings
if (bProtected)
{
@@ -3739,14 +3557,10 @@
}
}
GetScImport().UnlockSolarMutex();
-Index: sc/source/filter/xml/xmlexprt.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/xml/xmlexprt.cxx,v
-retrieving revision 1.212
-retrieving revision 1.211.28.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.212 -r1.211.28.3
---- sc/source/filter/xml/xmlexprt.cxx 10 Apr 2008 21:29:11 -0000 1.212
-+++ sc/source/filter/xml/xmlexprt.cxx 23 May 2008 00:17:47 -0000 1.211.28.3
+diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
+index ac51704..4ff2a5c 100644
+--- sc/source/filter/xml/xmlexprt.cxx
++++ sc/source/filter/xml/xmlexprt.cxx
@@ -67,6 +67,7 @@
#include "rangeutl.hxx"
#include "convuno.hxx"
@@ -3755,7 +3569,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
-@@ -1399,7 +1400,11 @@
+@@ -1399,7 +1400,11 @@ void ScXMLExport::SetBodyAttributes()
{
AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE);
rtl::OUStringBuffer aBuffer;
@@ -3768,7 +3582,7 @@
if (aBuffer.getLength())
AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
}
-@@ -1417,11 +1422,13 @@
+@@ -1417,11 +1422,13 @@ void ScXMLExport::_ExportContent()
DBG_ERROR("no shared data setted");
}
ScXMLExportDatabaseRanges aExportDatabaseRanges(*this);
@@ -3786,7 +3600,7 @@
uno::Reference<container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY );
if ( xIndex.is() )
{
-@@ -1471,7 +1478,11 @@
+@@ -1471,7 +1478,11 @@ void ScXMLExport::_ExportContent()
AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE);
rtl::OUStringBuffer aBuffer;
if (pDoc)
@@ -3799,7 +3613,7 @@
if (aBuffer.getLength())
AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
}
-@@ -1585,8 +1596,6 @@
+@@ -1585,8 +1596,6 @@ void ScXMLExport::_ExportContent()
aExportDDELinks.WriteDDELinks(xSpreadDoc);
IncrementProgressBar(sal_True, 0);
GetProgressBarHelper()->SetValue(GetProgressBarHelper()->GetReference());
@@ -3808,14 +3622,10 @@
}
void ScXMLExport::_ExportStyles( sal_Bool bUsed )
-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 -b -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
+diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
+index 8d45478..ab00932 100644
+--- sc/source/filter/xml/xmlsubti.cxx
++++ sc/source/filter/xml/xmlsubti.cxx
@@ -42,6 +42,7 @@
#include "docuno.hxx"
#include "cellsuno.hxx"
@@ -3835,7 +3645,7 @@
//------------------------------------------------------------------
using namespace com::sun::star;
-@@ -639,13 +644,10 @@
+@@ -639,13 +644,10 @@ void ScMyTables::DeleteTable()
{
uno::Sequence<sal_Int8> aPass;
SvXMLUnitConverter::decodeBase64(aPass, sPassword);
@@ -3853,15 +3663,11 @@
}
rImport.UnlockSolarMutex();
-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 -b -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 @@
+diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
+index 4ad0a5a..554562c 100644
+--- sc/source/ui/docshell/docfunc.cxx
++++ sc/source/ui/docshell/docfunc.cxx
+@@ -98,7 +98,12 @@
#include "editable.hxx"
#include "compiler.hxx"
#include "scui_def.hxx" //CHINA001
@@ -3872,9 +3678,9 @@
using namespace com::sun::star;
+using ::com::sun::star::uno::Sequence;
- // STATIC DATA -----------------------------------------------------------
-@@ -2601,103 +2606,152 @@
+ // STATIC DATA -----------------------------------------------------------
+@@ -2709,103 +2714,152 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
//------------------------------------------------------------------------
@@ -4003,17 +3809,18 @@
- uno::Sequence<sal_Int8> aPass;
- BOOL bOk = lcl_ValidPassword( pDoc, nTab, rPassword, &aOldPassword );
- if ( bOk )
-+
-+ if (nTab == TABLEID_DOC)
- {
+- {
- uno::Sequence<sal_Int8> aEmptyPass;
- if ( nTab == TABLEID_DOC )
- pDoc->SetDocProtection( FALSE, aEmptyPass );
- else
- pDoc->SetTabProtection( nTab, FALSE, aEmptyPass );
-+ // document protection
- if (bUndo)
++ if (nTab == TABLEID_DOC)
++ {
++ // document protection
++
+ ScDocProtection* pDocProtect = pDoc->GetDocProtection();
+ if (!pDocProtect || !pDocProtect->isProtected())
+ // already unprotected (should not happen)!
@@ -4088,15 +3895,11 @@
}
//------------------------------------------------------------------------
-Index: sc/source/ui/docshell/docsh.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/docshell/docsh.cxx,v
-retrieving revision 1.100
-retrieving revision 1.98.28.6
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.100 -r1.98.28.6
---- sc/source/ui/docshell/docsh.cxx 15 Apr 2008 14:12:23 -0000 1.100
-+++ sc/source/ui/docshell/docsh.cxx 22 May 2008 21:47:16 -0000 1.98.28.6
-@@ -78,11 +78,6 @@
+diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
+index b1186d9..7def18e 100644
+--- sc/source/ui/docshell/docsh.cxx
++++ sc/source/ui/docshell/docsh.cxx
+@@ -80,11 +80,6 @@
#include <sot/formats.hxx>
#define SOT_FORMATSTR_ID_STARCALC_30 SOT_FORMATSTR_ID_STARCALC
@@ -4108,7 +3911,7 @@
// INCLUDE ---------------------------------------------------------------
#include "cell.hxx"
-@@ -96,7 +91,6 @@
+@@ -98,7 +93,6 @@
#include "scresid.hxx"
#include "sc.hrc"
#include "globstr.hrc"
@@ -4116,7 +3919,7 @@
#include "scerrors.hxx"
#include "brdcst.hxx"
#include "stlpool.hxx"
-@@ -125,6 +119,7 @@
+@@ -127,6 +121,7 @@
#include "cfgids.hxx"
#include "warnpassword.hxx"
#include "optsolver.hxx"
@@ -4124,7 +3927,7 @@
#include "docsh.hxx"
#include "docshimp.hxx"
-@@ -1948,6 +1943,32 @@
+@@ -2002,6 +1997,32 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
rStream.SetNumberFormatInt( nOldNumberFormatInt );
}
@@ -4157,7 +3960,7 @@
BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
{
-@@ -2001,6 +2022,14 @@
+@@ -2055,6 +2076,14 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
aDocument.SetExtDocOptions( pExtDocOpt = new ScExtDocOptions );
pViewShell->GetViewData()->WriteExtOptions( *pExtDocOpt );
@@ -4172,7 +3975,7 @@
/* #115980 #If the imported document contained an encrypted password -
determine if we should save without it. */
ScExtDocSettings& rDocSett = pExtDocOpt->GetDocSettings();
-@@ -2010,6 +2039,7 @@
+@@ -2064,6 +2093,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
// #i42858# warn only on time
rDocSett.mbEncrypted = false;
}
@@ -4180,15 +3983,11 @@
}
if( bDoSave )
-Index: sc/source/ui/docshell/docsh5.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/docshell/docsh5.cxx,v
-retrieving revision 1.20
-retrieving revision 1.19.28.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.20 -r1.19.28.2
---- sc/source/ui/docshell/docsh5.cxx 10 Apr 2008 22:12:43 -0000 1.20
-+++ sc/source/ui/docshell/docsh5.cxx 6 May 2008 23:27:03 -0000 1.19.28.2
-@@ -820,7 +820,7 @@
+diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
+index cc851e6..efa4bee 100644
+--- sc/source/ui/docshell/docsh5.cxx
++++ sc/source/ui/docshell/docsh5.cxx
+@@ -820,7 +820,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
++nAdjSource; // new position of source table after CopyTab
if ( aDocument.IsTabProtected( nAdjSource ) )
@@ -4197,15 +3996,11 @@
if (bRecord)
{
-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 -b -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 @@
+diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
+index 1c7b3cc..8736c29 100644
+--- sc/source/ui/inc/docfunc.hxx
++++ sc/source/ui/inc/docfunc.hxx
+@@ -47,7 +47,7 @@ class ScRangeName;
class ScBaseCell;
class ScTokenArray;
struct ScTabOpParam;
@@ -4214,7 +4009,7 @@
// ---------------------------------------------------------------------------
-@@ -129,6 +129,8 @@
+@@ -129,6 +129,8 @@ public:
BOOL RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
BOOL bRecord, BOOL bSetModified, BOOL bApi );
@@ -4223,12 +4018,11 @@
BOOL Protect( SCTAB nTab, const String& rPassword, BOOL bApi );
BOOL Unprotect( SCTAB nTab, const String& rPassword, BOOL bApi );
-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
+diff --git a/sc/source/ui/inc/protectiondlg.hrc b/sc/source/ui/inc/protectiondlg.hrc
+new file mode 100644
+index 0000000..2eed38b
+--- /dev/null
++++ sc/source/ui/inc/protectiondlg.hrc
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
@@ -4277,12 +4071,11 @@
+
+#define ST_SELECT_LOCKED_CELLS 50
+#define ST_SELECT_UNLOCKED_CELLS 51
-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
+diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx
+new file mode 100644
+index 0000000..263931f
+--- /dev/null
++++ sc/source/ui/inc/protectiondlg.hxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
@@ -4369,12 +4162,11 @@
+};
+
+#endif
-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
+diff --git a/sc/source/ui/inc/retypepassdlg.hrc b/sc/source/ui/inc/retypepassdlg.hrc
+new file mode 100644
+index 0000000..da24d64
+--- /dev/null
++++ sc/source/ui/inc/retypepassdlg.hrc
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
@@ -4450,12 +4242,11 @@
+#define BTN_MATCH_OLD_PASSWORD 305
+#define BTN_RETYPE_PASSWORD 306
+#define BTN_REMOVE_PASSWORD 307
-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
+diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx
+new file mode 100644
+index 0000000..4899d8f
+--- /dev/null
++++ sc/source/ui/inc/retypepassdlg.hxx
@@ -0,0 +1,177 @@
+/*************************************************************************
+ *
@@ -4634,14 +4425,10 @@
+};
+
+#endif
-Index: sc/source/ui/inc/tabvwsh.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/inc/tabvwsh.hxx,v
-retrieving revision 1.30
-retrieving revision 1.30.30.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.30 -r1.30.30.2
---- sc/source/ui/inc/tabvwsh.hxx 10 Apr 2008 23:29:18 -0000 1.30
-+++ sc/source/ui/inc/tabvwsh.hxx 21 May 2008 04:37:25 -0000 1.30.30.2
+diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
+index b0f3949..77903aa 100644
+--- sc/source/ui/inc/tabvwsh.hxx
++++ sc/source/ui/inc/tabvwsh.hxx
@@ -38,6 +38,7 @@
#include "target.hxx"
#include "rangelst.hxx" // ScRangeListRef
@@ -4650,7 +4437,7 @@
class FmFormShell;
class SbxObject;
-@@ -430,6 +431,8 @@
+@@ -429,6 +430,8 @@ public:
void BroadcastAccessibility( const SfxHint &rHint );
BOOL HasAccessibilityObjects();
@@ -4659,14 +4446,10 @@
using ScTabView::ShowCursor;
};
-Index: sc/source/ui/inc/undotab.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/inc/undotab.hxx,v
-retrieving revision 1.11
-retrieving revision 1.9.424.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.9.424.3
---- sc/source/ui/inc/undotab.hxx 14 May 2008 09:59:00 -0000 1.11
-+++ sc/source/ui/inc/undotab.hxx 23 May 2008 01:50:19 -0000 1.9.424.3
+diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
+index c4aa6d5..2d6d89a 100644
+--- sc/source/ui/inc/undotab.hxx
++++ sc/source/ui/inc/undotab.hxx
@@ -52,11 +52,15 @@
#include <com/sun/star/uno/Sequence.hxx>
@@ -4683,7 +4466,7 @@
//----------------------------------------------------------------------------
-@@ -336,14 +340,15 @@
+@@ -336,14 +340,15 @@ private:
void DoChange( BOOL bShow ) const;
};
@@ -4704,7 +4487,7 @@
virtual void Undo();
virtual void Redo();
-@@ -353,11 +358,34 @@
+@@ -353,11 +358,34 @@ public:
virtual String GetComment() const;
private:
@@ -4743,15 +4526,11 @@
};
-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 -b -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 @@
+diff --git a/sc/source/ui/inc/viewfunc.hxx b/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;
class ScRangeList;
class SvxHyperlinkItem;
class ScTransferObj;
@@ -4759,7 +4538,7 @@
namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } }
-@@ -199,6 +200,8 @@
+@@ -199,6 +200,8 @@ public:
void ChangeIndent( BOOL bIncrement );
@@ -4768,15 +4547,11 @@
void Protect( SCTAB nTab, const String& rPassword );
BOOL Unprotect( SCTAB nTab, const String& rPassword );
-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 -b -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 @@
+diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk
+index bb81bba..aac2608 100644
+--- sc/source/ui/miscdlgs/makefile.mk
++++ sc/source/ui/miscdlgs/makefile.mk
+@@ -79,7 +79,9 @@ SLOFILES = \
$(SLO)$/warnbox.obj \
$(SLO)$/scuiautofmt.obj \
$(SLO)$/conflictsdlg.obj \
@@ -4787,7 +4562,7 @@
EXCEPTIONSFILES = \
$(SLO)$/acredlin.obj \
-@@ -87,7 +89,9 @@
+@@ -88,7 +90,9 @@ EXCEPTIONSFILES = \
$(SLO)$/optsolver.obj \
$(SLO)$/solveroptions.obj \
$(SLO)$/crnrdlg.obj \
@@ -4798,7 +4573,7 @@
SRS1NAME=$(TARGET)
SRC1FILES = \
-@@ -96,7 +100,9 @@
+@@ -97,7 +101,9 @@ SRC1FILES = \
highred.src \
linkarea.src \
conflictsdlg.src \
@@ -4809,23 +4584,22 @@
LIB1TARGET = $(SLB)$/$(TARGET).lib
-@@ -116,7 +122,9 @@
- $(SLO)$/redcom.obj \
- $(SLO)$/warnbox.obj \
+@@ -119,7 +125,9 @@ LIB1OBJFILES = \
$(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
# --- Tagets -------------------------------------------------------
-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
+diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
+new file mode 100644
+index 0000000..ab77209
+--- /dev/null
++++ sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -0,0 +1,161 @@
+/*************************************************************************
+ *
@@ -4988,12 +4762,11 @@
+ maBtnOk.Enable(aPass1.Equals(aPass2));
+ return 0;
+}
-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
+diff --git a/sc/source/ui/miscdlgs/protectiondlg.src b/sc/source/ui/miscdlgs/protectiondlg.src
+new file mode 100644
+index 0000000..14a1c85
+--- /dev/null
++++ sc/source/ui/miscdlgs/protectiondlg.src
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
@@ -5125,12 +4898,11 @@
+ Text [ en-US ] = "Select unlocked cells";
+ };
+};
-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
+diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
+new file mode 100644
+index 0000000..28b41b8
+--- /dev/null
++++ sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -0,0 +1,544 @@
+/*************************************************************************
+ *
@@ -5676,12 +5448,11 @@
+ CheckPasswordInput();
+ return 0;
+}
-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
+diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
+new file mode 100644
+index 0000000..4c45fbf
+--- /dev/null
++++ sc/source/ui/miscdlgs/retypepassdlg.src
@@ -0,0 +1,316 @@
+/*************************************************************************
+ *
@@ -5999,14 +5770,10 @@
+};
+
+
-Index: sc/source/ui/undo/undotab.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/undo/undotab.cxx,v
-retrieving revision 1.20
-retrieving revision 1.18.56.4
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.20 -r1.18.56.4
---- sc/source/ui/undo/undotab.cxx 14 May 2008 10:02:11 -0000 1.20
-+++ sc/source/ui/undo/undotab.cxx 23 May 2008 01:50:23 -0000 1.18.56.4
+diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
+index e1f1f69..4fa38d4 100644
+--- sc/source/ui/undo/undotab.cxx
++++ sc/source/ui/undo/undotab.cxx
@@ -61,6 +61,7 @@
#include "prnsave.hxx"
#include "printfun.hxx"
@@ -6024,7 +5791,7 @@
// STATIC DATA -----------------------------------------------------------
-@@ -85,7 +88,6 @@
+@@ -85,7 +88,6 @@ TYPEINIT1(ScUndoMakeScenario, SfxUndoAction);
TYPEINIT1(ScUndoImportTab, SfxUndoAction);
TYPEINIT1(ScUndoRemoveLink, SfxUndoAction);
TYPEINIT1(ScUndoShowHideTab, SfxUndoAction);
@@ -6032,7 +5799,7 @@
TYPEINIT1(ScUndoPrintRange, SfxUndoAction);
TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction);
TYPEINIT1(ScUndoRenameObject, SfxUndoAction);
-@@ -112,12 +114,12 @@
+@@ -112,12 +114,12 @@ ScUndoInsertTab::ScUndoInsertTab( ScDocShell* pNewDocShell,
SetChangeTrack();
}
@@ -6047,7 +5814,7 @@
{
if (bAppend)
return ScGlobal::GetRscString( STR_UNDO_APPEND_TAB );
-@@ -138,7 +140,7 @@
+@@ -138,7 +140,7 @@ void ScUndoInsertTab::SetChangeTrack()
nEndChangeAction = 0;
}
@@ -6056,7 +5823,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo(nTab);
-@@ -159,7 +161,7 @@
+@@ -159,7 +161,7 @@ void __EXPORT ScUndoInsertTab::Undo()
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -6065,7 +5832,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-@@ -180,14 +182,14 @@
+@@ -180,14 +182,14 @@ void __EXPORT ScUndoInsertTab::Redo()
SetChangeTrack();
}
@@ -6082,7 +5849,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -211,7 +213,7 @@
+@@ -211,7 +213,7 @@ ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell,
SetChangeTrack();
}
@@ -6091,7 +5858,7 @@
{
String *pStr=NULL;
if(pNameList!=NULL)
-@@ -227,7 +229,7 @@
+@@ -227,7 +229,7 @@ __EXPORT ScUndoInsertTables::~ScUndoInsertTables()
DeleteSdrUndoAction( pDrawUndo );
}
@@ -6100,7 +5867,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
}
-@@ -252,7 +254,7 @@
+@@ -252,7 +254,7 @@ void ScUndoInsertTables::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
@@ -6109,7 +5876,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo(nTab);
-@@ -282,7 +284,7 @@
+@@ -282,7 +284,7 @@ void __EXPORT ScUndoInsertTables::Undo()
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -6118,7 +5885,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-@@ -299,14 +301,14 @@
+@@ -299,14 +301,14 @@ void __EXPORT ScUndoInsertTables::Redo()
SetChangeTrack();
}
@@ -6135,7 +5902,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -327,12 +329,12 @@
+@@ -327,12 +329,12 @@ ScUndoDeleteTab::ScUndoDeleteTab( ScDocShell* pNewDocShell,const SvShorts &aTab,
SetChangeTrack();
}
@@ -6150,7 +5917,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_DELETE_TAB );
}
-@@ -366,7 +368,7 @@
+@@ -366,7 +368,7 @@ SCTAB lcl_GetVisibleTabBefore( ScDocument& rDoc, SCTAB nTab )
return nTab;
}
@@ -6159,7 +5926,7 @@
{
BeginUndo();
int i=0;
-@@ -414,7 +416,7 @@
+@@ -414,7 +416,7 @@ void __EXPORT ScUndoDeleteTab::Undo()
pDoc->SetVisible( nTab, pRefUndoDoc->IsVisible( nTab ) );
if ( pRefUndoDoc->IsTabProtected( nTab ) )
@@ -6168,7 +5935,7 @@
// Drawing-Layer passiert beim MoveUndo::EndUndo
// pDoc->TransferDrawPage(pRefUndoDoc, nTab,nTab);
-@@ -450,7 +452,7 @@
+@@ -450,7 +452,7 @@ void __EXPORT ScUndoDeleteTab::Undo()
// EndUndo();
}
@@ -6177,7 +5944,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDocShell->GetDocument(), theTabs[0] ) );
-@@ -469,7 +471,7 @@
+@@ -469,7 +471,7 @@ void __EXPORT ScUndoDeleteTab::Redo()
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -6186,7 +5953,7 @@
{
if (rTarget.ISA(ScTabViewTarget))
{
-@@ -478,7 +480,7 @@
+@@ -478,7 +480,7 @@ void __EXPORT ScUndoDeleteTab::Repeat(SfxRepeatTarget& rTarget)
}
}
@@ -6195,7 +5962,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -500,11 +502,11 @@
+@@ -500,11 +502,11 @@ ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell,
sNewName = rNewName;
}
@@ -6209,7 +5976,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_RENAME_TAB );
}
-@@ -526,22 +528,22 @@
+@@ -526,22 +528,22 @@ void ScUndoRenameTab::DoChange( SCTAB nTabP, const String& rName ) const
pViewShell->UpdateInputHandler();
}
@@ -6236,7 +6003,7 @@
{
return FALSE;
}
-@@ -565,13 +567,13 @@
+@@ -565,13 +567,13 @@ ScUndoMoveTab::ScUndoMoveTab( ScDocShell* pNewDocShell,
theNewTabs.Insert(aNewTab[sal::static_int_cast<USHORT>(i)],theNewTabs.Count());
}
@@ -6252,7 +6019,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_MOVE_TAB );
}
-@@ -618,22 +620,22 @@
+@@ -618,22 +620,22 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
pDocShell->PostDataChanged();
}
@@ -6279,7 +6046,7 @@
{
return FALSE;
}
-@@ -660,12 +662,12 @@
+@@ -660,12 +662,12 @@ ScUndoCopyTab::ScUndoCopyTab( ScDocShell* pNewDocShell,
theNewTabs.Insert(aNewTab[sal::static_int_cast<USHORT>(i)],theNewTabs.Count());
}
@@ -6294,7 +6061,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_COPY_TAB );
}
-@@ -684,7 +686,7 @@
+@@ -684,7 +686,7 @@ void ScUndoCopyTab::DoChange() const
pDocShell->PostDataChanged();
}
@@ -6303,7 +6070,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
-@@ -717,7 +719,7 @@
+@@ -717,7 +719,7 @@ void __EXPORT ScUndoCopyTab::Undo()
DoChange();
}
@@ -6312,7 +6079,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-@@ -756,7 +758,7 @@
+@@ -756,7 +758,7 @@ void __EXPORT ScUndoCopyTab::Redo()
}
if ( pDoc->IsTabProtected( nAdjSource ) )
@@ -6321,7 +6088,7 @@
}
RedoSdrUndoAction( pDrawUndo ); // after the sheets are inserted
-@@ -767,12 +769,12 @@
+@@ -767,12 +769,12 @@ void __EXPORT ScUndoCopyTab::Redo()
}
@@ -6336,7 +6103,7 @@
{
return FALSE;
}
-@@ -800,17 +802,17 @@
+@@ -800,17 +802,17 @@ ScUndoMakeScenario::ScUndoMakeScenario( ScDocShell* pNewDocShell,
{
}
@@ -6357,7 +6124,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
pDoc->DeleteTab( nDestTab );
-@@ -824,7 +826,7 @@
+@@ -824,7 +826,7 @@ void __EXPORT ScUndoMakeScenario::Undo()
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
}
@@ -6366,7 +6133,7 @@
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
-@@ -838,7 +840,7 @@
+@@ -838,7 +840,7 @@ void __EXPORT ScUndoMakeScenario::Redo()
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
}
@@ -6375,7 +6142,7 @@
{
if (rTarget.ISA(ScTabViewTarget))
{
-@@ -846,7 +848,7 @@
+@@ -846,7 +848,7 @@ void __EXPORT ScUndoMakeScenario::Repeat(SfxRepeatTarget& rTarget)
}
}
@@ -6384,7 +6151,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -869,13 +871,13 @@
+@@ -869,13 +871,13 @@ ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell,
pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() );
}
@@ -6400,7 +6167,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
}
-@@ -902,7 +904,7 @@
+@@ -902,7 +904,7 @@ void ScUndoImportTab::DoChange() const
PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS );
}
@@ -6409,7 +6176,7 @@
{
//! eingefuegte Bereichsnamen etc.
-@@ -938,7 +940,7 @@
+@@ -938,7 +940,7 @@ void __EXPORT ScUndoImportTab::Undo()
}
if ( pDoc->IsTabProtected( nTabPos ) )
@@ -6418,7 +6185,7 @@
}
}
-@@ -953,7 +955,7 @@
+@@ -953,7 +955,7 @@ void __EXPORT ScUndoImportTab::Undo()
DoChange();
}
@@ -6427,7 +6194,7 @@
{
if (!pRedoDoc)
{
-@@ -992,7 +994,7 @@
+@@ -992,7 +994,7 @@ void __EXPORT ScUndoImportTab::Redo()
}
if ( pRedoDoc->IsTabProtected( nTabPos ) )
@@ -6436,7 +6203,7 @@
}
RedoSdrUndoAction( pDrawUndo ); // after the sheets are inserted
-@@ -1000,14 +1002,14 @@
+@@ -1000,14 +1002,14 @@ void __EXPORT ScUndoImportTab::Redo()
DoChange();
}
@@ -6453,7 +6220,7 @@
{
return (rTarget.ISA(ScTabViewTarget));
}
-@@ -1055,14 +1057,14 @@
+@@ -1055,14 +1057,14 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
}
}
@@ -6470,7 +6237,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_REMOVELINK );
}
-@@ -1079,22 +1081,22 @@
+@@ -1079,22 +1081,22 @@ void ScUndoRemoveLink::DoChange( BOOL bLink ) const
pDocShell->UpdateLinks();
}
@@ -6497,7 +6264,7 @@
{
return FALSE;
}
-@@ -1112,7 +1114,7 @@
+@@ -1112,7 +1114,7 @@ ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, BOOL bN
{
}
@@ -6506,7 +6273,7 @@
{
}
-@@ -1129,17 +1131,17 @@
+@@ -1129,17 +1131,17 @@ void ScUndoShowHideTab::DoChange( BOOL bShowP ) const
pDocShell->SetDocumentModified();
}
@@ -6527,7 +6294,7 @@
{
if (rTarget.ISA(ScTabViewTarget))
((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData()->GetDispatcher().
-@@ -1147,53 +1149,44 @@
+@@ -1147,53 +1149,44 @@ void __EXPORT ScUndoShowHideTab::Repeat(SfxRepeatTarget& rTarget)
SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
}
@@ -6596,7 +6363,7 @@
}
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-@@ -1206,37 +1199,103 @@
+@@ -1206,37 +1199,103 @@ void ScUndoProtect::DoProtect( BOOL bDo )
pDocShell->PostPaintGridAll();
}
@@ -6632,10 +6399,7 @@
-String __EXPORT ScUndoProtect::GetComment() const
+String ScUndoDocProtect::GetComment() const
- {
-- USHORT nId;
-- if ( nTab == TABLEID_DOC )
-- nId = bProtect ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
++{
+ USHORT nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
+ return ScGlobal::GetRscString( nId );
+}
@@ -6650,7 +6414,10 @@
+}
+
+ScUndoTabProtect::~ScUndoTabProtect()
-+{
+ {
+- USHORT nId;
+- if ( nTab == TABLEID_DOC )
+- nId = bProtect ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
+}
+
+void ScUndoTabProtect::DoProtect(bool bProtect)
@@ -6711,7 +6478,7 @@
return ScGlobal::GetRscString( nId );
}
-@@ -1254,7 +1313,7 @@
+@@ -1254,7 +1313,7 @@ ScUndoPrintRange::ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
{
}
@@ -6720,7 +6487,7 @@
{
delete pOldRanges;
delete pNewRanges;
-@@ -1277,31 +1336,31 @@
+@@ -1277,31 +1336,31 @@ void ScUndoPrintRange::DoChange(BOOL bUndo)
pDocShell->PostPaint( ScRange(0,0,nTab,MAXCOL,MAXROW,nTab), PAINT_GRID );
}
@@ -6757,7 +6524,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_PRINTRANGES );
}
-@@ -1330,16 +1389,16 @@
+@@ -1330,16 +1389,16 @@ ScUndoScenarioFlags::ScUndoScenarioFlags( ScDocShell* pNewDocShell, SCTAB nT,
{
}
@@ -6777,7 +6544,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
-@@ -1356,7 +1415,7 @@
+@@ -1356,7 +1415,7 @@ void __EXPORT ScUndoScenarioFlags::Undo()
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
}
@@ -6786,7 +6553,7 @@
{
ScDocument* pDoc = pDocShell->GetDocument();
-@@ -1373,12 +1432,12 @@
+@@ -1373,12 +1432,12 @@ void __EXPORT ScUndoScenarioFlags::Redo()
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
}
@@ -6801,7 +6568,7 @@
{
return FALSE;
}
-@@ -1478,7 +1537,7 @@
+@@ -1478,7 +1537,7 @@ ScUndoLayoutRTL::ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRT
{
}
@@ -6810,7 +6577,7 @@
{
}
-@@ -1498,29 +1557,29 @@
+@@ -1498,29 +1557,29 @@ void ScUndoLayoutRTL::DoChange( BOOL bNew )
pDocShell->SetInUndo( FALSE );
}
@@ -6845,7 +6612,7 @@
{
return ScGlobal::GetRscString( STR_UNDO_TAB_RTL );
}
-@@ -1540,7 +1599,7 @@
+@@ -1540,7 +1599,7 @@ ScUndoSetGrammar::ScUndoSetGrammar( ScDocShell* pShell,
meOldGrammar = pDocShell->GetDocument()->GetGrammar();
}
@@ -6854,7 +6621,7 @@
{
}
-@@ -1553,17 +1612,17 @@
+@@ -1553,17 +1612,17 @@ void ScUndoSetGrammar::DoChange( ScGrammar::Grammar eGrammar )
pDocShell->SetInUndo( FALSE );
}
@@ -6875,7 +6642,7 @@
{
#if 0
// erAck: 2006-09-07T23:00+0200 commented out in CWS scr1c1
-@@ -1573,12 +1632,12 @@
+@@ -1573,12 +1632,12 @@ void __EXPORT ScUndoSetGrammar::Repeat(SfxRepeatTarget& /* rTarget */)
#endif
}
@@ -6890,14 +6657,10 @@
{
return ScGlobal::GetRscString( STR_UNDO_TAB_R1C1 );
}
-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 -b -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
+diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx
+index 78f355d..659e372 100644
+--- sc/source/ui/unoobj/warnpassword.cxx
++++ sc/source/ui/unoobj/warnpassword.cxx
@@ -32,6 +32,9 @@
#include "precompiled_sc.hxx"
@@ -6908,29 +6671,25 @@
#include "warnpassword.hxx"
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
-@@ -95,3 +98,5 @@
+@@ -95,3 +98,5 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium )
}
return bReturn;
}
+
+#endif
-Index: sc/source/ui/view/gridwin.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/gridwin.cxx,v
-retrieving revision 1.94
-retrieving revision 1.92.26.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.94 -r1.92.26.2
---- sc/source/ui/view/gridwin.cxx 18 Apr 2008 11:47:50 -0000 1.94
-+++ sc/source/ui/view/gridwin.cxx 6 May 2008 23:26:52 -0000 1.92.26.2
-@@ -135,6 +135,7 @@
- #include "userdat.hxx"
+diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
+index 38a581e..286e5fe 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -140,6 +140,7 @@
#include "drwlayer.hxx"
#include "attrib.hxx"
+ #include "cellsh.hxx"
+#include "tabprotection.hxx"
// #114409#
#include <vcl/salbtype.hxx> // FRound
-@@ -2006,11 +2007,12 @@
+@@ -2063,11 +2064,12 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
Point aPos = rMEvt.GetPosPixel();
SCsCOL nPosX;
SCsROW nPosY;
@@ -6942,10 +6701,10 @@
{
- ScAddress aCellPos( nPosX, nPosY, pViewData->GetTabNo() );
+ ScAddress aCellPos( nPosX, nPosY, nTab );
- ScDPPositionData aData;
- pDPObj->GetPositionData( aData, aCellPos );
-@@ -2047,6 +2049,23 @@
+ // Check for header drill-down first.
+ sheet::DataPilotTableHeaderData aData;
+@@ -2106,6 +2108,23 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
return;
}
@@ -6969,27 +6728,11 @@
// edit cell contents
pViewData->GetViewShell()->UpdateInputHandler();
pScMod->SetInputMode( SC_INPUT_TABLE );
-@@ -2057,9 +2076,10 @@
- MouseEvent aEditEvt( rMEvt.GetPosPixel(), 1, MOUSE_SYNTHETIC, MOUSE_LEFT, 0 );
- pEditView->MouseButtonDown( aEditEvt );
- pEditView->MouseButtonUp( aEditEvt );
-- return;
- }
- }
-+ return;
-+ }
-
- //
- // Links in edit cells
-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 -b -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 @@
+diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
+index a803f6e..3ab9e7b 100644
+--- sc/source/ui/view/scextopt.cxx
++++ sc/source/ui/view/scextopt.cxx
+@@ -42,9 +42,7 @@ ScExtDocSettings::ScExtDocSettings() :
maOleSize( ScAddress::INITIALIZE_INVALID ),
mfTabBarWidth( -1.0 ),
mnLinkCnt( 0 ),
@@ -7000,15 +6743,11 @@
{
}
-Index: sc/source/ui/view/select.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/select.cxx,v
-retrieving revision 1.19
-retrieving revision 1.18.324.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.19 -r1.18.324.2
---- sc/source/ui/view/select.cxx 11 Apr 2008 01:37:56 -0000 1.19
-+++ sc/source/ui/view/select.cxx 6 May 2008 23:26:55 -0000 1.18.324.2
-@@ -47,6 +47,7 @@
+diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
+index e3aa3d2..95c2062 100644
+--- sc/source/ui/view/select.cxx
++++ sc/source/ui/view/select.cxx
+@@ -48,6 +48,7 @@
//#include "dataobj.hxx"
#include "transobj.hxx"
#include "docsh.hxx"
@@ -7016,7 +6755,7 @@
extern USHORT nScFillModeMouseModifier; // global.cxx
-@@ -322,6 +323,26 @@
+@@ -403,6 +404,26 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
{
ScTabView* pView = pViewData->GetView();
SCTAB nTab = pViewData->GetTabNo();
@@ -7043,7 +6782,7 @@
ScModule* pScMod = SC_MOD();
BOOL bRefMode = pScMod->IsFormulaMode();
-@@ -374,7 +395,6 @@
+@@ -455,7 +476,6 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
ScRange aDelRange;
BOOL bOldDelMark = pViewData->GetDelMark( aDelRange );
@@ -7051,7 +6790,7 @@
if ( nPosX+1 >= (SCsCOL) nStartX && nPosX <= (SCsCOL) nEndX &&
nPosY+1 >= (SCsROW) nStartY && nPosY <= (SCsROW) nEndY &&
-@@ -510,7 +530,6 @@
+@@ -591,7 +611,6 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
BYTE nMode = pViewData->GetFillMode();
if ( nMode == SC_FILL_EMBED_LT || nMode == SC_FILL_EMBED_RB )
{
@@ -7059,23 +6798,19 @@
DBG_ASSERT( pDoc->IsEmbedded(), "!pDoc->IsEmbedded()" );
ScRange aRange;
pDoc->GetEmbedded( aRange);
-Index: sc/source/ui/view/tabview3.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/tabview3.cxx,v
-retrieving revision 1.67
-retrieving revision 1.65.56.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.67 -r1.65.56.2
---- sc/source/ui/view/tabview3.cxx 18 Apr 2008 11:48:39 -0000 1.67
-+++ sc/source/ui/view/tabview3.cxx 6 May 2008 23:26:39 -0000 1.65.56.2
-@@ -79,6 +79,7 @@
- #include "AccessibilityHints.hxx"
- #include "rangeutl.hxx"
- #include "client.hxx"
+diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
+index eaaa900..ac3ecbc 100644
+--- sc/source/ui/view/tabview3.cxx
++++ sc/source/ui/view/tabview3.cxx
+@@ -68,6 +68,7 @@
+ #include "inputopt.hxx"
+ #include "rfindlst.hxx"
+ #include "hiranges.hxx"
+#include "tabprotection.hxx"
-
- #include <com/sun/star/chart2/data/HighlightedRange.hpp>
-
-@@ -1020,6 +1021,17 @@
+ #include "viewuno.hxx"
+ #include "chartarr.hxx"
+ #include "anyrefdg.hxx"
+@@ -1028,6 +1029,17 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
ScDocument* pDoc = aViewData.GetDocument();
SCTAB nTab = aViewData.GetTabNo();
@@ -7093,8 +6828,8 @@
SCsCOL nOldX;
SCsROW nOldY;
SCsCOL nCurX;
-@@ -1039,7 +1051,7 @@
- nCurY = (nMovY != 0) ? nOldY+nMovY : (SCsROW) aViewData.GetOldCurY();
+@@ -1058,7 +1070,7 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+ nCurY = (nMovY != 0) ? nOldY+nMovY : nOldCurY;
}
- BOOL bHidden;
@@ -7102,7 +6837,7 @@
aViewData.ResetOldCursor();
if (nMovX != 0 && VALIDCOLROW(nCurX,nCurY))
-@@ -1048,15 +1060,20 @@
+@@ -1067,15 +1079,20 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
do
{
BYTE nColFlags = pDoc->GetColFlags( nCurX, nTab );
@@ -7126,7 +6861,7 @@
}
else
{
-@@ -1069,7 +1086,8 @@
+@@ -1088,7 +1105,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
if (nMovX > 0) ++nCurX; else --nCurX;
}
}
@@ -7136,7 +6871,7 @@
if (pDoc->IsVerOverlapped( nCurX, nCurY, nTab ))
{
aViewData.SetOldCursor( nCurX,nCurY );
-@@ -1084,15 +1102,20 @@
+@@ -1103,15 +1121,20 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
do
{
BYTE nRowFlags = pDoc->GetRowFlags( nCurY, nTab );
@@ -7160,7 +6895,7 @@
}
else
{
-@@ -1105,7 +1128,8 @@
+@@ -1124,7 +1147,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
if (nMovY > 0) ++nCurY; else --nCurY;
}
}
@@ -7170,14 +6905,10 @@
if (pDoc->IsHorOverlapped( nCurX, nCurY, nTab ))
{
aViewData.SetOldCursor( nCurX,nCurY );
-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.4
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.40 -r1.38.80.4
---- sc/source/ui/view/tabvwsh3.cxx 14 May 2008 10:05:09 -0000 1.40
-+++ sc/source/ui/view/tabvwsh3.cxx 23 May 2008 01:50:32 -0000 1.38.80.4
+diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
+index feff307..346e809 100644
+--- sc/source/ui/view/tabvwsh3.cxx
++++ sc/source/ui/view/tabvwsh3.cxx
@@ -75,6 +75,8 @@
#include "autofmt.hxx"
#include "dwfunctr.hxx"
@@ -7198,7 +6929,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 @@
+@@ -964,12 +970,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
}
}
@@ -7214,7 +6945,7 @@
{
String aText( ScResId(SCSTR_PASSWORD) );
-@@ -1030,15 +1037,12 @@
+@@ -1022,15 +1029,12 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
ScDocument* pDoc = GetViewData()->GetDocument();
SCTAB nTab = GetViewData()->GetTabNo();
@@ -7232,7 +6963,7 @@
if( IS_AVAILABLE( FID_PROTECT_TABLE, &pItem ) )
bNewProtection = ((const SfxBoolItem*)pItem)->GetValue();
if( bNewProtection == bOldProtection )
-@@ -1048,13 +1052,16 @@
+@@ -1040,13 +1044,16 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
}
}
@@ -7254,7 +6985,7 @@
pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) );
pDlg->SetMinLen( 0 );
pDlg->SetHelpId( FID_PROTECT_TABLE );
-@@ -1062,51 +1069,42 @@
+@@ -1054,51 +1061,42 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if (pDlg->Execute() == RET_OK)
aPassword = pDlg->GetPassword();
@@ -7281,19 +7012,19 @@
- 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
- bCancel = TRUE;
-+ auto_ptr<ScTableProtectionDlg> pDlg(new ScTableProtectionDlg(GetDialogParent()));
-
-- delete pDlg;
-- }
+ ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
+ if (pProtect)
+ pDlg->SetDialogData(*pProtect);
+- delete pDlg;
+- }
+-
- if( !bCancel )
- {
- if ( bOldProtection )
@@ -7325,14 +7056,10 @@
SelectionChanged();
}
break;
-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 -b -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
+diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
+index fb9408b..52c8fc4 100644
+--- sc/source/ui/view/tabvwshh.cxx
++++ sc/source/ui/view/tabvwshh.cxx
@@ -43,6 +43,7 @@
#include <sfx2/request.hxx>
#include <basic/sbxcore.hxx>
@@ -7352,7 +7079,7 @@
using namespace com::sun::star;
-@@ -270,6 +275,22 @@
+@@ -270,6 +275,22 @@ BOOL ScTabViewShell::HasAccessibilityObjects()
return pAccessibilityBroadcaster != NULL;
}
@@ -7375,15 +7102,11 @@
-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 -b -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 @@
+diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
+index 4b30ca9..7491061 100644
+--- sc/source/ui/view/viewfun2.cxx
++++ sc/source/ui/view/viewfun2.cxx
+@@ -2182,7 +2182,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
pUndoDoc->SetVisible( nTab, pDoc->IsVisible( nTab ) );
if ( pDoc->IsTabProtected( nTab ) )
@@ -7392,7 +7115,7 @@
// Drawing-Layer muss sein Undo selbst in der Hand behalten !!!
// pUndoDoc->TransferDrawPage(pDoc, nTab,nTab);
-@@ -2565,7 +2565,7 @@
+@@ -2607,7 +2607,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
}
if ( nErrVal > 0 && pDoc->IsTabProtected( TheTabs[i] ) )
@@ -7401,15 +7124,11 @@
nDestTab1++;
}
-Index: sc/source/ui/view/viewfunc.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/viewfunc.cxx,v
-retrieving revision 1.45
-retrieving revision 1.44.20.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.45 -r1.44.20.2
---- sc/source/ui/view/viewfunc.cxx 14 May 2008 10:06:28 -0000 1.45
-+++ sc/source/ui/view/viewfunc.cxx 23 May 2008 01:50:36 -0000 1.44.20.2
-@@ -2390,6 +2390,36 @@
+diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
+index 55b0cf3..d262883 100644
+--- sc/source/ui/view/viewfunc.cxx
++++ sc/source/ui/view/viewfunc.cxx
+@@ -2409,6 +2409,36 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
ShowAllCursors();
}
Added: trunk/patches/dev300/sc-dataform-officecfg.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sc-dataform-officecfg.diff Fri May 30 18:45:29 2008
@@ -0,0 +1,17 @@
+diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+index 653fa4a..52242f3 100644
+--- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
++++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+@@ -1184,6 +1184,12 @@
+ <value xml:lang="en-US">~Remove Filter</value>
+ </prop>
+ </node>
++ <node oor:name=".uno:DataForm" oor:op="replace">
++ <prop oor:name="Label" oor:type="xs:string">
++ <value xml:lang="de">D~atenForm...</value>
++ <value xml:lang="en-US">D~ataForm...</value>
++ </prop>
++ </node>
+ <node oor:name=".uno:DataSubTotals" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Sub~totals...</value>
Modified: trunk/patches/dev300/sc-dataform.diff
==============================================================================
--- trunk/patches/dev300/sc-dataform.diff (original)
+++ trunk/patches/dev300/sc-dataform.diff Fri May 30 18:45:29 2008
@@ -1,23 +1,8 @@
-diff -uNr officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
---- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 2007-09-18 14:20:48.000000000 +0800
-+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 2007-09-18 14:20:23.000000000 +0800
-@@ -1169,6 +1169,12 @@
- <value xml:lang="en-US">~Remove Filter</value>
- </prop>
- </node>
-+ <node oor:name=".uno:DataForm" oor:op="replace">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="de">D~atenForm...</value>
-+ <value xml:lang="en-US">D~ataForm...</value>
-+ </prop>
-+ </node>
- <node oor:name=".uno:DataSubTotals" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sub~totals...</value>
-diff -uNr sc/inc/document.hxx sc/inc/document.hxx
---- sc/inc/document.hxx 2007-09-18 13:29:33.000000000 +0800
-+++ sc/inc/document.hxx 2007-09-18 13:31:06.000000000 +0800
-@@ -733,7 +733,10 @@
+diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
+index b8f96ea..3e68262 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -717,7 +717,10 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
void PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
ULONG nFormatIndex, BOOL bForceTab = FALSE);
// return TRUE = Zahlformat gesetzt
@@ -29,7 +14,7 @@
void SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal );
void SetNote( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPostIt& rNote );
void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError);
-@@ -894,8 +897,10 @@
+@@ -887,8 +890,10 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
SCCOL nEndCol, SCTAB nEndTab,
SCROW nStartRow, SCSIZE nSize,
ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
@@ -41,7 +26,7 @@
BOOL InsertCol( SCROW nStartRow, SCTAB nStartTab,
SCROW nEndRow, SCTAB nEndTab,
SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL );
-@@ -1186,7 +1191,9 @@
+@@ -1187,7 +1192,9 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
USHORT nNewHeight );
void SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bManual );
@@ -52,10 +37,27 @@
USHORT GetRowHeight( SCROW nRow, SCTAB nTab ) const;
ULONG GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const;
ULONG GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, double fScale ) const;
-diff -uNr sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
---- sc/inc/scabstdlg.hxx 2007-09-18 13:29:33.000000000 +0800
-+++ sc/inc/scabstdlg.hxx 2007-09-18 13:31:07.000000000 +0800
-@@ -52,6 +52,8 @@
+diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
+index 4b48144..9f58a25 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1641,6 +1641,11 @@
+
+ #define SC_OOO_BUILD_START (SC_DIALOGS_END)
+
++// Data Form
++#define SID_DATAFORM_NEW (SC_OOO_BUILD_START + 1) // message
++#define SID_DATAFORM (SC_OOO_BUILD_START + 2) // menu (in Data menu)
++#define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 3) // dialog
++
+
+
+
+diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
+index 3403c2d..dfdf0ba 100644
+--- sc/inc/scabstdlg.hxx
++++ sc/inc/scabstdlg.hxx
+@@ -42,6 +42,8 @@
#include "global.hxx"
#include "pivot.hxx"
@@ -64,7 +66,7 @@
class ScAsciiOptions;
class ScAutoFormat;
class ScAutoFormatData;
-@@ -120,6 +122,12 @@
+@@ -111,6 +113,12 @@ public:
virtual DelCellCmd GetDelCellCmd() const = 0;
};
@@ -77,7 +79,7 @@
class AbstractScDeleteContentsDlg: public VclAbstractDialog //add for ScDeleteContentsDlg
{
public:
-@@ -333,6 +341,9 @@
+@@ -324,6 +332,9 @@ public:
virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, BOOL bDisallowCellMove = FALSE ) = 0 ; //add for ScDeleteCellDlg
@@ -87,43 +89,11 @@
virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
USHORT nCheckDefaults = 0 ) = 0;
virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg
-diff -uNr sc/inc/sc.hrc sc/inc/sc.hrc
---- sc/inc/sc.hrc 2007-09-18 13:29:33.000000000 +0800
-+++ sc/inc/sc.hrc 2007-09-18 13:31:07.000000000 +0800
-@@ -635,6 +635,7 @@
- #define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35)
- #define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36)
- #define SC_HINT_TABLECHANGED (SC_MESSAGE_START + 37)
-+#define SID_DATAFORM_NEW (SC_MESSAGE_START + 38) // Amelia Wang
-
- // Nachricht zum Oeffnen von Dialogen:
- #define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50)
-@@ -803,9 +804,10 @@
-
- #define SID_SORT_DESCENDING (DATA_MENU_START + 23)
- #define SID_SORT_ASCENDING (DATA_MENU_START + 24)
-+#define SID_DATA_FORM (DATA_MENU_START + 25)
- //
- //
--#define DATA_MENU_END (DATA_MENU_START + 25)
-+#define DATA_MENU_END (DATA_MENU_START + 26)
-
- #define TAB_POPUP_START (DATA_MENU_END)
- #define RID_POPUP_TAB (TAB_POPUP_START)
-@@ -1600,6 +1602,9 @@
- #define RID_SCDLG_DPDATEGROUP (SC_DIALOGS_START + 136)
- #define RID_SCDLG_DPSHOWDETAIL (SC_DIALOGS_START + 137)
-
-+#define RID_SCDLG_DATAFORM (SC_DIALOGS_START + 138)
-+
-+
- #define SC_DIALOGS_END (SC_DIALOGS_START + 150)
-
- #ifndef STD_MASKCOLOR
-diff -uNr sc/sdi/cellsh.sdi sc/sdi/cellsh.sdi
---- sc/sdi/cellsh.sdi 2007-09-18 13:29:33.000000000 +0800
-+++ sc/sdi/cellsh.sdi 2007-09-18 13:31:08.000000000 +0800
-@@ -64,6 +64,7 @@
+diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
+index 5e99223..baec475 100644
+--- sc/sdi/cellsh.sdi
++++ sc/sdi/cellsh.sdi
+@@ -60,6 +60,7 @@ interface CellSelection
SID_SBA_BRW_INSERT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_SELECT_DB [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_SORT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
@@ -131,10 +101,11 @@
FID_FILTER_OK [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_AUTO_FILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_AUTOFILTER_HIDE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
-diff -uNr sc/sdi/scalc.sdi sc/sdi/scalc.sdi
---- sc/sdi/scalc.sdi 2007-09-18 13:29:33.000000000 +0800
-+++ sc/sdi/scalc.sdi 2007-09-18 13:31:08.000000000 +0800
-@@ -1606,6 +1606,31 @@
+diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
+index 2fb90e6..f6cc119 100644
+--- sc/sdi/scalc.sdi
++++ sc/sdi/scalc.sdi
+@@ -1601,6 +1601,31 @@ SfxVoidItem DataSort SID_SORT
]
//--------------------------------------------------------------------------
@@ -166,10 +137,11 @@
SfxVoidItem DataSubTotals SID_SUBTOTALS
()
[
-diff -uNr sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
---- sc/source/ui/attrdlg/scdlgfact.cxx 2007-09-18 13:29:39.000000000 +0800
-+++ sc/source/ui/attrdlg/scdlgfact.cxx 2007-09-18 13:31:18.000000000 +0800
-@@ -81,6 +81,8 @@
+diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
+index aeb4786..de9b284 100644
+--- sc/source/ui/attrdlg/scdlgfact.cxx
++++ sc/source/ui/attrdlg/scdlgfact.cxx
+@@ -76,6 +76,8 @@
#include "tpstat.hxx" //add for ScDocStatPage
#include "tpusrlst.hxx" //add for ScTpUserLists
#include "tpview.hxx" //add for ScTpContentOptions
@@ -178,7 +150,7 @@
// ause
#include "editutil.hxx"
-@@ -93,6 +95,8 @@
+@@ -88,6 +90,8 @@ IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl); //add for ScDataPilotDat
IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl); //add for ScDataPilotSourceTypeDlg
IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl); //add for ScDataPilotServiceDlg
IMPL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl); //add for ScDeleteCellDlg
@@ -187,7 +159,7 @@
IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl); //add for ScDeleteContentsDlg
IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl); //add for ScFillSeriesDlg
IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl); //add for ScGroupDlg
-@@ -761,6 +765,26 @@
+@@ -761,6 +765,26 @@ AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Wi
//add for ScDeleteCellDlg end
@@ -214,10 +186,11 @@
//add for ScDeleteContentsDlg begin
AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
USHORT nCheckDefaults )
-diff -uNr sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/attrdlg/scdlgfact.hxx
---- sc/source/ui/attrdlg/scdlgfact.hxx 2007-09-18 13:29:39.000000000 +0800
-+++ sc/source/ui/attrdlg/scdlgfact.hxx 2007-09-18 13:31:18.000000000 +0800
-@@ -45,6 +45,7 @@
+diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
+index 463898c..526a1ec 100644
+--- sc/source/ui/attrdlg/scdlgfact.hxx
++++ sc/source/ui/attrdlg/scdlgfact.hxx
+@@ -40,6 +40,7 @@ class ScDataPilotDatabaseDlg;
class ScDataPilotSourceTypeDlg;
class ScDataPilotServiceDlg;
class ScDeleteCellDlg;
@@ -225,7 +198,7 @@
class ScDeleteContentsDlg;
class ScFillSeriesDlg;
class ScGroupDlg;
-@@ -167,6 +168,12 @@
+@@ -163,6 +164,12 @@ class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg //add for S
virtual DelCellCmd GetDelCellCmd() const;
};
@@ -238,7 +211,7 @@
class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg //add for ScDeleteContentsDlg
{
DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg)
-@@ -395,6 +402,9 @@
+@@ -391,6 +398,9 @@ public:
virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId,
BOOL bDisallowCellMove = FALSE ); //add for ScDeleteCellDlg
@@ -248,9 +221,11 @@
virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
USHORT nCheckDefaults = 0 );
-diff -uNr sc/source/ui/inc/datafdlg.hrc sc/source/ui/inc/datafdlg.hrc
---- sc/source/ui/inc/datafdlg.hrc 1970-01-01 08:00:00.000000000 +0800
-+++ sc/source/ui/inc/datafdlg.hrc 2007-09-18 13:31:09.000000000 +0800
+diff --git a/sc/source/ui/inc/datafdlg.hrc b/sc/source/ui/inc/datafdlg.hrc
+new file mode 100644
+index 0000000..8fa8999
+--- /dev/null
++++ sc/source/ui/inc/datafdlg.hrc
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
@@ -302,9 +277,11 @@
+#define FT_DATAFORM_FIXEDTEXT1 2001
+#define ED_DATAFORM_EDIT1 2002
\ No newline at end of file
-diff -uNr sc/source/ui/inc/datafdlg.hxx sc/source/ui/inc/datafdlg.hxx
---- sc/source/ui/inc/datafdlg.hxx 1970-01-01 08:00:00.000000000 +0800
-+++ sc/source/ui/inc/datafdlg.hxx 2007-09-18 13:31:09.000000000 +0800
+diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
+new file mode 100644
+index 0000000..b1a38c2
+--- /dev/null
++++ sc/source/ui/inc/datafdlg.hxx
@@ -0,0 +1,121 @@
+/*************************************************************************
+ *
@@ -427,10 +404,11 @@
+#endif // SC_DATAFDLG_HXX
+
+
-diff -uNr sc/source/ui/inc/undodat.hxx sc/source/ui/inc/undodat.hxx
---- sc/source/ui/inc/undodat.hxx 2007-09-18 13:29:34.000000000 +0800
-+++ sc/source/ui/inc/undodat.hxx 2007-09-18 13:31:09.000000000 +0800
-@@ -554,7 +554,43 @@
+diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
+index d5cfd54..61107ce 100644
+--- sc/source/ui/inc/undodat.hxx
++++ sc/source/ui/inc/undodat.hxx
+@@ -532,7 +532,43 @@ private:
void Init();
};
@@ -449,14 +427,14 @@
+ BOOL bRedoIsFilled = TRUE
+ );
+ virtual ~ScUndoDataForm();
-
++
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+
+ virtual String GetComment() const;
-+
+
+private:
+ ScMarkData aMarkData;
+ ScDocument* pUndoDoc;
@@ -474,10 +452,11 @@
#endif
-diff -uNr sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
---- sc/source/ui/inc/viewfunc.hxx 2007-09-18 13:29:34.000000000 +0800
-+++ sc/source/ui/inc/viewfunc.hxx 2007-09-18 13:31:09.000000000 +0800
-@@ -340,6 +340,13 @@
+diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
+index b5b00be..a88db08 100644
+--- sc/source/ui/inc/viewfunc.hxx
++++ sc/source/ui/inc/viewfunc.hxx
+@@ -328,6 +328,13 @@ public:
void ForgetFormatArea() { bFormatValid = FALSE; }
BOOL SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL );
@@ -491,9 +470,11 @@
// interne Hilfsfunktionen
protected:
void UpdateLineAttrs( SvxBorderLine& rLine,
-diff -uNr sc/source/ui/miscdlgs/datafdlg.cxx sc/source/ui/miscdlgs/datafdlg.cxx
---- sc/source/ui/miscdlgs/datafdlg.cxx 1970-01-01 08:00:00.000000000 +0800
-+++ sc/source/ui/miscdlgs/datafdlg.cxx 2007-09-18 13:31:17.000000000 +0800
+diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
+new file mode 100644
+index 0000000..da9214a
+--- /dev/null
++++ sc/source/ui/miscdlgs/datafdlg.cxx
@@ -0,0 +1,436 @@
+/*************************************************************************
+ *
@@ -931,10 +912,11 @@
+ if ( pEdits )
+ pEdits[0]->GrabFocus();
+}
-diff -uNr sc/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
---- sc/source/ui/miscdlgs/makefile.mk 2007-09-18 13:29:39.000000000 +0800
-+++ sc/source/ui/miscdlgs/makefile.mk 2007-09-18 13:31:17.000000000 +0800
-@@ -54,6 +54,7 @@
+diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk
+index 90f3afe..3569ccf 100644
+--- sc/source/ui/miscdlgs/makefile.mk
++++ sc/source/ui/miscdlgs/makefile.mk
+@@ -45,6 +45,7 @@ LIBTARGET=no
# --- Files --------------------------------------------------------
SLOFILES = \
@@ -942,9 +924,11 @@
$(SLO)$/delcldlg.obj \
$(SLO)$/inscldlg.obj \
$(SLO)$/delcodlg.obj \
-diff -uNr sc/source/ui/src/datafdlg.src sc/source/ui/src/datafdlg.src
---- sc/source/ui/src/datafdlg.src 1970-01-01 08:00:00.000000000 +0800
-+++ sc/source/ui/src/datafdlg.src 2007-09-18 13:31:10.000000000 +0800
+diff --git a/sc/source/ui/src/datafdlg.src b/sc/source/ui/src/datafdlg.src
+new file mode 100644
+index 0000000..18877fa
+--- /dev/null
++++ sc/source/ui/src/datafdlg.src
@@ -0,0 +1,108 @@
+/*************************************************************************
+ *
@@ -1054,21 +1038,23 @@
+
+
+
-diff -uNr sc/source/ui/src/makefile.mk sc/source/ui/src/makefile.mk
---- sc/source/ui/src/makefile.mk 2007-09-18 13:29:34.000000000 +0800
-+++ sc/source/ui/src/makefile.mk 2007-09-18 13:31:10.000000000 +0800
-@@ -61,6 +61,7 @@
+diff --git a/sc/source/ui/src/makefile.mk b/sc/source/ui/src/makefile.mk
+index af0e906..8f33ac9 100644
+--- sc/source/ui/src/makefile.mk
++++ sc/source/ui/src/makefile.mk
+@@ -57,6 +57,7 @@ SRC1FILES = \
dbnamdlg.src \
subtdlg.src \
miscdlgs.src \
+ datafdlg.src \
autofmt.src \
solvrdlg.src \
- tabopdlg.src \
-diff -uNr sc/source/ui/undo/undodat.cxx sc/source/ui/undo/undodat.cxx
---- sc/source/ui/undo/undodat.cxx 2007-09-18 13:29:34.000000000 +0800
-+++ sc/source/ui/undo/undodat.cxx 2007-09-18 13:31:11.000000000 +0800
-@@ -63,6 +63,8 @@
+ optsolver.src \
+diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
+index d7529d9..2dad8e7 100644
+--- sc/source/ui/undo/undodat.cxx
++++ sc/source/ui/undo/undodat.cxx
+@@ -58,6 +58,8 @@
#include "dpobject.hxx"
#include "attrib.hxx"
#include "sc.hrc"
@@ -1077,7 +1063,7 @@
// -----------------------------------------------------------------------
-@@ -83,6 +85,7 @@
+@@ -78,6 +80,7 @@ TYPEINIT1(ScUndoPivot, SfxUndoAction);
TYPEINIT1(ScUndoDataPilot, SfxUndoAction);
TYPEINIT1(ScUndoConsolidate, SfxUndoAction);
TYPEINIT1(ScUndoChartData, SfxUndoAction);
@@ -1085,7 +1071,7 @@
// -----------------------------------------------------------------------
-@@ -2182,8 +2185,218 @@
+@@ -2179,8 +2182,218 @@ BOOL __EXPORT ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return FALSE;
}
@@ -1114,13 +1100,13 @@
+
+ if ( !aMarkData.IsMarked() ) // no cell marked:
+ aMarkData.SetMarkArea( aBlockRange ); // mark paste block
-+
+
+ if ( pRefUndoData )
+ pRefUndoData->DeleteUnchanged( pDocShell->GetDocument() );
-+
+
+ SetChangeTrack();
+}
-+
+
+__EXPORT ScUndoDataForm::~ScUndoDataForm()
+{
+ delete pUndoDoc;
@@ -1128,7 +1114,7 @@
+ delete pRefUndoData;
+ delete pRefRedoData;
+}
-+
+
+String __EXPORT ScUndoDataForm::GetComment() const
+{
+ return ScGlobal::GetRscString( STR_UNDO_PASTE );
@@ -1173,7 +1159,7 @@
+ //ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pViewSh->GetActiveWin() );
+ }
+}
-+
+
+BOOL __EXPORT ScUndoDataForm::CanRepeat(SfxRepeatTarget& rTarget) const
+{
+ return (rTarget.ISA(ScTabViewTarget));
@@ -1190,21 +1176,21 @@
+ pRefRedoData = new ScRefUndoData( pDoc );
+
+ ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData;
-
++
+ // fuer Undo immer alle oder keine Inhalte sichern
+ USHORT nUndoFlags = IDF_NONE;
+ if (nFlags & IDF_CONTENTS)
+ nUndoFlags |= IDF_CONTENTS;
+ if (nFlags & IDF_ATTRIB)
+ nUndoFlags |= IDF_ATTRIB;
-
++
+ BOOL bPaintAll = FALSE;
-
++
+ ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-
++
+ // marking is in ScBlockUndo...
+ //ScUndoUtil::MarkSimpleBlock( pDocShell, aBlockRange );
-
++
+ SCTAB nTabCount = pDoc->GetTableCount();
+ if ( bUndo && !bRedoFilled )
+ {
@@ -1304,10 +1290,11 @@
+ if (pViewShell)
+ pViewShell->CellContentChanged();
+}
-diff -uNr sc/source/ui/view/cellsh2.cxx sc/source/ui/view/cellsh2.cxx
---- sc/source/ui/view/cellsh2.cxx 2007-09-18 13:29:34.000000000 +0800
-+++ sc/source/ui/view/cellsh2.cxx 2007-09-18 13:31:11.000000000 +0800
-@@ -228,6 +228,20 @@
+diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
+index 7cc4624..dffb73a 100644
+--- sc/source/ui/view/cellsh2.cxx
++++ sc/source/ui/view/cellsh2.cxx
+@@ -265,6 +265,20 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
break;
@@ -1328,7 +1315,7 @@
case SID_SUBTOTALS:
{
const SfxItemSet* pArgs = rReq.GetArgs();
-@@ -561,6 +575,15 @@
+@@ -593,6 +607,15 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
rReq.Done();
break;
@@ -1344,10 +1331,11 @@
case SID_PIVOT_TABLE:
{
const SfxPoolItem* pItem;
-diff -uNr sc/source/ui/view/viewfun3.cxx sc/source/ui/view/viewfun3.cxx
---- sc/source/ui/view/viewfun3.cxx 2007-09-18 13:29:34.000000000 +0800
-+++ sc/source/ui/view/viewfun3.cxx 2007-09-18 13:31:11.000000000 +0800
-@@ -214,6 +214,7 @@
+diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
+index 1cb5400..9c2ef97 100644
+--- sc/source/ui/view/viewfun3.cxx
++++ sc/source/ui/view/viewfun3.cxx
+@@ -208,6 +208,7 @@
#include "editable.hxx"
#include "transobj.hxx"
#include "drwtrans.hxx"
@@ -1355,7 +1343,7 @@
using namespace com::sun::star;
-@@ -1343,6 +1344,85 @@
+@@ -1414,6 +1415,85 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B
return TRUE;
}
@@ -1392,7 +1380,7 @@
+ SCCOL nUndoEndCol = nStartCol+aColLength-1;
+ SCROW nUndoEndRow = nCurrentRow;
+ USHORT nUndoFlags = IDF_NONE;
-
++
+ if ( bRecord )
+ {
+ pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
@@ -1433,7 +1421,7 @@
+ nPaint |= PAINT_LEFT;
+ nUndoEndRow = MAXROW; // nur zum Zeichnen !
+ }
-+
+
+ pDocSh->PostPaint( nStartCol, nCurrentRow, nStartTab,
+ nUndoEndCol, nUndoEndRow, nEndTab, nPaint, nExtFlags );
+ pDocSh->UpdateOle(GetViewData());
@@ -1441,10 +1429,11 @@
+}
-diff -uNr sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
---- sc/uiconfig/scalc/menubar/menubar.xml 2007-09-18 13:29:34.000000000 +0800
-+++ sc/uiconfig/scalc/menubar/menubar.xml 2007-09-18 13:31:08.000000000 +0800
-@@ -397,6 +397,7 @@
+diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
+index 7d63f85..f29aedd 100644
+--- sc/uiconfig/scalc/menubar/menubar.xml
++++ sc/uiconfig/scalc/menubar/menubar.xml
+@@ -391,6 +391,7 @@
<menu:menuitem menu:id=".uno:DataFilterHideAutoFilter"/>
</menu:menupopup>
</menu:menu>
@@ -1452,10 +1441,11 @@
<menu:menuitem menu:id=".uno:DataSubTotals"/>
<menu:menuitem menu:id=".uno:Validation"/>
<menu:menuseparator/>
-diff -uNr sc/util/makefile.mk sc/util/makefile.mk
---- sc/util/makefile.mk 2007-09-18 13:29:34.000000000 +0800
-+++ sc/util/makefile.mk 2007-09-18 13:31:08.000000000 +0800
-@@ -247,6 +247,7 @@
+diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
+index 38c205e..64e1ead 100644
+--- sc/util/makefile.mk
++++ sc/util/makefile.mk
+@@ -242,6 +242,7 @@ LIB8OBJFILES = \
$(SLO)$/filldlg.obj \
$(SLO)$/delcodlg.obj \
$(SLO)$/delcldlg.obj \
Modified: trunk/patches/dev300/sc-datapilot-autoformat.diff
==============================================================================
--- trunk/patches/dev300/sc-datapilot-autoformat.diff (original)
+++ trunk/patches/dev300/sc-datapilot-autoformat.diff Fri May 30 18:45:29 2008
@@ -1,7 +1,8 @@
-diff -u -r ../../../sc.bak/inc/dpobject.hxx sc/inc/dpobject.hxx
---- ../../../sc.bak/inc/dpobject.hxx 2004-12-22 14:05:07.000000000 +0530
-+++ sc/inc/dpobject.hxx 2005-01-11 13:20:14.887574368 +0530
-@@ -142,6 +142,7 @@
+diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
+index af87cbe..282db21 100644
+--- sc/inc/dpobject.hxx
++++ sc/inc/dpobject.hxx
+@@ -106,6 +106,7 @@ private:
ScDPOutput* pOutput;
BOOL bSettingsChanged;
BOOL bAlive; // FALSE if only used to hold settings
@@ -9,7 +10,7 @@
BOOL bAllowMove;
BOOL bInfoValid; // affects: nHeaderRows
long nHeaderRows; // page fields plus filter button
-@@ -172,6 +173,9 @@
+@@ -137,6 +138,9 @@ public:
void SetOutRange(const ScRange& rRange);
const ScRange& GetOutRange() const { return aOutRange; }
@@ -19,21 +20,24 @@
void SetSheetDesc(const ScSheetSourceDesc& rDesc);
void SetImportDesc(const ScImportSourceDesc& rDesc);
void SetServiceData(const ScDPServiceDesc& rDesc);
-diff -u -r ../../../sc.bak/inc/sc.hrc sc/inc/sc.hrc
---- ../../../sc.bak/inc/sc.hrc 2004-12-22 14:05:07.000000000 +0530
-+++ sc/inc/sc.hrc 2005-01-11 13:19:28.850573056 +0530
-@@ -1608,6 +1608,7 @@
- #define RID_SCDLG_DPDATEGROUP (SC_DIALOGS_START + 136)
- #define RID_SCDLG_DPSHOWDETAIL (SC_DIALOGS_START + 137)
-
-+#define SID_PIVOT_AFMT (SC_DIALOGS_START + 133)
- #define SC_DIALOGS_END (SC_DIALOGS_START + 150)
-
- #ifndef STD_MASKCOLOR
-diff -u -r ../../../sc.bak/sdi/pivotsh.sdi sc/sdi/pivotsh.sdi
---- ../../../sc.bak/sdi/pivotsh.sdi 2004-12-22 14:05:07.000000000 +0530
-+++ sc/sdi/pivotsh.sdi 2005-01-11 13:19:28.000000000 +0530
-@@ -65,6 +65,7 @@
+diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
+index 9f58a25..a17e56d 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1646,6 +1646,8 @@
+ #define SID_DATAFORM (SC_OOO_BUILD_START + 2) // menu (in Data menu)
+ #define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 3) // dialog
+
++// Autoformat for DataPilot
++#define SID_PIVOT_AFMT (SC_OOO_BUILD_START + 4)
+
+
+
+diff --git a/sc/sdi/pivotsh.sdi b/sc/sdi/pivotsh.sdi
+index fed3a6a..7e2f418 100644
+--- sc/sdi/pivotsh.sdi
++++ sc/sdi/pivotsh.sdi
+@@ -34,6 +34,7 @@ interface Pivot
SID_PIVOT_RECALC [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
SID_PIVOT_KILL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
SID_DP_FILTER [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
@@ -41,10 +45,11 @@
}
shell ScPivotShell
-diff -u -r ../../../sc.bak/sdi/scalc.sdi sc/sdi/scalc.sdi
---- ../../../sc.bak/sdi/scalc.sdi 2004-12-22 14:05:07.000000000 +0530
-+++ sc/sdi/scalc.sdi 2005-01-11 13:19:28.000000000 +0530
-@@ -1906,6 +1906,31 @@
+diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
+index f6cc119..b728021 100644
+--- sc/sdi/scalc.sdi
++++ sc/sdi/scalc.sdi
+@@ -1900,6 +1900,31 @@ SfxVoidItem DeletePivotTable SID_PIVOT_KILL
GroupId = GID_DATA;
]
@@ -76,10 +81,11 @@
//--------------------------------------------------------------------------
SfxVoidItem DeletePrintArea SID_DELETE_PRINTAREA
()
-diff -u -r ../../../sc.bak/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
---- ../../../sc.bak/source/core/data/dpobject.cxx 2004-12-22 14:05:08.000000000 +0530
-+++ sc/source/core/data/dpobject.cxx 2005-01-11 13:19:28.863571080 +0530
-@@ -151,6 +151,7 @@
+diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
+index d534160..67edc4d 100644
+--- sc/source/core/data/dpobject.cxx
++++ sc/source/core/data/dpobject.cxx
+@@ -160,6 +160,7 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
pImpDesc( NULL ),
pServDesc( NULL ),
pOutput( NULL ),
@@ -87,7 +93,7 @@
bSettingsChanged( FALSE ),
bAlive( FALSE ),
bAllowMove( FALSE ),
-@@ -166,6 +167,7 @@
+@@ -175,6 +176,7 @@ ScDPObject::ScDPObject(const ScDPObject& r) :
aTableName( r.aTableName ),
aTableTag( r.aTableTag ),
aOutRange( r.aOutRange ),
@@ -95,7 +101,7 @@
pSheetDesc( NULL ),
pImpDesc( NULL ),
pServDesc( NULL ),
-@@ -245,6 +247,11 @@
+@@ -231,6 +233,11 @@ void ScDPObject::SetSaveData(const ScDPSaveData& rData)
InvalidateData(); // re-init source from SaveData
}
@@ -107,10 +113,11 @@
void ScDPObject::SetOutRange(const ScRange& rRange)
{
aOutRange = rRange;
-diff -u -r ../../../sc.bak/source/ui/docshell/dbdocfun.cxx sc/source/ui/docshell/dbdocfun.cxx
---- ../../../sc.bak/source/ui/docshell/dbdocfun.cxx 2004-12-22 14:05:08.000000000 +0530
-+++ sc/source/ui/docshell/dbdocfun.cxx 2005-01-11 13:54:59.264700880 +0530
-@@ -1376,6 +1376,36 @@
+diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
+index e9e1b7e..78d6e28 100644
+--- sc/source/ui/docshell/dbdocfun.cxx
++++ sc/source/ui/docshell/dbdocfun.cxx
+@@ -1369,6 +1369,36 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
delete pNewUndoDoc;
delete pUndoDPObj;
@@ -147,10 +154,11 @@
if (bDone)
aModificator.SetDocumentModified();
-diff -u -r ../../../sc.bak/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
---- ../../../sc.bak/source/ui/inc/dbfunc.hxx 2004-12-22 14:05:07.000000000 +0530
-+++ sc/source/ui/inc/dbfunc.hxx 2005-01-11 13:21:00.515637848 +0530
-@@ -117,6 +117,8 @@
+diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
+index 0e46f3f..2e4bf9f 100644
+--- sc/source/ui/inc/dbfunc.hxx
++++ sc/source/ui/inc/dbfunc.hxx
+@@ -90,6 +90,8 @@ public:
const ScDPObject& rSource, BOOL bApi = FALSE );
void DeletePivotTable();
void RecalcPivotTable();
@@ -159,10 +167,11 @@
BOOL HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts );
BOOL HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo );
-diff -u -r ../../../sc.bak/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
---- ../../../sc.bak/source/ui/inc/viewdata.hxx 2004-12-22 14:05:07.000000000 +0530
-+++ sc/source/ui/inc/viewdata.hxx 2005-01-11 13:21:48.324369816 +0530
-@@ -331,6 +331,10 @@
+diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
+index 12e59bd..3e48121 100644
+--- sc/source/ui/inc/viewdata.hxx
++++ sc/source/ui/inc/viewdata.hxx
+@@ -331,6 +331,10 @@ public:
ScMarkType GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab,
SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const;
@@ -173,12 +182,13 @@
ScMarkType GetSimpleArea( ScRange& rRange ) const;
/// May modify rNewMark using MarkToSimple().
ScMarkType GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const;
-diff -u -r ../../../sc.bak/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
---- ../../../sc.bak/source/ui/miscdlgs/makefile.mk 2004-12-22 14:05:08.000000000 +0530
-+++ sc/source/ui/miscdlgs/makefile.mk 2005-01-11 14:43:07.477625776 +0530
-@@ -136,7 +136,9 @@
- $(SLO)$/warnbox.obj \
- $(SLO)$/scuiautofmt.obj \
+diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk
+index 3569ccf..bb81bba 100644
+--- sc/source/ui/miscdlgs/makefile.mk
++++ sc/source/ui/miscdlgs/makefile.mk
+@@ -117,7 +117,9 @@ LIB1OBJFILES = \
+ $(SLO)$/redcom.obj \
+ $(SLO)$/warnbox.obj \
$(SLO)$/conflictsdlg.obj \
- $(SLO)$/sharedocdlg.obj
+ $(SLO)$/sharedocdlg.obj \
@@ -187,10 +197,11 @@
# --- Tagets -------------------------------------------------------
-diff -u -r ../../../sc.bak/source/ui/src/popup.src sc/source/ui/src/popup.src
---- ../../../sc.bak/source/ui/src/popup.src 2004-12-22 14:05:07.000000000 +0530
-+++ sc/source/ui/src/popup.src 2005-01-11 13:25:54.836894216 +0530
-@@ -318,6 +318,84 @@ Menu RID_POPUP_PIVOT
+diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
+index ba9508c..b576003 100644
+--- sc/source/ui/src/popup.src
++++ sc/source/ui/src/popup.src
+@@ -206,6 +206,84 @@ Menu RID_POPUP_PIVOT
Text [ en-US ] = "~Start..." ;
};
MenuItem
@@ -275,10 +286,11 @@
{
Identifier = SID_PIVOT_RECALC ;
HelpId = SID_PIVOT_RECALC ;
-diff -u -r ../../../sc.bak/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
---- ../../../sc.bak/source/ui/view/dbfunc3.cxx 2004-12-22 14:05:08.000000000 +0530
-+++ sc/source/ui/view/dbfunc3.cxx 2005-01-11 13:19:28.894566368 +0530
-@@ -1794,7 +1794,29 @@
+diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
+index 9ac2287..05a7fbe 100644
+--- sc/source/ui/view/dbfunc3.cxx
++++ sc/source/ui/view/dbfunc3.cxx
+@@ -1968,7 +1968,29 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
else // "Keine Operationen auszufuehren"
ErrorMessage(STR_MSSG_REPEATDB_0);
}
@@ -286,7 +298,7 @@
+{
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScDocument* pDoc = GetViewData()->GetDocument();
-
++
+ // old pivot not used any more
+
+ ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(),
@@ -298,7 +310,7 @@
+ }
+ else
+ ErrorMessage(STR_PIVOT_NOTFOUND);
-+
+
+}
+
+void ScDBFunc::AutoFormatPivotTable(ScDPObject* pDPObj, USHORT nIndex)
@@ -308,10 +320,11 @@
-diff -u -r ../../../sc.bak/source/ui/view/pivotsh.cxx sc/source/ui/view/pivotsh.cxx
---- ../../../sc.bak/source/ui/view/pivotsh.cxx 2004-12-22 14:05:08.000000000 +0530
-+++ sc/source/ui/view/pivotsh.cxx 2005-01-11 13:46:00.779563064 +0530
-@@ -88,6 +88,12 @@
+diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
+index 19b694f..ccfa022 100644
+--- sc/source/ui/view/pivotsh.cxx
++++ sc/source/ui/view/pivotsh.cxx
+@@ -56,6 +56,12 @@
#include "uiitems.hxx"
//CHINA001 #include "pfiltdlg.hxx"
#include "scabstdlg.hxx" //CHINA001
@@ -324,7 +337,7 @@
//------------------------------------------------------------------------
#define ScPivotShell
-@@ -125,13 +131,56 @@
+@@ -99,13 +105,56 @@ void ScPivotShell::Execute( SfxRequest& rReq )
{
switch ( rReq.GetSlot() )
{
@@ -351,7 +364,7 @@
+ ScGlobal::GetAutoFormat(),
+ pNewEntry,
+ pViewShell->GetViewData()->GetDocument() );
-+
+
+ if ( pDlg->Execute() == RET_OK )
+ {
+ ScEditableTester aTester( pViewShell );
@@ -368,7 +381,7 @@
+ }
+ delete pDlg;
+ delete pNewEntry;
-
++
+
+ //pViewShell->DeletePivotTable();
+ //pViewShell->RecalcPivotTable();
@@ -384,10 +397,11 @@
case SID_DP_FILTER:
{
-diff -u -r ../../../sc.bak/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
---- ../../../sc.bak/source/ui/view/viewdata.cxx 2004-12-22 14:05:08.000000000 +0530
-+++ sc/source/ui/view/viewdata.cxx 2005-01-11 13:23:56.430894664 +0530
-@@ -654,6 +654,22 @@
+diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
+index 21d548e..d1e4463 100644
+--- sc/source/ui/view/viewdata.cxx
++++ sc/source/ui/view/viewdata.cxx
+@@ -670,6 +670,22 @@ void ScViewData::RefreshZoom()
aLogicMode.SetScaleY( GetZoomY() );
}
Added: trunk/patches/dev300/sc-hrc-ooo-build-resources.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sc-hrc-ooo-build-resources.diff Fri May 30 18:45:29 2008
@@ -0,0 +1,19 @@
+diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
+index f75956a..4b48144 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1636,6 +1636,14 @@
+ #define MID_3 3
+ #define MID_4 4
+
++// ----------------------------------------------------------------------------
++// ooo-build specific resources
++
++#define SC_OOO_BUILD_START (SC_DIALOGS_END)
++
++
++
++
+ #endif
+
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
