[GSoC] Remove bitmap controls from area tab

Change-Id: Ie8d62b42c9b5ce9a4d087d809e7c395b8c71e667
Reviewed-on: https://gerrit.libreoffice.org/27024
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

3 files changed, 2 insertions, 1340 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 54bd78b71985..82676af138cf 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -203,31 +203,6 @@ private:
     VclPtr<HatchingLB>         m_pLbHatching;
     VclPtr<BitmapLB>           m_pLbBitmap;
     VclPtr<SvxXRectPreview>    m_pCtlBitmapPreview;
-
-    VclPtr<VclBox>             m_pBxBitmap;
-
-    VclPtr<VclFrame>           m_pFlSize;
-    VclPtr<TriStateBox>        m_pTsbOriginal;
-    VclPtr<TriStateBox>        m_pTsbScale;
-    VclPtr<VclGrid>            m_pGridX_Y;
-    VclPtr<FixedText>          m_pFtXSize;
-    VclPtr<MetricField>        m_pMtrFldXSize;
-    VclPtr<FixedText>          m_pFtYSize;
-    VclPtr<MetricField>        m_pMtrFldYSize;
-
-    VclPtr<VclFrame>           m_pFlPosition;
-    VclPtr<SvxRectCtl>         m_pCtlPosition;
-    VclPtr<VclGrid>            m_pGridOffset;
-    VclPtr<MetricField>        m_pMtrFldXOffset;
-    VclPtr<MetricField>        m_pMtrFldYOffset;
-    VclPtr<VclBox>             m_pBxTile;
-    VclPtr<TriStateBox>        m_pTsbTile;
-    VclPtr<TriStateBox>        m_pTsbStretch;
-    VclPtr<VclFrame>           m_pFlOffset;
-    VclPtr<RadioButton>        m_pRbtRow;
-    VclPtr<RadioButton>        m_pRbtColumn;
-    VclPtr<MetricField>        m_pMtrFldOffset;
-
     VclPtr<SvxXRectPreview>    m_pCtlXRectPreview;
 
     const SfxItemSet&   m_rOutAttrs;
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 6f425521dbf3..c9f5cae1dc4b 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -97,15 +97,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
     m_pbAreaTP(&maFixed_sal_Bool),
 
     m_aXFillAttr          ( rInAttrs.GetPool() ),
-    m_rXFSet              ( m_aXFillAttr.GetItemSet() ),
-
-    m_ePoolUnit(SFX_MAPUNIT_100TH_MM),
-    m_eFUnit(FUNIT_NONE),
-
-    //UUUU
-    mbOfferImportButton(false),
-    mbDirectGraphicSet(false),
-    maDirectGraphic()
+    m_rXFSet              ( m_aXFillAttr.GetItemSet() )
 {
     get(m_pTypeLB,"LB_AREA_TYPE");
     get(m_pFillLB,"boxLB_FILL");
@@ -114,70 +106,16 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
     get(m_pLbHatching,"LB_HATCHING");
     get(m_pLbBitmap,"LB_BITMAP");
     get(m_pCtlBitmapPreview,"CTL_BITMAP_PREVIEW");
-
-    get(m_pBxBitmap,"boxBITMAP");
-
-    get(m_pFlSize,"FL_SIZE");
-    get(m_pGridX_Y,"gridX_Y");
-    get(m_pTsbOriginal,"TSB_ORIGINAL");
-    get(m_pTsbScale,"TSB_SCALE");
-    get(m_pFtXSize,"FT_X_SIZE");
-    get(m_pMtrFldXSize,"MTR_FLD_X_SIZE");
-    get(m_pFtYSize,"FT_Y_SIZE");
-    get(m_pMtrFldYSize,"MTR_FLD_Y_SIZE");
-
-    get(m_pFlPosition,"framePOSITION");
-    get(m_pCtlPosition,"CTL_POSITION");
-    get(m_pGridOffset,"gridOFFSET");
-    get(m_pMtrFldXOffset,"MTR_FLD_X_OFFSET");
-    get(m_pMtrFldYOffset,"MTR_FLD_Y_OFFSET");
-    get(m_pBxTile,"boxTILE");
-    get(m_pTsbTile,"TSB_TILE");
-    get(m_pTsbStretch,"TSB_STRETCH");
-
-    get(m_pFlOffset,"FL_OFFSET");
-    get(m_pRbtRow,"RBT_ROW");
-    get(m_pRbtColumn,"RBT_COLUMN");
-    get(m_pBtnImport, "btnimport");
-    get(m_pMtrFldOffset,"MTR_FLD_OFFSET");
-
     get(m_pCtlXRectPreview,"CTL_COLOR_PREVIEW");
 
-    //so that even for "none" the size requested is the largest
-    //size required for any of the areas which might be selected
-    //later, so that there's sufficient space
-    VclContainer *pMainFrame = get<VclContainer>("mainframe");
-    Size aBitmapSize(m_pBxBitmap->get_preferred_size());
-    Size aMainFrame(aBitmapSize.Width(),aBitmapSize.Height());
-    pMainFrame->set_width_request(aMainFrame.Width());
-    pMainFrame->set_height_request(aMainFrame.Height());
-
 
     // groups that overlay each other
     m_pLbBitmap->Hide();
     m_pCtlBitmapPreview->Hide();
 
-    m_pBxBitmap->Hide();
-
-    m_pTsbOriginal->EnableTriState( false );
-
     // this page needs ExchangeSupport
     SetExchangeSupport();
 
-    // set Metrics
-    m_eFUnit = GetModuleFieldUnit( rInAttrs );
-
-    switch ( m_eFUnit )
-    {
-        case FUNIT_M:
-        case FUNIT_KM:
-            m_eFUnit = FUNIT_MM;
-        break;
-        default: ;//prevent warning
-    }
-    SetFieldUnit( *m_pMtrFldXSize, m_eFUnit, true );
-    SetFieldUnit( *m_pMtrFldYSize, m_eFUnit, true );
-
     // get PoolUnit
     SfxItemPool* pPool = m_rOutAttrs.GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool?" );
@@ -190,27 +128,10 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
     m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
 
     m_pLbColor->SetSelectHdl( LINK( this, SvxAreaTabPage, ModifyColorHdl_Impl ) );
-    //UUUU
-    m_pBtnImport->SetClickHdl(LINK(this, SvxAreaTabPage, ClickImportHdl_Impl));
-
     m_pLbGradient->SetSelectHdl( LINK( this, SvxAreaTabPage, ModifyGradientHdl_Impl ) );
     m_pLbHatching->SetSelectHdl( LINK( this, SvxAreaTabPage, ModifyHatchingHdl_Impl ) );
     m_pLbBitmap->SetSelectHdl(   LINK( this, SvxAreaTabPage, ModifyBitmapHdl_Impl ) );
 
-    Link<Edit&,void> aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) );
-    Link<Button*,void> aClickLink( LINK( this, SvxAreaTabPage, ModifyTileClickHdl_Impl ) );
-    m_pTsbTile->SetClickHdl( aClickLink );
-    m_pTsbStretch->SetClickHdl( aClickLink );
-    m_pTsbOriginal->SetClickHdl( aClickLink );
-    m_pMtrFldXSize->SetModifyHdl( aLink );
-    m_pMtrFldYSize->SetModifyHdl( aLink );
-    m_pRbtRow->SetClickHdl( aClickLink );
-    m_pRbtColumn->SetClickHdl( aClickLink );
-    m_pMtrFldOffset->SetModifyHdl( aLink );
-    m_pMtrFldXOffset->SetModifyHdl( aLink );
-    m_pMtrFldYOffset->SetModifyHdl( aLink );
-    m_pTsbScale->SetClickHdl( LINK( this, SvxAreaTabPage, ClickScaleHdl_Impl ) );
-
     m_pTypeLB->SetSelectHdl( LINK( this, SvxAreaTabPage, SelectDialogTypeHdl_Impl ) );
 
     // #i76307# always paint the preview in LTR, because this is what the document does
