[Libreoffice-commits] .: 3 commits - sc/inc sc/source unusedcode.easy vcl/inc vcl/source

2012-04-22 Thread Muthu Subramanian 
 sc/inc/dbdata.hxx   |1 
 sc/source/core/tool/dbdata.cxx  |5 
 unusedcode.easy |7 --
 vcl/inc/salgdi.hxx  |4 ---
 vcl/inc/vcl/outdev.hxx  |4 ---
 vcl/source/gdi/outmap.cxx   |   42 
 vcl/source/gdi/salgdilayout.cxx |   34 
 7 files changed, 97 deletions(-)

New commits:
commit d31aae4c9eea4f4aecea2a051518536b47aa8ab6
Author: Monica Ramirez Arceda mon...@probeta.net
Date:   Mon Apr 23 11:30:01 2012 +0530

Remove unused vcl methods.

diff --git a/unusedcode.easy b/unusedcode.easy
index b2ca35e..b09221f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -27,10 +27,6 @@ Matrix3d::Inverse() const
 Matrix3d::Matrix3d()
 PopupMenu::SetSelectedEntry(unsigned short)
 PropBrwMgr::GetChildWindowId()
-SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const, unsigned int, 
OutputDevice const*)
-SalGraphics::drawAlphaBitmap(SalTwoRect const, SalBitmap const, SalBitmap 
const)
-SalGraphics::drawPolyLine(basegfx::B2DPolygon const, double, 
basegfx::B2DVector const, basegfx::B2DLineJoin)
-SalGraphics::drawPolyPolygon(basegfx::B2DPolyPolygon const, double)
 SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequencesigned char, 
com::sun::star::uno::Sequencesigned char, unsigned char)
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, 
unsigned int, unsigned char)
 ScAddInAsyncs::Insert(ScAddInAsync* const, unsigned short)
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index e351ed3..6c99e46 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -405,10 +405,6 @@ public:
 const OutputDevice *pOutDev );
 voidDrawBitmap( const SalTwoRect* pPosAry,
 const SalBitmap rSalBitmap,
-SalColor nTransparentColor,
-const OutputDevice *pOutDev );
-voidDrawBitmap( const SalTwoRect* pPosAry,
-const SalBitmap rSalBitmap,
 const SalBitmap rTransparentBitmap,
 const OutputDevice *pOutDev );
 
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 2197905..d750264 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -91,14 +91,6 @@ SalGraphics::~SalGraphics()
 
 // 
 
-bool SalGraphics::drawAlphaBitmap( const SalTwoRect,
-const SalBitmap, const SalBitmap )
-{
-return false;
-}
-
-// 
-
 void SalGraphics::mirror( long x, const OutputDevice *pOutDev, bool bBack ) 
const
 {
 long w;
@@ -411,14 +403,6 @@ voidSalGraphics::DrawRect( long nX, long nY, long 
nWidth, long nHeight, cons
 mirror( nX, nWidth, pOutDev );
 drawRect( nX, nY, nWidth, nHeight );
 }
-bool SalGraphics::drawPolyLine(
-const basegfx::B2DPolygon /*rPolyPolygon*/,
-double /*fTransparency*/,
-const basegfx::B2DVector /*rLineWidths*/,
-basegfx::B2DLineJoin /*eLineJoin*/)
-{
-return false;
-}
 
 void SalGraphics::DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry, 
const OutputDevice *pOutDev )
 {
@@ -483,11 +467,6 @@ bool SalGraphics::DrawPolyPolygon( const 
::basegfx::B2DPolyPolygon i_rPolyPolyg
 return bRet;
 }
 
-bool SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon, double 
/*fTransparency*/)
-{
-return false;
-}
-
 sal_Bool SalGraphics::DrawPolyLineBezier( sal_uLong nPoints, const SalPoint* 
pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
 {
 sal_Bool bResult = sal_False;
@@ -600,19 +579,6 @@ voidSalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
 else
 drawBitmap( pPosAry, rSalBitmap );
 }
-voidSalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
-const SalBitmap rSalBitmap,
-SalColor nTransparentColor, const 
OutputDevice *pOutDev )
-{
-if( (m_nLayout  SAL_LAYOUT_BIDI_RTL) || (pOutDev  
pOutDev-IsRTLEnabled()) )
-{
-SalTwoRect pPosAry2 = *pPosAry;
-mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev );
-drawBitmap( pPosAry2, rSalBitmap, nTransparentColor );
-}
-else
-drawBitmap( pPosAry, rSalBitmap, nTransparentColor );
-}
 void SalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
   const SalBitmap rSalBitmap,
   const SalBitmap rTransparentBitmap, const 
OutputDevice *pOutDev )
commit 2910933f2609b19d9c6c4b793288e1b2d9991080
Author: Santiago Martinez smvar...@gmail.com
Date:   Mon Apr 23 11:27:07 2012 +0530

Remove unused code in vcl

diff --git

[Libreoffice-commits] .: 3 commits - sc/inc sc/source unusedcode.easy

2012-03-12 Thread Kohei Yoshida 
 sc/inc/dpcache.hxx   |3 ---
 sc/inc/dpcachetable.hxx  |8 
 sc/inc/dptabres.hxx  |3 ---
 sc/source/core/data/dpcache.cxx  |   32 
 sc/source/core/data/dpcachetable.cxx |9 -
 sc/source/core/data/dptabres.cxx |   18 --
 unusedcode.easy  |5 -
 7 files changed, 78 deletions(-)

New commits:
commit 6f7bf17e3147c2064362216d6b60df9f6818535a
Author: Santiago Martinez smvar...@gmail.com
Date:   Mon Mar 12 19:22:44 2012 +0100

Remove unused code in dptabres

diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index bfdef7f..36ed4ac 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -83,7 +83,6 @@ public:
 longGetCount() const{ return nCount; }
 const long* GetSource() const   { return pIndex; }
 const SCROW* GetNameIds() const{ return pData; }
