summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-07-01 18:24:05 +0200
committerThomas Arnhold <thomas@arnhold.org>2012-07-01 18:33:42 +0200
commit00240d049790d11c4ef35de7a294819107197efd (patch)
tree6479f4fee0eac540ca6d0b80552834f2b19e4364 /sw
parentd341aca7f68bc082cdefe4b1176f56c2c14a0322 (diff)
Remove unused defines
Change-Id: Ic36b131ee9964a6671f7f41e1cad1631c43ad565
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/dbgoutsw.hxx8
-rw-r--r--sw/inc/fesh.hxx2
-rw-r--r--sw/inc/fmtanchr.hxx1
-rw-r--r--sw/inc/fmtornt.hxx6
-rw-r--r--sw/inc/fmtpdsc.hxx3
-rw-r--r--sw/inc/tox.hxx3
-rw-r--r--sw/source/core/inc/rootfrm.hxx6
-rw-r--r--sw/source/core/txtnode/swfont.cxx8
-rw-r--r--sw/source/core/unocore/unochart.cxx5
-rw-r--r--sw/source/core/unocore/unocoll.cxx1
-rw-r--r--sw/source/ui/config/uinums.cxx1
-rw-r--r--sw/source/ui/config/viewopt.cxx9
-rw-r--r--sw/source/ui/dialog/regionsw.src7
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx3
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx3
-rw-r--r--sw/source/ui/inc/swcont.hxx4
-rw-r--r--sw/source/ui/utlui/navipi.cxx2
-rw-r--r--sw/source/ui/vba/vbacolumn.cxx2
18 files changed, 0 insertions, 74 deletions
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index b090dfe0b52c..42dcf062c2e1 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 fe4a353aff9d..c5c75439fb4b 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 fbceba429795..6e16970e5319 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 a4055da5db8f..ff95797652aa 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 64f93d260724..42527b1c6b1f 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 f8217350230a..561df1f69635 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 85c2a0718b9a..bd7242195425 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 0fe7f1d4ec4e..f5e4b16fee26 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 82b7468b8234..f27ca9634826 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 ba7a538f971b..b24524176824 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 2118eff045fc..f2118661b21b 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 1547038cad3d..b44179f0d4f8 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 f97ec06f005b..2f728ddfe9ee 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 64f57ecb566e..08962f044d4f 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 fb9d0c9d85cf..a0362c11f8e2 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 099ce7e6a6e9..bf8496c3d7fa 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 827b47e79157..e8136298ec38 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 a5770486eb9d..2e8fe9d531c6 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;