@@ -252,29 +173,7 @@ void SvxAreaTabPage::dispose()
     m_pLbHatching.clear();
     m_pLbBitmap.clear();
     m_pCtlBitmapPreview.clear();
-    m_pBxBitmap.clear();
-    m_pFlSize.clear();
-    m_pTsbOriginal.clear();
-    m_pTsbScale.clear();
-    m_pGridX_Y.clear();
-    m_pFtXSize.clear();
-    m_pMtrFldXSize.clear();
-    m_pFtYSize.clear();
-    m_pMtrFldYSize.clear();
-    m_pFlPosition.clear();
-    m_pCtlPosition.clear();
-    m_pGridOffset.clear();
-    m_pMtrFldXOffset.clear();
-    m_pMtrFldYOffset.clear();
-    m_pBxTile.clear();
-    m_pTsbTile.clear();
-    m_pTsbStretch.clear();
-    m_pFlOffset.clear();
-    m_pRbtRow.clear();
-    m_pRbtColumn.clear();
-    m_pMtrFldOffset.clear();
     m_pCtlXRectPreview.clear();
-    m_pBtnImport.clear();
     SvxTabPage::dispose();
 }
 
@@ -631,232 +530,6 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
                 }
            }
            break;
-       }
-
-        if( m_pTsbTile->IsEnabled() )
-        {
-            TriState eState = m_pTsbTile->GetState();
-            if( m_pTsbTile->IsValueChangedFromSaved() )
-            {
-                XFillBmpTileItem aFillBmpTileItem( eState != TRISTATE_FALSE );
-                pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILE );
-                if ( !pOld || !( *static_cast<const XFillBmpTileItem*>(pOld) == aFillBmpTileItem ) )
-                {
-                    rAttrs->Put( aFillBmpTileItem );
-                    bModified = true;
-                }
-            }
-        }
-
-        if( m_pTsbStretch->IsEnabled() )
-        {
-            TriState eState = m_pTsbStretch->GetState();
-            if( m_pTsbStretch->IsValueChangedFromSaved() )
-            {
-                XFillBmpStretchItem aFillBmpStretchItem(
-                    eState != TRISTATE_FALSE );
-                pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_STRETCH );
-                if ( !pOld || !( *static_cast<const XFillBmpStretchItem*>(pOld) == aFillBmpStretchItem ) )
-                {
-                    rAttrs->Put( aFillBmpStretchItem );
-                    bModified = true;
-                }
-            }
-        }
-
-        // Original size (in the UI) is used as follows:
-        // Controls are disabled, but have to be set.
-        // SizeX = 0; SizeY = 0; Log = sal_True
-
-        //aTsbScale
-        TriState eState = m_pTsbScale->GetState();
-        if( m_pTsbScale->IsValueChangedFromSaved() ||
-            ( !m_pTsbScale->IsEnabled() &&
-              m_pTsbOriginal->IsEnabled() &&
-              m_pTsbScale->GetSavedValue() != TRISTATE_TRUE ) )
-        {
-            std::unique_ptr<XFillBmpSizeLogItem> pItem;
-            if( m_pTsbScale->IsEnabled() )
-                pItem.reset(new XFillBmpSizeLogItem( eState == TRISTATE_FALSE ));
-            else if( m_pTsbOriginal->IsEnabled() && m_pTsbOriginal->GetState() == TRISTATE_TRUE )
-                pItem.reset(new XFillBmpSizeLogItem( true ));
-
-            if( pItem )
-            {
-                pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_SIZELOG );
-                if ( !pOld || !( *static_cast<const XFillBmpSizeLogItem*>(pOld) == *pItem ) )
-                {
-                    rAttrs->Put( *pItem );
-                    bModified = true;
-                }
-            }
-        }
-
-        //aMtrFldXSize
-        OUString aStr = m_pMtrFldXSize->GetText();
-        {
-            std::unique_ptr<XFillBmpSizeXItem> pItem;
-            TriState eScaleState = m_pTsbScale->GetState();
-
-            if( m_pMtrFldXSize->IsEnabled() &&
-                !aStr.isEmpty()  &&
-                aStr != m_pMtrFldXSize->GetSavedValue() )
-            {
-                if( eScaleState == TRISTATE_FALSE )
-                    pItem.reset(new XFillBmpSizeXItem( GetCoreValue( *m_pMtrFldXSize, m_ePoolUnit ) ));
-                else
-                {
-                    // Percentage values are set negatively, so that
-                    // they aren't scaled; this is considered in the item.
-                    pItem.reset(new XFillBmpSizeXItem( -labs( static_cast<long>(m_pMtrFldXSize->GetValue()) ) ));
-                }
-            }
-            else if( m_pTsbOriginal->IsEnabled() &&
-                     m_pTsbOriginal->GetState() == TRISTATE_TRUE &&
-                     !m_pMtrFldXSize->GetSavedValue().isEmpty() )
-                pItem.reset(new XFillBmpSizeXItem( 0 ));
-
-            if( pItem )
-            {
-                pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_SIZEX );
-                if ( !pOld || !( *static_cast<const XFillBmpSizeXItem*>(pOld) == *pItem ) )
-                {
-                    rAttrs->Put( *pItem );
-                    bModified = true;
-                }
-            }
-        }
-
-        //aMtrFldYSize
-        aStr = m_pMtrFldYSize->GetText();
-        {
-            std::unique_ptr<XFillBmpSizeYItem> pItem;
-            TriState eScaleState = m_pTsbScale->GetState();
-
-            if( m_pMtrFldYSize->IsEnabled() &&
-                !aStr.isEmpty()  &&
-                aStr != m_pMtrFldYSize->GetSavedValue() )
-            {
-                if( eScaleState == TRISTATE_FALSE )
-                    pItem.reset(new XFillBmpSizeYItem( GetCoreValue( *m_pMtrFldYSize, m_ePoolUnit ) ));
-                else
-                {
-                    // Percentage values are set negatively, so that
-                    // they aren't scaled by the MetricItem;
-                    // this is considered in the item.
-                    pItem.reset(new XFillBmpSizeYItem( -labs( static_cast<long>(m_pMtrFldYSize->GetValue()) ) ));
-                }
-            }
-            else if( m_pTsbOriginal->IsEnabled() &&
-                     m_pTsbOriginal->GetState() == TRISTATE_TRUE &&
-                     !m_pMtrFldYSize->GetSavedValue().isEmpty() )
-                pItem.reset(new XFillBmpSizeYItem( 0 ));
-
-            if( pItem )
-            {
-                pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_SIZEY );
-                if ( !pOld || !( *static_cast<const XFillBmpSizeYItem*>(pOld) == *pItem ) )
-                {
-                    rAttrs->Put( *pItem );
-                    bModified = true;
-                }
-            }
-        }
-
-        //aRbtRow
-        //aRbtColumn
-        //aMtrFldOffset
-        if( m_pMtrFldOffset->IsEnabled() )
-        {
-            OUString aMtrString = m_pMtrFldOffset->GetText();
-            if( ( !aMtrString.isEmpty()  &&
-                  aMtrString != m_pMtrFldOffset->GetSavedValue() ) ||
-                  m_pRbtRow->IsValueChangedFromSaved() ||
-                  m_pRbtColumn->IsValueChangedFromSaved() )
-            {
-                if( m_pRbtRow->IsChecked() )
-                {
-                    XFillBmpTileOffsetXItem aFillBmpTileOffsetXItem( (sal_uInt16) m_pMtrFldOffset->GetValue() );
-                    pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILEOFFSETX );
-                    if ( !pOld || !( *static_cast<const XFillBmpTileOffsetXItem*>(pOld) == aFillBmpTileOffsetXItem ) )
-                    {
-                        rAttrs->Put( aFillBmpTileOffsetXItem );
-                        rAttrs->Put( XFillBmpTileOffsetYItem( 0 ) );
-                        bModified = true;
-                    }
-                }
-                else if( m_pRbtColumn->IsChecked() )
-                {
-                    XFillBmpTileOffsetYItem aFillBmpTileOffsetYItem( (sal_uInt16) m_pMtrFldOffset->GetValue() );
-                    pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILEOFFSETY );
-                    if ( !pOld || !( *static_cast<const XFillBmpTileOffsetYItem*>(pOld) == aFillBmpTileOffsetYItem ) )
-                    {
-                        rAttrs->Put( aFillBmpTileOffsetYItem );
-                        rAttrs->Put( XFillBmpTileOffsetXItem( 0 ) );
-                        bModified = true;
-                    }
-                }
-            }
-        }
-
-        //aCtlPosition
-        if( m_pCtlPosition->IsEnabled() )
-        {
-            bool bPut = false;
-            RECT_POINT _eRP = m_pCtlPosition->GetActualRP();
-
-            if( SfxItemState::DONTCARE == m_rOutAttrs.GetItemState( XATTR_FILLBMP_POS ) )
-                bPut = true;
-            else
-            {
-                RECT_POINT eValue = static_cast<const XFillBmpPosItem&>( m_rOutAttrs.Get( XATTR_FILLBMP_POS ) ).GetValue();
-                if( eValue != _eRP )
-                    bPut = true;
-            }
-            if( bPut )
-            {
-                XFillBmpPosItem aFillBmpPosItem( _eRP );
-                pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_POS );
-                if ( !pOld || !( *static_cast<const XFillBmpPosItem*>(pOld) == aFillBmpPosItem ) )
-                {
-                    rAttrs->Put( aFillBmpPosItem );
-                    bModified = true;
-                }
-            }
-        }
-
-        //aMtrFldXOffset
-        if( m_pMtrFldXOffset->IsEnabled() )
-        {
-            OUString sMtrXOffset = m_pMtrFldXOffset->GetText();
-            if( !sMtrXOffset.isEmpty()  &&
-                m_pMtrFldXOffset->IsValueChangedFromSaved() )
-            {
-                XFillBmpPosOffsetXItem aFillBmpPosOffsetXItem( (sal_uInt16) m_pMtrFldXOffset->GetValue() );
-                pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_POSOFFSETX );
-                if ( !pOld || !( *static_cast<const XFillBmpPosOffsetXItem*>(pOld) == aFillBmpPosOffsetXItem ) )
-                {
-                    rAttrs->Put( aFillBmpPosOffsetXItem );
-                    bModified = true;
-                }
-            }
-        }
-
-        //aMtrFldYOffset
-        if( m_pMtrFldYOffset->IsEnabled() )
-        {
-            OUString sMtrYOffset = m_pMtrFldYOffset->GetText();
-            if( !sMtrYOffset.isEmpty() &&
-                m_pMtrFldYOffset->IsValueChangedFromSaved() )
-            {
-                XFillBmpPosOffsetYItem aFillBmpPosOffsetYItem( (sal_uInt16) m_pMtrFldYOffset->GetValue() );
-                pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_POSOFFSETY );
-                if ( !pOld || !( *static_cast<const XFillBmpPosOffsetYItem*>(pOld) == aFillBmpPosOffsetYItem ) )
-                {
-                    rAttrs->Put( aFillBmpPosOffsetYItem );
-                    bModified = true;
-                }
-            }
         }
         rAttrs->Put (SfxUInt16Item(SID_PAGE_TYPE,m_nPageType));
         rAttrs->Put (SfxUInt16Item(SID_TABPAGE_POS,m_nPos));
