Author: alg
Date: Wed Jan 8 15:53:47 2014
New Revision: 1556561
URL: http://svn.apache.org/r1556561
Log:
made AreaDialog called from sidebar using more options work
Modified:
openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx
Modified:
openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx?rev=1556561&r1=1556560&r2=1556561&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx
(original)
+++ openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx Wed
Jan 8 15:53:47 2014
@@ -1321,17 +1321,21 @@ void SwFrameShell::ExecDrawDlgTextFrame(
SdrModel* pDoc = pView->GetModel();
SfxItemSet aNewAttr(pDoc->GetItemPool());
+ // get attributes from FlyFrame
+ rSh.GetFlyFrmAttr(aNewAttr);
+
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet Factory fail!");
AbstractSvxAreaTabDialog * pDlg =
pFact->CreateSvxAreaTabDialog(
NULL,
&aNewAttr,
pDoc,
-false);
+ false);
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if(RET_OK == pDlg->Execute())
{
+ // set attributes at FlyFrame
rSh.SetFlyFrmAttr(const_cast< SfxItemSet&
>(*pDlg->GetOutputItemSet()));
static sal_uInt16 __READONLY_DATA aInval[] =
