chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src | 1
cui/source/tabpages/tabarea.src | 1
dbaccess/source/ui/inc/dbu_resource.hrc | 1
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 23 --
i18npool/inc/servicename.hxx | 10 -
sc/source/filter/inc/colrowst.hxx | 2
sd/inc/sduiks.hrc | 40 -----
sd/source/ui/slidesorter/controller/SlsFocusManager.cxx | 2
sfx2/inc/sfx2/sfxbasemodel.hxx | 1
sfx2/source/view/sfxbasecontroller.cxx | 3
sfx2/source/view/view.hrc | 2
svl/inc/svl/cntwids.hrc | 3
svtools/inc/svtools/wizdlg.hxx | 1
svx/inc/uiks.hxx | 80
----------
sw/inc/globals.hrc | 1
sw/inc/swtypes.hxx | 2
sw/inc/unomap.hxx | 2
sw/inc/unoprnms.hxx | 3
sw/source/ui/app/apphdl.cxx | 1
vcl/inc/headless/svpinst.hxx | 1
20 files changed, 180 deletions(-)
New commits:
commit 1136fa4fc40cba46272e06b529064a02a140803f
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Mon Jul 2 06:28:57 2012 +0200
Remove unused defines
Change-Id: Ibc46eb4565d4df88e83882045b2ed6d31e487d16
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src
b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src
index 2039892..c323497 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 3bc0ca8..c704969 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 6364b23..0caa88f 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 144be50..b2f7692 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 c395433..7a8d0d1 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 55379c8..e906a52 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 9fc6cd9..651d71d 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 b8c4ad4..4444451 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 af628d1..f4b1a7d 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 6e8e4d6..02132e1 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 1bef08b..55fdaf1 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 c9e909d..849ee3e 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 d6044b7..b7773d0 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 d5849c7..1b01121 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 9e7c152..cd583e2 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 43ed2bb..44b7f5c 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 4570296..0efa291 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 f20f7cd..da60631 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 -
commit 2f7461722ccee315fe9f85aa651bca1c46adf263
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Mon Jul 2 06:27:19 2012 +0200
Remove unused sduiks.hrc
Change-Id: I147c1ea28dea0bf3341ee5d646d0204d5774ac95
diff --git a/sd/inc/sduiks.hrc b/sd/inc/sduiks.hrc
deleted file mode 100644
index d7af449..0000000
--- a/sd/inc/sduiks.hrc
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SDUIKS_HRC
-#define _SDUIKS_HRC
-
-#include <usr/uiks.hrc>
-
-#define SD_UIK_CONNECT UIK_DRAWING(34)
-#define SD_UIK_CONNECT UIK_DRAWING(35)
-
-#define SD_UIK_PRESENTATION UIK_DRAWING(40)
-#define SD_UIK_PRESENTATION_NAVIGATION UIK_DRAWING(41)
-#define SD_UIK_CUSTOM_PRESENTATION UIK_DRAWING(42)
-#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(43)
-#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(44)
-
-#define SD_UIK_ZOOM UIK_DRAWING(50)
-#define SD_UIK_DRAW_VIEW UIK_DRAWING(51)
-#define SD_UIK_OUTLINE_VIEW UIK_DRAWING(52)
-#define SD_UIK_SLIDE_VIEW UIK_DRAWING(53)
-#define SD_UIK_SLIDE_VIEW UIK_DRAWING(53)
-
-#define SD_UIK_PRESENTATION_STYLES UIK_DRAWING(60)
-
-#endif
commit 8930046435f93d3f85bb41e0b4044d507ae724be
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sun Jul 1 22:15:38 2012 +0200
Remove unused header uiks.hxx
Change-Id: Iab8bdeb25ca36b203c70b27b172e341f94af26bd
diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx
deleted file mode 100644
index 7539008..0000000
--- a/svx/inc/uiks.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_UIKS_HXX
-#define _SVX_UIKS_HXX
-
-#include <usr/uiks.hxx>
-
-// DBENGINE
-
-#define UIK_XDATABASEENGINE UIK_DATABASE(00)
-#define UIK_XDATABASEFAVORITES UIK_DATABASE(01)
-#define UIK_XDATABASE UIK_DATABASE(02)
-#define UIK_XDATABASECONNECTION UIK_DATABASE(03)
-#define UIK_XTRANSACTIONSUPPORT UIK_DATABASE(04)
-#define UIK_XDATABASECURSOR UIK_DATABASE(05)
-#define UIK_XDATABASETABLE UIK_DATABASE(06)
-#define UIK_XDATABASETABLES UIK_DATABASE(07)
-#define UIK_XDATABASEQUERY UIK_DATABASE(08)
-#define UIK_XDATABASEQUERIES UIK_DATABASE(09)
-#define UIK_XDATABASERELATION UIK_DATABASE(0a)
-#define UIK_XDATABASERELATIONS UIK_DATABASE(0b)
-#define UIK_XDATABASEFIELD UIK_DATABASE(0c)
-#define UIK_XDATABASEFIELDS UIK_DATABASE(0d)
-#define UIK_XDATABASEINDEX UIK_DATABASE(0e)
-#define UIK_XDATABASEINDEXES UIK_DATABASE(0f)
-#define UIK_XDATABASEDOCUMENT UIK_DATABASE(10)
-#define UIK_XDATABASEDOCUMENTS UIK_DATABASE(11)
-#define UIK_XDATABASEWORKSPACE UIK_DATABASE(12)
-#define UIK_XDATABASEWORKSPACES UIK_DATABASE(13)
-#define UIK_XDATABASEITERATOR UIK_DATABASE(14)
-#define UIK_XPREPAREDDATABASECURSOR UIK_DATABASE(15)
-
-
-// DBENGINE
-
-// FORMS
-
-#define UIK_XFORM UIK_FORMS(01)
-#define UIK_XFORMS UIK_FORMS(02)
-#define UIK_XFORMCONTROL UIK_FORMS(03)
-
-#define UIK_XHTMLFORM UIK_FORMS(05)
-#define UIK_XHTMLFORMLISTENER UIK_FORMS(06)
-#define UIK_XDATABASEFORM UIK_FORMS(07)
-#define UIK_XBOUNDCONTROL UIK_FORMS(08)
-#define UIK_XINSERTRECORDLISTENER UIK_FORMS(09)
-#define UIK_XUPDATERECORDLISTENER UIK_FORMS(0a)
-#define UIK_XDESTROYRECORDLISTENER UIK_FORMS(0b)
-#define UIK_XCURRENTRECORDLISTENER UIK_FORMS(0c)
-#define UIK_XBOUNDCONTROLLISTENER UIK_FORMS(0d)
-#define UIK_XLOADLISTENER UIK_FORMS(0e)
-#define UIK_XERRORLISTENER UIK_FORMS(0f)
-
-#define UIK_XFORMCONTROLFACTORY UIK_FORMS(10)
-#define UIK_XFORMCONTROLLER UIK_FORMS(11)
-#define UIK_XFORMCONTROLLERLISTENER UIK_FORMS(12)
-
-// FORMS
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