@@ -977,167 +650,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
         m_pTypeLB->SetNoSelection();
     }
 
-    // attributes for the bitmap filling
-
-    if( rAttrs->GetItemState( XATTR_FILLBMP_TILE ) != SfxItemState::DONTCARE )
-    {
-        m_pTsbTile->EnableTriState( false );
-
-        if( static_cast<const XFillBmpTileItem&>( rAttrs->Get( XATTR_FILLBMP_TILE ) ).GetValue() )
-            m_pTsbTile->SetState( TRISTATE_TRUE );
-        else
-            m_pTsbTile->SetState( TRISTATE_FALSE );
-    }
-    else
-        m_pTsbTile->SetState( TRISTATE_INDET );
-
-    if( rAttrs->GetItemState( XATTR_FILLBMP_STRETCH ) != SfxItemState::DONTCARE )
-    {
-        m_pTsbStretch->EnableTriState( false );
-
-        if( static_cast<const XFillBmpStretchItem&>( rAttrs->Get( XATTR_FILLBMP_STRETCH ) ).GetValue() )
-            m_pTsbStretch->SetState( TRISTATE_TRUE );
-        else
-            m_pTsbStretch->SetState( TRISTATE_FALSE );
-    }
-    else
-        m_pTsbStretch->SetState( TRISTATE_INDET );
-
-
-    //aTsbScale
-    if( rAttrs->GetItemState( XATTR_FILLBMP_SIZELOG ) != SfxItemState::DONTCARE )
-    {
-        m_pTsbScale->EnableTriState( false );
-
-        if( static_cast<const XFillBmpSizeLogItem&>( rAttrs->Get( XATTR_FILLBMP_SIZELOG ) ).GetValue() )
-            m_pTsbScale->SetState( TRISTATE_FALSE );
-        else
-            m_pTsbScale->SetState( TRISTATE_TRUE );
-
-        ClickScaleHdl_Impl( nullptr );
-    }
-    else
-        m_pTsbScale->SetState( TRISTATE_INDET );
-
-
-    // determine status for the original size
-    TriState eOriginal = TRISTATE_FALSE;
-
-    //aMtrFldXSize
-    if( rAttrs->GetItemState( XATTR_FILLBMP_SIZEX ) != SfxItemState::DONTCARE )
-    {
-        sal_Int32 nValue = static_cast<const XFillBmpSizeXItem&>( rAttrs->Get( XATTR_FILLBMP_SIZEX ) ).GetValue();
-        if( m_pTsbScale->GetState() == TRISTATE_TRUE )
-        {
-            // If there's a percentage value in the item,
-            // it is negative because of the MetricItems.
-            m_pMtrFldXSize->SetValue( labs( nValue ) );
-        }
-        else
-            SetMetricValue( *m_pMtrFldXSize, nValue, m_ePoolUnit );
-        m_pMtrFldXSize->SaveValue();
-
-        if( nValue == 0 )
-        {
-            eOriginal = TRISTATE_TRUE;
-            // value would be too small otherwise when turning off the original size
-            // (performance problem)
-            m_pMtrFldXSize->SetValue( 100 );
-        }
-    }
-    else
-    {
-        m_pMtrFldXSize->SetText( "" );
-        m_pMtrFldXSize->SaveValue();
-    }
-
-    //aMtrFldYSize
-    if( rAttrs->GetItemState( XATTR_FILLBMP_SIZEY ) != SfxItemState::DONTCARE )
-    {
-        sal_Int32 nValue = static_cast<const XFillBmpSizeYItem&>( rAttrs->Get( XATTR_FILLBMP_SIZEY ) ).GetValue();
-        if( m_pTsbScale->GetState() == TRISTATE_TRUE )
-        {
-            // If there's a percentage value in the item,
-            // it is negative because of the MetricItems.
-            m_pMtrFldYSize->SetValue( labs( nValue ) );
-        }
-        else
-            SetMetricValue( *m_pMtrFldYSize, nValue, m_ePoolUnit );
-        m_pMtrFldYSize->SaveValue();
-
-        if( nValue == 0 )
-            m_pMtrFldYSize->SetValue( 100 ); //s.o.
-        else
-            eOriginal = TRISTATE_FALSE;
-    }
-    else
-    {
-        m_pMtrFldYSize->SetText( "" );
-        m_pMtrFldYSize->SaveValue();
-        eOriginal = TRISTATE_FALSE;
-    }
-
-    // aTsbOriginal
-    m_pTsbOriginal->SetState( eOriginal );
-
-    // #93372# Setting proper state after changing button
-    ModifyTileHdl_Impl( *m_pMtrFldXSize );
-
-    //aRbtRow
-    //aRbtColumn
-    //aMtrFldOffset
-    if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETX ) != SfxItemState::DONTCARE )
-    {
-        sal_uInt16 nValue = static_cast<const XFillBmpTileOffsetXItem&>( rAttrs->Get( XATTR_FILLBMP_TILEOFFSETX ) ).GetValue();
-        if( nValue > 0 )
-        {
-            m_pMtrFldOffset->SetValue( nValue );
-            m_pRbtRow->Check();
-        }
-        else if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETY ) != SfxItemState::DONTCARE )
-        {
-            nValue = static_cast<const XFillBmpTileOffsetYItem&>( rAttrs->Get( XATTR_FILLBMP_TILEOFFSETY ) ).GetValue();
-            if( nValue > 0 )
-            {
-                m_pMtrFldOffset->SetValue( nValue );
-                m_pRbtColumn->Check();
-            }
-        }
-        else
-            m_pMtrFldOffset->SetValue( 0 );
-    }
-    else
-        m_pMtrFldOffset->SetText( "" );
-
-
-    //aCtlPosition
-    if( rAttrs->GetItemState( XATTR_FILLBMP_POS ) != SfxItemState::DONTCARE )
-    {
-        RECT_POINT eValue = static_cast<const XFillBmpPosItem&>( rAttrs->Get( XATTR_FILLBMP_POS ) ).GetValue();
-        m_pCtlPosition->SetActualRP( eValue );
-    }
-    else
-        m_pCtlPosition->Reset();
-
-    //aMtrFldXOffset
-    if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETX ) != SfxItemState::DONTCARE )
-    {
-        sal_Int32 nValue = static_cast<const XFillBmpPosOffsetXItem&>( rAttrs->Get( XATTR_FILLBMP_POSOFFSETX ) ).GetValue();
-        m_pMtrFldXOffset->SetValue( nValue );
-    }
-    else
-        m_pMtrFldXOffset->SetText( "" );
-
-    //aMtrFldYOffset
-    if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SfxItemState::DONTCARE )
-    {
-        sal_Int32 nValue = static_cast<const XFillBmpPosOffsetYItem&>( rAttrs->Get( XATTR_FILLBMP_POSOFFSETY ) ).GetValue();
-        m_pMtrFldYOffset->SetValue( nValue );
-    }
-    else
-        m_pMtrFldYOffset->SetText( "" );
-
-    // not earlier so that tile and stretch are considered
     if( m_pTypeLB->GetSelectEntryPos() == drawing::FillStyle_BITMAP )
         ClickBitmapHdl_Impl();
 
@@ -1150,33 +662,15 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
         m_pLbHatching->SaveValue();
     if (!isMissingBitmap)
         m_pLbBitmap->SaveValue();
-    m_pTsbTile->SaveValue();
-    m_pTsbStretch->SaveValue();
-    m_pTsbScale->SaveValue();
-    m_pRbtRow->SaveValue();
-    m_pRbtColumn->SaveValue();
-    m_pMtrFldOffset->SaveValue();
-    m_pMtrFldXOffset->SaveValue();
-    m_pMtrFldYOffset->SaveValue();
 }
 
 void SvxAreaTabPage::ChangesApplied()
 {
-    m_pMtrFldXSize->SaveValue();
-    m_pMtrFldYSize->SaveValue();
     m_pTypeLB->SaveValue();
     m_pLbColor->SaveValue();
     m_pLbGradient->SaveValue();
     m_pLbHatching->SaveValue();
     m_pLbBitmap->SaveValue();
-    m_pTsbTile->SaveValue();
-    m_pTsbStretch->SaveValue();
-    m_pTsbScale->SaveValue();
-    m_pRbtRow->SaveValue();
-    m_pRbtColumn->SaveValue();
-    m_pMtrFldOffset->SaveValue();
-    m_pMtrFldXOffset->SaveValue();
-    m_pMtrFldYOffset->SaveValue();
 }
 
 
