[Libreoffice-commits] .: 2 commits - sc/inc sc/source

[Markus Mohrhard]

 sc/inc/conditio.hxx                       |    7 +++++++
 sc/source/ui/condformat/condformatdlg.cxx |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d3f063cc86b50ac9adf08eb46dd2caf7975ed43c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 11 09:01:49 2012 +0200

    abstract type in ptr_container needs this workaround
    
    Change-Id: I00be4d0963c9cebc50aff3eb44cb208b6eb8c88c

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 1b241cf..c68875f 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -354,6 +354,13 @@ public:
     void erase(sal_uLong nIndex);
 };
 
+// see http://www.boost.org/doc/libs/1_49_0/libs/ptr_container/doc/tutorial.html#cloneability
+//for MSVC we need:
+inline ScFormatEntry* new_clone( const ScFormatEntry& rFormat )
+{
+    return rFormat.Clone();
+}
+
 #endif
 
 
commit 64cd0d66ef91668fae759361992380e0c7d8d73b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 11 08:37:25 2012 +0200

    make mac tinderbox happy
    
    Change-Id: Ie42f38f65fd4b164c9bebb14f6754392c4abecff

diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 32869de..27127e9 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -162,7 +162,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, ScDocument* pDoc):
     maLbEntryTypeMax.SelectEntryPos(1);
     maLbDataBarMinType.SelectEntryPos(0);
     maLbDataBarMaxType.SelectEntryPos(1);
-    maEdMiddle.SetText(rtl::OUString::valueOf(50));
+    maEdMiddle.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(50)));
     maEdDataBarMin.Disable();
     maEdDataBarMax.Disable();