From e3b0f50966caa8be33a51974b6dccf6a5913bd1f Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sun, 6 May 2012 00:16:50 +0900 Subject: removed unused defines Change-Id: Ibb6141776fc3a418095b7184c7dacfba70dd7238 --- unotools/source/config/bootstrap.cxx | 6 ------ unotools/source/config/cmdoptions.cxx | 4 ---- unotools/source/config/fontcfg.cxx | 3 --- unotools/source/config/misccfg.cxx | 5 ----- unotools/source/config/securityoptions.cxx | 1 - unotools/source/config/startoptions.cxx | 1 - unotools/source/config/viewoptions.cxx | 7 ------- unotools/source/i18n/calendarwrapper.cxx | 1 - unotools/source/misc/atom.cxx | 1 - unotools/source/ucbhelper/tempfile.cxx | 1 - 10 files changed, 30 deletions(-) (limited to 'unotools') diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 94c8c2e89f40..07ae774c65cb 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -59,18 +59,12 @@ #define BOOTSTRAP_ITEM_BASEINSTALLATION "BRAND_BASE_DIR" #define BOOTSTRAP_ITEM_USERINSTALLATION "UserInstallation" -#define BOOTSTRAP_ITEM_SHAREDIR "SharedDataDir" #define BOOTSTRAP_ITEM_USERDIR "UserDataDir" #define BOOTSTRAP_DEFAULT_BASEINSTALL "$SYSBINDIR/.." -#define BOOTSTRAP_DIRNAME_SHAREDIR "share" #define BOOTSTRAP_DIRNAME_USERDIR "user" -#define VERSIONFILE_SECTION "Versions" - -#define SETUP_DATA_NAME SAL_CONFIGFILE("setup") -#define SETUP_ITEM_ALLUSERS "ALLUSERS" // --------------------------------------------------------------------------------------- typedef char const * AsciiString; // --------------------------------------------------------------------------------------- diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 5a2bf0abb4b2..d4e99b61da81 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -55,10 +55,6 @@ using namespace ::com::sun::star::beans ; #define PROPERTYNAME_CMD OUString(RTL_CONSTASCII_USTRINGPARAM("Command" )) -#define PROPERTYCOUNT 1 - -#define OFFSET_CMD 0 - // Method to retrieve a hash code from a string. May be we have to change it to decrease collisions in the hash map struct OUStringHashCode { diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 91aa696ed14e..cd11d8071a78 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -46,9 +46,6 @@ #include #include -#define DEFAULTFONT_CONFIGNODE "VCL/DefaultFonts" -#define SUBSTFONT_CONFIGNODE "VCL/FontSubstitutions" - using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index 17b0999316ae..6df28b37c9a0 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -39,11 +39,6 @@ #include #include "itemholder1.hxx" -#define DEFAULT_TAB 2000 - -#define DEF_INCH 2540L -#define DEF_RELTWIP 1440L - using namespace com::sun::star::uno; using ::rtl::OUString; diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index c8d65e2c2b1f..01e1abd3a267 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star::uno ; #define ROOTNODE_SECURITY OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Security/Scripting")) #define DEFAULT_SECUREURL Sequence< OUString >() -#define DEFAULT_SECLEVEL 3 #define DEFAULT_TRUSTEDAUTHORS Sequence< SvtSecurityOptions::Certificate >() // xmlsec05 depricated diff --git a/unotools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx index 18653e38e3a0..aed86b25b88a 100644 --- a/unotools/source/config/startoptions.cxx +++ b/unotools/source/config/startoptions.cxx @@ -42,7 +42,6 @@ using namespace ::osl ; using namespace ::com::sun::star::uno ; #define DEFAULT_SHOWINTRO sal_True -#define DEFAULT_CONNECTIONURL OUString() #define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/Office" )) #define PROPERTYNAME_SHOWINTRO OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupShowIntro" )) diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 0ec236d30a62..112ffbb36b33 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -61,8 +61,6 @@ namespace css = ::com::sun::star; #define CONST_ASCII(SASCIIVALUE) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SASCIIVALUE)) #endif -#define PATHSEPERATOR CONST_ASCII("/") - #define PACKAGE_VIEWS CONST_ASCII("org.openoffice.Office.Views") #define LIST_DIALOGS CONST_ASCII("Dialogs" ) @@ -75,11 +73,6 @@ namespace css = ::com::sun::star; #define PROPERTY_VISIBLE CONST_ASCII("Visible" ) #define PROPERTY_USERDATA CONST_ASCII("UserData" ) -#define PROPCOUNT_DIALOGS 1 -#define PROPCOUNT_TABDIALOGS 2 -#define PROPCOUNT_TABPAGES 1 -#define PROPCOUNT_WINDOWS 2 - #define DEFAULT_WINDOWSTATE ::rtl::OUString() #define DEFAULT_USERDATA css::uno::Sequence< css::beans::NamedValue >() #define DEFAULT_PAGEID 0 diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index ad781428aac7..ee685b034cf2 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -35,7 +35,6 @@ #include #include -#define CALENDAR_LIBRARYNAME "i18n" #define CALENDAR_SERVICENAME "com.sun.star.i18n.LocaleCalendar" using namespace ::com::sun::star; diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index a5093a9eb379..5cfd14331f9c 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.cxx @@ -32,7 +32,6 @@ using namespace utl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -#define NMSP_UTIL ::com::sun::star::util AtomProvider::AtomProvider() { diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index cf16a4b74186..21578d95a8a6 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -132,7 +132,6 @@ umask(old_mode); return bSuccess; } -#define TMPNAME_SIZE ( 1 + 5 + 5 + 4 + 1 ) String ConstructTempDir_Impl( const String* pParent ) { String aName; -- cgit v1.2.3