Commits

releng  committed cbe2f4a

CWS-TOOLING: integrate CWS mba32issues01
2009-05-05 18:23:27 +0200 mba r271547 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-05-05 18:22:02 +0200 mba r271545 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-05-05 18:16:42 +0200 mba r271544 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-04-29 19:35:58 +0200 mba r271392 : #i73672#: unify commands for inserting special characters
2009-04-29 18:01:27 +0200 mba r271391 : #i101337#: missing string resources
2009-04-29 18:01:10 +0200 mba r271390 : #i101337#: missing string resources
2009-04-29 15:42:47 +0200 mba r271380 : concurrency problem in multithreaded dmake due to missing dependency
2009-04-28 17:36:03 +0200 tbo r271336 : #i99432#
2009-04-28 13:57:52 +0200 mba r271322 : #i101302#: ctor might be called with pSet=0
2009-04-22 19:32:39 +0200 tbo r271138 : #i99432#
2009-04-09 14:46:03 +0200 mba r270709 : make sendreportw32.cxx compile with pch
2009-04-06 16:05:07 +0200 mba r270568 : #i99432#: some tweaks for build order
2009-04-06 15:38:52 +0200 mba r270558 : typo
2009-04-06 13:36:19 +0200 mba r270542 : #i99432#: split of localization also
2009-04-06 13:19:06 +0200 mba r270539 : #i99432#: split up srs files also
2009-04-03 17:57:59 +0200 mba r270513 : #i99432#: split dialog folder into two
2009-04-03 17:56:46 +0200 mba r270512 : #i99432#: split dialog folder into two
2009-04-01 22:15:00 +0200 mba r270364 : warnings on Linux
2009-04-01 22:10:44 +0200 mba r270363 : warnings on Linux
2009-04-01 21:43:54 +0200 mba r270362 : warning fixed
2009-04-01 21:41:27 +0200 mba r270361 : warning on Linux fixed
2009-04-01 21:35:44 +0200 mba r270360 : warning fixed
2009-04-01 20:19:59 +0200 mba r270358 : warning found on Linux fixed
2009-04-01 19:23:38 +0200 mba r270354 : warning due to missing eof
2009-04-01 18:56:25 +0200 mba r270352 : linking problem fixed that appeared only on mac
2009-04-01 18:41:30 +0200 mba r270350 : warnings discovered on Linux fixed
2009-04-01 18:34:28 +0200 mba r270349 : some fixes for warnings and include problems discoverd after resync and build on mac
2009-04-01 14:08:22 +0200 mba r270328 : CWS-TOOLING: rebase CWS mba32issues01 to trunk@270033 (milestone: DEV300:m45)
2009-03-04 18:13:35 +0100 mba r268858 : #i99432#: more dialogs moved to cui
2009-03-04 17:47:41 +0100 mba r268854 : #i99432#: more dialogs moved to cui
2009-03-04 17:32:39 +0100 mba r268851 : warning fixed
2009-03-04 12:59:26 +0100 mba r268814 : #i99432#: more dialogs moved to cui
2009-03-04 11:49:03 +0100 mba r268802 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:46:00 +0100 mba r268795 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:43:50 +0100 mba r268794 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:00:29 +0100 mba r268792 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:00:03 +0100 mba r268791 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:59:43 +0100 mba r268790 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:58:51 +0100 mba r268789 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:58:16 +0100 mba r268788 : #i99432#: CharmapDialog moved to cui
2009-03-03 16:33:14 +0100 mba r268763 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:32:28 +0100 mba r268762 : #i99432#: some tabpages moved to cui
2009-03-03 16:32:09 +0100 mba r268761 : #i99432#: some tabpages moved to cui
2009-03-03 16:29:40 +0100 mba r268760 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:29:08 +0100 mba r268759 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:28:41 +0100 mba r268758 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:28:18 +0100 mba r268757 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:27:36 +0100 mba r268756 : #i99465#: replace FN_SYMBOL by SID_CHARMAP
2009-03-03 16:27:02 +0100 mba r268755 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:26:23 +0100 mba r268754 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:25:30 +0100 mba r268753 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:24:49 +0100 mba r268752 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:24:35 +0100 mba r268751 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:23:20 +0100 mba r268750 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:23:04 +0100 mba r268749 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:21:56 +0100 mba r268748 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:18:39 +0100 mba r268747 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:13:14 +0100 mba r268745 : #i99465#: replace FN_SYMBOL by SID_CHARMAP
2009-03-03 16:02:54 +0100 mba r268738 : #i99432#: moved MacroAssignment TabPage from sfx2
2009-03-03 14:57:58 +0100 mba r268729 : #i99465#: transport return value via ItemSet
2009-03-03 00:08:10 +0100 mba r268701 : #i99432#: move acccfg to cuilib
2009-03-03 00:07:32 +0100 mba r268700 : #i99432#: move acccfg to cuilib
2009-03-03 00:02:01 +0100 mba r268699 : #i99432#: move acccfg to cuilib
2009-03-03 00:01:38 +0100 mba r268698 : #i99432#: move acccfg to cuilib
2009-03-03 00:01:11 +0100 mba r268697 : #i99432#: move acccfg to cuilib
2009-03-03 00:00:40 +0100 mba r268696 : #i99432#: move acccfg to cuilib
2009-03-03 00:00:06 +0100 mba r268695 : #i99432#: replace SfxAbstractSingleTabDialog by SfxAbstractDialog
2009-03-02 23:59:22 +0100 mba r268694 : #i99432#: move acccfg to cuilib
2009-03-02 23:57:19 +0100 mba r268693 : #i99432#: move acccfg to svx
2009-03-02 23:56:14 +0100 mba r268692 : #i99432#: replace SfxAbstractSingleTabDialog by SfxAbstractDialog
2009-03-02 23:49:37 +0100 mba r268691 : #i99785#: consolidate dialogs library
2009-03-02 17:26:40 +0100 mba r268683 : #i99785#: consolidate dialogs library
2009-03-02 17:24:28 +0100 mba r268682 : i99465#: consolidate slot for InsertSymbol command
2009-03-02 17:22:29 +0100 mba r268681 : #i99785#: consolidate dialogs library
2009-03-02 17:18:11 +0100 mba r268680 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 17:08:30 +0100 mba r268679 : #i99785#: consolidate dialogs library
2009-03-02 17:06:57 +0100 mba r268678 : #i99785#: consolidate dialogs library
2009-03-02 17:06:30 +0100 mba r268677 : #i99785#: consolidate dialogs library
2009-03-02 17:05:02 +0100 mba r268676 : #i99785#: consolidate dialogs library
2009-03-02 17:04:35 +0100 mba r268675 : #i99785#: consolidate dialogs library
2009-03-02 16:47:53 +0100 mba r268673 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:45:17 +0100 mba r268671 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:39:59 +0100 mba r268670 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:38:59 +0100 mba r268668 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:38:28 +0100 mba r268667 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:36:06 +0100 mba r268666 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:29:50 +0100 mba r268663 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:24:00 +0100 mba r268659 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:23:31 +0100 mba r268658 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:22:41 +0100 mba r268657 : i99432#: move accelconfig and macroassignment to cui
2009-02-25 16:57:26 +0100 mba r268453 : obsolete
2009-02-17 10:50:51 +0100 mba r267846 : obsolete
2009-02-12 16:33:54 +0100 mba r267676 : #i96834#: warning fixed
2009-02-11 19:28:47 +0100 mba r267626 : #i91978#: unused code
2009-02-11 18:37:47 +0100 mba r267625 : metafile output, fixes for 3 layer office
2009-02-11 12:56:28 +0100 mba r267593 : selective trees; incomplete build lists; metafile output

  • Participants
  • Parent commits af01cca