@@ -1202,8 +696,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, SelectDialogTypeHdl_Impl, ListBox&, void)
 
 void SvxAreaTabPage::ClickInvisibleHdl_Impl()
 {
-    m_pBxBitmap->Hide();
-
     m_pFillLB->Hide();
 
     m_pCtlXRectPreview->Hide();
@@ -1220,8 +712,6 @@ void SvxAreaTabPage::ClickInvisibleHdl_Impl()
 
 void SvxAreaTabPage::ClickColorHdl_Impl()
 {
-    m_pBxBitmap->Hide();
-
     m_pFillLB->Show();
     m_pLbColor->Enable();
     m_pLbColor->Show();
@@ -1262,8 +752,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyColorHdl_Impl, ListBox&, void)
 
 void SvxAreaTabPage::ClickGradientHdl_Impl()
 {
-    m_pBxBitmap->Hide();
-
     m_pFillLB->Show();
     m_pLbColor->Hide();
     m_pLbGradient->Enable();
@@ -1320,8 +808,6 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl()
     m_pCtlXRectPreview->Show();
     m_pCtlBitmapPreview->Hide();
 
-    m_pBxBitmap->Hide();
-
     ModifyHatchingHdl_Impl( *m_pLbHatching );
 }
 
@@ -1371,48 +857,17 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl()
     m_pLbColor->Hide();
     m_pLbGradient->Hide();
     m_pLbHatching->Hide();
-
-    //UUUU
-    if(mbOfferImportButton)
-    {
-        m_pBtnImport->Show();
-        m_pBtnImport->Enable();
-    }
-    else
-    {
-        m_pBtnImport->Hide();
-        m_pBtnImport->Disable();
-    }
-
-    m_pLbBitmap->Enable();
     m_pLbBitmap->Show();
     m_pCtlBitmapPreview->Enable();
     m_pCtlBitmapPreview->Show();
     m_pCtlXRectPreview->Hide();
 
-    m_pBxTile->Enable();
-
-    m_pFlSize->Enable();
-    m_pFlPosition->Enable();
-    m_pFlOffset->Enable();
-
-    if (!m_pRbtRow->IsChecked() && !m_pRbtColumn->IsChecked())
-        m_pRbtRow->Check();
-
-    m_pBxBitmap->Show();
-
     ModifyBitmapHdl_Impl( *m_pLbBitmap );
-    ModifyTileHdl_Impl( *m_pMtrFldXSize );
 }
 
 
 IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void)
 {
-    //UUUU
-    mbDirectGraphicSet = false;
-    maDirectGraphic.Clear();
-    maDirectName.clear();
-
     const SfxPoolItem* pPoolItem = nullptr;
     sal_Int32 _nPos = m_pLbBitmap->GetSelectEntryPos();
     if( _nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -1435,241 +890,8 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void)
     m_pCtlBitmapPreview->Invalidate();
 }
 
