diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/qa/unit/export-tests.cxx | 8 | ||||
-rw-r--r-- | sd/qa/unit/import-tests.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/EffectMigration.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsListener.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/table/tablefunction.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/tools/EventMultiplexer.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 2 |
12 files changed, 28 insertions, 34 deletions
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 96ef8094d770..2fcec9351420 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -190,12 +190,12 @@ void SdExportTest::testN821567() xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xPage, uno::UNO_QUERY ); - uno::Any aAny = xPropSet->getPropertyValue( OUString("Background") ); + uno::Any aAny = xPropSet->getPropertyValue( "Background" ); if(aAny.hasValue()) { uno::Reference< beans::XPropertySet > aXBackgroundPropSet; aAny >>= aXBackgroundPropSet; - aAny = aXBackgroundPropSet->getPropertyValue( OUString("FillBitmapName")); + aAny = aXBackgroundPropSet->getPropertyValue( "FillBitmapName" ); aAny >>= bgImage; } CPPUNIT_ASSERT_MESSAGE("Slide Background is not exported properly", !bgImage.isEmpty()); @@ -594,7 +594,7 @@ void SdExportTest::testFdo83751() uno::Reference<document::XDocumentProperties> xProps( xDocumentPropertiesSupplier->getDocumentProperties(), uno::UNO_QUERY ); uno::Reference<beans::XPropertySet> xUDProps( xProps->getUserDefinedProperties(), uno::UNO_QUERY ); OUString propValue; - xUDProps->getPropertyValue(OUString("Testing")) >>= propValue; + xUDProps->getPropertyValue("Testing") >>= propValue; CPPUNIT_ASSERT_EQUAL(OUString("Document"), propValue); xDocShRef->DoClose(); } @@ -1117,7 +1117,7 @@ void SdExportTest::testTdf91378() uno::Reference<document::XDocumentProperties> xProps( xDocumentPropertiesSupplier->getDocumentProperties(), uno::UNO_QUERY ); uno::Reference<beans::XPropertySet> xUDProps( xProps->getUserDefinedProperties(), uno::UNO_QUERY ); OUString propValue; - xUDProps->getPropertyValue(OUString("Testing")) >>= propValue; + xUDProps->getPropertyValue("Testing") >>= propValue; CPPUNIT_ASSERT(propValue.isEmpty()); xDocShRef = saveAndReload( xDocShRef, PPTX ); } diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index e05cf4d47ff7..9376286f67bd 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -646,7 +646,7 @@ void SdImportTest::testFdo71075() CPPUNIT_ASSERT_MESSAGE( "failed to load shape", xShape.is() ); uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); - aAny = xPropSet->getPropertyValue( OUString("Model") ); + aAny = xPropSet->getPropertyValue( "Model" ); CPPUNIT_ASSERT_MESSAGE( "failed to load shape", aAny.hasValue() ); uno::Reference< chart::XChartDocument > xChartDoc; diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 2912b666440b..668aef1d5279 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -1346,7 +1346,7 @@ void createVisibilityOnOffNode(Reference< XTimeContainer >& rxParentContainer, S xAnimate->setTarget(aAny); // set AttributeName - xAnimate->setAttributeName(OUString("Visibility")); + xAnimate->setAttributeName("Visibility"); // set attribute value aAny <<= bVisible; diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index aa76a395ce45..830d451aac5f 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -511,11 +511,11 @@ static void implCreateTableTemplate( const Reference< XNameContainer >& xTableFa { if( xTableFamily.is() ) try { - if( !xTableFamily->hasByName( OUString( rName ) ) ) + if( !xTableFamily->hasByName( rName ) ) { Reference< XSingleServiceFactory > xFactory( xTableFamily, UNO_QUERY_THROW ); Reference< XNameReplace > xDefaultTableStyle( xFactory->createInstance(), UNO_QUERY_THROW ); - xTableFamily->insertByName( OUString( rName ), Any( xDefaultTableStyle ) ); + xTableFamily->insertByName( rName, Any( xDefaultTableStyle ) ); xDefaultTableStyle->replaceByName( "body", rBody ); xDefaultTableStyle->replaceByName( "odd-rows" , rBanding ); diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 575d9f307786..3679ca1f67bd 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -110,7 +110,7 @@ void PPTWriter::exportPPTPre( const std::vector< css::beans::PropertyValue >& rM { mbStatusIndicator = true; mnStatMaxValue = ( mnPages + mnMasterPages ) * 5; - mXStatusIndicator->start( OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); + mXStatusIndicator->start( "PowerPoint Export", mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); } SvGlobalName aGName( 0x64818d10L, 0x4f9b, 0x11cf, 0x86, 0xea, 0x00, 0xaa, 0x00, 0xb9, 0x29, 0xe8 ); @@ -145,7 +145,7 @@ void PPTWriter::exportPPTPost( ) if ( mbStatusIndicator ) { - mXStatusIndicator->setText( OUString( "PowerPoint Export" ) ); + mXStatusIndicator->setText( "PowerPoint Export" ); sal_uInt32 nValue = mnStatMaxValue + ( mnStatMaxValue >> 3 ); if ( nValue > mnLatestStatValue ) { diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index b349a438471b..a99caae77db2 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -145,9 +145,9 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) ::awt::Size aPageSize; xSlideProps->getPropertyValue( - OUString("Width")) >>= aPageSize.Width; + "Width") >>= aPageSize.Width; xSlideProps->getPropertyValue( - OUString("Height")) >>= aPageSize.Height; + "Height") >>= aPageSize.Height; ::awt::Point aPicPos; @@ -188,9 +188,9 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) ::awt::Size aPageSize; xSlideProps->getPropertyValue( - OUString("Width")) >>= aPageSize.Width; + "Width") >>= aPageSize.Width; xSlideProps->getPropertyValue( - OUString("Height")) >>= aPageSize.Height; + "Height") >>= aPageSize.Height; // grab the left one void* pD1 = pImagesLst->GetEntryData(i); @@ -293,9 +293,9 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) ::awt::Size aPageSize; xSlideProps->getPropertyValue( - OUString("Width")) >>= aPageSize.Width; + "Width") >>= aPageSize.Width; xSlideProps->getPropertyValue( - OUString("Height")) >>= aPageSize.Height; + "Height") >>= aPageSize.Height; // grab the upper left one void* pD1 = pImagesLst->GetEntryData(i); diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index b167ab23c08a..79b34a445423 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -211,9 +211,7 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript { Any aPage; aPage <<= rpDescriptor->GetPage()->getUnoPage(); - xSet->setPropertyValue ( - OUString("CurrentPage"), - aPage); + xSet->setPropertyValue( "CurrentPage", aPage ); } } catch (const Exception&) diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 6628f31bc15a..c69c49ad6723 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -212,7 +212,7 @@ void Listener::ConnectToController() { try { - xSet->addPropertyChangeListener(OUString("CurrentPage"), this); + xSet->addPropertyChangeListener("CurrentPage", this); } catch (beans::UnknownPropertyException&) { @@ -220,7 +220,7 @@ void Listener::ConnectToController() } try { - xSet->addPropertyChangeListener(OUString("IsMasterPageMode"), this); + xSet->addPropertyChangeListener("IsMasterPageMode", this); } catch (beans::UnknownPropertyException&) { @@ -252,12 +252,8 @@ void Listener::DisconnectFromController() // Remove the property listener. if (xSet.is()) { - xSet->removePropertyChangeListener ( - OUString("CurrentPage"), - this); - xSet->removePropertyChangeListener ( - OUString("IsMasterPageMode"), - this); + xSet->removePropertyChangeListener( "CurrentPage", this ); + xSet->removePropertyChangeListener( "IsMasterPageMode", this); } // Remove the dispose listener. diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 14fcf10edc95..c544e70753bd 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -181,7 +181,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) // First make sure that the sidebar is visible pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR); ::sfx2::sidebar::Sidebar::ShowPanel( - OUString("SdSlideTransitionPanel"), + "SdSlideTransitionPanel", pShell->GetViewFrame()->GetFrame().GetFrameInterface()); rRequest.Ignore (); break; diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index d3c32d68a0d2..5f1a09abda98 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -208,7 +208,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) // First make sure that the sidebar is visible GetViewFrame()->ShowChildWindow(SID_SIDEBAR); ::sfx2::sidebar::Sidebar::ShowPanel( - OUString("SdTableDesignPanel"), + "SdTableDesignPanel", GetViewFrame()->GetFrame().GetFrameInterface()); } diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index f218a21d81df..2552f2b8d01c 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -381,7 +381,7 @@ void EventMultiplexer::Implementation::ConnectToController() { try { - xSet->addPropertyChangeListener(OUString(aCurrentPagePropertyName), this); + xSet->addPropertyChangeListener(aCurrentPagePropertyName, this); } catch (const beans::UnknownPropertyException&) { @@ -390,7 +390,7 @@ void EventMultiplexer::Implementation::ConnectToController() try { - xSet->addPropertyChangeListener(OUString(aEditModePropertyName), this); + xSet->addPropertyChangeListener(aEditModePropertyName, this); } catch (const beans::UnknownPropertyException&) { @@ -425,7 +425,7 @@ void EventMultiplexer::Implementation::DisconnectFromController() { try { - xSet->removePropertyChangeListener(OUString(aCurrentPagePropertyName), this); + xSet->removePropertyChangeListener(aCurrentPagePropertyName, this); } catch (const beans::UnknownPropertyException&) { @@ -434,7 +434,7 @@ void EventMultiplexer::Implementation::DisconnectFromController() try { - xSet->removePropertyChangeListener(OUString(aEditModePropertyName), this); + xSet->removePropertyChangeListener(aEditModePropertyName, this); } catch (const beans::UnknownPropertyException&) { diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 439389902628..4df152a283d1 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -122,7 +122,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( // First make sure that the sidebar is visible mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR); sfx2::sidebar::Sidebar::ShowPanel( - OUString("SdLayoutsPanel"), + "SdLayoutsPanel", mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface()); break; } |