[ooo-build-commit] .: Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                      |    4 ++
 patches/dev300/calc-dp-drilldown-fieldname-crash-fix.diff |   20 ++++++++++++++
 2 files changed, 24 insertions(+)

New commits:
commit e1271822e46f4eea0caddbbbf2472125154d9625
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Jan 25 13:52:48 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 388f1e0..3de6f90 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3541,3 +3541,7 @@ oox-pptx-import-fix-header-footer-backport.diff, n#549246, rodo
 # fix RenderBadPicture crash in xinerama cases
 vcl-free-renderpicture.diff, thorsten
 
+[ CalcFixes ]
+
+# 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
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));
+             }