-SCROW   GetNameIdForIndex( long nIndexValue ) const;
 };
 
 typedef ::std::vectorsal_Int32 ScMemberSortOrder;
@@ -337,8 +336,6 @@ public:
 boolIsBaseForGroup( long nDim ) const;  // any 
group
 longGetGroupBase( long nGroupDim ) const;
 boolIsNumOrDateGroup( long nDim ) const;
-boolIsInGroup( const ScDPItemData rGroupData, long 
nGroupIndex,
-   long nBaseDataId, long nBaseIndex ) const;
 boolIsInGroup( SCROW nGroupDataId, long nGroupIndex,
const ScDPItemData rBaseData, long 
nBaseIndex ) const;
 boolHasCommonElement( SCROW nFirstDataId, long nFirstIndex,
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 9ffe37c..314fc7e 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -279,15 +279,6 @@ void ScDPInitState::RemoveMember()
 --nCount;
 }
 
-SCROW ScDPInitState::GetNameIdForIndex( long nIndexValue ) const
-{
-for (long i=0; inCount; i++)
-if ( pIndex[i] == nIndexValue )
-return pData[i];
-
-return -1;// not found
-}
-
 // ---
 
 void lcl_DumpRow( const String rType, const String rName, const ScDPAggData* 
pAggData,
@@ -920,15 +911,6 @@ bool ScDPResultData::IsNumOrDateGroup( long nDim ) const
 return pSource-GetData()-IsNumOrDateGroup( nDim );
 }
 
-bool ScDPResultData::IsInGroup( const ScDPItemData rGroupData, long 
nGroupIndex,
-long nBaseDataId, long nBaseIndex ) const
-{
-const ScDPItemData* pData = pSource-GetItemDataById( nGroupIndex , 
nBaseDataId);
-if ( pData )
- return pSource-GetData()-IsInGroup( rGroupData, nGroupIndex, *pData 
, nBaseIndex );
-else
-return false;
-}
 bool ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex,
 const ScDPItemData rBaseData, long nBaseIndex 
) const
 {
diff --git a/unusedcode.easy b/unusedcode.easy
index ecc821d..e1067ed 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -72,11 +72,9 @@ ScConditionalFormats_Impl::Remove(unsigned short, unsigned 
short)
 ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const, long)
 
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator__gnu_debug::_Safe_iterator__gnu_cxx::__normal_iteratorvoid**,
 std::__cxx1998::vectorvoid*, std::allocatorvoid*  , 
std::__debug::vectorvoid*, std::allocatorvoid*  , ScDBData)
 ScDBCollection::AnonDBs::size() const
-ScDPInitState::GetNameIdForIndex(long) const
 ScDPItemData::ScDPItemData(double)
 ScDPItemData::SetGroupValue(int, int)
 ScDPLabelData::ScDPLabelData(rtl::OUString const, short, bool)
-ScDPResultData::IsInGroup(ScDPItemData const, long, long, long) const
 ScDocRowHeightUpdater::TabRanges::TabRanges()
 
ScFilterDetect::impl_createFactory(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
 const)
 ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
commit 411a0f08f951809ea71fba7c64eba2762d4a1330
Author: Santiago Martinez smvar...@gmail.com
Date:   Mon Mar 12 19:04:03 2012 +0100

Remove unused code in dpcache

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 9f33db5..8ece780 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -136,9 +136,7 @@ public:
 long AppendGroupField();
 void ResetGroupItems(long nDim, const ScDPNumGroupInfo rNumInfo);
 SCROW SetGroupItem(long nDim, const ScDPItemData rData);
-const DataListType* GetGroupDimMemberValues(long nDim) const;
 void GetGroupDimMemberIds(long nDim, std::vectorSCROW rIds) const;
-void ClearGroupFields();
 
 SCCOL GetDimensionIndex(const rtl::OUString sName) const;
 sal_uLong GetNumberFormat( long nDim ) const;
@@ -158,7 +156,6 @@ public:
 
 ScDocument* GetDoc() const;
 long GetColumnCount()

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

2012-03-09 Thread Kohei Yoshida 
 sc/inc/dpgroup.hxx   |2 -
 sc/inc/dptabsrc.hxx  |8 --
 sc/source/core/data/dpgroup.cxx  |   27 +++---
 sc/source/core/data/dptabres.cxx |4 +--
 sc/source/core/data/dptabsrc.cxx |   47 +--
 5 files changed, 38 insertions(+), 50 deletions(-)

New commits:
commit 137b53e0e2763d41c43e62ecc85b38d7f3cb71f7
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 22:25:10 2012 -0500

vector and rtl::Reference over manual ref-counting.

diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index b43e795..b69846b 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -54,6 +54,7 @@
 #include cppuhelper/implbase3.hxx
 #include cppuhelper/implbase5.hxx
 #include cppuhelper/implbase6.hxx
+#include rtl/ref.hxx
 
 #include dptabdat.hxx
 #include dpglobal.hxx
@@ -683,12 +684,13 @@ class ScDPMembers : public cppu::WeakImplHelper2
 com::sun::star::lang::XServiceInfo 
 {
 private:
+typedef std::vectorrtl::ReferenceScDPMember  MembersType;
 ScDPSource* pSource;
 longnDim;
 longnHier;
 longnLev;
 longnMbrCount;
-ScDPMember**ppMbrs;
+mutable MembersType maMembers;
 mutable ScDPMembersHashMap aHashMap;
 
 public:
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 9514046..3d41f86 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2284,8 +2284,7 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long 
nH, long nL ) :
 pSource( pSrc ),
 nDim( nD ),
 nHier( nH ),