Comments (0)

Files changed (789)

File chart2/source/controller/main/ChartController_TextEdit.cxx

 #include "macros.hxx"
 #include "ControllerLockGuard.hxx"
 #include "AccessibleTextHelper.hxx"
+#include "chartview/DrawModelWrapper.hxx"
 
 #include <svx/svdotext.hxx>
 
-// header for class SvxCharacterMap
-#include <svx/charmap.hxx>
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
 // header for class SdrOutliner
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <svtools/stritem.hxx>
+#include <svx/fontitem.hxx>
 
 //.............................................................................
 namespace chart
 
 	SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT( pFact, "No dialog factory" );
-	AbstractSvxCharacterMap * pDlg = pFact->CreateSvxCharacterMap( m_pChartWindow,  RID_SVXDLG_CHARMAP, FALSE );
-    DBG_ASSERT( pDlg, "Couldn't create SvxCharacterMap dialog" );
+
+	SfxAllItemSet aSet( m_pDrawModelWrapper->GetItemPool() );
+	aSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
 
     //set fixed current font
-    pDlg->SetFont( m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont() );
-    pDlg->DisableFontSelection(); //maybe not necessary in future
+	aSet.Put( SfxBoolItem( FN_PARAM_2, TRUE ) ); //maybe not necessary in future
+	
+	Font aCurFont = m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont();
+	aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) );
 
