[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basic/source

[Noel Power]

 basic/source/sbx/sbxvalue.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 726344abbbec4beab5525c7890a360f9877d1ffa
Author: Noel Power noel.po...@novell.com
Date:   Thu Jan 12 15:46:52 2012 +

restore special DATE handling code for SbxValue::Compute fdo#44385

restore code that seemed to be erroneously moved as part of the currency 
enhancement feature

diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index e21234c..6d9d718 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1311,9 +1311,6 @@ Lbl_OpIsDouble:
 else aL.nDouble /= aR.nDouble; break;
 case SbxPLUS:
 aL.nDouble += aR.nDouble; break;
-// #45465 Date needs with + a special handling: 
forces date type
-if( GetType() == SbxDATE || rOp.GetType() == 
SbxDATE )
-aL.eType = SbxDATE;
 case SbxMINUS:
 aL.nDouble -= aR.nDouble; break;
 case SbxNEG:
@@ -1321,6 +1318,9 @@ Lbl_OpIsDouble:
 default:
 SetError( SbxERR_NOTIMP );
 }
+// #45465 Date needs with + a special handling: forces 
date type
+if( Op == SbxPLUS  (GetType() == SbxDATE || 
rOp.GetType() == SbxDATE )
+aL.eType = SbxDATE;
 
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basic/source

[Stephan Bergmann]

 basic/source/sbx/sbxvalue.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1a3533da32df2217e389c3f7c97cb642427d864b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jan 13 11:25:49 2012 +0100

Fixed apparent typos.

diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 6d9d718..6448158 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1319,7 +1319,7 @@ Lbl_OpIsDouble:
 SetError( SbxERR_NOTIMP );
 }
 // #45465 Date needs with + a special handling: forces 
date type
-if( Op == SbxPLUS  (GetType() == SbxDATE || 
rOp.GetType() == SbxDATE )
+if( eOp == SbxPLUS  (GetType() == SbxDATE || 
rOp.GetType() == SbxDATE ) )
 aL.eType = SbxDATE;
 
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basic/source

[Caolán McNamara]

 basic/source/classes/sb.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 738622d199a64327048d6a40953499b9dca5c008
Author: Michael Meeks michael.me...@novell.com
Date:   Mon Jul 25 18:08:29 2011 +0100

fdo#39520 - turn DocBasicItems into an rtl::Static to improve shutdown on 
mac

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index f9cbab6..9ef8de3 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -164,33 +164,33 @@ namespace {
 
 typedef ::rtl::Reference DocBasicItem  DocBasicItemRef;
 typedef boost::unordered_map const StarBASIC *, DocBasicItemRef  
DocBasicItemMap;
-//::rtl::OUStringHash, ::std::equal_to ::rtl::OUString   
ModuleInitDependencyMap;
 
-static DocBasicItemMap GaDocBasicItems;
+class GaDocBasicItems : public rtl::StaticDocBasicItemMap,GaDocBasicItems {};
 
 const DocBasicItem* lclFindDocBasicItem( const StarBASIC* pDocBasic )
 {
-DocBasicItemMap::iterator it = GaDocBasicItems.find( pDocBasic );
-return (it != GaDocBasicItems.end()) ? it-second.get() : 0;
+DocBasicItemMap::iterator it = GaDocBasicItems::get().find( pDocBasic );
+DocBasicItemMap::iterator end = GaDocBasicItems::get().end();
+return (it != end) ? it-second.get() : 0;
 }
 
 void lclInsertDocBasicItem( StarBASIC rDocBasic )
 {
-DocBasicItemRef rxDocBasicItem = GaDocBasicItems[ rDocBasic ];
+DocBasicItemRef rxDocBasicItem = GaDocBasicItems::get()[ rDocBasic ];
 rxDocBasicItem.set( new DocBasicItem( rDocBasic ) );
 rxDocBasicItem-startListening();
 }
 
 void lclRemoveDocBasicItem( StarBASIC rDocBasic )
 {
-DocBasicItemMap::iterator it = GaDocBasicItems.find( rDocBasic );
-if( it != GaDocBasicItems.end() )
+DocBasicItemMap::iterator it = GaDocBasicItems::get().find( rDocBasic );
+if( it != GaDocBasicItems::get().end() )
 {
 it-second-stopListening();
-GaDocBasicItems.erase( it );
+GaDocBasicItems::get().erase( it );
 }
-DocBasicItemMap::iterator it_end = GaDocBasicItems.end();
-for( it = GaDocBasicItems.begin(); it != it_end; ++it )
+DocBasicItemMap::iterator it_end = GaDocBasicItems::get().end();
+for( it = GaDocBasicItems::get().begin(); it != it_end; ++it )
 it-second-clearDependingVarsOnDelete( rDocBasic );
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits