diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 10:18:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-27 09:36:53 +0100 |
| commit | aa753f01ba4631614bb88ee7d3a3e6b222208b3e (patch) | |
| tree | c8b168e8e0619c387d30f206848ec30ca7238a00 /desktop/source | |
| parent | 2ea2860ba56231d989c5e1b8f87392921bc2a8db (diff) | |
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
Diffstat (limited to 'desktop/source')
4 files changed, 6 insertions, 8 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 160b56dd9b0b..9b4ba5b39095 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#if defined WNT #define _WIN32_WINNT 0x0500 - - - - +#endif #include "sal/config.h" diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 01fea3e3b3d7..7b61ac925f36 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -33,7 +33,6 @@ #define USER_PACKAGE_MANAGER "user" #define SHARED_PACKAGE_MANAGER "shared" -#define BUNDLED_PACKAGE_MANAGER "bundled" using namespace ::com::sun::star; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 65ca88fa73cf..b0d1350955eb 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -36,7 +36,6 @@ #define USER_PACKAGE_MANAGER OUString("user") #define SHARED_PACKAGE_MANAGER OUString("shared") -#define BUNDLED_PACKAGE_MANAGER OUString("bundled") using namespace ::com::sun::star; using ::rtl::OUString; diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index f95466664286..27ef710a112b 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -54,14 +54,16 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; using ::rtl::OString; - +#if defined WNT #define SOFFICE1 "soffice.exe" -#define SOFFICE2 "soffice.bin" #define SBASE "sbase.exe" #define SCALC "scalc.exe" #define SDRAW "sdraw.exe" #define SIMPRESS "simpress.exe" #define SWRITER "swriter.exe" +#endif + +#define SOFFICE2 "soffice.bin" namespace dp_misc { namespace { |