-nLev( nL ),
-ppMbrs( NULL )
+nLev( nL )
 {
 //! hold pSource
 
@@ -2357,15 +2356,6 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, 
long nH, long nL ) :
 
 ScDPMembers::~ScDPMembers()
 {
-//! release pSource
-
-if (ppMbrs)
-{
-for (long i=0; inMbrCount; i++)
-if ( ppMbrs[i] )
-ppMbrs[i]-release();   // ref-counted
-delete[] ppMbrs;
-}
 }
 
 // XNameAccess implementation using getCount/getByIndex
@@ -2451,13 +2441,14 @@ long ScDPMembers::getMinMembers() const
 // used in lcl_CountMinMembers
 
 long nVisCount = 0;
-if ( ppMbrs )
+if (!maMembers.empty())
 {
-for (long i=0; inMbrCount; i++)
+MembersType::const_iterator it = maMembers.begin(), itEnd = 
maMembers.end();
+for (; it != itEnd; ++it)
 {
 //  count only visible with details (default is true for both)
-const ScDPMember* pMbr = ppMbrs[i];
-if ( !pMbr || ( pMbr-isVisible()  pMbr-getShowDetails() ) )
+const rtl::ReferenceScDPMember pMbr = *it;
+if (!pMbr.get() || (pMbr-isVisible()  pMbr-getShowDetails()))
 ++nVisCount;
 }
 }
@@ -2474,20 +2465,17 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
 
 if ( nIndex = 0  nIndex  nMbrCount )
 {
-if ( !ppMbrs )
-{
-((ScDPMembers*)this)-ppMbrs = new ScDPMember*[nMbrCount];
-for (long i=0; inMbrCount; i++)
-ppMbrs[i] = NULL;
-}
-if ( !ppMbrs[nIndex] )
+if (maMembers.empty())
+maMembers.resize(nMbrCount);
+
+if (!maMembers[nIndex].get())
 {
-ScDPMember* pNew;
+rtl::ReferenceScDPMember pNew;
 long nSrcDim = pSource-GetSourceDim( nDim );
 if ( pSource-IsDataLayoutDimension(nSrcDim) )
 {
 // empty name (never shown, not used for lookup)
-pNew = new ScDPMember( pSource, nDim, nHier, nLev, 0 );
+pNew.set(new ScDPMember(pSource, nDim, nHier, nLev, 0));
 }
 else if ( nHier != SC_DAPI_HIERARCHY_FLAT  
pSource-IsDateDimension( nSrcDim ) )
 {
@@ -2549,20 +2537,17 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
 
 ScDPItemData aData(nGroupBy, nVal);
 SCROW nId = pSource-GetCache()-GetIdByItemData(nDim, aData);
-pNew = new ScDPMember(pSource, nDim, nHier, nLev, nId);
+pNew.set(new ScDPMember(pSource, nDim, nHier, nLev, nId));
 }
 else
 {
 const std::vectorSCROW memberIndexs = 
pSource-GetData()-GetColumnEntries(nSrcDim);
-pNew = new ScDPMember(pSource, nDim, nHier, nLev, 
memberIndexs[nIndex]);
+pNew.set(new ScDPMember(pSource, nDim, nHier, nLev, 
memberIndexs[nIndex]));
 }
-pNew-acquire();// ref-counted
-ppMbrs[nIndex] = pNew;
+maMembers[nIndex] = pNew;
 }
 
-OSL_ENSURE( ppMbrs[nIndex] , member is not initialized  );
-
-return ppMbrs[nIndex];
+return maMembers[nIndex].get();
 }
 
 return NULL;//! exception?
commit

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

2012-03-08 Thread Markus Mohrhard 
 sc/inc/globstr.hrc  |2 --
 sc/source/ui/dbgui/dbnamdlg.cxx |7 ---
 sc/source/ui/src/globstr.src|4 
 3 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 59dcb5918dbcb93173afcd5bc4f3b01fa7bef1ee
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Mar 9 02:16:06 2012 +0100

prevent creating new db ranges with the internal anonymous db name

diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 0f32a4d..493b2db 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -469,7 +469,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
 
 if ( aNewName.Len()  0  aNewArea.Len()  0 )
 {
-if ( ScRangeData::IsNameValid( aNewName, pDoc ) )
+if ( ScRangeData::IsNameValid( aNewName, pDoc )  
!aNewName.EqualsAscii(STR_DB_LOCAL_NONAME) )
 {
 //  weil jetzt editiert werden kann, muss erst geparst werden
 ScRange aTmpRange;
commit 66fbd3a48ac5608eeb45629b9d285790cfcefff6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Mar 9 02:08:40 2012 +0100

remove one more reference to the anonymous db string

diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 18850f8..0f32a4d 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -245,7 +245,6 @@ void ScDbNameDlg::Init()
 pDBData = pDBColl-GetDBAtCursor( nStartCol, nStartRow, nStartTab, 
sal_True );
 if ( pDBData )
 {
-::rtl::OUString theDbName;
 ScAddress  rStart = theCurArea.aStart;
 ScAddress  rEnd   = theCurArea.aEnd;
 SCCOL nCol1;
@@ -260,7 +259,9 @@ void ScDbNameDlg::Init()
  (rStart.Col() == nCol1)  (rStart.Row() == nRow1)
  (rEnd.Col()   == nCol2)  (rEnd.Row()   == nRow2 ) )
 {
-aEdName.SetText(pDBData-GetName());
+rtl::OUString aDBName = pDBData-GetName();
+if 
(!aDBName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
+aEdName.SetText(aDBName);
 
 aBtnHeader.Check( pDBData-HasHeader() );
 aBtnDoSize.Check( pDBData-IsDoSize() );
commit 50ade1da6464c99bd9670dbaa2fc1a9dadf6b914
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Mar 9 02:00:47 2012 +0100

remove old unnamed db string

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 48f4015..5157eb6 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -67,8 +67,6 @@
 #define STR_UNDO_IMPORTDATA 37
 #define STR_UNDO_REPEATDB   38
 
-#define STR_DB_NONAME   39
-
 #define STR_MSSG_DOSUBTOTALS_0  40
 #define STR_MSSG_DOSUBTOTALS_1  41
 #define STR_MSSG_DOSUBTOTALS_2  42
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 2e852ec..164e12d 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -365,10 +365,6 @@ Resource RID_GLOBSTR
 {
 Text [ en-US ] = ~Change Case;
 };
-String STR_DB_NONAME
-{
-Text [ en-US ] = unnamed ;
-};
 String STR_DBNAME_IMPORT
 {
 Text [ en-US ] = Import ;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-08 Thread Kohei Yoshida 
 sc/inc/collect.hxx  |   45 ---
 sc/source/core/tool/collect.cxx |  120 +---
 sc/source/ui/app/inputhdl.cxx   |   12 
 3 files changed, 9 insertions(+), 168 deletions(-)

New commits:
commit 1eecb1841e8692e03e8e0aecaa99e3e7a3300d4c
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Feb 8 20:34:23 2012 -0500

ScSortedCollection is now officially unused.  Nuking it.

diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx
index d175fa3..3dc738f 100644
--- a/sc/inc/collect.hxx
+++ b/sc/inc/collect.hxx
@@ -29,22 +29,10 @@
 #ifndef SC_COLLECT_HXX
 #define SC_COLLECT_HXX
 
-#include address.hxx
-#include tools/string.hxx
-
-#ifndef INCLUDED_LIMITS_H
-#include limits.h
-#define INCLUDED_LIMITS_H
-#endif
 #include scdllapi.h
+#include rtl/ustring.hxx
 
-#define MAXCOLLECTIONSIZE   16384
-#define MAXDELTA1024
-#define SCPOS_INVALID   USHRT_MAX
-
-#include boost/ptr_container/ptr_set.hpp
-
-class ScDocument;
+#include set
 
 class SC_DLLPUBLIC ScDataObject
 {
@@ -83,35 +71,6 @@ public:
 ScCollection   operator=( const ScCollection rCol );
 };
 
-
-class SC_DLLPUBLIC  ScSortedCollection : public ScCollection
-{
-private:
-sal_BoolbDuplicates;
-protected:
-// for ScStrCollection load/store
-voidSetDups( sal_Bool bVal ) { bDuplicates = bVal; }
-sal_BoolIsDups() const { return bDuplicates; }
-public:
-ScSortedCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup 
= false);
-ScSortedCollection(const ScSortedCollection rScSortedCollection) :
-ScCollection(rScSortedCollection),
-bDuplicates(rScSortedCollection.bDuplicates) {}
-
-virtual sal_uInt16  IndexOf(ScDataObject* pScDataObject) const;
-virtual short   Compare(ScDataObject* pKey1, ScDataObject* pKey2) 
const = 0;
-virtual sal_BoolIsEqual(ScDataObject* pKey1, ScDataObject* pKey2) 
const;
-sal_BoolSearch(ScDataObject* pScDataObject, sal_uInt16 rIndex) 
const;
-virtual sal_BoolInsert(ScDataObject* pScDataObject);
-virtual sal_BoolInsertPos(ScDataObject* pScDataObject, sal_uInt16 
nIndex);
-
-sal_Booloperator==(const ScSortedCollection rCmp) const;
-};
-
-//
-// TypedScStrCollection: wie ScStrCollection, nur, dass Zahlen vor Strings
-// sortiert werden
-
 class TypedStrData
 {
 public:
diff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxx
index 2bbf244..e8f3de6 100644
--- a/sc/source/core/tool/collect.cxx
+++ b/sc/source/core/tool/collect.cxx
@@ -26,16 +26,15 @@
  *
  /
 
+#include unotools/transliterationwrapper.hxx
 
-
+#include collect.hxx
+#include global.hxx
 
 #include string.h
-#include tools/stream.hxx
-#include unotools/transliterationwrapper.hxx
 
-#include rechead.hxx
-#include collect.hxx
-#include document.hxx // fuer TypedStrData Konstruktor
+#define MAXCOLLECTIONSIZE   16384
+#define MAXDELTA1024
 
 // ---
 
@@ -197,115 +196,6 @@ ScDataObject*   ScCollection::Clone() const
 return new ScCollection(*this);
 }
 
-//
-// ScSortedCollection
-//
-
-ScSortedCollection::ScSortedCollection(sal_uInt16 nLim, sal_uInt16 nDel, 
sal_Bool bDup) :
-ScCollection (nLim, nDel),
-bDuplicates ( bDup)
-{
-}
-
-//
-
-sal_uInt16 ScSortedCollection::IndexOf(ScDataObject* pScDataObject) const
-{
-sal_uInt16 nIndex;
-if (Search(pScDataObject, nIndex))
-return nIndex;
-else
-return 0x;
-}
-
-//
-
-sal_Bool ScSortedCollection::Search(ScDataObject* pScDataObject, sal_uInt16 
rIndex) const
-{
-rIndex = nCount;
-sal_Bool bFound = false;
-short nLo = 0;
-short nHi = nCount - 1;
-short nIndex;
-short nCompare;
-while (nLo = nHi)
-{
-nIndex = (nLo + nHi) / 2;
-nCompare = Compare(pItems[nIndex], pScDataObject);
-if (nCompare  0)
-nLo = nIndex + 1;
-else
-{
-nHi = nIndex - 1;
-if (nCompare == 0)
-{
-bFound = sal_True;
-nLo = nIndex;
-}
-}
-}
-rIndex = nLo;
-return bFound;
-}
-
-//
-
-sal_Bool ScSortedCollection::Insert(ScDataObject* pScDataObject)
-{
-sal_uInt16 nIndex;
-sal_Bool bFound =

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

2012-01-07 Thread Markus Mohrhard 
 sc/inc/address.hxx   |3 ++-
 sc/source/core/tool/interpr1.cxx |3 +++
 sc/source/ui/view/editsh.cxx |4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit aeddbade5428ae4794faea79c376f6c8c0e9112f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Jan 8 04:17:53 2012 +0100

don't set document modified for copy and select all, fdo#44423

diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 7e7cea0..c843e96 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -233,7 +233,7 @@ void ScEditShell::Execute( SfxRequest rReq )
 
 case SID_COPY:
 pTableView-Copy();
-break;
+return;
 
 case SID_CUT:
 pTableView-Cut();
@@ -334,7 +334,7 @@ void ScEditShell::Execute( SfxRequest rReq )
 pTopView-SetSelection(ESelection(0,0,nPar-1,nLen));
 }
 }
-break;
+return;
 
 case SID_CHARMAP:
 {
commit baed170c416fd5bcae4d17362f0efd0e6284efdc
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Jan 8 03:09:34 2012 +0100

return earlier from ScInterpreter::GetDBParams on error, fdo#2

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 34f027d..f54d2a0 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6609,6 +6609,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool 
rMissingField )
 SetError( errIllegalParameter );
 }
 
+if (nGlobalError)
+return NULL;
+
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 auto_ptrScDBRangeBase pDBRef( PopDBDoubleRef() );
 SAL_WNODEPRECATED_DECLARATIONS_POP
commit 7922d1d8b65fa18822eaba8d38460d76c1e7a2c8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Jan 8 02:39:53 2012 +0100

limit the number of sheets again to 1

Our 32bit builds have problems to generate more sheets and crash with a
std::bad_alloc

Increase this limit again as soon as we can handle std::bad_alloc

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index c3eb51c..6c45311 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -87,7 +87,8 @@ const SCSIZE   SCSIZE_MAX   = 
::std::numeric_limitsSCSIZE::max();
 // Count values
 const SCROW   MAXROWCOUNT= MAXROWCOUNT_DEFINE;
 const SCCOL   MAXCOLCOUNT= MAXCOLCOUNT_DEFINE;
-const SCTAB   MAXTABCOUNT= 32000;
+// limiting to 1 for now, problem with 32 bit builds for now
+const SCTAB   MAXTABCOUNT= 1;
 const SCCOLROWMAXCOLROWCOUNT = MAXROWCOUNT;
 // Maximum values
 const SCROW   MAXROW = MAXROWCOUNT - 1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-05 Thread Markus Mohrhard 
 sc/inc/rangenam.hxx|1 
 sc/inc/reftokenhelper.hxx  |1 
 sc/source/core/tool/rangenam.cxx   |9 +
 sc/source/core/tool/reftokenhelper.cxx |   54 -
 sc/source/core/tool/token.cxx  |   10 +-
 sc/source/ui/inc/namemgrtable.hxx  |4 +-
 sc/source/ui/namedlg/namedlg.cxx   |2 -
 sc/source/ui/namedlg/namemgrtable.cxx  |7 ++--
 sc/source/ui/namedlg/namepast.cxx  |5 ++-
 9 files changed, 25 insertions(+), 68 deletions(-)

New commits:
commit 5b8deb57c6782b77fcf180ef6097f71b6e1b07d2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Jan 5 18:35:05 2012 +0100

simplify code a bit

diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index c076f34..9119e3e 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -58,7 +58,6 @@ public:
 const sal_Unicode cSep, ::formula::FormulaGrammar::Grammar eGrammar);
 
 static bool getRangeFromToken(ScRange rRange, const ScTokenRef pToken, 
bool bExternal = false);
-static bool getAbsRangeFromToken(ScRange rRange, const ScTokenRef 
pToken, const ScAddress rPos, bool bExternal = false);
 
 static void getRangeListFromTokens(ScRangeList rRangeList, const 
::std::vectorScTokenRef pTokens);
 
diff --git a/sc/source/core/tool/reftokenhelper.cxx 
b/sc/source/core/tool/reftokenhelper.cxx
index 364556c..2a32e12 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -146,25 +146,6 @@ void singleRefToAddr(const ScSingleRefData rRef, 
ScAddress rAddr)
 rAddr.SetTab(rRef.nTab);
 }
 
