summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-26 10:18:14 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-03-27 09:36:53 +0100
commitaa753f01ba4631614bb88ee7d3a3e6b222208b3e (patch)
treec8b168e8e0619c387d30f206848ec30ca7238a00 /sd
parent2ea2860ba56231d989c5e1b8f87392921bc2a8db (diff)
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/typemap.cxx24
-rw-r--r--sd/source/filter/cgm/sdcgmfilter.cxx5
-rw-r--r--sd/source/filter/eppt/eppt.cxx3
-rw-r--r--sd/source/filter/eppt/epptso.cxx2
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx16
-rw-r--r--sd/source/filter/html/htmlex.cxx3
-rw-r--r--sd/source/ui/app/sddll2.cxx1
-rw-r--r--sd/source/ui/dlg/LayerTabBar.cxx3
-rw-r--r--sd/source/ui/dlg/PaneShells.cxx8
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx4
-rw-r--r--sd/source/ui/dlg/diactrl.cxx1
-rw-r--r--sd/source/ui/func/fulinend.cxx3
-rw-r--r--sd/source/ui/view/ViewTabBar.cxx2
-rw-r--r--sd/source/ui/view/drviewsh.cxx3
-rw-r--r--sd/source/ui/view/drviewsi.cxx4
-rw-r--r--sd/source/ui/view/tabcontr.cxx2
16 files changed, 0 insertions, 84 deletions
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx
index 69704ddfd9b0..446be74e343f 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -86,30 +86,6 @@
#include <svl/lckbitem.hxx>
-
-#define CharSetItem SfxUInt16Item
-#define FontFamilyItem SfxUInt16Item
-#define FontPitchItem SfxUInt16Item
-#define FontAlignItem SfxUInt16Item
-#define FontWeightItem SfxUInt16Item
-#define FontUnderlineItem SfxUInt16Item
-#define FontStrikeoutItem SfxUInt16Item
-#define FontItalicItem SfxUInt16Item
-#define SvxDbTypeItem SfxUInt16Item
-#define SvxLineSpaceItem SfxUInt16Item
-#define SvxInterLineSpaceItem SfxUInt16Item
-#define SvxBreakItem SfxUInt16Item
-#define BrushStyleItem SfxUInt16Item
-#define SvxNumTypeItem SfxUInt16Item
-#define SvxShadowLocationItem SfxUInt16Item
-#define SvxDbTypeItem SfxUInt16Item
-#define SvxDrawToolEnumItem SfxUInt16Item
-#define SvxChooseControlItem SfxEnumItem
-#define SvxDrawToolItem SfxUInt16Item
-#define SvxCellHorJustifyEnumItem SfxUInt16Item
-#define SvxCellVerJustifyEnumItem SfxUInt16Item
-#define SvxCellOrientationEnumItem SfxUInt16Item
-#define SvxLanguage SfxUInt16Item
#define avmedia_MediaItem ::avmedia::MediaItem
#include <sfx2/tplpitem.hxx>
#include <svl/ptitem.hxx>
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 24a3d6d9bdc8..6ebd25fe4b54 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -31,15 +31,10 @@
#include "sdcgmfilter.hxx"
#define CGM_IMPORT_CGM 0x00000001
-#define CGM_IMPORT_IM 0x00000002
#define CGM_EXPORT_IMPRESS 0x00000100
-#define CGM_EXPORT_META 0x00000200
-#define CGM_EXPORT_COMMENT 0x00000400
-#define CGM_NO_PAD_BYTE 0x00010000
#define CGM_BIG_ENDIAN 0x00020000
-#define CGM_LITTLE_ENDIAN 0x00040000
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 5dfa305ebb29..aa10f3325868 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1355,10 +1355,7 @@ void PPTWriter::ImplWriteOLE( )
sal_Bool PPTWriter::ImplWriteAtomEnding()
{
-#define EPP_LastViewTypeNone 0
#define EPP_LastViewTypeSlideView 1
-#define EPP_LastViewTypeOutlineView 2
-#define EPP_LastViewTypeNotes 3
sal_uInt32 i, nPos, nOfs, nPersistOfs = mpStrm->Tell();
sal_uInt32 nPersistEntrys = 0;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index f543cdee6687..4965de7ba382 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -88,7 +88,6 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
/* Font Families */
-#define FF_DONTCARE 0x00
#define FF_ROMAN 0x10
#define FF_SWISS 0x20
#define FF_MODERN 0x30
@@ -99,7 +98,6 @@ using namespace ::com::sun::star;
#define DEFAULT_PITCH 0x00
#define FIXED_PITCH 0x01
-#define VARIABLE_PITCH 0x02
// ---------------------------------------------------------------------------------------------
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 85c3725d899b..7260f27467db 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -405,22 +405,6 @@ void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropert
pFS->endElementNS( XML_p, XML_bg );
}
-#define MINIMAL_SPTREE "<p:spTree>\
- <p:nvGrpSpPr>\
- <p:cNvPr id=\"1\" name=\"\"/>\
- <p:cNvGrpSpPr/>\
- <p:nvPr/>\
- </p:nvGrpSpPr>\
- <p:grpSpPr>\
- <a:xfrm>\
- <a:off x=\"0\" y=\"0\"/>\
- <a:ext cx=\"0\" cy=\"0\"/>\
- <a:chOff x=\"0\" y=\"0\"/>\
- <a:chExt cx=\"0\" cy=\"0\"/>\
- </a:xfrm>\
- </p:grpSpPr>\
- </p:spTree>"
-
#define MAIN_GROUP \
"<p:nvGrpSpPr>\
<p:cNvPr id=\"1\" name=\"\"/>\
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 034583e175fd..706b199745bb 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -91,12 +91,9 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::document;
-#define KEY_QUALITY "JPG-EXPORT-QUALITY"
-
// get parameter from Itemset
#define RESTOHTML( res ) StringToHTMLString(String(SdResId(res)))
-#define S2H( str ) StringToHTMLString( str )
const char *pButtonNames[] =
{
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index 25d39955425e..bc175b42711b 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -56,7 +56,6 @@
#include "sddll.hxx"
#include "sdmod.hxx"
-#define _SD_DIACTRL_CXX
#include "diactrl.hxx"
#include "gluectrl.hxx"
#include "tbx_ww.hxx"
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index 98eebefd9ee9..2587f2a41944 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -44,9 +44,6 @@
namespace sd {
-#define SWITCH_TIMEOUT 20
-
-
/**
* default constructor
*/
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index cbad03b29d65..5040a9614d41 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -31,8 +31,6 @@ namespace sd {
//===== LeftImpressPaneShell ==================================================
-#define ShellClass LeftImpressPaneShell
-
SFX_SLOTMAP(LeftImpressPaneShell)
{
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -66,9 +64,6 @@ LeftImpressPaneShell::~LeftImpressPaneShell (void)
//===== LeftDrawPaneShell =====================================================
-#undef ShellClass
-#define ShellClass LeftDrawPaneShell
-
SFX_SLOTMAP(LeftDrawPaneShell)
{
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -102,9 +97,6 @@ LeftDrawPaneShell::~LeftDrawPaneShell (void)
//===== ToolPanelPaneShell ========================================================
-#undef ShellClass
-#define ShellClass ToolPanelPaneShell
-
SFX_SLOTMAP( ToolPanelPaneShell )
{
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 2694218cdf2d..bc9b508feed2 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -27,10 +27,6 @@
#include "com/sun/star/deployment/DependencyException.hpp"
#include "com/sun/star/deployment/DeploymentException.hpp"
-#define USER_PACKAGE_MANAGER "user"
-#define SHARED_PACKAGE_MANAGER "shared"
-#define BUNDLED_PACKAGE_MANAGER "bundled"
-
using namespace ::com::sun::star;
namespace sd {
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index 0b2213cf2521..069dd4213b3a 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -24,7 +24,6 @@
#include "sdattr.hxx"
#include "strings.hrc"
-#define _SD_DIACTRL_CXX
#include "diactrl.hxx"
#include "sdresid.hxx"
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index efe9a3f29f09..531ecda3225f 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -35,9 +35,6 @@
namespace sd {
-#define BITMAP_WIDTH 32
-#define BITMAP_HEIGHT 12
-
TYPEINIT1( FuLineEnd, FuPoor );
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index a6c11e5215b3..167f2f752122 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -20,8 +20,6 @@
#include "ViewTabBar.hxx"
-#define USE_TAB_CONTROL
-
#include "ViewShell.hxx"
#include "ViewShellBase.hxx"
#include "DrawViewShell.hxx"
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index f7fcb2a5df9f..a732e475ca5e 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -45,9 +45,6 @@
namespace sd {
-#define TABCONTROL_INITIAL_SIZE 500
-
-
sal_Bool DrawViewShell::GotoBookmark(const String& rBookmark)
{
sal_Bool bRet = sal_False;
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index c64484fa5dd3..245d687fb5df 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -53,10 +53,6 @@ using namespace ::com::sun::star;
namespace sd {
-#define ATTR_MISSING 0 // Attribut nicht verfuegbar
-#define ATTR_MIXED 1 // Attribut uneindeutig (bei Mehrfachselektion)
-#define ATTR_SET 2 // Attribut eindeutig
-
#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue()
/**
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 9cfcea5dc629..5e926d349435 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -45,8 +45,6 @@
namespace sd {
-#define SWITCH_TIMEOUT 20
-
// -----------------------------------------
// - SdTabControl::SdPageObjsTransferable -
// -----------------------------------------