summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2010-06-01 16:20:28 +0200
committerJoachim Lingner <jl@openoffice.org>2010-06-01 16:20:28 +0200
commit7ef48b304fe975501f32f8261ee620ebbedc90e5 (patch)
treef0dfe3e9204dd841310bd34b20e7f4d8dd434f02 /desktop
parent776d5631f5089f94cbe87b6f869f7887aeff2092 (diff)
jl152 #i77196# fix compiler warnings
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedata.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx11
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx2
-rw-r--r--desktop/util/makefile.mk2
4 files changed, 8 insertions, 9 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 7228982da518..76eb8af31e8e 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -47,7 +47,7 @@ namespace dp_gui {
struct UpdateData
{
UpdateData( ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > const & aExt):
- aInstalledPackage(aExt), bIsShared(false) {};
+ bIsShared(false), aInstalledPackage(aExt){};
//When entries added to the listbox then there can be one for the user update and one
//for the shared update. However, both list entries will contain the same UpdateData.
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index d121ad976a06..a27f04326b25 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -280,7 +280,6 @@ private:
dp_gui::UpdateData const & data, ::rtl::OUString const & version = ::rtl::OUString()) const;
void prepareUpdateData(
- ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > const & package,
::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & updateInfo,
UpdateDialog::DisabledUpdate & out_du,
dp_gui::UpdateData & out_data) const;
@@ -415,7 +414,7 @@ void UpdateDialog::Thread::execute()
for (Map::iterator i(map.begin()); i != map.end(); ++i)
{
//determine if online updates meet the requirements
- prepareUpdateData(i->second.package, i->second.info,
+ prepareUpdateData(i->second.info,
i->second.disableUpdate, i->second.updateData);
//determine if the update is installed in the user or shared repository
@@ -613,7 +612,6 @@ void UpdateDialog::Thread::getOwnUpdateInformation(
/** out_data will only be filled if all dependencies are ok.
*/
void UpdateDialog::Thread::prepareUpdateData(
- css::uno::Reference< css::deployment::XPackage > const & package,
css::uno::Reference< css::xml::dom::XNode > const & updateInfo,
UpdateDialog::DisabledUpdate & out_du,
dp_gui::UpdateData & out_data) const
@@ -648,21 +646,22 @@ bool UpdateDialog::Thread::update(
UpdateDialog::DisabledUpdate const & du,
dp_gui::UpdateData const & data) const
{
+ bool ret = false;
if (du.unsatisfiedDependencies.getLength() == 0)
{
vos::OGuard g(Application::GetSolarMutex());
if (!m_stop) {
m_dialog.addEnabledUpdate(getUpdateDisplayString(data), data);
}
- return !m_stop;
+ ret = !m_stop;
} else {
vos::OGuard g(Application::GetSolarMutex());
if (!m_stop) {
m_dialog.addDisabledUpdate(du);
}
- return !m_stop;
+ ret = !m_stop;
}
- return true;
+ return ret;
}
// UpdateDialog ----------------------------------------------------------
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 251e70a19ce6..24b5712ebd30 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -251,7 +251,7 @@ void ExtensionManager::addExtensionsToMap(
::std::list<Reference<deploy::XPackage> >
ExtensionManager::getExtensionsWithSameId(
OUString const & identifier, OUString const & fileName,
- Reference< ucb::XCommandEnvironment> const & xCmdEnv)
+ Reference< ucb::XCommandEnvironment> const & /*xCmdEnv*/)
{
::std::list<Reference<deploy::XPackage> > extensionList;
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 47885dfd6b73..8cf03f157254 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -108,7 +108,7 @@ APP5RPATH=BRAND
APP5OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/main.obj
APP5STDLIBS = $(SALLIB) $(SOFFICELIB)
.IF "$(OS)" == "LINUX"
-APP5STDLIBS+= -lXext
+APP5STDLIBS+= -lXext -lX11
#APP5STDLIBS+= -lXext -lSM -lICE
.ENDIF # LINUX