diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2011-12-14 01:29:32 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2011-12-14 01:42:58 +0900 |
commit | 55b9dc002a7ffbf5d3abdece74a09029e2da94a5 (patch) | |
tree | 12dc676cac1f268954b1f76f3120dad3dfdbf530 | |
parent | 520891d058f9e936b9b8afb490b5a26c156008ef (diff) |
shrinked useless constants/defines
-rw-r--r-- | cui/source/options/optinet2.cxx | 18 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 4 | ||||
-rw-r--r-- | framework/source/layoutmanager/helpers.hxx | 5 | ||||
-rw-r--r-- | framework/source/services/pathsettings.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/headermenucontroller.cxx | 4 | ||||
-rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 1 |
6 files changed, 1 insertions, 33 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index f1bcd0722909..5d1b394d1d55 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -107,32 +107,14 @@ using namespace ::com::sun::star::uno; using namespace ::sfx2; using ::rtl::OUString; - -// define ---------------------------------------------------------------- - -// different delimiter for Unix (:) and Windows (;) - -#ifdef UNX -#define CLASSPATH_DELIMITER ':' -#else -#define CLASSPATH_DELIMITER ';' -#endif - // static ---------------------------------------------------------------- #define C2U(cChar) OUString::createFromAscii(cChar) -#define INET_SEARCH_TOKEN '"' -#define RET_ALL ((short)200) -#define CFG_READONLY_DEFAULT FALSE - #include <sal/config.h> SV_IMPL_PTRARR( SfxFilterPtrArr, SfxFilterPtr ) -const char* SEARCHENGINE_INI = "srcheng.ini"; -const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)"; - // ----------------------------------------------------------------------- void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 2f0de10f470c..75fba5aed80a 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -60,10 +60,6 @@ #include "osl/mutex.hxx" #include "vcl/svapp.hxx" -// define ---------------------------------------------------------------- - -#define MAKE_ANY ::com::sun::star::uno::makeAny - // using ---------------------------------------------------------------- using namespace ::com::sun::star::container; diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx index e2a22ce382ad..66d15832f72c 100644 --- a/framework/source/layoutmanager/helpers.hxx +++ b/framework/source/layoutmanager/helpers.hxx @@ -47,10 +47,7 @@ #include <vcl/window.hxx> #include <vcl/toolbox.hxx> -#define UIRESOURCE_PROTOCO_ASCII "private:" -#define UIRESOURCE_RESOURCE_ASCII "resource" -#define UIRESOURCE_URL_ASCII "private:resource" -#define UIRESOURCE_URL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( UIRESOURCE_URL_ASCII )) +#define UIRESOURCE_URL RTL_CONSTASCII_USTRINGPARAM( "private:resource" ) #define UIRESOURCETYPE_TOOLBAR "toolbar" #define UIRESOURCETYPE_STATUSBAR "statusbar" #define UIRESOURCETYPE_MENUBAR "menubar" diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 3d5e3b961090..45d3c8f1593c 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -63,8 +63,6 @@ // ______________________________________________ // non exported const -#define CFG_READONLY_DEFAULT sal_False - const ::rtl::OUString CFGPROP_USERPATHES(RTL_CONSTASCII_USTRINGPARAM("UserPaths")); const ::rtl::OUString CFGPROP_WRITEPATH(RTL_CONSTASCII_USTRINGPARAM("WritePath")); diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index e262a2c0276b..3c1e1b49e974 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -71,10 +71,6 @@ using namespace com::sun::star::util; using namespace com::sun::star::style; using namespace com::sun::star::container; -// Copied from Writer module -//#define RID_SW_SHELLRES (RID_SW_START + 1250 + 1) -//#define STR_ALLPAGE_HEADFOOT 14 - const sal_uInt16 ALL_MENUITEM_ID = 1; namespace framework diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index d5cc5cda19fe..029cc52d5cb4 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -76,7 +76,6 @@ using namespace ::com::sun::star; #define css_ui ::com::sun::star::ui #endif -const sal_Int32 HELPID_PREFIX_LENGTH = 7; static const char HELPID_PREFIX[] = "helpid:"; // Property names of a menu/menu item ItemDescriptor |