-//returns an absolute address in reference to rPos
-void singleRefToAbsAddr(const ScSingleRefData rRef, ScAddress rAddr, const 
ScAddress rPos)
-{
-if (rRef.IsColRel())
-rAddr.SetCol(rRef.nRelCol + rPos.Col());
-else
-rAddr.SetCol(rRef.nCol);
-
-if (rRef.IsRowRel())
-rAddr.SetRow(rRef.nRelRow + rPos.Row());
-else
-rAddr.SetRow(rRef.nRow);
-
-if (rRef.IsTabRel())
-rAddr.SetTab(rRef.nRelTab + rPos.Tab());
-else
-rAddr.SetTab(rRef.nTab);
-}
-
 }
 
 bool ScRefTokenHelper::getRangeFromToken(ScRange rRange, const ScTokenRef 
pToken, bool bExternal)
@@ -202,41 +183,6 @@ bool ScRefTokenHelper::getRangeFromToken(ScRange rRange, 
const ScTokenRef pTok
 return false;
 }
 
-bool ScRefTokenHelper::getAbsRangeFromToken(ScRange rRange, const ScTokenRef 
pToken, const ScAddress rPos, bool bExternal)
-{
-StackVar eType = pToken-GetType();
-switch (pToken-GetType())
-{
-case svSingleRef:
-case svExternalSingleRef:
-{
-if ((eType == svExternalSingleRef  !bExternal) ||
-(eType == svSingleRef  bExternal))
-return false;
-
-const ScSingleRefData rRefData = pToken-GetSingleRef();
-singleRefToAbsAddr(rRefData, rRange.aStart, rPos);
-rRange.aEnd = rRange.aStart;
-return true;
-}
-case svDoubleRef:
-case svExternalDoubleRef:
-{
-if ((eType == svExternalDoubleRef  !bExternal) ||
-(eType == svDoubleRef  bExternal))
-return false;
-
-const ScComplexRefData rRefData = pToken-GetDoubleRef();
-singleRefToAbsAddr(rRefData.Ref1, rRange.aStart, rPos);
-singleRefToAbsAddr(rRefData.Ref2, rRange.aEnd, rPos);
-return true;
-}
-default:
-; // do nothing
-}
-return false;
-}
-
 void ScRefTokenHelper::getRangeListFromTokens(ScRangeList rRangeList, const 
vectorScTokenRef rTokens)
 {
 vectorScTokenRef::const_iterator itr = rTokens.begin(), itrEnd = 
rTokens.end();
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8196b8a..83be799 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1823,7 +1823,6 @@ namespace {
 void GetExternalTableData(const ScDocument* pOldDoc, const ScDocument* 
pNewDoc, const SCTAB nTab, rtl::OUString rTabName, sal_uInt16 rFileId)
 {
 rtl::OUString aFileName = pOldDoc-GetFileURL();;
-std::cout  aFileName  std::endl;
 rFileId = pNewDoc-GetExternalRefManager()-getExternalFileId(aFileName);
 rTabName = pOldDoc-GetCopyTabName(nTab);
 if (rTabName.isEmpty())
@@ -1839,7 +1838,9 @@ bool IsInCopyRange( const ScRange rRange, const 
ScDocument* pClipDoc )
 bool SkipReference(ScToken* pToken, const ScAddress rPos, const ScDocument* 
pOldDoc, bool bRangeName)
 {
 ScRange aRange;
-if (!ScRefTokenHelper::getAbsRangeFromToken(aRange, pToken, rPos))
+
+pToken-CalcAbsIfRel(rPos);
+if (!ScRefTokenHelper::getRangeFromToken(aRange, pToken))
 return true;
 
 if (bRangeName  aRange.aStart.Tab() == rPos.Tab())
commit ac7f046d27b4e47361f44efe252fca867a0a1d02
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Jan 5 18:28:05 2012 +0100

[Libreoffice-commits] .: 3 commits - sc/inc sc/source sw/source

2011-12-21 Thread Michael Stahl 
 sc/inc/chgtrack.hxx|   42 +++--
 sc/source/core/tool/chgtrack.cxx   |  139 -
 sc/source/filter/xcl97/XclExpChangeTrack.cxx   |   12 -
 sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |2 
 sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx |6 
 sc/source/ui/inc/acredlin.hxx  |8 
 sc/source/ui/miscdlgs/acredlin.cxx |   99 ++--
 sw/source/core/text/inftxt.hxx |   19 +-
 8 files changed, 180 insertions(+), 147 deletions(-)

New commits:
commit 3d96cb2527b5899b4d1bda3cef78110f321718e5
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 21 20:13:52 2011 +0100

ScChangeActionTable conversion: small corrections

diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index ef5ec99..937fb97 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -4032,7 +4032,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
 {
 ScChangeAction* p = GetAction(
 ((ScChangeActionReject*)pCur)-GetRejectAction() );
-if ( p != pAct  rMap.find( p-GetActionNumber() ) != 
rMap.end() )
+if (p != pAct  rMap.find( p-GetActionNumber() ) == 
rMap.end())
 cStack.push( p );
 }
 }
@@ -4200,8 +4200,9 @@ sal_Bool ScChangeTrack::Reject( ScChangeAction* pAct, 
ScChangeActionMap* pMap,
 if ( pAct-HasDependent()  !bRecursion )
 {
 OSL_ENSURE( pMap, ScChangeTrack::Reject: Insert ohne map );
-ScChangeActionMap::iterator itChangeAction;
-for( itChangeAction = pMap-begin(); itChangeAction != pMap-end() 
 bOk; ++itChangeAction )
+ScChangeActionMap::reverse_iterator itChangeAction;
+for (itChangeAction = pMap-rbegin();
+ itChangeAction != pMap-rend()  bOk; ++itChangeAction)
 {
 // keine Contents restoren, die eh geloescht werden wuerden
 if ( itChangeAction-second-GetType() == SC_CAT_CONTENT )
commit 713d69d96038fdd5479de076270c2186f95c2630
Author: Marcel Metz mm...@adrian-broher.net
Date:   Wed Dec 21 20:00:03 2011 +0100

fdo#38832 Replace ScChangeActionTable with std::map

diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 5dc02d8..9dd27ca 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -30,11 +30,11 @@
 #define SC_CHGTRACK_HXX
 
 #include deque
+#include map
 #include stack
 
 #include tools/string.hxx
 #include tools/datetime.hxx
-#include tools/table.hxx
 #include tools/mempool.hxx
 #include tools/link.hxx
 #include unotools/options.hxx
@@ -952,6 +952,7 @@ struct ScChangeTrackMsgInfo
 // MsgQueue for notification via ModifiedLink
 typedef std::dequeScChangeTrackMsgInfo* ScChangeTrackMsgQueue;
 typedef std::stackScChangeTrackMsgInfo* ScChangeTrackMsgStack;
+typedef std::mapsal_uLong, ScChangeAction* ScChangeActionMap;
 
 enum ScChangeTrackMergeState
 {
@@ -962,9 +963,6 @@ enum ScChangeTrackMergeState
 SC_CTMS_OTHER
 };
 
-// Table, additionally to pFirst/pNext/pLast/pPrev, to enable fast access by 
ActionNumber and by list
-DECLARE_TABLE( ScChangeActionTable, ScChangeAction* )
-
 // Internally generated actions start at this value (nearly all bits set)
 // and are decremented, to keep values in a table seperated from normal 
actions.
 #define SC_CHGTRACK_GENERATED_START ((sal_uInt32) 0xfff0)
@@ -981,9 +979,9 @@ class ScChangeTrack : public utl::ConfigurationListener
 static  const SCSIZEnContentSlots;
 
 com::sun::star::uno::Sequence sal_Int8aProtectPass;
-ScChangeActionTable aTable;
-ScChangeActionTable aGeneratedTable;
-ScChangeActionTable aPasteCutTable;
+ScChangeActionMap   aMap;
+ScChangeActionMap   aGeneratedMap;
+ScChangeActionMap   aPasteCutMap;
 ScChangeTrackMsgQueue   aMsgQueue;
 ScChangeTrackMsgStack   aMsgStackTmp;
 ScChangeTrackMsgStack   aMsgStackFinal;
@@ -1097,7 +1095,7 @@ class ScChangeTrack : public utl::ConfigurationListener
 // is NULL otherwise.
 // bRecursion == called from reject with table
 sal_BoolReject( ScChangeAction*,
-ScChangeActionTable*, sal_Bool bRecursion 
);
+ScChangeActionMap*, sal_Bool bRecursion );
 
 #endif  // SC_CHGTRACK_CXX
 
@@ -1126,9 +1124,21 @@ public:
 sal_BoolIsGenerated( sal_uLong nAction ) const
 { return nAction = nGeneratedMin; }
 ScChangeAction* GetAction( sal_uLong nAction ) const
-{ return aTable.Get( nAction ); }
+{
+ScChangeActionMap::const_iterator it = aMap.find(

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

2011-10-26 Thread Markus Mohrhard 
 sc/inc/nameuno.hxx|   47 
 sc/inc/unowids.hxx|3 
 sc/source/ui/docshell/docfunc.cxx |   34 --
 sc/source/ui/inc/docfunc.hxx  |6 -
 sc/source/ui/inc/undocell.hxx |4 
 sc/source/ui/undo/undocell.cxx|   19 ++-
 sc/source/ui/unoobj/cellsuno.cxx  |8 +
 sc/source/ui/unoobj/docuno.cxx|2 
 sc/source/ui/unoobj/nameuno.cxx   |  202 +-
 sc/source/ui/unoobj/targuno.cxx   |2 
 10 files changed, 257 insertions(+), 70 deletions(-)

New commits:
commit 7fe4fa13c1f82524bd7b1f526adb851c67e1706f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Oct 26 15:26:43 2011 +0200

add uno part for local range names

you can now use e.g. thisComponent.sheets(0).namedRanges

diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 5ba41a9..9d7ca93 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -50,9 +50,11 @@
 #include cppuhelper/implbase6.hxx
 
 class ScDocShell;
+class ScRangeName;
 class ScRangeData;
 class ScTokenArray;
 class ScNamedRangesObj;
+class ScTableSheetObj;
 
 class ScNamedRangeObj : public ::cppu::WeakImplHelper6
 ::com::sun::star::sheet::XNamedRange,
@@ -67,6 +69,7 @@ private:
 ScNamedRangesObj*   mpParent;
 ScDocShell* pDocShell;
 String  aName;
+ScTableSheetObj*mpSheet;
 
 private:
 ScRangeData*GetRangeData_Impl();
@@ -74,9 +77,10 @@ private:
 const ScTokenArray* pNewTokens, const 
String* pNewContent,
 const ScAddress* pNewPos, const 
sal_uInt16* pNewType,
 const formula::FormulaGrammar::Grammar 
eGrammar );
+SCTAB   GetTab_Impl();
 
 public:
-ScNamedRangeObj(ScNamedRangesObj* pParent, 
ScDocShell* pDocSh, const String rNm);
+ScNamedRangeObj(ScNamedRangesObj* pParent, 
ScDocShell* pDocSh, const String rNm, ScTableSheetObj* pSheet = NULL);
 virtual ~ScNamedRangeObj();
 
 virtual voidNotify( SfxBroadcaster rBC, const SfxHint rHint 
);
@@ -184,17 +188,21 @@ class ScNamedRangesObj : public ::cppu::WeakImplHelper6
 public SfxListener
 {
 private:
-ScDocShell* pDocShell;
 
  // if true, adding new name or modifying existing one will set the
  // document 'modified' and broadcast the change.  We turn this off during
  // import.
 sal_BoolmbModifyAndBroadcast;
 
-ScNamedRangeObj*GetObjectByIndex_Impl(sal_uInt16 nIndex);
-ScNamedRangeObj*GetObjectByName_Impl(const ::rtl::OUString aName);
+virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) = 0;
+virtual ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString 
aName) = 0;
+
+virtual ScRangeName*GetRangeName_Impl() = 0;
+virtual SCTAB   GetTab_Impl() = 0;
 
 protected:
+
+ScDocShell* pDocShell;
 /** called from the XActionLockable interface methods on initial locking */
 virtual voidlock();
 
@@ -304,6 +312,37 @@ public:
 throw(::com::sun::star::uno::RuntimeException);
 };
 
+class ScGlobalNamedRangesObj: public ScNamedRangesObj
+{
+private:
+
+virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex);
+virtual ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString 
aName);
+
+virtual ScRangeName*GetRangeName_Impl();
+virtual SCTAB   GetTab_Impl();
+
+public:
+ScGlobalNamedRangesObj(ScDocShell* pDocSh);
+virtual ~ScGlobalNamedRangesObj();
+};
+
+class ScLocalNamedRangesObj: public ScNamedRangesObj
+{
+private:
+
+virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex);
+virtual ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString 
aName);
+
+virtual ScRangeName*GetRangeName_Impl();
+virtual SCTAB   GetTab_Impl();
+
+ScTableSheetObj* mpSheet;
+public:
+ScLocalNamedRangesObj(ScDocShell* pDocSh, 
ScTableSheetObj* pSheet);
+virtual ~ScLocalNamedRangesObj();
+};
+
 
 class ScLabelRangeObj : public ::cppu::WeakImplHelper2
 ::com::sun::star::sheet::XLabelRange,
