GNOME.org
 

ooo-build r15161 - in trunk: . patches/dev300

Author: kyoshida
Date: Tue Jan 27 06:08:51 2009
New Revision: 15161
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15161&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-standard-filter-options-m38.diff:
	* patches/dev300/sc-standard-filter-options.diff:	
	* patches/dev300/apply: adjusted for dev300-m39.



Added:
   trunk/patches/dev300/sc-standard-filter-options-m38.diff
      - copied unchanged from r15157, /trunk/patches/dev300/sc-standard-filter-options.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-standard-filter-options.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 06:08:51 2009
@@ -730,8 +730,16 @@
 [ CalcFixes ]
 # adds to Autofilter Empty-NonEmpty options bxc #62165
 sc-autofilter-empty-nonempty.diff, i#35578, jody
+
+[ CalcFixes <= dev300-m38 ]
+# Improves the standard filter options and menu. bxc #62187 #62495
+sc-standard-filter-options-m38.diff, i#35579, michael
+
+[ CalcFixes > dev300-m38 ]
 # Improves the standard filter options and menu. bxc #62187 #62495
 sc-standard-filter-options.diff, i#35579, michael
+
+[ CalcFixes ]
 # Saves and loads the standard filters in ods
 sc-standard-filter-options-ods-hack.diff, i#35579, jonp
 # Hides the filtered rows when height of rows are changed bxc #62161

Modified: trunk/patches/dev300/sc-standard-filter-options.diff
==============================================================================
--- trunk/patches/dev300/sc-standard-filter-options.diff	(original)
+++ trunk/patches/dev300/sc-standard-filter-options.diff	Tue Jan 27 06:08:51 2009
@@ -1,11 +1,8 @@
-Index: sc/inc/global.hxx
-===================================================================
-RCS file: /cvs/sc/sc/inc/global.hxx,v
-retrieving revision 1.49
-diff -u -p -r1.49 global.hxx
---- sc/inc/global.hxx	6 Jul 2007 12:30:02 -0000	1.49
-+++ sc/inc/global.hxx	9 Aug 2007 18:29:24 -0000
-@@ -817,7 +817,11 @@ enum ScQueryOp
+diff --git sc/inc/global.hxx sc/inc/global.hxx
+index fd6a7e6..f3d6e2b 100644
+--- sc/inc/global.hxx
++++ sc/inc/global.hxx
+@@ -722,7 +722,11 @@ enum ScQueryOp
  		SC_TOPVAL,
  		SC_BOTVAL,
  		SC_TOPPERC,
@@ -18,14 +15,11 @@
  	};
  
  // -----------------------------------------------------------------------
-Index: sc/source/core/data/table3.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/core/data/table3.cxx,v
-retrieving revision 1.28
-diff -u -p -r1.28 table3.cxx
---- sc/source/core/data/table3.cxx	5 Mar 2007 14:40:30 -0000	1.28
-+++ sc/source/core/data/table3.cxx	9 Aug 2007 18:29:24 -0000
-@@ -40,6 +40,7 @@
+diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
+index bdb4fc9..5e7ddd9 100644
+--- sc/source/core/data/table3.cxx
++++ sc/source/core/data/table3.cxx
+@@ -35,6 +35,7 @@
  
  // INCLUDE ---------------------------------------------------------------
  
@@ -33,7 +27,7 @@
  #include <rtl/math.hxx>
  #include <unotools/textsearch.hxx>
  #include <svtools/zforlist.hxx>
-@@ -925,6 +926,28 @@ BOOL ScTable::DoSubTotals( ScSubTotalPar
+@@ -927,6 +928,28 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
  	return bSpaceLeft;
  }
  
@@ -62,7 +56,7 @@
  
  BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
          BOOL* pSpecial /* =NULL */ , ScBaseCell* pCell /* =NULL */ ,
-@@ -1018,13 +1041,22 @@ BOOL ScTable::ValidQuery(SCROW nRow, con
+@@ -1020,13 +1043,22 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
                  }
  			}
  		}
