You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/05/31 15:56:04 UTC
svn commit: r1488227 [7/15] - in /openoffice/branches/rejuvenate01: ./
ext_libraries/apr/ ext_libraries/apr/prj/ ext_libraries/coinmp/prj/
ext_libraries/ratscan/prj/ ext_libraries/serf/prj/ main/
main/basctl/source/dlged/ main/basctl/uiconfig/basicide/...
Modified: openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu (original)
+++ openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu Fri May 31 13:55:58 2013
@@ -345,10 +345,13 @@
<prop oor:name="ContextList">
<value oor:separator=";">
Calc, Draw, visible ;
+ Calc, OLE, hidden ;
DrawImpress, 3DObject, visible ;
DrawImpress, Draw, visible ;
DrawImpress, TextObject, hidden ;
+ DrawImpress, OLE, hidden ;
WriterVariants, Draw, visible ;
+ WriterVariants, OLE, hidden, .uno:FrameDialog ;
</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
@@ -376,11 +379,14 @@
<value oor:separator=";">
Calc, Draw, visible ;
Calc, Graphic, visible ;
+ Calc, OLE, hidden ;
DrawImpress, 3DObject, visible ;
DrawImpress, Draw, visible ;
DrawImpress, Graphic, visible ;
DrawImpress, TextObject, hidden ;
+ DrawImpress, OLE, hidden ;
WriterVariants, Draw, visible ;
+ WriterVariants, OLE, hidden, .uno:FrameDialog ;
</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
@@ -746,6 +752,7 @@
<value oor:separator=";">
Calc, Auditing, visible ;
Calc, Cell, visible ;
+ Calc, EditCell, visible ;
Calc, default, visible ;
Calc, Pivot, visible ;
</value>
@@ -775,6 +782,7 @@
<value oor:separator=";">
Calc, Auditing, hidden ;
Calc, Cell, hidden ;
+ Calc, EditCell, hidden ;
Calc, default, hidden ;
Calc, Pivot, hidden ;
</value>
Modified: openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu (original)
+++ openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu Fri May 31 13:55:58 2013
@@ -35,7 +35,7 @@
</node>
<node oor:name=".uno:AcceptTrackedChanges" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Accept or Reject...</value>
+ <value xml:lang="en-US">~Accept or Reject...</value>
</prop>
</node>
<node oor:name=".uno:AddAllUnknownWords" oor:op="replace">
@@ -83,17 +83,17 @@
</node>
<node oor:name=".uno:AuthoritiesEntryDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Bibliography Entry...</value>
+ <value xml:lang="en-US">~Bibliography Entry...</value>
</prop>
</node>
<node oor:name=".uno:AutoFormatApply" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Apply</value>
+ <value xml:lang="en-US">Appl~y</value>
</prop>
</node>
<node oor:name=".uno:AutoFormatRedlineApply" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Apply and Edit Changes</value>
+ <value xml:lang="en-US">Apply and Edit ~Changes</value>
</prop>
</node>
<node oor:name=".uno:BackColor" oor:op="replace">
@@ -119,7 +119,7 @@
</node>
<node oor:name=".uno:BulletsAndNumberingDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Bullets and Numbering...</value>
+ <value xml:lang="en-US">~Bullets and Numbering...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -132,7 +132,7 @@
</node>
<node oor:name=".uno:CalculateSel" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Calculate</value>
+ <value xml:lang="en-US">Calculat~e</value>
</prop>
</node>
<node oor:name=".uno:ChainFrames" oor:op="replace">
@@ -145,7 +145,7 @@
</node>
<node oor:name=".uno:ChangeDatabaseField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Exchange Database...</value>
+ <value xml:lang="en-US">Exc~hange Database...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -153,7 +153,7 @@
</node>
<node oor:name=".uno:ChapterNumberingDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Outline Numbering...</value>
+ <value xml:lang="en-US">Outline ~Numbering...</value>
</prop>
</node>
<node oor:name=".uno:CharBackgroundExt" oor:op="replace">
@@ -184,7 +184,7 @@
</node>
<node oor:name=".uno:CommentChangeTracking" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Comment...</value>
+ <value xml:lang="en-US">~Comment...</value>
</prop>
</node>
<node oor:name=".uno:ContinueNumbering" oor:op="replace">
@@ -194,7 +194,7 @@
</node>
<node oor:name=".uno:ControlCodes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Nonprinting Characters</value>
+ <value xml:lang="en-US">~Nonprinting Characters</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
@@ -202,17 +202,17 @@
</node>
<node oor:name=".uno:ConvertTableText" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Text <-> Table...</value>
+ <value xml:lang="en-US">Te~xt <-> Table...</value>
</prop>
</node>
<node oor:name=".uno:ConvertTableToText" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Table to Text...</value>
+ <value xml:lang="en-US">T~able to Text...</value>
</prop>
</node>
<node oor:name=".uno:ConvertTextToTable" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Text to Table...</value>
+ <value xml:lang="en-US">~Text to Table...</value>
</prop>
</node>
<node oor:name=".uno:CopyHyperlinkLocation" oor:op="replace">
@@ -222,7 +222,7 @@
</node>
<node oor:name=".uno:CreateAbstract" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Create AutoAbstract...</value>
+ <value xml:lang="en-US">Create A~utoAbstract...</value>
</prop>
</node>
<node oor:name=".uno:DecrementIndentValue" oor:op="replace">
@@ -293,7 +293,7 @@
</node>
<node oor:name=".uno:DeleteTable" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Table</value>
+ <value xml:lang="en-US">~Table</value>
</prop>
</node>
<node oor:name=".uno:EditCurIndex" oor:op="replace">
@@ -303,12 +303,12 @@
</node>
<node oor:name=".uno:EditFootnote" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Footnote/Endnote...</value>
+ <value xml:lang="en-US">Footnote/Endnote~...</value>
</prop>
</node>
<node oor:name=".uno:EditGlossary" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">AutoText...</value>
+ <value xml:lang="en-US">AutoTe~xt...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -316,7 +316,7 @@
</node>
<node oor:name=".uno:EditRegion" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sections...</value>
+ <value xml:lang="en-US">~Sections...</value>
</prop>
</node>
<node oor:name=".uno:EndOfDocumentSel" oor:op="replace">
@@ -336,7 +336,7 @@
</node>
<node oor:name=".uno:EntireCell" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Cells</value>
+ <value xml:lang="en-US">C~ells</value>
</prop>
</node>
<node oor:name=".uno:Escape" oor:op="replace">
@@ -361,12 +361,12 @@
</node>
<node oor:name=".uno:FieldDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fields...</value>
+ <value xml:lang="en-US">F~ields...</value>
</prop>
</node>
<node oor:name=".uno:Fieldnames" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Field Names</value>
+ <value xml:lang="en-US">~Field Names</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -382,12 +382,12 @@
</node>
<node oor:name=".uno:FootnoteDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Footnotes/Endnotes...</value>
+ <value xml:lang="en-US">~Footnotes/Endnotes...</value>
</prop>
</node>
<node oor:name=".uno:FormatColumns" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Columns...</value>
+ <value xml:lang="en-US">Co~lumns...</value>
</prop>
</node>
<node oor:name=".uno:FormatDropcap" oor:op="replace">
@@ -400,7 +400,7 @@
<value xml:lang="en-US">Frame Properties</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Frame/Object...</value>
+ <value xml:lang="en-US">Fra~me/Object...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -671,7 +671,7 @@
<value xml:lang="en-US">Picture...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Picture...</value>
+ <value xml:lang="en-US">Pict~ure...</value>
</prop>
</node>
<node oor:name=".uno:HScroll" oor:op="replace">
@@ -707,7 +707,7 @@
</node>
<node oor:name=".uno:IndexEntryDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Index Entry...</value>
+ <value xml:lang="en-US">Index Entr~y...</value>
</prop>
</node>
<node oor:name=".uno:IndexMarkToIndex" oor:op="replace">
@@ -717,7 +717,7 @@
</node>
<node oor:name=".uno:InsertAuthoritiesEntry" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Bibliography Entry...</value>
+ <value xml:lang="en-US">~Bibliography Entry...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>8</value>
@@ -725,7 +725,7 @@
</node>
<node oor:name=".uno:InsertBookmark" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Bookmark...</value>
+ <value xml:lang="en-US">Bookmar~k...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -733,7 +733,7 @@
</node>
<node oor:name=".uno:InsertBreak" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Manual Break...</value>
+ <value xml:lang="en-US">Manual ~Break...</value>
</prop>
</node>
<node oor:name=".uno:InsertCaptionDialog" oor:op="replace">
@@ -746,7 +746,7 @@
</node>
<node oor:name=".uno:InsertDateField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Date</value>
+ <value xml:lang="en-US">~Date</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -762,12 +762,12 @@
</node>
<node oor:name=".uno:InsertEnvelope" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Envelope...</value>
+ <value xml:lang="en-US">En~velope...</value>
</prop>
</node>
<node oor:name=".uno:InsertField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Other...</value>
+ <value xml:lang="en-US">~Other...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -796,12 +796,12 @@
</node>
<node oor:name=".uno:InsertFootnoteDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Footnote/Endnote...</value>
+ <value xml:lang="en-US">Footnote/Endnote~...</value>
</prop>
</node>
<node oor:name=".uno:InsertFormula" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Formula</value>
+ <value xml:lang="en-US">Fo~rmula</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -809,7 +809,7 @@
</node>
<node oor:name=".uno:InsertFrame" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Frame...</value>
+ <value xml:lang="en-US">Fra~me...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -833,7 +833,7 @@
</node>
<node oor:name=".uno:InsertGraphicRuler" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Horizontal Ruler...</value>
+ <value xml:lang="en-US">Hori~zontal Ruler...</value>
</prop>
</node>
<node oor:name=".uno:InsertHeader" oor:op="replace">
@@ -848,7 +848,7 @@
</node>
<node oor:name=".uno:InsertIndexesEntry" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Entry...</value>
+ <value xml:lang="en-US">~Entry...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -861,7 +861,7 @@
</node>
<node oor:name=".uno:InsertMultiIndex" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Indexes and Tables...</value>
+ <value xml:lang="en-US">~Indexes and Tables...</value>
</prop>
</node>
<node oor:name=".uno:InsertNeutralParagraph" oor:op="replace">
@@ -890,7 +890,7 @@
</node>
<node oor:name=".uno:InsertPageCountField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Page Count</value>
+ <value xml:lang="en-US">Page ~Count</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -898,12 +898,12 @@
</node>
<node oor:name=".uno:InsertPageFooter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Footer</value>
+ <value xml:lang="en-US">Foote~r</value>
</prop>
</node>
<node oor:name=".uno:InsertPageHeader" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Header</value>
+ <value xml:lang="en-US">He~ader</value>
</prop>
</node>
<node oor:name=".uno:InsertPagebreak" oor:op="replace">
@@ -926,12 +926,12 @@
</node>
<node oor:name=".uno:InsertScript" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Script...</value>
+ <value xml:lang="en-US">S~cript...</value>
</prop>
</node>
<node oor:name=".uno:InsertSection" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Section...</value>
+ <value xml:lang="en-US">~Section...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -939,7 +939,7 @@
</node>
<node oor:name=".uno:InsertTitleField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Title</value>
+ <value xml:lang="en-US">T~itle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -947,7 +947,7 @@
</node>
<node oor:name=".uno:InsertTopicField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Subject</value>
+ <value xml:lang="en-US">~Subject</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1050,7 +1050,7 @@
</node>
<node oor:name=".uno:LineNumberingDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Line Numbering...</value>
+ <value xml:lang="en-US">~Line Numbering...</value>
</prop>
</node>
<node oor:name=".uno:LineUpSel" oor:op="replace">
@@ -1060,7 +1060,7 @@
</node>
<node oor:name=".uno:LinkDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Links...</value>
+ <value xml:lang="en-US">Lin~ks...</value>
</prop>
</node>
<node oor:name=".uno:LoadStyles" oor:op="replace">
@@ -1070,12 +1070,12 @@
</node>
<node oor:name=".uno:MailMergeWizard" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Mail Merge Wizard...</value>
+ <value xml:lang="en-US">Mail Merge Wi~zard...</value>
</prop>
</node>
<node oor:name=".uno:Marks" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Field Shadings</value>
+ <value xml:lang="en-US">Fie~ld Shadings</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1083,7 +1083,7 @@
</node>
<node oor:name=".uno:MergeDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Mail Merge...</value>
+ <value xml:lang="en-US">~Mail Merge...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1138,12 +1138,12 @@
</node>
<node oor:name=".uno:NewGlobalDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Create Master Document</value>
+ <value xml:lang="en-US">Create Master ~Document</value>
</prop>
</node>
<node oor:name=".uno:NewHtmlDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Create HTML Document</value>
+ <value xml:lang="en-US">Create ~HTML Document</value>
</prop>
</node>
<node oor:name=".uno:NumberOrNoNumber" oor:op="replace">
@@ -1161,7 +1161,7 @@
</node>
<node oor:name=".uno:OnlineAutoFormat" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">While Typing</value>
+ <value xml:lang="en-US">~While Typing</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>8</value>
@@ -1233,7 +1233,7 @@
</node>
<node oor:name=".uno:PrintLayout" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Print Layout</value>
+ <value xml:lang="en-US">~Print Layout</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1310,7 +1310,7 @@
</node>
<node oor:name=".uno:Ruler" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Ruler</value>
+ <value xml:lang="en-US">~Ruler</value>
</prop>
</node>
<node oor:name=".uno:SaveGraphic" oor:op="replace">
@@ -1340,7 +1340,7 @@
</node>
<node oor:name=".uno:SelectionModeBlock" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Block Area</value>
+ <value xml:lang="en-US">~Block Area</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>8</value>
@@ -1348,7 +1348,7 @@
</node>
<node oor:name=".uno:SelectionModeDefault" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Standard</value>
+ <value xml:lang="en-US">~Standard</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>8</value>
@@ -1356,27 +1356,27 @@
</node>
<node oor:name=".uno:SendAbstractToStarImpress" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">AutoAbstract to Presentation...</value>
+ <value xml:lang="en-US">AutoAbst~ract to Presentation...</value>
</prop>
</node>
<node oor:name=".uno:SendMailDocAsMS" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">E-mail as Microsoft Word...</value>
+ <value xml:lang="en-US">E-mail as ~Microsoft Word...</value>
</prop>
</node>
<node oor:name=".uno:SendMailDocAsOOo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">E-mail as OpenDocument Text...</value>
+ <value xml:lang="en-US">E-mail as ~OpenDocument Text...</value>
</prop>
</node>
<node oor:name=".uno:SendOutlineToClipboard" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Outline to Clipboard</value>
+ <value xml:lang="en-US">Outline to ~Clipboard</value>
</prop>
</node>
<node oor:name=".uno:SendOutlineToStarImpress" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Outline to Presentation</value>
+ <value xml:lang="en-US">Outline to ~Presentation</value>
</prop>
</node>
<node oor:name=".uno:SetAnchorAtChar" oor:op="replace">
@@ -1384,7 +1384,7 @@
<value xml:lang="en-US">Anchor to Character</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">To Character</value>
+ <value xml:lang="en-US">To ~Character</value>
</prop>
</node>
<node oor:name=".uno:SetAnchorToChar" oor:op="replace">
@@ -1392,7 +1392,7 @@
<value xml:lang="en-US">Anchor as Character</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">As Character</value>
+ <value xml:lang="en-US">As C~haracter</value>
</prop>
</node>
<node oor:name=".uno:SetAnchorToFrame" oor:op="replace">
@@ -1400,7 +1400,7 @@
<value xml:lang="en-US">Anchor To Frame</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">To Frame</value>
+ <value xml:lang="en-US">To ~Frame</value>
</prop>
</node>
<node oor:name=".uno:SetAnchorToPara" oor:op="replace">
@@ -1408,12 +1408,12 @@
<value xml:lang="en-US">Anchor To Paragraph</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">To Paragraph</value>
+ <value xml:lang="en-US">To ~Paragraph</value>
</prop>
</node>
<node oor:name=".uno:SetColumnWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Column Width...</value>
+ <value xml:lang="en-US">~Column Width...</value>
</prop>
</node>
<node oor:name=".uno:SetExtSelection" oor:op="replace">
@@ -1470,7 +1470,7 @@
</node>
<node oor:name=".uno:ShowHiddenParagraphs" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Hidden Paragraphs</value>
+ <value xml:lang="en-US">~Hidden Paragraphs</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>8</value>
@@ -1486,7 +1486,7 @@
</node>
<node oor:name=".uno:ShowTrackedChanges" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Show</value>
+ <value xml:lang="en-US">~Show</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>8</value>
@@ -1502,7 +1502,7 @@
</node>
<node oor:name=".uno:SortDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sort...</value>
+ <value xml:lang="en-US">So~rt...</value>
</prop>
</node>
<node oor:name=".uno:SplitTable" oor:op="replace">
@@ -1584,7 +1584,7 @@
<value xml:lang="en-US">Text Wrap...</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Edit...</value>
+ <value xml:lang="en-US">~Edit...</value>
</prop>
</node>
<node oor:name=".uno:ToggleObjectLayer" oor:op="replace">
@@ -1594,7 +1594,7 @@
</node>
<node oor:name=".uno:TrackChanges" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Record</value>
+ <value xml:lang="en-US">~Record</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>8</value>
@@ -1615,32 +1615,32 @@
</node>
<node oor:name=".uno:UpdateAll" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Update All</value>
+ <value xml:lang="en-US">~Update All</value>
</prop>
</node>
<node oor:name=".uno:UpdateAllIndexes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">All Indexes and Tables</value>
+ <value xml:lang="en-US">~All Indexes and Tables</value>
</prop>
</node>
<node oor:name=".uno:UpdateAllLinks" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Links</value>
+ <value xml:lang="en-US">~Links</value>
</prop>
</node>
<node oor:name=".uno:UpdateCharts" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">All Charts</value>
+ <value xml:lang="en-US">All ~Charts</value>
</prop>
</node>
<node oor:name=".uno:UpdateCurIndex" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Current Index</value>
+ <value xml:lang="en-US">Current ~Index</value>
</prop>
</node>
<node oor:name=".uno:UpdateFields" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fields</value>
+ <value xml:lang="en-US">~Fields</value>
</prop>
</node>
<node oor:name=".uno:UpdateInputFields" oor:op="replace">
@@ -1660,12 +1660,12 @@
</node>
<node oor:name=".uno:ViewBounds" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Text Boundaries</value>
+ <value xml:lang="en-US">Te~xt Boundaries</value>
</prop>
</node>
<node oor:name=".uno:WordCountDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Word Count</value>
+ <value xml:lang="en-US">~Word Count</value>
</prop>
</node>
<node oor:name=".uno:WordLeftSel" oor:op="replace">
@@ -1683,7 +1683,7 @@
<value xml:lang="en-US">Wrap First Paragraph</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">First Paragraph</value>
+ <value xml:lang="en-US">~First Paragraph</value>
</prop>
</node>
<node oor:name=".uno:WrapContour" oor:op="replace">
@@ -1691,7 +1691,7 @@
<value xml:lang="en-US">Wrap Contour On</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">Contour</value>
+ <value xml:lang="en-US">~Contour</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -1699,7 +1699,7 @@
</node>
<node oor:name=".uno:WrapIdeal" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Optimal Page Wrap</value>
+ <value xml:lang="en-US">~Optimal Page Wrap</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1723,7 +1723,7 @@
</node>
<node oor:name=".uno:WrapOn" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Page Wrap</value>
+ <value xml:lang="en-US">~Page Wrap</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -1739,7 +1739,7 @@
</node>
<node oor:name=".uno:WrapThrough" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Wrap Through</value>
+ <value xml:lang="en-US">~Wrap Through</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -1747,19 +1747,19 @@
</node>
<node oor:name=".uno:WrapThroughTransparent" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">In Background</value>
+ <value xml:lang="en-US">In ~Background</value>
</prop>
</node>
</node>
<node oor:name="Popups">
<node oor:name=".uno:AutoFormatMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">AutoCorrect</value>
+ <value xml:lang="en-US">AutoCorr~ect</value>
</prop>
</node>
<node oor:name=".uno:IndexesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Indexes and Tables</value>
+ <value xml:lang="en-US">Inde~xes and Tables</value>
</prop>
</node>
<node oor:name=".uno:PageSettingDialog" oor:op="replace">
@@ -1774,27 +1774,27 @@
</node>
<node oor:name=".uno:StylesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Styles</value>
+ <value xml:lang="en-US">Styl~es</value>
</prop>
</node>
<node oor:name=".uno:TableAutoFitMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Autofit</value>
+ <value xml:lang="en-US">A~utofit</value>
</prop>
</node>
<node oor:name=".uno:TableConvertMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Convert</value>
+ <value xml:lang="en-US">~Convert</value>
</prop>
</node>
<node oor:name=".uno:TableDeleteMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Delete</value>
+ <value xml:lang="en-US">~Delete</value>
</prop>
</node>
<node oor:name=".uno:TableInsertMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert</value>
+ <value xml:lang="en-US">~Insert</value>
</prop>
</node>
<node oor:name=".uno:TableMenu" oor:op="replace">
@@ -1804,17 +1804,17 @@
</node>
<node oor:name=".uno:TableSelectMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Select</value>
+ <value xml:lang="en-US">~Select</value>
</prop>
</node>
<node oor:name=".uno:UpdateMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Update</value>
+ <value xml:lang="en-US">~Update</value>
</prop>
</node>
<node oor:name=".uno:WrapMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Wrap</value>
+ <value xml:lang="en-US">~Wrap</value>
</prop>
</node>
</node>
Modified: openoffice/branches/rejuvenate01/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs (original)
+++ openoffice/branches/rejuvenate01/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs Fri May 31 13:55:58 2013
@@ -88,6 +88,7 @@
com.sun.star.text.WebDocument
com.sun.star.xforms.XMLFormDocument
com.sun.star.sdb.FormDesign
+ com.sun.star.sdb.TextReportDesign
com.sun.star.sheet.SpreadsheetDocument
com.sun.star.presentation.PresentationDocument
com.sun.star.drawing.DrawingDocument
Modified: openoffice/branches/rejuvenate01/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/postprocess/packcomponents/makefile.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/postprocess/packcomponents/makefile.mk Fri May 31 13:55:58 2013
@@ -90,7 +90,7 @@ my_components = \
component/sw/util/sw \
component/sw/util/swd \
component/sw/util/vbaswobj \
- component/toolkit/util/tk \
+ component/toolkit/util/ootk \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
component/xmloff/source/transform/xof \
Modified: openoffice/branches/rejuvenate01/main/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java (original)
+++ openoffice/branches/rejuvenate01/main/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java Fri May 31 13:55:58 2013
@@ -61,7 +61,7 @@ public class _XPopupMenuController exten
System.out.println("enableItem called.");
}
- public short execute(com.sun.star.awt.XWindowPeer xWindowPeer, com.sun.star.awt.Point pos, short param) {
+ public short execute(com.sun.star.awt.XWindowPeer xWindowPeer, com.sun.star.awt.Rectangle pos, short param) {
System.out.println("execute called.");
return 0;
}
Modified: openoffice/branches/rejuvenate01/main/readlicense_oo/docs/readme/readme.xrm
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/readlicense_oo/docs/readme/readme.xrm?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/readlicense_oo/docs/readme/readme.xrm (original)
+++ openoffice/branches/rejuvenate01/main/readlicense_oo/docs/readme/readme.xrm Fri May 31 13:55:58 2013
@@ -39,13 +39,13 @@
<h1 id="Welcome" xml:lang="en-US">${PRODUCTNAME} ${PRODUCTVERSION} ReadMe</h1>
<p id="LatestUpdates" xml:lang="en-US">For latest updates to this readme file, see <a href="http://www.openoffice.org/welcome/readme.html">http://www.openoffice.org/welcome/readme.html</a></p>
<p id="A6" xml:lang="en-US">This file contains important information about this program. Please read this information very carefully before starting work.</p>
- <p id="A7" xml:lang="en-US">The Apache OpenOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.openoffice.org/about_us/introduction.html">http://www.openoffice.org/about_us/introduction.html</a></p>
+ <p id="A7" xml:lang="en-US">The Apache OpenOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} community site with helpful information at <a href="http://openoffice.apache.org">http://openoffice.apache.org</a></p>
<p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the Apache OpenOffice project.</p>
<h3 id="A10" xml:lang="en-US">Is ${PRODUCTNAME} really free for any user? </h3>
<p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or <a href="http://www.openoffice.org/license.html">http://www.openoffice.org/license.html</a></p>
<h3 id="A12" xml:lang="en-US">Why is ${PRODUCTNAME} free for any user?</h3>
<p id="A13" xml:lang="en-US">You can use this copy of ${PRODUCTNAME} today free of charge because individual contributors and corporate sponsors have designed, developed, tested, translated, documented, supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today - the world's leading open-source office software.</p>
- <p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure Apache OpenOffice continues into the future, please consider contributing to the project - see <a href="http://contributing.openoffice.org">http://contributing.openoffice.org</a> for details. Everyone has a contribution to make.</p>
+ <p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure Apache OpenOffice continues into the future, please consider contributing to the project - see <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> for details on contributing time and <a href="http://www.apache.org/foundation/contributing.html">http://www.apache.org/foundation/contributing.html</a> for details on donations. Everyone has a contribution to make.</p>
</div>
<div id="Installation">
@@ -78,11 +78,11 @@
<div class="WIN" id="SystemRequirements_WIN">
<ul>
<li>
- <p id="s2s3sdf2" xml:lang="en-US">Microsoft Windows 2000 (Service Pack 4 or higher), XP, Vista, or Windows 7</p>
+ <p id="s2s3sdf2" xml:lang="en-US">Microsoft Windows XP, Vista, Windows 7 or Windows 8</p>
</li>
<li>
- <p id="utzu6" xml:lang="en-US">Pentium compatible PC (Pentium III or Athlon recommended)</p>
+ <p id="utzu6" xml:lang="en-US">Pentium III or later processor</p>
</li>
<li>
@@ -108,7 +108,7 @@
<p id="MSOReg3" xml:lang="en-US"><tt>/msoreg=0</tt> will suppress registration of ${PRODUCTNAME} as default application for Microsoft Office formats.</p>
</li>
</ul>
- <p id="DLLA1" xml:lang="en-US">If you perform an administrative installation using setup /a, you need to make sure that the file msvc90.dll is installed on the system. This file is required for ${PRODUCTNAME} to start after an administrative installation. You can get the file from <a href="http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF">http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF</a></p>
+ <p id="DLLA1" xml:lang="en-US">If you perform an administrative installation using setup /a, you need to make sure that the file msvcr100.dll is installed on the system. This file is required for ${PRODUCTNAME} to start after an administrative installation. You can get the file from <a href="http://www.microsoft.com/en-us/download/details.aspx?id=5555">http://www.microsoft.com/en-us/download/details.aspx?id=5555</a></p>
<p class="note" id="AdminNeeded" xml:lang="en-US">Please be aware that administrator rights are needed for the installation process.</p>
</div>
<div class="SOLSPARC" id="Sols2">
@@ -180,7 +180,7 @@
</li>
<li>
- <p id="s2etfseg" xml:lang="en-US">Pentium compatible PC (Pentium III or Athlon recommended)</p>
+ <p id="s2etfseg" xml:lang="en-US">Pentium III or later processor</p>
</li>
<li>
@@ -209,13 +209,6 @@
<p id="Precautions" xml:lang="en-US">Please make sure you have enough free memory in the temporary directory on your system and that read, write and run access rights have been granted. Close all other programs before starting the installation.</p>
</div>
- <div id="BerkeleyDB">
- <h2 id="BDB11" xml:lang="en-US">Extension Database Incompatibility</h2>
- <p id="BDB2a" xml:lang="en-US">The Berkeley database engine has been upgraded in this version of ${PRODUCTNAME}. The database engine upgrade introduces an incompatibility with user data for installed extensions for ${PRODUCTNAME} versions prior to 3.2 that may require your action if you downgrade your version of ${PRODUCTNAME}.</p>
- <p id="BDB3a" xml:lang="en-US">This version of ${PRODUCTNAME} will convert your extension database to the new Berkeley database format when extensions are installed or removed. After this conversion, the database can no longer be read by earlier versions of ${PRODUCTNAME}. Downgrading to an earlier version may result in a dysfunctional installation.</p>
- <p id="BDB4a" xml:lang="en-US">If you downgrade to an earlier version of ${PRODUCTNAME}, you must remove the user data directory <tt>{user data}/uno_packages</tt>, for example <tt>~/.openoffice.org/3/user/uno_packages</tt>, and reinstall all extensions.</p>
- </div>
-
<div class="LINUX WIN" id="StartupProblems">
<h2 id="naso01" xml:lang="en-US">Problems During Program Startup</h2>
<div class="LINUX" id="GnomeStartupProblems">
@@ -266,13 +259,13 @@
<div id="UserSupport">
<h2 id="support" xml:lang="en-US">User Support</h2>
- <p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users@openoffice.apache.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.apache.org">users@openoffice.apache.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p>
- <p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ">http://wiki.services.openoffice.org/wiki/Documentation/FAQ.</a></p>
+ <p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://forum.openoffice.org">http://forum.openoffice.org</a> or search the archives of the 'users@openoffice.apache.org' mailing list at <a href="http://openoffice.apache.org/mailing-lists.html">http://openoffice.apache.org/mailing-lists.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.apache.org">users@openoffice.apache.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://openoffice.apache.org/mailing-lists.html">http://openoffice.apache.org/mailing-lists.html</a>.</p>
+ <p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://wiki.openoffice.org/wiki/Documentation/FAQ">http://wiki.openoffice.org/wiki/Documentation/FAQ</a>.</p>
</div>
<div id="ReportBugsIssues">
<h2 id="reportbugs" xml:lang="en-US">Reporting Bugs & Issues</h2>
- <p id="reportbugs1" xml:lang="en-US">The ${PRODUCTNAME} Web site hosts IssueZilla, our mechanism for reporting, tracking and solving bugs and issues. We encourage all users to feel entitled and welcome to report issues that may arise on your particular platform. Energetic reporting of issues is one of the most important contributions that the user community can make to the ongoing development and improvement of the suite.</p>
+ <p id="reportbugs1" xml:lang="en-US">The ${PRODUCTNAME} Web site hosts <a href="https://issues.apache.org/ooo/">BugZilla</a>, our mechanism for reporting, tracking and solving bugs and issues. We encourage all users to feel entitled and welcome to report issues that may arise on your particular platform. Energetic reporting of issues is one of the most important contributions that the user community can make to the ongoing development and improvement of the suite.</p>
</div>
<div id="GettingInvolved">
@@ -280,30 +273,26 @@
<p id="gettinginvolved2" xml:lang="en-US">The ${PRODUCTNAME} Community would very much benefit from your active participation in the development of this important open source project.</p>
<p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the user page at <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a></p>
<h3 id="howtostart" xml:lang="en-US">How to Start</h3>
- <p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href="http://development.openoffice.org/todo.html">http://development.openoffice.org/todo.html</a>.</p>
+ <p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in.</p>
<h3 id="subscribe" xml:lang="en-US">Subscribe</h3>
- <p id="subscribe1" xml:lang="en-US">Here are a few of the Project mailing lists to which you can subscribe at <a href="http://openoffice.apache.org/mailing-lists.html">http://openoffice.apache.org/mailing-lists.html</a></p>
+ <p id="subscribe1" xml:lang="en-US">Here are a few of the ${PRODUCTNAME} mailing lists to which you can subscribe at <a href="http://openoffice.apache.org/mailing-lists.html">http://openoffice.apache.org/mailing-lists.html</a></p>
<ul>
<li>
- <p id="subscribelist1" xml:lang="en-US">News: ooo-announce@incubator.apache.org *recommended to all users* (light traffic)</p>
- </li>
-
- <li>
- <p id="subscribelist2" xml:lang="en-US">Main user forum: ooo-users@incubator.apache.org *easy way to lurk on discussions* (heavy traffic)</p>
+ <p id="subscribelist1" xml:lang="en-US">News: announce@openoffice.apache.org *recommended to all users* (light traffic)</p>
</li>
<li>
- <p id="subscribelist3" xml:lang="en-US">Marketing project: ooo-marketing@incubator.apache.org *beyond development* (getting heavy)</p>
+ <p id="subscribelist2" xml:lang="en-US">Main user forum: users@openoffice.apache.org *easy way to lurk on discussions* (heavy traffic)</p>
</li>
<li>
- <p id="subscribelist4" xml:lang="en-US">General code contributor list: ooo-dev@incubator.apache.org (moderate/heavy)</p>
+ <p id="subscribelist4" xml:lang="en-US">General project development and discussion list: dev@openoffice.apache.org (heavy traffic)</p>
</li>
</ul>
<h3 xml:lang="en-US">Joining the Project</h3>
<p id="joining" xml:lang="en-US">You can make major contributions to this important open source project even if you have limited software design or coding experience. Yes, you!</p>
- <p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The Apache OpenOffice Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
- <p id="joining3" xml:lang="en-US">You can help by joining the marktig mailig list ooo-marketing@incubator.apache.org or visit the Marketing Communications & Information Network on <a href="http://marketing.openoffice.org">http://marketing.openoffice.org</a> where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p>
+ <p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, you can help with Documentation or Marketing, for example. The ${PRODUCTNAME} marketing is applying both guerrilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
+ <p id="joining3" xml:lang="en-US">You can help by joining the marketing mailing list marketing@openoffice.apache.org where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p>
</div>
<div id="Credits">
Modified: openoffice/branches/rejuvenate01/main/sal/inc/rtl/allocator.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/rtl/allocator.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/rtl/allocator.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/rtl/allocator.hxx Fri May 31 13:55:58 2013
@@ -120,9 +120,8 @@ public:
are not enabled, e.g. GCC under Linux and it is
in general not desired to compile sal with exceptions
enabled. */
- pointer allocate (size_type n, const void* hint = 0)
+ pointer allocate (size_type n, const void* /*hint=NULL*/)
{
- hint = hint; /* avoid warnings */
return reinterpret_cast<pointer>(
rtl_allocateMemory(sal_uInt32(n * sizeof(T))));
}
Modified: openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx Fri May 31 13:55:58 2013
@@ -947,7 +947,7 @@ struct CStringHash
size_t operator()( const char* p) const {
size_t n = 0;
while( *p)
- n += 4*n + *(p++);
+ n += 4*n + *reinterpret_cast<const unsigned char*>(p++);
return n;
}
};
Modified: openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h Fri May 31 13:55:58 2013
@@ -27,6 +27,7 @@
#include "osl/endian.h"
#include <float.h>
+#include <math.h>
#if defined SOLARIS
#include <ieeefp.h>
@@ -54,7 +55,15 @@ extern "C" {
/* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#ifdef __STDC__
+#if defined(__GNUC__)
+#if defined(MACOSX)
+ #define SAL_MATH_FINITE(d) finite(d)
+#else
+ #define SAL_MATH_FINITE(d) __builtin_isfinite(d) // gcc bug 14608
+#endif
+#elif defined(__STDC__)
+ // isfinite() should be available in math.h according to C99,C++99,SUSv3,etc.
+ // unless GCC bug 14608 hits us where cmath undefines isfinite as macro
#define SAL_MATH_FINITE(d) isfinite(d)
#elif defined( WNT)
#define SAL_MATH_FINITE(d) _finite(d)
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docsh.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docsh.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docsh.cxx Fri May 31 13:55:58 2013
@@ -203,7 +203,7 @@ namespace
static const struct
{
const char * mpFilterName;
- unsigned mnFilterNameLen;
+ size_t mnFilterNameLen;
} szMSFilterNames [] =
{
{ pFilterExcel4, strlen( pFilterExcel4 ) },
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/drawfunc/drawsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/drawfunc/drawsh2.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/drawfunc/drawsh2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/drawfunc/drawsh2.cxx Fri May 31 13:55:58 2013
@@ -43,6 +43,7 @@
#include <svx/fontworkbar.hxx>
#include <svx/sidebar/SelectionChangeHandler.hxx>
#include <svx/sidebar/SelectionAnalyzer.hxx>
+#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
#include "drawsh.hxx"
#include "drawview.hxx"
@@ -69,7 +70,7 @@ ScDrawShell::ScDrawShell( ScViewData* pD
SfxShell(pData->GetViewShell()),
pViewData( pData ),
mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
- ::boost::bind(&ScDrawShell::GetContextForSelection, this),
+ ::boost::bind(&ScDrawShell::GetSidebarContextName, this),
GetFrame()->GetFrame().GetController(),
sfx2::sidebar::EnumContext::Context_Cell))
{
@@ -408,8 +409,25 @@ void ScDrawShell::GetDrawAttrStateForIFB
}
}
-sfx2::sidebar::EnumContext::Context ScDrawShell::GetContextForSelection (void)
+
+
+
+void ScDrawShell::Activate (const sal_Bool bMDI)
+{
+ (void)bMDI;
+
+ ContextChangeEventMultiplexer::NotifyContextChange(
+ GetFrame()->GetFrame().GetController(),
+ ::sfx2::sidebar::EnumContext::GetContextEnum(
+ GetSidebarContextName()));
+}
+
+
+
+
+::rtl::OUString ScDrawShell::GetSidebarContextName (void)
{
- return ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC(
- GetDrawView()->GetMarkedObjectList());
+ return sfx2::sidebar::EnumContext::GetContextName(
+ ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC(
+ GetDrawView()->GetMarkedObjectList()));
}
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/inc/drawsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/inc/drawsh.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/inc/drawsh.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/inc/drawsh.hxx Fri May 31 13:55:58 2013
@@ -27,7 +27,6 @@
#include <sfx2/shell.hxx>
#include "shellids.hxx"
#include <sfx2/module.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
#include <svx/svdmark.hxx>
#include <tools/link.hxx>
#include <rtl/ref.hxx>
@@ -51,6 +50,7 @@ class ScDrawShell : public SfxShell
#endif
protected:
+ virtual void Activate(sal_Bool bMDI);
ScViewData* GetViewData() { return pViewData; }
public:
@@ -89,7 +89,7 @@ public:
sal_Bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark);
void GetDrawAttrStateForIFBX( SfxItemSet& rSet );
- ::sfx2::sidebar::EnumContext::Context GetContextForSelection (void);
+ ::rtl::OUString GetSidebarContextName (void);
};
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/navipi/navipi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/navipi/navipi.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/navipi/navipi.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/navipi/navipi.cxx Fri May 31 13:55:58 2013
@@ -56,6 +56,8 @@
#include "navipi.hxx"
#include "navsett.hxx"
+#include <algorithm>
+
// Timeout, um Notizen zu suchen
#define SC_CONTENT_TIMEOUT 1000
@@ -700,7 +702,11 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindi
aTitleBase = GetText();
- long nListboxYPos = aTbxCmd.GetPosPixel().Y() + aTbxCmd.GetSizePixel().Height() + 4;
+ const long nListboxYPos =
+ ::std::max(
+ (aTbxCmd.GetPosPixel().Y() + aTbxCmd.GetSizePixel().Height()),
+ (aEdRow.GetPosPixel().Y() + aEdRow.GetSizePixel().Height()) )
+ + 4;
aLbEntries.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y);
nBorderOffset = aLbEntries.GetPosPixel().X();
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx Fri May 31 13:55:58 2013
@@ -22,7 +22,6 @@
#ifndef SC_PROPERTYPANEL_ALIGNMENT_HXX
#define SC_PROPERTYPANEL_ALIGNMENT_HXX
-#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <vcl/fixed.hxx>
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx Fri May 31 13:55:58 2013
@@ -22,7 +22,6 @@
#ifndef SC_PROPERTYPANEL_APPEARANCE_HXX
#define SC_PROPERTYPANEL_APPEARANCE_HXX
-#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <boost/scoped_ptr.hpp>
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc Fri May 31 13:55:58 2013
@@ -37,7 +37,7 @@
//===============================================================position=============================================
#define MBOX_WIDTH 28
-#define TOOLBOX_ITEM_HEIGHT 12
+#define LOCAL_TOOLBOX_ITEM_HEIGHT 12
#define CHECKBOX_HEIGHT 10
#define FT_CATEGORY_X SECTIONPAGE_MARGIN_HORIZONTAL
@@ -49,7 +49,7 @@
#define TBX_CATEGORY_Y LB_CATEGORY_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
#define FT_DECIMALS_X SECTIONPAGE_MARGIN_HORIZONTAL
-#define FT_DECIMALS_Y TBX_CATEGORY_Y + TOOLBOX_ITEM_HEIGHT + 4 + CONTROL_SPACING_VERTICAL
+#define FT_DECIMALS_Y TBX_CATEGORY_Y + LOCAL_TOOLBOX_ITEM_HEIGHT + 4 + CONTROL_SPACING_VERTICAL
#define LB_DECIMALS_X FT_CATEGORY_X
#define LB_DECIMALS_Y FT_DECIMALS_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx Fri May 31 13:55:58 2013
@@ -22,7 +22,6 @@
#ifndef SC_PROPERTYPANEL_NUMFORMAT_HXX
#define SC_PROPERTYPANEL_NUMFORMAT_HXX
-#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <boost/scoped_ptr.hpp>
@@ -97,6 +96,6 @@ private:
} } // end of namespace ::sc::sidebar
-#endif SC_PROPERTYPANEL_NUMFORMAT_HXX
+#endif
// eof
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/view/tabvwsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/view/tabvwsh.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/view/tabvwsh.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/view/tabvwsh.cxx Fri May 31 13:55:58 2013
@@ -65,7 +65,6 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxVie
SFX_CHILDWINDOW_REGISTRATION(FID_INPUTLINE_STATUS);
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
- SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId());
Modified: openoffice/branches/rejuvenate01/main/sc/uiconfig/scalc/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/uiconfig/scalc/menubar/menubar.xml?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/uiconfig/scalc/menubar/menubar.xml (original)
+++ openoffice/branches/rejuvenate01/main/sc/uiconfig/scalc/menubar/menubar.xml Fri May 31 13:55:58 2013
@@ -143,7 +143,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
Modified: openoffice/branches/rejuvenate01/main/sc/uiconfig/scalc/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/uiconfig/scalc/toolbar/standardbar.xml?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/uiconfig/scalc/toolbar/standardbar.xml (original)
+++ openoffice/branches/rejuvenate01/main/sc/uiconfig/scalc/toolbar/standardbar.xml Fri May 31 13:55:58 2013
@@ -26,7 +26,7 @@
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
Modified: openoffice/branches/rejuvenate01/main/sc/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/util/makefile.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/util/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sc/util/makefile.mk Fri May 31 13:55:58 2013
@@ -63,9 +63,7 @@ RESLIB1SRSFILES=\
# --- StarClac DLL
SHL1TARGET= sc$(DLLPOSTFIX)
-.IF "$(GUI)" != "OS2"
SHL1USE_EXPORTS=name
-.ENDIF
SHL1IMPLIB= sci
# dynamic libraries
Modified: openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp Fri May 31 13:55:58 2013
@@ -1356,7 +1356,7 @@ File gid_File_Lib_PresentationMinimizer
#ifdef UNX
Name = STRING(CONCAT2(PresentationMinimizer.uno,UNXSUFFIX));
#elif defined OS2
- Name = "PresentationMinimizer.dll";
+ Name = "PreMin.dll";
#else
Name = "PresentationMinimizer.uno.dll";
#endif
@@ -1369,7 +1369,7 @@ File gid_File_Lib_PresenterScreen
#ifdef UNX
Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX));
#elif defined OS2
- Name = "PresenterScreen.dll";
+ Name = "PreScr.dll";
#else
Name = "PresenterScreen.uno.dll";
#endif
@@ -1503,7 +1503,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
#endif
-STD_LIB_FILE( gid_File_Lib_Tk, tk )
+STD_LIB_FILE( gid_File_Lib_Tk, ootk )
STD_LIB_FILE( gid_File_Lib_Acc, acc )
STD_LIB_FILE( gid_File_Lib_Tools, tl )
Modified: openoffice/branches/rejuvenate01/main/scp2/source/sdkoo/sdkoo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/sdkoo/sdkoo.scp?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/sdkoo/sdkoo.scp Fri May 31 13:55:58 2013
@@ -43,25 +43,15 @@ End
#ifndef MACOSX
#ifdef WNT
-Directory gid_Dir_Sdkoo_Root
+Directory gid_Dir_OpenOffice_Sdk
ParentID = PREDEFINED_PROGDIR;
HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Openofficeorg_Sdk
+#else
+Directory gid_Dir_OpenOffice_Sdk
ParentID = PREDEFINED_PROGDIR;
- HostName = "${UNIXBASISROOTNAME}";
-End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Basis_Sdk
- ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
- HostName = "basis${OOOBASEVERSION}";
- Styles = (BASISDIRECTORY);
+ HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
End
#endif
@@ -72,11 +62,7 @@ Directory gid_Dir_Basis_Sdk
ParentID = PREDEFINED_PROGDIR;
DosName = "OpenOffice_SDK";
#else
- #if defined WNT
- ParentID = gid_Dir_Sdkoo_Root;
- #else
- ParentID = gid_Dir_Ooo_Basis_Sdk;
- #endif
+ ParentID = gid_Dir_OpenOffice_Sdk;
DosName = "sdk";
#endif
End
@@ -183,7 +169,7 @@ Unixlink gid_Unixlink_Sal_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_NORMAL("sal");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("sal", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_VER("sal", "3");
End
#endif
@@ -193,7 +179,7 @@ Unixlink gid_Unixlink_Salhelper_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
End
#endif
@@ -203,7 +189,7 @@ Unixlink gid_Unixlink_Cppu_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_NORMAL("cppu");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("cppu", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_VER("cppu", "3");
End
#endif
@@ -214,7 +200,7 @@ Unixlink gid_Unixlink_Cppuhelper_Link_Sd
// Styles = (LAYERLINK);
Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
End
#endif
@@ -224,7 +210,7 @@ Unixlink gid_Unixlink_Purpenvhelper_Link
Styles = ();
Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
End
#endif
Modified: openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc4.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc4.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc4.cxx Fri May 31 13:55:58 2013
@@ -1370,12 +1370,12 @@ void SdDrawDocument::SetTextDefaults() c
SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10, sal_False);
- aNumberFormat.SetLSpace( 0 );
- aNumberFormat.SetAbsLSpace( 0 );
- aNumberFormat.SetFirstLineOffset( 0 );
- aNumRule.SetLevel( 0, aNumberFormat );
+ //aNumberFormat.SetLSpace( 0 );
+ //aNumberFormat.SetAbsLSpace( 0 );
+ //aNumberFormat.SetFirstLineOffset( 0 );
+ //aNumRule.SetLevel( 0, aNumberFormat );
- for( sal_uInt16 i = 1; i < aNumRule.GetLevelCount(); i++ )
+ for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
{
const short nLSpace = (i + 1) * 600;
aNumberFormat.SetLSpace(nLSpace);
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/dlg/navigatr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/dlg/navigatr.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/dlg/navigatr.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/dlg/navigatr.cxx Fri May 31 13:55:58 2013
@@ -86,63 +86,74 @@ SdNavigatorWin::SdNavigatorWin(
maImageList ( SdResId( IL_NAVIGATR ) ),
maImageListH ( SdResId( ILH_NAVIGATR ) )
{
- maTlbObjects.SetViewFrame( mpBindings->GetDispatcher()->GetFrame() );
+ maTlbObjects.SetViewFrame( mpBindings->GetDispatcher()->GetFrame() );
- FreeResource();
+ FreeResource();
maTlbObjects.SetAccessibleName(String(SdResId(STR_OBJECTS_TREE)));
- mpNavigatorCtrlItem = new SdNavigatorControllerItem( SID_NAVIGATOR_STATE, this, mpBindings, rUpdateRequest);
- mpPageNameCtrlItem = new SdPageNameControllerItem( SID_NAVIGATOR_PAGENAME, this, mpBindings, rUpdateRequest);
- mpDocList = new List();
-
- ApplyImageList(); // load images *before* calculating sizes to get something useful !!!
-
- Size aTbxSize( maToolbox.CalcWindowSizePixel() );
- maToolbox.SetOutputSizePixel( aTbxSize );
- maToolbox.SetSelectHdl( LINK( this, SdNavigatorWin, SelectToolboxHdl ) );
- maToolbox.SetClickHdl( LINK( this, SdNavigatorWin, ClickToolboxHdl ) );
+ mpNavigatorCtrlItem = new SdNavigatorControllerItem( SID_NAVIGATOR_STATE, this, mpBindings, rUpdateRequest);
+ mpPageNameCtrlItem = new SdPageNameControllerItem( SID_NAVIGATOR_PAGENAME, this, mpBindings, rUpdateRequest);
+ mpDocList = new List();
+
+ ApplyImageList(); // load images *before* calculating sizes to get something useful !!!
+
+ Size aTbxSize( maToolbox.CalcWindowSizePixel() );
+ maToolbox.SetOutputSizePixel( aTbxSize );
+ maToolbox.SetSelectHdl( LINK( this, SdNavigatorWin, SelectToolboxHdl ) );
+ maToolbox.SetClickHdl( LINK( this, SdNavigatorWin, ClickToolboxHdl ) );
maToolbox.SetDropdownClickHdl( LINK(this, SdNavigatorWin, DropdownClickToolBoxHdl) );
maToolbox.SetItemBits( TBI_DRAGTYPE, maToolbox.GetItemBits( TBI_DRAGTYPE ) | TIB_DROPDOWNONLY );
// Shape filter drop down menu.
- maToolbox.SetItemBits(TBI_SHAPE_FILTER,
+ maToolbox.SetItemBits(
+ TBI_SHAPE_FILTER,
maToolbox.GetItemBits(TBI_SHAPE_FILTER) | TIB_DROPDOWNONLY);
- // TreeListBox
+ // TreeListBox
// set position below toolbox
long nListboxYPos = maToolbox.GetPosPixel().Y() + maToolbox.GetSizePixel().Height() + 4;
maTlbObjects.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
- maTlbObjects.SetDoubleClickHdl( LINK( this, SdNavigatorWin, ClickObjectHdl ) );
- maTlbObjects.SetSelectionMode( SINGLE_SELECTION );
+ maTlbObjects.SetDoubleClickHdl( LINK( this, SdNavigatorWin, ClickObjectHdl ) );
+ maTlbObjects.SetSelectionMode( SINGLE_SELECTION );
// set focus to listbox, otherwise it is in the toolbox which is only useful
// for keyboard navigation
maTlbObjects.GrabFocus();
- // DragTypeListBox
- maLbDocs.SetSelectHdl( LINK( this, SdNavigatorWin, SelectDocumentHdl ) );
+ // DragTypeListBox
+ maLbDocs.SetSelectHdl( LINK( this, SdNavigatorWin, SelectDocumentHdl ) );
// set position below treelistbox
nListboxYPos = maTlbObjects.GetPosPixel().Y() + maTlbObjects.GetSizePixel().Height() + 4;
maLbDocs.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
+ // assure that tool box is at least as wide as the tree list box
+ {
+ const Size aTlbSize( maTlbObjects.GetOutputSizePixel() );
+ if ( aTlbSize.Width() > aTbxSize.Width() )
+ {
+ maToolbox.SetPosSizePixel( 0, 0, aTlbSize.Width(), 0, WINDOW_POSSIZE_WIDTH );
+ aTbxSize = maToolbox.GetOutputSizePixel();
+ }
+ }
+
// set min outputsize after all sizes are known
- long nFullHeight = nListboxYPos + maLbDocs.GetSizePixel().Height() + 4;
- maSize = GetOutputSizePixel();
+ const long nFullHeight = nListboxYPos + maLbDocs.GetSizePixel().Height() + 4;
+ maSize = GetOutputSizePixel();
if( maSize.Height() < nFullHeight )
{
maSize.Height() = nFullHeight;
SetOutputSizePixel( maSize );
}
maMinSize = maSize;
- long nMinWidth = 2*maToolbox.GetPosPixel().X() + aTbxSize.Width(); // never clip the toolbox
+ const long nMinWidth = 2*maToolbox.GetPosPixel().X() + aTbxSize.Width(); // never clip the toolbox
if( nMinWidth > maMinSize.Width() )
maMinSize.Width() = nMinWidth;
- maMinSize.Height() -= 40;
+ maMinSize.Height() -= 40;
SfxDockingWindow* pDockingParent = dynamic_cast<SfxDockingWindow*>(GetParent());
- if (pDockingParent != NULL)
+ if (pDockingParent != NULL)
pDockingParent->SetMinOutputSizePixel( maMinSize );
- // InitTlb; Wird ueber Slot initiiert
+ // InitTlb; Wird ueber Slot initiiert
if (rUpdateRequest)
rUpdateRequest();
}