-IMPL_LINK_NOARG_TYPED( SvxAreaTabPage, ClickImportHdl_Impl, Button*, void )
-{
-    ResMgr& rMgr = CUI_MGR();
-    SvxOpenGraphicDialog aDlg("Import");
-    aDlg.EnableLink(false);
-
-    if(!aDlg.Execute())
-    {
-        EnterWait();
-        const int nError(aDlg.GetGraphic(maDirectGraphic));
-        LeaveWait();
-
-        if(!nError && GraphicType::NONE != maDirectGraphic.GetType())
-        {
-            // extract name from filename
-            const INetURLObject aURL(aDlg.GetPath());
-            maDirectName = aURL.GetName().getToken( 0, '.' );
-
-            // use loaded graphic
-            const XFillBitmapItem aXBmpItem(maDirectName, maDirectGraphic);
-            m_rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
-            m_rXFSet.Put(aXBmpItem);
-
-            // trigger state flag for directly loaded graphic
-            mbDirectGraphicSet = true;
-
-            // preview
-            m_pCtlBitmapPreview->SetAttributes(m_aXFillAttr.GetItemSet());
-            m_pCtlBitmapPreview->Invalidate();
-        }
-        else
-        {
-            // graphic could not be loaded
-            ScopedVclPtrInstance<MessageDialog>(this, OUString(ResId(RID_SVXSTR_READ_DATA_ERROR, rMgr)))->Execute();
-        }
-    }
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileClickHdl_Impl, Button*, void)
-{
-    ModifyTileHdl_Impl(*m_pMtrFldXSize);
-}
-IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileHdl_Impl, Edit&, void)
-{
-    TriState eState = m_pTsbTile->GetState();
-    if( eState == TRISTATE_TRUE )
-    {
-        // tiled
-        // disable stretched for tiled graphic
-        m_pTsbStretch->Disable();
-        m_pFlOffset->Enable();
-
-        // allow positioning
-        m_pCtlPosition->Invalidate();
-        // allow 'Position" title
-        m_pFlPosition->Enable();
-
-        // allow size definitions
-        m_pFlSize->Enable();
-    }
-    else if( eState == TRISTATE_FALSE )
-    {
-        // non-tiled
-        // enable stretch selection
-        m_pTsbStretch->Enable();
-        // no need for offsets, only position is supported in non-tiled
-        m_pFlOffset->Disable();
-
-        if( m_pTsbStretch->GetState() != TRISTATE_FALSE )
-        {
-            // non-tiled, stretched
-            // no need for positioning
-            m_pCtlPosition->Invalidate();
-            // no need for 'Position" title, all deactivated
-            m_pFlPosition->Disable();
-
-            // no need for size definitions
-            m_pFlSize->Disable();
-        }
-        else
-        {
-            // non-tiled, non-stretched
-            // allow positioning
-            m_pCtlPosition->Enable();
-            m_pCtlPosition->Invalidate();
-            // allow 'Position" title, positioning is active
-            m_pFlPosition->Enable();
-            m_pFlSize->Enable();
-        }
-    }
-    else
-    {
-        // disable all when tiling is undefined
-        m_pTsbStretch->Disable();
-        m_pFlOffset->Disable();
-
-        m_pCtlPosition->Invalidate();
-        m_pFlPosition->Disable();
-
-        m_pFlSize->Disable();
-    }
-
-    if( m_pTsbOriginal->GetState() == TRISTATE_TRUE )
-    {
-        m_pMtrFldXSize->SetText( "" );
-        m_pMtrFldYSize->SetText( "" );
-        m_pGridX_Y->Disable();
-        m_pTsbScale->Disable();
-    }
-    else
-    {
-        m_pMtrFldXSize->SetValue( m_pMtrFldXSize->GetValue() );
-        m_pMtrFldYSize->SetValue( m_pMtrFldYSize->GetValue() );
-    }
-
-    m_rXFSet.Put( XFillBmpTileItem( eState != TRISTATE_FALSE ) );
-
-    if( m_pTsbStretch->IsEnabled() )
-        m_rXFSet.Put(
-            XFillBmpStretchItem(
-                m_pTsbStretch->GetState() != TRISTATE_FALSE ) );
-
-    if( m_pTsbScale->IsEnabled() )
-        m_rXFSet.Put( XFillBmpSizeLogItem( m_pTsbScale->GetState() == TRISTATE_FALSE ) );
-
-    if( m_pMtrFldXSize->IsEnabled() )
-    {
-        std::unique_ptr<XFillBmpSizeXItem> pItem;
-        TriState eScaleState = m_pTsbScale->GetState();
-
-        if( eScaleState == TRISTATE_FALSE )
-            pItem.reset(new XFillBmpSizeXItem( GetCoreValue( *m_pMtrFldXSize, m_ePoolUnit ) ));
-        else
-            pItem.reset(new XFillBmpSizeXItem( -labs( static_cast<long>(m_pMtrFldXSize->GetValue()) ) ));
-
-        m_rXFSet.Put( *pItem );
-    }
-    else if( m_pTsbOriginal->IsEnabled() && m_pTsbOriginal->GetState() == TRISTATE_TRUE )
-    {
-        // original size -> size == 0
-        m_rXFSet.Put( XFillBmpSizeXItem( 0 ) );
-        m_rXFSet.Put( XFillBmpSizeLogItem( true ) );
-    }
-
-    if( m_pMtrFldYSize->IsEnabled() )
-    {
-        std::unique_ptr<XFillBmpSizeYItem> pItem;
-        TriState eScaleState = m_pTsbScale->GetState();
-
-        if( eScaleState == TRISTATE_FALSE )
-            pItem.reset(new XFillBmpSizeYItem( GetCoreValue( *m_pMtrFldYSize, m_ePoolUnit ) ));
-        else
-            pItem.reset(new XFillBmpSizeYItem( -labs( static_cast<long>(m_pMtrFldYSize->GetValue()) ) ));
-
-        m_rXFSet.Put( *pItem );
-    }
-    else if( m_pTsbOriginal->IsEnabled() && m_pTsbOriginal->GetState() == TRISTATE_TRUE )
-    {
-        // original size -> size == 0
-        m_rXFSet.Put( XFillBmpSizeYItem( 0 ) );
-        m_rXFSet.Put( XFillBmpSizeLogItem( true ) );
-    }
-
-    if( m_pMtrFldOffset->IsEnabled() )
-    {
-        if( m_pRbtRow->IsChecked() )
-        {
-            m_rXFSet.Put( XFillBmpTileOffsetXItem( (sal_uInt16) m_pMtrFldOffset->GetValue() ) );
-            m_rXFSet.Put( XFillBmpTileOffsetYItem( (sal_uInt16) 0 ) );
-        }
-        else if( m_pRbtColumn->IsChecked() )
-        {
-            m_rXFSet.Put( XFillBmpTileOffsetXItem( (sal_uInt16) 0 ) );
-            m_rXFSet.Put( XFillBmpTileOffsetYItem( (sal_uInt16) m_pMtrFldOffset->GetValue() ) );
-        }
-    }
-
-    if( m_pCtlPosition->IsEnabled() )
-        m_rXFSet.Put( XFillBmpPosItem( m_pCtlPosition->GetActualRP() ) );
-
-    if( m_pMtrFldXOffset->IsEnabled() )
-        m_rXFSet.Put( XFillBmpPosOffsetXItem( (sal_uInt16) m_pMtrFldXOffset->GetValue() ) );
-
-    if( m_pMtrFldYOffset->IsEnabled() )
-        m_rXFSet.Put( XFillBmpPosOffsetYItem( (sal_uInt16) m_pMtrFldYOffset->GetValue() ) );
-
-
-    m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
-    m_pCtlBitmapPreview->Invalidate();
-}
-
-
-IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ClickScaleHdl_Impl, Button*, void)
-{
-    if( m_pTsbScale->GetState() == TRISTATE_TRUE )
-    {
-        m_pMtrFldXSize->SetDecimalDigits( 0 );
-        m_pMtrFldXSize->SetUnit(FUNIT_PERCENT);
-        m_pMtrFldXSize->SetValue( 100 );
-        m_pMtrFldXSize->SetMax( 100 );
-        m_pMtrFldXSize->SetLast( 100 );
-
-        m_pMtrFldYSize->SetDecimalDigits( 0 );
-        m_pMtrFldYSize->SetUnit(FUNIT_PERCENT);
-        m_pMtrFldYSize->SetValue( 100 );
-        m_pMtrFldYSize->SetMax( 100 );
-        m_pMtrFldYSize->SetLast( 100 );
-    }
-    else
-    {
-        m_pMtrFldXSize->SetDecimalDigits( 2 );
-        m_pMtrFldXSize->SetUnit( m_eFUnit );
-        m_pMtrFldXSize->SetValue( 100 );
-        m_pMtrFldXSize->SetMax( 999900 );
-        m_pMtrFldXSize->SetLast( 100000 );
-
-        m_pMtrFldYSize->SetDecimalDigits( 2 );
-        m_pMtrFldYSize->SetUnit( m_eFUnit );
-        m_pMtrFldYSize->SetValue( 100 );
-        m_pMtrFldYSize->SetMax( 999900 );
-        m_pMtrFldYSize->SetLast( 100000 );
-    }
-
-    ModifyTileHdl_Impl( *m_pMtrFldXSize );
-}
-
-
-void SvxAreaTabPage::PointChanged( vcl::Window* , RECT_POINT eRcPt )
+void SvxAreaTabPage::PointChanged( vcl::Window* , RECT_POINT )
 {
-    m_eRP = eRcPt;
-
-    // alignment of the bitmap fill
-    ModifyTileHdl_Impl( *m_pMtrFldXSize );
 }
 
 void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet)
