diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-01 12:29:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-01 13:14:55 +0000 |
| commit | 44f85f3804d69cd437a5baeae2d1aeadf1873f74 (patch) | |
| tree | 8eeefee3faf2ba14c6eb366a33de21ea37244e03 /cui/source/factory | |
| parent | b26f6cdbd0de34cceb1dd8fc382490860f45a66f (diff) | |
convert emboss dialog to .ui
Change-Id: I16883023ba7386437ff1cc9cd7d3393db8fb4654
Diffstat (limited to 'cui/source/factory')
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 13 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 12 |
2 files changed, 5 insertions, 20 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 11fc55c685cf..a75e482d1142 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -140,7 +140,6 @@ IMPL_ABSTDLG_BASE(AbstractSvxMultiFileDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl); IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl); IMPL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl); -IMPL_ABSTDLG_BASE(oldAbstractGraphicFilterDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractPasteDialog_Impl); IMPL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl); @@ -878,11 +877,6 @@ Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGr return pDlg->GetFilteredGraphic( rGraphic, fScaleX, fScaleY ); } -Graphic oldAbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) -{ - return pDlg->GetFilteredGraphic( rGraphic, fScaleX, fScaleY ); -} - // AbstractSvxAreaTabDialog implementations just forwards everything to the dialog void AbstractSvxAreaTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { @@ -1505,11 +1499,10 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (Window* pParent, const Graphic& rGraphic, - RECT_POINT eLightSource, - sal_uInt32) + RECT_POINT eLightSource) { - oldGraphicFilterDialog* pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource ); - return new oldAbstractGraphicFilterDialog_Impl( pDlg ); + GraphicFilterDialog* pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource ); + return new AbstractGraphicFilterDialog_Impl( pDlg ); } AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(Window* pParent, diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 58e921a680d1..4f90936e35e1 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -46,7 +46,6 @@ class SvxMultiFileDialog; class SvxHpLinkDlg; class FmSearchDialog; class Graphic; -class oldGraphicFilterDialog; class GraphicFilterDialog; class SvxAreaTabDialog; class InsertObjectDialog_Impl; @@ -443,12 +442,6 @@ class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); }; -class oldAbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog -{ - DECL_ABSTDLG_BASE(oldAbstractGraphicFilterDialog_Impl,oldGraphicFilterDialog) - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); -}; - class SvxAreaTabDialog; class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog { @@ -660,9 +653,8 @@ public: const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier); - virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, - const Graphic& rGraphic, RECT_POINT eLightSource, - sal_uInt32 nResId); + virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(Window* pParent, + const Graphic& rGraphic, RECT_POINT eLightSource); virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount); virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent, |