Kaydet (Commit) 80016f5f authored tarafından Matteo Casalin's avatar Matteo Casalin

OUString: avoid temporaries and constify

Change-Id: I12762daed58e8006e95cc10c3ba0b1d7564a012e
üst 25b11683
...@@ -256,7 +256,7 @@ SwPrintUIOptions::SwPrintUIOptions( ...@@ -256,7 +256,7 @@ SwPrintUIOptions::SwPrintUIOptions(
if (!bWeb) if (!bWeb)
{ {
// create subgroup for misc options // create subgroup for misc options
m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", OUString(aLocalizedStrings.GetString(9)), OUString()); m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", aLocalizedStrings.GetString(9), OUString());
// create a bool option for printing automatically inserted blank pages // create a bool option for printing automatically inserted blank pages
bDefaultVal = rDefaultPrintData.IsPrintEmptyPages(); bDefaultVal = rDefaultPrintData.IsPrintEmptyPages();
...@@ -280,12 +280,12 @@ SwPrintUIOptions::SwPrintUIOptions( ...@@ -280,12 +280,12 @@ SwPrintUIOptions::SwPrintUIOptions(
vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
aPrintRangeOpt.maGroupHint = "PrintRange"; aPrintRangeOpt.maGroupHint = "PrintRange";
aPrintRangeOpt.mbInternalOnly = true; aPrintRangeOpt.mbInternalOnly = true;
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aLocalizedStrings.GetString(26)), m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", aLocalizedStrings.GetString(26),
OUString(), OUString(),
aPrintRangeOpt); aPrintRangeOpt);
// create a choice for the content to create // create a choice for the content to create
OUString aPrintRangeName( "PrintContent" ); const OUString aPrintRangeName( "PrintContent" );
uno::Sequence< OUString > aChoices( 3 ); uno::Sequence< OUString > aChoices( 3 );
uno::Sequence< sal_Bool > aChoicesDisabled( 3 ); uno::Sequence< sal_Bool > aChoicesDisabled( 3 );
uno::Sequence< OUString > aHelpIds( 3 ); uno::Sequence< OUString > aHelpIds( 3 );
...@@ -316,8 +316,9 @@ SwPrintUIOptions::SwPrintUIOptions( ...@@ -316,8 +316,9 @@ SwPrintUIOptions::SwPrintUIOptions(
// print content selection // print content selection
vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt; vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt;
aContentsOpt.maGroupHint = "JobPage"; aContentsOpt.maGroupHint = "JobPage";
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", OUString(aLocalizedStrings.GetString(12)), m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions",
OUString(), aContentsOpt); aLocalizedStrings.GetString(12),
OUString(), aContentsOpt);
// create a list box for notes content // create a list box for notes content
const sal_Int16 nPrintPostIts = rDefaultPrintData.GetPrintPostIts(); const sal_Int16 nPrintPostIts = rDefaultPrintData.GetPrintPostIts();
aChoices.realloc( 5 ); aChoices.realloc( 5 );
...@@ -329,12 +330,12 @@ SwPrintUIOptions::SwPrintUIOptions( ...@@ -329,12 +330,12 @@ SwPrintUIOptions::SwPrintUIOptions(
aHelpIds.realloc( 2 ); aHelpIds.realloc( 2 );
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText"; aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText";
aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox"; aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox";
vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( OUString( "PrintProspect" ), 0, false ); vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( "PrintProspect", 0, false );
aAnnotOpt.mbEnabled = bHasPostIts; aAnnotOpt.mbEnabled = bHasPostIts;
m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments", m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments",
aLocalizedStrings.GetString( 17 ), aLocalizedStrings.GetString( 17 ),
aHelpIds, aHelpIds,
OUString( "PrintAnnotationMode" ), "PrintAnnotationMode",
aChoices, aChoices,
nPrintPostIts, nPrintPostIts,
uno::Sequence< sal_Bool >(), uno::Sequence< sal_Bool >(),
...@@ -346,7 +347,8 @@ SwPrintUIOptions::SwPrintUIOptions( ...@@ -346,7 +347,8 @@ SwPrintUIOptions::SwPrintUIOptions(
if (!bWeb) if (!bWeb)
{ {
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pagesides", OUString(aLocalizedStrings.GetString(18)), m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pagesides",
aLocalizedStrings.GetString(18),
OUString(), aPageSetOpt); OUString(), aPageSetOpt);
uno::Sequence< OUString > aRLChoices( 3 ); uno::Sequence< OUString > aRLChoices( 3 );
aRLChoices[0] = aLocalizedStrings.GetString( 19 ); aRLChoices[0] = aLocalizedStrings.GetString( 19 );
...@@ -375,7 +377,7 @@ SwPrintUIOptions::SwPrintUIOptions( ...@@ -375,7 +377,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// create a bool option for brochure // create a bool option for brochure
bDefaultVal = rDefaultPrintData.IsPrintProspect(); bDefaultVal = rDefaultPrintData.IsPrintProspect();
OUString aBrochurePropertyName( "PrintProspect" ); const OUString aBrochurePropertyName( "PrintProspect" );
m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("brochure", aLocalizedStrings.GetString( 23 ), m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("brochure", aLocalizedStrings.GetString( 23 ),
".HelpID:vcl:PrintDialog:PrintProspect:CheckBox", ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox",
aBrochurePropertyName, aBrochurePropertyName,
...@@ -399,7 +401,7 @@ SwPrintUIOptions::SwPrintUIOptions( ...@@ -399,7 +401,7 @@ SwPrintUIOptions::SwPrintUIOptions(
m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("scriptdirection", m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("scriptdirection",
OUString(), OUString(),
aBRTLHelpIds, aBRTLHelpIds,
OUString( "PrintProspectRTL" ), "PrintProspectRTL",
aBRTLChoices, aBRTLChoices,
nBRTLChoice, nBRTLChoice,
uno::Sequence< sal_Bool >(), uno::Sequence< sal_Bool >(),
...@@ -482,7 +484,7 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat( const uno::Sequence< bea ...@@ -482,7 +484,7 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat( const uno::Sequence< bea
bool bChanged = processProperties( i_rNewProp ); bool bChanged = processProperties( i_rNewProp );
uno::Reference< awt::XDevice > xRenderDevice; uno::Reference< awt::XDevice > xRenderDevice;
uno::Any aVal( getValue( OUString( "RenderDevice" ) ) ); uno::Any aVal( getValue( "RenderDevice" ) );
aVal >>= xRenderDevice; aVal >>= xRenderDevice;
OutputDevice* pOut = 0; OutputDevice* pOut = 0;
......
...@@ -230,7 +230,7 @@ void SwViewImp::MakeDrawView() ...@@ -230,7 +230,7 @@ void SwViewImp::MakeDrawView()
pDrawView = new SwDrawView( *this, pIDDMA->GetDrawModel(), pOutDevForDrawView); pDrawView = new SwDrawView( *this, pIDDMA->GetDrawModel(), pOutDevForDrawView);
} }
GetDrawView()->SetActiveLayer(OUString("Heaven")); GetDrawView()->SetActiveLayer("Heaven");
const SwViewOption* pSwViewOption = GetShell()->GetViewOptions(); const SwViewOption* pSwViewOption = GetShell()->GetViewOptions();
Init(pSwViewOption); Init(pSwViewOption);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment