[Libreoffice-commits] .: 2 commits - basctl/source chart2/source cui/source editeng/source filter/source forms/source fpicker/source framework/source l10ntools/inc lotuswordpro/source sal/osl sal/qa sal/rtl sc/source sd/source shell/source sot/source store/workben svl/source svtools/source svx/inc svx/source sw/source toolkit/source tools/source vcl/source vcl/unx vcl/win writerfilter/source xml2cmp/source xmloff/source xmlsecurity/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Fri Jun 29 07:00:56 PDT 2012
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/tbxctl.cxx | 2
chart2/source/controller/dialogs/DataBrowser.cxx | 3
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 3
chart2/source/controller/dialogs/res_Titles.cxx | 5 -
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 2
chart2/source/controller/dialogs/tp_Scale.cxx | 2
cui/source/dialogs/cuicharmap.cxx | 1
cui/source/dialogs/cuiimapwnd.cxx | 1
cui/source/options/cuisrchdlg.cxx | 1
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/tpline.cxx | 2
editeng/source/items/frmitems.cxx | 3
editeng/source/items/paraitem.cxx | 4
editeng/source/items/svxfont.cxx | 3
filter/source/config/cache/macros.hxx | 1
filter/source/config/cache/versions.hxx | 1
filter/source/svg/svgdialog.cxx | 6 -
filter/source/xmlfilteradaptor/genericfilter.cxx | 4
filter/source/xmlfilterdetect/fdcomp.cxx | 5 -
forms/source/richtext/richtextvclcontrol.cxx | 8 -
fpicker/source/win32/filepicker/workbench/Test_fps.cxx | 3
fpicker/source/win32/folderpicker/workbench/Test_fops.cxx | 2
framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx | 2
framework/source/lomenubar/exports.cxx | 3
framework/source/register/register3rdcomponents.cxx | 5 -
framework/source/register/registerlogindialog.cxx | 5 -
framework/source/register/registerservices.cxx | 5 -
framework/source/register/registertemp.cxx | 5 -
framework/source/services/frame.cxx | 2
l10ntools/inc/tokens.h | 1
lotuswordpro/source/filter/genericfilter.cxx | 3
lotuswordpro/source/filter/lwp9reader.cxx | 2
lotuswordpro/source/filter/lwpdoc.cxx | 2
lotuswordpro/source/filter/lwpglobalmgr.cxx | 2
lotuswordpro/source/filter/lwpgrfobj.cxx | 2
lotuswordpro/source/filter/lwplayout.cxx | 2
lotuswordpro/source/filter/lwpobjfactory.cxx | 4
lotuswordpro/source/filter/lwpobjid.cxx | 4
sal/osl/unx/file_error_transl.cxx | 16 ---
sal/osl/unx/file_path_helper.cxx | 13 --
sal/osl/unx/process.cxx | 3
sal/osl/unx/uunxapi.cxx | 15 ---
sal/qa/rtl_strings/rtl_OString.cxx | 21 ----
sal/qa/rtl_strings/rtl_OUStringBuffer.cxx | 47 +---------
sal/qa/rtl_strings/rtl_String_Utils.cxx | 21 ----
sal/rtl/source/cipher.cxx | 2
sal/rtl/source/crc.cxx | 2
sal/rtl/source/digest.cxx | 2
sal/rtl/source/random.cxx | 2
sal/rtl/source/strbuf.cxx | 9 -
sc/source/ui/view/editsh.cxx | 2
sd/source/filter/ppt/pptatom.cxx | 5 -
sd/source/ui/dlg/animobjs.cxx | 5 -
sd/source/ui/view/DocumentRenderer.hrc | 1
shell/source/unix/sysshell/recently_used_file.cxx | 3
sot/source/base/exchange.cxx | 2
sot/source/base/factory.cxx | 4
sot/source/base/object.cxx | 3
store/workben/t_store.cxx | 1
svl/source/items/dateitem.cxx | 1
svl/source/items/lckbitem.cxx | 5 -
svl/source/memtools/svarray.cxx | 3
svtools/source/control/filectrl.cxx | 2
svtools/source/dialogs/insdlg.cxx | 5 -
svx/inc/svx/unoshprp.hxx | 1
svx/source/dialog/imapwnd.cxx | 1
svx/source/dialog/passwd.cxx | 3
svx/source/dialog/svxbmpnumvalueset.cxx | 3
svx/source/items/hlnkitem.cxx | 2
svx/source/items/numinf.cxx | 3
svx/source/items/postattr.cxx | 1
svx/source/stbctrls/pszctrl.cxx | 1
svx/source/svdraw/svdibrow.cxx | 3
svx/source/svdraw/svdograf.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 4
svx/source/unodraw/unomod.cxx | 2
svx/source/unodraw/unopage.cxx | 2
svx/source/unodraw/unoprov.cxx | 4
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshap3.cxx | 2
svx/source/unodraw/unoshap4.cxx | 2
svx/source/unodraw/unoshape.cxx | 2
sw/source/core/doc/docfmt.cxx | 2
sw/source/filter/ww8/writerhelper.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 5 -
sw/source/ui/app/apphdl.cxx | 2
sw/source/ui/fldui/changedb.cxx | 3
sw/source/ui/fldui/fldui.src | 2
sw/source/ui/fldui/javaedit.cxx | 6 -
sw/source/ui/inc/num.hxx | 2
sw/source/ui/misc/num.cxx | 5 -
sw/source/ui/misc/outline.cxx | 6 -
sw/source/ui/misc/redlndlg.cxx | 3
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 3
sw/source/ui/shells/tabsh.cxx | 3
sw/source/ui/uno/swdet2.cxx | 2
sw/source/ui/utlui/numfmtlb.cxx | 2
toolkit/source/controls/controlmodelcontainerbase.cxx | 2
tools/source/datetime/ttime.cxx | 3
tools/source/debug/debug.cxx | 3
tools/source/generic/line.cxx | 2
tools/source/generic/poly.cxx | 2
tools/source/generic/poly2.cxx | 3
tools/source/rc/rc.cxx | 3
tools/source/rc/resary.cxx | 2
tools/source/stream/vcompat.cxx | 2
vcl/source/control/longcurr.cxx | 2
vcl/source/src/btntext.src | 2
vcl/source/src/helptext.src | 2
vcl/source/src/images.src | 2
vcl/source/src/menu.src | 1
vcl/source/src/stdtext.src | 2
vcl/source/src/units.src | 1
vcl/unx/gtk/app/gtkdata.cxx | 5 -
vcl/unx/kde/kdedata.cxx | 3
vcl/unx/kde/salnativewidgets-kde.cxx | 3
vcl/unx/kde4/KDESalGraphics.cxx | 3
vcl/win/source/gdi/salnativewidgets-luna.cxx | 2
writerfilter/source/dmapper/FontTable.cxx | 2
writerfilter/source/dmapper/ThemeTable.cxx | 2
writerfilter/source/doctok/WW8PieceTableImpl.cxx | 2
xml2cmp/source/inc/precomp.h | 2
xmloff/source/forms/propertyimport.cxx | 2
xmloff/source/text/XMLFootnoteBodyImportContext.cxx | 2
xmloff/source/text/XMLSectionFootnoteConfigExport.cxx | 3
xmloff/source/text/XMLSectionFootnoteConfigImport.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 3
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 3
129 files changed, 23 insertions(+), 448 deletions(-)
New commits:
commit 8e1bffe7ffb0a091e06e83a453aec7ce666e8df0
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jun 29 15:50:40 2012 +0200
Remove include guards
Change-Id: Ib4ba76d0083e5bd75cc589a55318089c004f591f
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 0c38dc0..ddba9b1 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -26,11 +26,8 @@
*
************************************************************************/
-
// header for class SvNumberformat
-#ifndef _ZFORMAT_HXX
#include <svl/zformat.hxx>
-#endif
// header for SvNumberFormatter
#include <svl/zforlist.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index b4f5906..44e7348 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -26,10 +26,7 @@
*
************************************************************************/
-#ifndef _ZFORLIST_HXX
#include <svl/zforlist.hxx>
-#endif
-
#include "dlg_ObjectProperties.hxx"
#include "ResourceIds.hrc"
#include "Strings.hrc"
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index 0fc7f39..e2845b7 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -22,10 +22,7 @@
#include "res_Titles.hrc"
#include "ResId.hxx"
#include "TitleDialogData.hxx"
-
- #ifndef _SVT_CONTROLDIMS_HRC_
- #include <svtools/controldims.hrc>
- #endif
+#include <svtools/controldims.hrc>
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 41fb85f..59d06f6 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -48,9 +48,7 @@
#include <vcl/msgbox.hxx>
// header for class SvNumberformat
-#ifndef _ZFORMAT_HXX
#include <svl/zformat.hxx>
-#endif
#include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 7bcdb92..e198a68 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -48,9 +48,7 @@
#include <vcl/msgbox.hxx>
// header for class SvNumberformat
-#ifndef _ZFORMAT_HXX
#include <svl/zformat.hxx>
-#endif
#include <svtools/controldims.hrc>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 05e9133..2a3490a 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -26,9 +26,7 @@
*
************************************************************************/
-#ifndef _SVX_SIZEITEM_HXX //autogen
#include <editeng/sizeitem.hxx>
-#endif
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/app.hxx>
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index 342466c..98717cc 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -34,15 +34,9 @@
#include <vcl/svapp.hxx>
#include <vcl/dialog.hxx>
-#ifndef _COM_SUN_STAR_VIEW_XRENDERABLE_HPP_
#include <com/sun/star/view/XRenderable.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_
#include <com/sun/star/frame/XController.hpp>
-#endif
-#ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#endif
#define SVG_DIALOG_SERVICE_NAME "com.sun.star.comp.Draw.SVGFilterDialog"
#define SVG_DIALOG_IMPLEMENTATION_NAME SVG_DIALOG_SERVICE_NAME
diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index 3e73b3a..5f9fe9e 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -30,11 +30,7 @@
#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <cppuhelper/factory.hxx>
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
-
#include "XmlFilterAdaptor.hxx"
using namespace ::rtl;
diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx
index 7be124e..a031a33 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -27,15 +27,10 @@
************************************************************************/
#include <stdio.h>
-
#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <cppuhelper/factory.hxx>
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
-
#include "filterdetect.hxx"
using namespace ::rtl;
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index c8e4fd7..043aeff 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -32,18 +32,10 @@
#include <svl/itemset.hxx>
#include <svl/languageoptions.hxx>
#if OSL_DEBUG_LEVEL > 0
- #ifndef _UNTOOLS_UCBSTREAMHELPER_HXX
#include <unotools/ucbstreamhelper.hxx>
- #endif
- #ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
- #endif
- #ifndef _FILEDLGHELPER_HXX
#include <sfx2/filedlghelper.hxx>
- #endif
- #ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
- #endif
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#endif
#include <editeng/scripttypeitem.hxx>
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index e368364..07b2003 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -39,10 +39,7 @@
// other includes
//_________________________________________________________________________________________________________________________
#include <cppuhelper/servicefactory.hxx>
-
-#ifndef _RTL_USTRING_
#include <rtl/ustring.hxx>
-#endif
#include <sal/types.h>
#include <osl/diagnose.h>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 0c14a93..859c812 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -40,9 +40,7 @@
//--------------------------------------------------------------
#include <cppuhelper/servicefactory.hxx>
-#ifndef _RTL_USTRING_
#include <rtl/ustring.hxx>
-#endif
#include <sal/types.h>
#include <osl/diagnose.h>
diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
index 44c0812..a5702da 100644
--- a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
@@ -33,9 +33,7 @@
// interface includes
//_________________________________________________________________________________________________________________
-#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#endif
//_________________________________________________________________________________________________________________
// other includes
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
index db3e07b..f1a3321 100644
--- a/framework/source/lomenubar/exports.cxx
+++ b/framework/source/lomenubar/exports.cxx
@@ -30,10 +30,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/types.h>
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
#include "DesktopJob.hxx"
#include "FrameJob.hxx"
diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx
index c2a8566..8ea6674 100644
--- a/framework/source/register/register3rdcomponents.cxx
+++ b/framework/source/register/register3rdcomponents.cxx
@@ -36,13 +36,8 @@
Example:
- #ifndef __YOUR_SERVICE_1_HXX_
#include <service1.hxx>
- #endif
-
- #ifndef __YOUR_SERVICE_2_HXX_
#include <service2.hxx>
- #endif
COMPONENTGETFACTORY ( IFFACTORIE( Service1 )
else
diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx
index a857f12..9d17675 100644
--- a/framework/source/register/registerlogindialog.cxx
+++ b/framework/source/register/registerlogindialog.cxx
@@ -37,13 +37,8 @@
Example:
- #ifndef __YOUR_SERVICE_1_HXX_
#include <service1.hxx>
- #endif
-
- #ifndef __YOUR_SERVICE_2_HXX_
#include <service2.hxx>
- #endif
COMPONENTGETFACTORY ( IFFACTORIE( Service1 )
else
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index cf13ca4..28fb366 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -34,13 +34,8 @@
Example:
- #ifndef __YOUR_SERVICE_1_HXX_
#include <service1.hxx>
- #endif
-
- #ifndef __YOUR_SERVICE_2_HXX_
#include <service2.hxx>
- #endif
COMPONENTGETFACTORY ( IFFACTORIE( Service1 )
else
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 2cfac4f..8b77dd3 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -36,13 +36,8 @@
Example:
- #ifndef __YOUR_SERVICE_1_HXX_
#include <service1.hxx>
- #endif
-
- #ifndef __YOUR_SERVICE_2_HXX_
#include <service2.hxx>
- #endif
COMPONENTGETFACTORY ( IFFACTORIE( Service1 )
else
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 078361e..9178979 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -92,9 +92,7 @@
#include <unotools/moduleoptions.hxx>
#ifdef ENABLE_ASSERTIONS
- #ifndef _RTL_STRBUF_HXX_
#include <rtl/strbuf.hxx>
- #endif
#endif
#include <vcl/menu.hxx>
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index d889515..1a37472 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -4,10 +4,7 @@
#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <cppuhelper/factory.hxx>
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
#include "LotusWordProImportFilter.hxx"
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index 29c52d3..eda611a 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -53,9 +53,7 @@
*
*
************************************************************************/
-#ifndef _LWP9READER_HXX
#include "lwp9reader.hxx"
-#endif
#include "lwpglobalmgr.hxx"
#include "lwpunoheader.hxx"
#include "lwparrowstyles.hxx"
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index c5986d5..e9a2f72 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -66,9 +66,7 @@
#include "lwplayout.hxx"
#include "lwppagelayout.hxx"
#include "xfilter/xfstylemanager.hxx"
-#ifndef _OSL_THREAD_H_
#include <osl/thread.h>
-#endif
LwpDocument::LwpDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
: LwpDLNFPVList(objHdr, pStrm), m_pOwnedFoundry(NULL), m_pLnOpts(NULL)
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.cxx b/lotuswordpro/source/filter/lwpglobalmgr.cxx
index ce3167e..71dcc24 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.cxx
+++ b/lotuswordpro/source/filter/lwpglobalmgr.cxx
@@ -54,9 +54,7 @@
*
************************************************************************/
#include "lwpglobalmgr.hxx"
-#ifndef _OSL_THREAD_H_
#include <osl/thread.h>
-#endif
std::map< sal_uInt32,LwpGlobalMgr* > LwpGlobalMgr::m_ThreadMap;
LwpGlobalMgr::LwpGlobalMgr(LwpSvStream* pSvStream)
{
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 5632083..718d5f5 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -82,9 +82,7 @@
//For chart
#include "string.h"
-#ifndef _OSL_THREAD_H_
#include <osl/thread.h>
-#endif
#define EF_NONE 0x0000
#define EF_FTP 0x0001
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 4a4ebe9..1c646f9 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -74,9 +74,7 @@
#include "lwppagehint.hxx"
#include "lwpdivinfo.hxx"
#include "lwpgrfobj.hxx"
-#ifndef _OSL_THREAD_H_
#include <osl/thread.h>
-#endif
LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
: LwpDLNFPVList(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index a14e193..616b11b 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -63,11 +63,7 @@
************************************************************************/
#include "lwpobjfactory.hxx"
-
-#ifndef _LWPDEFS_HXX
#include "lwpdefs.hxx"
-#endif
-
#include "lwpdoc.hxx"
#include "lwptemp.hxx"
#include "lwpstory.hxx"
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index 7826866..5eb7f6d 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -62,11 +62,7 @@
Jan 2005 Created
************************************************************************/
-
-#ifndef _LWPOBJECTID_HXX
#include "lwpobjid.hxx"
-#endif
-
#include "lwpfilehdr.hxx"
#include "lwpobjfactory.hxx"
#include "lwpglobalmgr.hxx"
diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx
index c716707..7e7bb9b 100644
--- a/sal/osl/unx/file_error_transl.cxx
+++ b/sal/osl/unx/file_error_transl.cxx
@@ -17,19 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
- #ifndef _ERRNO_H
- #include <errno.h>
- #endif
-
- #ifndef _FILE_ERROR_TRANSL_H_
- #include "file_error_transl.h"
- #endif
-
- #ifndef _OSL_DIAGNOSE_H_
- #include <osl/diagnose.h>
- #endif
-
+#include <errno.h>
+#include "file_error_transl.h"
+#include <osl/diagnose.h>
/********************************************
* oslTranslateFileError
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 1aaf0e4..39b9a58 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -31,25 +31,12 @@
Includes
******************************************/
- #ifndef _OSL_FILE_PATH_HELPER_H_
#include "file_path_helper.h"
- #endif
-
- #ifndef _OSL_FILE_PATH_HELPER_HXX_
#include "file_path_helper.hxx"
- #endif
-
- #ifndef _OSL_UUNXAPI_HXX_
#include "uunxapi.hxx"
- #endif
- #ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>
- #endif
-
- #ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
- #endif
/*******************************************
Constants
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index ff68fde..cb9d6c8 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -56,10 +56,7 @@
#endif
#include <osl/diagnose.h>
#include <osl/mutex.h>
-
-#ifndef _OSL_CONDITN_H_
#include <osl/conditn.h>
-#endif
#include <osl/thread.h>
#include <osl/file.h>
#include <osl/signal.h>
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 270f5c3..b2b2bc3 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -26,26 +26,11 @@
*
************************************************************************/
-
- #ifndef _OSL_UUNXAPI_H_
#include "uunxapi.h"
- #endif
-
- #ifndef __OSL_SYSTEM_H__
#include "system.h"
- #endif
-
- #ifndef _LIMITS_H
#include <limits.h>
- #endif
-
- #ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
- #endif
-
- #ifndef _OSL_THREAD_H_
#include <osl/thread.h>
- #endif
#ifdef ANDROID
#include <osl/detail/android-bootstrap.h>
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx b/sal/qa/rtl_strings/rtl_OString.cxx
index 5be8f31..8a5f31e 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -27,24 +27,11 @@
************************************************************************/
#include <string.h>
-
-#ifndef _SAL_TYPES_H_
- #include <sal/types.h>
-#endif
-
+#include <sal/types.h>
#include <testshl/tresstatewrapper.hxx>
-
-#ifndef _RTL_STRING_HXX_
- #include <rtl/string.hxx>
-#endif
-
-#ifndef _RTL_STRING_CONST_H_
- #include <rtl_String_Const.h>
-#endif
-
-#ifndef _RTL_STRING_UTILS_HXX_
- #include <rtl_String_Utils.hxx>
-#endif
+#include <rtl/string.hxx>
+#include <rtl_String_Const.h>
+#include <rtl_String_Utils.hxx>
#include <rtl/ustring.h>
using ::rtl::OString;
diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
index 7a9871c..58cf2ca 100644
--- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
@@ -26,45 +26,16 @@
*
************************************************************************/
-
-#ifndef _SAL_TYPES_H_
- #include <sal/types.h>
-#endif
-
+#include <sal/types.h>
#include <testshl/tresstatewrapper.hxx>
-
-#ifndef _RTL_STRING_HXX_
- #include <rtl/string.hxx>
-#endif
-
-#ifndef _RTL_USTRING_H_
- #include <rtl/ustring.h>
-#endif
-
-#ifndef _RTL_USTRING_HXX_
- #include <rtl/ustring.hxx>
-#endif
-
-#ifndef _RTL_USTRBUF_H_
- #include <rtl/ustrbuf.h>
-#endif
-
-#ifndef _RTL_USTRBUF_HXX
- #include <rtl/ustrbuf.hxx>
-#endif
-
-#ifndef _OSL_THREAD_H_
- #include <osl/thread.h>
-#endif
-
-#ifndef _RTL_STRING_CONST_H_
- #include <rtl_String_Const.h>
-#endif
-
-#ifndef _RTL_STRING_UTILS_HXX_
- #include <rtl_String_Utils.hxx>
-#endif
-
+#include <rtl/string.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.h>
+#include <rtl/ustrbuf.hxx>
+#include <osl/thread.h>
+#include <rtl_String_Const.h>
+#include <rtl_String_Utils.hxx>
#include "stdio.h"
using ::rtl::OUString;
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.cxx b/sal/qa/rtl_strings/rtl_String_Utils.cxx
index 972124f..2c11679 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.cxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.cxx
@@ -26,25 +26,12 @@
*
#*************************************************************************/
-
#include <math.h>
#include <stdlib.h>
-
-#ifndef _SAL_TYPES_H_
- #include <sal/types.h>
-#endif
-
-#ifndef _RTL_USTRING_H_
- #include <rtl/ustring.h>
-#endif
-
-#ifndef _RTL_STRING_HXX_
- #include <rtl/string.hxx>
-#endif
-
-#ifndef _RTL_STRING_UTILS_CONST_H_
- #include <rtl_String_Utils_Const.h>
-#endif
+#include <sal/types.h>
+#include <rtl/ustring.h>
+#include <rtl/string.hxx>
+#include <rtl_String_Utils_Const.h>
using ::rtl::OString;
sal_uInt32 AStringLen( const sal_Char *pAStr )
diff --git a/sal/rtl/source/strbuf.cxx b/sal/rtl/source/strbuf.cxx
index c9a4f31..d4a5a75 100644
--- a/sal/rtl/source/strbuf.cxx
+++ b/sal/rtl/source/strbuf.cxx
@@ -27,18 +27,9 @@
************************************************************************/
#include <osl/interlck.h>
-
-#ifndef _RTL_STRING_HXX_
#include <rtl/strbuf.hxx>
-#endif
#include <rtl/memory.h>
-/*
-#include <rtl/alloc.h>
-*/
-
-
-
/*************************************************************************
* rtl_stringbuffer_newFromStr_WithLength
*/
diff --git a/sd/source/filter/ppt/pptatom.cxx b/sd/source/filter/ppt/pptatom.cxx
index dc30965..ce19f39 100644
--- a/sd/source/filter/ppt/pptatom.cxx
+++ b/sd/source/filter/ppt/pptatom.cxx
@@ -26,13 +26,8 @@
*
************************************************************************/
-#ifndef _STREAM_HXX
#include <tools/stream.hxx>
-#endif
-
-#ifndef _PPTATOM_HXX_
#include "pptatom.hxx"
-#endif
using namespace ppt;
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index b985402..30cfca6 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -26,10 +26,7 @@
*
************************************************************************/
-
-#ifndef INCLUDED_RECENTLY_USED_FILE
#include "recently_used_file.hxx"
-#endif
#include <rtl/ustring.hxx>
#include <osl/process.h>
#include <osl/security.hxx>
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index cd505ac..13a2e34 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -45,10 +45,7 @@
#include <vcl/msgbox.hxx>
#include <editeng/flstitem.hxx>
#include <svx/dlgutil.hxx>
-#ifndef _XTABLE_HXX //autogen
-
#include <svx/xtable.hxx>
-#endif
#include <svx/drawitem.hxx>
#include <svx/numvset.hxx>
#include <svx/htmlmode.hxx>
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index f2dc1b9..21cef82 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -30,10 +30,7 @@
#include "svdibrow.hxx"
-#ifndef _STDLIB_H
#include <stdlib.h>
-#define _STDLIB_H
-#endif
#include "svx/svditext.hxx"
#include <editeng/flditem.hxx>
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 21b507f..bbf3c76 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -36,9 +36,7 @@
#include <editeng/lrspitem.hxx>
#include <editeng/brkitem.hxx>
#include <svl/whiter.hxx>
-#ifndef _ZFORLIST_HXX //autogen
#include <svl/zforlist.hxx>
-#endif
#include <comphelper/processfactory.hxx>
#include <unotools/misccfg.hxx>
#include <com/sun/star/i18n/WordType.hpp>
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 69114a4..f261f7e 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -56,9 +56,7 @@
#include <docary.hxx> //SwCharFmts
#include <charfmt.hxx> //SwCharFmt
#include <fchrfmt.hxx> //SwFmtCharFmt
-#ifndef _UNOTOOLS_STREAMWRAP_HXX
#include <unotools/streamwrap.hxx>
-#endif
#include <numrule.hxx>
using namespace com::sun::star;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index df0c10b..d29d4f1 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -53,12 +53,7 @@
#include <editeng/frmdiritem.hxx>
#include <svx/svdoole2.hxx>
#include <editeng/editeng.hxx>
-#ifndef _SVX_FLDITEM_HXX
-//miserable hack to get around #98519#
-
#include <editeng/flditem.hxx>
-#endif
-
#include <comphelper/seqstream.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <svx/fmglob.hxx>
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index 06bd31a..d613366 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -161,6 +161,6 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog
SwWrtShell &);
~SwSvxNumBulletTabDialog();
};
-#endif // _NUM_CXX
+#endif // _NUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 983bb7e..912b24b 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -21,12 +21,7 @@
#undef SW_DLLIMPLEMENTATION
#endif
-
-
-#define USE_NUMTABPAGES
-#define _NUM_CXX
#include <hintids.hxx>
-
#include <vcl/msgbox.hxx>
#include <sfx2/app.hxx>
#include <sfx2/imgmgr.hxx>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index abd58e4..cfa46f5 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -37,11 +37,7 @@
#include <editeng/brshitem.hxx>
#include <unotools/configmgr.hxx>
#include <SwStyleNameMapper.hxx>
-
-#ifndef _NUM_HXX //autogen
-#define USE_NUMTABPAGES
#include <num.hxx>
-#endif
#include <view.hxx>
#include <docsh.hxx>
#include <uitool.hxx>
@@ -68,9 +64,7 @@
#include <IDocumentOutlineNodes.hxx>
#include <app.hrc>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
using namespace ::com::sun::star;
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 2e14c57..b1884b7 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -27,10 +27,7 @@
************************************************************************/
#include <hintids.hxx>
-
-#ifndef _ZFORLIST_HXX
#include <svl/zforlist.hxx>
-#endif
#include <svl/stritem.hxx>
#include <svl/whiter.hxx>
#include <unotools/moduleoptions.hxx>
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 880e0c4..bdf712c 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -32,9 +32,7 @@
#include <editeng/unolingu.hxx>
#include <unotools/localedatawrapper.hxx>
#include <i18npool/lang.h>
-#ifndef _ZFORMAT_HXX //autogen
#include <svl/zformat.hxx>
-#endif
#include <svl/eitem.hxx>
#include <svx/svxids.hrc>
#include <svx/numinf.hxx>
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 7af946a..e56edd5 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -38,9 +38,7 @@
#include <toolkit/controls/unocontrols.hxx>
#include "toolkit/controls/formattedcontrol.hxx"
#include "toolkit/controls/roadmapcontrol.hxx"
-#ifndef TOOLKIT_INC_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
#include "toolkit/controls/tkscrollbar.hxx"
-#endif
#include <toolkit/controls/stdtabcontroller.hxx>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/awt/WindowAttribute.hpp>
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 02c6eb9..d5de5d8 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -18,10 +18,8 @@
*/
#include <FontTable.hxx>
-#ifndef INCLUDED_RESOURCESIDS
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
-#endif
#include <vector>
#include <stdio.h>
#include <rtl/tencinfo.h>
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 0dc8ba4..0b19382 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -18,10 +18,8 @@
*/
#include <ThemeTable.hxx>
-#ifndef INCLUDED_RESOURCESIDS
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
-#endif
#include "dmapperLoggers.hxx"
#if DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/doctok/WW8PieceTableImpl.cxx b/writerfilter/source/doctok/WW8PieceTableImpl.cxx
index 96ba5d1..9214243 100644
--- a/writerfilter/source/doctok/WW8PieceTableImpl.cxx
+++ b/writerfilter/source/doctok/WW8PieceTableImpl.cxx
@@ -20,9 +20,7 @@
#include <algorithm>
#include <iterator>
-#ifndef INCLUDED_DOCTOK_EXCEPTIONS
#include <resourcemodel/exceptions.hxx>
-#endif
#include <WW8PieceTableImpl.hxx>
#include <WW8Clx.hxx>
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 632f691..501622c 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -47,9 +47,7 @@
#include <rtl/strbuf.hxx>
#if OSL_DEBUG_LEVEL > 0
- #ifndef _OSL_THREAD_H_
#include <osl/thread.h>
- #endif
#endif
//.........................................................................
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index fe33907..135fc97 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -19,9 +19,7 @@
#include "XMLFootnoteBodyImportContext.hxx"
-#ifndef _RTL_USTRING
#include <rtl/ustring.hxx>
-#endif
#include <xmloff/xmlimp.hxx>
#include <xmloff/txtimp.hxx>
#include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index 3c09c16..cedb551 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -40,10 +40,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnume.hxx>
#include <tools/debug.hxx>
-
-#ifndef _RTL_USTRING
#include <rtl/ustring.hxx>
-#endif
#include <rtl/ustrbuf.hxx>
#include <vector>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index 199e56a..ba8fa95 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -28,9 +28,7 @@
#include "XMLSectionFootnoteConfigImport.hxx"
-#ifndef _RTL_USTRING
#include <rtl/ustring.hxx>
-#endif
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/style/NumberingType.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
index 1dc97f9..377da31 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
@@ -35,10 +35,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <comphelper/sequence.hxx>
-
-#ifndef _SANEXTENSION_MSCRYPTIMPL_HXX_
#include "sanextension_mscryptimpl.hxx"
-#endif
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno ;
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index f83aff3..3ca94b7 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -40,10 +40,7 @@
#include <secitem.h>
#include <secport.h>
-
-#ifndef _SANEXTENSION_NSSIMPL_HXX_
#include "sanextension_nssimpl.hxx"
-#endif
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno ;
commit b63027f0992cf5c368faeb807c69110997dd00ea
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jun 29 15:03:50 2012 +0200
Remove some unused defines and controls
Change-Id: I96f76ed6b33f5c786d1e3ab3981a535037a9c1b5
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index f753a0c..d674fd1 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _BASIC_TEXTPORTIONS
-
#include "helpid.hrc"
#include "baside2.hrc"
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 7ba9d11..171fa00 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _BASIDE_POPUPWINDOWTBX
-
#include <svl/solar.hrc>
#include <svx/svxids.hrc>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 676ef53..ca780f8 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -28,7 +28,6 @@
#include <stdio.h>
-#define _CUI_CHARMAP_CXX_
#include <tools/shl.hxx>
#include <vcl/sound.hxx>
#include <vcl/svapp.hxx>
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index bdaef5f..3374d13 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -30,7 +30,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/help.hxx>
#include <sfx2/sfxsids.hrc>
-#define _ANIMATION
#include "macroass.hxx"
#include <svtools/imaprect.hxx>
#include <svtools/imapcirc.hxx>
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 20ac475..fdc01a9 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -32,7 +32,6 @@
#include <svl/cjkoptions.hxx>
#include <com/sun/star/i18n/TransliterationModules.hpp>
-#define _CUI_SRCHDLG_CXX
#include "cuisrchdlg.hxx"
#include <cuires.hrc>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index d96ad0d..98b00b6 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -40,8 +40,6 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <svtools/unitconv.hxx>
-
-#define _SVX_CHARDLG_CXX
#include <svl/languageoptions.hxx>
#include "chardlg.hrc"
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index c080460..d2f9a3c 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -64,9 +64,6 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <svtools/filter.hxx>
-
-#define _SVX_FRMITEMS_CXX
-
#include <editeng/editids.hrc>
#include <editeng/editrids.hrc>
#include <editeng/pbinitem.hxx>
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 382f9bd..e306b89 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -38,13 +38,9 @@ using namespace ::rtl;
using namespace ::com::sun::star;
#include <tools/rtti.hxx>
-
-#define _SVX_PARAITEM_CXX
#include <svl/itempool.hxx>
-
#include <svl/memberid.hrc>
#include <editeng/editrids.hrc>
-
#include <editeng/lspcitem.hxx>
#include <editeng/adjitem.hxx>
#include <editeng/orphitem.hxx>
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 6d65882..4319cd6 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -32,9 +32,6 @@
#include <unotools/charclass.hxx>
#include <editeng/unolingu.hxx>
#include <com/sun/star/i18n/KCharacterType.hpp>
-
-#define _SVX_SVXFONT_CXX
-
#include <editeng/svxfont.hxx>
#include <editeng/escpitem.hxx>
diff --git a/filter/source/config/cache/macros.hxx b/filter/source/config/cache/macros.hxx
index 9a5c077..048acec 100644
--- a/filter/source/config/cache/macros.hxx
+++ b/filter/source/config/cache/macros.hxx
@@ -50,7 +50,6 @@
#define _FILTER_CONFIG_LOG_(TEXT)
#define _FILTER_CONFIG_LOG_1_(FORMAT, ARG1)
#define _FILTER_CONFIG_LOG_2_(FORMAT, ARG1, ARG2)
-#define _FILTER_CONFIG_LOG_3_(FORMAT, ARG1, ARG2, ARG3)
#endif // _FILTER_CONFIG_MACROS_HXX_
diff --git a/filter/source/config/cache/versions.hxx b/filter/source/config/cache/versions.hxx
index 52e9653..71789dd 100644
--- a/filter/source/config/cache/versions.hxx
+++ b/filter/source/config/cache/versions.hxx
@@ -22,7 +22,6 @@
//_______________________________________________
-//#define _FILTER_CONFIG_Q_ // final Q code base
#define _FILTER_CONFIG_MIGRATION_Q_ // usefull for migration time, to support some old functionality temp. :-)
#endif // _FILTER_CONFIG_VERSIONS_HXX_
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index c42ee50..ba5a6ae 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -59,7 +59,6 @@
#define _LISTTEXT 521 /* { "Text" ... } */
#define TEXTREFID 522 /* Text = 12345 */
#define LISTRESID 523 /* < 12345; ... > */
-#define _LISTRESID 523 /* { 12345; ... } */
#define NORMDEFINE 524 /* #define ... */
/*------------------------------------------------------ */
/*------------------------------------------------------ */
diff --git a/sal/rtl/source/cipher.cxx b/sal/rtl/source/cipher.cxx
index 4dc5171..7a57ac0 100644
--- a/sal/rtl/source/cipher.cxx
+++ b/sal/rtl/source/cipher.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-#define _RTL_CIPHER_C_
-
#include <sal/types.h>
#include <rtl/alloc.h>
#include <rtl/memory.h>
diff --git a/sal/rtl/source/crc.cxx b/sal/rtl/source/crc.cxx
index 942bff7..a75ba36 100644
--- a/sal/rtl/source/crc.cxx
+++ b/sal/rtl/source/crc.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-#define _RTL_CRC_C_
-
#include <sal/types.h>
#include <rtl/crc.h>
diff --git a/sal/rtl/source/digest.cxx b/sal/rtl/source/digest.cxx
index 1bcc150..feec3b4 100644
--- a/sal/rtl/source/digest.cxx
+++ b/sal/rtl/source/digest.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-#define _RTL_DIGEST_C_
-
#include <sal/types.h>
#include <sal/macros.h>
#include <osl/endian.h>
diff --git a/sal/rtl/source/random.cxx b/sal/rtl/source/random.cxx
index da1ddda..8e1e06b 100644
--- a/sal/rtl/source/random.cxx
+++ b/sal/rtl/source/random.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-#define _RTL_RANDOM_C_
-
#include <sal/types.h>
#include <osl/thread.h>
#include <osl/time.h>
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 42b4076..51b2679 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -65,9 +65,7 @@
#include <svtools/transfer.hxx>
#include <svl/stritem.hxx>
-#define _EDITSH_CXX
#include "editsh.hxx"
-
#include "scresid.hxx"
#include "global.hxx"
#include "sc.hrc"
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index be53af6..d2de7c2 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -28,12 +28,7 @@
#include <com/sun/star/presentation/AnimationEffect.hpp>
#include <com/sun/star/presentation/AnimationSpeed.hpp>
-
-#define _ANIMATION //animation freischalten
-
-#define _SV_BITMAPEX
#include <svx/xoutbmp.hxx>
-
#include <time.h>
#include <svl/eitem.hxx>
#include <svx/svdograf.hxx>
diff --git a/sd/source/ui/view/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc
index 469614d..cb6c4d0 100644
--- a/sd/source/ui/view/DocumentRenderer.hrc
+++ b/sd/source/ui/view/DocumentRenderer.hrc
@@ -29,7 +29,6 @@
#define _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT 13
#define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME 14
#define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE 16
-#define _STR_IMPRESS_PRINT_UI_IS_PRINT_TIME 18
#define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN 20
#define _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP 22
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 99b2bc5..69164b0 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _SOT_EXCHANGE_CXX
-#define SOT_STRING_LIST
#define _SOT_FORMATS_INCLUDE_SYSTEMFORMATS
#include <tools/debug.hxx>
#include <tools/solar.h>
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 17440b3..7835683 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _SOT_FACTORY_CXX
-#define SOT_STRING_LIST
-
#include <sot/factory.hxx>
#include <tools/debug.hxx>
#include <tools/string.hxx>
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index a4670c5..3264015 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _SOT_OBJECT_CXX
-
#include <sot/object.hxx>
#include <sot/factory.hxx>
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index 6e7bc63..db61383 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -48,7 +48,6 @@ using rtl::OUString;
#define _DEMOSTOR_LOOPS 1000 /* 1000, 2000 */
#define _DEMOSTOR_REMOVE 0
-#define _DEMOSTOR_REBUILD 0
enum Options
{
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index 8d06d45..6a8f878 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#define _DATETIMEITEM_CXX
#include <svl/dateitem.hxx>
#include <svl/svl.hrc>
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 6936c65..8319a44 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -26,17 +26,12 @@
*
************************************************************************/
-
-#define _LCKBITEM_CXX
#include <svl/lckbitem.hxx>
#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <tools/cachestr.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-
// -----------------------------------------------------------------------
TYPEINIT1_AUTOFACTORY(SfxLockBytesItem, SfxPoolItem);
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 3d01bea..f288329 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_STRINGSSORTDTOR
-
#include <svl/svstdarr.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 7f702b5..5af9c80 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _SV_FIELCTRL_CXX
#include <svtools/svtresid.hxx>
#include <svtools/filectrl.hxx>
#include <filectrl.hrc>
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index d657893..460b183 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -26,11 +26,6 @@
*
************************************************************************/
-
-#define _INSDLG_CXX
-
-// include ---------------------------------------------------------------
-
#include <svtools/insdlg.hxx>
#include <svtools/sores.hxx>
#include <svtools/svtresid.hxx>
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index 6cf3619..8fee2c1 100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
@@ -73,7 +73,6 @@
#include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-#define _SVX_USE_UNOGLOBALS_
#include <svx/unoprov.hxx>
#include <editeng/unoprnms.hxx>
#include <svx/unomid.hxx>
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index f9bc34b..936748b 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -30,7 +30,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/help.hxx>
#include <sfx2/sfxsids.hrc> // SID_ATTR_MACROITEM
-#define _ANIMATION
#include <svtools/imaprect.hxx>
#include <svtools/imapcirc.hxx>
#include <svtools/imappoly.hxx>
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 5773bb3..3341c21 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -29,9 +29,6 @@
#include <comphelper/string.hxx>
#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
-
-#define _SVX_PASSWD_CXX
-
#include "svx/passwd.hxx"
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 247ef7c..cec06ce 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-#define _SVX_HLNKITEM_CXX
-
#include <svx/svxids.hrc>
#include <tools/stream.hxx>
#include <svl/memberid.hrc>
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 9401e00..721c165 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-#define _SVX_NUMINF_CXX
-
#include <svx/numinf.hxx>
// -----------------------------------------------------------------------
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index c925ee2..1685a74 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#define _SVX_POSTATTR_CXX
#include "svx/postattr.hxx"
#include <editeng/itemtype.hxx>
#include <svx/svxitems.hrc>
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 8b09cb2..c52c63e 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -39,7 +39,6 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/objsh.hxx>
#include <svl/intitem.hxx>
-#define _SVX_PSZCTRL_CXX
#include "svx/pszctrl.hxx"
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index d82f72c..75f71f6 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _ANIMATION
#include <unotools/streamwrap.hxx>
#include <sfx2/lnkbase.hxx>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 4ad989c..014d483 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -54,17 +54,13 @@
#include <sfx2/viewfrm.hxx>
#include <unotools/fontoptions.hxx>
#include <vcl/mnemonic.hxx>
-
#include <vcl/svapp.hxx>
#include <svl/smplhint.hxx>
-
-#define _SVX_TBCONTRL_CXX
#include <svtools/colorcfg.hxx>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/status/ItemStatus.hpp>
-
#include <svx/dialogs.hrc>
#include <svx/svxitems.hrc>
#include "helpid.hrc"
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 736038e..47c96c8 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _SVX_USE_UNOGLOBALS_
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
#include <com/sun/star/drawing/XShape.hpp>
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index eaafdff..4aef2c5 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _SVX_USE_UNOGLOBALS_
#include <com/sun/star/document/EventObject.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <osl/mutex.hxx>
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 41a813c..7e99ef6 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -26,11 +26,7 @@
*
************************************************************************/
-
#include <sal/macros.h>
-
-#define _SVX_USE_UNOGLOBALS_
-
#include <com/sun/star/table/XTable.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 07bc6c4..93f8e18 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _SVX_USE_UNOGLOBALS_
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
#include <com/sun/star/style/VerticalAlignment.hpp>
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 0a9339d..72246c0 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _SVX_USE_UNOGLOBALS_
#include <com/sun/star/drawing/HomogenMatrix.hpp>
#include <com/sun/star/drawing/Position3D.hpp>
#include <com/sun/star/drawing/Direction3D.hpp>
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 3fe75fc..ab308e5 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -31,8 +31,6 @@
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-#define _SVX_USE_UNOGLOBALS_
-
#include <vcl/virdev.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdomedia.hxx>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 8194e82..ce1315f 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _SVX_USE_UNOGLOBALS_
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 98eeccf..4570296 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -123,8 +123,6 @@ using namespace ::com::sun::star;
#define ViewSettings
#define WebViewSettings
#define PrintSettings
-#define _ExecAddress ExecOther
-#define _StateAddress StateOther
#include <sfx2/msg.hxx>
#include "swslots.hxx"
#include <cfgid.h>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index a599321..0172e05 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -32,9 +32,6 @@
#undef SW_DLLIMPLEMENTATION
#endif
-
-#define _CHANGEDB_CXX
-
#include <svtools/stdctrl.hxx>
#include <vcl/msgbox.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src
index e3d9972..1b17447 100644
--- a/sw/source/ui/fldui/fldui.src
+++ b/sw/source/ui/fldui/fldui.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define _FLDUI_SRC
+
#include "index.hrc"
#include "fldui.hrc"
#include "helpid.h"
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 60d957a..5f893da 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -31,14 +31,8 @@
#undef SW_DLLIMPLEMENTATION
#endif
-// include ---------------------------------------------------------------
-
-
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-
-#define _JAVAEDIT_CXX
#include <hintids.hxx>
-
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 6161886..df8c355 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -39,10 +39,7 @@
#include <wrtsh.hxx>
#include <view.hxx>
#include <swmodule.hxx>
-#ifndef _REDLNDLG_HXX
-#define _REDLNACCEPTDLG
#include <redlndlg.hxx>
-#endif
#include <swwait.hxx>
#include <uitool.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 4cf6701..53444dd 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -52,10 +52,7 @@
#include <shells.hrc>
#include <vector>
-#ifndef _REDLNDLG_HXX
-#define _REDLNACCEPTDLG
#include <redlndlg.hxx>
-#endif
#include "swmodalredlineacceptdlg.hxx"
#include <unomid.h>
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index 40e4be5..cfe82cd 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _SWLIB_CXX
#include <sfx2/docfac.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index 4a377e2..0aa82ad 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-#define _TOOLS_TIME_CXX
-
#if defined( WNT )
#include <windows.h>
#elif defined UNX
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index b3dae60..5c1dfa3 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-#define _TOOLS_DEBUG_CXX
-
#if defined (UNX) || defined (GCC)
#include <unistd.h>
#else
diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx
index 32c81e8..5b9073e 100644
--- a/tools/source/generic/line.cxx
+++ b/tools/source/generic/line.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _LINE_CXX
#include <tools/link.hxx>
#include <tools/line.hxx>
#include <tools/debug.hxx>
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index bbc50d6..7f2afca 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#define _SV_POLY_CXX
#include <osl/endian.h>
#include <tools/bigint.hxx>
#include <tools/debug.hxx>
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 089c715..8f44385 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-#define _SV_POLY2_CXX
-
#define POLY_CLIP_INT 0
#define POLY_CLIP_UNION 1
#define POLY_CLIP_DIFF 2
diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx
index 00f2a7a..3161357 100644
--- a/tools/source/rc/rc.cxx
+++ b/tools/source/rc/rc.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _TOOLS_RC_CXX
-
#include <string.h>
#include <tools/date.hxx>
#include <tools/time.hxx>
diff --git a/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx
index d226445..cdf04f7 100644
--- a/tools/source/rc/resary.cxx
+++ b/tools/source/rc/resary.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _TOOLS_RESARY_CXX
#include <tools/resmgr.hxx>
#include <tools/resary.hxx>
#include <tools/rcid.h>
diff --git a/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx
index 599d719..fc9dc17 100644
--- a/tools/source/stream/vcompat.cxx
+++ b/tools/source/stream/vcompat.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _VCOMPAT_CXX
#include <tools/stream.hxx>
#include <tools/vcompat.hxx>
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 0ae610f..fa9fe0f 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -26,10 +26,8 @@
*
************************************************************************/
-
#include <comphelper/string.hxx>
#include <sot/object.hxx>
-#define _TOOLS_BIGINT
#include <sot/factory.hxx>
#include <tools/debug.hxx>
#include <tools/bigint.hxx>
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index c0303aa..cad485f 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-#define _SV_BTNTEXT_SRC
-
#include <svids.hrc>
String SV_BUTTONTEXT_OK
diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
index d794fad..573c1b6 100644
--- a/vcl/source/src/helptext.src
+++ b/vcl/source/src/helptext.src
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _SV_HELPTEXT_SRC
-
#include <svids.hrc>
String SV_HELPTEXT_CLOSE
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 2dcaac6..f0b58f4 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-#define _SV_IMAGES_SRC
-
#include <svids.hrc>
// =======================================================================
diff --git a/vcl/source/src/menu.src b/vcl/source/src/menu.src
index cbc6181..efb9831 100644
--- a/vcl/source/src/menu.src
+++ b/vcl/source/src/menu.src
@@ -15,7 +15,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _SV_MENU_SRC
#include <svids.hrc>
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index 53d4fb5..ffe5ac1 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-#define _SV_STDTEXT_SRC
-
#include <svids.hrc>
String SV_STDTEXT_SERVICENOTAVAILABLE
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
index 2402356..342c108 100644
--- a/vcl/source/src/units.src
+++ b/vcl/source/src/units.src
@@ -24,7 +24,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define _SV_UNITS_SRC
#include <svids.hrc>
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 07beacc..8f3151c 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -26,11 +26,6 @@
*
************************************************************************/
-
-#define _SV_SALDATA_CXX
-
-// -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
#include <unistd.h>
#include <fcntl.h>
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 195915b..e4b1092 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-#define _SV_SALDATA_CXX
-
#include <shell/kde_headers.h>
#include <unistd.h>
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 0a5f79f..e9e4d65 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-#define _SV_SALNATIVEWIDGETS_KDE_CXX
-
#include <shell/kde_headers.h>
#include "UnxFilePicker.hxx"
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 80c38ec..c7980a1 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-#define _SV_SALNATIVEWIDGETS_KDE_CXX
-
#define Region QtXRegion
#include <QStyle>
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index b8abaee..ca63b70 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -40,8 +40,6 @@
// Drawing in non-client area (general DWM-related info):
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb688195%28v=vs.85%29.aspx
-#define _SV_SALNATIVEWIDGETS_CXX
-
#include "rtl/ustring.h"
#include "osl/module.h"
diff --git a/xml2cmp/source/inc/precomp.h b/xml2cmp/source/inc/precomp.h
index fa0f582..31a6e22 100644
--- a/xml2cmp/source/inc/precomp.h
+++ b/xml2cmp/source/inc/precomp.h
@@ -20,8 +20,6 @@
#ifndef CPV_PRECOMP_H
#define CPV_PRECOMP_H
-#define _NO_BOOL_TYPE_
-
typedef short Bool;
#define True 1
#define False 0
More information about the Libreoffice-commits
mailing list