sc/source/core/data/conditio.cxx | 4 ++--
sc/source/ui/view/cellsh1.cxx | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit d6fd3ccb105e164fdc826f1cafff2f5323194794
Author: Markus Mohrhard <markus.mohrh...@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 d2206ba..9bb6977 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1288,9 +1288,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 faa7667d4a249d1a497610a10c64ac54799c08f4
Author: Markus Mohrhard <markus.mohrh...@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 ec105f3..6d434ce 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1825,6 +1825,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
