1. mst
  2. ooo340

Commits

Daniel Rentz  committed 19b0d41

container_controls: little changes

  • Participants
  • Parent commits 0d63349
  • Branches default

Comments (0)

Files changed (6)

File oox/inc/oox/ole/axbinaryreader.hxx

View file
  • Ignore whitespace
     /** Reads the next picture property from the stream, if the respective flag
         in the property mask is set. */
     void                readPictureProperty( StreamDataSequence& orPicData );
-    
+
     /** Skips the next integer property value in the stream, if the respective
         flag in the property mask is set. */
     template< typename StreamType >

File oox/inc/oox/ole/axcontrol.hxx

View file
  • Ignore whitespace
     explicit            AxTabStripModel();
 
     virtual bool        importBinaryModel( BinaryInputStream& rInStrm );
-    
+
     virtual ApiControlType getControlType() const;
     virtual void        convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
 

File oox/inc/oox/ole/vbacontrol.hxx

View file
  • Ignore whitespace
     namespace container { class XNameContainer; }
 } } }
 
-namespace oox { class StorageBase; class PropertySet; }
+namespace oox { class StorageBase; }
 
 namespace oox {
 namespace ole {
-class VbaFormControl;
 
 // ============================================================================
 

File oox/source/ole/axbinaryreader.cxx

View file
  • Ignore whitespace
 {
     sal_Int64 nEndPos = rInStrm.tell() + mnSize;
     while( rInStrm.tell() < nEndPos )
-    { 
+    {
         OUString aString;
         if( !lclReadString( rInStrm, aString, rInStrm.readuInt32(), true ) )
             return false;

File oox/source/ole/axcontrol.cxx

View file
  • Ignore whitespace
 
 // Generic conversion ---------------------------------------------------------
 
+void ControlConverter::convertPosition( PropertyMap& rPropMap, const AxPairData& rPos ) const
+{
+    // position is given in 1/100 mm, UNO needs AppFont units
+    Point aAppFontPos = mrGraphicHelper.convertHmmToAppFont( Point( rPos.first, rPos.second ) );
+    rPropMap.setProperty( PROP_PositionX, aAppFontPos.X );
+    rPropMap.setProperty( PROP_PositionY, aAppFontPos.Y );
+}
+
 void ControlConverter::convertSize( PropertyMap& rPropMap, const AxPairData& rSize ) const
 {
     // size is given in 1/100 mm, UNO needs AppFont units
     rPropMap.setProperty( PROP_Height, aAppFontSize.Height );
 }
 
-void ControlConverter::convertPosition( PropertyMap& rPropMap, const AxPairData& rPos ) const
-{
-    // position is given in 1/100 mm, UNO needs AppFont units
-    Point aAppFontPos = mrGraphicHelper.convertHmmToAppFont( Point( rPos.first, rPos.second ) );
-    rPropMap.setProperty( PROP_PositionX, aAppFontPos.X );
-    rPropMap.setProperty( PROP_PositionY, aAppFontPos.Y );
-}
-
 void ControlConverter::convertColor( PropertyMap& rPropMap, sal_Int32 nPropId, sal_uInt32 nOleColor ) const
 {
     rPropMap.setProperty( nPropId, OleHelper::decodeOleColor( mrGraphicHelper, nOleColor, mbDefaultColorBgr ) );

File oox/source/ole/vbacontrol.cxx

View file
  • Ignore whitespace
 using ::rtl::OUStringBuffer;
 using ::com::sun::star::awt::XControlModel;
 using ::com::sun::star::container::XNameContainer;
+using ::com::sun::star::frame::XModel;
 using ::com::sun::star::io::XInputStreamProvider;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::uno::UNO_SET_THROW;
 using ::com::sun::star::uno::XComponentContext;
-using ::com::sun::star::frame::XModel;
 
 namespace oox {
 namespace ole {
             mxSiteModel->convertProperties( aPropMap, rConv, mxCtrlModel->getControlType(), nCtrlIndex );
             mxCtrlModel->convertProperties( aPropMap, rConv );
             mxCtrlModel->convertSize( aPropMap, rConv );
-
             PropertySet aPropSet( rxCtrlModel );
             aPropSet.setProperties( aPropMap );