[Libreoffice-commits] .: binfilter/bf_sc

[Caolán McNamara]

 binfilter/bf_sc/source/ui/app/makefile.mk     |    1 -
 binfilter/bf_sc/source/ui/app/sc_rfindlst.cxx |    8 --------
 binfilter/bf_sc/source/ui/app/sc_sclib.cxx    |   12 +-----------
 binfilter/bf_sc/source/ui/app/sc_uiitems.cxx  |   10 +++++-----
 binfilter/bf_sc/source/ui/dbgui/makefile.mk   |    1 -
 binfilter/bf_sc/source/ui/inc/csvsplits.hxx   |    4 ++--
 6 files changed, 8 insertions(+), 28 deletions(-)

New commits:
commit eeea9b0d2a24c7e470d320db519876589be55089
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 31 13:29:04 2010 +0000

    WaE: make this dir warning free

diff --git a/binfilter/bf_sc/source/ui/app/makefile.mk b/binfilter/bf_sc/source/ui/app/makefile.mk
index f68e708..e8f8583 100644
--- a/binfilter/bf_sc/source/ui/app/makefile.mk
+++ b/binfilter/bf_sc/source/ui/app/makefile.mk
@@ -25,7 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 PRJ=..$/..$/..$/..
 BFPRJ=..$/..$/..
 
diff --git a/binfilter/bf_sc/source/ui/app/sc_rfindlst.cxx b/binfilter/bf_sc/source/ui/app/sc_rfindlst.cxx
index 3959b77..e998079 100644
--- a/binfilter/bf_sc/source/ui/app/sc_rfindlst.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_rfindlst.cxx
@@ -33,14 +33,6 @@
 #include "rfindlst.hxx"
 namespace binfilter {
 
-// STATIC DATA -----------------------------------------------------------
-
-#define SC_RANGECOLORS	8
-
-/*N*/ static ColorData aColNames[SC_RANGECOLORS] =
-/*N*/ 	{ COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN,
-/*N*/ 		COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN };
-
 //==================================================================
 
 ScRangeFindList::~ScRangeFindList()
diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
index 545ef28..6589071 100644
--- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
@@ -134,18 +134,8 @@ extern "C" { static void SAL_CALL thisModule() {} }
 /*N*/ 			SetDocumentServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
 /*N*/ 					"com.sun.star.sheet.SpreadsheetDocument" )) );
 /*N*/
-/*N*/ 	const String	aEmptyStr;
-/*N*/ 									// Clipboard-IDs:
-/*N*/ 	SOT_FORMATSTR_ID_STARCALC_50;
-/*N*/
-/*N*/ 	String aVndCalc = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(CONTENT_TYPE_STR_APP_VND_CALC));
-/*N*/
 /*N*/ 	Factory().GetFilterContainer()->SetDetectFilter( ScDLL::DetectFilter );
 /*N*/
-/*N*/ 	//	5.0 muss mit vnd-Mime-Type registriert werden, aeltere mit dem alten x-starcalc
-
-/*N*/ 	//	alle Im-/Exportfilter werden nur noch per install.ini registriert,
-/*N*/ 	//	damit sie bei der Installation weggelassen werden koennen.
 /*N*/ }
 
 
@@ -544,7 +534,7 @@ BOOL lcl_IsAnyXMLFilter( const SfxFilter* /*pFilter*/ )
 /*N*/ 				else if( nMuster & M_DC )
 /*N*/ 				{ // 											 don't care
 /*N*/ 				}
-/*N*/ 				else if( nMuster & M_ALT(0) )
+/*N*/ 				else if( nMuster & (M_ALT(0)) )
 /*N*/ 				{ // 									  alternative Bytes
 /*N*/ 					BYTE nAnzAlt = ( BYTE ) nMuster;
 /*N*/ 					bSync = FALSE;			// zunaechst unsynchron
diff --git a/binfilter/bf_sc/source/ui/app/sc_uiitems.cxx b/binfilter/bf_sc/source/ui/app/sc_uiitems.cxx
index ab6a638..a2405bb 100644
--- a/binfilter/bf_sc/source/ui/app/sc_uiitems.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_uiitems.cxx
@@ -123,8 +123,8 @@ namespace binfilter {
 /*N*/ 						  ScViewData*           ptrViewData,
 /*N*/ 						  const ScQueryParam*   pQueryData ) :
 /*N*/ 		SfxPoolItem ( nWhich ),
-/*N*/ 		bIsAdvanced	( FALSE ),
-/*N*/ 		pViewData   ( ptrViewData )
+/*N*/ 		pViewData   ( ptrViewData ),
+/*N*/ 		bIsAdvanced ( FALSE )
 /*N*/ {
 /*N*/ 	if ( pQueryData ) theQueryData = *pQueryData;
 /*N*/ }
@@ -133,10 +133,10 @@ namespace binfilter {
 
 /*N*/ ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) :
 /*N*/ 		SfxPoolItem ( rItem ),
-/*N*/ 		bIsAdvanced	( rItem.bIsAdvanced ),
-/*N*/ 		aAdvSource	( rItem.aAdvSource ),
 /*N*/ 		pViewData   ( rItem.pViewData ),
-/*N*/ 		theQueryData( rItem.theQueryData )
+/*N*/ 		theQueryData( rItem.theQueryData ),
+/*N*/ 		bIsAdvanced	( rItem.bIsAdvanced ),
+/*N*/ 		aAdvSource  ( rItem.aAdvSource )
 /*N*/ {
 /*N*/ }
 
diff --git a/binfilter/bf_sc/source/ui/dbgui/makefile.mk b/binfilter/bf_sc/source/ui/dbgui/makefile.mk
index 3b55a0f..5346a4a 100644
--- a/binfilter/bf_sc/source/ui/dbgui/makefile.mk
+++ b/binfilter/bf_sc/source/ui/dbgui/makefile.mk
@@ -25,7 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 PRJ=..$/..$/..$/..
 BFPRJ=..$/..$/..
 
diff --git a/binfilter/bf_sc/source/ui/inc/csvsplits.hxx b/binfilter/bf_sc/source/ui/inc/csvsplits.hxx
index a7867f8..e240c8e 100644
--- a/binfilter/bf_sc/source/ui/inc/csvsplits.hxx
+++ b/binfilter/bf_sc/source/ui/inc/csvsplits.hxx
@@ -40,9 +40,9 @@ namespace binfilter {
 // ============================================================================
 
 /** Constant for an invalid vector index. */
-const sal_uInt32 CSV_VEC_NOTFOUND   = ~0UL;
+const sal_uInt32 CSV_VEC_NOTFOUND = SAL_MAX_UINT32;
 /** Constant for an invalid ruler position. */
-const sal_Int32 CSV_POS_INVALID     = -1;
+const sal_Int32 CSV_POS_INVALID = -1;
 
 
 // ----------------------------------------------------------------------------