comphelper/inc/comphelper/accessibleselectionhelper.hxx | 1
l10ntools/inc/tokens.h | 1
sc/inc/cfgids.hxx | 8 +
sc/inc/rechead.hxx | 73 ++++++++++++++++
sd/source/ui/view/DocumentRenderer.hrc | 1
store/workben/t_store.cxx | 1
vcl/inc/win/saldata.hxx | 5 +
7 files changed, 90 insertions(+)
New commits:
commit e9b19eebb9041f817dedd558117bce7bf6fbb70e
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Jul 28 15:30:38 2012 +0200
Revert "Remove unused InterceptChildWindowKeyDown: further cleanup"
This reverts commit 06d358fea294617d8618e9cf6fadb1f162fd6014.
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index ea08500..ab74270 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -250,13 +250,18 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const
char* pStr2 );
#define SAL_FRAME_WNDEXTRA sizeof( DWORD )
#define SAL_FRAME_THIS 0
+#define SAL_FRAME_CLASSNAMEA "SALFRAME"
#define SAL_FRAME_CLASSNAMEW L"SALFRAME"
+#define SAL_SUBFRAME_CLASSNAMEA "SALSUBFRAME"
#define SAL_SUBFRAME_CLASSNAMEW L"SALSUBFRAME"
#define SAL_TMPSUBFRAME_CLASSNAMEW L"SALTMPSUBFRAME"
#define SAL_OBJECT_WNDEXTRA sizeof( DWORD )
#define SAL_OBJECT_THIS 0
#define SAL_OBJECT_CLASSNAMEA "SALOBJECT"
+#define SAL_OBJECT_CLASSNAMEW L"SALOBJECT"
#define SAL_OBJECT_CHILDCLASSNAMEA "SALOBJECTCHILD"
+#define SAL_OBJECT_CHILDCLASSNAMEW L"SALOBJECTCHILD"
+#define SAL_COM_CLASSNAMEA "SALCOMWND"
#define SAL_COM_CLASSNAMEW L"SALCOMWND"
#define SAL_MOUSELEAVE_TIMEOUT 300
commit 8849f13ea3baa82137c398cdcd3e886303caff63
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Jul 28 15:24:06 2012 +0200
Partially revert "Remove unused defines"
This partially reverts 8ca21893e58dc9694e0e7a6c0fc52154b3ccb5f7
http://lists.freedesktop.org/archives/libreoffice/2012-July/035331.html
Change-Id: Iae4347a26b1f388bc5e780d24ab7371ffac8b1f8
diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx
b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
index 9ce4f6e..e1bb5dd 100644
--- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx
+++ b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
@@ -27,6 +27,7 @@
#include "comphelper/comphelperdllapi.h"
#define ACCESSIBLE_SELECTION_CHILD_ALL ((sal_Int32)-1)
+#define ACCESSIBLE_SELECTION_CHILD_SELF ((sal_Int32)-2)
//.........................................................................
namespace comphelper
diff --git a/sc/inc/cfgids.hxx b/sc/inc/cfgids.hxx
index 6f6cd4c..839268f 100644
--- a/sc/inc/cfgids.hxx
+++ b/sc/inc/cfgids.hxx
@@ -19,7 +19,15 @@
#ifndef _CFGID_HXX
#define _CFGID_HXX
+#define SCCFG_DOC SFX_ITEMTYPE_SC_BEGIN
+#define SCCFG_VIEW (SFX_ITEMTYPE_SC_BEGIN + 1)
+#define SCCFG_APP (SFX_ITEMTYPE_SC_BEGIN + 2)
+#define SCCFG_SPELLCHECK (SFX_ITEMTYPE_SC_BEGIN + 3)
+#define SCCFG_PRINT (SFX_ITEMTYPE_SC_BEGIN + 4)
#define SCCFG_STATUSBAR (SFX_ITEMTYPE_SC_BEGIN + 5)
+#define SCCFG_INPUT (SFX_ITEMTYPE_SC_BEGIN + 8)
+#define SCCFG_NAVIPI (SFX_ITEMTYPE_SC_BEGIN + 9)
+
#endif
diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx
index 151633f..689228b 100644
--- a/sc/inc/rechead.hxx
+++ b/sc/inc/rechead.hxx
@@ -35,10 +35,83 @@
#define SCID_SIZES 0x4200
+#define SCID_POOLS 0x4210
+#define SCID_DOCPOOL 0x4211
+#define SCID_STYLEPOOL 0x4212
+#define SCID_NEWPOOLS 0x4213 // ID for SC 3.0a
+#define SCID_EDITPOOL 0x4214
+
+#define SCID_DOCUMENT 0x4220
+#define SCID_DOCFLAGS 0x4221
+#define SCID_TABLE 0x4222
+#define SCID_DRAWING 0x4223
+#define SCID_RANGENAME 0x4224
+#define SCID_DBAREAS 0x4225
+#define SCID_PIVOT 0x4226
+#define SCID_CHARTS 0x4227
+#define SCID_NUMFORMAT 0x4228
+#define SCID_DOCOPTIONS 0x4229
+#define SCID_VIEWOPTIONS 0x422a
+#define SCID_PRINTSETUP 0x422b
+#define SCID_CHARSET 0x422c
+#define SCID_NEWDOCUMENT 0x422d // ID for SC 3.0a
+#define SCID_DDELINKS 0x422e
+#define SCID_AREALINKS 0x422f
+#define SCID_CONDFORMATS 0x4230
+#define SCID_VALIDATION 0x4231
+#define SCID_COLNAMERANGES 0x4232
+#define SCID_ROWNAMERANGES 0x4233
+#define SCID_DETOPLIST 0x4234
+#define SCID_CONSOLIDATA 0x4235
+#define SCID_CHANGETRACK 0x4236
+#define SCID_CHGVIEWSET 0x4237
+#define SCID_LINKUPMODE 0x4238
+#define SCID_DATAPILOT 0x4239
+
+#define SCID_COLUMNS 0x4240
+#define SCID_COLROWFLAGS 0x4241
+#define SCID_TABOPTIONS 0x4242
+#define SCID_TABLINK 0x4243
+
+#define SCID_COLDATA 0x4250
+#define SCID_COLNOTES 0x4251
+#define SCID_COLATTRIB 0x4252
+
+#define SCID_DRAWPOOL 0x4260
+#define SCID_DRAWMODEL 0x4261
+
+
+
+// file version
+// if the high-byte is incremented, the document won't be opened by older SCs
+#define SC_INITIAL_VERSION 0x0001
+#define SC_FORMULA_LCLVER 0x0002 // formula with local version no.
+//--------------------------------
+#define SC_NEW_TOKEN_ARRAYS 0x0003 // new TokenArray format
+#define SC_FORMULA_VALUES 0x0004 // values in formula cells
+#define SC_FORMULA_VALUES2 0x0005 // values in formula cells
+#define SC_DATABYTES 0x0006 // data bytes, small tables
+#define SC_DATABYTES2 0x0007 // data bytes, small tables
+#define SC_NUMFMT 0x0008 // number format of formula cell
+#define SC_NEWIF 0x0009 // new coding of ocIf (komp.)
+//--------------------------------
+#define SC_RELATIVE_REFS 0x0010 // relative references
+#define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal of formula cell
+#define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges as ScRangePair
+//--------------------------------
+#define SC_31_EXPORT_VER 0x0012 // version for 3.1-export
//-------------------------------- since 4.0
+#define SC_32K_ROWS 0x0100 // 32000 rows - incompatibel
#define SC_FONTCHARSET 0x0101 // Font-CharSets have to be right
+//--------------------------------
+#define SC_40_EXPORT_VER 0x0101 // version for 4.0-Export
//-------------------------------- since 5.0
+#define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode
#define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implicit intersection
+#define SC_VERSION_EDITPOOL 0x0203 // EditCells with EditPool
+#define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal of formula cell (true)
+//-------------------------------- since 5.2
+#define SC_CONVERT_RECALC_ON_LOAD 0x0205 // CONVERT function recalculated
on each load
//--------------------------------
#define SC_CURRENT_VERSION 0x0205
commit 5ef0042114e7fa4b0231a18b1a0a780ea74bc6c2
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Jul 28 15:11:02 2012 +0200
Partially revert "Remove some unused defines and controls"
This partially reverts b63027f0992cf5c368faeb807c69110997dd00ea
http://lists.freedesktop.org/archives/libreoffice/2012-July/035331.html
Change-Id: I2c87ea89e1b05aa6874a74d2b781b976e970f979
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index ba5a6ae..c42ee50 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -59,6 +59,7 @@
#define _LISTTEXT 521 /* { "Text" ... } */
#define TEXTREFID 522 /* Text = 12345 */
#define LISTRESID 523 /* < 12345; ... > */
+#define _LISTRESID 523 /* { 12345; ... } */
#define NORMDEFINE 524 /* #define ... */
/*------------------------------------------------------ */
/*------------------------------------------------------ */
diff --git a/sd/source/ui/view/DocumentRenderer.hrc
b/sd/source/ui/view/DocumentRenderer.hrc
index cb6c4d0..469614d 100644
--- a/sd/source/ui/view/DocumentRenderer.hrc
+++ b/sd/source/ui/view/DocumentRenderer.hrc
@@ -29,6 +29,7 @@
#define _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT 13
#define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME 14
#define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE 16
+#define _STR_IMPRESS_PRINT_UI_IS_PRINT_TIME 18
#define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN 20
#define _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP 22
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index db61383..6e7bc63 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -48,6 +48,7 @@ using rtl::OUString;
#define _DEMOSTOR_LOOPS 1000 /* 1000, 2000 */
#define _DEMOSTOR_REMOVE 0
+#define _DEMOSTOR_REBUILD 0
enum Options
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
