[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/conditio.cxx |    4 ++--
 sc/source/ui/view/cellsh1.cxx    |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3ea8026aefc358483292b459aaaead830e1f667d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Dec 31 04:27:44 2012 +0100

    handle strings correctly in ScCondFormatEntry::GetExpression, fdo#58781
    
    Change-Id: I418837d4363c14779a4b2a7ce78c8b9e8df7f0d1

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index b0e99cb..843eda5 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1289,9 +1289,9 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn
         }
         else if (bIsStr1)
         {
-            aRet = """";
+            aRet = "\"";
             aRet += aStrVal1;
-            aRet += """";
+            aRet += "\"";
         }
         else
             mpDoc->GetFormatTable()->GetInputLineString(nVal1, nNumFmt, aRet);
commit 2eebc768c4d48f384f14142516df7d8b3a751097
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Dec 31 04:25:14 2012 +0100

    don't add a new cond format if we just want to edit one, related fdo#58781
    
    Change-Id: I2f48daa9b317c59515366206f9f17c7d219db5d0

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 91054f1..68be16dd 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1827,6 +1827,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                 const ScConditionalFormat* pCondFormat = pList->GetFormat(rCondFormats[0]);
                                 assert(pCondFormat);
                                 const ScRangeList& rCondFormatRange = pCondFormat->GetRange();
+                                nKey = pCondFormat->GetKey();
                                 pCondFormatDlg.reset( new ScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, rCondFormatRange, aPos, condformat::dialog::NONE ) );
                             }
                             else