[Libreoffice-commits] .: patches/dev300

[Fridrich Strba]

 patches/dev300/apply                      |    5 --
 patches/dev300/framework-menubar-fix.diff |   34 -----------------
 patches/dev300/valgrind-fixes.diff        |   59 ------------------------------
 3 files changed, 98 deletions(-)

New commits:
commit 839b7aee4eb3bd9bc171202245bb2de1f6f5bc7d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sat Oct 9 01:00:21 2010 +0200

    Moved 2 patches to git
    
    framework-menubar-fix.diff and valgrind-fixes.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6ca7c71..98a7c5d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2609,11 +2609,6 @@ novell-subscription-enable-in-menu.diff
 # back to the up-stream row limit
 evaluation-row-limit.diff
 
-[ Fixes ]
-# TODO: split up into the original patches were this belongs
-valgrind-fixes.diff, thorsten
-framework-menubar-fix.diff, thorsten
-
 [ Netbook ]
 vcl-netbook.diff, rodo
 
diff --git a/patches/dev300/framework-menubar-fix.diff b/patches/dev300/framework-menubar-fix.diff
deleted file mode 100644
index 828b333..0000000
--- a/patches/dev300/framework-menubar-fix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- framework/source/uielement/menubarmerger.cxx |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git framework/source/uielement/menubarmerger.cxx framework/source/uielement/menubarmerger.cxx
-index 51f87a4..852e456 100644
---- framework/source/uielement/menubarmerger.cxx
-+++ framework/source/uielement/menubarmerger.cxx
-@@ -101,6 +101,14 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
- {
-     sal_uInt32       i( 0 );
-     const sal_uInt32 nCount( rReferencePath.size() );
-+
-+    ReferencePathInfo aResult;
-+    if ( !nCount )
-+    {
-+        aResult.eResult = RP_MENUITEM_NOT_FOUND;
-+        return aResult;
-+    }
-+
-     Menu*            pCurrMenu( pMenu );
-     RPResultInfo     eResult( RP_OK );
- 
-@@ -142,7 +150,6 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
-     }
-     while (( pCurrMenu != 0 ) && ( i < nCount ) && ( eResult == RP_OK ));
- 
--    ReferencePathInfo aResult;
-     aResult.pPopupMenu = pCurrMenu;
-     aResult.nPos       = nPos;
-     aResult.nLevel     = nLevel;
--- 
-1.7.0.1
-
diff --git a/patches/dev300/valgrind-fixes.diff b/patches/dev300/valgrind-fixes.diff
deleted file mode 100644
index d204255..0000000
--- a/patches/dev300/valgrind-fixes.diff
+++ /dev/null
@@ -1,59 +0,0 @@
---- sc/source/core/data/sortparam.cxx
-+++ sc/source/core/data/sortparam.cxx
-@@ -52,7 +52,8 @@ ScSortParam::ScSortParam( const ScSortParam& r ) :
-         bUserDef(r.bUserDef),nUserIndex(r.nUserIndex),bIncludePattern(r.bIncludePattern),
-         bInplace(r.bInplace),
-         nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow),
--        aCollatorLocale( r.aCollatorLocale ), aCollatorAlgorithm( r.aCollatorAlgorithm )
-+        aCollatorLocale( r.aCollatorLocale ), aCollatorAlgorithm( r.aCollatorAlgorithm ),
-+        nCompatHeader( r.nCompatHeader )
- {
-     for (USHORT i=0; i<MAXSORT; i++)
-     {
-@@ -93,9 +94,9 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r )
-     nCol2			= r.nCol2;
-     nRow2			= r.nRow2;
-     bHasHeader		= r.bHasHeader;
-+    bByRow			= r.bByRow;
-     bCaseSens		= r.bCaseSens;
-     bNaturalSort	= r.bNaturalSort;
--    bByRow			= r.bByRow;
-     bUserDef		= r.bUserDef;
-     nUserIndex		= r.nUserIndex;
-     bIncludePattern	= r.bIncludePattern;
-@@ -105,6 +106,7 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r )
-     nDestRow		= r.nDestRow;
-     aCollatorLocale			= r.aCollatorLocale;
-     aCollatorAlgorithm		= r.aCollatorAlgorithm;
-+    nCompatHeader   = r.nCompatHeader;
- 
-     for (USHORT i=0; i<MAXSORT; i++)
-     {
-@@ -163,11 +165,12 @@ BOOL ScSortParam::operator==( const ScSortParam& rOther ) const
- 
- ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) :
-         nCol1(rSub.nCol1),nRow1(rSub.nRow1),nCol2(rSub.nCol2),nRow2(rSub.nRow2),
--        bHasHeader(TRUE),bByRow(TRUE),bCaseSens(rSub.bCaseSens),
-+        bHasHeader(TRUE),bByRow(TRUE),bCaseSens(rSub.bCaseSens),bNaturalSort(rOld.bNaturalSort),
-         bUserDef(rSub.bUserDef),nUserIndex(rSub.nUserIndex),bIncludePattern(rSub.bIncludePattern),
-         bInplace(TRUE),
-         nDestTab(0),nDestCol(0),nDestRow(0),
--        aCollatorLocale( rOld.aCollatorLocale ), aCollatorAlgorithm( rOld.aCollatorAlgorithm )
-+        aCollatorLocale( rOld.aCollatorLocale ), aCollatorAlgorithm( rOld.aCollatorAlgorithm ),
-+        nCompatHeader( rOld.nCompatHeader )
- {
-     USHORT nNewCount = 0;
-     USHORT i;
-@@ -220,10 +223,11 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
- ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) :
-         nCol1(nCol),nRow1(rParam.nRow1),nCol2(nCol),nRow2(rParam.nRow2),
-         bHasHeader(rParam.bHasHeader),bByRow(TRUE),bCaseSens(rParam.bCaseSens),
-+        bNaturalSort(FALSE),
- //! TODO: what about Locale and Algorithm?
-         bUserDef(FALSE),nUserIndex(0),bIncludePattern(FALSE),
-         bInplace(TRUE),
--        nDestTab(0),nDestCol(0),nDestRow(0)
-+        nDestTab(0),nDestCol(0),nDestRow(0), nCompatHeader(2)
- {
-     bDoSort[0] = TRUE;
-     nField[0] = nCol;