[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Mon Jan 25 10:42:11 PST 2010
patches/dev300/apply | 3 ++
patches/dev300/calc-dp-drilldown-fieldname-crash-fix.diff | 20 ++++++++++++++
2 files changed, 23 insertions(+)
New commits:
commit b5c4e8203923a2f3ed3e3bddb500c3ea7ed96246
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Jan 25 13:43:43 2010 -0500
Fix a crash on drilling down on field member.
* patches/dev300/apply:
* patches/dev300/calc-dp-drilldown-fieldname-crash-fix.diff: this
fixes i#103347 and n#573456.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 987f3f0..0f99c85 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -859,6 +859,9 @@ chart-highlight-selection-fix.diff, n#568016, kohei
svtools-uninitialized-member-fix.diff, kohei
sc-uninitialized-var-fix.diff, kohei
+# when double-clicking on a cell that contains a field name, it crashes.
+calc-dp-drilldown-fieldname-crash-fix.diff, n#573456, i#103347, kohei
+
# Support PHONETIC function to display asian phonetic guide.
# LATER: I'll take care of this later. --kohei
# calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
diff --git a/patches/dev300/calc-dp-drilldown-fieldname-crash-fix.diff b/patches/dev300/calc-dp-drilldown-fieldname-crash-fix.diff
new file mode 100644
index 0000000..d134e60
--- /dev/null
+++ b/patches/dev300/calc-dp-drilldown-fieldname-crash-fix.diff
@@ -0,0 +1,20 @@
+diff --git sc/source/ui/dbgui/pvfundlg.cxx sc/source/ui/dbgui/pvfundlg.cxx
+index ec140d8..cc88d96 100644
+--- sc/source/ui/dbgui/pvfundlg.cxx
++++ sc/source/ui/dbgui/pvfundlg.cxx
+@@ -742,9 +742,12 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
+ const ScDPSaveDimension* pDimension = pSaveData ? pSaveData->GetExistingDimensionByName(aName) : 0;
+ if ( !pDimension || (pDimension->GetOrientation() != nOrient) )
+ {
+- const OUString* pLayoutName = pDimension->GetLayoutName();
+- if (pLayoutName)
+- aName = *pLayoutName;
++ if (pDimension)
++ {
++ const OUString* pLayoutName = pDimension->GetLayoutName();
++ if (pLayoutName)
++ aName = *pLayoutName;
++ }
+ maLbDims.InsertEntry( aName );
+ maNameIndexMap.insert(DimNameIndexMap::value_type(aName, nDim));
+ }
More information about the ooo-build-commit
mailing list