ooo-build r14948 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14948 - in trunk: . patches/dev300
- Date: Mon, 29 Dec 2008 16:57:56 +0000 (UTC)
Author: kyoshida
Date: Mon Dec 29 16:57:56 2008
New Revision: 14948
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14948&view=rev
Log:
2008-12-29 Kohei Yoshida <kyoshida novell com>
* patches/dev300/sc-overwrite-char-font-attrs-m37.diff:
* patches/dev300/sc-overwrite-char-font-attrs.diff:
* patches/dev300/apply: more dev300-m38 work.
Added:
trunk/patches/dev300/sc-overwrite-char-font-attrs-m37.diff
- copied unchanged from r14946, /trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Dec 29 16:57:56 2008
@@ -880,9 +880,15 @@
# button.
sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
+[ CalcFixes < dev300-m38 ]
+# overwrite character level font attributes when changing them at cell level.
+sc-overwrite-char-font-attrs-m37.diff, n#374580, i#53545, i#96853, kohei
+
+[ CalcFixes >= dev300-m38 ]
# overwrite character level font attributes when changing them at cell level.
sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
+[ CalcFixes ]
# ignore manual breaks when the "fit to x pages wide and x pages tall" option
# is used, for Excel interoperability.
sc-fit-to-width-height-skip-breaks.diff, n#404232, n#404563, i#94698, kohei
Modified: trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
==============================================================================
--- trunk/patches/dev300/sc-overwrite-char-font-attrs.diff (original)
+++ trunk/patches/dev300/sc-overwrite-char-font-attrs.diff Mon Dec 29 16:57:56 2008
@@ -1,5 +1,5 @@
diff --git sc/inc/attarray.hxx sc/inc/attarray.hxx
-index f123276..5bfa8cd 100644
+index e212084..2a8c515 100644
--- sc/inc/attarray.hxx
+++ sc/inc/attarray.hxx
@@ -35,6 +35,7 @@
@@ -35,7 +35,7 @@
const SvxBorderLine* pLine, BOOL bColorOnly );
diff --git sc/inc/cell.hxx sc/inc/cell.hxx
-index 8484278..ac35dc6 100644
+index b2917c7..1b4e162 100644
--- sc/inc/cell.hxx
+++ sc/inc/cell.hxx
@@ -34,6 +34,9 @@
@@ -56,7 +56,7 @@
class ScMultipleReadHeader;
class ScMultipleWriteHeader;
-@@ -217,8 +221,57 @@ public:
+@@ -203,8 +207,57 @@ public:
void GetString( String& rString ) const;
const EditTextObject* GetData() const { return pData; }
@@ -115,7 +115,7 @@
MM_NONE = 0, // No matrix formula
MM_FORMULA = 1, // Upper left matrix formula cell
diff --git sc/inc/column.hxx sc/inc/column.hxx
-index 388ad6c..3621d78 100644
+index 4cc04d5..d968c30 100644
--- sc/inc/column.hxx
+++ sc/inc/column.hxx
@@ -56,6 +56,7 @@ class ScAttrIterator;
@@ -126,7 +126,7 @@
class ScFormulaCell;
class ScMarkData;
class ScMultipleReadHeader;
-@@ -316,7 +317,8 @@ public:
+@@ -310,7 +311,8 @@ public:
void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr );
void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr );
@@ -136,7 +136,7 @@
void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE );
void SetPatternArea( SCROW nStartRow, SCROW nEndRow,
const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE );
-@@ -348,7 +350,7 @@ public:
+@@ -342,7 +344,7 @@ public:
void RemoveProtected( SCROW nStartRow, SCROW nEndRow );
@@ -146,7 +146,7 @@
void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 2bf4393..6d361ae 100644
+index 872bcf7..44f2e07 100644
--- sc/inc/document.hxx
+++ sc/inc/document.hxx
@@ -368,6 +368,7 @@ private:
@@ -157,7 +157,7 @@
BOOL bImportingXML; // special handling of formula text
BOOL bXMLFromWrapper; // distinguish ScXMLImportWrapper from external component
BOOL bCalcingAfterLoad; // in CalcAfterLoad TRUE
-@@ -1140,7 +1141,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
+@@ -1107,7 +1108,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
const ScPatternAttr& rAttr );
void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
@@ -167,7 +167,7 @@
void ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow, SCTAB nTab,
const ScPatternAttr& rAttr );
-@@ -1207,7 +1209,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
+@@ -1169,7 +1171,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
SCCOL nVCol, SCROW nVRow, SCTAB nVTab,
const String& sValStr, double& nX);
@@ -177,7 +177,7 @@
void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
void DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark );
-@@ -1477,6 +1480,8 @@ SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
+@@ -1426,6 +1429,8 @@ SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
BOOL GetNoSetDirty() const { return bNoSetDirty; }
void SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; }
BOOL IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; }
@@ -187,7 +187,7 @@
BOOL IsImportingXML() const { return bImportingXML; }
void SetXMLFromWrapper( BOOL bVal );
diff --git sc/inc/table.hxx sc/inc/table.hxx
-index c9f6603..570bdd3 100644
+index 5d8539f..a74c8ef 100644
--- sc/inc/table.hxx
+++ sc/inc/table.hxx
@@ -57,6 +57,7 @@ class ScAutoFormatData;
@@ -198,7 +198,7 @@
class ScFormulaCell;
class ScOutlineTable;
class ScPostIt;
-@@ -454,7 +455,8 @@ public:
+@@ -449,7 +450,8 @@ public:
void ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr );
void ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr );
@@ -208,7 +208,7 @@
void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE )
{ aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr, bPutToPool ); }
void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE );
-@@ -482,7 +484,7 @@ public:
+@@ -477,7 +479,7 @@ public:
BOOL ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags );
BOOL RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags );
@@ -218,7 +218,7 @@
void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
diff --git sc/source/core/data/attarray.cxx sc/source/core/data/attarray.cxx
-index 19e7684..6102796 100644
+index fca2695..3d0e5de 100644
--- sc/source/core/data/attarray.cxx
+++ sc/source/core/data/attarray.cxx
@@ -41,6 +41,7 @@
@@ -304,21 +304,20 @@
}
else
diff --git sc/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
-index 3357180..a4c9a1c 100644
+index 55c5431..a7ae2a8 100644
--- sc/source/core/data/cell2.cxx
+++ sc/source/core/data/cell2.cxx
-@@ -49,7 +49,8 @@
- #include "editutil.hxx"
+@@ -50,6 +50,8 @@
#include "chgtrack.hxx"
#include "indexmap.hxx"
--
-+#include "scitems.hxx"
-+#include "patattr.hxx"
+ #include "externalrefmgr.hxx"
++#include "scitems.hxx"
++#include "patattr.hxx"
// STATIC DATA -----------------------------------------------------------
-@@ -189,6 +190,28 @@ void ScEditCell::Save( SvStream& rStream ) const
- pData->Store( rStream );
+@@ -141,6 +143,28 @@ void ScEditCell::GetString( String& rString ) const
+ rString.Erase();
}
+void ScEditCell::RemoveCharAttribs( const ScPatternAttr& rAttr )
@@ -346,7 +345,7 @@
void ScEditCell::SetTextObject( const EditTextObject* pObject,
const SfxItemPool* pFromPool )
{
-@@ -224,6 +246,76 @@ void ScEditCell::SetTextObject( const EditTextObject* pObject,
+@@ -176,6 +200,76 @@ void ScEditCell::SetTextObject( const EditTextObject* pObject,
pData = NULL;
}
@@ -424,10 +423,10 @@
BOOL ScFormulaCell::IsEmpty()
diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx
-index fc848b1..67f0b70 100644
+index df502e6..f4555dc 100644
--- sc/source/core/data/column.cxx
+++ sc/source/core/data/column.cxx
-@@ -369,7 +369,7 @@ ULONG ScColumn::GetNumberFormat( SCROW nRow ) const
+@@ -385,7 +385,7 @@ ULONG ScColumn::GetNumberFormat( SCROW nRow ) const
}
@@ -436,7 +435,7 @@
{
SCROW nTop = 0;
SCROW nBottom = 0;
-@@ -380,7 +380,7 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData
+@@ -396,7 +396,7 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData
ScMarkArrayIter aMarkIter( rMark.GetArray() + nCol );
while (aMarkIter.Next( nTop, nBottom ))
{
@@ -445,7 +444,7 @@
bFound = TRUE;
}
}
-@@ -454,11 +454,12 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr )
+@@ -470,11 +470,12 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr )
}
@@ -461,10 +460,10 @@
diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
-index cbf19d4..08912c2 100644
+index 9db90f4..e4e9354 100644
--- sc/source/core/data/documen2.cxx
+++ sc/source/core/data/documen2.cxx
-@@ -187,6 +187,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
+@@ -188,6 +188,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
// bNoSetDirty( TRUE ),
bNoSetDirty( FALSE ),
bInsertingFromOtherDoc( FALSE ),
@@ -473,10 +472,10 @@
bXMLFromWrapper( FALSE ),
bCalcingAfterLoad( FALSE ),
diff --git sc/source/core/data/documen9.cxx sc/source/core/data/documen9.cxx
-index 2b3c3f7..c29607d 100644
+index b2c43a2..8b4575c 100644
--- sc/source/core/data/documen9.cxx
+++ sc/source/core/data/documen9.cxx
-@@ -885,6 +885,16 @@ void ScDocument::UpdateFontCharSet()
+@@ -827,6 +827,16 @@ void ScDocument::UpdateFontCharSet()
}
}
@@ -494,10 +493,10 @@
{
bImportingXML = bVal;
diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 3f6030c..c5dc8b8 100644
+index 9de1ce5..cfd819d 100644
--- sc/source/core/data/document.cxx
+++ sc/source/core/data/document.cxx
-@@ -3117,12 +3117,13 @@ void ScDocument::ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatte
+@@ -3105,12 +3105,13 @@ void ScDocument::ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatte
void ScDocument::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark,
@@ -513,7 +512,7 @@
}
-@@ -4211,7 +4212,7 @@ void ScDocument::ApplyFrameAreaTab( const ScRange& rRange,
+@@ -4042,7 +4043,7 @@ void ScDocument::ApplyFrameAreaTab( const ScRange& rRange,
}
@@ -522,7 +521,7 @@
{
const SfxItemSet* pSet = &rAttr.GetItemSet();
BOOL bSet = FALSE;
-@@ -4228,7 +4229,7 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark
+@@ -4059,7 +4060,7 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark
ScRange aRange;
rMark.GetMarkArea( aRange );
ApplyPatternArea( aRange.aStart.Col(), aRange.aStart.Row(),
@@ -531,7 +530,7 @@
}
else
{
-@@ -4236,7 +4237,7 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark
+@@ -4067,7 +4068,7 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark
for (SCTAB nTab=0; nTab<=MAXTAB; nTab++)
if (pTab[nTab])
if (rMark.GetTableSelect(nTab))
@@ -541,10 +540,10 @@
}
}
diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index 0ae2d0b..6a55cb5 100644
+index d60d337..1aad7a0 100644
--- sc/source/core/data/table2.cxx
+++ sc/source/core/data/table2.cxx
-@@ -1648,14 +1648,14 @@ void ScTable::ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr )
+@@ -1654,14 +1654,14 @@ void ScTable::ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr )
void ScTable::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
@@ -561,7 +560,7 @@
}
}
-@@ -1863,10 +1863,11 @@ void ScTable::ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr )
+@@ -1869,10 +1869,11 @@ void ScTable::ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr )
}
@@ -576,10 +575,10 @@
diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index 9bcc078..c702954 100644
+index 257f21b..d8c30de 100644
--- sc/source/ui/docshell/docsh.cxx
+++ sc/source/ui/docshell/docsh.cxx
-@@ -680,10 +680,31 @@ BOOL ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::R
+@@ -430,10 +430,31 @@ BOOL ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::R
return bRet;
}
@@ -612,7 +611,7 @@
ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
// only the latin script language is loaded
-@@ -1048,7 +1069,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
+@@ -772,7 +793,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::LoadFrom" );
@@ -621,7 +620,7 @@
ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
WaitObject aWait( GetActiveDialogParent() );
-@@ -1075,6 +1096,7 @@ BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
+@@ -799,6 +820,7 @@ BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertFrom" );
@@ -630,7 +629,7 @@
BOOL bRet = FALSE; // FALSE heisst Benutzerabbruch !!
// bei Fehler: Fehler am Stream setzen!!
diff --git sc/source/ui/inc/undoblk.hxx sc/source/ui/inc/undoblk.hxx
-index cfa37e2..6f7c526 100644
+index b48a051..d65bfa2 100644
--- sc/source/ui/inc/undoblk.hxx
+++ sc/source/ui/inc/undoblk.hxx
@@ -35,6 +35,10 @@
@@ -644,7 +643,7 @@
class ScDocShell;
class ScDocument;
class ScOutlineTable;
-@@ -347,9 +351,11 @@ public:
+@@ -353,9 +357,11 @@ public:
virtual String GetComment() const;
@@ -656,7 +655,7 @@
ScDocument* pUndoDoc;
BOOL bMulti;
ScPatternAttr* pApplyPattern;
-@@ -357,6 +363,7 @@ private:
+@@ -363,6 +369,7 @@ private:
SvxBoxInfoItem* pLineInner;
void DoChange( const BOOL bUndo );
@@ -715,10 +714,10 @@
# --- Tagets -------------------------------------------------------
diff --git sc/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx
-index 9cabbd7..5cf9b92 100644
+index e2d5ade..cdc877f 100644
--- sc/source/ui/undo/undoblk3.cxx
+++ sc/source/ui/undo/undoblk3.cxx
-@@ -474,6 +474,12 @@ String __EXPORT ScUndoSelectionAttr::GetComment() const
+@@ -460,6 +460,12 @@ String __EXPORT ScUndoSelectionAttr::GetComment() const
return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR );
}
@@ -731,7 +730,7 @@
//----------------------------------------------------------------------------
-@@ -492,6 +498,8 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
+@@ -478,6 +484,8 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
USHORT nExtFlags = 0;
pDocShell->UpdatePaintExt( nExtFlags, aEffRange );
@@ -740,7 +739,7 @@
if (bUndo) // nur bei Undo
{
ScRange aCopyRange = aRange;
-@@ -516,6 +524,24 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
+@@ -502,6 +510,24 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
ShowTable( aRange );
}
@@ -766,7 +765,7 @@
//----------------------------------------------------------------------------
diff --git sc/source/ui/undo/undocell.cxx sc/source/ui/undo/undocell.cxx
-index 5a8d9fa..9ff33fe 100644
+index 750bf62..b3fb3f7 100644
--- sc/source/ui/undo/undocell.cxx
+++ sc/source/ui/undo/undocell.cxx
@@ -61,6 +61,8 @@
@@ -830,10 +829,10 @@
}
diff --git sc/source/ui/view/viewfunc.cxx sc/source/ui/view/viewfunc.cxx
-index 666b939..d262883 100644
+index ef0e0a0..94aa94d 100644
--- sc/source/ui/view/viewfunc.cxx
+++ sc/source/ui/view/viewfunc.cxx
-@@ -1293,6 +1293,8 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
+@@ -1297,6 +1297,8 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
SCROW nEndRow = aMarkRange.aEnd.Row();
SCTAB nEndTab = aMarkRange.aEnd.Tab();
@@ -842,7 +841,7 @@
if (bRecord)
{
ScRange aCopyRange = aMarkRange;
-@@ -1309,15 +1311,14 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
+@@ -1313,15 +1315,14 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
aFuncMark.MarkToMulti();
@@ -864,7 +863,7 @@
pDocSh->PostPaint( nStartCol, nStartRow, nStartTab,
nEndCol, nEndRow, nEndTab,
-@@ -1331,6 +1332,19 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
+@@ -1335,6 +1336,19 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
SCCOL nCol = pViewData->GetCurX();
SCROW nRow = pViewData->GetCurY();
SCTAB nTab = pViewData->GetTabNo();
@@ -883,8 +882,8 @@
+
ScPatternAttr* pOldPat = new ScPatternAttr(*pDoc->GetPattern( nCol, nRow, nTab ));
- if (!bCursorOnly)
-@@ -1340,11 +1354,10 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
+ pDoc->ApplyPattern( nCol, nRow, nTab, rAttr );
+@@ -1343,11 +1357,10 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
if (bRecord)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]