dbaccess/source/filter/xml/xmlHelper.hxx | 2 +- sfx2/inc/sfx2/linksrc.hxx | 4 ++-- solenv/inc/starview.hid | 2 ++ svtools/source/filter/wmf/winmtf.hxx | 23 +++++++++++++++-------- sw/source/ui/dialog/regionsw.src | 7 +++++++ toolkit/inc/toolkit/helper/property.hxx | 14 +++++++++----- 6 files changed, 36 insertions(+), 16 deletions(-)
New commits: commit 10ada83716e7c7d591d2c7d5c19cc5920db38faf Author: Thomas Arnhold <tho...@arnhold.org> Date: Sun Jul 29 19:22:59 2012 +0200 Partially revert "Remove unused defines" This partially reverts 00240d049790d11c4ef35de7a294819107197efd http://lists.freedesktop.org/archives/libreoffice/2012-July/035331.html Change-Id: Ib682cd258cca12e742be5fb1715b2aecfe0a761e diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index f835c9e..aa7a76e 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -25,7 +25,7 @@ #include <memory> -// CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1) +#define CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1) #define CTF_DB_ISVISIBLE (XML_DB_CTF_START + 2) #define CTF_DB_MASTERPAGENAME (XML_DB_CTF_START + 3) #define CTF_DB_NUMBERFORMAT (XML_DB_CTF_START + 4) diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx index f152c0d..4ff77b6 100644 --- a/sfx2/inc/sfx2/linksrc.hxx +++ b/sfx2/inc/sfx2/linksrc.hxx @@ -39,9 +39,9 @@ class String; #ifndef ADVISEMODE_NODATA // Must be the same value as Ole2 ADVF_* #define ADVISEMODE_NODATA 0x01 -// ADVISEMODE_PRIMEFIRST 0x02 +#define ADVISEMODE_PRIMEFIRST 0x02 #define ADVISEMODE_ONLYONCE 0x04 -// ADVISEMODE_DATAONSTOP 0x40 +#define ADVISEMODE_DATAONSTOP 0x40 #endif namespace sfx2 diff --git a/solenv/inc/starview.hid b/solenv/inc/starview.hid index d090951..651a830 100644 --- a/solenv/inc/starview.hid +++ b/solenv/inc/starview.hid @@ -310,7 +310,9 @@ #define accelerator 96 #define Accelerator 96 #define ACCELERATOR 96 +#define acceleratoritem 97 #define AcceleratorItem 97 +#define ACCELERATORITEM 97 #define SfxStyleFamilies 98 #define SfxStyleFamilyItem 99 diff --git a/svtools/source/filter/wmf/winmtf.hxx b/svtools/source/filter/wmf/winmtf.hxx index 8e2194c..bf81be5 100644 --- a/svtools/source/filter/wmf/winmtf.hxx +++ b/svtools/source/filter/wmf/winmtf.hxx @@ -77,11 +77,11 @@ #define BLACK_PEN 7 #define NULL_PEN 8 #define OEM_FIXED_FONT 10 -// ANSI_FIXED_FONT 11 -// ANSI_VAR_FONT 12 -// SYSTEM_FONT 13 -// DEVICE_DEFAULT_FONT 14 -// DEFAULT_PALETTE 15 +#define ANSI_FIXED_FONT 11 +#define ANSI_VAR_FONT 12 +#define SYSTEM_FONT 13 +#define DEVICE_DEFAULT_FONT 14 +#define DEFAULT_PALETTE 15 #define SYSTEM_FIXED_FONT 16 @@ -122,10 +122,12 @@ #define BLACKONWHITE 1 #define WHITEONBLACK 2 #define COLORONCOLOR 3 +#define HALFTONE 4 #define MAXSTRETCHBLTMODE 4 #define STRETCH_ANDSCANS BLACKONWHITE #define STRETCH_ORSCANS WHITEONBLACK #define STRETCH_DELETESCANS COLORONCOLOR +#define STRETCH_HALFTONE HALFTONE #define LF_FACESIZE 32 @@ -185,6 +187,11 @@ struct WMF_EXTERNALHEADER; #define PS_ALTERNATE 8 #define PS_STYLE_MASK 15 +#define PS_ENDCAP_ROUND 0x000 +#define PS_ENDCAP_SQUARE 0x100 +#define PS_ENDCAP_FLAT 0x200 +#define PS_ENDCAP_MASK 0xF00 + #define PS_JOIN_ROUND 0x0000 #define PS_JOIN_BEVEL 0x1000 #define PS_JOIN_MITER 0x2000 @@ -220,9 +227,9 @@ struct WMF_EXTERNALHEADER; /*WINVER >= 0x0400*/ #define ETO_GLYPH_INDEX 0x0010 #define ETO_RTLREADING 0x0080 -// ETO_NUMERICSLOCAL 0x0400 -// ETO_NUMERICSLATIN 0x0800 -// ETO_IGNORELANGUAGE 0x1000 +#define ETO_NUMERICSLOCAL 0x0400 +#define ETO_NUMERICSLATIN 0x0800 +#define ETO_IGNORELANGUAGE 0x1000 /*_WIN32_WINNT >= 0x0500*/ #define ETO_PDY 0x2000 diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src index 2f728dd..f97ec06 100644 --- a/sw/source/ui/dialog/regionsw.src +++ b/sw/source/ui/dialog/regionsw.src @@ -67,6 +67,13 @@ #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/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx index a681640..dd4bdd1 100644 --- a/toolkit/inc/toolkit/helper/property.hxx +++ b/toolkit/inc/toolkit/helper/property.hxx @@ -83,10 +83,10 @@ namespace rtl { #define BASEPROPERTY_TIME 33 // sal_Int32 #define BASEPROPERTY_TIMEMIN 34 // sal_Int32 #define BASEPROPERTY_TIMEMAX 35 // sal_Int32 -// BASEPROPERTY_VALUE_INT32 36 // sal_Int32 -// BASEPROPERTY_VALUEMIN_INT32 37 // sal_Int32 -// BASEPROPERTY_VALUEMAX_INT32 38 // sal_Int32 -// BASEPROPERTY_VALUESTEP_INT32 39 // sal_Int32 +#define BASEPROPERTY_VALUE_INT32 36 // sal_Int32 +#define BASEPROPERTY_VALUEMIN_INT32 37 // sal_Int32 +#define BASEPROPERTY_VALUEMAX_INT32 38 // sal_Int32 +#define BASEPROPERTY_VALUESTEP_INT32 39 // sal_Int32 #define BASEPROPERTY_EDITMASK 40 // ::rtl::OUString #define BASEPROPERTY_LITERALMASK 41 // ::rtl::OUString #define BASEPROPERTY_IMAGEURL 42 // ::rtl::OUString @@ -107,7 +107,7 @@ namespace rtl { #define BASEPROPERTY_DEFAULTBUTTON 57 // sal_Bool #define BASEPROPERTY_HELPURL 58 // ::rtl::OUString #define BASEPROPERTY_AUTOTOGGLE 59 // sal_Bool -// BASEPROPERTY_FOCUSSELECTIONHIDE 60 // sal_Bool +//#define BASEPROPERTY_FOCUSSELECTIONHIDE 60 // sal_Bool #define BASEPROPERTY_FORMATKEY 61 // sal_Bool #define BASEPROPERTY_FORMATSSUPPLIER 62 // ::com::sun::star::util::XNumberFormatsSupplier #define BASEPROPERTY_EFFECTIVE_VALUE 63 // Any (double or string) @@ -237,6 +237,10 @@ namespace rtl { #define PROPERTY_ALIGN_CENTER 1 #define PROPERTY_ALIGN_RIGHT 2 +#define PROPERTY_STATE_OFF 0 +#define PROPERTY_STATE_ON 1 +#define PROPERTY_STATE_DONTCARE 2 + TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const ::rtl::OUString& rPropertyName ); const ::com::sun::star::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ); TOOLKIT_DLLPUBLIC const ::rtl::OUString& GetPropertyName( sal_uInt16 nPropertyId ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits