diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-06-25 10:52:10 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-06-25 14:12:57 +0200 |
| commit | 66cd9eeb90869b88ab883eab367a39041f21aef0 (patch) | |
| tree | 5626a9f3422d5bd36d026ab0570228e57c94e01e | |
| parent | ee60fab03b743a151508608265abe45e5a731e97 (diff) | |
Remove various commented out defines
Most of them in hrc files.
Change-Id: I3944f6ed9befd2b498385f61b851790362221a4f
56 files changed, 0 insertions, 467 deletions
diff --git a/basctl/source/inc/svheader.hxx b/basctl/source/inc/svheader.hxx index 05f68b33c605..6becbabf0dcd 100644 --- a/basctl/source/inc/svheader.hxx +++ b/basctl/source/inc/svheader.hxx @@ -26,13 +26,8 @@ #define _CURSOR_HXX #define _FONTDLG_HXX #define _PRVWIN_HXX -//#define _SELENG_HXX #define _VIRTDEV_HXX -// For Brkdlg without PCH: -// #define _SPIN_HXX -// #define _FIELD_HXX - // SVTOOLS #define _CTRLBOX_HXX #define _EXTATTR_HXX @@ -50,12 +45,9 @@ #define _INTRO_HXX #define _SFXMSGDESCR_HXX #define _SFXMSGPOOL_HXX -// #define _PASSWD_HXX #define _SFXMNUMGR_HXX // SFXDLG -// #define _SFXTABDLG_HXX -// #define _SFX_DINFDLG_HXX #define _SFX_MGETEMPL_HXX #define _SFX_STYLEDLG_HXX #define _SFX_TPLPITEM_HXX @@ -66,8 +58,6 @@ #define _SFXNEW_HXX // SFXDOC -// #define _SFXDOCINF_HXX -//#define _SFX_DOCFILT_HXX #define _SFX_IPFRM_HXX #define _SFX_INTERNO_HXX diff --git a/basic/inc/basic/sberrors.hxx b/basic/inc/basic/sberrors.hxx index 26da416d76cf..f287f3afca88 100644 --- a/basic/inc/basic/sberrors.hxx +++ b/basic/inc/basic/sberrors.hxx @@ -194,7 +194,6 @@ typedef sal_uIntPtr SbError; #define ERRCODE_BASIC_UNEXPECTED ((LAST_SBX_ERROR_ID+63UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Unexpected symbol: xx -// #define ERRCODE_BASIC_COMPILER_BGN ERRCODE_BASIC_UNEXPECTED #define ERRCODE_BASIC_EXPECTED ((LAST_SBX_ERROR_ID+64UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Expected: xx #define ERRCODE_BASIC_SYMBOL_EXPECTED ((LAST_SBX_ERROR_ID+65UL) | ERRCODE_AREA_SBX | \ @@ -373,7 +372,6 @@ typedef sal_uIntPtr SbError; #define SbERR_METHOD_FAILED ERRCODE_BASIC_METHOD_FAILED #define SbERR_SETPROP_FAILED ERRCODE_BASIC_SETPROP_FAILED #define SbERR_GETPROP_FAILED ERRCODE_BASIC_GETPROP_FAILED -// #define SbERR_COMPILER_BGN ERRCODE_BASIC_COMPILER_BGN #define SbERR_UNEXPECTED ERRCODE_BASIC_UNEXPECTED #define SbERR_EXPECTED ERRCODE_BASIC_EXPECTED #define SbERR_SYMBOL_EXPECTED ERRCODE_BASIC_SYMBOL_EXPECTED @@ -411,142 +409,6 @@ typedef sal_uIntPtr SbError; #define SbERR_BASIC_OPER_NOT_PERFORM ERRCODE_BASIC_OPER_NOT_PERFORM #define SbERR_BASIC_TOO_MANY_DLL ERRCODE_BASIC_TOO_MANY_DLL #define SbERR_BASIC_LOOP_NOT_INIT ERRCODE_BASIC_LOOP_NOT_INIT -// #define SbERR_COMPILER_END ERRCODE_BASIC_COMPILER_END - -/* ALT -#define SbERR_SYNTAX 2 // unspecified syntax error -#define SbERR_NO_GOSUB 3 // Return without Gosub -#define SbERR_REDO_FROM_START 4 // Redo form start (SB internal) -#define SbERR_BAD_ARGUMENT 5 // Invalid procedure call -#define SbERR_MATH_OVERFLOW 6 // Overflow -#define SbERR_NO_MEMORY 7 // Out of memory -#define SbERR_ALREADY_DIM 8 // Array already dimensioned -#define SbERR_OUT_OF_RANGE 9 // Subscript out of range -#define SbERR_DUPLICATE_DEF 10 // Duplicate definition -#define SbERR_ZERODIV 11 // Division by zero -#define SbERR_VAR_UNDEFINED 12 // Variable undefined (SB) -#define SbERR_CONVERSION 13 // Type mismatch -#define SbERR_BAD_PARAMETER 14 // Invalid Parameter -#define SbERR_USER_ABORT 18 // User interrupt occurred -#define SbERR_BAD_RESUME 20 // Resume without error -#define SbERR_STACK_OVERFLOW 28 // Out of stack space -#define SbERR_PROC_UNDEFINED 35 // Sub or Function not defined -#define SbERR_BAD_DLL_LOAD 48 // Error in loading DLL -#define SbERR_BAD_DLL_CALL 49 // Bad DLL calling convention -#define SbERR_INTERNAL_ERROR 51 // internal error -#define SbERR_BAD_CHANNEL 52 // Bad file name or number -#define SbERR_FILE_NOT_FOUND 53 // File not found -#define SbERR_BAD_FILE_MODE 54 // Bad file mode -#define SbERR_FILE_ALREADY_OPEN 55 // File already open -#define SbERR_IO_ERROR 57 // Device I/O error -#define SbERR_FILE_EXISTS 58 // File already exists -#define SbERR_BAD_RECORD_LENGTH 59 // bad record length -#define SbERR_DISK_FULL 61 // disk full -#define SbERR_READ_PAST_EOF 62 // Input past end of file -#define SbERR_BAD_RECORD_NUMBER 63 // Bad record number -#define SbERR_TOO_MANY_FILES 67 // Too many files -#define SbERR_NO_DEVICE 68 // Device not available -#define SbERR_ACCESS_DENIED 70 // Permission denied -#define SbERR_NOT_READY 71 // Disk not ready -#define SbERR_NOT_IMPLEMENTED 73 // Feature not implemented -#define SbERR_DIFFERENT_DRIVE 74 // No rename with different drive -#define SbERR_ACCESS_ERROR 75 // Path/File access error -#define SbERR_PATH_NOT_FOUND 76 // Path not found -#define SbERR_NO_OBJECT 91 // Object variable not set -#define SbERR_BAD_PATTERN 93 // Invalid pattern string -#define SBERR_IS_NULL 94 // Invalid use of Null - -// DDE messages from 250-299 -#define SbERR_DDE_ERROR 250 -#define SbERR_DDE_WAITINGACK 280 -#define SbERR_DDE_OUTOFCHANNELS 281 -#define SbERR_DDE_NO_RESPONSE 282 -#define SbERR_DDE_MULT_RESPONSES 283 -#define SbERR_DDE_CHANNEL_LOCKED 284 -#define SbERR_DDE_NOTPROCESSED 285 -#define SbERR_DDE_TIMEOUT 286 -#define SbERR_DDE_USER_INTERRUPT 287 -#define SbERR_DDE_BUSY 288 -#define SbERR_DDE_NO_DATA 289 -#define SbERR_DDE_WRONG_DATA_FORMAT 290 -#define SbERR_DDE_PARTNER_QUIT 291 -#define SbERR_DDE_CONV_CLOSED 292 -#define SbERR_DDE_NO_CHANNEL 293 -#define SbERR_DDE_INVALID_LINK 294 -#define SbERR_DDE_QUEUE_OVERFLOW 295 -#define SbERR_DDE_LINK_ALREADY_EST 296 -#define SbERR_DDE_LINK_INV_TOPIC 297 -#define SbERR_DDE_DLL_NOT_FOUND 298 - -#define SbERR_CANNOT_LOAD 323 // Can't load module -#define SbERR_BAD_INDEX 341 // Invalid object index -#define SbERR_NO_ACTIVE_OBJECT 366 // No active view or document -#define SbERR_BAD_PROP_VALUE 380 // Bad property value -#define SbERR_PROP_READONLY 382 // Property is read only -#define SbERR_PROP_WRITEONLY 394 // Property is write only -#define SbERR_INVALID_OBJECT 420 // Invalid object reference -#define SbERR_NO_METHOD 423 // Property or method not found -#define SbERR_NEEDS_OBJECT 424 // Object required -#define SbERR_INVALID_USAGE_OBJECT 425 // Invalid usee of object -#define SbERR_NO_OLE 430 // Class does not support OLE -#define SbERR_BAD_METHOD 438 // Object doesn't support method -#define SbERR_OLE_ERROR 440 // OLE Automation error -#define SbERR_BAD_ACTION 445 // Object doesn't support this action -#define SbERR_NO_NAMED_ARGS 446 // Object doesn't support named args -#define SbERR_BAD_LOCALE 447 // Object doesn't support current locale setting -#define SbERR_NAMED_NOT_FOUND 448 // Named argument not found -#define SbERR_NOT_OPTIONAL 449 // Argument not optional -#define SbERR_WRONG_ARGS 450 // Wrong number of arguments -#define SbERR_NOT_A_COLL 451 // Object not a collection -#define SbERR_BAD_ORDINAL 452 // Invalid ordinal -#define SbERR_DLLPROC_NOT_FOUND 453 // Specified DLL function not found -#define SbERR_BAD_CLIPBD_FORMAT 460 // Invalid clipboard format - -// Debugger messages from 700-799 - -#define SbERR_PROPERTY_NOT_FOUND 1000 // Class not have property -#define SbERR_METHOD_NOT_FOUND 1001 // Class does not have method -#define SbERR_ARG_MISSING 1002 // Missing required argument -#define SbERR_BAD_NUMBER_OF_ARGS 1003 // Bad number of arguments -#define SbERR_METHOD_FAILED 1004 // Method failed -#define SbERR_SETPROP_FAILED 1005 // Unable to set property -#define SbERR_GETPROP_FAILED 1006 // Unable to get property - -// Compiler Errors (do not happen at runtime) -// These IDs can shift at any time - -#define SbERR_COMPILER_BGN 950 -#define SbERR_UNEXPECTED 951 // Unexpected symbol: xx -#define SbERR_EXPECTED 952 // Expected: xx -#define SbERR_SYMBOL_EXPECTED 953 // Symbol expected -#define SbERR_VAR_EXPECTED 954 // Variable expected -#define SbERR_LABEL_EXPECTED 955 // Label expected -#define SbERR_LVALUE_EXPECTED 956 // Lvalue expected -#define SbERR_VAR_DEFINED 957 // Variable xxx already defined -#define SbERR_PROC_DEFINED 958 // Procedure xx already defined -#define SbERR_LABEL_DEFINED 959 // Label xxx already defined -#define SbERR_UNDEF_VAR 960 // Variable xx undefined -#define SbERR_UNDEF_ARRAY 961 // Array or function xx undefined -#define SbERR_UNDEF_PROC 962 // Procedure xxx undefined -#define SbERR_UNDEF_LABEL 963 // Label xxx undefined -#define SbERR_UNDEF_TYPE 964 // Unknown user defined type xxx -#define SbERR_BAD_EXIT 965 // Exit XXX expexted -#define SbERR_BAD_BLOCK 966 // Unterminated statement block: missing XX -#define SbERR_BAD_BRACKETS 967 // Parentheses do not match -#define SbERR_BAD_DECLARATION 968 // Symbol xx defined differently -#define SbERR_BAD_PARAMETERS 969 // Parameters do not match -#define SbERR_BAD_CHAR_IN_NUMBER 970 // Bad character in number -#define SbERR_MUST_HAVE_DIMS 971 // Array needs dimensioning -#define SbERR_NO_IF 972 // Else/Endif without If -#define SbERR_NOT_IN_SUBR 973 // xxx not allowed within a sub -#define SbERR_NOT_IN_MAIN 974 // xxx not allowed outside a sub -#define SbERR_WRONG_DIMS 975 // Dimensions do not match -#define SbERR_BAD_OPTION 976 // Unknown option: xxx -#define SbERR_CONSTANT_REDECLARED 977 // Constant xx redeclared -#define SbERR_PROG_TOO_LARGE 978 // Program is too large -#define SbERR_NO_STRINGS_ARRAYS 979 -#define SbERR_COMPILER_END 299 -*/ // Grid messages from 30000-30999 // OLE messages from 31000-31999 diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc index 04fc6072c974..e0d45ebc3429 100644 --- a/basic/inc/sb.hrc +++ b/basic/inc/sb.hrc @@ -28,11 +28,4 @@ #define IDS_SBERR_TERMINATED IDS_SBERR_START+2000 #define IDS_SBERR_STOREREF IDS_SBERR_START+2001 -// #define IDS_SBERR_LIBLOAD IDS_SBERR_START+2002 -// #define IDS_SBERR_LIBSAVE IDS_SBERR_START+2003 -// #define IDS_SBERR_MGROPEN IDS_SBERR_START+2004 -// #define IDS_SBERR_MGRSAVE IDS_SBERR_START+2005 -// #define IDS_SBERR_REMOVELIB IDS_SBERR_START+2006 -// #define IDS_SBERR_UNLOADLIB IDS_SBERR_START+2007 - #endif diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx index 0d6f1be979f3..2b582be6c48d 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx @@ -72,15 +72,6 @@ namespace pq_sdbc_driver { -// static const sal_Int32 RESULTSET_CURSOR_NAME = 0; -// static const sal_Int32 RESULTSET_ESCAPE_PROCESSING = 1; -// static const sal_Int32 RESULTSET_FETCH_DIRECTION = 2; -// static const sal_Int32 RESULTSET_FETCH_SIZE = 3; -// static const sal_Int32 RESULTSET_RESULT_SET_CONCURRENCY = 4; -// static const sal_Int32 RESULTSET_RESULT_SET_TYPE = 5; - -//#define RESULTSET_SIZE 6 - class SequenceResultSet : public BaseResultSet { protected: diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 94836fa21310..e6f432e64da7 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -60,7 +60,6 @@ #define DIFF(v1,v2) (v2-v1) #define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -//#define OFFS_PUSHBUTTON_FIXEDTEXT(base) (base+(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) #define ROW_MF_SCALING (13) #define ROW_FT_ICONSIZESTYLE (ROW_MF_SCALING+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) @@ -106,12 +105,6 @@ #define FT_MACRORECORDER 19 #define CB_MACRORECORDER 20 -//#define FL_FILEDLG 20 -//#define CB_FILEDLG 21 - -//#define FL_DOCSTATUS 30 -//#define CB_DOCSTATUS 31 - #define FL_TWOFIGURE 40 #define FT_INTERPRET 41 #define NF_YEARVALUE 42 diff --git a/cui/source/options/webconninfo.hrc b/cui/source/options/webconninfo.hrc index ce0270b3658a..663d004de6a8 100644 --- a/cui/source/options/webconninfo.hrc +++ b/cui/source/options/webconninfo.hrc @@ -25,7 +25,6 @@ #define PB_REMOVEALL 13 #define PB_CHANGE 14 #define FL_BUTTONS 15 -// #define PB_OK 16 #define PB_CLOSE 17 #define PB_HELP 18 diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc index 2fb3827af0ed..408aedd8b7a5 100644 --- a/cui/source/tabpages/align.hrc +++ b/cui/source/tabpages/align.hrc @@ -45,8 +45,6 @@ #define LB_FRAMEDIR 44 #define BTN_SHRINK 45 -//#define ED_INDENT1 100 - // list box indexes #define ALIGNDLG_HORALIGN_STD 0 #define ALIGNDLG_HORALIGN_LEFT 1 diff --git a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx index 8940bdc5a9d4..2b8e97ebd27c 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx @@ -24,7 +24,6 @@ // define ranges for other libraries #define PRIMITIVE3D_ID_RANGE_DRAWINGLAYER (0 << 16) -// #define PRIMITIVE3D_ID_RANGE_SVX (1 << 16) ////////////////////////////////////////////////////////////////////////////// // local primitives diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx index 39450d56775a..7dc8824ffde2 100644 --- a/embedserv/source/embed/ed_idataobj.cxx +++ b/embedserv/source/embed/ed_idataobj.cxx @@ -20,20 +20,8 @@ #pragma warning(disable : 4917 4555) #endif -// actually this workaround should be in presys.h! -//#define UINT64 USE_WIN_UINT64 -//#define INT64 USE_WIN_INT64 -//#define UINT32 USE_WIN_UINT32 -//#define INT32 USE_WIN_INT32 - #include "embeddoc.hxx" -//#undef UINT64 -//#undef INT64 -//#undef UINT32 -//#undef INT32 - - #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> diff --git a/extensions/source/nsplugin/source/so_env.hxx b/extensions/source/nsplugin/source/so_env.hxx index 5da85f23c467..d8960e542e0f 100644 --- a/extensions/source/nsplugin/source/so_env.hxx +++ b/extensions/source/nsplugin/source/so_env.hxx @@ -61,7 +61,6 @@ #define SECTION_NAME "Versions" #define SOFFICE_VERSION "StarOffice 8" -//#define SOFFICE_VERSION "SunShine Office 1.0" #define APP_ERROR 1 #define APP_CHAR 2 diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx index b3ee2a6b6ce9..f47079ef1bcb 100644 --- a/extensions/source/ole/unoobjw.hxx +++ b/extensions/source/ole/unoobjw.hxx @@ -39,7 +39,6 @@ #include "ole2uno.hxx" #include "unoconversionutilities.hxx" -//#define INVOCATION_SERVICE L"com.sun.star.script.Invocation" #define JSCRIPT_VALUE_FUNC L"_GetValueObject" #define GET_STRUCT_FUNC L"_GetStruct" #define BRIDGE_VALUE_FUNC L"Bridge_GetValueObject" diff --git a/formula/source/ui/dlg/parawin.hrc b/formula/source/ui/dlg/parawin.hrc index fba1d4b9496c..f340e6320cd3 100644 --- a/formula/source/ui/dlg/parawin.hrc +++ b/formula/source/ui/dlg/parawin.hrc @@ -16,8 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// #define RID_SCTAB_PARAMETER 256 - #define FT_PARNAME 1 #define FT_PARDESC 2 #define FT_EDITDESC 3 diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index db320ebc9782..26d37081c2e5 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -85,7 +85,6 @@ namespace framework{ #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 DEFAULT_FILTERCACHE_MODE CONFIG_MODE_DELAYED_UPDATE /// 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 diff --git a/framework/inc/services.h b/framework/inc/services.h index 413659269306..f5ab413d0c94 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -124,17 +124,10 @@ namespace framework{ #define IMPLEMENTATIONNAME_FRAME DECLARE_ASCII("com.sun.star.comp.framework.Frame" ) #define IMPLEMENTATIONNAME_DESKTOP DECLARE_ASCII("com.sun.star.comp.framework.Desktop" ) #define IMPLEMENTATIONNAME_TASK DECLARE_ASCII("com.sun.star.comp.framework.Task" ) -//#define IMPLEMENTATIONNAME_FRAMELOADERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.FrameLoaderFactory" ) -//#define IMPLEMENTATIONNAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.FilterFactory" ) #define IMPLEMENTATIONNAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer" ) -// #define IMPLEMENTATIONNAME_PLUGINFRAME DECLARE_ASCII("com.sun.star.comp.framework.PluginFrame" ) #define IMPLEMENTATIONNAME_GENERICFRAMELOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" ) #define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper") -//#define IMPLEMENTATIONNAME_LOGINDIALOG DECLARE_ASCII("com.sun.star.comp.framework.LoginDialog" ) -//#define IMPLEMENTATIONNAME_TYPEDETECTION DECLARE_ASCII("com.sun.star.comp.framework.TypeDetection" ) -//#define IMPLEMENTATIONNAME_DOCUMENTPROPERTIES DECLARE_ASCII("com.sun.star.comp.framework.DocumentProperties" ) #define IMPLEMENTATIONNAME_OXT_HANDLER DECLARE_ASCII("com.sun.star.comp.framework.OXTFileHandler" ) -//#define IMPLEMENTATIONNAME_CONTENTHANDLERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.ContentHandlerFactory" ) #define IMPLEMENTATIONNAME_SFXTERMINATOR DECLARE_ASCII("com.sun.star.comp.sfx2.SfxTerminateListener" ) #define IMPLEMENTATIONNAME_PIPETERMINATOR DECLARE_ASCII("com.sun.star.comp.OfficeIPCThreadController" ) #define IMPLEMENTATIONNAME_QUICKLAUNCHER DECLARE_ASCII("com.sun.star.comp.desktop.QuickstartWrapper" ) @@ -149,13 +142,11 @@ namespace framework{ #define IMPLEMENTATIONNAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.comp.framework.PathSettings" ) #define IMPLEMENTATIONNAME_JOBDISPATCH DECLARE_ASCII("com.sun.star.comp.framework.jobs.JobDispatch" ) #define IMPLEMENTATIONNAME_DISPATCHHELPER DECLARE_ASCII("com.sun.star.comp.framework.services.DispatchHelper" ) -//#define IMPLEMENTATIONNAME_DETECTORFACTORY DECLARE_ASCII("com.sun.star.comp.framework.DetectorFactory" ) #define IMPLEMENTATIONNAME_LAYOUTMANAGER DECLARE_ASCII("com.sun.star.comp.framework.LayoutManager" ) #define IMPLEMENTATIONNAME_POPUPMENUCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.PopupMenuControllerFactory" ) #define IMPLEMENTATIONNAME_MACROSMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.MacrosMenuController" ) #define IMPLEMENTATIONNAME_FONTMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.FontMenuController" ) #define IMPLEMENTATIONNAME_FONTSIZEMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.FontSizeMenuController" ) -// #define IMPLEMENTATIONNAME_FORMATMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.FormatMenuController" ) #define IMPLEMENTATIONNAME_OBJECTMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.ObjectMenuController" ) #define IMPLEMENTATIONNAME_HEADERMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.HeaderMenuController" ) #define IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.FooterMenuController" ) diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index dd202afcb0e4..ee88be39c325 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -41,17 +41,11 @@ // interface includes #include <com/sun/star/configuration/CorruptedUIConfigurationException.hpp> - #include <com/sun/star/container/NoSuchElementException.hpp> - #include <com/sun/star/container/XNameAccess.hpp> - #include <com/sun/star/beans/XPropertySet.hpp> - #include <com/sun/star/embed/ElementModes.hpp> - #include <com/sun/star/embed/XTransactedObject.hpp> - #include <com/sun/star/lang/XSingleServiceFactory.hpp> //_______________________________________________ @@ -71,8 +65,6 @@ #define RELPATH_SHARE_LAYER DECLARE_ASCII("soffice.cfg") #define RELPATH_USER_LAYER DECLARE_ASCII("soffice.cfg") -// #define RELPATH_SHARE_LAYER DECLARE_ASCII("soffice.cfg/uiconfig.zip") -// #define RELPATH_USER_LAYER DECLARE_ASCII("soffice.cfg/uiconfig.zip") #define FILE_EXTENSION DECLARE_ASCII(".xml") diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 34e6918f5182..2e32656dae77 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -48,8 +48,6 @@ namespace com { namespace sun { namespace star { namespace i18n { #define ERROR ::com::sun::star::uno::RuntimeException() -//#define ImplementName "com.sun.star.i18n.BreakIterator_Unicode"; - BreakIterator_Unicode::BreakIterator_Unicode() : cBreakIterator( "com.sun.star.i18n.BreakIterator_Unicode" ), // implementation name diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx index 659e5dacea1b..fa53d8efe70d 100644 --- a/registry/source/reflcnst.hxx +++ b/registry/source/reflcnst.hxx @@ -64,12 +64,10 @@ extern const sal_uInt16 majorVersion; #define FIELD_OFFSET_VALUE (FIELD_OFFSET_TYPE + sizeof(sal_uInt16)) #define FIELD_OFFSET_DOKU (FIELD_OFFSET_VALUE + sizeof(sal_uInt16)) #define FIELD_OFFSET_FILENAME (FIELD_OFFSET_DOKU + sizeof(sal_uInt16)) -//#define FIELD_ENTRY_SIZE (FIELD_OFFSET_FILENAME + sizeof(sal_uInt16)) #define PARAM_OFFSET_TYPE 0 #define PARAM_OFFSET_MODE (PARAM_OFFSET_TYPE + sizeof(sal_uInt16)) #define PARAM_OFFSET_NAME (PARAM_OFFSET_MODE + sizeof(sal_uInt16)) -//#define PARAM_ENTRY_SIZE (PARAM_OFFSET_NAME + sizeof(sal_uInt16)) #define METHOD_OFFSET_SIZE 0 #define METHOD_OFFSET_MODE (METHOD_OFFSET_SIZE + sizeof(sal_uInt16)) @@ -77,13 +75,11 @@ extern const sal_uInt16 majorVersion; #define METHOD_OFFSET_RETURN (METHOD_OFFSET_NAME + sizeof(sal_uInt16)) #define METHOD_OFFSET_DOKU (METHOD_OFFSET_RETURN + sizeof(sal_uInt16)) #define METHOD_OFFSET_PARAM_COUNT (METHOD_OFFSET_DOKU + sizeof(sal_uInt16)) -//#define METHOD_OFFSET_PARAM(i) (METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (i * PARAM_ENTRY_SIZE)) #define REFERENCE_OFFSET_TYPE 0 #define REFERENCE_OFFSET_NAME (REFERENCE_OFFSET_TYPE + sizeof(sal_uInt16)) #define REFERENCE_OFFSET_DOKU (REFERENCE_OFFSET_NAME + sizeof(sal_uInt16)) #define REFERENCE_OFFSET_ACCESS (REFERENCE_OFFSET_DOKU + sizeof(sal_uInt16)) -//#define REFERENCE_ENTRY_SIZE (REFERENCE_OFFSET_ACCESS + sizeof(sal_uInt16)) enum CPInfoTag { diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index 3021e7021e5b..88ac501d4e3e 100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -96,49 +96,6 @@ extern "C" #define IP_VER 4 /// currently only IPv4 is considered. //------------------------------------------------------------------------ -// Ip port definition -//------------------------------------------------------------------------ -// #define IP_PORT_ZERO 0 -// #define IP_PORT_TELNET 23 -// #define IP_PORT_SMTP 25 -// #define IP_PORT_GOPHER 70 -// #define IP_PORT_POP3 110 -// #define IP_PORT_NETBIOS_DGM 138 -// #define IP_PORT_NETBIOS 139 -// #define IP_PORT_IMAP 143 -// #define IP_PORT_HTTPS 443 -// /**reference: http://www.iana.org/assignments/port-numbers */ -// #define IP_PORT_MYPORT 8881 //8888 -// #define IP_PORT_MYPORT1 8882 //8889 -// #define IP_PORT_MYPORT3 8884 //8891 -// #define IP_PORT_MYPORT4 8885 //8892 -// #define IP_PORT_MYPORT5 8886 //8893 -// #define IP_PORT_MYPORT6 8887 //8894 -// #define IP_PORT_MYPORT7 8895 -// #define IP_PORT_MYPORT8 8896 -// #define IP_PORT_MYPORT9 8897 -// #define IP_PORT_MYPORT10 8898 -// -// #define IP_PORT_TMP 9999 -// #define IP_PORT_INVAL 99999 - -//------------------------------------------------------------------------ -// service definitions. -//------------------------------------------------------------------------ -// OSLTEST_DECLARE( ServiceFTP, "ftp" ); -// OSLTEST_DECLARE( ServiceTELNET, "telnet" ); -// OSLTEST_DECLARE( ServiceGOPHER, "gopher" ); -// OSLTEST_DECLARE( ServiceIMAP, "imap" ); -// OSLTEST_DECLARE( ServiceHTTPS, "https" ); -// OSLTEST_DECLARE( ServiceNETBIOS, "netbios-dgm" ); - -//------------------------------------------------------------------------ -// protocol definitions. -//------------------------------------------------------------------------ -// OSLTEST_DECLARE( ProtocolTCP, "tcp" ); -// OSLTEST_DECLARE( ProtocolUDP, "udp" ); - -//------------------------------------------------------------------------ // Hostnames. //------------------------------------------------------------------------ // OSLTEST_DECLARE( HostName1, "localhost" ); diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index e528f2659f8e..a64ca396c3ec 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -32,11 +32,8 @@ #include <osl/time.h> #include <osl/diagnose.h> - #include <com/sun/star/test/XSimpleTest.hpp> - #include <com/sun/star/io/XOutputStream.hpp> - #include <com/sun/star/xml/sax/SAXParseException.hpp> #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> @@ -278,14 +275,6 @@ Reference< XInputStream > createStreamFromFile( - - - -// #define PCHAR_TO_OUSTRING(x) OStringToOUString(x,CHARSET_PC_1252) -// #define USTRING_TO_PCHAR(x) UStringToString(x,CHARSET_PC_437).GetStr() - - - class TestDocumentHandler : public WeakImplHelper3< XExtendedDocumentHandler , XEntityResolver , XErrorHandler > { diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 8464981caa23..8509272b721a 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -//#define _FUMORPH_PRIVATE #include "fumorph.hxx" #include <svx/xfillit.hxx> #include <svx/xlineit.hxx> diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index 22b72e7265d6..ae55f45efd1c 100644 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -140,10 +140,6 @@ sal_Bool FuZoom::MouseMove(const MouseEvent& rMEvt) Point aScroll = aBeginPos - aEndPos; - // #i2237# - // removed old stuff here which still forced zoom to be - // %BRUSH_SIZE which is outdated now - if (aScroll.X() != 0 || aScroll.Y() != 0) { Size aWorkSize = mpView->GetWorkArea().GetSize(); diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 367822ff0124..a9d127a86e2d 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -38,14 +38,6 @@ namespace sd { class ViewShell; -// Since we removed all old SV-stuff, there is no brush any more -// and so there is no BRUSH_SIZE defined in VCL. -// So I define it here -// #i2237# -// removed old stuff here which still forced zoom to be -// %BRUSH_SIZE which is outdated now -//#define BRUSH_SIZE 8 - /** An SdWindow contains the actual working area of ViewShell. <p>The zoom factor used by this class controls how much the page and the diff --git a/sd/source/ui/inc/present.hrc b/sd/source/ui/inc/present.hrc index 10b652b45db7..7d536f811695 100644 --- a/sd/source/ui/inc/present.hrc +++ b/sd/source/ui/inc/present.hrc @@ -54,5 +54,3 @@ #define STR_MONITOR 2 #define STR_ALL_MONITORS 3 -// #define CBX_ENDLESS 1 -// #define CBX_WINDOW_PRESENTATION 9 diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc index addb0c659f39..6127ac9508be 100644 --- a/sd/source/ui/inc/pubdlg.hrc +++ b/sd/source/ui/inc/pubdlg.hrc @@ -115,10 +115,6 @@ ////////////////////////////// -//#define PAGE6_PAGE_SND 128 - -////////////////////////////// - #define BUT_LAST 200 #define BUT_NEXT 201 #define BUT_FINISH 202 diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index de8ffd6632a0..7adefbf7f241 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -97,7 +97,6 @@ #define STR_IMPRESS (RID_APP_START+149) #define STR_IMPRESS_DOCUMENT (RID_APP_START+154) #define STR_LAYER (RID_APP_START+158) -// #define (RID_APP_START+159) #define STR_POPUP_DELETE_SNAPLINE (RID_APP_START+160) #define STR_POPUP_DELETE_SNAPPOINT (RID_APP_START+161) diff --git a/sd/source/ui/inc/tpoption.hrc b/sd/source/ui/inc/tpoption.hrc index 2feaba0cda55..6f93558014db 100644 --- a/sd/source/ui/inc/tpoption.hrc +++ b/sd/source/ui/inc/tpoption.hrc @@ -36,7 +36,6 @@ #define GRP_ORTHO 2 #define FT_SNAP_AREA 1 #define FT_BEZ_ANGLE 4 -//#define FT_METRIC 5 #define LB_METRIC 1 #define MTR_FLD_SNAP_AREA 1 #define MTR_FLD_ANGLE 2 diff --git a/sfx2/inc/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc index 7f1061a18d93..f28e0cd3a840 100644 --- a/sfx2/inc/filedlghelper.hrc +++ b/sfx2/inc/filedlghelper.hrc @@ -21,7 +21,6 @@ #include <sfx2/sfx.hrc> -//#define STR_SFX_IMPORT_ALL (RID_SFX_EXPLORER_START + 50) #define STR_CB_AUTO_EXTENSION (RID_SFX_EXPLORER_START + 51) #define STR_CB_SELECTION (RID_SFX_EXPLORER_START + 52) #define STR_CB_INSERT_AS_LINK (RID_SFX_EXPLORER_START + 53) diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index fbe6cba2d1db..1fa43e3f8108 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -61,9 +61,6 @@ #define SID_SETUPPRINTER (SID_SFX_START + 302) #define SID_EXITANDRETURN (SID_SFX_START + 303) -// SID_TITLE, this value below is given in chaos/cntids.hrc!! -//#define SID_TITLE (SID_SFX_START + 307) - #define SID_CONTEXT (SID_SFX_START + 310) #define SID_PASTE_SPECIAL (SID_SFX_START + 311) @@ -178,9 +175,6 @@ #define SID_BROWSER (SID_SFX_START + 1318) #define SID_MACROEXECMODE (SID_SFX_START + 1319) -// The Id value is given in chaos/cntids.hrc!! -//#define SID_INTERNET_ONLINE (SID_SFX_START + 1370) - #define SID_FILTER_DATA (SID_SFX_START + 1375) #define SID_EXPLORER_FILEPROPS_START (SID_SFX_START + 1390) @@ -207,8 +201,6 @@ #define SID_CREATE_BASICOBJECT (SID_SFX_START + 1555) #define SID_DELETE_BASICOBJECT (SID_SFX_START + 1556) -//#define SID_EXPLORER_CREATEPROJECT (SID_SFX_START + 1567) - #define SID_UPDATE_VERSION (SID_SFX_START + 1568) #define SID_BUILD_VERSION (SID_SFX_START + 1569) @@ -443,9 +435,6 @@ #define SID_COPY (SID_SFX_START + 711) #define SID_PASTE (SID_SFX_START + 712) -// Value below given in chaos/cntids.hrc!!! -//#define SID_DELETE (SID_SFX_START + 713) - #define SID_BACKSPACE (SID_SFX_START + 714) #define SID_FORMATPAINTBRUSH (SID_SFX_START + 715) #define SID_SELECT (SID_SFX_START + 720) diff --git a/svtools/inc/svtools/sores.hxx b/svtools/inc/svtools/sores.hxx index 3ff17296c422..869eed98d367 100644 --- a/svtools/inc/svtools/sores.hxx +++ b/svtools/inc/svtools/sores.hxx @@ -52,21 +52,12 @@ #define STR_FORMAT_STRING (STR_FORMAT_START + 1) #define STR_FORMAT_BITMAP (STR_FORMAT_START + 2) #define STR_FORMAT_GDIMETAFILE (STR_FORMAT_START + 3) - // #define STR_FORMAT_PRIVATE (STR_FORMAT_START + 4) - // #define STR_FORMAT_FILE (STR_FORMAT_START + 5) - // #define STR_FORMAT_FILE_LIST (STR_FORMAT_START + 6) #define STR_FORMAT_RTF (STR_FORMAT_START + 7) #define STR_FORMAT_ID_DRAWING (STR_FORMAT_START + 8) #define STR_FORMAT_ID_SVXB (STR_FORMAT_START + 9) - // #define STR_FORMAT_ID_SVIM (STR_FORMAT_START + 10) - // #define STR_FORMAT_ID_XFA (STR_FORMAT_START + 11) - // #define STR_FORMAT_ID_EDITENGINE (STR_FORMAT_START + 12) #define STR_FORMAT_ID_INTERNALLINK_STATE (STR_FORMAT_START + 13) #define STR_FORMAT_ID_SOLK (STR_FORMAT_START + 14) #define STR_FORMAT_ID_NETSCAPE_BOOKMARK (STR_FORMAT_START + 15) - // #define STR_FORMAT_ID_TREELISTBOX (STR_FORMAT_START + 16) - // #define STR_FORMAT_ID_NATIVE (STR_FORMAT_START + 17) - // #define STR_FORMAT_ID_OWNERLINK (STR_FORMAT_START + 18) #define STR_FORMAT_ID_STARSERVER (STR_FORMAT_START + 19) #define STR_FORMAT_ID_STAROBJECT (STR_FORMAT_START + 20) #define STR_FORMAT_ID_APPLETOBJECT (STR_FORMAT_START + 21) @@ -95,61 +86,19 @@ #define STR_FORMAT_ID_STARMATH_40 (STR_FORMAT_START + 44) #define STR_FORMAT_ID_STARMATH_50 (STR_FORMAT_START + 45) #define STR_FORMAT_ID_STAROBJECT_PAINTDOC (STR_FORMAT_START + 46) - // #define STR_FORMAT_ID_FILLED_AREA (STR_FORMAT_START + 47) #define STR_FORMAT_ID_HTML (STR_FORMAT_START + 48) #define STR_FORMAT_ID_HTML_SIMPLE (STR_FORMAT_START + 49) - // #define STR_FORMAT_ID_CHAOS (STR_FORMAT_START + 50) - // #define STR_FORMAT_ID_CNT_MSGATTACHFILE (STR_FORMAT_START + 51) #define STR_FORMAT_ID_BIFF_5 (STR_FORMAT_START + 52) #define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 53) #define STR_FORMAT_ID_SYLK (STR_FORMAT_START + 54) - // #define STR_FORMAT_ID_SYLK_BIGCAPS (STR_FORMAT_START + 55) #define STR_FORMAT_ID_LINK (STR_FORMAT_START + 56) #define STR_FORMAT_ID_DIF (STR_FORMAT_START + 57) - // #define STR_FORMAT_ID_STARDRAW_TABBAR (STR_FORMAT_START + 58) - // #define STR_FORMAT_ID_SONLK (STR_FORMAT_START + 59) #define STR_FORMAT_ID_MSWORD_DOC (STR_FORMAT_START + 60) #define STR_FORMAT_ID_STAR_FRAMESET_DOC (STR_FORMAT_START + 61) #define STR_FORMAT_ID_OFFICE_DOC (STR_FORMAT_START + 62) #define STR_FORMAT_ID_NOTES_DOCINFO (STR_FORMAT_START + 63) - // #define STR_FORMAT_ID_NOTES_HNOTE (STR_FORMAT_START + 64) - // #define STR_FORMAT_ID_NOTES_NATIVE (STR_FORMAT_START + 65) #define STR_FORMAT_ID_SFX_DOC (STR_FORMAT_START + 66) - // #define STR_FORMAT_ID_EVDF (STR_FORMAT_START + 67) - // #define STR_FORMAT_ID_ESDF (STR_FORMAT_START + 68) - // #define STR_FORMAT_ID_IDF (STR_FORMAT_START + 69) - // #define STR_FORMAT_ID_EFTP (STR_FORMAT_START + 70) - // #define STR_FORMAT_ID_EFD (STR_FORMAT_START + 71) - // #define STR_FORMAT_ID_SVX_FORMFIELDEXCH (STR_FORMAT_START + 72) - // #define STR_FORMAT_ID_EXTENDED_TABBAR (STR_FORMAT_START + 73) - // #define STR_FORMAT_ID_SBA_DATAEXCHANGE (STR_FORMAT_START + 74) - // #define STR_FORMAT_ID_SBA_FIELDDATAEXCHANGE (STR_FORMAT_START + 75) - // #define STR_FORMAT_ID_SBA_PRIVATE_URL (STR_FORMAT_START + 76) - // #define STR_FORMAT_ID_SBA_TABED (STR_FORMAT_START + 77) - // #define STR_FORMAT_ID_SBA_TABID (STR_FORMAT_START + 78) - // #define STR_FORMAT_ID_SBA_JOIN (STR_FORMAT_START + 79) - // #define STR_FORMAT_ID_OBJECTDESCRIPTOR (STR_FORMAT_START + 80) - // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR (STR_FORMAT_START + 81) - // #define STR_FORMAT_ID_EMBED_SOURCE (STR_FORMAT_START + 82) - // #define STR_FORMAT_ID_LINK_SOURCE (STR_FORMAT_START + 83) - // #define STR_FORMAT_ID_EMBEDDED_OBJ (STR_FORMAT_START + 84) - // #define STR_FORMAT_ID_FILECONTENT (STR_FORMAT_START + 85) #define STR_FORMAT_ID_FILEGRPDESCRIPTOR (STR_FORMAT_START + 86) - // #define STR_FORMAT_ID_FILENAME (STR_FORMAT_START + 87) - // #define STR_FORMAT_ID_SD_OLE (STR_FORMAT_START + 88) - // #define STR_FORMAT_ID_EMBEDDED_OBJ_OLE (STR_FORMAT_START + 89) - // #define STR_FORMAT_ID_EMBED_SOURCE_OLE (STR_FORMAT_START + 90) - // #define STR_FORMAT_ID_OBJECTDESCRIPTOR_OLE (STR_FORMAT_START + 91) - // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR_OLE (STR_FORMAT_START + 92) - // #define STR_FORMAT_ID_LINK_SOURCE_OLE (STR_FORMAT_START + 93) - // #define STR_FORMAT_ID_SBA_CTRLDATAEXCHANGE (STR_FORMAT_START + 94) - // #define STR_FORMAT_ID_OUTPLACE_OBJ (STR_FORMAT_START + 95) - // #define STR_FORMAT_ID_CNT_OWN_CLIP (STR_FORMAT_START + 96) - // #define STR_FORMAT_ID_INET_IMAGE (STR_FORMAT_START + 97) - // #define STR_FORMAT_ID_NETSCAPE_IMAGE (STR_FORMAT_START + 98) - // #define STR_FORMAT_ID_SBA_FORMEXCHANGE (STR_FORMAT_START + 99) - // #define STR_FORMAT_ID_SBA_REPORTEXCHANGE (STR_FORMAT_START + 100) - // #define STR_FORMAT_ID_UNIFORMRESOURCELOCATOR (STR_FORMAT_START + 101) #define STR_FORMAT_ID_STARCHARTDOCUMENT_50 (STR_FORMAT_START + 102) #define STR_FORMAT_ID_GRAPHOBJ (STR_FORMAT_START + 103) #define STR_FORMAT_ID_STARWRITER_60 (STR_FORMAT_START + 104) @@ -165,8 +114,6 @@ #define STR_FORMAT_ID_DBACCESS_TABLE (STR_FORMAT_START + 114) #define STR_FORMAT_ID_DBACCESS_COMMAND (STR_FORMAT_START + 115) #define STR_FORMAT_ID_DIALOG_60 (STR_FORMAT_START + 116) - // #define STR_FORMAT_ID_EMF (STR_FORMAT_START + 117) - // #define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 118) #define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119) #define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT) diff --git a/svx/inc/svx/fmresids.hrc b/svx/inc/svx/fmresids.hrc index a0d1371dbcdb..1ead07243f50 100644 --- a/svx/inc/svx/fmresids.hrc +++ b/svx/inc/svx/fmresids.hrc @@ -28,7 +28,6 @@ #define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) // Image-Id's ----------------------------------------------------------- -//#define SID_FMSLOTS_START (SID_SVX_START + 592) -> svxids.hrc #define RID_SVXIMG_FORM SID_FM_CONFIG #define RID_SVXIMG_CONTROL SID_CHOOSE_CONTROLS #define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) @@ -183,27 +182,6 @@ #define RID_STR_PROPTITLE_SPINBUTTON (RID_FORMS_START + 100) #define RID_STR_PROPTITLE_HIDDEN (RID_FORMS_START + 101) // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE #define RID_STR_DATANAVIGATOR (RID_FORMS_START + 124) #define RID_STR_DATANAV_SUBM_PARENT (RID_FORMS_START + 125) #define RID_STR_DATANAV_SUBM_ID (RID_FORMS_START + 126) diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 857556030cb3..d3282c1584ff 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -159,9 +159,6 @@ enum SdrUserCallType {SDRUSERCALL_MOVEONLY, // Nur verschoben, Groesse u SDRUSERCALL_CHILD_INSERTED, // Ein Child einer Gruppe hat sich veraendert SDRUSERCALL_CHILD_REMOVED}; // Ein Child einer Gruppe hat sich veraendert -/* nur voruebergehend, weil sonst MUSS-Aenderung */ -// #define nLayerID nLayerId - //************************************************************ // Hilfsklasse SdrObjUserCall //************************************************************ diff --git a/svx/inc/svx/svdstr.hrc b/svx/inc/svx/svdstr.hrc index 5f223fd3b3c4..bd52c5e38dc5 100644 --- a/svx/inc/svx/svdstr.hrc +++ b/svx/inc/svx/svdstr.hrc @@ -181,7 +181,6 @@ #define STR_ObjNameSingulMEDIA (STR_ObjNameBegin + 143) #define STR_ObjNamePluralMEDIA (STR_ObjNameBegin + 144) -//#define STR_ObjNameEnd (STR_ObjNamePluralMEDIA) //IAccessibility2 Implementation 2009----- #define STR_ObjNameSingulFONTWORK (STR_ObjNameBegin+145) #define STR_ObjNamePluralFONTWORK (STR_ObjNameBegin+146) diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index b7aee5f4d843..3dd452d471cc 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -70,7 +70,6 @@ namespace svx{ class SpellDialogChildWindow;} #define EMPTY_FRAME_REF com::sun::star::uno::Reference < com::sun::star::frame::XFrame >() -//#define SVX_DIALOGFACTORY_CLASSID 0xf8e5fd97, 0x49e2, 0x4ae5, 0xac, 0x31, 0x4, 0xcb, 0xf7, 0xf3, 0xcf, 0x69 class AbstractSvxDistributeDialog :public VclAbstractDialog //add for SvxDistributeDialog { public: diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 685b3453e384..fca583186b5f 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -17,7 +17,6 @@ */ #ifndef _SVX_SVXIDS_HRC #define _SVX_SVXIDS_HRC -// include ------------------------------------------------------------------ #include <svl/memberid.hrc> #include <svl/solar.hrc> @@ -236,20 +235,6 @@ // Calc-Id's // -------------------------------------------------------------------------- -//! moved to sfx2, still in use: -//#ifndef SC_FUNCTION_START -//#define SC_FUNCTION_START (SID_SC_START + 200) -//#endif -//#ifndef FILE_MENU_END -//#define FILE_MENU_END (SC_FUNCTION_START + 20) -//#endif -//#ifndef EDIT_MENU_START -//#define EDIT_MENU_START (FILE_MENU_END) -//#endif -//#ifndef SC_VIEW_START -//#define SC_VIEW_START (SID_SC_START) -//#endif - #define SID_OUTLINE_HIDE (SID_SC_START + 329) #define SID_OUTLINE_SHOW (SID_SC_START + 330) #define SID_OUTLINE_MAKE (SID_SC_START + 331) @@ -259,10 +244,6 @@ #define SID_ENTER_STRING (SID_SC_START + 476) #define SID_ATTR_SPECIALCHAR (SID_SC_START + 581) -//! moved to sfx2, still in use: -//#define FID_CHG_RECORD (EDIT_MENU_START + 18) -//#define SID_CHG_PROTECT (SC_VIEW_START + 84) - // -------------------------------------------------------------------------- // Writer-Id's // -------------------------------------------------------------------------- @@ -296,18 +277,12 @@ #define FN_PGPREVIEW (SID_SW_START + 1250) #define FN_SHOW_MULTIPLE_PAGES (FN_PGPREVIEW + 2) -//! moved to sfx2, still in use: -//#define FN_EDIT2 (SID_SW_START + 1800) -//#define FN_REDLINE_PROTECT (FN_EDIT2 + 23) -//#define FN_REDLINE_ON (FN_EDIT2 + 25) - // -------------------------------------------------------------------------- // Svx-Id's // -------------------------------------------------------------------------- #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) - #define SID_ATTR_POSTIT_AUTHOR ( SID_SVX_START + 44 ) #define SID_ATTR_POSTIT_DATE ( SID_SVX_START + 45 ) #define SID_ATTR_POSTIT_TEXT ( SID_SVX_START + 46 ) @@ -342,11 +317,6 @@ #define SID_RULER_PAGE_POS ( SID_SVX_START + 82 ) #define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 ) #define SID_RULER_LR_MIN_MAX ( SID_SVX_START + 84 ) -//#define SID_ZOOM_TOOLBOX ( SID_SVX_START + 96 ) -> sfxsids.hrc -//#define SID_ZOOM_OUT ( SID_SVX_START + 97 ) -> sfxsids.hrc -//#define SID_ZOOM_IN ( SID_SVX_START + 98 ) -> sfxsids.hrc -//#define SID_SIZE_REAL ( SID_SVX_START + 99 ) -> sfxsids.hrc -//#define SID_SIZE_PAGE ( SID_SVX_START + 100 ) -> sfxsids.hrc #define SID_SIZE_ALL ( SID_SVX_START + 101 ) #define SID_DRAW_LINE ( SID_SVX_START + 102 ) #define SID_DRAW_XLINE ( SID_SVX_START + 103 ) @@ -395,7 +365,6 @@ #define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 ) #define SID_HIDE_SLIDE ( SID_SVX_START + 161 ) #define SID_CHOOSE_POLYGON ( SID_SVX_START + 162 ) -//#define SID_SHOW_BROWSER ( SID_SVX_START + 163 ) -> sfxsids.hrc #define SID_ATTR_FILL_STYLE ( SID_SVX_START + 164 ) #define SID_ATTR_FILL_COLOR ( SID_SVX_START + 165 ) #define SID_ATTR_FILL_GRADIENT ( SID_SVX_START + 166 ) @@ -445,8 +414,6 @@ #define SID_ATTR_POSITION ( SID_SVX_START + 223 ) #define SID_ATTR_SIZE ( SID_SVX_START + 224 ) #define SID_TABLE_CELL ( SID_SVX_START + 225 ) -//#define SID_ATTR_ALIGN_HOR_JUSTIFY ( SID_SVX_START + 226 ) -//#define SID_ATTR_ALIGN_VER_JUSTIFY ( SID_SVX_START + 227 ) #define SID_ATTR_ALIGN_MARGIN ( SID_SVX_START + 228 ) #define SID_ATTR_ALIGN_STACKED ( SID_SVX_START + 229 ) #define SID_ATTR_ALIGN_LINEBREAK ( SID_SVX_START + 230 ) @@ -483,9 +450,7 @@ #define SID_GALLERY_ENABLE_ADDCOPY ( SID_SVX_START + 276 ) #define SID_GALLERY_IMPORTTHEME ( SID_SVX_START + 277 ) #define SID_GALLERY_BG_POS ( SID_SVX_START + 278 ) -//#define SID_GALLERY_BG_BRUSH ( SID_SVX_START + 279 ) -> sfxsids.hrc #define SID_GALLERY_FORMATS ( SID_SVX_START + 280 ) -//#define SID_SEARCH_OPTIONS ( SID_SVX_START + 281 ) -> sfxsids.hrc #define SID_OBJECT_HELL ( SID_SVX_START + 282 ) #define SID_OBJECT_HEAVEN ( SID_SVX_START + 283 ) #define SID_ATTR_LONG_ULSPACE ( SID_SVX_START + 284 ) @@ -493,8 +458,6 @@ #define SID_FRAME_TO_TOP ( SID_SVX_START + 286 ) #define SID_FRAME_TO_BOTTOM ( SID_SVX_START + 287 ) #define SID_POSTIT ( SID_SVX_START + 288 ) -//#define SID_ZOOM ( SID_SVX_START + 289 ) -> sfxsids.hrc -//#define SID_SEARCH_ITEM ( SID_SVX_START + 291 ) -> sfxsids.hrc #define SID_SEARCH_SEARCHSET ( SID_SVX_START + 292 ) #define SID_SEARCH_REPLACESET ( SID_SVX_START + 293 ) #define SID_SET_SUPER_SCRIPT ( SID_SVX_START + 294 ) @@ -531,13 +494,9 @@ #define SID_BMPMASK ( SID_SVX_START + 350 ) #define SID_BMPMASK_PIPETTE ( SID_SVX_START + 351 ) #define SID_BMPMASK_EXEC ( SID_SVX_START + 353 ) -//#define SID_HYPERLINK_GETLINK ( SID_SVX_START + 361 ) -> sfxsids.hrc -//#define SID_HYPERLINK_SETLINK ( SID_SVX_START + 362 ) -> sfxsids.hrc -//#define SID_NAVIGATOR ( SID_SVX_START + 366 ) -> sfxsids.hrc #define SID_ATTR_TEXT_FITTOSIZE ( SID_SVX_START + 367 ) #define SID_ATTR_BRUSH_ROW ( SID_SVX_START + 368 ) #define SID_OPTFILTER_MSOFFICE ( SID_SVX_START + 369 ) -//#define SID_TASKPANE ( SID_SVX_START + 370 ) -> sfxsids.hrc #define SID_IMAP ( SID_SVX_START + 371 ) #define SID_IMAP_EXEC ( SID_SVX_START + 374 ) #define SID_SHOW_HIDDEN ( SID_SVX_START + 375 ) @@ -566,19 +525,13 @@ #define SID_DRAWTBX_RECTANGLES ( SID_SVX_START + 399 ) #define SID_DRAWTBX_ELLIPSES ( SID_SVX_START + 400 ) #define SID_DRAWTBX_LINES ( SID_SVX_START + 401 ) -//#define SID_ZOOM_NEXT ( SID_SVX_START + 402 ) -> sfxsids.hrc -//#define SID_ZOOM_PREV ( SID_SVX_START + 403 ) -> sfxsids.hrc #define SID_BACKGRND_DESTINATION ( SID_SVX_START + 404 ) #define SID_ATTR_FLASH ( SID_SVX_START + 406 ) #define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_START SID_ATTR_3D_LIGHT #define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 ) -//! moved to sfx2, still in use: -//#define SID_HTML_MODE ( SID_SVX_START + 414 ) - #define SID_RULER_PROTECT ( SID_SVX_START + 415 ) -//#define SID_INET_DLG ( SID_SVX_START + 416 ) -> sfxsids.hrc #define SID_COLOR_CONTROL ( SID_SVX_START + 417 ) #define SID_ATTR_3D_PERSPECTIVE ( SID_SVX_START + 418 ) #define SID_ATTR_3D_DEPTH ( SID_SVX_START + 419 ) @@ -586,9 +539,7 @@ #define SID_ATTR_3D_FOCAL_LENGTH ( SID_SVX_START + 421 ) #define SID_ATTR_3D_INTERN ( SID_SVX_START + 422 ) #define SID_PSZ_FUNCTION ( SID_SVX_START + 423 ) -//#define SID_AUTO_CORRECT_DLG ( SID_SVX_START + 424 ) -> sfxsids.hrc #define SID_OFASLOTS_START ( SID_SVX_START + 425 ) -//#define SID_SD_AUTOPILOT ( SID_SVX_START + 425 ) -> sfxsids.hrc #define SID_AUTOPILOT SID_SD_AUTOPILOT #define SID_TABLE_INSERT_COL_DLG ( SID_SVX_START + 426 ) @@ -805,7 +756,6 @@ #define SID_ATTR_GRAF_TRANSPARENCE ( SID_SVX_START + 869 ) #define SID_ATTR_GRAF_INVERT ( SID_SVX_START + 870 ) #define SID_ATTR_GRAF_MODE ( SID_SVX_START + 871 ) -//#define SID_COMP_BIBLIOGRAPHY ( SID_SVX_START + 880 ) -> sfxsids.hrc #define SID_ATTR_GRAF_KEEP_ZOOM ( SID_SVX_START + 882 ) #define SID_ATTR_GRAF_CROP ( SID_SVX_START + 883 ) #define SID_ATTR_GRAF_FRMSIZE ( SID_SVX_START + 884 ) @@ -834,7 +784,6 @@ #define SID_ATTR_ALIGN_HYPHENATION ( SID_SVX_START + 931 ) #define SID_ATTR_NUMBERFORMAT_SOURCE ( SID_SVX_START + 932 ) #define SID_ATTR_AUTO_COLOR_INVALID ( SID_SVX_START + 933 ) -//#define SID_ADDRESS_DATA_SOURCE ( SID_SVX_START + 934 ) -> sfxsids.hrc #define SID_RULER_BORDER_DISTANCE ( SID_SVX_START + 935 ) #define SID_INSERT_DATEFIELD ( SID_SVX_START + 936 ) #define SID_INSERT_TIMEFIELD ( SID_SVX_START + 937 ) diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc index b54940b6c9f2..6cfc23937803 100644 --- a/sw/inc/access.hrc +++ b/sw/inc/access.hrc @@ -42,7 +42,6 @@ //IAccessibility2 Implementation 2009----- #define STR_ACCESS_PREVIEW_DOC_NAME (RC_ACCESS_BEGIN + 22) -//#define STR_ACCESS_PREVIEW_DOC_DESC (RC_ACCESS_BEGIN + 23) #define STR_ACCESS_PREVIEW_DOC_SUFFIX (RC_ACCESS_BEGIN + 24) #define STR_ACCESS_DOC_WORDPROCESSING (RC_ACCESS_BEGIN + 25) #define STR_ACCESS_DOC_WORDPROCESSING_READONLY (RC_ACCESS_BEGIN + 26) diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 3a6f80ccdde1..ac547f67a226 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -479,9 +479,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_FORMAT_FOOTNOTE (FN_FORMAT + 67) /* footnotes */ #define FN_FORMAT_FOOTNOTE_DLG (FN_FORMAT + 68) /* footnote dialog */ -// already defined in Svx -//#define FN_FORMAT_RESET (FN_FORMAT + 69) - #define FN_FRAME_TO_TOP (FN_FORMAT + 70) #define FN_FRAME_TO_BOTTOM (FN_FORMAT + 71) diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h index 323744a14768..62e38c926a7a 100644 --- a/sw/inc/unomid.h +++ b/sw/inc/unomid.h @@ -20,7 +20,6 @@ #define SW_UNOMID_HXX #define C2S(cChar) String::CreateFromAscii( cChar ) -//#define C2U(cChar) rtl::OUString::createFromAscii( cChar ) #define C2U(cChar) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( cChar )) #define MID_MIRROR_VERT 0 diff --git a/sw/source/ui/chrdlg/paradlg.src b/sw/source/ui/chrdlg/paradlg.src index 8194ebbb799e..fe48d495ce95 100644 --- a/sw/source/ui/chrdlg/paradlg.src +++ b/sw/source/ui/chrdlg/paradlg.src @@ -29,7 +29,6 @@ #include "chrdlg.hrc" #include "paradlg.hrc" #define HelpText "error - hier keine HelpTexte HelpText" - // #define DLG_PARA 256 TabDialog DLG_PARA { OutputSize = TRUE ; diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src index c75e7d67ddf6..65e5a76b1038 100644 --- a/sw/source/ui/chrdlg/swbreak.src +++ b/sw/source/ui/chrdlg/swbreak.src @@ -29,7 +29,6 @@ #include "break.hrc" #include "cmdid.h" #include "helpid.h" - // #define DLG_BREAK 256 ModalDialog DLG_BREAK { HelpID = CMD_FN_INSERT_BREAK_DLG ; diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc index d84de6490b92..76d6a7f86830 100644 --- a/sw/source/ui/config/optdlg.hrc +++ b/sw/source/ui/config/optdlg.hrc @@ -65,13 +65,9 @@ #define CB_CHAR_HIDDEN 61 // Print-Extra-Page #define CB_PGRF 61 -//#define CB_PTAB 62 merged with CB_PGRF in printerpullpages -//#define CB_PDRAW 63 removed in printerpullpages #define CB_LEFTP 64 #define CB_RIGHTP 65 -//#define CB_REVERSE 66 removed in printerpullpages #define CB_PROSPECT 67 -//#define CB_SINGLEJOBS 68 removed in printerpullpages #define CB_CTRLFLD 69 #define CB_PAPERFROMSETUP 70 #define FL_1 71 diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src index 3d67571c20fb..f4337d53293d 100644 --- a/sw/source/ui/dialog/docstdlg.src +++ b/sw/source/ui/dialog/docstdlg.src @@ -28,7 +28,6 @@ #include "globals.hrc" #include "docstdlg.hrc" #include "helpid.h" - // #define TP_DOC_STAT 256 TabPage TP_DOC_STAT { HelpID = HID_DOC_STAT ; diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src index 960c7855d41c..006ae9c7efa3 100644 --- a/sw/source/ui/dochdl/selglos.src +++ b/sw/source/ui/dochdl/selglos.src @@ -30,7 +30,6 @@ #include "cmdid.h" #include "helpid.h" - // #define DLG_SEL_GLOS 256 ModalDialog DLG_SEL_GLOS { HelpID = CMD_FN_EXPAND_GLOSSARY ; diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc index 4a6aefb5f339..35abbfced4ac 100644 --- a/sw/source/ui/envelp/label.hrc +++ b/sw/source/ui/envelp/label.hrc @@ -95,8 +95,6 @@ #define ED_SHORTCUT_2 68 #define FT_PHONE_MOBILE 70 -//#define FT_PHONE 71 -//#define FT_MOBILE 72 #define FT_FAX 73 // global resources ******************************************************** diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src index 3d42fcf57a94..93ed085136b7 100644 --- a/sw/source/ui/frmdlg/column.src +++ b/sw/source/ui/frmdlg/column.src @@ -32,7 +32,6 @@ #include "helpid.h" #include "access.hrc" - // #define TP_COLUMN 256 TabPage TP_COLUMN { HelpID = HID_COLUMN ; diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc index b90367c2bc98..f880861617b9 100644 --- a/sw/source/ui/frmdlg/frmpage.hrc +++ b/sw/source/ui/frmdlg/frmpage.hrc @@ -82,8 +82,6 @@ #define CB_HOR 46 #define CB_VERT 47 -//#define LB_MIRROR_PAGES 49 -//#define FT_MIRROR_PAGES 50 #define FL_MIRROR 51 #define WN_BMP 52 #define PB_BROWSE 53 diff --git a/sw/source/ui/inc/table.hrc b/sw/source/ui/inc/table.hrc index dfde64c43061..cd6373b32c9e 100644 --- a/sw/source/ui/inc/table.hrc +++ b/sw/source/ui/inc/table.hrc @@ -21,7 +21,6 @@ #define DLG_INSERT_TABLE RC_TABLE_BEGIN #define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1) #define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2) -//#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) moved to svx #define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4) #define DLG_SPLIT (RC_TABLE_BEGIN + 5) #define DLG_COL_WIDTH (RC_TABLE_BEGIN + 6) diff --git a/sw/source/ui/misc/glossary.hrc b/sw/source/ui/misc/glossary.hrc index 99c40ba3705d..9034e2304ded 100644 --- a/sw/source/ui/misc/glossary.hrc +++ b/sw/source/ui/misc/glossary.hrc @@ -21,12 +21,9 @@ #define FT_SHORTNAME 1 #define ED_SHORTNAME 2 #define FT_NAME 3 -//#define DCB_NAME 4 #define ED_NAME 4 #define CB_INSERT_TIP 5 -//#define FT_BIB 10 - #define PB_INSERT 50 #define PB_EDIT 52 #define PB_BIB 54 diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src index 4e2db6dcfe49..3c864d254e4e 100644 --- a/sw/source/ui/misc/glossary.src +++ b/sw/source/ui/misc/glossary.src @@ -31,7 +31,6 @@ #include "helpid.h" #include "access.hrc" - // #define DLG_GLOSSARY 256 ModalDialog DLG_GLOSSARY { HelpID = CMD_FN_GLOSSARY_DLG ; diff --git a/sw/source/ui/misc/insfnote.src b/sw/source/ui/misc/insfnote.src index a37f03817374..212038a7ca0b 100644 --- a/sw/source/ui/misc/insfnote.src +++ b/sw/source/ui/misc/insfnote.src @@ -28,7 +28,6 @@ #include "misc.hrc" #include "insfnote.hrc" #include "helpid.h" - // #define DLG_INS_FOOTNOTE 257 ModalDialog DLG_INS_FOOTNOTE { HelpID = "sw:ModalDialog:DLG_INS_FOOTNOTE"; diff --git a/sw/source/ui/table/colwd.src b/sw/source/ui/table/colwd.src index 8be269672c5a..e26dfdea4a95 100644 --- a/sw/source/ui/table/colwd.src +++ b/sw/source/ui/table/colwd.src @@ -20,7 +20,6 @@ #include "colwd.hrc" #include "cmdid.h" #include "helpid.h" - // #define DLG_COL_WIDTH 256 ModalDialog DLG_COL_WIDTH { HelpID = CMD_FN_TABLE_SET_COL_WIDTH ; diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src index 1b4fd16bcf59..8c10468e64e3 100644 --- a/sw/source/ui/table/instable.src +++ b/sw/source/ui/table/instable.src @@ -20,7 +20,6 @@ #include "instable.hrc" #include "cmdid.h" #include "helpid.h" - // #define DLG_INSERT_TABLE 256 ModalDialog DLG_INSERT_TABLE { HelpID = CMD_FN_INSERT_TABLE ; diff --git a/sw/source/ui/table/tautofmt.hrc b/sw/source/ui/table/tautofmt.hrc index 3b864a32f229..082283bea512 100644 --- a/sw/source/ui/table/tautofmt.hrc +++ b/sw/source/ui/table/tautofmt.hrc @@ -41,7 +41,6 @@ #define BTN_FONT 23 #define BTN_PATTERN 24 #define BTN_ALIGNMENT 25 -//#define BTN_ADJUST 26 #define STR_ADD_TITLE 100 #define STR_ADD_LABEL 101 #define STR_DEL_TITLE 102 diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc index 84ae23d08042..428d51d81b63 100644 --- a/sw/source/ui/uiview/view.hrc +++ b/sw/source/ui/uiview/view.hrc @@ -34,7 +34,6 @@ #define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14) -//#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 15) #define MSG_NOT_FOUND (RC_VIEW_BEGIN + 16) #define MSG_SEARCH_START (RC_VIEW_BEGIN + 17) #define MSG_SEARCH_END (RC_VIEW_BEGIN + 18) diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 5505c5ff832c..ed2cfc559910 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -313,7 +313,6 @@ void SwView::SetVisArea( const Point &rPt, sal_Bool bUpdateScrollbar ) //passgenau ist, kann nicht aligned werden (bessere Idee?!?!) //MA 29. Oct. 96 (fix: Bild.de, 200%) ganz ohne Alignment geht es nicht //mal sehen wie weit wir mit der halben BrushSize kommen. - //TODO: why BRUSH_SIZE? Point aPt( rPt ); // const long nTmp = GetWrtShell().IsFrameView() ? BRUSH_SIZE/2 : BRUSH_SIZE; const long nTmp = GetWrtShell().IsFrameView() ? 4 : 8; diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index 6b00a8d2c676..ae12dfe241e4 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -36,9 +36,6 @@ #include <com/sun/star/ucb/XDynamicResultSetListener.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//#define CACHED_CRS_STUB_SERVICE_NAME "com.sun.star.ucb.CachedContentResultSetStub" -//#define CACHED_CRS_STUB_FACTORY_NAME "com.sun.star.ucb.CachedContentResultSetStubFactory" - //========================================================================= class DynamicResultSetWrapperListener; diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx index cf32b4fc9df5..f989d0a2d238 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.hxx +++ b/xmlhelp/source/cxxhelp/provider/provider.hxx @@ -36,7 +36,6 @@ namespace chelp { // UNO service name for the provider. This name will be used by the UCB to // create instances of the provider. -//#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME "com.sun.star.ucb.CHelpContentProvider" #define MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 "com.sun.star.help.XMLHelp" #define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH1 25 |