remove non-compiled code

4 files changed, 4 insertions, 69 deletions

diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx
index 25e221ef4870..2a1a0e779b60 100644
--- a/desktop/os2/source/applauncher/launcher.cxx
+++ b/desktop/os2/source/applauncher/launcher.cxx
@@ -67,11 +67,7 @@ int main( int argc, char* argv[])
     DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH);
     // make sure we load DLL from our path only, so multiple instances/versions
     // can be loaded.
-#if 0
-    // YD this feature is not compatible with innowin b20,
-    // java cannot load with this flag enabled
-    DosSetExtLIBPATH( (PCSZ)"T", LIBPATHSTRICT);
-#endif
+
 
     // adjust exe name
     _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 011518221b9b..9104e3fc1c6b 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -151,28 +151,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
                 {
                     Reference<XContentProviderManager> xCPM =
                         cb->getContentProviderManagerInterface();
-#if 0
-                    try
-                    {
 
-                        Reference<XContentProviderFactory> xCPF(
-                            xServiceFactory->createInstance(
-                                rtl::OUString::createFromAscii(
-                                    "com.sun.star.ucb.ContentProviderProxyFactory")),
-                            UNO_QUERY);
-                        if(xCPF.is())
-                            xCPM->registerContentProvider(
-                                xCPF->createContentProvider(
-                                    rtl::OUString::createFromAscii(
-                                        "com.sun.star.ucb.GnomeVFSContentProvider"
-                                    )
-                                ),
-                                rtl::OUString::createFromAscii(".*"),
-                                false);
-                    } catch (...)
-                    {
-                    }
-#else
 
             // Workaround for P1 #124597#.  Instanciate GNOME-VFS-UCP in the thread that initialized
              // GNOME in order to avoid a deadlock that may occure in case UCP gets initialized from
@@ -195,7 +174,6 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
                     {
                     }
                 }
-#endif
             }
         } catch (RuntimeException e) {
         }
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index a77da3eb4438..d83d8cef1b02 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -261,9 +261,7 @@ private:
     virtual ~Thread();
 
     virtual void execute();
-#if 0
-    void handleGeneralError(css::uno::Any const & exception) const;
-#endif
+
     void handleSpecificError(
         css::uno::Reference< css::deployment::XPackage > const & package,
         css::uno::Any const & exception) const;
@@ -452,21 +450,7 @@ void UpdateDialog::Thread::execute()
         m_dialog.checkingDone();
     }
 }
-#if 0
-void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
-    const
-{
-    rtl::OUString message;
-    css::uno::Exception e;
-    if (exception >>= e) {
-        message = e.Message;
-    }
-    vos::OGuard g(Application::GetSolarMutex());
-    if (!m_stop) {
-        m_dialog.addGeneralError(message);
-    }
-}
-#endif
+
 //Parameter package can be null
 void UpdateDialog::Thread::handleSpecificError(
     css::uno::Reference< css::deployment::XPackage > const & package,
@@ -772,18 +756,7 @@ void UpdateDialog::addDisabledUpdate(UpdateDialog::DisabledUpdate const & data)
         SvLBoxButtonKind_disabledCheckbox);
         // position overflow is rather harmless
 }
-#if 0
-void UpdateDialog::addGeneralError(rtl::OUString const & message) {
-    std::vector< rtl::OUString >::size_type n = m_generalErrors.size();
-    m_generalErrors.push_back(message);
-    addAdditional(
-        m_error,
-        sal::static_int_cast< USHORT >(
-            m_enabledUpdates.size() + m_disabledUpdates.size() + n),
-        UpdateDialog::Index::newGeneralError(n), SvLBoxButtonKind_staticImage);
-        // position overflow is rather harmless
-}
-#endif
+
 void UpdateDialog::addSpecificError(UpdateDialog::SpecificError const & data) {
     std::vector< UpdateDialog::SpecificError >::size_type n =
         m_specificErrors.size();
@@ -1245,15 +1218,6 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
         //If the user has no write access to the shared folder then the update
         //for a shared extension is disable, that is it cannot be in m_enabledUpdates
 //        OSL_ASSERT(isReadOnly(i->aInstalledPackage) == sal_False);
-#if 0
-        // TODO: check!
-        OSL_ASSERT(m_extensionManagerDialog.get());
-        if (RET_CANCEL == m_extensionManagerDialog->continueUpdateForSharedExtension(
-            this, i->aPackageManager))
-        {
-            EndDialog(RET_CANCEL);
-        }
-#endif
     }
 
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 34411f9ed0b6..a4489dcaa351 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -158,9 +158,6 @@ private:
         rtl::OUString const & name, dp_gui::UpdateData const & data);
 
     void addDisabledUpdate(UpdateDialog::DisabledUpdate const & data);
-#if 0
-    void addGeneralError(rtl::OUString const & message);
-#endif
     void addSpecificError(UpdateDialog::SpecificError const & data);
 
     void checkingDone();