diff options
| author | sb <sb@openoffice.org> | 2010-01-21 12:06:31 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-21 12:06:31 +0100 |
| commit | 6fc142c2e5993e1763a897186eef76a984105f5c (patch) | |
| tree | 80a45e7f2865074dec4739690c5c49d1f2f8afc4 /sd/source/ui/unoidl | |
| parent | 54a3fd62fe515fc9e50e4f00620ea9600e06145b (diff) | |
| parent | 5c2d284b0f9973aada365a8f464f1152671bd629 (diff) | |
sb118: merged in DEV300_m70
Diffstat (limited to 'sd/source/ui/unoidl')
| -rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 51caedee6f6f..65fa2dbf0206 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -737,7 +737,7 @@ Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() } -uno::Reference< form::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException) +uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException) { OGuard aGuard( Application::GetSolarMutex() ); @@ -746,7 +746,7 @@ uno::Reference< form::XFormController > SAL_CALL DrawController::getFormControll ::boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell(); ::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : NULL; - uno::Reference< form::XFormController > xController( NULL ); + uno::Reference< form::runtime::XFormController > xController( NULL ); if ( pFormShell && pSdrView && pWindow ) xController = pFormShell->GetFormController( Form, *pSdrView, *pWindow ); return xController; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 8906059e57cf..2e753fd859d1 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -122,8 +122,6 @@ using namespace ::com::sun::star; extern uno::Reference< uno::XInterface > SdUnoCreatePool( SdDrawDocument* pDrawModel ); -/////////////////////////////////////////////////////////////////////// - class SdUnoForbiddenCharsTable : public SvxUnoForbiddenCharsTable, public SfxListener { @@ -1516,7 +1514,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( sal_Bool bExportNotesPages = sal_False; for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty ) { - if( rxOptions[ nProperty ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ) ) + if( rxOptions[ nProperty ].Name.equalsAscii( "ExportNotesPages" ) ) rxOptions[ nProperty].Value >>= bExportNotesPages; } uno::Sequence< beans::PropertyValue > aRenderer; |