@@ -86,7 +80,7 @@
              if ( pCell )
              {
                  if (pCell->GetCellType() != CELLTYPE_NOTE)
-@@ -1037,7 +1069,9 @@ BOOL ScTable::ValidQuery(SCROW nRow, con
+@@ -1039,7 +1071,9 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
                  GetInputString( static_cast<SCCOL>(rEntry.nField), nRow, aCellStr );
  
              BOOL bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
@@ -97,7 +91,7 @@
              BOOL bTestRegExp = (pbTestEqualCondition && rParam.bRegExp
                  && ((rEntry.eOp == SC_LESS_EQUAL)
                      || (rEntry.eOp == SC_GREATER_EQUAL)));
-@@ -1048,17 +1082,21 @@ BOOL ScTable::ValidQuery(SCROW nRow, con
+@@ -1050,17 +1084,21 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
                  BOOL bMatch = (BOOL) rEntry.GetSearchTextPtr( rParam.bCaseSens )
  					->SearchFrwrd( aCellStr, &nStart, &nEnd );
  				// from 614 on, nEnd is behind the found text
@@ -124,7 +118,7 @@
  				{
                      if ( !rEntry.bQueryByString && rEntry.pStr->Len() == 0 )
                      {
-@@ -1067,8 +1105,6 @@ BOOL ScTable::ValidQuery(SCROW nRow, con
+@@ -1069,8 +1107,6 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
                          // don't find any string (isEqual would find empty string results in formula cells).
                          bOk = FALSE;
                      }
@@ -133,7 +127,7 @@
  					else
  					{
                          ::com::sun::star::uno::Sequence< sal_Int32 > xOff;
-@@ -1078,9 +1114,14 @@ BOOL ScTable::ValidQuery(SCROW nRow, con
+@@ -1080,9 +1116,14 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
                          String aQuer( pTransliteration->transliterate(
                              *rEntry.pStr, ScGlobal::eLnge, 0, rEntry.pStr->Len(),
                              &xOff ) );
@@ -150,14 +144,11 @@
  						bOk = !bOk;
  				}
  				else
-Index: sc/source/filter/excel/excimp8.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/excimp8.cxx,v
-retrieving revision 1.120
-diff -u -p -r1.120 excimp8.cxx
---- sc/source/filter/excel/excimp8.cxx	17 Jul 2007 13:33:21 -0000	1.120
-+++ sc/source/filter/excel/excimp8.cxx	10 Aug 2007 13:27:58 -0000
-@@ -454,6 +454,66 @@ void XclImpAutoFilterData::InsertQueryPa
+diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
+index d0d132c..3b8913c 100644
+--- sc/source/filter/excel/excimp8.cxx
++++ sc/source/filter/excel/excimp8.cxx
+@@ -426,6 +426,66 @@ void XclImpAutoFilterData::InsertQueryParam()
  	}
  }
  
@@ -224,7 +215,7 @@
  void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
  {
  	UINT16 nCol, nFlags;
-@@ -491,14 +551,14 @@ void XclImpAutoFilterData::ReadAutoFilte
+@@ -463,14 +523,14 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
  		BOOL	bIgnore;
  
  		UINT8	nStrLen[ 2 ]	= { 0, 0 };
@@ -241,7 +232,7 @@
  				bIgnore = FALSE;
  
  				rStrm >> nType >> nOper;
-@@ -586,8 +646,10 @@ void XclImpAutoFilterData::ReadAutoFilte
+@@ -558,8 +618,10 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
  		}
  
  		for( nE = 0; nE < 2; nE++ )
@@ -254,14 +245,11 @@
  	}
  }
  
-Index: sc/source/filter/excel/excrecds.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/excrecds.cxx,v
-retrieving revision 1.87
-diff -u -p -r1.87 excrecds.cxx
---- sc/source/filter/excel/excrecds.cxx	22 May 2007 19:45:31 -0000	1.87
-+++ sc/source/filter/excel/excrecds.cxx	9 Aug 2007 18:29:24 -0000
-@@ -630,13 +630,50 @@ BOOL XclExpAutofilter::AddCondition( ScQ
+diff --git sc/source/filter/excel/excrecds.cxx sc/source/filter/excel/excrecds.cxx
+index 1a4e746..8c3104c 100644
+--- sc/source/filter/excel/excrecds.cxx
++++ sc/source/filter/excel/excrecds.cxx
+@@ -693,13 +693,50 @@ BOOL XclExpAutofilter::AddCondition( ScQueryConnect eConn, UINT8 nType, UINT8 nO
  	return TRUE;
  }
  
@@ -315,7 +303,7 @@
  
      BOOL bLen = sText.Len() > 0;
  
-@@ -655,7 +692,7 @@ BOOL XclExpAutofilter::AddEntry( const S
+@@ -718,7 +755,7 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
  
  		// top10 flags
  		UINT16 nNewFlags = 0x0000;
@@ -324,7 +312,7 @@
  		{
  			case SC_TOPVAL:
  				nNewFlags = (EXC_AFFLAG_TOP10 | EXC_AFFLAG_TOP10TOP);
-@@ -688,7 +725,7 @@ BOOL XclExpAutofilter::AddEntry( const S
+@@ -751,7 +788,7 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
  				UINT8 nType = bIsNum ? EXC_AFTYPE_DOUBLE : EXC_AFTYPE_STRING;
  				UINT8 nOper = EXC_AFOPER_NONE;
  
@@ -333,7 +321,7 @@
  				{
  					case SC_EQUAL:			nOper = EXC_AFOPER_EQUAL;			break;
  					case SC_LESS:			nOper = EXC_AFOPER_LESS;			break;
-@@ -801,7 +838,7 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( co
+@@ -900,7 +937,7 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
  						bConflict = (nEntry == 1) && (rEntry.eConnect == SC_OR) &&
  									(nFirstField != rEntry.nField);
  					if( !bConflict )
@@ -342,30 +330,24 @@
  				}
  			}
  
-Index: sc/source/filter/inc/excrecds.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/excrecds.hxx,v
-retrieving revision 1.49
-diff -u -p -r1.49 excrecds.hxx
---- sc/source/filter/inc/excrecds.hxx	27 Feb 2007 12:32:42 -0000	1.49
-+++ sc/source/filter/inc/excrecds.hxx	9 Aug 2007 18:29:25 -0000
-@@ -469,7 +469,7 @@ public:
+diff --git sc/source/filter/inc/excrecds.hxx sc/source/filter/inc/excrecds.hxx
+index 217c30c..048a910 100644
+--- sc/source/filter/inc/excrecds.hxx
++++ sc/source/filter/inc/excrecds.hxx
+@@ -442,7 +442,7 @@ public:
  	inline BOOL				HasCondition() const	{ return !aCond[ 0 ].IsEmpty(); }
      inline BOOL             HasTop10() const        { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); }
  
 -    BOOL                    AddEntry( const ScQueryEntry& rEntry );
 +    BOOL                    AddEntry( const ScQueryEntry& rEntry, const ScQueryParam& rParam );
- };
  
- // ----------------------------------------------------------------------------
-Index: sc/source/ui/src/filter.src
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/src/filter.src,v
-retrieving revision 1.57
-diff -u -p -r1.57 filter.src
---- sc/source/ui/src/filter.src	19 Apr 2007 16:37:30 -0000	1.57
-+++ sc/source/ui/src/filter.src	9 Aug 2007 18:29:26 -0000
-@@ -126,16 +126,20 @@ ModelessDialog RID_SCDLG_FILTER
+     virtual void            SaveXml( XclExpXmlStream& rStrm );
+ };
+diff --git sc/source/ui/src/filter.src sc/source/ui/src/filter.src
+index 5eedbb7..d9f1fe1 100644
+--- sc/source/ui/src/filter.src
++++ sc/source/ui/src/filter.src
+@@ -121,16 +121,20 @@ ModelessDialog RID_SCDLG_FILTER
  		DropDown = TRUE ;
  		stringlist [ en-US ] =
  		{
@@ -388,7 +370,7 @@
  		};
  	};
  	ListBox LB_COND2
-@@ -147,16 +151,20 @@ ModelessDialog RID_SCDLG_FILTER
+@@ -142,16 +146,20 @@ ModelessDialog RID_SCDLG_FILTER
  		DropDown = TRUE ;
  		stringlist [ en-US ] =
  		{
@@ -411,7 +393,7 @@
  		};
  	};
  	ListBox LB_COND3
-@@ -168,16 +176,20 @@ ModelessDialog RID_SCDLG_FILTER
+@@ -163,16 +171,20 @@ ModelessDialog RID_SCDLG_FILTER
  		DropDown = TRUE ;
  		stringlist [ en-US ] =
  		{
@@ -434,14 +416,11 @@
  		};
  	};
  	ComboBox ED_VAL1
-Index: sc/util/makefile.mk
-===================================================================
-RCS file: /cvs/sc/sc/util/makefile.mk,v
-retrieving revision 1.41
-diff -u -p -r1.41 makefile.mk
---- sc/util/makefile.mk	22 May 2007 20:15:40 -0000	1.41
-+++ sc/util/makefile.mk	9 Aug 2007 18:29:27 -0000
-@@ -98,6 +98,7 @@ SHL1STDLIBS=       \
+diff --git sc/util/makefile.mk sc/util/makefile.mk
+index 9d2706a..b420951 100644
+--- sc/util/makefile.mk
++++ sc/util/makefile.mk
+@@ -94,6 +94,7 @@ SHL1STDLIBS=       \
  	$(VOSLIB)		\
  	$(SALLIB)		\
  	$(TOOLSLIB)	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]