diff --git a/sc/inc/unowids.hxx b/sc/inc/unowids.hxx
index af860fd..0a87081 100644
--- a/sc/inc/unowids.hxx
+++ b/sc/inc/unowids.hxx
@@ -80,7 +80,8 @@
 #define SC_WID_UNO_ABSNAME  ( SC_WID_UNO_START + 39 )
 #define SC_WID_UNO_CODENAME ( SC_WID_UNO_START + 40 )
 #define SC_WID_UNO_TABCOLOR ( SC_WID_UNO_START + 41 )
-#define SC_WID_UNO_END  ( SC_WID_UNO_START + 41 )
+#define SC_WID_UNO_NAMES( SC_WID_UNO_START + 42 )
+#define SC_WID_UNO_END  ( SC_WID_UNO_START + 42 )

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

2011-09-19 Thread Kohei Yoshida 
 sc/inc/document.hxx  |8 +-
 sc/inc/table.hxx |   45 +++---
 sc/source/core/data/documen3.cxx |   20 ++
 sc/source/core/data/markdata.cxx |2 
 sc/source/core/data/table6.cxx   |  122 ++-
 sc/source/ui/unoobj/cellsuno.cxx |   25 ---
 sc/source/ui/view/viewfun2.cxx   |   17 -
 7 files changed, 124 insertions(+), 115 deletions(-)

