More on build errors and warnings.

7 files changed, 10 insertions, 34 deletions

diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 49d88e2f2d26..9e92284a108b 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -184,21 +184,6 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREAD
 
 //------------------------------------------------------------------------
 
-static void lcl_WriteInfo( registry::XRegistryKey* pRegistryKey,
-                        const rtl::OUString& rImplementationName,
-                        const uno::Sequence< rtl::OUString >& rServices )
-                    throw( registry::InvalidRegistryException )
-{
-    rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM( "/" ));
-    aImpl += rImplementationName;
-    aImpl += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
-    uno::Reference<registry::XRegistryKey> xNewKey(pRegistryKey->createKey(aImpl));
-
-    const rtl::OUString* pArray = rServices.getConstArray();
-    for( sal_Int32 i = 0; i < rServices.getLength(); i++ )
-        xNewKey->createKey( pArray[i]);
-}
-
 extern "C" {
 
 SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 71b5e5359945..d1289cd205d8 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1400,9 +1400,9 @@ void ScDataPilotTableObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         const ScUpdateRefHint& rRef = static_cast< const ScUpdateRefHint& >( rHint );
         if ( aRanges.UpdateReference( rRef.GetMode(), GetDocShell()->GetDocument(), rRef.GetRange(),
                  rRef.GetDx(), rRef.GetDy(), rRef.GetDz() ) &&
-             aRanges.Count() == 1 )
+             aRanges.size() == 1 )
         {
-            const ScRange* pRange = aRanges.GetObject( 0 );
+            const ScRange* pRange = aRanges.front();
             if ( pRange )
             {
                 nTab = pRange->aStart.Tab();
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 1fea8e338cca..a58cbe5516dd 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -396,7 +396,6 @@ void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex )
 
         (*iter)->release();
         aEntries.erase(iter);
-        DataChanged();
     }
 }
 
@@ -407,8 +406,6 @@ void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException)
                   boost::bind(&ScTableConditionalEntry::release,_1));
 
     aEntries.clear();
-
-    DataChanged();
 }
 
 // XEnumerationAccess
@@ -552,9 +549,7 @@ ScTableConditionalFormat* ScTableConditionalFormat::getImplementation(
 
 //------------------------------------------------------------------------
 
-ScTableConditionalEntry::ScTableConditionalEntry(ScTableConditionalFormat* pPar,
-                                                 const ScCondFormatEntryItem& aItem) :
-    pParent( pPar ),
+ScTableConditionalEntry::ScTableConditionalEntry(const ScCondFormatEntryItem& aItem) :
     aData( aItem )
 {
     // #i113668# only store the settings, keep no reference to parent object
@@ -597,8 +592,6 @@ void SAL_CALL ScTableConditionalEntry::setConditionOperator( sal_Int32 nOperator
 {
     SolarMutexGuard aGuard;
     aData.meMode = lcl_ConditionOperatorToModeNew( nOperator );
-    if (pParent)
-        pParent->DataChanged();
 }
 
 rtl::OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException)
@@ -783,7 +776,6 @@ void SAL_CALL ScTableValidationObj::setOperator( sheet::ConditionOperator nOpera
 {
     SolarMutexGuard aGuard;
     nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToMode( nOperator ) );
-    DataChanged();
 }
 
 sal_Int32 SAL_CALL ScTableValidationObj::getConditionOperator()
@@ -798,7 +790,6 @@ void SAL_CALL ScTableValidationObj::setConditionOperator( sal_Int32 nOperator )
 {
     SolarMutexGuard aGuard;
     nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToModeNew( nOperator ) );
-    DataChanged();
 }
 
 rtl::OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException)
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 430252b688ae..807528c5c77e 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -481,7 +481,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat
 sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-    INT32 nCount = 0;
+    sal_Int32 nCount = 0;
     if (pDocShell)
     {
         ScStrCollection aNames; // um doppelte wegzulassen
@@ -1020,7 +1020,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati
 sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-    INT32 nAreaCount = 0;
+    sal_Int32 nAreaCount = 0;
     if (pDocShell)
     {
         sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
@@ -1346,7 +1346,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio
 sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-    INT32 nAreaCount = 0;
+    sal_Int32 nAreaCount = 0;
     if (pDocShell)
         nAreaCount = pDocShell->GetDocument()->GetDdeLinkCount();
     return nAreaCount;
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 89a358ad1408..c906a9d2cf25 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -616,7 +616,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
                             pLotus2,
                             pQPro
                             };
-                        const UINT16 nFilterCount = SAL_N_ELEMENTS(ppFilterPatterns);
+                        const sal_uInt16 nFilterCount = SAL_N_ELEMENTS(ppFilterPatterns);
 
                         static const sal_Char* const pFilterName[] =     // zugehoerige Filter
                             {
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 0a15aa2578ff..9fd9199b9e86 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -492,7 +492,7 @@ sal_Bool lcl_EndsWithUser( const String& rString )
            pChar[nLen-1] == ')';
 }
 
-String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName, UINT16 nType )
+String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName, sal_uInt16 nType )
 {
     sal_Bool bDisplayIsProgrammatic = false;
 
@@ -522,7 +522,7 @@ String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName
     return rDispName;
 }
 
-String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName, UINT16 nType )
+String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName, sal_uInt16 nType )
 {
     if ( lcl_EndsWithUser( rProgName ) )
     {
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index adeb0e7a3a6d..93705fa7dae5 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1552,7 +1552,7 @@ void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference<
         EndActivationListening();
 }
 
-INT16 ScTabViewObj::GetZoom(void) const
+sal_Int16 ScTabViewObj::GetZoom(void) const
 {
     ScTabViewShell* pViewSh = GetViewShell();
     if (pViewSh)