[Libreoffice-commits] core.git: include/oox oox/source sc/source

[Noel Power]

 include/oox/ole/axcontrol.hxx            |    6 +++---
 oox/source/ole/axcontrol.cxx             |   10 +++++-----
 sc/source/filter/oox/drawingfragment.cxx |    8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit fecd316a966f08d095c1514f8de0924749a5b8da
Author: Noel Power <noel.power at suse.com>
Date:   Wed Jun 12 18:50:22 2013 +0100

    typo correction AX_SELCTION_xxx -> AX_SELECTION_xxx
    
    petty correct of AX_SELCTION_xxx -> AX_SELECTION_xxx but it
    was irritating me
    
    Change-Id: Iae7a0151a63502aa89f04ae54fe7348548ffd32c

diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 84e3a3e..d2bf3e5 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -129,9 +129,9 @@ const sal_Int32 AX_DISPLAYSTYLE_OPTBUTTON   = 5;
 const sal_Int32 AX_DISPLAYSTYLE_TOGGLE      = 6;
 const sal_Int32 AX_DISPLAYSTYLE_DROPDOWN    = 7;
 
-const sal_Int32 AX_SELCTION_SINGLE          = 0;
-const sal_Int32 AX_SELCTION_MULTI           = 1;
-const sal_Int32 AX_SELCTION_EXTENDED        = 2;
+const sal_Int32 AX_SELECTION_SINGLE         = 0;
+const sal_Int32 AX_SELECTION_MULTI          = 1;
+const sal_Int32 AX_SELECTION_EXTENDED       = 2;
 
 const sal_Int32 AX_SHOWDROPBUTTON_NEVER     = 0;
 const sal_Int32 AX_SHOWDROPBUTTON_FOCUS     = 1;
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 47d21d5..eca6d70 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -541,7 +541,7 @@ void ControlConverter::convertAxState( PropertyMap& rPropMap,
 
     // tristate
     if( bSupportsTriState )
-        rPropMap.setProperty( PROP_TriState, nMultiSelect == AX_SELCTION_MULTI );
+        rPropMap.setProperty( PROP_TriState, nMultiSelect == AX_SELECTION_MULTI );
 }
 
 void ControlConverter::convertToAxState( PropertySet& rPropSet,
@@ -564,7 +564,7 @@ void ControlConverter::convertToAxState( PropertySet& rPropSet,
 
     // tristate
     if( bSupportsTriState && rPropSet.getProperty( bTmp, PROP_TriState ) )
-        nMultiSelect = AX_SELCTION_MULTI;
+        nMultiSelect = AX_SELECTION_MULTI;
 }
 
 void ControlConverter::convertAxOrientation( PropertyMap& rPropMap,
@@ -1408,7 +1408,7 @@ AxMorphDataModelBase::AxMorphDataModelBase() :
     mnBorderStyle( AX_BORDERSTYLE_NONE ),
     mnSpecialEffect( AX_SPECIALEFFECT_SUNKEN ),
     mnDisplayStyle( AX_DISPLAYSTYLE_TEXT ),
-    mnMultiSelect( AX_SELCTION_SINGLE ),
+    mnMultiSelect( AX_SELECTION_SINGLE ),
     mnScrollBars( AX_SCROLLBAR_NONE ),
     mnMatchEntry( AX_MATCHENTRY_NONE ),
     mnShowDropButton( AX_SHOWDROPBUTTON_NEVER ),
@@ -1535,7 +1535,7 @@ void AxMorphDataModelBase::exportBinaryModel( BinaryOutputStream& rOutStrm )
     aWriter.skipProperty(); // mnShowDropButton );
     aWriter.skipProperty();
     aWriter.skipProperty(); // drop down style
-    if ( mnDisplayStyle == AX_DISPLAYSTYLE_LISTBOX && mnMultiSelect != AX_SELCTION_SINGLE )
+    if ( mnDisplayStyle == AX_DISPLAYSTYLE_LISTBOX && mnMultiSelect != AX_SELECTION_SINGLE )
         aWriter.writeIntProperty< sal_uInt8 >( mnMultiSelect );
     // although CheckBox, ListBox, OptionButton, ToggleButton are also supported
     // they can only have the fileformat default
@@ -1924,7 +1924,7 @@ ApiControlType AxListBoxModel::getControlType() const
 
 void AxListBoxModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
 {
-    bool bMultiSelect = (mnMultiSelect == AX_SELCTION_MULTI) || (mnMultiSelect == AX_SELCTION_EXTENDED);
+    bool bMultiSelect = (mnMultiSelect == AX_SELECTION_MULTI) || (mnMultiSelect == AX_SELECTION_EXTENDED);
     rPropMap.setProperty( PROP_MultiSelection, bMultiSelect );
     rPropMap.setProperty( PROP_Dropdown, false );
     rConv.convertAxBackground( rPropMap, mnBackColor, mnFlags, API_TRANSPARENCY_VOID );
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 65bff71..dc047d4 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -535,7 +535,7 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S
                 rAxModel.mnSpecialEffect = pClientData->mbNo3D ? AX_SPECIALEFFECT_FLAT : AX_SPECIALEFFECT_SUNKEN;
                 rAxModel.mnVerticalAlign = pClientData->mnTextVAlign;
                 bool bTriState = (pClientData->mnChecked != ::oox::vml::VML_CLIENTDATA_UNCHECKED) && (pClientData->mnChecked != ::oox::vml::VML_CLIENTDATA_CHECKED);
-                rAxModel.mnMultiSelect = bTriState ? AX_SELCTION_MULTI : AX_SELCTION_SINGLE;
+                rAxModel.mnMultiSelect = bTriState ? AX_SELECTION_MULTI : AX_SELECTION_SINGLE;
             }
             break;
 
@@ -558,9 +558,9 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S
                 rAxModel.mnSpecialEffect = pClientData->mbNo3D2 ? AX_SPECIALEFFECT_FLAT : AX_SPECIALEFFECT_SUNKEN;
                 switch( pClientData->mnSelType )
                 {
-                    case XML_Single:    rAxModel.mnMultiSelect = AX_SELCTION_SINGLE;    break;
-                    case XML_Multi:     rAxModel.mnMultiSelect = AX_SELCTION_MULTI;     break;
-                    case XML_Extend:    rAxModel.mnMultiSelect = AX_SELCTION_EXTENDED;  break;
+                    case XML_Single:    rAxModel.mnMultiSelect = AX_SELECTION_SINGLE;    break;
+                    case XML_Multi:     rAxModel.mnMultiSelect = AX_SELECTION_MULTI;     break;
+                    case XML_Extend:    rAxModel.mnMultiSelect = AX_SELECTION_EXTENDED;  break;
                 }
             }
             break;