[ooo-build-commit] 6 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 11 02:57:05 PDT 2009
patches/dev300/apply | 14 ++---
patches/dev300/calc-dp-custom-names-sc-group-fix.diff | 6 --
patches/dev300/calc-dp-custom-names-sc.diff | 49 +++++++-----------
3 files changed, 30 insertions(+), 39 deletions(-)
New commits:
commit ccd8b9d3f5148b3e31d4d8e14aabe2f2029f7f33
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 12:54:03 2009 +0300
i#100827 is upstream
* patches/dev300/apply: Move also svx-speed-editeng.diff to
UnUsedButNotYetRemovedFromGit as it seems to be upstreamed.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 454c2f3..a8fa9be 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -752,10 +752,6 @@ calc-menu-manual-page-break.diff, kohei
# make biffdumper build
fix-biffdumper.diff, noelpwer
-# accelerate calc HTML import from it's horribly turgid state
-# removes an N^2 algorithm, and saves 8 bn cycles for a small
-# HTML file for me.
-svx-speed-editeng.diff, i#100827, michael
# FIXME: enable me after 3.1 release ...
# svtools-speed-itemset.diff, i#100910, michael
@@ -2273,6 +2269,7 @@ calc-autofill-increment-fix.diff, i#5550, kohei
# HTML file for me.
sc-speed-html-import.diff, i#100827, michael
sc-speed-html-import-sizing.diff, i#100827, michael
+svx-speed-editeng.diff, i#100827, michael
[ Store ]
commit 9a2dff7bea8e89f3f0ae0a431a15652b35b828a4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 12:51:11 2009 +0300
i#100827 is fixed upstream
* patches/dev300/apply: Move sc-speed-html-import-sizing.diff, too, to
UnUsedButNotYetRemovedFromGit.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 551cc34..454c2f3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -755,7 +755,6 @@ fix-biffdumper.diff, noelpwer
# accelerate calc HTML import from it's horribly turgid state
# removes an N^2 algorithm, and saves 8 bn cycles for a small
# HTML file for me.
-sc-speed-html-import-sizing.diff, i#100827, michael
svx-speed-editeng.diff, i#100827, michael
# FIXME: enable me after 3.1 release ...
# svtools-speed-itemset.diff, i#100910, michael
@@ -2273,6 +2272,7 @@ calc-autofill-increment-fix.diff, i#5550, kohei
# removes an N^2 algorithm, and saves 8 bn cycles for a small
# HTML file for me.
sc-speed-html-import.diff, i#100827, michael
+sc-speed-html-import-sizing.diff, i#100827, michael
[ Store ]
commit 5fce52a4532a5993f5e873b129298821387c3bba
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 12:37:31 2009 +0300
Actually move sc-speed-html-import-sizing.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e105c29..551cc34 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -755,7 +755,6 @@ fix-biffdumper.diff, noelpwer
# accelerate calc HTML import from it's horribly turgid state
# removes an N^2 algorithm, and saves 8 bn cycles for a small
# HTML file for me.
-sc-speed-html-import.diff, i#100827, michael
sc-speed-html-import-sizing.diff, i#100827, michael
svx-speed-editeng.diff, i#100827, michael
# FIXME: enable me after 3.1 release ...
commit af9a7e27652a79e2852cbea5f3d5386402c14279
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 12:35:29 2009 +0300
i#100827 is fixed upstream
* patches/dev300/apply: Move sc-speed-html-import.diff to
UnUsedButNotYetRemovedFromGit. The issue is marked as fixed and
verified. Seems to be fixed in a different manner than our patch,
though, so keep it for a while here.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1f80468..e105c29 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2270,6 +2270,12 @@ chart-skip-hidden-cells-sc.diff, n#404190, i#81209, n#425617, kohei
# modify the autofill behavior to bring it a little closer to Excel's.
calc-autofill-increment-fix.diff, i#5550, kohei
+# accelerate calc HTML import from it's horribly turgid state
+# removes an N^2 algorithm, and saves 8 bn cycles for a small
+# HTML file for me.
+sc-speed-html-import.diff, i#100827, michael
+
+
[ Store ]
SectionOwner => rodo
SectionIssue => i#75399
commit 2e566fa3872c4a59776fbf2b3010de4dc29c4904
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 12:30:43 2009 +0300
Adapt calc-dp-custom-names-sc-group-fix.diff for dev300
* patches/dev300/calc-dp-custom-names-sc-group-fix.diff: Adapt for
dev300-m54.
diff --git a/patches/dev300/calc-dp-custom-names-sc-group-fix.diff b/patches/dev300/calc-dp-custom-names-sc-group-fix.diff
index 804e55a..892f66c 100644
--- a/patches/dev300/calc-dp-custom-names-sc-group-fix.diff
+++ b/patches/dev300/calc-dp-custom-names-sc-group-fix.diff
@@ -1,5 +1,3 @@
-diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
-index cd4dcd1..eddb200 100644
--- sc/source/core/data/dpobject.cxx
+++ sc/source/core/data/dpobject.cxx
@@ -448,7 +448,7 @@ void ScDPObject::CreateObjects()
@@ -12,10 +10,10 @@ index cd4dcd1..eddb200 100644
if (!xSource.is())
{
@@ -501,6 +501,7 @@ void ScDPObject::InvalidateSource()
+ void ScDPObject::InvalidateSource()
{
xSource = NULL;
- bInfoValid = FALSE;
-+ mpTableData.reset();
++ mpTableData.reset();
}
ScRange ScDPObject::GetNewOutputRange( BOOL& rOverflow )
commit aa8a2efb10bf3e5665e0ce4d4f4a9e40b8b5ab84
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 12:28:27 2009 +0300
Adapt calc-dp-custom-names-sc.diff for dev300
* patches/dev300/calc-dp-custom-names-sc.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/calc-dp-custom-names-sc.diff b/patches/dev300/calc-dp-custom-names-sc.diff
index ac79be2..0ed7adc 100644
--- a/patches/dev300/calc-dp-custom-names-sc.diff
+++ b/patches/dev300/calc-dp-custom-names-sc.diff
@@ -675,8 +675,6 @@ index a411c80..de9c898 100644
}
bool lcl_IsCondition( const sheet::MemberResult& rResultEntry, const ScDPGetPivotDataField& rFilter )
-diff --git sc/source/core/data/dpsave.cxx sc/source/core/data/dpsave.cxx
-index 130e7a8..f41ea2c 100644
--- sc/source/core/data/dpsave.cxx
+++ sc/source/core/data/dpsave.cxx
@@ -58,7 +58,12 @@
@@ -988,8 +986,8 @@ index 130e7a8..f41ea2c 100644
+
+ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const
+{
- long nCount = aDimList.Count();
- for (long i=0; i<nCount; i++)
+ ULONG nCount = aDimList.Count();
+ for (ULONG i=0; i<nCount; i++)
{
@@ -839,9 +953,7 @@ ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
if ( pDim->IsDataLayout() )
@@ -1248,8 +1246,6 @@ index d8f6454..e53ecb9 100644
maMemberArray[0]->FillMemberResults( pSequences, nPos, nSorted, FALSE, &aMbrName, &aMbrCapt );
}
else if ( pMember->IsVisible() )
-diff --git sc/source/core/data/dptabsrc.cxx sc/source/core/data/dptabsrc.cxx
-index 499309f..04e75ba 100644
--- sc/source/core/data/dptabsrc.cxx
+++ sc/source/core/data/dptabsrc.cxx
@@ -85,6 +85,7 @@ using ::com::sun::star::uno::Reference;
@@ -1342,7 +1338,7 @@ index 499309f..04e75ba 100644
ScUnoGuard aGuard;
+ using beans::PropertyAttribute::READONLY;
- static SfxItemPropertyMap aDPSourceMap_Impl[] =
+ static SfxItemPropertyMapEntry aDPSourceMap_Impl[] =
{
@@ -1136,6 +1155,10 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
{MAP_CHAR_LEN(SC_UNO_IGNOREEM), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only
@@ -2434,34 +2430,29 @@ index 804f162..1707cd6 100644
};
// ============================================================================
-diff --git sc/source/ui/unoobj/dapiuno.cxx sc/source/ui/unoobj/dapiuno.cxx
-index 8732865..7a72040 100644
--- sc/source/ui/unoobj/dapiuno.cxx
+++ sc/source/ui/unoobj/dapiuno.cxx
-@@ -1605,7 +1605,13 @@ rtl::OUString SAL_CALL ScDataPilotFieldObj::getName() throw(uno::RuntimeExceptio
- if (pDim->IsDataLayout())
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(SC_DATALAYOUT_NAME));
- else
-- sRet = pDim->GetLayoutName();
+@@ -1605,6 +1605,10 @@ rtl::OUString SAL_CALL ScDataPilotFieldObj::getName() throw(uno::RuntimeExceptio
+ if( pDim->IsDataLayout() )
+ aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) );
+ else
+- aName = pDim->GetLayoutName();
+ {
-+ const rtl::OUString* pLayoutName = pDim->GetLayoutName();
-+ if (pLayoutName)
-+ sRet = *pLayoutName;
-+ else
-+ sRet = pDim->GetName();
++ aName = pDim->GetLayoutName();
++ if (!aName)
++ aName = pDim->GetName();
+ }
- }
}
- return sRet;
+ return aName;
@@ -1625,7 +1631,7 @@ void SAL_CALL ScDataPilotFieldObj::setName( const rtl::OUString& aNewName )
- if (!pDim->IsDataLayout())
- {
- String aName(aNewName);
-- pDim->SetLayoutName(&aName);
-+ pDim->SetLayoutName(aName);
- pParent->SetDPObject(pDPObj);
- }
- }
+ if( pDim && !pDim->IsDataLayout() )
+ {
+ String aName( rName );
+- pDim->SetLayoutName( &aName );
++ pDim->SetLayoutName( aName );
+ SetDPObject( pDPObj );
+ }
+ }
diff --git sc/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
index 3e5a627..df92a5e 100644
--- sc/source/ui/view/dbfunc3.cxx
More information about the ooo-build-commit
mailing list