New commits:
commit 0783e78de2ce265e19b739effbff80c37ee98576
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Sep 19 19:09:19 2011 -0400

Let's avoid modifying the selection data during search and replace.

The previous code was modifying the selection data (ScMarkData) in
a not-so-obvious fashion during the search and/or replace.  Let's only
modify selection in the view code to avoid surprises.  The document
model shouldn't be modifying the view model.

Those methods that were taking a reference to ScMarkData now take a
const reference instead.

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 77439d1..ca98063 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1260,10 +1260,10 @@ public:
 sal_uInt16 nFormatNo, const ScMarkData 
rMark );
 voidGetAutoFormatData( SCTAB nTab, SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SCROW nEndRow,
 ScAutoFormatData rData );
-sal_BoolSearchAndReplace( const SvxSearchItem rSearchItem,
-SCCOL rCol, SCROW rRow, SCTAB rTab,
-ScMarkData rMark,
-String rUndoStr, ScDocument* pUndoDoc 
= NULL );
+boolSearchAndReplace( const SvxSearchItem rSearchItem,
+  SCCOL rCol, SCROW rRow, SCTAB rTab,
+  const ScMarkData rMark, ScRangeList 
rMatchedRanges,
+  rtl::OUString rUndoStr, ScDocument* 
pUndoDoc = NULL );
 
 // determine Col/Row of subsequent calls
 // (e.g. not found from the beginning, or subsequent 
