summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-23 09:47:48 +0200
committerNoel Grandin <noel@peralex.com>2015-01-08 10:39:36 +0200
commit45ec1d9b56cec41596f806ebf845ebfcd30c9f46 (patch)
treee368da6d3ae2c8a5c8e214b99dd0f95861d0fc78 /svx
parent0748a5f8298e2ea817e131234f5e99300ed7f9f7 (diff)
brute-force find-and-remove of unused #define constants.
Change-Id: I7223530ae37297a76654cd00cc1fedb56dbe3adb
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/galobj.hxx7
-rw-r--r--svx/inc/helpid.hrc2
-rw-r--r--svx/source/form/formcontroller.cxx17
-rw-r--r--svx/source/inc/datanavi.hrc2
-rw-r--r--svx/source/inc/docrecovery.hxx1
-rw-r--r--svx/source/inc/fmprop.hrc22
6 files changed, 7 insertions, 44 deletions
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 6b960e0986c7..bf7abafc786f 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -27,13 +27,6 @@
#define S_THUMB 80
-#define SGA_FORMAT_NONE 0x00000000L
-#define SGA_FORMAT_STRING 0x00000001L
-#define SGA_FORMAT_GRAPHIC 0x00000010L
-#define SGA_FORMAT_SOUND 0x00000100L
-#define SGA_FORMAT_OLE 0x00001000L
-#define SGA_FORMAT_SVDRAW 0x00010000L
-#define SGA_FORMAT_ALL 0xFFFFFFFFL
enum GalSoundType
{
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 52ce367836c4..82269b1c8da7 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -91,8 +91,6 @@
#define HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS "SVX_HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS"
#define HID_PPROPERTYPANEL_LINE_VS_WIDTH "SVX_HID_PPROPERTYPANEL_LINE_VS_WIDTH"
#define HID_PPROPERTYPANEL_LINE_MTR_WIDTH "SVX_HID_PPROPERTYPANEL_LINE_MTR_WIDTH"
-#define HID_PPROPERTYPANEL_LINE_VS_STYLE "SVX_HID_PPROPERTYPANEL_LINE_VS_STYLE"
-#define HID_PPROPERTYPANEL_LINE_BTN_STYLE "SVX_HID_PPROPERTYPANEL_LINE_BTN_STYLE"
#define HID_PPROPERTYPANEL_TEXT_SPACING_VS "SVX_HID_PPROPERTYPANEL_TEXT_SPACING_VS"
#define HID_PPROPERTYPANEL_AREA_LB_FILL_TYPES "SVX_HID_PPROPERTYPANEL_AREA_LB_FILL_TYPES"
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index a253efd05d28..725326cd22fa 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -868,14 +868,6 @@ Reference< XPropertySetInfo > FormController::getPropertySetInfo() throw( Runti
}
-#define DECL_PROP_CORE(varname, type) \
-pDesc[nPos++] = Property(FM_PROP_##varname, FM_ATTR_##varname, ::getCppuType((const type*)0),
-
-
-#define DECL_PROP1(varname, type, attrib1) \
- DECL_PROP_CORE(varname, type) PropertyAttribute::attrib1)
-
-
void FormController::fillProperties(
Sequence< Property >& /* [out] */ _rProps,
Sequence< Property >& /* [out] */ /*_rAggregateProps*/
@@ -884,8 +876,13 @@ void FormController::fillProperties(
_rProps.realloc(2);
sal_Int32 nPos = 0;
Property* pDesc = _rProps.getArray();
- DECL_PROP1(FILTER, OUString, READONLY);
- DECL_PROP1(FORM_OPERATIONS, Reference< XFormOperations >, READONLY);
+
+ pDesc[nPos++] = Property(FM_PROP_FILTER, FM_ATTR_FILTER,
+ ::getCppuType((const OUString*)0),
+ PropertyAttribute::READONLY);
+ pDesc[nPos++] = Property(FM_PROP_FORM_OPERATIONS, FM_ATTR_FORM_OPERATIONS,
+ ::getCppuType((const Reference< XFormOperations >*)0),
+ PropertyAttribute::READONLY);
}
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index 2168994641dd..5a13af57629a 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -47,8 +47,6 @@
#define IID_TEXT 5
#define IID_OTHER 6
-#define STR_HEADER_PREFIX 10
-#define STR_HEADER_URL 11
#endif //_SVX_DATANAVI_HRC
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index b3b095378ed7..5d41f28ac598 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -71,7 +71,6 @@
#define DLG_RET_UNKNOWN -1
#define DLG_RET_OK 1
#define DLG_RET_CANCEL 0
-#define DLG_RET_BACK 100
#define DLG_RET_OK_AUTOLUNCH 101
diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc
index 18013b653fe2..7e602301eb5e 100644
--- a/svx/source/inc/fmprop.hrc
+++ b/svx/source/inc/fmprop.hrc
@@ -107,11 +107,6 @@
#define FM_PROP_FILTERPROPOSAL "UseFilterValueProposal"
#define FM_PROP_FIELDSOURCE "FieldSource"
#define FM_PROP_TABLENAME "TableName"
-#define FM_PROP_FILTERSUPPLIER "FilterSupplier"
-#define FM_PROP_CURRENTFILTER "CurrentFilter"
-#define FM_PROP_SELECTED_FIELDS "SelectedFields"
-#define FM_PROP_SELECTED_TABLES "SelectedTables"
-#define FM_PROP_THREADSAFE "ThreadSafe"
#define FM_PROP_CONTROLLABEL "LabelControl"
#define FM_PROP_CURSORCOLOR "CursorColor"
#define FM_PROP_ALWAYSSHOWCURSOR "AlwaysShowCursor"
@@ -131,30 +126,13 @@
#define FM_PROP_ISCURRENCY "IsCurrency"
#define FM_PROP_URL "URL"
#define FM_PROP_ACTIVE_CONNECTION "ActiveConnection"
-#define FM_PROP_SORT "Order"
#define FM_PROP_CONTROLSOURCEPROPERTY "DataFieldProperty"
#define FM_PROP_REALNAME "RealName"
#define FM_PROP_TEXTLINECOLOR "TextLineColor"
#define FM_PROP_FONTEMPHASISMARK "FontEmphasisMark"
#define FM_PROP_FONTRELIEF "FontRelief"
-#define FM_PROP_SCROLLVALUE_MIN "ScrollValueMin"
-#define FM_PROP_SCROLLVALUE_MAX "ScrollValueMax"
-#define FM_PROP_DEFAULT_SCROLLVALUE "DefaultScrollValue"
-#define FM_PROP_LINEINCREMENT "LineIncrement"
-#define FM_PROP_BLOCKINCREMENT "BlockIncrement"
#define FM_PROP_ORIENTATION "Orientation"
-#define FM_PROP_REPEAT "Repeat"
-#define FM_PROP_REPEATDELAY "RepeatDelay"
-#define FM_PROP_SYMBOLCOLOR "SymbolColor"
-#define FM_PROP_VISIBILESIZE "VisibleSize"
-#define FM_PROP_SPINVALUE_MIN "SpinValueMin"
-#define FM_PROP_SPINVALUE_MAX "SpinValueMax"
-#define FM_PROP_DEFAULT_SPINVALUE "DefaultSpinValue"
-#define FM_PROP_SPININCREMENT "SpinIncrement"
#define FM_PROP_LINEENDFORMAT "LineEndFormat"
-#define FM_PROP_TOGGLE "Toggle"
-#define FM_PROP_FOCUSONCLICK "FocusOnClick"
-#define FM_PROP_HIDEINACTIVESELECTION "HideInactiveSelection"
#define FM_PROP_VISUALEFFECT "VisualEffect"
#define FM_PROP_BORDERCOLOR "BorderColor"
#define FM_PROP_DYNAMIC_CONTROL_BORDER "DynamicControlBorder"