+	SfxAbstractDialog * pDlg = pFact->CreateSfxDialog( m_pChartWindow, aSet, getFrame(), RID_SVXDLG_CHARMAP );
+    DBG_ASSERT( pDlg, "Couldn't create SvxCharacterMap dialog" );
 	if( pDlg->Execute() == RET_OK )
 	{
-		String aString( pDlg->GetCharacters() );
+		const SfxItemSet* pSet = pDlg->GetOutputItemSet();
+		const SfxPoolItem* pItem=0;
+		String aString;
+		if ( pSet && pSet->GetItemState( SID_CHARMAP, TRUE, &pItem) == SFX_ITEM_SET &&
+			 pItem->ISA(SfxStringItem) )
+				aString = dynamic_cast<const SfxStringItem*>(pItem)->GetValue();
 
         OutlinerView* pOutlinerView = m_pDrawViewWrapper->GetTextEditOutlinerView();
         SdrOutliner*  pOutliner = m_pDrawViewWrapper->getOutliner();

File default_images/sfx2/res/minus_h.png

Removed
Old image

File default_images/sfx2/res/plus_h.png

Removed
Old image

File default_images/svx/res/minus_h.png

Added
New image

File default_images/svx/res/plus_h.png

Added
New image

File idl/source/objects/bastype.cxx

             {
                 ULONG n = pTok->GetNumber();
                 if( nSign == -1 || n <= nMax )
-                { // nich tueber dem Maximum
+                { // nicht ueber dem Maximum
                     if( (nSign == -1 && n < 0x8000000
                          && -(long)n >= nMin)
-                      || (nSign == 1 && n >= 0x8000000 || (long)n > nMin) )
+                      || ( (nSign == 1 && n >= 0x8000000) || (long)n > nMin) )
                     {
                         *pValue = (long)n;
                     }

File officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu

 		<node oor:name="Commands">
 			<node oor:name=".uno:Polygon" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Polygon, filled</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:ColorView" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Black &amp; White View</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:RenamePage" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Rename Slide</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:RenameLayer" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Rename</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:Presentation" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Slide Show</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:RehearseTimings" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Rehearse Timings</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Dia" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">SlideTransition</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:ShowSlide" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Sho~w Slide</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:HideSlide" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Hide Slide</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:TextAttributes" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Te~xt...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:PagesPerRow" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Slides Per Row</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:TextFitToSizeTool" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Fit Text to Frame</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:VerticalTextFitToSizeTool" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Fit Vertical Text to Frame</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Objects3DToolbox" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">3D Objects</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Cube" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Cube</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Sphere" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Sphere</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Cylinder" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Cylinder</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Cone" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Cone</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Cyramid" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Pyramid</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueEditMode" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-                    
+
 					<value xml:lang="en-US">~Glue Points</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueInsertPoint" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Insert Glue Point</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GluePercent" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Glue Point Relative</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueEscapeDirection" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Exit Direction</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:GlueHorzAlignCenter" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Glue Point Horizontal Center</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueHorzAlignLeft" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Glue Point Horizontal Left</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueHorzAlignRight" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Glue Point Horizontal Right</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueVertAlignCenter" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Glue Point Vertical Center</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueVertAlignTop" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Glue Point Vertical Top</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueVertAlignBottom" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Glue Point Vertical Bottom</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Shell3D" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Shell</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Torus" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Torus</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:HalfSphere" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Half-Sphere</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueEscapeDirectionLeft" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Exit Direction Left</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueEscapeDirectionRight" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Exit Direction Right</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueEscapeDirectionTop" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Exit Direction Top</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:GlueEscapeDirectionBottom" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Exit Direction Bottom</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:InsertToolbox" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Insert</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:Morphing" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Cross-fading...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:MeasureAttributes" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Dimen~sions...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:GridFront" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Grid to ~Front</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:HelplinesVisible" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Display Guides</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:HelplinesFront" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Guides to ~Front</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:BeforeObject" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">In Front of ~Object</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:PreviewWindow" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Pre~view</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:CustomAnimation" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Custom Animation...</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:CustomAnimationSchemes" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Animation Schemes...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:SlideChangeWindow" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Slide Transition...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:ConnectorAttributes" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Connector...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:PresentationDialog" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">S~lide Show Settings...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:Hyphenation" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Hyphenation</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:NewRouting" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Reset Routing</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:DuplicatePage" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">D~uplicate Slide</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:ExpandPage" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">E~xpand Slide</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:SummaryPage" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Su~mmary Slide</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:LeaveAllGroups" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Exit All Groups</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:ParaspaceIncrease" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Increase Spacing</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:ParaspaceDecrease" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Decrease Spacing</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:SlideMasterPage" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Slide Master</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:HandoutMasterPage" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Handout Master</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:NotesMasterPage" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Notes Master</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:TitleMasterPage" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Title Slide Master</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:InsertPageQuick" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Insert Slide Direct</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:InsertDateFieldVar" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Dat~e (variable)</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:InsertDateFieldFix" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Date (fixed)</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:InsertTimeFieldVar" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">T~ime (variable)</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:InsertTimeFieldFix" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Time (fixed)</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:InsertPageField" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Page Number</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:ModifyField" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">F~ields...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:InsertFileField" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~File Name</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:InsertAuthorField" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Author</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:CustomShowDialog" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Custom Slide Show...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:OutputQualityColor" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Color</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:OutputQualityGrayscale" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Grayscale</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:OutputQualityBlackWhite" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Black and White</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:PreviewQualityColor" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Color</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:PreviewQualityGrayscale" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Grayscale</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:PreviewQualityBlackWhite" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Black and White</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:ConvertInto3D" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">To 3~D</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:ConvertInto3DLatheFast" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">To 3D ~Rotation Object</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:ConvertIntoBitmap" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">To ~Bitmap</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:ConvertIntoMetaFile" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">To ~Metafile</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:PackAndGo" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Pack</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:convert_to_contour" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">To C~ontour</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:EditHyperlink" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">H~yperlink...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:PageSetup" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Page...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:PasteClipboard" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Paste ~Special...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:CopyObjects" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Duplicat~e...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:ManageLinks" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Lin~ks...</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:ConvertInto3DLathe" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">In 3D Rotation Object</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:DrawingMode" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Drawing View</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:OutlineMode" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~Outline</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:OutputQualityContrast" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~High Contrast</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:DiaMode" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Sli~de Sorter</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:PreviewQualityContrast" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~High Contrast</value>
 				</prop>
 			</node>
 			<node oor:name=".uno:InsertPage" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Slid~e</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:ImportFromFile" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">~File...</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 			</node>
 			<node oor:name=".uno:ZoomPanning" oor:op="replace">
 				<prop oor:name="Label" oor:type="xs:string">
-					
+
 					<value xml:lang="en-US">Shift</value>
 				</prop>
 				<prop oor:name="Properties" oor:type="xs:int">
 					<value>1</value>
 				</prop>
 			</node>