diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-13 22:22:39 -0300 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-13 22:22:39 -0300 |
commit | 9432c51b350958162df7fa6cddb4aaf0536735df (patch) | |
tree | f8ae75e2f610f0b808018076292d446a1fa25998 /sd | |
parent | 301217d7087280f1ec4053dd873f79922d981dd3 (diff) |
More RTL_CONSTASCII_USTRINGPARAM removals
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvasFactory.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/LayoutMenu.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/ScrollPanel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/SubToolPanel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/unoidl/sddetect.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/view/GraphicObjectBar.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drtxtob.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsf.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 2 |
16 files changed, 21 insertions, 23 deletions
diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx b/sd/source/ui/presenter/PresenterCanvasFactory.cxx index 22530559e6cc..1999f120d3fb 100644 --- a/sd/source/ui/presenter/PresenterCanvasFactory.cxx +++ b/sd/source/ui/presenter/PresenterCanvasFactory.cxx @@ -251,7 +251,7 @@ Reference<rendering::XCanvas> PresenterCanvasFactory::CreateCanvas ( xFactory->createInstanceWithArguments( rsCanvasServiceName.getLength()>0 ? rsCanvasServiceName - : OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.VCLCanvas")), + : OUString("com.sun.star.rendering.VCLCanvas"), aArg), UNO_QUERY); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index e8421a572de1..a9b09a9a0a17 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -140,7 +140,7 @@ SlideSorterViewShell::SlideSorterViewShell ( mpFrameView = new FrameView(GetDoc()); GetFrameView()->Connect(); - SetName (String (RTL_CONSTASCII_USTRINGPARAM("SlideSorterViewShell"))); + SetName (rtl::OUString("SlideSorterViewShell")); pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL); } diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 70af4cd627c6..62d2c5060175 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -206,7 +206,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) SetExtraSpacing(2); SetSelectHdl (LINK(this, LayoutMenu, ClickHandler)); SetPool (&rDocumentShell.GetDoc()->GetPool()); - SetName(String(RTL_CONSTASCII_USTRINGPARAM("LayoutMenu"))); + SetName(rtl::OUString("LayoutMenu")); InvalidateContent(); Link aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener)); diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index ee575ceaf390..b2011240c516 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -60,7 +60,7 @@ ScrollPanel::ScrollPanel ( void ScrollPanel::Construct() { - SetAccessibleName (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel"))); + SetAccessibleName (::rtl::OUString("Sub Task Panel")); mpControlContainer->SetMultiSelection (true); SetBorderStyle (WINDOW_BORDER_NORMAL); diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index e753918baa50..1d1c8dbed35d 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -52,7 +52,7 @@ SubToolPanel::SubToolPanel ( mnVerticalGap(3), mnHorizontalBorder(2) { - SetAccessibleName (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel"))); + SetAccessibleName (::rtl::OUString("Sub Task Panel")); mpControlContainer->SetMultiSelection (true); SetBorderStyle (WINDOW_BORDER_NORMAL); diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 66fe8f6bf7db..12f65150267e 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -512,7 +512,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi mpHorizontalRuler.reset(); mpVerticalRuler.reset(); - SetName( String( RTL_CONSTASCII_USTRINGPARAM( "ToolPanelViewShell" ) ) ); + SetName( rtl::OUString( "ToolPanelViewShell" ) ); // enforce the creation of the Accessible object here. // In some not-always-to-reproduce situations, creating the accessible on demand only leads to some diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx index 1401bb94726e..69ff4f420908 100644 --- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx @@ -98,7 +98,7 @@ AllMasterPagesSelector::AllMasterPagesSelector ( mrViewShell(rViewShell), mpSortedMasterPages(new SortedMasterPageDescriptorList()) { - SetName (String(RTL_CONSTASCII_USTRINGPARAM("AllMasterPagesSelector"))); + SetName (rtl::OUString("AllMasterPagesSelector")); MasterPagesSelector::Fill(); } diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx index 2692043e2f2c..212cacf83c6a 100644 --- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx @@ -60,7 +60,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( const ::boost::shared_ptr<MasterPageContainer>& rpContainer) : MasterPagesSelector (pParent, rDocument, rBase, rpContainer) { - SetName(String(RTL_CONSTASCII_USTRINGPARAM("CurrentMasterPagesSelector"))); + SetName(rtl::OUString("CurrentMasterPagesSelector")); // For this master page selector only we change the default action for // left clicks. diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx index 84b02eacfab0..0a58fc3589a9 100644 --- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx @@ -48,7 +48,7 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( const ::boost::shared_ptr<MasterPageContainer>& rpContainer) : MasterPagesSelector (pParent, rDocument, rBase, rpContainer) { - SetName (String(RTL_CONSTASCII_USTRINGPARAM("RecentMasterPagesSelector"))); + SetName (rtl::OUString("RecentMasterPagesSelector")); } diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx index 6b3d69086ee8..1f305328a234 100644 --- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx @@ -193,8 +193,8 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void) if ( ! xSet.is()) return; - const String sURLMemberName (RTL_CONSTASCII_USTRINGPARAM("URL")); - const String sNameMemberName (RTL_CONSTASCII_USTRINGPARAM("Name")); + const OUString sURLMemberName("URL"); + const OUString sNameMemberName("Name"); OUString sURL; OUString sName; @@ -268,8 +268,8 @@ void RecentlyUsedMasterPages::SavePersistentValues (void) xSet->removeByName (aKeys[i]); // Fill it with the URLs of this object. - const String sURLMemberName (RTL_CONSTASCII_USTRINGPARAM("URL")); - const String sNameMemberName (RTL_CONSTASCII_USTRINGPARAM("Name")); + const OUString sURLMemberName("URL"); + const OUString sNameMemberName("Name"); Any aValue; Reference<lang::XSingleServiceFactory> xChildFactory ( xSet, UNO_QUERY); diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 4280288333ee..07c92ac1f9ab 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -390,9 +390,8 @@ SdFilterDetect::~SdFilterDetect() nBase = 1; else if ( aFilterTypeName.CompareToAscii( "pcd_Photo_CD_Base16" ) == COMPARE_EQUAL ) nBase = 0; - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Import/PCD" ) ); - FilterConfigItem aFilterConfigItem( aFilterConfigPath ); - aFilterConfigItem.WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ), nBase ); + FilterConfigItem aFilterConfigItem( "Office.Common/Filter/Graphic/Import/PCD" ); + aFilterConfigItem.WriteInt32( "Resolution" , nBase ); } SfxFilterMatcher aMatch( String::CreateFromAscii("sdraw") ); diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 87efab47222f..247844f1a4f6 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -93,7 +93,7 @@ GraphicObjectBar::GraphicObjectBar ( SetUndoManager( pDocShell->GetUndoManager() ); SetRepeatTarget( mpView ); SetHelpId( SD_IF_SDDRAWGRAFOBJECTBAR ); - SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Graphic objectbar" ))); + SetName( rtl::OUString( "Graphic objectbar" )); } // ----------------------------------------------------------------------------- diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index f955e0b9eb33..e124fcc735e5 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -133,7 +133,7 @@ TextObjectBar::TextObjectBar ( } } - SetName( String( RTL_CONSTASCII_USTRINGPARAM( "TextObjectBar" ))); + SetName( rtl::OUString( "TextObjectBar" )); // SetHelpId( SD_IF_SDDRAWTEXTOBJECTBAR ); } diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index df0ddd916b61..38dc2b84a6f6 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -506,7 +506,7 @@ String DrawViewShell::GetSelectionText(sal_Bool bCompleteWords) ESelection aSel = pOlView->GetSelection(); String aStrCurrentDelimiters = pOl->GetWordDelimiters(); - pOl->SetWordDelimiters( String( RTL_CONSTASCII_USTRINGPARAM( " .,;\"'" ))); + pOl->SetWordDelimiters( OUString(" .,;\"'" )); aStrSelection = pOl->GetWord( aSel.nEndPara, aSel.nEndPos ); pOl->SetWordDelimiters( aStrCurrentDelimiters ); } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index b72f0fad55d3..4f1398904286 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -173,8 +173,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) pLastPage = GetActualPage(); - String aName( RTL_CONSTASCII_USTRINGPARAM( "OutlineViewShell" )); - SetName (aName); + SetName( OUString( "OutlineViewShell" ) ); SetHelpId( SD_IF_SDOUTLINEVIEWSHELL ); GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL ); @@ -1599,7 +1598,7 @@ String OutlineViewShell::GetSelectionText(sal_Bool bCompleteWords) ESelection aSel = pOutlinerView->GetSelection(); String aStrCurrentDelimiters = pOl->GetWordDelimiters(); - pOl->SetWordDelimiters( String( RTL_CONSTASCII_USTRINGPARAM( " .,;\"'" ))); + pOl->SetWordDelimiters( OUString( " .,;\"'" ) ); aStrSelection = pOl->GetWord( aSel.nEndPara, aSel.nEndPos ); pOl->SetWordDelimiters( aStrCurrentDelimiters ); } diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 1640b73bb471..d7834b3af1d2 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -163,7 +163,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewSh maBulletFont.SetColor( COL_AUTO ); maBulletFont.SetHeight( 1000 ); maBulletFont.SetCharSet(RTL_TEXTENCODING_MS_1252); // and replacing other values by standard - maBulletFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "StarSymbol" )) ); + maBulletFont.SetName( OUString( "StarSymbol" ) ); maBulletFont.SetWeight(WEIGHT_NORMAL); maBulletFont.SetUnderline(UNDERLINE_NONE); maBulletFont.SetStrikeout(STRIKEOUT_NONE); |