jl152: Fixed compiling errors for gcc

9 files changed, 32 insertions, 26 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 625d817de1..e8f5f9bb24 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -60,8 +60,8 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
     m_bActive( false ),
     m_bLocked( bReadOnly ),
     m_bHasOptions( false ),
-    m_bShared( false ),
     m_bUser( false ),
+    m_bShared( false ),
     m_bNew( false ),
     m_bChecked( false ),
     m_bMissingDeps( false ),
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 7ebb2b2daa..b6f9ce77dc 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -503,7 +503,7 @@ void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt )
 
 //------------------------------------------------------------------------------
 // XModifyListener
-void TheExtensionManager::modified( ::lang::EventObject const & rEvt )
+void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
     throw ( uno::RuntimeException )
 {
     getDialogHelper()->prepareChecking();
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index c55c71c6cf..702b1b331f 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -84,9 +84,8 @@ public:
 class TmpRepositoryCommandEnv : public BaseCommandEnv
 {
 public:
-    TmpRepositoryCommandEnv::TmpRepositoryCommandEnv();
-    TmpRepositoryCommandEnv::TmpRepositoryCommandEnv(
-        css::uno::Reference< css::task::XInteractionHandler> const & handler);
+    TmpRepositoryCommandEnv();
+    TmpRepositoryCommandEnv(css::uno::Reference< css::task::XInteractionHandler> const & handler);
     
 // XInteractionHandler
     virtual void SAL_CALL handle(
@@ -105,8 +104,8 @@ private:
     ::rtl::OUString m_repository;
     bool m_bSuppressLicense;
 public:
-    LicenseCommandEnv::LicenseCommandEnv(){};
-    LicenseCommandEnv::LicenseCommandEnv(
+    LicenseCommandEnv(){};
+    LicenseCommandEnv(
         css::uno::Reference< css::task::XInteractionHandler> const & handler,
         bool bSuppressLicense,
         ::rtl::OUString const & repository);
@@ -126,9 +125,8 @@ class NoLicenseCommandEnv : public BaseCommandEnv
 {
 
 public:
-    NoLicenseCommandEnv::NoLicenseCommandEnv(){};
-    NoLicenseCommandEnv::NoLicenseCommandEnv(
-        css::uno::Reference< css::task::XInteractionHandler> const & handler);
+    NoLicenseCommandEnv(){};
+    NoLicenseCommandEnv(css::uno::Reference< css::task::XInteractionHandler> const & handler);
     
 // XInteractionHandler
     virtual void SAL_CALL handle(
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 0843daafc4..5540fc5872 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1225,6 +1225,7 @@ ExtensionManager::getExtensionsWithUnacceptedLicenses(
 }
 
 sal_Bool ExtensionManager::isReadOnlyRepository(::rtl::OUString const & repository)
+        throw (uno::RuntimeException)
 {
     return getPackageManager(repository)->isReadOnly();
 }
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index f308fdf7eb..58d61bd50b 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -202,7 +202,8 @@ public:
         throw (css::deployment::DeploymentException,
                css::uno::RuntimeException);
     
-    virtual sal_Bool SAL_CALL isReadOnlyRepository(::rtl::OUString const & repository);
+    virtual sal_Bool SAL_CALL isReadOnlyRepository(::rtl::OUString const & repository)
+        throw (css::uno::RuntimeException);
     
 private:
 
@@ -233,7 +234,7 @@ private:
     bool isUserDisabled(::rtl::OUString const & identifier,
                         ::rtl::OUString const & filename);
 
-    bool ExtensionManager::isUserDisabled(
+    bool isUserDisabled(
         css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > const & seqExtSameId);
 
     void activateExtension(
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 683193d549..b486f84045 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1471,6 +1471,8 @@ Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getExtensionsWit
     Reference<ucb::XCommandEnvironment> const & xCmdEnv)
     throw (deployment::DeploymentException, RuntimeException)
 {
+    ::std::vector<Reference<deployment::XPackage> > vec;
+
     try
     {
         const ::osl::MutexGuard guard( getMutex() );
@@ -1479,9 +1481,7 @@ Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getExtensionsWit
 
         ActivePackages::Entries::const_iterator i = id2temp.begin();
         bool bShared = m_context.equals(OUSTR("shared"));
-        ::std::vector<Reference<deployment::XPackage> > vec;
 
-                                    
         for (; i != id2temp.end(); i++ )
         {
             //Get the database entry
@@ -1523,6 +1523,8 @@ Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getExtensionsWit
         exc <<= de;
         ::cppu::throwException(exc);
     }
+
+    return ::comphelper::containerToSequence(vec);
 }
 
 sal_Int32 PackageManagerImpl::checkPrerequisites(
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index ca0360f26e..2437bc5362 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -274,12 +274,12 @@ void PackageRegistryBackend::deleteUnusedFolders(
             //usedFolders contains the urls to the folders which have
             //a trailing underscore
             const OUString  tempFile = tempEntries[ pos ];
-            const OUString tempFolder = tempFile + OUSTR("_");
+            const OUString tempFolderName = tempFile + OUSTR("_");
 
-            if (::std::find( usedFolders.begin(), usedFolders.end(), tempFolder ) ==
+            if (::std::find( usedFolders.begin(), usedFolders.end(), tempFolderName ) ==
                 usedFolders.end())
             {
-                erase_path( tempFolder, Reference<XCommandEnvironment>(),
+                erase_path( tempFolderName, Reference<XCommandEnvironment>(),
                             false /* no throw: ignore errors */ );
                 erase_path( tempFile, Reference<XCommandEnvironment>(),
                             false /* no throw: ignore errors */ );
@@ -306,7 +306,7 @@ Package::~Package()
 //______________________________________________________________________________
 Package::Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend,
                   OUString const & url,
-                  OUString const & name,
+                  OUString const & rName,
                   OUString const & displayName,
                   Reference<deployment::XPackageTypeInfo> const & xPackageType,
                   bool bRemoved,
@@ -314,7 +314,7 @@ Package::Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend,
     : t_PackageBase( getMutex() ),
       m_myBackend( myBackend ),
       m_url( url ),
-      m_name( name ),
+      m_name( rName ),
       m_displayName( displayName ),
       m_xPackageType( xPackageType ),
       m_bRemoved(bRemoved),
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 6c1ee81659..9b6dbf3373 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -228,7 +228,8 @@ class BackendImpl : public ImplBaseT
         virtual beans::StringPair SAL_CALL getPublisherInfo()
             throw (deployment::ExtensionRemovedException, RuntimeException);
 
-        virtual OUString SAL_CALL getDisplayName() throw (RuntimeException);
+        virtual OUString SAL_CALL getDisplayName()
+            throw (deployment::ExtensionRemovedException, RuntimeException);
         
         virtual Reference< graphic::XGraphic > SAL_CALL
         getIcon( ::sal_Bool bHighContrast )
@@ -754,9 +755,10 @@ bool BackendImpl::PackageImpl::checkDependencies(
 
 ::sal_Bool BackendImpl::PackageImpl::checkDependencies( 
         const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) 
-        throw (css::deployment::DeploymentException, 
-            css::ucb::CommandFailedException, 
-            css::uno::RuntimeException)
+        throw (deployment::DeploymentException, 
+               deployment::ExtensionRemovedException,
+               ucb::CommandFailedException,
+               RuntimeException)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -781,7 +783,8 @@ beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier()
         true, identifier);
 }
 
-OUString BackendImpl::PackageImpl::getVersion() throw (RuntimeException)
+OUString BackendImpl::PackageImpl::getVersion()
+    throw (deployment::ExtensionRemovedException, RuntimeException)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();    
@@ -982,7 +985,8 @@ void BackendImpl::PackageImpl::processPackage_(
 }
 
 //______________________________________________________________________________
-OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException)
+OUString BackendImpl::PackageImpl::getDescription()
+    throw (deployment::ExtensionRemovedException, RuntimeException)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();    
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 839a5feeba..15a6ac9311 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -321,7 +321,7 @@ BackendImpl::PackageImpl::isRegistered_(
     BackendImpl * that = getMyBackend();
     Reference< deployment::XPackage > xThisPackage( this );
 
-    bool registered = getMyBackend()->isRegisteredInDb(getURL());
+    bool registered = that->isRegisteredInDb(getURL());
     return beans::Optional< beans::Ambiguous<sal_Bool> >(
         true /* IsPresent */,
         beans::Ambiguous<sal_Bool>( registered, false /* IsAmbiguous */ ) );