From 21ac5b4a3ebc9aa5e685e9352179b23c47b15ba4 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 27 Aug 2009 11:59:20 +0000 Subject: CWS-TOOLING: integrate CWS sw32a11y01 2009-08-27 10:11:46 +0200 hde r275457 : new testcase i103265 2009-08-27 08:24:31 +0200 hde r275454 : new testcase i103265 2009-08-27 08:23:05 +0200 hde r275453 : new document for testcase i103265 2009-08-26 13:43:33 +0200 hde r275421 : added new autotest 2009-08-26 13:36:28 +0200 hde r275420 : added new autotest 2009-08-18 15:41:18 +0200 od r275113 : #i104300# method - improve help tip for hyperlinks to cross-reference bookmarks. 2009-08-10 15:18:41 +0200 od r274816 : #i73249# method - no update of fly frame manager on dialog "Title and Description" 2009-08-10 14:24:15 +0200 od r274813 : #i92125# correction of end of file - missing newline end 2009-08-10 14:10:14 +0200 od r274811 : #i92125# correction of end of file - newline missing 2009-08-10 14:00:30 +0200 od r274808 : #i92125# - correct end of file - new line missing 2009-08-10 09:12:30 +0200 od r274794 : CWS-TOOLING: rebase CWS sw32a11y01 to trunk@274622 (milestone: DEV300:m54) 2009-08-07 15:52:59 +0200 od r274775 : #i73249# minor adjustment due to compiler warning 2009-08-07 15:40:38 +0200 od r274774 : #i92125# method - do not delete cross-reference bookmark, if deletion occurs inside a certain node 2009-08-06 12:53:05 +0200 od r274717 : #i92125# method - keep cross-reference bookmarks, if deletion occurs inside a certain node. 2009-08-06 09:53:29 +0200 od r274705 : #i103265# method - For outline and template entries create link to bookmark. The bookmark of type CROSSREF_HEADING_BOOKMARK is created, if needed 2009-07-22 13:57:04 +0200 od r274236 : #i73249# adjustment for export of svg:title and svg:description 2009-07-22 13:51:58 +0200 od r274234 : #i73249# adjust and enhance import/export of svg:title and svg:description for Writer's text frames, graphics and embedded objects 2009-07-21 10:26:27 +0200 od r274168 : #i73249# implement support for attributes Title and Description for text frames, graphics and embedded objects in Writer - core, UNO-API, undo/redo and UI 2009-07-21 10:05:15 +0200 od r274164 : #i73249# new optional properties Title and Description as basis frame properties in text documents 2009-07-13 12:19:54 +0200 od r273928 : #i73249# Implementation of Undo/Redo of drawing object's name, title and description --- sw/sdi/_frmsh.sdi | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sw/sdi') diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi index a355bdb76b55..8081d8e04378 100644 --- a/sw/sdi/_frmsh.sdi +++ b/sw/sdi/_frmsh.sdi @@ -251,6 +251,14 @@ interface BaseTextFrame [ ExecMethod = Execute ; ] + // --> OD 2009-07-08 #i73249# + FN_TITLE_DESCRIPTION_SHAPE + [ + ExecMethod = Execute ; + StateMethod = GetState ; + DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; + ] + // <-- /***************************************************** -- cgit From 940e511ce08a7f1fb4483a92ab2811d7649a1bd3 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 16 Sep 2009 11:45:54 +0000 Subject: CWS-TOOLING: integrate CWS l10nframework01 --- sw/sdi/makefile.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/sdi') diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk index 1a3f17a6c69d..cc6ae3bc20bd 100644 --- a/sw/sdi/makefile.mk +++ b/sw/sdi/makefile.mk @@ -38,20 +38,20 @@ PRJNAME=sw TARGET=swslots # --- Settings ----------------------------------------------------- - +.IF "$(L10N_framework)"=="" SVSDIINC=$(PRJ)$/source$/ui$/inc +.ENDIF .INCLUDE : $(PRJ)$/inc$/swpre.mk .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/inc$/sw.mk - +.IF "$(L10N_framework)"=="" SDI1NAME=$(TARGET) SDI1EXPORT=swriter #SIDHRCNAME=swslots.hrc # --- Files -------------------------------------------------------- - SVSDI1DEPEND= \ switems.sdi\ swriter.sdi\ @@ -98,7 +98,7 @@ SVSDI1DEPEND= \ swslots.hrc \ $(INC)$/globals.hrc \ $(INC)$/cmdid.h - +.ENDIF # --- Targets ------------------------------------------------------- .INCLUDE : target.mk -- cgit From 5ed3fa4c39a67b2b12b4206bef6680fb757e1b75 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 18 Sep 2009 10:15:03 +0000 Subject: CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS --- sw/sdi/_annotsh.sdi | 4 +--- sw/sdi/_basesh.sdi | 4 +--- sw/sdi/_docsh.sdi | 1 + sw/sdi/drwtxtsh.sdi | 4 +--- sw/sdi/makefile.mk | 6 ++++-- sw/sdi/swriter.sdi | 45 ++++++++++----------------------------------- sw/sdi/viewsh.sdi | 10 +++++++++- sw/sdi/wdocsh.sdi | 1 - sw/sdi/wviewsh.sdi | 10 ++++++++-- 9 files changed, 35 insertions(+), 50 deletions(-) (limited to 'sw/sdi') diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi index 9b5f411ffd28..e1249a337ee8 100755 --- a/sw/sdi/_annotsh.sdi +++ b/sw/sdi/_annotsh.sdi @@ -93,7 +93,6 @@ interface _Annotation [ ExecMethod = ExecClpbrd ; StateMethod = StateClpbrd ; - Volatile ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] @@ -101,7 +100,6 @@ interface _Annotation [ ExecMethod = ExecClpbrd ; StateMethod = StateClpbrd ; - Volatile ; ] SID_PASTE // api: @@ -111,7 +109,7 @@ interface _Annotation DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - FN_PASTESPECIAL // api: + SID_PASTE_SPECIAL // api: [ StateMethod = StateClpbrd ; ExecMethod = ExecClpbrd ; diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi index 50b85eddfab6..882104509b9e 100644 --- a/sw/sdi/_basesh.sdi +++ b/sw/sdi/_basesh.sdi @@ -95,7 +95,6 @@ interface BaseTextSelection [ ExecMethod = ExecClpbrd ; StateMethod = StateClpbrd ; - Volatile; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] @@ -103,7 +102,6 @@ interface BaseTextSelection [ ExecMethod = ExecClpbrd ; StateMethod = StateClpbrd ; - Volatile; ] SID_PASTE // status(final|play) @@ -127,7 +125,7 @@ interface BaseTextSelection DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - FN_PASTESPECIAL // status(final|play) + SID_PASTE_SPECIAL // status(final|play) [ ExecMethod = ExecClpbrd ; StateMethod = StateClpbrd ; diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi index 6dfd2c78bd47..9154e6ce2578 100644 --- a/sw/sdi/_docsh.sdi +++ b/sw/sdi/_docsh.sdi @@ -133,6 +133,7 @@ interface BaseTextDocument : OfficeDocument ExecMethod = Execute; StateMethod = GetState; ] + FN_PRINT_LAYOUT [ ExecMethod = Execute; diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi index 8f6eb837af86..0da76e212df1 100644 --- a/sw/sdi/drwtxtsh.sdi +++ b/sw/sdi/drwtxtsh.sdi @@ -43,7 +43,6 @@ interface TextDrawText [ ExecMethod = ExecClpbrd ; StateMethod = StateClpbrd ; - Volatile ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] @@ -51,7 +50,6 @@ interface TextDrawText [ ExecMethod = ExecClpbrd ; StateMethod = StateClpbrd ; - Volatile ; ] SID_PASTE // api: @@ -61,7 +59,7 @@ interface TextDrawText DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - FN_PASTESPECIAL // api: + SID_PASTE_SPECIAL // api: [ StateMethod = StateClpbrd ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk index cc6ae3bc20bd..25b75feea040 100644 --- a/sw/sdi/makefile.mk +++ b/sw/sdi/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -97,8 +97,10 @@ SVSDI1DEPEND= \ annotsh.sdi\ swslots.hrc \ $(INC)$/globals.hrc \ - $(INC)$/cmdid.h + $(INC)$/cmdid.h \ + $(SOLARINCXDIR)$/svxslots.ilb .ENDIF + # --- Targets ------------------------------------------------------- .INCLUDE : target.mk diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 784100694d4a..315d34197715 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -821,7 +821,7 @@ SfxVoidItem ChangeDatabaseField FN_CHANGE_DBFIELD [ /* flags: */ AutoUpdate = FALSE, - Cachable = Volatile, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = TRUE, @@ -1759,7 +1759,7 @@ SfxVoidItem ExecuteMacroField FN_EXECUTE_MACROFIELD [ /* flags: */ AutoUpdate = FALSE, - Cachable = Volatile, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -1809,7 +1809,7 @@ SfxVoidItem FieldDialog FN_EDIT_FIELD [ /* flags: */ AutoUpdate = FALSE, - Cachable = Volatile, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = TRUE, @@ -4370,7 +4370,7 @@ SfxVoidItem InsertMultiIndex FN_INSERT_MULTI_TOX [ /* flags: */ AutoUpdate = FALSE, - Cachable = Volatile, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = TRUE, @@ -6508,31 +6508,6 @@ SfxVoidItem PageUpSel FN_PAGEUP_SEL GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- -SfxInt16Item PasteSpecial FN_PASTESPECIAL -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Volatile, - FastCall = TRUE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_EDIT; -] - //-------------------------------------------------------------------------- SfxVoidItem PreviewPrintOptions FN_PREVIEW_PRINT_OPTIONS () @@ -6592,7 +6567,7 @@ SfxBoolItem PrintLayout FN_PRINT_LAYOUT [ /* flags: */ AutoUpdate = TRUE, - Cachable = Volatile, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -6873,7 +6848,7 @@ SfxBoolItem Ruler FN_RULER [ /* flags: */ AutoUpdate = FALSE, - Cachable = Volatile, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -7052,7 +7027,7 @@ SfxUInt16Item SelectionMode FN_STAT_SELMODE [ /* flags: */ AutoUpdate = FALSE, - Cachable = Volatile, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -7419,7 +7394,7 @@ SfxVoidItem SetOptimalColumnWidth FN_TABLE_ADJUST_CELLS [ /* flags: */ AutoUpdate = FALSE, - Cachable = Volatile, + Cachable = Cachable, FastCall = TRUE, HasCoreId = FALSE, HasDialog = FALSE, @@ -7930,7 +7905,7 @@ SfxStringItem StatePageNumber FN_STAT_PAGE [ /* flags: */ AutoUpdate = FALSE, - Cachable = Volatile, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -8708,7 +8683,7 @@ SfxBoolItem ViewBounds FN_VIEW_BOUNDS [ /* flags: */ AutoUpdate = FALSE, - Cachable = Volatile, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi index 18d537144c5b..05b41e6e7482 100644 --- a/sw/sdi/viewsh.sdi +++ b/sw/sdi/viewsh.sdi @@ -158,9 +158,17 @@ shell SwView : SfxViewShell interface TextPrintPreview : View [ uuid = "1622A480-111A-101D-9757-6E74207A7520" ] { + SID_BROWSER_MODE + [ + StateMethod = GetState; + ] + FN_PRINT_LAYOUT + [ + ExecMethod = Execute; + StateMethod = GetState; + ] FN_REFRESH_VIEW // status(final|play) [ - ExecMethod = Execute ; StateMethod = GetState ; ] FN_CHAR_LEFT // status(final|play) diff --git a/sw/sdi/wdocsh.sdi b/sw/sdi/wdocsh.sdi index fb704c8c19b4..e2efd025c1df 100644 --- a/sw/sdi/wdocsh.sdi +++ b/sw/sdi/wdocsh.sdi @@ -38,7 +38,6 @@ interface WebDocument : BaseTextDocument [ ExecMethod = Execute ; StateMethod = GetState ; - Volatile = TRUE; Asynchron = TRUE; ] diff --git a/sw/sdi/wviewsh.sdi b/sw/sdi/wviewsh.sdi index e38e99246a36..3eff3db1f4a0 100644 --- a/sw/sdi/wviewsh.sdi +++ b/sw/sdi/wviewsh.sdi @@ -144,7 +144,6 @@ interface WebSourceView : View [ ExecMethod = Execute ; StateMethod = GetState ; - Volatile; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] @@ -152,7 +151,6 @@ interface WebSourceView : View [ ExecMethod = Execute ; StateMethod = GetState ; - Volatile; ] SID_PASTE // status(final|play) @@ -187,6 +185,14 @@ interface WebSourceView : View [ StateMethod = GetState ; ] + SID_BROWSER_MODE + [ + StateMethod = GetState; + ] + FN_PRINT_LAYOUT + [ + StateMethod = GetState; + ] } shell SwSrcView : SfxViewShell -- cgit