summaryrefslogtreecommitdiff
path: root/framework
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 /framework
parentd341aca7f68bc082cdefe4b1176f56c2c14a0322 (diff)
Remove unused defines
Change-Id: Ic36b131ee9964a6671f7f41e1cad1631c43ad565
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/acceleratorconst.h7
-rw-r--r--framework/inc/classes/filtercachedata.hxx30
-rw-r--r--framework/inc/classes/protocolhandlercache.hxx2
-rw-r--r--framework/inc/framework/menuconfiguration.hxx1
-rw-r--r--framework/inc/services/logindialog.hxx50
-rw-r--r--framework/inc/xml/toolboxconfigurationdefines.hxx32
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx2
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx2
8 files changed, 0 insertions, 126 deletions
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index e5204aa93b4a..63afcbb25d02 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -40,13 +40,6 @@ namespace framework{
#define XMLNS_ACCEL DECLARE_ASCII("accel")
#define XMLNS_XLINK DECLARE_ASCII("xlink")
-#define ATTRIBUTE_URL DECLARE_ASCII("href" )
-#define ATTRIBUTE_KEYCODE DECLARE_ASCII("code" )
-#define ATTRIBUTE_MOD_SHIFT DECLARE_ASCII("shift")
-#define ATTRIBUTE_MOD_MOD1 DECLARE_ASCII("mod1" )
-#define ATTRIBUTE_MOD_MOD2 DECLARE_ASCII("mod2" )
-#define ATTRIBUTE_MOD_MOD3 DECLARE_ASCII("mod3" )
-
// same items with a name space alias
#define AL_ELEMENT_ACCELERATORLIST DECLARE_ASCII("accel:acceleratorlist")
#define AL_ELEMENT_ITEM DECLARE_ASCII("accel:item" )
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 26d37081c2e5..781829ed750e 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -80,30 +80,10 @@ namespace framework{
#define PACKAGENAME_TYPEDETECTION_ADDITIONAL DECLARE_ASCII("Office.TypeDetectionAdditional" )
#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// separator for configuration paths
#define PROPERTY_SEPERATOR sal_Unicode(',') /// separator for own formated property strings of types and filters
-#define LIST_SEPERATOR sal_Unicode(';') /// separator for own formated lists as part of our own formated type- or filter-string
-#define LOCALE_FALLBACK DECLARE_ASCII("en-US" ) /// fallback, if configuration can't give us current set locale ...
#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 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
-#define PRODUCTNAME_VARIABLE DECLARE_ASCII("%productname%")
-#define PRODUCTNAME_VARLENGTH 13
-#define PRODUCTNAME_FALLBACK DECLARE_ASCII("StarOffice" ) /// fallback, if configuration can't give us current set product name ...
-#define FORMATVERSION_VARIABLE DECLARE_ASCII("%formatversion%" )
-#define FORMATVERSION_VARLENGTH 15
-#define FORMATVERSION_FALLBACK DECLARE_ASCII("6.0/7" )
-
-//*****************************************************************************************************************
-// We know some default values ...
-//*****************************************************************************************************************
-#define NAME_DEFAULTDETECTOR DECLARE_ASCII("com.sun.star.comp.office.FilterDetect" )
-#define NAME_GENERICLOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" )
-#define UINAME_GENERICLOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" )
-#define TYPELIST_DEFAULTDETECTOR DECLARE_ASCII("*" )
-#define TYPELIST_GENERICLOADER DECLARE_ASCII("*" )
-
//*****************************************************************************************************************
// This are all supported set-names of our filter configuration.
//*****************************************************************************************************************
@@ -155,22 +135,12 @@ namespace framework{
#define PROPERTY_PREFERRED DECLARE_ASCII("Preferred" )
#define PROPERTY_INSTALLED DECLARE_ASCII("Installed" )
#define PROPERTY_UINAME DECLARE_ASCII("UIName" )
-#define PROPERTY_UINAMES DECLARE_ASCII("UINames" )
#define PROPERTY_MEDIATYPE DECLARE_ASCII("MediaType" )
-#define PROPERTY_CLIPBOARDFORMAT DECLARE_ASCII("ClipboardFormat" )
-#define PROPERTY_URLPATTERN DECLARE_ASCII("URLPattern" )
-#define PROPERTY_EXTENSIONS DECLARE_ASCII("Extensions" )
-#define PROPERTY_DOCUMENTICONID DECLARE_ASCII("DocumentIconID" )
#define PROPERTY_TYPE DECLARE_ASCII("Type" )
-#define PROPERTY_DOCUMENTSERVICE DECLARE_ASCII("DocumentService" )
-#define PROPERTY_FILTERSERVICE DECLARE_ASCII("FilterService" )
#define PROPERTY_FLAGS DECLARE_ASCII("Flags" )
#define PROPERTY_USERDATA DECLARE_ASCII("UserData" )
-#define PROPERTY_FILEFORMATVERSION DECLARE_ASCII("FileFormatVersion" )
-#define PROPERTY_TEMPLATENAME DECLARE_ASCII("TemplateName" )
#define PROPERTY_TYPES DECLARE_ASCII("Types" )
#define PROPERTY_ORDER DECLARE_ASCII("Order" )
-#define PROPERTY_UICOMPONENT DECLARE_ASCII("UIComponent" )
//_________________________________________________________________________________________________________________
// exported definitions
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 8fe3dfcf1e0c..be7e1c8d2325 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -63,8 +63,6 @@ namespace framework{
#define PACKAGENAME_PROTOCOLHANDLER DECLARE_ASCII("Office.ProtocolHandler" ) /// name of our configuration package
#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// separator for configuration paths
-#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
#define SETNAME_HANDLER DECLARE_ASCII("HandlerSet" ) /// name of configuration set inside package
#define PROPERTY_PROTOCOLS DECLARE_ASCII("Protocols" ) /// properties of a protocol handler
diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx
index bf052bc67e59..e4b2f4b63c95 100644
--- a/framework/inc/framework/menuconfiguration.hxx
+++ b/framework/inc/framework/menuconfiguration.hxx
@@ -53,7 +53,6 @@
#define BOOKMARK_NEWMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_new" ))
#define BOOKMARK_WIZARDMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_wizard" ))
-#define ADDONS_POPUPMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_addons_popup" ))
// Prepare for inclusion by framework and sfx
// Please consider that there is a corresponding define also in sfxsids.hrc!! (SID_SFX_START)/(SID_ADDONS)
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index eed512ea22e1..115ca13eedcc 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -109,7 +109,6 @@ namespace framework{
#endif
#define UNCPATHSEPERATOR sal_Unicode(0x002F)
-#define MAX_SERVERHISTORY 10
// Use follow keys in follow order.
// [Global]
@@ -132,55 +131,6 @@ namespace framework{
#define SECTION_DEFAULTPORTS "DefaultPorts"
#define SECTION_SERVERHISTORY "ServerHistory"
-#define SECTION_USERNAME SECTION_GLOBAL
-#define SECTION_ACTIVESERVER SECTION_GLOBAL
-#define SECTION_CONNECTIONTYPE SECTION_GLOBAL
-#define SECTION_LANGUAGE SECTION_GLOBAL
-#define SECTION_SECURITYPROXY SECTION_GLOBAL
-#define SECTION_DIALOG SECTION_GLOBAL
-#define SECTION_HTTP SECTION_DEFAULTPORTS
-#define SECTION_HTTPS SECTION_DEFAULTPORTS
-#define SECTION_SERVER_X SECTION_SERVERHISTORY
-
-#define KEY_USERNAME "UserName"
-#define KEY_ACTIVESERVER "ActiveServer"
-#define KEY_CONNECTIONTYPE "ConnectionType"
-#define KEY_LANGUAGE "Language"
-#define KEY_SERVER_X "Server_"
-#define KEY_SECURITYPROXY "SecurityProxy"
-#define KEY_USESECURITYPROXY "UseProxy"
-#define KEY_DIALOG "dialog"
-#define KEY_HTTP "http"
-#define KEY_HTTPS "https"
-
-#define PROPERTYNAME_CONNECTIONTYPE DECLARE_ASCII("ConnectionType" )
-#define PROPERTYNAME_LANGUAGE DECLARE_ASCII("Language" )
-#define PROPERTYNAME_PARENTWINDOW DECLARE_ASCII("ParentWindow" )
-#define PROPERTYNAME_PASSWORD DECLARE_ASCII("Password" )
-#define PROPERTYNAME_SECURITYPROXY DECLARE_ASCII("SecurityProxy" )
-#define PROPERTYNAME_SERVER DECLARE_ASCII("Server" )
-#define PROPERTYNAME_SERVERHISTORY DECLARE_ASCII("ServerHistory" )
-#define PROPERTYNAME_USERNAME DECLARE_ASCII("UserName" )
-#define PROPERTYNAME_USEPROXY DECLARE_ASCII("UseProxy" )
-#define PROPERTYNAME_DIALOG DECLARE_ASCII("Dialog" )
-#define PROPERTYNAME_HTTP DECLARE_ASCII("http" )
-#define PROPERTYNAME_HTTPS DECLARE_ASCII("https" )
-
-#define PROPERTYHANDLE_CONNECTIONTYPE 1
-#define PROPERTYHANDLE_LANGUAGE 2
-#define PROPERTYHANDLE_PARENTWINDOW 3
-#define PROPERTYHANDLE_PASSWORD 4
-#define PROPERTYHANDLE_SERVER 5
-#define PROPERTYHANDLE_SERVERHISTORY 6
-#define PROPERTYHANDLE_USERNAME 7
-#define PROPERTYHANDLE_SECURITYPROXY 8
-#define PROPERTYHANDLE_USEPROXY 9
-#define PROPERTYHANDLE_DIALOG 10
-#define PROPERTYHANDLE_HTTP 11
-#define PROPERTYHANDLE_HTTPS 12
-
-#define PROPERTYCOUNT 12
-
//_________________________________________________________________________________________________________________
// exported definitions
//_________________________________________________________________________________________________________________
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index 4e15921f33b8..acd8e02c27bf 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -32,11 +32,6 @@
#define ELEMENT_TOOLBARBREAK "toolbarbreak"
#define ELEMENT_TOOLBARSEPARATOR "toolbarseparator"
-#define ELEMENT_TOOLBARLAYOUTS "toolbarlayouts"
-#define ELEMENT_TOOLBARLAYOUT "toolbarlayout"
-#define ELEMENT_TOOLBARCONFIGITEMS "toolbarconfigitems"
-#define ELEMENT_TOOLBARCONFIGITEM "toolbarconfigitem"
-
#define ATTRIBUTE_UINAME "uiname"
#define ATTRIBUTE_BITMAP "bitmap"
@@ -50,29 +45,12 @@
#define ATTRIBUTE_TOOLTIP "tooltip"
#define ATTRIBUTE_ITEMSTYLE "style"
-#define ATTRIBUTE_ID "id"
-#define ATTRIBUTE_FLOATINGPOSLEFT "floatingposleft"
-#define ATTRIBUTE_FLOATINGPOSTOP "floatingpostop"
-#define ATTRIBUTE_TOOLBARNAME "toolbarname"
-#define ATTRIBUTE_CONTEXT "context"
-#define ATTRIBUTE_FLOATINGLINES "floatinglines"
-#define ATTRIBUTE_DOCKINGLINES "dockinglines"
-#define ATTRIBUTE_ALIGN "align"
-#define ATTRIBUTE_FLOATING "floating"
-#define ATTRIBUTE_BUTTONTYPE "style"
-#define ATTRIBUTE_USERDEFNAME "userdefname"
-
#define ELEMENT_NS_TOOLBAR "toolbar:toolbar"
#define ELEMENT_NS_TOOLBARITEM "toolbar:toolbaritem"
#define ELEMENT_NS_TOOLBARSPACE "toolbar:toolbarspace"
#define ELEMENT_NS_TOOLBARBREAK "toolbar:toolbarbreak"
#define ELEMENT_NS_TOOLBARSEPARATOR "toolbar:toolbarseparator"
-#define ELEMENT_NS_TOOLBARLAYOUTS "toolbar:toolbarlayouts"
-#define ELEMENT_NS_TOOLBARLAYOUT "toolbar:toolbarlayout"
-#define ELEMENT_NS_TOOLBARCONFIGITEMS "toolbar:toolbarconfigitems"
-#define ELEMENT_NS_TOOLBARCONFIGITEM "toolbar:toolbarconfigitem"
-
#define ATTRIBUTE_XMLNS_TOOLBAR "xmlns:toolbar"
#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink"
@@ -81,16 +59,6 @@
#define ATTRIBUTE_BOOLEAN_TRUE "true"
#define ATTRIBUTE_BOOLEAN_FALSE "false"
-#define ATTRIBUTE_ALIGN_LEFT "left"
-#define ATTRIBUTE_ALIGN_RIGHT "right"
-#define ATTRIBUTE_ALIGN_TOP "top"
-#define ATTRIBUTE_ALIGN_BOTTOM "bottom"
-
-#define ATTRIBUTE_STYLE_TEXT "text"
-#define ATTRIBUTE_STYLE_SYMBOL "symbol"
-#define ATTRIBUTE_STYLE_SYMBOLTEXT "symboltext"
-#define ATTRIBUTE_STYLE_SYMBOLPLUSTEXT "symbol+text"
-
#define ATTRIBUTE_ITEMSTYLE_RADIO "radio"
#define ATTRIBUTE_ITEMSTYLE_AUTO "auto"
#define ATTRIBUTE_ITEMSTYLE_LEFT "left"
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index f284d77688a4..f2316b617a55 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -67,7 +67,6 @@ using namespace ::com::sun::star::lang ;
#define ROOTNODE_ADDONMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" ))
#define PATHDELIMITER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" ))
-#define TOOLBARITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" ))
#define SEPARATOR_URL_STR "private:separator"
#define SEPARATOR_URL_LEN 17
#define SEPARATOR_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR ))
@@ -99,7 +98,6 @@ using namespace ::com::sun::star::lang ;
#define PROPERTYNAME_MERGEMENU_MERGEFALLBACK ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" ))
#define PROPERTYNAME_MERGEMENU_MERGECONTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" ))
#define PROPERTYNAME_MERGEMENU_MENUITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MenuItems" ))
-#define MERGEMENU_MERGEPOINT_SEPARATOR '\\'
#define PROPERTYNAME_MERGETOOLBAR_TOOLBAR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeToolBar" ))
#define PROPERTYNAME_MERGETOOLBAR_MERGEPOINT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" ))
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 2c50e0e07c97..8b128938dd85 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -64,13 +64,11 @@
#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id"
#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label"
#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid"
-#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak"
#define ATTRIBUTE_STYLE "http://openoffice.org/2001/menu^style"
#define ATTRIBUTE_NS_ID "menu:id"
#define ATTRIBUTE_NS_LABEL "menu:label"
#define ATTRIBUTE_NS_HELPID "menu:helpid"
-#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak"
#define ATTRIBUTE_NS_STYLE "menu:style"
#define ATTRIBUTE_XMLNS_MENU "xmlns:menu"