@@ -1682,9 +904,6 @@ void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet)
     const SfxUInt16Item* pDlgTypeItem = aSet.GetItem<SfxUInt16Item>(SID_DLG_TYPE, false);
     const SfxUInt16Item* pPosItem = aSet.GetItem<SfxUInt16Item>(SID_TABPAGE_POS, false);
 
-    //UUUU
-    const SfxBoolItem* pOfferImportItem = aSet.GetItem<SfxBoolItem>(SID_OFFER_IMPORT, false);
-
     if (pColorListItem)
         SetColorList(pColorListItem->GetColorList());
     if (pGradientListItem)
@@ -1700,17 +919,6 @@ void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet)
     if (pPosItem)
         SetPos(pPosItem->GetValue());
 
-    //UUUU
-    if(pOfferImportItem)
-    {
-        const bool bNew(pOfferImportItem->GetValue());
-
-        if(mbOfferImportButton != bNew)
-        {
-            mbOfferImportButton = bNew;
-        }
-    }
-
     Construct();
 }
 
diff --git a/cui/uiconfig/ui/areatabpage.ui b/cui/uiconfig/ui/areatabpage.ui
index fc0eb493a7fe..504e9310dab5 100644
--- a/cui/uiconfig/ui/areatabpage.ui
+++ b/cui/uiconfig/ui/areatabpage.ui
@@ -3,16 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">1000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkListStore" id="liststoreLB_AREA_TYPE">
     <columns>
       <!-- column-name gchararray1 -->
