diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-07-02 06:28:57 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-07-02 06:29:10 +0200 |
commit | 1136fa4fc40cba46272e06b529064a02a140803f (patch) | |
tree | b4708277684b12738f5e80f5704d5e3c8457d6b5 | |
parent | 2f7461722ccee315fe9f85aa651bca1c46adf263 (diff) |
Remove unused defines
Change-Id: Ibc46eb4565d4df88e83882045b2ed6d31e487d16
-rw-r--r-- | chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src | 1 | ||||
-rw-r--r-- | cui/source/tabpages/tabarea.src | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 1 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePicker.cxx | 23 | ||||
-rw-r--r-- | i18npool/inc/servicename.hxx | 10 | ||||
-rw-r--r-- | sc/source/filter/inc/colrowst.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsFocusManager.cxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxbasemodel.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/view/view.hrc | 2 | ||||
-rw-r--r-- | svl/inc/svl/cntwids.hrc | 3 | ||||
-rw-r--r-- | svtools/inc/svtools/wizdlg.hxx | 1 | ||||
-rw-r--r-- | sw/inc/globals.hrc | 1 | ||||
-rw-r--r-- | sw/inc/swtypes.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unomap.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unoprnms.hxx | 3 | ||||
-rw-r--r-- | sw/source/ui/app/apphdl.cxx | 1 | ||||
-rw-r--r-- | vcl/inc/headless/svpinst.hxx | 1 |
18 files changed, 0 insertions, 60 deletions
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src index 2039892a8583..c323497c4e3a 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src @@ -36,7 +36,6 @@ #define WIZ_POSX2_A (WIZ_POSX2) #define WIZ_POSX2_B (WIZ_POSX2_A+9) -#define WIZ_SECOND_FIXEDLINE_WIDTH (CHART_WIZARD_PAGEWIDTH-10-(WIZ_POSX2)) #define WIZ_COMPLETE_FIXEDLINE_WIDTH (CHART_WIZARD_PAGEWIDTH-10-(WIZ_POSX1)) #define WIZ_VERTICAL_FIXEDLINE_HEIGHT ( 88 ) diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src index 3bc0ca8d3798..c704969d6012 100644 --- a/cui/source/tabpages/tabarea.src +++ b/cui/source/tabpages/tabarea.src @@ -35,7 +35,6 @@ // RID_SVXPAGE_AREA ------------------------------------------------------ #define TRANS_GRAD_OFFSET_X 6 #define TRANS_GRAD_OFFSET_Y 64 -#define TRANS_GRAD_FIELD_SEPARATION 24 TabPage RID_SVXPAGE_TRANSPARENCE { diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 6364b2328587..0caa88f9fd0d 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -126,7 +126,6 @@ #define PAGE_LDAP RID_PAGE_START + 15 #define TAB_PAGE_USERADMIN RID_PAGE_START + 16 #define PAGE_MYSQL_ODBC RID_PAGE_START + 17 -#define TAB_PAGE_TABLEPRIVILEGES RID_PAGE_START + 18 #define PAGE_USERDRIVER RID_PAGE_START + 19 #define PAGE_MYSQL_JDBC RID_PAGE_START + 20 #define PAGE_GENERATED_VALUES RID_PAGE_START + 22 diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 144be502cd96..b2f7692943da 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -137,29 +137,6 @@ namespace #endif //----------------------------------------------------------------------------------------- -#define VISTAFILEDIALOG_CHECKED_COMCALL(PARAM_CODE, PARAM_LOGMESSAGE, PARAM_ERRORMESSAGE) \ - { \ - HRESULT aResult; \ - VISTAFILEDIALOG_CHECKED_COMCALL_WITH_RETURN(aResult, PARAM_CODE, PARAM_LOGMESSAGE, PARAM_ERRORMESSAGE) \ - } - -//----------------------------------------------------------------------------------------- -#define VISTAFILEDIALOG_CHECKED_COMCALL_WITH_RETURN(RETURN_HR, PARAM_CODE, PARAM_LOGMESSAGE, PARAM_ERRORMESSAGE) \ - { \ - LOG_FILE(PARAM_LOGMESSAGE) \ - RETURN_HR = PARAM_CODE; \ - if ( FAILED(RETURN_HR) ) \ - { \ - LOG_FILE_1_PARAM("will throw exception for checked COM call:\n%s", PARAM_ERRORMESSAGE) \ - throw css::uno::RuntimeException( \ - ::rtl::OUString::createFromAscii(PARAM_ERRORMESSAGE), \ - css::uno::Reference< css::ui::dialogs::XFilePicker >()); \ - } \ - } - - - -//----------------------------------------------------------------------------------------- VistaFilePicker::VistaFilePicker(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : TVistaFilePickerBase (m_aMutex ) , m_xSMGR (xSMGR ) diff --git a/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx index c395433cda2b..7a8d0d11418e 100644 --- a/i18npool/inc/servicename.hxx +++ b/i18npool/inc/servicename.hxx @@ -57,24 +57,14 @@ Implementation Name #ifndef _I18N_SERVICENAME_HXX_ #define _I18N_SERVICENAME_HXX_ - - #define TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration" #define TRLT_SERVICELNAME_PREFIX TRLT_SERVICELNAME "." -#define TRLT_SERVICELNAME_U2L TRLT_SERVICELNAME_PREFIX "u2l" -#define TRLT_SERVICELNAME_L2U TRLT_SERVICELNAME_PREFIX "l2u" -#define TRLT_SERVICELNAME_CASEIGNORE TRLT_SERVICELNAME_PREFIX "caseignore" #define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME_PREFIX "l10n" #define TRLT_IMPLNAME "com.sun.star.i18n.Transliteration" -#define TRLT_IMPLNAME_PREFIX_LEN 34 #define TRLT_IMPLNAME_PREFIX "com.sun.star.i18n.Transliteration." // 1...5...901...5...901...5...901..4 --> 34 -#define TRLT_IMPLNAME_L10N TRLT_IMPLNAME_PREFIX "l10n" -#define TRLT_IMPLNAME_FH TRLT_IMPLNAME_PREFIX "FULLWIDTH_HALFWIDTH" // for test -#define TRLT_IMPLNAME_Ja_JP TRLT_IMPLNAME_PREFIX "ja_JP" - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index 55379c8f603a..e906a5242db4 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -32,8 +32,6 @@ #include "xiroot.hxx" #include <mdds/flat_segment_tree.hpp> -#define XLS_USE_NEW_ROW_CONT 1 - // ============================================================================ class XclImpColRowSettings : protected XclImpRoot diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 9fc6cd997e98..651d71de9c2c 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -42,8 +42,6 @@ #include "Window.hxx" #include "sdpage.hxx" -#define UNIFY_FOCUS_AND_CURRENT_PAGE - namespace sd { namespace slidesorter { namespace controller { FocusManager::FocusManager (SlideSorter& rSlideSorter) diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index b8c4ad481db4..444445115d04 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -136,7 +136,6 @@ #define NOSUCHELEMENTEXCEPTION ::com::sun::star::container::NoSuchElementException #define ELEMENTEXISTEXCEPTION ::com::sun::star::container::ElementExistException #define XNAMEREPLACE ::com::sun::star::container::XNameReplace -#define XINDEXCONTAINER ::com::sun::star::container::XIndexContainer #define DOCEVENTOBJECT ::com::sun::star::document::EventObject #define XDOCEVENTLISTENER ::com::sun::star::document::XEventListener #define XDOCUMENTINFO ::com::sun::star::document::XDocumentInfo diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index af628d16a190..f4b1a7d93d13 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -93,7 +93,6 @@ #define OMULTITYPEINTERFACECONTAINERHELPER ::cppu::OMultiTypeInterfaceContainerHelper #define OINTERFACECONTAINERHELPER ::cppu::OInterfaceContainerHelper -#define XFRAMEACTIONLISTENER ::com::sun::star::frame::XFrameActionListener #define XCLOSELISTENER ::com::sun::star::util::XCloseListener #define FRAMEACTIONEVENT ::com::sun::star::frame::FrameActionEvent #define EVENTOBJECT ::com::sun::star::lang::EventObject @@ -102,11 +101,9 @@ #define MUTEXGUARD ::osl::MutexGuard #define UNOQUERY ::com::sun::star::uno::UNO_QUERY #define MAPPING ::com::sun::star::uno::Mapping -#define XSTATUSINDICATORSUPPLIER ::com::sun::star::task::XStatusIndicatorSupplier #define XCOMPONENT ::com::sun::star::lang::XComponent #define XINTERFACE ::com::sun::star::uno::XInterface #define XKEYHANDLER ::com::sun::star::awt::XKeyHandler -#define XMOUSECLICKHANDLER ::com::sun::star::awt::XMouseClickHandler #define TIMEOUT_START_RESCHEDULE 10L /* 10th s */ diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc index 6e8e4d6f2b81..02132e1198c8 100644 --- a/sfx2/source/view/view.hrc +++ b/sfx2/source/view/view.hrc @@ -55,8 +55,6 @@ #define MSG_QUERY_OPENASTEMPLATE (RID_SFX_VIEW_START+41) #define MSG_CANT_CLOSE (RID_SFX_VIEW_START+42) -#define TP_FRAMEPROPERTIES (RID_SFX_VIEW_START+44) - #define FT_FRAMENAME 3 #define ED_FRAMENAME 4 #define FT_URL 5 diff --git a/svl/inc/svl/cntwids.hrc b/svl/inc/svl/cntwids.hrc index 1bef08bfee72..55fdaf15f157 100644 --- a/svl/inc/svl/cntwids.hrc +++ b/svl/inc/svl/cntwids.hrc @@ -19,9 +19,6 @@ #ifndef _CNTWIDS_HRC #define _CNTWIDS_HRC -#define TF_NEW_TABPAGES -#define CNT_COOL_ABO - //========================================================================= // ARGS, MSG, ALL, FOLDER, BOXALL, BOXEXT //========================================================================= diff --git a/svtools/inc/svtools/wizdlg.hxx b/svtools/inc/svtools/wizdlg.hxx index c9e909ddcb5c..849ee3e719b7 100644 --- a/svtools/inc/svtools/wizdlg.hxx +++ b/svtools/inc/svtools/wizdlg.hxx @@ -211,7 +211,6 @@ IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn ) #define WIZARDDIALOG_BUTTON_STDOFFSET_X 6 #define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X 3 -#define WIZARDDIALOG_BUTTON_STDOFFSETLEFT_X -10 // ---------------- // - WizardDialog - diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index d6044b795317..b7773d067369 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -175,7 +175,6 @@ #define TP_LINENUMBERING (RC_GLOBALS_BEGIN + 75) #define TP_OUTLINE_NUM (RC_GLOBALS_BEGIN + 76) -#define TP_OPTINSERT_PAGE (RC_GLOBALS_BEGIN + 77) #define TP_OPTCAPTION_PAGE (RC_GLOBALS_BEGIN + 78) #define DLG_SVXTEST_NUM_BULLET (RC_GLOBALS_BEGIN + 79) #define TP_OPTLOAD_PAGE (RC_GLOBALS_BEGIN + 80) diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index d5849c7f2a8e..1b01121d1184 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -87,8 +87,6 @@ const SwTwips lMinBorder = 1134; #define DOCUMENTBORDER 284L #define GAPBETWEENPAGES 284L -#define UNDO_ACTION_COUNT 20 - // Constant strings. SW_DLLPUBLIC extern UniString aEmptyStr; // "" SW_DLLPUBLIC extern UniString aDotStr; // '.' diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index 9e7c152c083f..cd583e22b84a 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -173,13 +173,11 @@ #define WID_USE_P_P 1014 #define WID_USE_DASH 1015 #define WID_USE_UPPER_CASE 1016 -#define WID_INDEX_AUTO_MARK_FILE_U_R_L 1017 #define WID_LABEL_CATEGORY 1018 #define WID_LABEL_DISPLAY_TYPE 1019 #define WID_USE_LEVEL_FROM_SOURCE 1020 #define WID_LEVEL_FORMAT 1021 #define WID_LEVEL_PARAGRAPH_STYLES 1022 -#define WID_RECALC_TAB_STOPS 1023 #define WID_MAIN_ENTRY_CHARACTER_STYLE_NAME 1025 #define WID_CREATE_FROM_TABLES 1026 #define WID_CREATE_FROM_TEXT_FRAMES 1027 diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 43ed2bb96c4d..44b7f5c8d945 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -843,9 +843,6 @@ SW_DLLPUBLIC const SwPropNameLen& SwGetPropName( sal_uInt16 nId ); #define SW_PROP_NAME(nId) \ GetPropName( nId ).pName, GetPropName( nId ).nNameLen -#define SW_PRPNM_EQLASCI(nId) \ - GetPropName( nId ).pName, 0, GetPropName( nId ).nNameLen - #define SW_PROP_NAME_STR(nId) \ GetPropName( nId ).pName diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 45702965b387..0efa29160747 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -121,7 +121,6 @@ using namespace ::com::sun::star; // #define SwModule #define ViewSettings -#define WebViewSettings #define PrintSettings #include <sfx2/msg.hxx> #include "swslots.hxx" diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index f20f7cd62ea1..da60631ead25 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -45,7 +45,6 @@ #define VIRTUAL_DESKTOP_WIDTH 1024 #define VIRTUAL_DESKTOP_HEIGHT 768 -#define VIRTUAL_DESKTOP_DEPTH 24 // --------------- // - SalTimer - |