diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2010-10-05 14:18:10 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2010-10-05 14:20:10 +0300 |
| commit | 9bbf47ee539900b9a62e8b16970bc029d21136a7 (patch) | |
| tree | 947b0b3f1d8e8e6a330fdaa1701f4d7117ffdfeb | |
| parent | 4992b7768e8afa4f1b6e4f26ed018f6d2c10f055 (diff) | |
Make cws-vbasupportdev300.diff apply again
| -rw-r--r-- | patches/vba/cws-vbasupportdev300.diff | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff index 88361a7d2..fef5624ce 100644 --- a/patches/vba/cws-vbasupportdev300.diff +++ b/patches/vba/cws-vbasupportdev300.diff @@ -11991,31 +11991,31 @@ diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc index a783120..7503ce2 100644 --- sc/inc/globstr.hrc +++ sc/inc/globstr.hrc -@@ -577,7 +577,23 @@ - #define STR_UNDO_SET_TAB_BG_COLOR 438 - #define STR_UNDO_SET_MULTI_TAB_BG_COLOR 439 - --#define STR_COUNT 440 -+#define STR_SHAPE_AUTOSHAPE 440 -+#define STR_SHAPE_RECTANGLE 441 -+#define STR_SHAPE_LINE 442 -+#define STR_SHAPE_OVAL 443 -+#define STR_SHAPE_TEXTBOX 444 -+ -+#define STR_FORM_BUTTON 445 -+#define STR_FORM_CHECKBOX 446 -+#define STR_FORM_OPTIONBUTTON 447 -+#define STR_FORM_LABEL 448 -+#define STR_FORM_LISTBOX 449 -+#define STR_FORM_GROUPBOX 450 -+#define STR_FORM_DROPDOWN 451 -+#define STR_FORM_SPINNER 452 -+#define STR_FORM_SCROLLBAR 453 -+ -+#define STR_COUNT 454 +@@ -577,7 +577,22 @@ + #define STR_UNDO_INSERT_CURRENT_DATE 440 + #define STR_UNDO_INSERT_CURRENT_TIME 441 + +-#define STR_COUNT 442 ++#define STR_SHAPE_AUTOSHAPE 442 ++#define STR_SHAPE_RECTANGLE 443 ++#define STR_SHAPE_LINE 444 ++#define STR_SHAPE_OVAL 445 ++#define STR_SHAPE_TEXTBOX 446 ++ ++#define STR_FORM_BUTTON 447 ++#define STR_FORM_CHECKBOX 448 ++#define STR_FORM_OPTIONBUTTON 449 ++#define STR_FORM_LABEL 450 ++#define STR_FORM_LISTBOX 451 ++#define STR_FORM_GROUPBOX 452 ++#define STR_FORM_DROPDOWN 453 ++#define STR_FORM_SPINNER 454 ++#define STR_FORM_SCROLLBAR 455 ++ ++#define STR_COUNT 456 #endif - +- diff --git sc/inc/macromgr.hxx sc/inc/macromgr.hxx new file mode 100644 index 0000000..35a3b2d @@ -12112,27 +12112,27 @@ index 87f02b5..d1ac237 100644 @@ -592,11 +592,9 @@ // #i59082# assign macro to shape #define SID_ASSIGNMACRO (SC_VIEW_START + 95) - + -#ifdef ISSUE66550_HLINK_FOR_SHAPES // #i66550# hyperlinks in shapes #define SID_DRAW_HLINK_EDIT (SC_VIEW_START + 96) #define SID_DRAW_HLINK_DELETE (SC_VIEW_START + 97) -#endif - + // "Zoom / Synchronize sheets" in options dialog #define SID_SC_OPT_SYNCZOOM (SC_VIEW_START + 98) -@@ -1669,6 +1669,11 @@ - #define RID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 2) - #define HID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 3) - +@@ -1669,6 +1669,9 @@ + #define SID_INSERT_CURRENT_DATE (SC_OOO_BUILD_START + 4) + #define SID_INSERT_CURRENT_TIME (SC_OOO_BUILD_START + 5) + +// Data Form -+#define SID_DATAFORM_NEW (SC_OOO_BUILD_START + 5) // message -+#define SID_DATA_FORM (SC_OOO_BUILD_START + 6) // menu (in Data menu) -+#define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 7) // dialog ++#define SID_DATAFORM_NEW (SC_OOO_BUILD_START + 7) // message ++#define SID_DATA_FORM (SC_OOO_BUILD_START + 8) // menu (in Data menu) ++#define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 9) // dialog + #endif - - +- +- diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx index 05ca719..e50f8cd 100644 --- sc/inc/scabstdlg.hxx @@ -12493,9 +12493,9 @@ index 74d7126..ce3a9b0 100644 #include <svl/intitem.hxx> #include <editeng/flditem.hxx> @@ -819,6 +820,8 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons - ScFormulaCell::~ScFormulaCell() { pDocument->RemoveFromFormulaTree( this ); + pDocument->RemoveSubTotalCell(this); + if (pCode->HasOpCode(ocMacro)) + pDocument->GetMacroManager()->RemoveDependentCell(this); |