tables)
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 347b9cc..9cd3c57 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -498,9 +498,9 @@ public:
 sal_uInt16 nFormatNo );
 voidGetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL 
nEndCol, SCROW nEndRow, ScAutoFormatData rData);
 voidScReplaceTabsStr( String rStr, const String rSrch, const 
String rRepl ); // from sw
-boolSearchAndReplace(const SvxSearchItem rSearchItem,
-SCCOL rCol, SCROW rRow, ScMarkData rMark,
-String rUndoStr, ScDocument* pUndoDoc);
+boolSearchAndReplace(
+const SvxSearchItem rSearchItem, SCCOL rCol, SCROW rRow, const 
ScMarkData rMark,
+ScRangeList rMatchedRanges, rtl::OUString rUndoStr, ScDocument* 
pUndoDoc);
 
 voidFindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, 
SCCOL nX2 );
 
@@ -819,33 +819,36 @@ private:
 voidGetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, 
ScAutoFormatData rData);
 voidGetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, 
sal_uInt16 nIndex, ScAutoFormatData rData);
 boolSearchCell(const SvxSearchItem rSearchItem, SCCOL nCol, SCROW 
nRow,
-   const ScMarkData rMark, String rUndoStr, 
ScDocument* pUndoDoc);
+   const ScMarkData rMark, rtl::OUString rUndoStr, 
ScDocument* pUndoDoc);
 boolSearch(const SvxSearchItem rSearchItem, SCCOL rCol, SCROW 
rRow,
-   const ScMarkData rMark, String rUndoStr, ScDocument* 
pUndoDoc);
-boolSearchAll(const SvxSearchItem rSearchItem, ScMarkData rMark,
-String rUndoStr, ScDocument* pUndoDoc);
+   const ScMarkData rMark, rtl::OUString rUndoStr, 
ScDocument* pUndoDoc);
+boolSearchAll(const SvxSearchItem rSearchItem, const ScMarkData 
rMark,
+  ScRangeList rMatchedRanges, rtl::OUString 
rUndoStr, ScDocument* pUndoDoc);
 boolReplace(const SvxSearchItem rSearchItem, SCCOL rCol, SCROW 
rRow,
-const ScMarkData rMark, String rUndoStr, ScDocument* 
pUndoDoc);
-boolReplaceAll(const SvxSearchItem rSearchItem, ScMarkData rMark,
-String rUndoStr, ScDocument* pUndoDoc);
+const ScMarkData rMark, rtl::OUString rUndoStr, 
ScDocument* pUndoDoc);
+boolReplaceAll(
+const SvxSearchItem rSearchItem, const ScMarkData rMark, 
ScRangeList rMatchedRanges,
+rtl::OUString rUndoStr, ScDocument* pUndoDoc);
 
 boolSearchStyle(const SvxSearchItem