@@ -213,511 +203,6 @@
         <property name="position">0</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkBox" id="mainframe">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox" id="boxBITMAP">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkFrame" id="FL_SIZE">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkBox" id="box9">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
-                        <property name="homogeneous">True</property>
-                        <child>
-                          <object class="GtkBox" id="boxORIGINAL">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <property name="homogeneous">True</property>
-                            <child>
-                              <object class="GtkCheckButton" id="TSB_ORIGINAL">
-                                <property name="label" translatable="yes">_Original</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="receives_default">False</property>
-                                <property name="valign">center</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
-                                <property name="inconsistent">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="TSB_SCALE">
-                                <property name="label" translatable="yes">Re_lative</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="receives_default">False</property>
-                                <property name="valign">center</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
-                                <property name="inconsistent">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkGrid" id="gridX_Y">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="FT_X_SIZE">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Wi_dth:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">MTR_FLD_X_SIZE:0.00cm</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="FT_Y_SIZE">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">H_eight:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">MTR_FLD_Y_SIZE:0.00cm</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="MTR_FLD_X_SIZE:0.00cm">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="invisible_char">•</property>
-                                <property name="adjustment">adjustment3</property>
-                                <property name="digits">2</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="MTR_FLD_Y_SIZE:0.00cm">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="invisible_char">•</property>
-                                <property name="adjustment">adjustment3</property>
-                                <property name="digits">2</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Size</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="framePOSITION">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkBox" id="boxPOSITION">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="svxlo-SvxRectCtl" id="CTL_POSITION">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="valign">start</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkGrid" id="gridOFFSET">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="column_spacing">12</property>
-                            <property name="column_homogeneous">True</property>
-                            <child>
-                              <object class="GtkGrid" id="grid1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="FT_X_OFFSET">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_X offset:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">MTR_FLD_X_SIZE:0.00cm</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="MTR_FLD_X_OFFSET:0%">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="halign">start</property>
-                                    <property name="invisible_char">•</property>
-                                    <property name="text">0</property>
-                                    <property name="adjustment">adjustment2</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkGrid" id="grid2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="FT_Y_OFFSET">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Y offset:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">MTR_FLD_Y_SIZE:0.00cm</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="MTR_FLD_Y_OFFSET:0%">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="halign">start</property>
-                                    <property name="invisible_char">•</property>
-                                    <property name="text">0</property>
-                                    <property name="adjustment">adjustment2</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Position</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="boxTILE">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
-                <property name="spacing">12</property>
-                <property name="homogeneous">True</property>
-                <child>
-                  <object class="GtkCheckButton" id="TSB_TILE">
-                    <property name="label" translatable="yes">_Tile</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="inconsistent">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="TSB_STRETCH">
-                    <property name="label" translatable="yes">Auto_Fit</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="inconsistent">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="FL_OFFSET">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkGrid" id="gridOFFSET2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="row_spacing">1</property>
-                        <property name="column_spacing">12</property>
-                        <property name="column_homogeneous">True</property>
-                        <child>
-                          <object class="GtkRadioButton" id="RBT_ROW">
-                            <property name="label" translatable="yes">Ro_w</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="MTR_FLD_OFFSET:0%">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">start</property>
-                            <property name="invisible_char">•</property>
-                            <property name="text">0</property>
-                            <property name="adjustment">adjustment2</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="RBT_COLUMN">
-                            <property name="label" translatable="yes">Colu_mn</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">RBT_ROW</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Offset</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="btnimport">
-                <property name="label" translatable="yes">Import Image...</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
@@ -730,10 +215,4 @@
       <widget name="CTL_BITMAP_PREVIEW"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup2">
-    <widgets>
-      <widget name="boxORIGINAL"/>
-      <widget name="gridX_Y"/>
-    </widgets>
-  </object>
 </interface>