[Libreoffice-commits] .: 8 commits - avmedia/source basic/inc comphelper/inc crashrep/source cui/source dbaccess/source desktop/inc dtrans/source editeng/inc editeng/source extensions/source filter/inc filter/source fpicker/source framework/inc framework/source l10ntools/inc linguistic/source sc/inc scp2/inc sc/source sd/inc sd/source sd/util sfx2/inc sfx2/source shell/source solenv/inc starmath/inc starmath/source svl/inc svtools/inc svtools/source svx/inc svx/source sw/inc sw/source toolkit/inc tools/inc ucbhelper/inc ucb/source unotools/inc vcl/inc vcl/source vcl/unx wizards/source writerfilter/source xmloff/inc xmloff/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Jul 1 09:34:54 PDT 2012
avmedia/source/viewer/mediawindow_impl.cxx | 9
avmedia/source/viewer/mediawindowbase_impl.cxx | 2
basic/inc/basic/sbxcore.hxx | 15
comphelper/inc/comphelper/accessibleselectionhelper.hxx | 1
crashrep/source/unx/main.cxx | 1
cui/source/dialogs/hldocntp.cxx | 7
cui/source/dialogs/iconcdlg.cxx | 2
cui/source/options/optgdlg.hrc | 1
dbaccess/source/filter/xml/xmlHelper.hxx | 2
dbaccess/source/inc/apitools.hxx | 6
dbaccess/source/ui/dlg/CollectionView.cxx | 1
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 8
dbaccess/source/ui/dlg/dbadmin.src | 3
desktop/inc/app.hxx | 4
dtrans/source/cnttype/mctfentry.cxx | 5
dtrans/source/win32/clipb/wcbentry.cxx | 5
dtrans/source/win32/dnd/globals.hxx | 2
editeng/inc/editeng/editdata.hxx | 11
editeng/inc/editeng/editobj.hxx | 3
editeng/inc/editeng/editstat.hxx | 4
editeng/source/editeng/eehtml.hxx | 2
editeng/source/misc/svxacorr.cxx | 4
extensions/source/bibliography/bibmod.hxx | 6
extensions/source/dbpilots/groupboxwiz.cxx | 2
extensions/source/propctrlr/stringdefine.hxx | 5
extensions/source/update/check/updatecheckconfig.cxx | 1
extensions/source/update/ui/updatecheckui.cxx | 2
extensions/source/update/ui/updatecheckui.hrc | 2
filter/inc/filter.hrc | 10
filter/source/config/cache/constant.hxx | 12
filter/source/xsltdialog/xmlfileview.hrc | 1
fpicker/source/aqua/FPServiceInfo.hxx | 7
fpicker/source/office/iodlgimp.hxx | 2
fpicker/source/win32/filepicker/FPServiceInfo.hxx | 5
fpicker/source/win32/folderpicker/FOPServiceInfo.hxx | 5
framework/inc/acceleratorconst.h | 7
framework/inc/classes/filtercachedata.hxx | 30 -
framework/inc/classes/protocolhandlercache.hxx | 2
framework/inc/framework/menuconfiguration.hxx | 1
framework/inc/services/logindialog.hxx | 50 --
framework/inc/xml/toolboxconfigurationdefines.hxx | 32 -
framework/source/classes/resource.src | 1
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/fwe/xml/menudocumenthandler.cxx | 2
l10ntools/inc/xmlparse.hxx | 1
l10ntools/inc/xmlutil.hxx | 29 -
linguistic/source/convdic.cxx | 2
sc/inc/address.hxx | 3
sc/inc/cfgids.hxx | 8
sc/inc/dptabdat.hxx | 2
sc/inc/global.hxx | 1
sc/inc/rechead.hxx | 73 ---
sc/inc/sc.hrc | 4
sc/source/core/data/drwlayer.cxx | 7
sc/source/core/tool/interpr1.cxx | 2
sc/source/core/tool/interpr3.cxx | 1
sc/source/filter/inc/xlchart.hxx | 6
sc/source/filter/inc/xlconst.hxx | 1
sc/source/filter/xml/xmlstyle.hxx | 8
sc/source/ui/dbgui/dpuiglobal.hxx | 1
sc/source/ui/docshell/docsh8.cxx | 2
sc/source/ui/inc/output.hxx | 6
sc/source/ui/view/viewfun5.cxx | 2
scp2/inc/macros.inc | 113 ----
sd/inc/anmdef.hxx | 34 -
sd/inc/anminfo.hxx | 1
sd/inc/app.hrc | 2
sd/source/filter/html/htmlex.hxx | 2
sd/source/filter/ppt/pptanimations.hxx | 9
sd/source/ui/animations/CustomAnimation.hrc | 1
sd/source/ui/dlg/animobjs.cxx | 1
sd/source/ui/func/fudraw.cxx | 1
sd/source/ui/func/fusel.cxx | 1
sd/source/ui/inc/drawview.hxx | 2
sd/source/ui/inc/slideshow.hxx | 3
sd/source/ui/inc/tpaction.hxx | 1
sd/source/ui/inc/unoaprms.hxx | 1
sd/util/hidother.hrc | 1
sfx2/inc/sfx2/childwin.hxx | 8
sfx2/inc/sfx2/cntids.hrc | 1
sfx2/inc/sfx2/htmlmode.hxx | 20
sfx2/inc/sfx2/linksrc.hxx | 4
sfx2/inc/sfx2/msg.hxx | 5
sfx2/inc/sfx2/sfx.hrc | 11
sfx2/inc/sfx2/sfxbasemodel.hxx | 1
sfx2/inc/sfx2/sfxdefs.hxx | 5
sfx2/inc/sfx2/shell.hxx | 3
sfx2/inc/sfx2/viewsh.hxx | 3
sfx2/source/dialog/templdlg.cxx | 7
sfx2/source/dialog/templdlg.hrc | 3
sfx2/source/inc/workwin.hxx | 1
sfx2/source/view/impframe.hxx | 7
shell/source/unix/exec/shellexecentry.cxx | 1
shell/source/win32/SysShentry.cxx | 1
shell/source/win32/simplemail/smplmailentry.cxx | 1
solenv/inc/starview.hid | 2
starmath/inc/applicat.hxx | 54 --
starmath/inc/document.hxx | 12
starmath/inc/types.hxx | 7
starmath/source/accessibility.cxx | 1
starmath/source/toolbox.src | 2
svl/inc/svl/hint.hxx | 6
svl/inc/svl/inettype.hxx | 6
svl/inc/svl/solar.hrc | 3
svtools/inc/svtools/brwbox.hxx | 6
svtools/inc/svtools/ruler.hxx | 1
svtools/inc/svtools/svtools.hrc | 1
svtools/source/control/ruler.cxx | 2
svtools/source/filter/sgvtext.cxx | 1
svtools/source/filter/wmf/winmtf.hxx | 19
svtools/source/inc/iodlg.hrc | 2
svx/inc/svx/dialogs.hrc | 12
svx/inc/svx/svdhlpln.hxx | 2
svx/inc/svx/svdocapt.hxx | 2
svx/inc/svx/svxdlg.hxx | 2
svx/inc/svx/svxids.hrc | 20
svx/source/engine3d/float3d.src | 2
sw/inc/cmdid.h | 212 ---------
sw/inc/dbgoutsw.hxx | 8
sw/inc/fesh.hxx | 2
sw/inc/fmtanchr.hxx | 1
sw/inc/fmtornt.hxx | 6
sw/inc/fmtpdsc.hxx | 3
sw/inc/tox.hxx | 3
sw/source/core/inc/rootfrm.hxx | 6
sw/source/core/txtnode/swfont.cxx | 8
sw/source/core/unocore/unochart.cxx | 5
sw/source/core/unocore/unocoll.cxx | 1
sw/source/ui/config/uinums.cxx | 1
sw/source/ui/config/viewopt.cxx | 9
sw/source/ui/dialog/regionsw.src | 7
sw/source/ui/dialog/uiregionsw.cxx | 3
sw/source/ui/docvw/SidebarWin.cxx | 3
sw/source/ui/inc/cfgid.h | 6
sw/source/ui/inc/ribbar.hrc | 1
sw/source/ui/inc/swcont.hxx | 4
sw/source/ui/utlui/navipi.cxx | 2
sw/source/ui/utlui/uiitems.cxx | 13
sw/source/ui/vba/vbacolumn.cxx | 2
toolkit/inc/toolkit/helper/property.hxx | 14
tools/inc/tools/color.hxx | 11
tools/inc/tools/debug.hxx | 4
tools/inc/tools/urlobj.hxx | 28 -
ucb/source/ucp/ftp/ftpcontent.hxx | 5
ucb/source/ucp/tdoc/tdoc_storage.cxx | 11
ucbhelper/inc/ucbhelper/macros.hxx | 15
unotools/inc/unotools/cmdoptions.hxx | 1
vcl/inc/aqua/salnativewidgets.h | 1
vcl/inc/vcl/apptypes.hxx | 13
vcl/inc/vcl/bitmap.hxx | 1
vcl/inc/vcl/cmdevt.h | 6
vcl/inc/vcl/combobox.h | 2
vcl/inc/vcl/lstbox.h | 2
vcl/inc/vcl/outdev.hxx | 2
vcl/inc/vcl/settings.hxx | 10
vcl/source/window/toolbox.cxx | 4
vcl/unx/kde/FPServiceInfo.hxx | 12
vcl/unx/kde4/FPServiceInfo.hxx | 6
wizards/source/importwizard/importwi.src | 340 ---------------
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 1
xmloff/inc/xmloff/txtprmap.hxx | 6
xmloff/source/forms/propertyexport.hxx | 3
162 files changed, 24 insertions(+), 1644 deletions(-)
New commits:
commit 00240d049790d11c4ef35de7a294819107197efd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jul 1 18:24:05 2012 +0200
Remove unused defines
Change-Id: Ic36b131ee9964a6671f7f41e1cad1631c43ad565
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 781c58e..814cef3 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -51,27 +51,12 @@ namespace rtl { class OUString; }
virtual sal_uInt16 GetVersion() const { return nVer; } \
virtual sal_uInt16 GetSbxId() const { return nSbxId; }
-#define SBX_DECL_PERSIST_NODATA_() \
- virtual sal_uInt32 GetCreator() const; \
- virtual sal_uInt16 GetVersion() const; \
- virtual sal_uInt16 GetSbxId() const;
-
// This version of the macro defines Load/StorePrivateData()-methods
#define SBX_DECL_PERSIST( nCre, nSbxId, nVer ) \
virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); \
virtual sal_Bool StorePrivateData( SvStream& ) const; \
SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer )
-#define SBX_DECL_PERSIST_() \
- virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); \
- virtual sal_Bool StorePrivateData( SvStream& ) const; \
- SBX_DECL_PERSIST_NODATA_()
-
-#define SBX_IMPL_PERSIST( C, nCre, nSbxId, nVer ) \
- sal_uInt32 C::GetCreator() const { return nCre; } \
- sal_uInt16 C::GetVersion() const { return nVer; } \
- sal_uInt16 C::GetSbxId() const { return nSbxId; }
-
class SbxBase;
class SbxFactory;
class SbxObject;
diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx
index aa7a76e..f835c9e 100644
--- a/dbaccess/source/filter/xml/xmlHelper.hxx
+++ b/dbaccess/source/filter/xml/xmlHelper.hxx
@@ -25,7 +25,7 @@
#include <memory>
-#define CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1)
+// CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1)
#define CTF_DB_ISVISIBLE (XML_DB_CTF_START + 2)
#define CTF_DB_MASTERPAGENAME (XML_DB_CTF_START + 3)
#define CTF_DB_NUMBERFORMAT (XML_DB_CTF_START + 4)
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index e5aec66..c7843b1 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -155,12 +155,6 @@ public:
} \
//----------------------------------------------------------------------------------
-// declare service info methods - no getImplementationName, so the class is abstract
-#define DECLARE_SERVICE_INFO_ABSTRACT() \
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
-
-//----------------------------------------------------------------------------------
// declare service info methods
#define DECLARE_SERVICE_INFO() \
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index bcb0b54..1c3bf8e 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -25,14 +25,6 @@
#include "curledit.hxx"
#include <sfx2/filedlghelper.hxx>
-
-#define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \
- if (editcontrol.GetText() != editcontrol.GetSavedValue()) \
- { \
- itemset.Put(SfxStringItem(itemid, editcontrol.GetText())); \
- modifiedflag = sal_True; \
- }
-
//.........................................................................
namespace dbaui
{
diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx
index 4b77299..223dc67 100644
--- a/dtrans/source/cnttype/mctfentry.cxx
+++ b/dtrans/source/cnttype/mctfentry.cxx
@@ -36,11 +36,6 @@
// the implementation names
#define MIMECONTENTTYPEFACTORY_IMPL_NAME "com.sun.star.datatransfer.MimeCntTypeFactory"
-// the registry key names
-// a key under which this service will be registered, Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-// < Implementation-Name ></UNO/SERVICES/>< Service-Name >
-#define MIMECONTENTTYPEFACTORY_REGKEY_NAME "/com.sun.star.datatransfer.MimeCntTypeFactory/UNO/SERVICES/com.sun.star.datatransfer.MimeContentTypeFactory"
-
//-----------------------------------------------------------------------------------------------------------
// namespace directives
//-----------------------------------------------------------------------------------------------------------
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index bf1cea4..2cf7860 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.cxx
@@ -35,11 +35,6 @@
// the implementation names
#define WINCLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.ClipboardW32"
-// the registry key names
-// a key under which this service will be registered, Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-// < Implementation-Name ></UNO/SERVICES/>< Service-Name >
-#define WINCLIPBOARD_REGKEY_NAME "/com.sun.star.datatransfer.clipboard.ClipboardW32/UNO/SERVICES/com.sun.star.datatransfer.clipboard.SystemClipboard"
-
//-----------------------------------------------------------------------------------------------------------
// namespace directives
//-----------------------------------------------------------------------------------------------------------
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index 97a3d0c..1828fc1 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.hxx
@@ -33,11 +33,9 @@
#define DNDSOURCE_SERVICE_NAME "com.sun.star.datatransfer.dnd.OleDragSource"
#define DNDSOURCE_IMPL_NAME "com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"
-#define DNDSOURCE_REGKEY_NAME "/com.sun.star.comp.datatransfer.dnd.OleDragSource_V1/UNO/SERVICES/com.sun.star.datatransfer.dnd.OleDragSource"
#define DNDTARGET_SERVICE_NAME "com.sun.star.datatransfer.dnd.OleDropTarget"
#define DNDTARGET_IMPL_NAME "com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"
-#define DNDTARGET_REGKEY_NAME "/com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1/UNO/SERVICES/com.sun.star.datatransfer.dnd.OleDropTarget"
// This maps key states as occur as parameter, e.g. in IDropTarget::DragEnter,
// IDropSource::QueryContinueDrag, to actions as are declared in
diff --git a/extensions/source/propctrlr/stringdefine.hxx b/extensions/source/propctrlr/stringdefine.hxx
index 8029460..9af1574 100644
--- a/extensions/source/propctrlr/stringdefine.hxx
+++ b/extensions/source/propctrlr/stringdefine.hxx
@@ -38,11 +38,6 @@ namespace pcr
using comphelper::string::ConstAsciiString;
//============================================================
-
-#define CONST_ASCII_LENGTH(c) \
- (const sal_Char*)c, c.length()
-
- //============================================================
//= concrete strings
//============================================================
#ifndef PCR_IMPLEMENT_STRINGS
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index cb06e29..d7c0b29 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -72,7 +72,6 @@ namespace uno = com::sun::star::uno ;
#define DOWNLOAD_PAUSED "DownloadPaused"
#define DOWNLOAD_DESTINATION "DownloadDestination"
#define RELEASE_NOTE "ReleaseNote"
-#define EXTENSION_PREFIX "Extension_"
#define PROPERTY_VERSION UNISTRING("Version")
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 53d41c4..ea1f050 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -62,7 +62,6 @@
#define UNISTRING(s) rtl::OUString(s)
#define MSG_ERR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START + 7)
-#define DEFAULT_MENUBAR_HEIGHT 24
#define PROPERTY_TITLE RTL_CONSTASCII_STRINGPARAM("BubbleHeading")
#define PROPERTY_TEXT RTL_CONSTASCII_STRINGPARAM("BubbleText")
@@ -804,7 +803,6 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent)
#define BUBBLE_BORDER 10
#define TEXT_MAX_WIDTH 300
#define TEXT_MAX_HEIGHT 200
-#define INITIAL_SHOW_TIME 10000
//------------------------------------------------------------------------------
BubbleWindow::BubbleWindow( Window* pParent, const XubString& rTitle,
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index 5fda7bb..bd9d063 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -163,18 +163,6 @@
#define FLAGVAL_STARTPRESENTATION 0x20000000 // 268435456
#define FLAGVAL_ALL 0xffffffff // 4294967295
-/** @short uno service names of our document services
- provided by our application modules.
- */
-#define DOCUMENTSERVICE_WRITER _FILTER_CONFIG_FROM_ASCII_("com.sun.star.text.TextDocument" )
-#define DOCUMENTSERVICE_WRITER_WEB _FILTER_CONFIG_FROM_ASCII_("com.sun.star.text.WebDocument" )
-#define DOCUMENTSERVICE_WRITER_GLOBAL _FILTER_CONFIG_FROM_ASCII_("com.sun.star.text.GlobalDocument" )
-#define DOCUMENTSERVICE_CALC _FILTER_CONFIG_FROM_ASCII_("com.sun.star.sheet.SpreadsheetDocument" )
-#define DOCUMENTSERVICE_DRAW _FILTER_CONFIG_FROM_ASCII_("com.sun.star.drawing.DrawingDocument" )
-#define DOCUMENTSERVICE_IMPRESS _FILTER_CONFIG_FROM_ASCII_("com.sun.star.presentation.PresentationDocument")
-#define DOCUMENTSERVICE_CHART _FILTER_CONFIG_FROM_ASCII_("com.sun.star.chart2.ChartDocument" )
-#define DOCUMENTSERVICE_MATH _FILTER_CONFIG_FROM_ASCII_("com.sun.star.formula.FormulaProperties" )
-
/** @short some uno service names.
*/
#define SERVICE_CONFIGURATIONUPDATEACCESS _FILTER_CONFIG_FROM_ASCII_("com.sun.star.configuration.ConfigurationUpdateAccess" )
diff --git a/fpicker/source/aqua/FPServiceInfo.hxx b/fpicker/source/aqua/FPServiceInfo.hxx
index ba4327d..c1b64c8 100644
--- a/fpicker/source/aqua/FPServiceInfo.hxx
+++ b/fpicker/source/aqua/FPServiceInfo.hxx
@@ -32,13 +32,6 @@
#define FILE_PICKER_IMPL_NAME "com.sun.star.ui.dialogs.SalAquaFilePicker"
#define FOLDER_PICKER_IMPL_NAME "com.sun.star.ui.dialogs.SalAquaFolderPicker"
-// the registry key names
-// a key under which this service will be registered,
-// Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-// <Implementation-Name></UNO/SERVICES/><Service-Name>
-#define FILE_PICKER_REGKEY_NAME "/com.sun.star.ui.dialogs.SalAquaFilePicker/UNO/SERVICES/com.sun.star.ui.dialogs.AquaFilePicker"
-#define FOLDER_PICKER_REGKEY_NAME "/com.sun.star.ui.dialogs.SalAquaFolderPicker/UNO/SERVICES/com.sun.star.ui.dialogs.AquaFolderPicker"
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 699092c..b5bcefa 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -45,8 +45,6 @@ class SvtFileDialog;
#define FILEDIALOG_DEF_EXTSEP ';'
#define FILEDIALOG_DEF_WILDCARD '*'
-#define FILEDIALOG_DEF_IMAGEBORDER 10
-#define FILEDIALOG_DEF_TIMEOUT 250
//*****************************************************************************
// SvtFileDialogFilter_Impl
diff --git a/fpicker/source/win32/filepicker/FPServiceInfo.hxx b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
index e3aa870..f6188bc 100644
--- a/fpicker/source/win32/filepicker/FPServiceInfo.hxx
+++ b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
@@ -52,11 +52,6 @@
// the implementation names
#define FILE_PICKER_IMPL_NAME "com.sun.star.ui.dialogs.Win32FilePicker"
-// the registry key names
-// a key under which this service will be registered, Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-// < Implementation-Name ></UNO/SERVICES/>< Service-Name >
-#define FILE_PICKER_REGKEY_NAME "/com.sun.star.ui.dialogs.Win32FilePicker/UNO/SERVICES/com.sun.star.ui.dialogs.SystemFilePicker"
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
index 9e1f2a8..501ca59 100644
--- a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
+++ b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
@@ -38,11 +38,6 @@
// the implementation names
#define FOLDER_PICKER_IMPL_NAME "com.sun.star.ui.dialogs.Win32FolderPicker"
-// the registry key names
-// a key under which this service will be registered, Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-// < Implementation-Name ></UNO/SERVICES/>< Service-Name >
-#define FOLDER_PICKER_REGKEY_NAME "/com.sun.star.ui.dialogs.Win32FolderPicker/UNO/SERVICES/com.sun.star.ui.dialogs.SystemFolderPicker"
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index e5204aa..63afcbb 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -40,13 +40,6 @@ namespace framework{
#define XMLNS_ACCEL DECLARE_ASCII("accel")
#define XMLNS_XLINK DECLARE_ASCII("xlink")
-#define ATTRIBUTE_URL DECLARE_ASCII("href" )
-#define ATTRIBUTE_KEYCODE DECLARE_ASCII("code" )
-#define ATTRIBUTE_MOD_SHIFT DECLARE_ASCII("shift")
-#define ATTRIBUTE_MOD_MOD1 DECLARE_ASCII("mod1" )
-#define ATTRIBUTE_MOD_MOD2 DECLARE_ASCII("mod2" )
-#define ATTRIBUTE_MOD_MOD3 DECLARE_ASCII("mod3" )
-
// same items with a name space alias
#define AL_ELEMENT_ACCELERATORLIST DECLARE_ASCII("accel:acceleratorlist")
#define AL_ELEMENT_ITEM DECLARE_ASCII("accel:item" )
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 26d3708..781829e 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -80,30 +80,10 @@ namespace framework{
#define PACKAGENAME_TYPEDETECTION_ADDITIONAL DECLARE_ASCII("Office.TypeDetectionAdditional" )
#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// separator for configuration paths
#define PROPERTY_SEPERATOR sal_Unicode(',') /// separator for own formated property strings of types and filters
-#define LIST_SEPERATOR sal_Unicode(';') /// separator for own formated lists as part of our own formated type- or filter-string
-#define LOCALE_FALLBACK DECLARE_ASCII("en-US" ) /// fallback, if configuration can't give us current set locale ...
#define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one.
#define DEFAULT_FILTERCACHE_MODE CONFIG_MODE_DELAYED_UPDATE | CONFIG_MODE_ALL_LOCALES /// ConfigItems could run in different modes: supported values are ... { CONFIG_MODE_IMMEDIATE_UPDATE, CONFIG_MODE_DELAYED_UPDATE, CONFIG_MODE_ALL_LOCALES }
-#define CFG_ENCODING_OPEN DECLARE_ASCII("[\'" ) /// used to start encoding of set names
-#define CFG_ENCODING_CLOSE DECLARE_ASCII("\']" ) /// used to finish encoding of set names
-#define PRODUCTNAME_VARIABLE DECLARE_ASCII("%productname%")
-#define PRODUCTNAME_VARLENGTH 13
-#define PRODUCTNAME_FALLBACK DECLARE_ASCII("StarOffice" ) /// fallback, if configuration can't give us current set product name ...
-#define FORMATVERSION_VARIABLE DECLARE_ASCII("%formatversion%" )
-#define FORMATVERSION_VARLENGTH 15
-#define FORMATVERSION_FALLBACK DECLARE_ASCII("6.0/7" )
-
-//*****************************************************************************************************************
-// We know some default values ...
-//*****************************************************************************************************************
-#define NAME_DEFAULTDETECTOR DECLARE_ASCII("com.sun.star.comp.office.FilterDetect" )
-#define NAME_GENERICLOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" )
-#define UINAME_GENERICLOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" )
-#define TYPELIST_DEFAULTDETECTOR DECLARE_ASCII("*" )
-#define TYPELIST_GENERICLOADER DECLARE_ASCII("*" )
-
//*****************************************************************************************************************
// This are all supported set-names of our filter configuration.
//*****************************************************************************************************************
@@ -155,22 +135,12 @@ namespace framework{
#define PROPERTY_PREFERRED DECLARE_ASCII("Preferred" )
#define PROPERTY_INSTALLED DECLARE_ASCII("Installed" )
#define PROPERTY_UINAME DECLARE_ASCII("UIName" )
-#define PROPERTY_UINAMES DECLARE_ASCII("UINames" )
#define PROPERTY_MEDIATYPE DECLARE_ASCII("MediaType" )
-#define PROPERTY_CLIPBOARDFORMAT DECLARE_ASCII("ClipboardFormat" )
-#define PROPERTY_URLPATTERN DECLARE_ASCII("URLPattern" )
-#define PROPERTY_EXTENSIONS DECLARE_ASCII("Extensions" )
-#define PROPERTY_DOCUMENTICONID DECLARE_ASCII("DocumentIconID" )
#define PROPERTY_TYPE DECLARE_ASCII("Type" )
-#define PROPERTY_DOCUMENTSERVICE DECLARE_ASCII("DocumentService" )
-#define PROPERTY_FILTERSERVICE DECLARE_ASCII("FilterService" )
#define PROPERTY_FLAGS DECLARE_ASCII("Flags" )
#define PROPERTY_USERDATA DECLARE_ASCII("UserData" )
-#define PROPERTY_FILEFORMATVERSION DECLARE_ASCII("FileFormatVersion" )
-#define PROPERTY_TEMPLATENAME DECLARE_ASCII("TemplateName" )
#define PROPERTY_TYPES DECLARE_ASCII("Types" )
#define PROPERTY_ORDER DECLARE_ASCII("Order" )
-#define PROPERTY_UICOMPONENT DECLARE_ASCII("UIComponent" )
//_________________________________________________________________________________________________________________
// exported definitions
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 8fe3dfc..be7e1c8 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -63,8 +63,6 @@ namespace framework{
#define PACKAGENAME_PROTOCOLHANDLER DECLARE_ASCII("Office.ProtocolHandler" ) /// name of our configuration package
#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// separator for configuration paths
-#define CFG_ENCODING_OPEN DECLARE_ASCII("[\'" ) /// used to start encoding of set names
-#define CFG_ENCODING_CLOSE DECLARE_ASCII("\']" ) /// used to finish encoding of set names
#define SETNAME_HANDLER DECLARE_ASCII("HandlerSet" ) /// name of configuration set inside package
#define PROPERTY_PROTOCOLS DECLARE_ASCII("Protocols" ) /// properties of a protocol handler
diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx
index bf052bc..e4b2f4b 100644
--- a/framework/inc/framework/menuconfiguration.hxx
+++ b/framework/inc/framework/menuconfiguration.hxx
@@ -53,7 +53,6 @@
#define BOOKMARK_NEWMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_new" ))
#define BOOKMARK_WIZARDMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_wizard" ))
-#define ADDONS_POPUPMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_addons_popup" ))
// Prepare for inclusion by framework and sfx
// Please consider that there is a corresponding define also in sfxsids.hrc!! (SID_SFX_START)/(SID_ADDONS)
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index eed512e..115ca13 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -109,7 +109,6 @@ namespace framework{
#endif
#define UNCPATHSEPERATOR sal_Unicode(0x002F)
-#define MAX_SERVERHISTORY 10
// Use follow keys in follow order.
// [Global]
@@ -132,55 +131,6 @@ namespace framework{
#define SECTION_DEFAULTPORTS "DefaultPorts"
#define SECTION_SERVERHISTORY "ServerHistory"
-#define SECTION_USERNAME SECTION_GLOBAL
-#define SECTION_ACTIVESERVER SECTION_GLOBAL
-#define SECTION_CONNECTIONTYPE SECTION_GLOBAL
-#define SECTION_LANGUAGE SECTION_GLOBAL
-#define SECTION_SECURITYPROXY SECTION_GLOBAL
-#define SECTION_DIALOG SECTION_GLOBAL
-#define SECTION_HTTP SECTION_DEFAULTPORTS
-#define SECTION_HTTPS SECTION_DEFAULTPORTS
-#define SECTION_SERVER_X SECTION_SERVERHISTORY
-
-#define KEY_USERNAME "UserName"
-#define KEY_ACTIVESERVER "ActiveServer"
-#define KEY_CONNECTIONTYPE "ConnectionType"
-#define KEY_LANGUAGE "Language"
-#define KEY_SERVER_X "Server_"
-#define KEY_SECURITYPROXY "SecurityProxy"
-#define KEY_USESECURITYPROXY "UseProxy"
-#define KEY_DIALOG "dialog"
-#define KEY_HTTP "http"
-#define KEY_HTTPS "https"
-
-#define PROPERTYNAME_CONNECTIONTYPE DECLARE_ASCII("ConnectionType" )
-#define PROPERTYNAME_LANGUAGE DECLARE_ASCII("Language" )
-#define PROPERTYNAME_PARENTWINDOW DECLARE_ASCII("ParentWindow" )
-#define PROPERTYNAME_PASSWORD DECLARE_ASCII("Password" )
-#define PROPERTYNAME_SECURITYPROXY DECLARE_ASCII("SecurityProxy" )
-#define PROPERTYNAME_SERVER DECLARE_ASCII("Server" )
-#define PROPERTYNAME_SERVERHISTORY DECLARE_ASCII("ServerHistory" )
-#define PROPERTYNAME_USERNAME DECLARE_ASCII("UserName" )
-#define PROPERTYNAME_USEPROXY DECLARE_ASCII("UseProxy" )
-#define PROPERTYNAME_DIALOG DECLARE_ASCII("Dialog" )
-#define PROPERTYNAME_HTTP DECLARE_ASCII("http" )
-#define PROPERTYNAME_HTTPS DECLARE_ASCII("https" )
-
-#define PROPERTYHANDLE_CONNECTIONTYPE 1
-#define PROPERTYHANDLE_LANGUAGE 2
-#define PROPERTYHANDLE_PARENTWINDOW 3
-#define PROPERTYHANDLE_PASSWORD 4
-#define PROPERTYHANDLE_SERVER 5
-#define PROPERTYHANDLE_SERVERHISTORY 6
-#define PROPERTYHANDLE_USERNAME 7
-#define PROPERTYHANDLE_SECURITYPROXY 8
-#define PROPERTYHANDLE_USEPROXY 9
-#define PROPERTYHANDLE_DIALOG 10
-#define PROPERTYHANDLE_HTTP 11
-#define PROPERTYHANDLE_HTTPS 12
-
-#define PROPERTYCOUNT 12
-
//_________________________________________________________________________________________________________________
// exported definitions
//_________________________________________________________________________________________________________________
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index 4e15921..acd8e02 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -32,11 +32,6 @@
#define ELEMENT_TOOLBARBREAK "toolbarbreak"
#define ELEMENT_TOOLBARSEPARATOR "toolbarseparator"
-#define ELEMENT_TOOLBARLAYOUTS "toolbarlayouts"
-#define ELEMENT_TOOLBARLAYOUT "toolbarlayout"
-#define ELEMENT_TOOLBARCONFIGITEMS "toolbarconfigitems"
-#define ELEMENT_TOOLBARCONFIGITEM "toolbarconfigitem"
-
#define ATTRIBUTE_UINAME "uiname"
#define ATTRIBUTE_BITMAP "bitmap"
@@ -50,29 +45,12 @@
#define ATTRIBUTE_TOOLTIP "tooltip"
#define ATTRIBUTE_ITEMSTYLE "style"
-#define ATTRIBUTE_ID "id"
-#define ATTRIBUTE_FLOATINGPOSLEFT "floatingposleft"
-#define ATTRIBUTE_FLOATINGPOSTOP "floatingpostop"
-#define ATTRIBUTE_TOOLBARNAME "toolbarname"
-#define ATTRIBUTE_CONTEXT "context"
-#define ATTRIBUTE_FLOATINGLINES "floatinglines"
-#define ATTRIBUTE_DOCKINGLINES "dockinglines"
-#define ATTRIBUTE_ALIGN "align"
-#define ATTRIBUTE_FLOATING "floating"
-#define ATTRIBUTE_BUTTONTYPE "style"
-#define ATTRIBUTE_USERDEFNAME "userdefname"
-
#define ELEMENT_NS_TOOLBAR "toolbar:toolbar"
#define ELEMENT_NS_TOOLBARITEM "toolbar:toolbaritem"
#define ELEMENT_NS_TOOLBARSPACE "toolbar:toolbarspace"
#define ELEMENT_NS_TOOLBARBREAK "toolbar:toolbarbreak"
#define ELEMENT_NS_TOOLBARSEPARATOR "toolbar:toolbarseparator"
-#define ELEMENT_NS_TOOLBARLAYOUTS "toolbar:toolbarlayouts"
-#define ELEMENT_NS_TOOLBARLAYOUT "toolbar:toolbarlayout"
-#define ELEMENT_NS_TOOLBARCONFIGITEMS "toolbar:toolbarconfigitems"
-#define ELEMENT_NS_TOOLBARCONFIGITEM "toolbar:toolbarconfigitem"
-
#define ATTRIBUTE_XMLNS_TOOLBAR "xmlns:toolbar"
#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink"
@@ -81,16 +59,6 @@
#define ATTRIBUTE_BOOLEAN_TRUE "true"
#define ATTRIBUTE_BOOLEAN_FALSE "false"
-#define ATTRIBUTE_ALIGN_LEFT "left"
-#define ATTRIBUTE_ALIGN_RIGHT "right"
-#define ATTRIBUTE_ALIGN_TOP "top"
-#define ATTRIBUTE_ALIGN_BOTTOM "bottom"
-
-#define ATTRIBUTE_STYLE_TEXT "text"
-#define ATTRIBUTE_STYLE_SYMBOL "symbol"
-#define ATTRIBUTE_STYLE_SYMBOLTEXT "symboltext"
-#define ATTRIBUTE_STYLE_SYMBOLPLUSTEXT "symbol+text"
-
#define ATTRIBUTE_ITEMSTYLE_RADIO "radio"
#define ATTRIBUTE_ITEMSTYLE_AUTO "auto"
#define ATTRIBUTE_ITEMSTYLE_LEFT "left"
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index f284d77..f2316b6 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -67,7 +67,6 @@ using namespace ::com::sun::star::lang ;
#define ROOTNODE_ADDONMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" ))
#define PATHDELIMITER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" ))
-#define TOOLBARITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" ))
#define SEPARATOR_URL_STR "private:separator"
#define SEPARATOR_URL_LEN 17
#define SEPARATOR_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR ))
@@ -99,7 +98,6 @@ using namespace ::com::sun::star::lang ;
#define PROPERTYNAME_MERGEMENU_MERGEFALLBACK ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" ))
#define PROPERTYNAME_MERGEMENU_MERGECONTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" ))
#define PROPERTYNAME_MERGEMENU_MENUITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MenuItems" ))
-#define MERGEMENU_MERGEPOINT_SEPARATOR '\\'
#define PROPERTYNAME_MERGETOOLBAR_TOOLBAR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeToolBar" ))
#define PROPERTYNAME_MERGETOOLBAR_MERGEPOINT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" ))
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 2c50e0e..8b12893 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -64,13 +64,11 @@
#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id"
#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label"
#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid"
-#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak"
#define ATTRIBUTE_STYLE "http://openoffice.org/2001/menu^style"
#define ATTRIBUTE_NS_ID "menu:id"
#define ATTRIBUTE_NS_LABEL "menu:label"
#define ATTRIBUTE_NS_HELPID "menu:helpid"
-#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak"
#define ATTRIBUTE_NS_STYLE "menu:style"
#define ATTRIBUTE_XMLNS_MENU "xmlns:menu"
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index ba12fa6..8b3cda9 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -89,7 +89,6 @@ class XclRoot;
#define EXC_CHPROP_CROSSOVERPOSITION CREATE_OUSTRING( "CrossoverPosition" )
#define EXC_CHPROP_CROSSOVERVALUE CREATE_OUSTRING( "CrossoverValue" )
#define EXC_CHPROP_CURVESTYLE CREATE_OUSTRING( "CurveStyle" )
-#define EXC_CHPROP_D3DCAMERAGEOMETRY CREATE_OUSTRING( "D3DCameraGeometry" )
#define EXC_CHPROP_D3DSCENEAMBIENTCOLOR CREATE_OUSTRING( "D3DSceneAmbientColor" )
#define EXC_CHPROP_D3DSCENELIGHTON1 CREATE_OUSTRING( "D3DSceneLightOn1" )
#define EXC_CHPROP_D3DSCENELIGHTCOLOR2 CREATE_OUSTRING( "D3DSceneLightColor2" )
@@ -97,18 +96,14 @@ class XclRoot;
#define EXC_CHPROP_D3DSCENELIGHTON2 CREATE_OUSTRING( "D3DSceneLightOn2" )
#define EXC_CHPROP_D3DSCENEPERSPECTIVE CREATE_OUSTRING( "D3DScenePerspective" )
#define EXC_CHPROP_D3DSCENESHADEMODE CREATE_OUSTRING( "D3DSceneShadeMode" )
-#define EXC_CHPROP_D3DTRANSFORMMATRIX CREATE_OUSTRING( "D3DTransformMatrix" )
#define EXC_CHPROP_DISPLAYLABELS CREATE_OUSTRING( "DisplayLabels" )
#define EXC_CHPROP_ERRORBARSTYLE CREATE_OUSTRING( "ErrorBarStyle" )
#define EXC_CHPROP_ERRORBARX CREATE_OUSTRING( "ErrorBarX" )
#define EXC_CHPROP_ERRORBARY CREATE_OUSTRING( "ErrorBarY" )
#define EXC_CHPROP_EXPANSION CREATE_OUSTRING( "Expansion" )
#define EXC_CHPROP_EXPTIMEINCREMENT CREATE_OUSTRING( "ExplicitTimeIncrement" )
-#define EXC_CHPROP_FILLBITMAPMODE CREATE_OUSTRING( "FillBitmapMode" )
-#define EXC_CHPROP_FILLSTYLE CREATE_OUSTRING( "FillStyle" )
#define EXC_CHPROP_GAPWIDTHSEQ CREATE_OUSTRING( "GapwidthSequence" )
#define EXC_CHPROP_GEOMETRY3D CREATE_OUSTRING( "Geometry3D" )
-#define EXC_CHPROP_HASMAINTITLE CREATE_OUSTRING( "HasMainTitle" )
#define EXC_CHPROP_INCLUDEHIDDENCELLS CREATE_OUSTRING( "IncludeHiddenCells" )
#define EXC_CHPROP_JAPANESE CREATE_OUSTRING( "Japanese" )
#define EXC_CHPROP_LABEL CREATE_OUSTRING( "Label" )
@@ -160,7 +155,6 @@ class XclRoot;
#define EXC_CHPROP_ROLE_ERRORBARS_POSX CREATE_OUSTRING( "error-bars-x-positive" )
#define EXC_CHPROP_ROLE_ERRORBARS_POSY CREATE_OUSTRING( "error-bars-y-positive" )
#define EXC_CHPROP_ROLE_LABEL CREATE_OUSTRING( "label" )
-#define EXC_CHPROP_ROLE_SIZES CREATE_OUSTRING( "sizes" )
#define EXC_CHPROP_ROLE_XVALUES CREATE_OUSTRING( "values-x" )
#define EXC_CHPROP_ROLE_YVALUES CREATE_OUSTRING( "values-y" )
#define EXC_CHPROP_ROLE_OPENVALUES CREATE_OUSTRING( "values-first" )
diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index 552c2d6..39dd2c3 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -88,7 +88,6 @@ const SCTAB SCTAB_GLOBAL = SCTAB_MAX; /// A Calc sheet
#define EXC_STORAGE_OLE_LINKED CREATE_STRING( "LNK" )
#define EXC_STORAGE_OLE_EMBEDDED CREATE_STRING( "MBD" )
#define EXC_STORAGE_VBA_PROJECT CREATE_STRING( "_VBA_PROJECT_CUR" )
-#define EXC_STORAGE_VBA CREATE_STRING( "VBA" )
#define EXC_STREAM_BOOK CREATE_STRING( "Book" )
#define EXC_STREAM_WORKBOOK CREATE_STRING( "Workbook" )
diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx
index cb6e4fe..630ce04 100644
--- a/sc/source/filter/xml/xmlstyle.hxx
+++ b/sc/source/filter/xml/xmlstyle.hxx
@@ -66,8 +66,8 @@ extern const XMLPropertyMapEntry aXMLScTableStylesImportProperties[];
#define XML_SC_TYPE_EQUAL (XML_SC_TYPES_START + 17)
#define XML_SC_TYPE_VERTICAL (XML_SC_TYPES_START + 18)
-#define CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1)
-#define CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2)
+// CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1)
+// CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2)
#define CTF_SC_ALLPADDING (XML_SC_CTF_START + 3)
#define CTF_SC_BOTTOMPADDING (XML_SC_CTF_START + 4)
#define CTF_SC_LEFTPADDING (XML_SC_CTF_START + 5)
@@ -85,8 +85,8 @@ extern const XMLPropertyMapEntry aXMLScTableStylesImportProperties[];
#define CTF_SC_BOTTOMBORDERWIDTH (XML_SC_CTF_START + 17)
#define CTF_SC_NUMBERFORMAT (XML_SC_CTF_START + 18)
#define CTF_SC_MAP (XML_SC_CTF_START + 19)
-#define CTF_SC_PARAINDENT (XML_SC_CTF_START + 20)
-#define CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21)
+// CTF_SC_PARAINDENT (XML_SC_CTF_START + 20)
+// CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21)
#define CTF_SC_IMPORT_MAP (XML_SC_CTF_START + 22)
#define CTF_SC_CELLSTYLE (XML_SC_CTF_START + 23)
#define CTF_SC_VALIDATION (XML_SC_CTF_START + 24)
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 893e675..5982668 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -27,32 +27,12 @@
ALL_LANG(Name,STR_NAME_##id); \
ALL_LANG(Description,STR_DESC_##id)
-#define MOD_NAME_DESC_ON_DESELECT(id) \
- MOD_NAME_DESC(id); \
- ALL_LANG(OnDeselect,STR_DESELECT_##id)
-
#define REG_VALUE_LNG(id) \
ALL_LANG(Value,STR_REG_VAL_##id);
-#define FOLDERITEM_NAME_LNG(id) \
- ALL_LANG(Name,STR_FI_NAME_##id);
-
-#define ALL_LANG_STR_KEY(ident) \
- ALL_LANG(Key,ident)
-
-#define ALL_LANG_STR_KEY_LNG(ident) \
- ALL_LANG(Key,STR_KEY_##ident)
-
#define ALL_LANG_STR_VALUE_LNG(ident) \
ALL_LANG(Value,STR_VALUE_##ident)
-#define ALL_LANG_VALUE(vident) \
- ALL_LANG(Value,vident)
-
-#define ALL_LANG_KEY(vident) \
- ALL_LANG(Key,vident)
-
-
#ifdef UNX
#ifdef MACOSX
#define UNXSUFFIX .dylib
@@ -81,7 +61,6 @@
#define SHORTRESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res))
#define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
#define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang))
-#define HELPFILENAME(name,endung) STRING(CONCAT3(name,.,endung))
#define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip))
#define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
@@ -103,18 +82,10 @@
TXT_FILE_BODY; \
Styles = (PACKED)
-#define PACKED_TXT_FILE_BODY_PATCH \
- TXT_FILE_BODY; \
- Styles = (PACKED,PATCH)
-
#define ARCHIVE_TXT_FILE_BODY \
TXT_FILE_BODY; \
Styles = (ARCHIVE)
-#define ARCHIVE_TXT_FILE_BODY_PATCH \
- TXT_FILE_BODY; \
- Styles = (ARCHIVE,PATCH)
-
#ifdef WITH_HELPPACK_INTEGRATION
#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
TXT_FILE_BODY; \
@@ -125,14 +96,6 @@
Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE)
#endif
-#define ARCHIVE_SUBST_FILE_BODY \
- TXT_FILE_BODY; \
- Styles = (ARCHIVE,SUBSTITUTE)
-
-#define ARCHIVE_SUBST_FILE_BODY_PATCH \
- TXT_FILE_BODY; \
- Styles = (ARCHIVE,SUBSTITUTE,PATCH)
-
#define PACKED_LIB_FILE_BODY \
LIB_FILE_BODY; \
Styles = (PACKED); \
@@ -143,28 +106,12 @@
Styles = (PACKED,PATCH); \
Dir = SCP2_OOO_BIN_DIR
-#define PACKED_FILTER_FILE_BODY \
- TXT_FILE_BODY; \
- Styles = (PACKED); \
- Dir = gid_Dir_Filter
-
-#define PACKED_FILTER_FILE_BODY_PATCH \
- TXT_FILE_BODY; \
- Styles = (PACKED,PATCH); \
- Dir = gid_Dir_Filter
-
#define STD_LIB_FILE(id,name) \
File id \
Name = LIBNAME(name); \
PACKED_LIB_FILE_BODY; \
End
-#define STD_LIB_FILE_PATCH(id,name) \
- File id \
- Name = LIBNAME(name); \
- PACKED_LIB_FILE_BODY_PATCH; \
- End
-
#define SPECIAL_LIB_FILE(id,name) \
File id \
Name = SPECIAL_NAME(name); \
@@ -193,42 +140,12 @@
Styles = (PACKED); \
End
-#define STD_RES_FILE_PATCH(id,name) \
- File id \
- TXT_FILE_BODY; \
- RESFILE_ALL_LANG(name); \
- Dir = gid_Dir_Resource; \
- Styles = (PACKED,PATCH); \
- End
-
-#define STD_RES_FILE_ONLY_PATCH(id,name) \
- File id \
- TXT_FILE_BODY; \
- RESFILE_ALL_LANG(name); \
- Dir = gid_Dir_Resource; \
- Styles = (PACKED,PATCH,PATCH_ONLY); \
- End
-
#define STD_FILTER_FILE(id,name) \
File id \
PACKED_LIB_FILE_BODY; \
Name = FILTER_LIBNAME(name); \
End
-#define STD_FILTER_FILE_PATCH(id,name) \
- File id \
- PACKED_LIB_FILE_BODY_PATCH; \
- Name = FILTER_LIBNAME(name); \
- End
-
-#define STD_FONTUNX_FILE(id,name,fontname) \
- File id \
- TXT_FILE_BODY; \
- Dir = gid_Dir_Fonts_Truetype; \
- Styles = (PACKED, FONT_WARN_IF_EXISTS); \
- Name = STRING(name) ; \
- End
-
#define STD_FONTWIN_FILE(id,name,fontname) \
File id \
TXT_FILE_BODY; \
@@ -283,14 +200,6 @@
End
#endif
-#define STD_PY_FILE(id,name,dir) \
- File id \
- TXT_FILE_BODY; \
- Name = STRING(CONCAT2(name,.py)); \
- Dir = dir; \
- Styles = (PACKED,DONT_OVERWRITE); \
- End
-
#define STD_JAR_FILE(id,name) \
File id \
TXT_FILE_BODY; \
@@ -299,14 +208,6 @@
Styles = (PACKED,DONT_OVERWRITE); \
End
-#define STD_JAR_FILE_PATCH(id,name) \
- File id \
- TXT_FILE_BODY; \
- Name = STRING(CONCAT2(name,.jar)); \
- Dir = gid_Dir_Classes; \
- Styles = (PACKED,DONT_OVERWRITE,PATCH); \
- End
-
#define JARFILENAME(name) STRING(CONCAT2(name,.jar))
#define PACKED_SHELLNEW_FILE_BODY \
@@ -327,20 +228,6 @@
PACKED_LIB_FILE_BODY; \
End
-#define SPECIAL_COMPONENT_LIB_FILE_PATCH(id,name) \
- File id \
- Name = SPECIAL_COMPONENT_LIB_NAME(name); \
- PACKED_LIB_FILE_BODY_PATCH; \
- End
-
-#define SPECIAL_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \
- File id \
- TXT_FILE_BODY; \
- Name = LIBNAME(name); \
- Dir = SCP2_OOO_BIN_DIR; \
- Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \
- End
-
// ---------------------------------------
#define CONDITIONAL_MODULE_ENTRY(name,modid) \
Module gid_Module_Root_Reg_##name \
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index b85c0cd..2bde062 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -61,8 +61,6 @@
#define PUB_THUMBNAIL_WIDTH 256
#define PUB_THUMBNAIL_HEIGHT 192
-#define HtmlButtonThemaStr = "private://gallery/hidden/HtmlExportButtons";
-
class SfxProgress;
class SdrOutliner;
class SdPage;
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index 6336017..972eea4 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -59,8 +59,6 @@ namespace ppt
#define PPT_TRANSITION_TYPE_WHEEL 26
#define PPT_TRANSITION_TYPE_CIRCLE 27
-
-
// atoms
#define DFF_msofbtAnimEvent 0xf125
#define DFF_msofbtAnimNode 0xf127
@@ -116,17 +114,12 @@ namespace ppt
#define DFF_ANIM_VOLUME 22
#define DFF_ANIM_PROPERTY_ID_COUNT DFF_ANIM_VOLUME
-
-
// property types
#define DFF_ANIM_PROP_TYPE_BYTE 0
#define DFF_ANIM_PROP_TYPE_INT32 1
#define DFF_ANIM_PROP_TYPE_FLOAT 2
#define DFF_ANIM_PROP_TYPE_UNISTRING 3
-#define DFF_ANIM_PATH_EDIT_MODE_FIXED 0
-#define DFF_ANIM_PATH_EDIT_MODE_RELATIVE 1
-
#define DFF_ANIM_PRESS_CLASS_USER_DEFINED 0
#define DFF_ANIM_PRESS_CLASS_ENTRANCE 1
#define DFF_ANIM_PRESS_CLASS_EXIT 2
@@ -142,8 +135,6 @@ namespace ppt
#define DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ 5
#define DFF_ANIM_NODE_TYPE_TIMING_ROOT 9
-#define DFF_ANIM_PROPERTY_AFTEREFFECT 20
-
/* constants for fill entry in AnimationNode */
const sal_Int32 mso_Anim_GroupType_PAR = 0;
const sal_Int32 mso_Anim_GroupType_SEQ = 1;
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index a2b27c3..1e46c58 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -28,8 +28,6 @@ namespace sd {
class DrawDocShell;
class DrawViewShell;
-#define SDDRAWVIEW_MAGIC 0x456789BA
-
/*************************************************************************
|*
|* Ableitung von ::sd::View; enthaelt auch einen Zeiger auf das Dokument
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 581402d..d27480e 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -64,9 +64,6 @@ class WorkWindow;
// TODO: Remove
#define PAGE_NO_END 65535
-#define PAGE_NO_SOFTEND (PAGE_NO_END - 1)
-#define PAGE_NO_PAUSE (PAGE_NO_SOFTEND - 1)
-#define PAGE_NO_FIRSTDEF PAGE_NO_PAUSE // immer mit anpassen
/* Definition of SlideShow class */
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index ca6d279..1911d68 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -339,14 +339,6 @@ public:
((SfxFloatingWindow*)GetWindow())->FillInfo( aInfo ); \
return aInfo; }
-#define SFX_IMPL_MODELESSDIALOG(Class, MyID) \
- SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo Class::GetInfo() const \
- { \
- SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
- ((SfxModelessDialog*)GetWindow())->FillInfo( aInfo ); \
- return aInfo; }
-
#define SFX_IMPL_MODELESSDIALOG_WITHID(Class, MyID) \
SFX_IMPL_CHILDWINDOW_WITHID(Class, MyID) \
SfxChildWinInfo Class::GetInfo() const \
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
index 7589dbc..4d5393c 100644
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/sfx2/inc/sfx2/htmlmode.hxx
@@ -19,7 +19,6 @@
#ifndef _SFX_HTMLMODE_HXX_
#define _SFX_HTMLMODE_HXX_
-
#define HTMLMODE_ON 0x0001
#define HTMLMODE_PARA_DISTANCE 0x0004
#define HTMLMODE_FRM_COLUMNS 0x0010
@@ -30,25 +29,6 @@
#define HTMLMODE_RESERVED1 0x4000
#define HTMLMODE_RESERVED0 0x8000
-
#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index 1a90ec5..add2759 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -48,9 +48,9 @@ class String;
#ifndef ADVISEMODE_NODATA
// Must be the same value as Ole2 ADVF_*
#define ADVISEMODE_NODATA 0x01
-//#define ADVISEMODE_PRIMEFIRST 0x02
+// ADVISEMODE_PRIMEFIRST 0x02
#define ADVISEMODE_ONLYONCE 0x04
-//#define ADVISEMODE_DATAONSTOP 0x40
+// ADVISEMODE_DATAONSTOP 0x40
#endif
namespace sfx2
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index c4d914b..2a6980a 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -234,11 +234,6 @@ SFX_DECL_TYPE(18); // for SvxSearchItem
0, 0, DisableFlags, UnoName \
}
-#define SFX_SLOTMAP_NONE(ShellClass) \
- static SfxFormalArgument a##ShellClass##Args_Impl[1]; \
- static SfxSlot a##ShellClass##Slots_Impl[] = \
- { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
-
#define SFX_ARGUMENT( ArgSlotId, ArgName, ArgTypeId ) \
{ (const SfxType*) &a##ArgTypeId##_Impl, ArgName, ArgSlotId }
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index b975648..64611dc 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -43,13 +43,8 @@
// EVENT_APP_END 29999
#define EVENT_OBJ_START 30000
-#define EVENT_OBJ0_START (EVENT_OBJ_START+0x0000)
-#define EVENT_OBJ2_START (EVENT_OBJ_START+0x0100)
-#define EVENT_OBJ1_START (EVENT_OBJ_START+0x0200)
-#define EVENT_OBJ3_START (EVENT_OBJ_START+0x0300)
-#define EVENT_OBJ4_START (EVENT_OBJ_START+0x0400)
-#define EVENT_SVX_START EVENT_OBJ4_START
+#define EVENT_SVX_START (EVENT_OBJ_START+0x0400)
// Warning: the following are simultaneously SID_ON_ ...
#define SFX_EVENT_CLOSEAPP (EVENT_SFX_START + 1)
@@ -112,10 +107,6 @@
//--------------------------------------------------------------------
-
-#define SFX_MSG_ENABLEDBMP 1
-#define SFX_MSG_DISABLEDBMP 2
-
#define SFX_OBJECTBAR_APPLICATION 0
#define SFX_OBJECTBAR_OBJECT 1
#define SFX_OBJECTBAR_TOOLS 2
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 82a27c9..b8c4ad4 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -137,7 +137,6 @@
#define ELEMENTEXISTEXCEPTION ::com::sun::star::container::ElementExistException
#define XNAMEREPLACE ::com::sun::star::container::XNameReplace
#define XINDEXCONTAINER ::com::sun::star::container::XIndexContainer
-#define DISPOSEDEXCEPTION ::com::sun::star::lang::DisposedException
#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/inc/sfx2/sfxdefs.hxx b/sfx2/inc/sfx2/sfxdefs.hxx
index 8fd9b75..cca545f 100644
--- a/sfx2/inc/sfx2/sfxdefs.hxx
+++ b/sfx2/inc/sfx2/sfxdefs.hxx
@@ -20,12 +20,7 @@
#ifndef _SFXDEFS_HXX
#define _SFXDEFS_HXX
-#define MESSAGEFILE_SDM_EXT "sdm" // Extension for the new Formats
-#define MESSAGEFILE_EXT "smd" // Extension for Single-Mail/News-Files
-#define MESSAGETEMPFILE_EXT "sd~" // Extension for Mail/News-TempFiles
-
#define SfxFilterFlags sal_uLong
-#define PRODUCT_VERSION "5.0"
#endif
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 0d51c20..1dec762 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -381,9 +381,6 @@ inline void SfxShell::SetPool
#define SFX_POPUPMENU_REGISTRATION(rResId) \
GetStaticInterface()->RegisterPopupMenu( rResId )
-#define SFX_OBJECTMENU_REGISTRATION(nPos,rResId) \
- GetStaticInterface()->RegisterObjectMenu( nPos, rResId )
-
#define SFX_STATUSBAR_REGISTRATION(rResId) \
GetStaticInterface()->RegisterStatusBar( rResId )
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index d2da4cb..f2a1841 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -131,9 +131,6 @@ public: \
#define SFX_VIEW_REGISTRATION(DocClass) \
DocClass::Factory().RegisterViewFactory( Factory() )
-#define SFX_REGISTER_VIEW(ViewShellClass) \
- Factory().RegisterViewFactory( ViewShellClass::Factory() )
-
class SfxInPlaceClient;
typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList;
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 5bfc002..8991589 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -96,13 +96,6 @@ static sal_uInt16 nLastItemId = USHRT_MAX;
// filter box has maximum 12 entries visible
#define MAX_FILTER_ENTRIES 12
-// Special constant to save hierarchical mode
-// We've to use this hack since this is not the
-// index in the filter listbox that is saved but the
-// index in the filters list and hierarchical is not
-// in it
-#define HIERARCHICAL_FILTER_INDEX 0xfffe // 0xffff is reserved
-
//=========================================================================
TYPEINIT0(SfxCommonTemplateDialog_Impl);
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index f4dd3c5..cf159a6 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -97,7 +97,6 @@ struct SfxStatBar_Impl
#define CHILD_NOT_HIDDEN 2 // not disabled through HideChildWindow
#define CHILD_FITS_IN 4 // not too large for output size of the parent
#define CHILD_VISIBLE (CHILD_NOT_HIDDEN | CHILD_ACTIVE | CHILD_FITS_IN)
-#define CHILD_ISVISIBLE (CHILD_NOT_HIDDEN | CHILD_ACTIVE)
struct SfxChild_Impl
{
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index ed28436..32eefc6 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -34,13 +34,6 @@ class SfxObjectShell;
#include <sfx2/viewsh.hxx>
#include <sfx2/sfxuno.hxx>
-#ifndef FRAME_SEARCH_PARENT
-#define FRAME_SEARCH_PARENT 0x00000001
-#define FRAME_SEARCH_SELF 0x00000002
-#define FRAME_SEARCH_CHILDREN 0x00000004
-#define FRAME_SEARCH_CREATE 0x00000008
-#endif
-
class SfxFrame_Impl : public SfxBroadcaster, public SvCompatWeakBase
{
public:
diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx
index 4fcc214..ca767a1 100644
--- a/shell/source/unix/exec/shellexecentry.cxx
+++ b/shell/source/unix/exec/shellexecentry.cxx
@@ -51,7 +51,6 @@ using com::sun::star::system::XSystemShellExecute;
#define SHELLEXEC_SERVICE_NAME "com.sun.star.system.SystemShellExecute"
#define SHELLEXEC_IMPL_NAME "com.sun.star.comp.system.SystemShellExecute"
-#define SHELLEXEC_REGKEY_NAME "/com.sun.star.comp.system.SystemShellExecute/UNO/SERVICES/com.sun.star.system.SystemShellExecute"
//-----------------------------------------------------------------------
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index def4664..b161ada 100644
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -53,7 +53,6 @@ using com::sun::star::system::XSystemShellExecute;
#define SYSSHEXEC_SERVICE_NAME "com.sun.star.system.SystemShellExecute"
#define SYSSHEXEC_IMPL_NAME "com.sun.star.system.SystemShellExecute"
-#define SYSSHEXEC_REGKEY_NAME "/com.sun.star.system.SystemShellExecute/UNO/SERVICES/com.sun.star.system.SystemShellExecute"
//-----------------------------------------------------------------------
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index ff723ba..bc67370 100644
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -53,7 +53,6 @@ using com::sun::star::system::XSimpleMailClientSupplier;
#define COMP_SERVICE_NAME "com.sun.star.system.SimpleSystemMail"
#define COMP_IMPL_NAME "com.sun.star.system.SimpleSystemMail"
-#define COMP_REGKEY_NAME "/com.sun.star.system.SimpleSystemMail/UNO/SERVICES/com.sun.star.system.SimpleSystemMail"
//-----------------------------------------------------------------------
diff --git a/solenv/inc/starview.hid b/solenv/inc/starview.hid
index 651a830..d090951 100644
--- a/solenv/inc/starview.hid
+++ b/solenv/inc/starview.hid
@@ -310,9 +310,7 @@
#define accelerator 96
#define Accelerator 96
#define ACCELERATOR 96
-#define acceleratoritem 97
#define AcceleratorItem 97
-#define ACCELERATORITEM 97
#define SfxStyleFamilies 98
#define SfxStyleFamilyItem 99
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index c8c1475..2327c16 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -55,18 +55,6 @@ class SfxPrinter;
class Printer;
class SmCursor;
-#define HINT_DATACHANGED 1004
-
-#define SM30BIDENT ((sal_uLong)0x534D3033L)
-#define SM30IDENT ((sal_uLong)0x30334d53L)
-#define SM304AIDENT ((sal_uLong)0x34303330L)
-#define SM30VERSION ((sal_uLong)0x00010000L)
-#define SM50VERSION ((ULONG)0x00010001L) //Difference to SM30VERSION is
- //the new border in the format.
-
-#define FRMIDENT ((sal_uLong)0x03031963L)
-#define FRMVERSION ((sal_uLong)0x00010001L)
-
#define STAROFFICE_XML "StarOffice XML (Math)"
#define MATHML_XML "MathML XML (Math)"
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index fbba0cc..05a0de6 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -38,13 +38,6 @@ enum SmPrintSize { PRINT_SIZE_NORMAL, PRINT_SIZE_SCALED, PRINT_SIZE_ZOOMED };
/////////////////////////////////////////////////////////////////
-#define FONT_ARIAL "Arial"
-#define FONT_SYMBOL "Symbol"
-#define FONT_MS_PMINCHO "MS PMincho"
-#define FONT_MS_PGOTHIC "MS PGothic"
-#define FONT_SUN_BATANG "SunBatang"
-
-
inline sal_Bool IsInPrivateUseArea( sal_Unicode cChar ) { return 0xE000 <= cChar && cChar <= 0xF8FF; }
// Greek char range as seen in svx/.../charmap.cxx RID_SUBSETSTR_BASIC_GREEK
diff --git a/svl/inc/svl/hint.hxx b/svl/inc/svl/hint.hxx
index b8fddb6..8c5c5d9 100644
--- a/svl/inc/svl/hint.hxx
+++ b/svl/inc/svl/hint.hxx
@@ -47,12 +47,6 @@ public:
sal_Bool IsOwner() const { return bIsOwner; } \
}
-#define IMPL_PTRHINT_AUTODELETE(Name, Type) \
- TYPEINIT1(Name, SfxHint); \
- Name::Name( Type* pObject, sal_Bool bOwnedByHint ) \
- { pObj = pObject; bIsOwner = bOwnedByHint; } \
- Name::~Name() { if ( bIsOwner ) delete pObj; }
-
#define IMPL_PTRHINT(Name, Type) \
TYPEINIT1(Name, SfxHint); \
Name::Name( Type* pObject, sal_Bool bOwnedByHint ) \
diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx
index d972872..a41d2d8 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -134,11 +134,6 @@
#define CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESSPACKED "application/vnd.sun.xml.impress-packed"
//============================================================================
-/** Definitions for frequently used media type parameter names.
- */
-#define INET_CONTENT_TYPE_PARAMETER_CHARSET "charset"
-
-//============================================================================
/** Definitions for matching parts of URIs.
*/
#define INETTYPE_URL_PROT_COMPONENT ".component"
@@ -168,7 +163,6 @@
#define INETTYPE_URL_SCHED_CMB "cmbview"
#define INETTYPE_URL_SCHED_FORM "formular"
-#define INETTYPE_URL_SCHED_EVENT "type=event"
#define INETTYPE_URL_SCHED_TASK "type=task"
//============================================================================
diff --git a/svtools/inc/svtools/ruler.hxx b/svtools/inc/svtools/ruler.hxx
index bbb0f8e..8597e21 100644
--- a/svtools/inc/svtools/ruler.hxx
+++ b/svtools/inc/svtools/ruler.hxx
@@ -516,7 +516,6 @@ enum RulerExtra { RULER_EXTRA_DONTKNOW,
#define RULER_MOUSE_BORDERMOVE 5
#define RULER_MOUSE_BORDERWIDTH 5
-#define RULER_MOUSE_TABLEWIDTH 1
#define RULER_MOUSE_MARGINWIDTH 3
#define RULER_SCROLL_NO 0
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 453dade..a422eb5 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -41,12 +41,10 @@
#define RULER_OFF 3
#define RULER_TEXTOFF 5
#define RULER_RESIZE_OFF 4
-#define RULER_LINE_WIDTH 7
#define RULER_MIN_SIZE 3
#define RULER_TICK1_WIDTH 1
#define RULER_TICK2_WIDTH 3
-#define RULER_TICK3_WIDTH 5
#define RULER_VAR_SIZE 8
diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx
index 5670530..1f07b83 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -159,7 +159,6 @@ extern SgfFontLst* pSgfFonts;
//==============================================================================
-#define DefaultCharWidth 4800
#define GradDiv 2
#define CharTopToBase 100 /* wegen Apostrophe und Umlaute mehr als 75% */
#define CharTopToBtm 120 /* Zeilenhoehe ist groesser als Schriftgrad */
diff --git a/svtools/source/filter/wmf/winmtf.hxx b/svtools/source/filter/wmf/winmtf.hxx
index bf81be5..a488690 100644
--- a/svtools/source/filter/wmf/winmtf.hxx
+++ b/svtools/source/filter/wmf/winmtf.hxx
@@ -77,11 +77,11 @@
#define BLACK_PEN 7
#define NULL_PEN 8
#define OEM_FIXED_FONT 10
-#define ANSI_FIXED_FONT 11
+// ANSI_FIXED_FONT 11
#define ANSI_VAR_FONT 12
#define SYSTEM_FONT 13
-#define DEVICE_DEFAULT_FONT 14
-#define DEFAULT_PALETTE 15
+// DEVICE_DEFAULT_FONT 14
+// DEFAULT_PALETTE 15
#define SYSTEM_FIXED_FONT 16
@@ -122,12 +122,10 @@
#define BLACKONWHITE 1
#define WHITEONBLACK 2
#define COLORONCOLOR 3
-#define HALFTONE 4
#define MAXSTRETCHBLTMODE 4
#define STRETCH_ANDSCANS BLACKONWHITE
#define STRETCH_ORSCANS WHITEONBLACK
#define STRETCH_DELETESCANS COLORONCOLOR
-#define STRETCH_HALFTONE HALFTONE
#define LF_FACESIZE 32
@@ -187,11 +185,6 @@ struct WMF_EXTERNALHEADER;
#define PS_ALTERNATE 8
#define PS_STYLE_MASK 15
-#define PS_ENDCAP_ROUND 0x000
-#define PS_ENDCAP_SQUARE 0x100
-#define PS_ENDCAP_FLAT 0x200
-#define PS_ENDCAP_MASK 0xF00
-
#define PS_JOIN_ROUND 0x0000
#define PS_JOIN_BEVEL 0x1000
#define PS_JOIN_MITER 0x2000
@@ -227,9 +220,9 @@ struct WMF_EXTERNALHEADER;
/*WINVER >= 0x0400*/
#define ETO_GLYPH_INDEX 0x0010
#define ETO_RTLREADING 0x0080
-#define ETO_NUMERICSLOCAL 0x0400
-#define ETO_NUMERICSLATIN 0x0800
-#define ETO_IGNORELANGUAGE 0x1000
+// ETO_NUMERICSLOCAL 0x0400
+// ETO_NUMERICSLATIN 0x0800
+// ETO_IGNORELANGUAGE 0x1000
/*_WIN32_WINNT >= 0x0500*/
#define ETO_PDY 0x2000
diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx
index 0106c2d..b963671 100644
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/svx/inc/svx/svdhlpln.hxx
@@ -41,8 +41,6 @@ class OutputDevice;
////////////////////////////////////////////////////////////////////////////////////////////////////
enum SdrHelpLineKind {SDRHELPLINE_POINT,SDRHELPLINE_VERTICAL,SDRHELPLINE_HORIZONTAL};
-#define SDRHELPLINE_MIN SDRHELPLINE_POINT
-#define SDRHELPLINE_MAX SDRHELPLINE_HORIZONTAL
#define SDRHELPLINE_POINT_PIXELSIZE 15 /* Tatsaechliche Groesse= PIXELSIZE*2+1 */
diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx
index 2a745cd..e37fa40 100644
--- a/svx/inc/svx/svdocapt.hxx
+++ b/svx/inc/svx/svdocapt.hxx
@@ -42,8 +42,6 @@ namespace sdr { namespace properties {
class CaptionProperties;
}}
-#define SDRSETITEM_CAPTION_ATTR SDRSETITEM_ATTR_COUNT
-
//************************************************************
// Hilfsklasse SdrCaptObjGeoData
//************************************************************
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index 3dd452d..de5fc03 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -68,8 +68,6 @@ typedef ::std::vector< String* > TargetList;
namespace svx{ class SpellDialogChildWindow;}
-#define EMPTY_FRAME_REF com::sun::star::uno::Reference < com::sun::star::frame::XFrame >()
-
class AbstractSvxDistributeDialog :public VclAbstractDialog //add for SvxDistributeDialog
{
public:
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index b090dfe..42dcf06 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -59,14 +59,6 @@ class SwOutlineNodes;
class SwTxtFmtColl;
class SwNodeRange;
-#define DBG_OUT_HERE printf("%s(%d):", __FILE__, __LINE__)
-#define DBG_OUT_HERE_FN printf("%s(%d) %s:", __FILE__, __LINE__, __FUNCTION__)
-#define DBG_OUT_HERE_LN printf("%s(%d)\n", __FILE__, __LINE__)
-#define DBG_OUT_HERE_FN_LN printf("%s(%d) %s\n", __FILE__, __LINE__, __FUNCTION__)
-#define DBG_OUT(x) printf("%s\n", dbg_out(x))
-#define DBG_OUT_LN(x) printf("%s(%d): %s\n", __FILE__, __LINE__, dbg_out(x))
-#define DBG_OUT_FN_LN(x) printf("%s: %s\n", __FUNCTION__, dbg_out(x))
-
extern bool bDbgOutStdErr;
extern bool bDbgOutPrintAttrSet;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index fe4a353..c5c7543 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -86,8 +86,6 @@ namespace svx
#define FRMTYPE_COLSECT (sal_uInt16) 8192
#define FRMTYPE_COLSECTOUTTAB (sal_uInt16) 16384
-#define FRMTYPE_ANYCOLSECT ( FRMTYPE_COLSECT | FRMTYPE_COLSECTOUTTAB )
-
//! values can be combined via logival or
#define GOTOOBJ_DRAW_CONTROL (sal_uInt16) 1
#define GOTOOBJ_DRAW_SIMPLE (sal_uInt16) 2
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index fbceba4..6e16970 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -39,7 +39,6 @@
struct SwPosition;
class IntlWrapper;
-#define IVER_FMTANCHOR_LONGIDX ((sal_uInt16)1)
// FlyAnchors
class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index a4055da..ff95797 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -40,8 +40,6 @@
class IntlWrapper;
-#define IVER_VERTORIENT_REL ((sal_uInt16)0x0001)
-
class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem
{
SwTwips nYPos; // Contains *always* the current RelPos.
@@ -76,10 +74,6 @@ public:
void SetPos( SwTwips nNew ) { nYPos = nNew; }
};
-// SwFmtHoriOrient; how and towards what does the FlyFrm orient itself horizontally?
-
-#define IVER_HORIORIENT_TOGGLE ((sal_uInt16)0x0001)
-#define IVER_HORIORIENT_REL ((sal_uInt16)0x0002)
class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
{
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index 64f93d2..42527b1 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -44,9 +44,6 @@ class SwEndNoteInfo;
// Pagedescriptor
// Client of SwPageDesc that is "described" by the attribute.
-#define IVER_FMTPAGEDESC_NOAUTO ((sal_uInt16)0x0001)
-#define IVER_FMTPAGEDESC_LONGPAGE ((sal_uInt16)0x0002)
-
class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
{
// This "Doc"-function is made friend in order to be able
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index f821735..561df1f 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -59,9 +59,6 @@ class SwTOXMarks : public std::vector<SwTOXMark*> {};
Description: Entry of content index, alphabetical index or user defined index
--------------------------------------------------------------------*/
-#define IVER_TOXMARK_STRPOOL ((sal_uInt16)1)
-#define IVER_TOXMARK_NEWTOX ((sal_uInt16)2)
-
class SW_DLLPUBLIC SwTOXMark
: public SfxPoolItem
, public SwModify
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 85c2a07..bd72421 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -46,12 +46,6 @@ class SwSelectionList;
struct SwPosition;
struct SwCrsrMoveState;
-#define HACK_TABLEMODE_INIT 0
-#define HACK_TABLEMODE_LOCKLINES 1
-#define HACK_TABLEMODE_PAINTLINES 2
-#define HACK_TABLEMODE_UNLOCKLINES 3
-#define HACK_TABLEMODE_EXIT 4
-
#define INV_SIZE 1
#define INV_PRTAREA 2
#define INV_POS 4
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 0fe7f1d..f5e4b16 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -66,14 +66,6 @@
#include <txtfrm.hxx> // SwTxtFrm
#include <scriptinfo.hxx>
-#if defined(WNT)
-#define FNT_LEADING_HACK
-#endif
-
-#if defined(WNT)
-#define FNT_ATM_HACK
-#endif
-
#ifdef DBG_UTIL
// global Variable
SvStatistics g_SvStat;
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 82b7468..f27ca96 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -61,11 +61,6 @@
#define SN_DATA_SEQUENCE "com.sun.star.chart2.data.DataSequence"
#define SN_LABELED_DATA_SEQUENCE "com.sun.star.chart2.data.LabeledDataSequence"
-#define DIRECTION_DONT_KNOW -1
-#define DIRECTION_HAS_ERROR -2
-#define DIRECTION_COLS 0
-#define DIRECTION_ROWS 1
-
using namespace ::com::sun::star;
using ::rtl::OUString;
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index ba7a538..b245241 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1424,7 +1424,6 @@ SwXTextEmbeddedObjects::~SwXTextEmbeddedObjects()
{
}
-#define PASSWORD_STD_TIMEOUT 1000
OUString SwXTextSections::getImplementationName(void) throw( RuntimeException )
{
return C2U("SwXTextSections");
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 2118eff..f211866 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -56,7 +56,6 @@ using namespace ::com::sun::star;
#define VERSION_53A ((sal_uInt16)596)
#define ACT_NUM_VERSION VERSION_53A
-#define NUMRULE_FILENAME "numrule.cfg"
#define CHAPTER_FILENAME "chapter.cfg"
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 1547038..b44179f 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -74,15 +74,6 @@ Color SwViewOption::aHeaderFooterMarkColor(COL_BLUE);
sal_Int32 SwViewOption::nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES;
sal_uInt16 SwViewOption::nPixelTwips = 0; // one pixel on the screen
-
-#define LINEBREAK_SIZE 12, 8
-#define TAB_SIZE 12, 6
-
-#define MIN_BLANKWIDTH 40
-#define MIN_BLANKHEIGHT 40
-#define MIN_TABWIDTH 120
-#define MIN_TABHEIGHT 200
-
static const char aPostItStr[] = " ";
sal_Bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index f97ec06..2f728dd 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -67,13 +67,6 @@
#define FT_FILE_TEXT \
Text [ en-US ] = "~File name" ;\
-
-#define GB_HIDE_TEXT \
- Text [ en-US ] = "Hide";\
-
-#define GB_OPTIONS_TEXT \
- Text [ en-US ] = "Options" ;\
-
#define FL_PROTECT_TEXT \
Text [ en-US ] = "Write protection";\
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 64f57ec..08962f0 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -78,9 +78,6 @@
using namespace ::com::sun::star;
-
-#define FILE_NAME_LENGTH 17
-
static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox );
void lcl_FillList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames, const SwSectionFmt* pNewFmt )
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index fb9d0c9..a0362c1 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -89,9 +89,6 @@ namespace sw { namespace sidebarwindows {
#define POSTIT_META_HEIGHT (sal_Int32) 30
#define POSTIT_MINIMUMSIZE_WITHOUT_META 50
-#define POSTIT_SHADOW_BRIGHT Color(180,180,180)
-#define POSTIT_SHADOW_DARK Color(83,83,83)
-
#define EMPTYSTRING rtl::OUString()
/************** SwSidebarWin************************************/
diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx
index 099ce7e..bf8496c 100644
--- a/sw/source/ui/inc/swcont.hxx
+++ b/sw/source/ui/inc/swcont.hxx
@@ -48,12 +48,8 @@ class SwContentType;
#define CONTENT_TYPE_DRAWOBJECT 11
#define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1
-
// types for global document
-#define GLOBAL_CONTENT_REGION 100
-#define GLOBAL_CONTENT_INDEX 101
#define GLOBAL_CONTENT_TEXT 102
-#define GLOBAL_CONTENT_MAX 3
// strings for context menus
#define CONTEXT_COUNT 12
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 827b47e..e813629 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -80,8 +80,6 @@
#define NAVI_VERSION1 1
#define NAVI_VERSION2 2 // bIsGlobalActive
-#define NAVI_CONFIG_VERSION NAVI_VERSION2
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index a577048..2e8fe9d 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -35,8 +35,6 @@
#include "wordvbahelper.hxx"
#include "vbatablehelper.hxx"
-#define RELATIVE_TABLE_WIDTH 10000
-
using namespace ::ooo::vba;
using namespace ::com::sun::star;
diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx
index dd4bdd1..a681640 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/toolkit/inc/toolkit/helper/property.hxx
@@ -83,10 +83,10 @@ namespace rtl {
#define BASEPROPERTY_TIME 33 // sal_Int32
#define BASEPROPERTY_TIMEMIN 34 // sal_Int32
#define BASEPROPERTY_TIMEMAX 35 // sal_Int32
-#define BASEPROPERTY_VALUE_INT32 36 // sal_Int32
-#define BASEPROPERTY_VALUEMIN_INT32 37 // sal_Int32
-#define BASEPROPERTY_VALUEMAX_INT32 38 // sal_Int32
-#define BASEPROPERTY_VALUESTEP_INT32 39 // sal_Int32
+// BASEPROPERTY_VALUE_INT32 36 // sal_Int32
+// BASEPROPERTY_VALUEMIN_INT32 37 // sal_Int32
+// BASEPROPERTY_VALUEMAX_INT32 38 // sal_Int32
+// BASEPROPERTY_VALUESTEP_INT32 39 // sal_Int32
#define BASEPROPERTY_EDITMASK 40 // ::rtl::OUString
#define BASEPROPERTY_LITERALMASK 41 // ::rtl::OUString
#define BASEPROPERTY_IMAGEURL 42 // ::rtl::OUString
@@ -107,7 +107,7 @@ namespace rtl {
#define BASEPROPERTY_DEFAULTBUTTON 57 // sal_Bool
#define BASEPROPERTY_HELPURL 58 // ::rtl::OUString
#define BASEPROPERTY_AUTOTOGGLE 59 // sal_Bool
-//#define BASEPROPERTY_FOCUSSELECTIONHIDE 60 // sal_Bool
+// BASEPROPERTY_FOCUSSELECTIONHIDE 60 // sal_Bool
#define BASEPROPERTY_FORMATKEY 61 // sal_Bool
#define BASEPROPERTY_FORMATSSUPPLIER 62 // ::com::sun::star::util::XNumberFormatsSupplier
#define BASEPROPERTY_EFFECTIVE_VALUE 63 // Any (double or string)
@@ -237,10 +237,6 @@ namespace rtl {
#define PROPERTY_ALIGN_CENTER 1
#define PROPERTY_ALIGN_RIGHT 2
-#define PROPERTY_STATE_OFF 0
-#define PROPERTY_STATE_ON 1
-#define PROPERTY_STATE_DONTCARE 2
-
TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const ::rtl::OUString& rPropertyName );
const ::com::sun::star::uno::Type* GetPropertyType( sal_uInt16 nPropertyId );
TOOLKIT_DLLPUBLIC const ::rtl::OUString& GetPropertyName( sal_uInt16 nPropertyId );
diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx
index 4594de6..f35f801 100644
--- a/tools/inc/tools/color.hxx
+++ b/tools/inc/tools/color.hxx
@@ -36,17 +36,6 @@ class ResId;
#include <basegfx/color/bcolor.hxx>
-// --------------------
-// - ColorCount-Types -
-// --------------------
-
-#define COLCOUNT_MONOCHROM ((sal_uIntPtr)2)
-#define COLCOUNT_16 ((sal_uIntPtr)16)
-#define COLCOUNT_256 ((sal_uIntPtr)256)
-#define COLCOUNT_HICOLOR1 (((sal_uIntPtr)0x00007FFF)+1)
-#define COLCOUNT_HICOLOR2 (((sal_uIntPtr)0x0000FFFF)+1)
-#define COLCOUNT_TRUECOLOR (((sal_uIntPtr)0x00FFFFFF)+1)
-
// ---------------
// - Color-Types -
// ---------------
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index 4888bb6..1769f52 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -89,10 +89,6 @@ typedef void (*DbgTestSolarMutexProc)();
// user (runtime) defined output channels
#define DBG_OUT_USER_CHANNEL_0 100
-#define DBGGUI_RESTORE 0
-#define DBGGUI_MINIMIZE 1
-#define DBGGUI_MAXIMIZE 2
-
struct DbgData
{
sal_uIntPtr nTestFlags;
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index b49d026..9fcae31 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -41,15 +41,8 @@ namespace com { namespace sun { namespace star { namespace util {
//============================================================================
// Special tokens:
-#define INET_PASS_TOKEN '@'
-#define INET_DELIM_TOKEN ':'
-#define INET_DELIM_IMAPID ';'
-#define INET_ENC_DELIM_TOKEN '|'
-#define INET_DELIM_HOST_TOKEN '.'
#define INET_PATH_TOKEN '/'
-#define INET_DOSPATH_TOKEN '\\'
#define INET_MARK_TOKEN '#'
-#define INET_PARAM_TOKEN '?'
#define INET_HEX_ESCAPE '%'
//============================================================================
@@ -58,29 +51,8 @@ namespace com { namespace sun { namespace star { namespace util {
#define INET_HTTP_SCHEME "http://"
#define INET_HTTPS_SCHEME "https://"
#define INET_FILE_SCHEME "file://"
-#define INET_GOPHER_SCHEME "gopher://"
#define INET_MAILTO_SCHEME "mailto:"
-#define INET_CID_SCHEME "cid:"
#define INET_NEWS_SCHEME "news:"
-#define INET_POP3_SCHEME "pop3://"
-#define INET_LDAP_SCHEME "ldap://"
-#define INET_PRIVATE_SCHEME "private:"
-#define INET_BUGDOC_SCHEME "bugdoc:"
-#define INET_SLOT_SCHEME "slot:"
-#define INET_MACRO_SCHEME "macro:"
-#define INET_JAVASCRIPT_SCHEME "javascript:"
-#define INET_IMAP_SCHEME "imap://"
-#define INET_DOWNPASS_SCHEME ".."
-#define INET_DATA_SCHEME "data:"
-#define INET_OUT_SCHEME "out://"
-#define INET_FIF_SCHEME "fif://"
-#define INET_CEPT_SCHEME "cept://"
-#define INET_VIM_SCHEME "vim://"
-#define INET_UNO_SCHEME ".uno:"
-#define INET_COMPONENT_SCHEME ".component:"
-#define INET_DB_SCHEME "db:"
-#define INET_BUGID_SCHEME "bugid:"
-#define INET_TELNET_SCHEME "telnet://"
#define INET_HID_SCHEME "hid:"
#define URL_PREFIX_PRIV_SOFFICE "private:"
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index 1f0da6f..2597393 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -41,11 +41,6 @@ namespace ftp
//=========================================================================
-// UNO service name for the content.
-#define FTP_CONTENT_SERVICE_NAME "com.sun.star.ucb.FTPContent"
-
-//=========================================================================
-
class FTPContentProvider;
//=========================================================================
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index 501f4e3..ca2a8ce 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -26,17 +26,6 @@
*
************************************************************************/
-
-/**************************************************************************
- TODO
- **************************************************************************
-
- - remove root storage access workaround
-
- *************************************************************************/
-
-#define ROOTSTORAGE_ACCESS_WORKAROUND 1
-
#include <memory>
#include "com/sun/star/beans/XPropertySet.hpp"
diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx
index 59fbd6a..b2cb7cb 100644
--- a/ucbhelper/inc/ucbhelper/macros.hxx
+++ b/ucbhelper/inc/ucbhelper/macros.hxx
@@ -677,21 +677,6 @@ Class::createServiceFactory( const com::sun::star::uno::Reference< \
Class::getSupportedServiceNames_Static() ) ); \
}
-#define SINGLE_SERVICE_FACTORY_IMPL( Class ) \
-com::sun::star::uno::Reference< \
- com::sun::star::lang::XSingleServiceFactory > \
-Class::createServiceFactory( const com::sun::star::uno::Reference< \
- com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ) \
-{ \
- return com::sun::star::uno::Reference< \
- com::sun::star::lang::XSingleServiceFactory >( \
- cppu::createSingleFactory( \
- rxServiceMgr, \
- Class::getImplementationName_Static(), \
- Class##_CreateInstance, \
- Class::getSupportedServiceNames_Static() ) ); \
-}
-
// Service without service factory.
// Own implementation of getSupportedServiceNames_Static().
diff --git a/unotools/inc/unotools/cmdoptions.hxx b/unotools/inc/unotools/cmdoptions.hxx
index ff1b64c..8d02fe7 100644
--- a/unotools/inc/unotools/cmdoptions.hxx
+++ b/unotools/inc/unotools/cmdoptions.hxx
@@ -40,7 +40,6 @@
@descr The method GetList() returns a list of property values.
Use follow defines to seperate values by names.
*//*-*************************************************************************************************************/
-#define CMDOPTIONS_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ))
/*-************************************************************************************************************//**
@short forward declaration to our private date container implementation
diff --git a/vcl/inc/aqua/salnativewidgets.h b/vcl/inc/aqua/salnativewidgets.h
index 7b6365b..f17ed36 100644
--- a/vcl/inc/aqua/salnativewidgets.h
+++ b/vcl/inc/aqua/salnativewidgets.h
@@ -45,7 +45,6 @@
#define SPIN_BUTTON_WIDTH 13
#define SPIN_UPPER_BUTTON_HEIGHT 11
#define SPIN_LOWER_BUTTON_HEIGHT 10
-#define SPIN_TWO_BUTTONS_HEIGHT 21
// progress bar
#define INTRO_PROGRESS_HEIGHT 9
diff --git a/vcl/inc/vcl/apptypes.hxx b/vcl/inc/vcl/apptypes.hxx
index 188c727..16818ec 100644
--- a/vcl/inc/vcl/apptypes.hxx
+++ b/vcl/inc/vcl/apptypes.hxx
@@ -64,19 +64,6 @@ public:
#define VCL_INPUT_MOUSEANDKEYBOARD (VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD)
#define VCL_INPUT_ANY (VCL_INPUT_MOUSEANDKEYBOARD | VCL_INPUT_PAINT | VCL_INPUT_TIMER | VCL_INPUT_OTHER | VCL_INPUT_APPEVENT)
-#define DISPATCH_OPEN 0x0001
-#define DISPATCH_PRINT 0x0002
-#define DISPATCH_SERVER 0x0004
-
-// --------------
-// - UserActive -
-// --------------
-
-#define USERACTIVE_MOUSEDRAG ((sal_uInt16)0x0001)
-#define USERACTIVE_INPUT ((sal_uInt16)0x0002)
-#define USERACTIVE_MODALDIALOG ((sal_uInt16)0x0004)
-#define USERACTIVE_ALL ((sal_uInt16)0xFFFF)
-
#endif // _VCL_APPTYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 06f2bf1..5c2832e 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -77,7 +77,6 @@
// -----------------------------------------------------------------------------
#define BMP_COL_TRANS Color( 252, 3, 251 )
-#define BMP_COLOR_MONOCHROME_THRESHOLD 128
// ---------
// - Enums -
diff --git a/vcl/inc/vcl/cmdevt.h b/vcl/inc/vcl/cmdevt.h
index 20b6ab7..a829869 100644
--- a/vcl/inc/vcl/cmdevt.h
+++ b/vcl/inc/vcl/cmdevt.h
@@ -24,9 +24,6 @@
// - CommandVoiceData -
// --------------------
-#define DICTATIONCOMMAND_SYSTEM 0x1000
-#define DICTATIONCOMMAND_USER 0x2000
-
#define DICTATIONCOMMAND_UNKNOWN 0x0001
#define DICTATIONCOMMAND_NEWPARAGRAPH 0x0002
#define DICTATIONCOMMAND_NEWLINE 0x0003
@@ -47,9 +44,6 @@
#define DICTATIONCOMMAND_REPEAT 0x0018
#define DICTATIONCOMMAND_DEL 0x0019
-#define DICTATIONCOMMAND_COMMANDMODE (DICTATIONCOMMAND_SYSTEM + 1)
-#define DICTATIONCOMMAND_DICTATIONMODE (DICTATIONCOMMAND_SYSTEM + 2)
-
#endif // _VCL_CMDEVT_H
diff --git a/vcl/inc/vcl/combobox.h b/vcl/inc/vcl/combobox.h
index 0067e23..4cb8c96 100644
--- a/vcl/inc/vcl/combobox.h
+++ b/vcl/inc/vcl/combobox.h
@@ -26,8 +26,6 @@
#define COMBOBOX_ENTRY_NOTFOUND ((sal_uInt16)0xFFFF)
#define COMBOBOX_ERROR ((sal_uInt16)0xFFFF)
-#define COMBOBOX_USERDRAW_SELECTED ((sal_uInt16)0x0001)
-
#endif // _SV_COMBOBOX_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/lstbox.h b/vcl/inc/vcl/lstbox.h
index 434ce16..a6d4832 100644
--- a/vcl/inc/vcl/lstbox.h
+++ b/vcl/inc/vcl/lstbox.h
@@ -24,8 +24,6 @@
#define LISTBOX_ENTRY_NOTFOUND ((sal_uInt16)0xFFFF)
#define LISTBOX_ERROR ((sal_uInt16)0xFFFF)
-#define LISTBOX_USERDRAW_SELECTED ((sal_uInt16)0x0001)
-
// --------------------------------------------------------------------
// the following defines can be used for the SetEntryFlags()
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 79e047f..e5e21c5 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -199,8 +199,6 @@ struct KerningPair
#define IMAGE_DRAW_DEACTIVE ((sal_uInt16)0x0004)
#define IMAGE_DRAW_COLORTRANSFORM ((sal_uInt16)0x0008)
#define IMAGE_DRAW_SEMITRANSPARENT ((sal_uInt16)0x0010)
-#define IMAGE_DRAW_3DLOOK 0
-#define IMAGE_DRAW_BTNLOOK 0
// WaveLine
#define WAVE_FLAT 1
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 37d8b51..2f62cee 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -354,15 +354,8 @@ private:
#define DRAGFULL_OPTION_SPLIT ((sal_uLong)0x00000020)
#define DRAGFULL_OPTION_SCROLL ((sal_uLong)0x00000040)
-#define LOGO_DISPLAYTIME_NOLOGO ((sal_uLong)0)
#define LOGO_DISPLAYTIME_STARTTIME ((sal_uLong)0xFFFFFFFF)
-#define ANIMATION_OPTION_MINIMIZE ((sal_uLong)0x00000001)
-#define ANIMATION_OPTION_POPUP ((sal_uLong)0x00000002)
-#define ANIMATION_OPTION_DIALOG ((sal_uLong)0x00000004)
-#define ANIMATION_OPTION_TREE ((sal_uLong)0x00000008)
-#define ANIMATION_OPTION_SCROLL ((sal_uLong)0x00000010)
-
#define SELECTION_OPTION_WORD ((sal_uLong)0x00000001)
#define SELECTION_OPTION_FOCUS ((sal_uLong)0x00000002)
#define SELECTION_OPTION_INVERT ((sal_uLong)0x00000004)
@@ -915,9 +908,6 @@ private:
// - HelpSettings -
// ----------------
-#define HELP_OPTION_QUICK ((sal_uLong)0x00000001)
-#define HELP_OPTION_ACTIVE ((sal_uLong)0x00000002)
-
class VCL_DLLPUBLIC HelpSettings
{
void CopyData();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index eaf0be7..ffe5007 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -69,8 +69,6 @@ DBG_NAMEEX( Window )
#define SMALLBUTTON_OFF_NORMAL_X 3
#define SMALLBUTTON_OFF_NORMAL_Y 3
-#define SMALLBUTTON_OFF_PRESSED_X 5
-#define SMALLBUTTON_OFF_PRESSED_Y 5
// -----------------------------------------------------------------------
@@ -79,8 +77,6 @@ DBG_NAMEEX( Window )
#define TB_LINESPACING 3
#define TB_SPIN_SIZE 14
#define TB_SPIN_OFFSET 2
-#define TB_NEXT_SIZE 22
-#define TB_NEXT_OFFSET 2
#define TB_BORDER_OFFSET1 4
#define TB_BORDER_OFFSET2 2
#define TB_CUSTOMIZE_OFFSET 2
diff --git a/vcl/unx/kde/FPServiceInfo.hxx b/vcl/unx/kde/FPServiceInfo.hxx
index 17d2dd6..ff8f586 100644
--- a/vcl/unx/kde/FPServiceInfo.hxx
+++ b/vcl/unx/kde/FPServiceInfo.hxx
@@ -35,23 +35,11 @@
// the service names
#define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.TDEFilePicker"
-// the registry key names
-// a key under which this service will be registered,
-// Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-// <Implementation-Name></UNO/SERVICES/><Service-Name>
-#define FILE_PICKER_REGKEY_NAME "/com.sun.star.ui.dialogs.UnxFilePicker/UNO/SERVICES/com.sun.star.ui.dialogs.TDEFilePicker"
-
#else // ENABLE_TDE
// the service names
#define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.KDEFilePicker"
-// the registry key names
-// a key under which this service will be registered,
-// Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-// <Implementation-Name></UNO/SERVICES/><Service-Name>
-#define FILE_PICKER_REGKEY_NAME "/com.sun.star.ui.dialogs.UnxFilePicker/UNO/SERVICES/com.sun.star.ui.dialogs.KDEFilePicker"
-
#endif // ENABLE_TDE
// the implementation names
diff --git a/vcl/unx/kde4/FPServiceInfo.hxx b/vcl/unx/kde4/FPServiceInfo.hxx
index 6dfb50e..07249c9 100644
--- a/vcl/unx/kde4/FPServiceInfo.hxx
+++ b/vcl/unx/kde4/FPServiceInfo.hxx
@@ -34,10 +34,4 @@
// the implementation names
#define FILE_PICKER_IMPL_NAME "com.sun.star.ui.dialogs.KDE4FilePicker"
-// the registry key names
-// a key under which this service will be registered,
-// Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-// <Implementation-Name></UNO/SERVICES/><Service-Name>
-#define FILE_PICKER_REGKEY_NAME "/com.sun.star.ui.dialogs.KDE4FilePickerImpl/UNO/SERVICES/com.sun.star.ui.dialogs.KDE4FilePicker"
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 4f5af12..d6cc79f 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
using namespace ::std;
#define DEF_BORDER_DIST 190 //0,19cm
-#define DEFAULT_CELL_MARGIN 108 //default cell margin, not documented
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
static void lcl_printProperties( PropertyMapPtr pProps )
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index 2067de0..50d239b 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -404,9 +404,6 @@ namespace xmloff
#define DBG_CHECK_PROPERTY_NO_TYPE(name) \
dbg_implCheckProperty(name, NULL)
- #define DBG_CHECK_PROPERTY_ASCII( name, type ) \
- dbg_implCheckProperty( ::rtl::OUString::createFromAscii( name ), &::getCppuType(static_cast< type* >(NULL)))
-
#define DBG_CHECK_PROPERTY_ASCII_NO_TYPE( name ) \
dbg_implCheckProperty( ::rtl::OUString::createFromAscii( name ), NULL )
#else
commit d341aca7f68bc082cdefe4b1176f56c2c14a0322
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jul 1 17:46:37 2012 +0200
hrc cleanup: Remove unused resource definitions
Change-Id: Ie3a3a65bfb628195940105d7261464989e9af3fa
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index e6f432e..2d2ff4c 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -102,7 +102,6 @@
#define FT_HELPFORMAT 15
#define LB_HELPFORMAT 16
#define CB_EXPERIMENTAL 18
-#define FT_MACRORECORDER 19
#define CB_MACRORECORDER 20
#define FL_TWOFIGURE 40
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index d68430c..aaa1d9a 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -385,9 +385,6 @@ TabPage PAGE_ODBC
};
//.........................................................................
-#define MYSQL_YDIST 53
-#define MYSQL_FL_Y 8
-#define MYSQL_DRIVERCLASS_Y 8
TabPage PAGE_MYSQL_ODBC
{
diff --git a/extensions/source/update/ui/updatecheckui.hrc b/extensions/source/update/ui/updatecheckui.hrc
index 636cff2..a837ed3 100644
--- a/extensions/source/update/ui/updatecheckui.hrc
+++ b/extensions/source/update/ui/updatecheckui.hrc
@@ -27,8 +27,6 @@
#define RID_UPDATECHECKUI_START 1100
- #define RID_UPDATE_AVAIL_IMAGES RID_UPDATECHECKUI_START + 1
-
#define RID_UPDATE_AVAILABLE_16 RID_UPDATECHECKUI_START + 1
#define RID_UPDATE_AVAILABLE_26 RID_UPDATECHECKUI_START + 2
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc
index 854a900..dc1c348 100644
--- a/filter/inc/filter.hrc
+++ b/filter/inc/filter.hrc
@@ -30,16 +30,6 @@
#define RID_XSLT_DIALOG_START (RID_FILTER_START + 20)
// RID_XSLT_DIALOG_END (RID_FILTER_START + 69)
-#define DLG_EXPORT_EPCT (RID_GOODIES_START+ 0)
-#define DLG_EXPORT_GIF (RID_GOODIES_START+ 1)
-#define DLG_EXPORT_EMET (RID_GOODIES_START+ 2)
-#define DLG_EXPORT_JPG (RID_GOODIES_START+ 3)
-#define DLG_EXPORT_EPNG (RID_GOODIES_START+ 5)
-#define DLG_EXPORT_EPS (RID_GOODIES_START+ 8)
-#define DLG_EXPORT_EPBM (RID_GOODIES_START+ 9)
-#define DLG_EXPORT_EPGM (RID_GOODIES_START+ 10)
-#define DLG_EXPORT_EPPM (RID_GOODIES_START+ 11)
-
// warning, next range is RID_FILTER_START + 100 !
#define HID_FILTER_PDF_OPTIONS "HID_FILTER_PDF_OPTIONS"
diff --git a/filter/source/xsltdialog/xmlfileview.hrc b/filter/source/xsltdialog/xmlfileview.hrc
index 5c686e6..47e19c2 100644
--- a/filter/source/xsltdialog/xmlfileview.hrc
+++ b/filter/source/xsltdialog/xmlfileview.hrc
@@ -21,7 +21,6 @@
#include "xmlfiltercommon.hrc"
-#define CTRL_SOURCE_VIEW 1
#define PB_VALIDATE 2
#endif
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 2a9bf0d..332bdc7 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -130,7 +130,6 @@ String STR_STATUSBAR_LOGOTEXT
// ***********************************************************************
#define LICENSE_DIALOG_WIDTH 260
#define LICENSE_RIGHT_BORDER 7
-#define LICENSE_BOTTOM_BORDER 0
#define LICENSE_ROW_1 (7)
#define LICENSE_COL_1 (7)
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index ff1997c..3988fe3 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -249,8 +249,6 @@
#define SID_OPENDLG_FUNCTION (SC_MESSAGE_START + 52)
#define SID_OPENDLG_SOLVE (SC_MESSAGE_START + 53)
#define SID_OPENDLG_TABOP (SC_MESSAGE_START + 54)
-#define SID_OPENDLG_EDITFUNCTION (SC_MESSAGE_START + 56)
-#define SID_OPENDLG_ARGUMENT (SC_MESSAGE_START + 57)
#define SID_OPENDLG_CONDFRMT (SC_MESSAGE_START + 59)
#define SID_OPENDLG_OPTSOLVER (SC_MESSAGE_START + 60)
#define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61)
@@ -1043,8 +1041,6 @@
#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113)
#define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114)
-#define RID_SCTAB_PARAMETER (SC_DIALOGS_START + 116)
-
#define RID_SCDLG_CHANGES (SC_DIALOGS_START + 119)
#define RID_POPUP_NAVIPI_SCENARIO (SC_DIALOGS_START + 120)
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 71aabc1..990a4fa 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -387,8 +387,6 @@
#define SID_OUTPUT_QUALITY_GRAYSCALE (SID_SD_START+367)
#define SID_OUTPUT_QUALITY_BLACKWHITE (SID_SD_START+368)
#define SID_PREVIEW_QUALITY_COLOR (SID_SD_START+369)
-#define SID_PREVIEW_QUALITY_GRAYSCALE (SID_SD_START+370)
-#define SID_PREVIEW_QUALITY_BLACKWHITE (SID_SD_START+371)
#define SID_VECTORIZE (SID_SD_START+372)
#define SID_INSERT_FLD_PAGES (SID_SD_START+373)
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
index 79135ad..61744ec 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -29,7 +29,6 @@
#define DLG_CUSTOMANIMATION RID_CUSTOMANIMATION_START+1
#define DLG_CUSTOMANIMATION_CREATE RID_CUSTOMANIMATION_START+2
#define DLG_SLIDE_TRANSITION_PANE RID_CUSTOMANIMATION_START+3
-#define DLG_CUSTOMANIMATION_SCHEMES_PANE RID_CUSTOMANIMATION_START+4
#define RID_EFFECT_CONTEXTMENU RID_CUSTOMANIMATION_START+0
#define RID_TP_CUSTOMANIMATION_EFFECT RID_CUSTOMANIMATION_START+1
diff --git a/sd/util/hidother.hrc b/sd/util/hidother.hrc
index 7c451fa..1607e6b 100644
--- a/sd/util/hidother.hrc
+++ b/sd/util/hidother.hrc
@@ -20,7 +20,6 @@
#define SD_IF_SDDRAWDOCSHELL 200 + 1
#define SD_IF_SDVIEWSHELL 200 + 2
#define SD_IF_SDDRAWVIEWSHELL 200 + 3
-#define SD_IF_SDSLIDEVIEWSHELL 200 + 4
#define SD_IF_SDOUTLINEVIEWSHELL 200 + 5
#define SD_IF_SDDRAWSTDOBJECTBAR 200 + 6
#define SD_IF_SDDRAWTEXTOBJECTBAR 200 + 7
diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc
index a923f3d..4862445 100644
--- a/sfx2/inc/sfx2/cntids.hrc
+++ b/sfx2/inc/sfx2/cntids.hrc
@@ -47,7 +47,6 @@
#define SID_DISTRIBUTION (SID_CHAOS_START + 26)
#define SID_UPDATE (SID_CHAOS_START + 86)
#define SID_INSERT (SID_CHAOS_START + 90)
-#define SID_EXPLORER_CREATEPROJECT (SID_CHAOS_START + 176)
#define SID_VIEW_FLD_PIC (SID_CHAOS_START + 185)
// ----- Help IDs -----
diff --git a/sfx2/source/dialog/templdlg.hrc b/sfx2/source/dialog/templdlg.hrc
index 3523b1b..c5808a4 100644
--- a/sfx2/source/dialog/templdlg.hrc
+++ b/sfx2/source/dialog/templdlg.hrc
@@ -31,9 +31,6 @@
#define BTN_NEW 10
#define LB_FILTER 4
-#define ID_NEW_STYLE_BY_EXAMPLE 20
-#define ID_UPDATE_STYLE_BY_EXAMPLE 21
-
#define BT_OK 1
#define BT_CANCEL 2
#define BT_ORG 3
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
index eda6042..d5ef57f 100644
--- a/starmath/source/toolbox.src
+++ b/starmath/source/toolbox.src
@@ -25,14 +25,12 @@
*
************************************************************************/
-
#include <sfx2/sfx.hrc>
#include <svx/globlmn.hrc>
#include "starmath.hrc"
#include "toolbox.hrc"
#define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-#define IMAGE_STDBTN_COLOR_HC IMAGE_STDBTN_COLOR
FloatingWindow RID_TOOLBOXWINDOW
diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc
index 973a738..416563c 100644
--- a/svl/inc/svl/solar.hrc
+++ b/svl/inc/svl/solar.hrc
@@ -74,8 +74,7 @@
#define RID_OFA_START (RID_LIB_START+6900)
// RID_OFA_END (RID_LIB_START+7399)
-#define RID_GOODIES_START (RID_LIB_START+7400)
-// RID_GOODIES_END (RID_LIB_START+7449)
+// free: RID_LIB_START+7400 to +7449
#define RID_SVL_START (RID_LIB_START+7450)
// RID_SVL_END (RID_LIB_START+7899)
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index 4a05fa8..75ffead 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list