Apache OpenOffice (AOO) Bugzilla – Issue 80528
Reduce complexity: Remove unnecessary display options
Last modified: 2008-07-17 17:21:13 UTC
AW: According to the spec with the same tame this is the task to follow the implementation.
AW: Started with rough removal, building for tet purposes...
AW: First removals done for svx and sd, sc to go...
AW: svx, sd and sc were already cleared, but in sw, i found usages of show/hide object categories. Together with sc's old excel import, i conclude that i need to keep the show/hide functionality and remove the draft states. Had to start over from svx, removing onlx the draft state will mbe more complex than removing that whole show/draft/hide feature set. Also: hanged OLEObjCache::UnloadObj since it only worked/did something when OLE is in draft mode in all views. What is intended is more some 'is visible in any view'-evaluation. Since this is possible now with the VOCs, i implemented it there. Continuing with sd...
AW: svx, sd, sc and sw newly handled. Need to build the rest of the stuff to get an install set (better due to the ressource changes) for testing...
AW: Removed part from optionsbar.xml for draw and impress (for HelpIDs): <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GraphicDraft" toolbar:helpid="helpid:27146" toolbar:style="auto" /> <toolbar:toolbaritem xlink:href=".uno:FillDraft" toolbar:helpid="helpid:27147" toolbar:style="auto" /> <toolbar:toolbaritem xlink:href=".uno:TextDraft" toolbar:helpid="helpid:27148" toolbar:style="auto" /> <toolbar:toolbaritem xlink:href=".uno:LineDraft" toolbar:helpid="helpid:27149" toolbar:style="auto" />
AW: Install set works now, the toolbar entries for draw/impress ar removed. Commenting and removing the #i80528#-tags...
AW: Need to check SdrObject::TakeContour(); there the draft modes were used to paint graphics and text as polygons to the recorded metafile. This may need to be replaced.
AW: Test-building with changes...
AW: As if i smelled it: TakeContour immediately crashed with the changes since the paint to metafile of the clone also has the text and also uses TakeContour for setting up the DrawOutliner -> recursive loop, stack overflow. ARGH! I will need to add some temporary PaintMode to react on contour paint in DoPaintObject for text and graphics. This will be a temporary solution until we get the primitives. There, i would simply implement a ContourRenderer whcih would process a fixed sequence of primitives and create polygons...
AW: Okay, new paintmode is SDRPAINTMODE_CONTOUR and i added support in SdrGrafObj::DoPaintObject and SdrTextObj::DoPaintObject. Contour for graphics did not work anyways, but works now. AW: Checking in changes...
AW: Initializing builds on unxlngi6.pro, unxsols4.pro and wntsci10...
AW: Builds progress, making experiments with debug version, checking contour stuff in SW with SW's graphic objects and DrawingLayer's...
AW: During tests i stumbled over SC save_old -> load_new and vice versa with changed show/hide/replacement settings. I debugged and looked for the error but could not find import/export conde. Calling NN (amd doing some simple tests with only one office) showed that these flags are not saved at all, thus there is no problem. All in all it works pretty well. Hopefully the builds will be ready, soon. AW: I did some changes in SC to make ScVObjMode usage more safe. First version was using %2 when assigning an integer to the type, new versions are more type safe by using if(x > VOBJ_MODE_HIDE) x = VOBJ_MODE_SHOW before assignment. Checking in...
AW: Builds look good (except windows, of course ;-). Updated SC, restarted builds...
AW->CGU: The following needs to be done for testing: - auomatic tests of Draw/Impres and Calc - Options toolbar in Draw and in Impress has 4 buttons less which were for draft display modes: 'Picture Placeholders', 'Contour mode', 'Text Placeholders' and 'Line Contour Only'. - Tools/Options/StarOfficeDraw/View and Tools/Options/StarOfficeImpress/View misses the CheckBox group 'Alternative Display' which contained 'Image Placeholders', 'Contour Mode', 'Text Placeholders' and 'Line contour only' - Tools/Options/StarOfficeCalc/View the Group 'Objects' with the three DropDown boxes misses the 'Placeholder' entry, only 'Show' and 'Hide' remain. - Draw/Impress files created with the regular Office and any of the draft mode options switched on (draft active) and loaded in this CWS-Version will have all objects normally displayed again (no draft mode, options off). - Draw/Impress files created with CWS-Version andl oaded in regular Office will have all objects displayed without draft (options off). - help content changed by UFI (see 2nd task) unxlngi6.pro, unxsols4.pro, wntmsci10.pro and wntmsci10 install sets are ready. Feel free to ask if You have questions.
AW->CGU: Please verify as described.
I reopen the issue.
Back to you. There is a empty area where the old entries have been. The persist entries should shift upwards.
AW: Resync to m235 done, wntmsci10, unxlngi6.pro and unxsols4.pro built. AW: Changed ressource to move the remaining options in tools/options/DrawImpress/View to the top. Built, but test installation does not come up. AW: Need to completely built wntmsci10.pro version. I will see if that one will start then. Else, i have to hunt problems after resync :-(
AW: wntmsci10 and wntmsci10.pro are both working now (after rebuild). Changed ressource (tpoption.src in sd) to move remaining options to the top in tools/options/drawImpress/View. Checked in. Building installsets...
Created attachment 49524 [details] The Spec (now with pictures)
AW: Install sets ready (unxlngi6.pro, unxsols4.pro, wntmsci10, wntmsci10.pro). Updated Spec attached (on this task).
AW->CGU: Please verify.
Verified in cws aw053
Created attachment 49806 [details] Test case specification
CGU: Integrated in dev300m25 and beb300m3