diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-05 19:34:00 -0300 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-05 19:34:00 -0300 |
commit | fe51974e6515f48a6e6881e5837027d08c8d66e9 (patch) | |
tree | 362e3a16ab4f8def5695033b9edf8b62af64a221 /sd | |
parent | More RTL_CONSTASCII_USTRINGPARAM cleanup (diff) | |
download | core-fe51974e6515f48a6e6881e5837027d08c8d66e9.tar.gz core-fe51974e6515f48a6e6881e5837027d08c8d66e9.zip |
More removal of RTL_CONSTASCII_USTRINGPARAM in sd
More removal of RTL_CONSTASCII_USTRINGPARAM in module sd
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/sdview3.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/view/sdview4.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 7 |
4 files changed, 10 insertions, 11 deletions
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 67b802dd75a4..062cf34dc94c 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -174,7 +174,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewSh Reference<XFrame> xFrame (mrOutlineViewShell.GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(), UNO_QUERY); - const OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:ShowSlide" )); + const OUString aSlotURL( ".uno:ShowSlide" ); maSlideImage = GetImage( xFrame, aSlotURL, true ); // Tell undo manager of the document about the undo manager of the diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 70f2a7a1e707..339e808e9163 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -975,12 +975,12 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, svt::EmbeddedObjectRef::TryRunningState( xObj ); uno::Reference< beans::XPropertySet > xProps( xObj->getComponent(), uno::UNO_QUERY ); if ( xProps.is() && - ( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>= bDisableDataTableDialog ) && + ( xProps->getPropertyValue( ::rtl::OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) && bDisableDataTableDialog ) { - xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ), + xProps->setPropertyValue( ::rtl::OUString( "DisableDataTableDialog" ), uno::makeAny( sal_False ) ); - xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableComplexChartTypes" ) ), + xProps->setPropertyValue( ::rtl::OUString( "DisableComplexChartTypes" ), uno::makeAny( sal_False ) ); uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY ); if ( xModifiable.is() ) @@ -1023,12 +1023,12 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, uno::Reference< embed::XStorage > xTmpStor = ::comphelper::OStorageHelper::GetTemporaryStorage(); uno::Reference < embed::XEmbedObjectClipboardCreator > xClipboardCreator( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.MSOLEObjectSystemCreator")) ), + ::rtl::OUString( "com.sun.star.embed.MSOLEObjectSystemCreator") ), uno::UNO_QUERY_THROW ); embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard( xTmpStor, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "DummyName" ) ), + ::rtl::OUString( "DummyName" ), uno::Sequence< beans::PropertyValue >() ); // TODO/LATER: in future InsertedObjectInfo will be used to get container related information diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index e109d8b0dcea..bd919e50649f 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -488,7 +488,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) //TODO/MBA: testing ::rtl::OUString aName; uno::Sequence < beans::PropertyValue > aMedium(1); - aMedium[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + aMedium[0].Name = ::rtl::OUString( "URL" ); aMedium[0].Value <<= ::rtl::OUString( aCurrentDropFile ); uno::Reference < embed::XEmbeddedObject > xObj = mpDocSh->GetEmbeddedObjectContainer(). diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 7dfdb9bd9b84..87c68397814f 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -1110,8 +1110,7 @@ void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < nViewID = GetViewShellBase().GetMainViewShell()->mpImpl->GetViewId(); rSequence[nIndex].Name = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_ViewId ) ); - rtl::OUStringBuffer sBuffer ( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "view" ) ) ); + rtl::OUStringBuffer sBuffer ( rtl::OUString( "view" ) ); sBuffer.append( static_cast<sal_Int32>(nViewID)); rSequence[nIndex].Value <<= sBuffer.makeStringAndClear(); @@ -1187,11 +1186,11 @@ void ViewShell::AdaptDefaultsForChart( // set background to transparent (none) uno::Reference< beans::XPropertySet > xPageProp( xChartDoc->getPageBackground()); if( xPageProp.is()) - xPageProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FillStyle")), + xPageProp->setPropertyValue( ::rtl::OUString( "FillStyle" ), uno::makeAny( drawing::FillStyle_NONE )); // set no border if( xPageProp.is()) - xPageProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LineStyle")), + xPageProp->setPropertyValue( ::rtl::OUString( "LineStyle" ), uno::makeAny( drawing::LineStyle_NONE )); } catch( const uno::Exception & ) |