summaryrefslogtreecommitdiff
path: root/svx/source/form/fmview.cxx
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2010-12-23 10:01:58 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2010-12-23 10:01:58 +0100
commit48de44881b95b2ce90759e0485d3a96fe1c1f4db (patch)
tree9616f3de0aa7b09e04de84f07534ccc05ef412de /svx/source/form/fmview.cxx
parenteb77ace518782bcbc0ac29c03b58ca3811e25cf8 (diff)
parent794c821e4d48c34aa376cdc7b6ab2cb029d9574d (diff)
undoapi: merged after pulling DEV300_m96. Most probably still not buildable:A number of changes which happened in the CWS need to be redone due to the new build system
Diffstat (limited to 'svx/source/form/fmview.cxx')
-rw-r--r--svx/source/form/fmview.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 71eed4a0c60e..1147e71b0731 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -49,7 +49,7 @@
#include <basic/sbx.hxx>
#include "fmitems.hxx"
#include "fmobj.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
#include <svx/svdpagv.hxx>
#include <svx/svdogrp.hxx>
#include <svx/fmview.hxx>
@@ -75,7 +75,7 @@
#include <vcl/stdtext.hxx>
#include <svx/fmglob.hxx>
#include <svx/sdrpagewindow.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -138,9 +138,7 @@ void FmFormView::Init()
const SfxPoolItem *pItem=0;
if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, sal_False, &pItem ) == SFX_ITEM_SET )
{
- Sequence< PropertyValue > aSeq;
- ( ((SfxUnoAnyItem*)pItem)->GetValue() ) >>= aSeq;
- ::comphelper::NamedValueCollection aComponentData( aSeq );
+ ::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() );
bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode );
}
}