summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-06 09:38:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-06 09:38:34 +0100
commit36328248309ebebee616452248d55923280deabb (patch)
tree3aec7576114f445dfe77ee1b59e332cf1f5fdc6c /vcl
parent4d6b9053a437dc128d186f8d100ef4a351136f54 (diff)
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: I7ac150458a72963f3336d30ef9d99d7c0d81c024
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/print/printerjob.cxx8
-rw-r--r--vcl/qa/cppunit/graphicfilter/filters-test.cxx6
-rw-r--r--vcl/source/app/settings.cxx10
-rw-r--r--vcl/source/app/svapp.cxx4
-rw-r--r--vcl/source/app/svdata.cxx2
-rw-r--r--vcl/source/edit/texteng.cxx4
-rw-r--r--vcl/source/filter/GraphicNativeTransform.cxx8
-rw-r--r--vcl/source/filter/sgvmain.cxx2
-rw-r--r--vcl/source/gdi/impgraph.cxx6
-rw-r--r--vcl/source/gdi/impimagetree.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx6
-rw-r--r--vcl/source/gdi/print3.cxx40
-rw-r--r--vcl/source/outdev/font.cxx2
-rw-r--r--vcl/source/uipreviewer/previewer.cxx2
-rw-r--r--vcl/source/window/printdlg.cxx70
-rw-r--r--vcl/source/window/settings.cxx2
-rw-r--r--vcl/source/window/toolbox2.cxx4
-rw-r--r--vcl/source/window/window.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx2
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx4
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.cxx6
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx50
-rw-r--r--vcl/unx/generic/dtrans/X11_transferable.cxx4
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx2
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx6
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx2
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx2
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx8
-rw-r--r--vcl/workben/icontest.cxx2
-rw-r--r--vcl/workben/mtfdemo.cxx2
-rw-r--r--vcl/workben/outdevgrind.cxx2
-rw-r--r--vcl/workben/svdem.cxx2
-rw-r--r--vcl/workben/svpclient.cxx6
-rw-r--r--vcl/workben/svptest.cxx2
34 files changed, 141 insertions, 141 deletions
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index fd42783b9b67..315347c30632 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -326,8 +326,8 @@ PrinterJob::StartJob (
maJobTitle = rJobName;
OUString aExt(".ps");
- mpJobHeader = CreateSpoolFile (OUString("psp_head"), aExt);
- mpJobTrailer = CreateSpoolFile (OUString("psp_tail"), aExt);
+ mpJobHeader = CreateSpoolFile ("psp_head", aExt);
+ mpJobTrailer = CreateSpoolFile ("psp_tail", aExt);
if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor
return false;
@@ -587,8 +587,8 @@ PrinterJob::StartPage (const JobData& rJobSetup)
OUString aPageNo = OUString::number ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
OUString aExt = aPageNo + ".ps";
- osl::File* pPageHeader = CreateSpoolFile ( OUString("psp_pghead"), aExt);
- osl::File* pPageBody = CreateSpoolFile ( OUString("psp_pgbody"), aExt);
+ osl::File* pPageHeader = CreateSpoolFile ( "psp_pghead", aExt);
+ osl::File* pPageBody = CreateSpoolFile ( "psp_pgbody", aExt);
maHeaderList.push_back (pPageHeader);
maPageList.push_back (pPageBody);
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index 722489207f01..ab0e1221ad67 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -112,11 +112,11 @@ void VclFiltersTest::checkExportImport(const OUString& aFilterShortName)
void VclFiltersTest::testExportImport()
{
fprintf(stderr, "Check ExportImport JPG\n");
- checkExportImport(OUString("jpg"));
+ checkExportImport("jpg");
fprintf(stderr, "Check ExportImport PNG\n");
- checkExportImport(OUString("png"));
+ checkExportImport("png");
fprintf(stderr, "Check ExportImport BMP\n");
- checkExportImport(OUString("bmp"));
+ checkExportImport("bmp");
}
void VclFiltersTest::testCVEs()
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 2fd759794732..cd3e91d8abc1 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2477,8 +2477,8 @@ bool MiscSettings::GetDisablePrinting() const
{
OUString aEnable =
vcl::SettingsConfigItem::get()->
- getValue( OUString( "DesktopManagement" ),
- OUString( "DisablePrinting" ) );
+ getValue( "DesktopManagement",
+ "DisablePrinting" );
mxData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? TRISTATE_TRUE : TRISTATE_FALSE;
}
@@ -2543,8 +2543,8 @@ bool MiscSettings::GetEnableATToolSupport() const
{
OUString aEnable =
vcl::SettingsConfigItem::get()->
- getValue( OUString( "Accessibility" ),
- OUString( "EnableATToolSupport" ) );
+ getValue( "Accessibility",
+ "EnableATToolSupport" );
mxData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? TRISTATE_TRUE : TRISTATE_FALSE;
}
else
@@ -2885,7 +2885,7 @@ namespace
nUIMirroring = 0; // ask configuration only once
utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext(
comphelper::getProcessComponentContext(),
- OUString("org.openoffice.Office.Common/I18N/CTL") ); // note: case sensitive !
+ "org.openoffice.Office.Common/I18N/CTL" ); // note: case sensitive !
if ( aNode.isValid() )
{
bool bTmp = bool();
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index f4928aad469b..a14b8841ef9f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -286,10 +286,10 @@ sal_uInt16 Application::Exception( sal_uInt16 nError )
#ifdef DBG_UTIL
case EXC_RSCNOTLOADED:
- Abort(OUString("Resource not loaded"));
+ Abort("Resource not loaded");
break;
default:
- Abort(OUString("Unknown Error"));
+ Abort("Unknown Error");
break;
#else
default:
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 45a6c024206d..a4b03dec9afe 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -136,7 +136,7 @@ vcl::Window* ImplGetDefaultWindow()
{
SAL_INFO( "vcl", "ImplGetDefaultWindow(): No AppWindow" );
pSVData->mpDefaultWin = VclPtr<WorkWindow>::Create( nullptr, WB_DEFAULTWIN );
- pSVData->mpDefaultWin->SetText( OUString( "VCL ImplGetDefaultWindow" ) );
+ pSVData->mpDefaultWin->SetText( "VCL ImplGetDefaultWindow" );
// Add a reference to the default context so it never gets deleted
rtl::Reference<OpenGLContext> pContext = pSVData->mpDefaultWin->GetGraphics()->GetOpenGLContext();
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index c65b38d4f261..b91f1bdd0d9a 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -194,10 +194,10 @@ void TextEngine::SetFont( const vcl::Font& rFont )
maFont.SetAlign( ALIGN_TOP );
mpRefDev->SetFont( maFont);
Size aTextSize;
- aTextSize.Width() = mpRefDev->GetTextWidth(OUString(" "));
+ aTextSize.Width() = mpRefDev->GetTextWidth(" ");
aTextSize.Height() = mpRefDev->GetTextHeight();
if ( !aTextSize.Width() )
- aTextSize.Width() = mpRefDev->GetTextWidth(OUString("XXXX"));
+ aTextSize.Width() = mpRefDev->GetTextWidth("XXXX");
mnDefTab = aTextSize.Width();
if ( !mnDefTab )
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index 664749790d38..11a17a5f091f 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -76,11 +76,11 @@ bool GraphicNativeTransform::rotate(sal_uInt16 aInputRotation)
}
else if ( aLink.GetType() == GFX_LINK_TYPE_NATIVE_PNG )
{
- return rotateGeneric(aRotation, OUString("png"));
+ return rotateGeneric(aRotation, "png");
}
else if ( aLink.GetType() == GFX_LINK_TYPE_NATIVE_GIF )
{
- return rotateGeneric(aRotation, OUString("gif"));
+ return rotateGeneric(aRotation, "gif");
}
else if ( aLink.GetType() == GFX_LINK_TYPE_NONE )
{
@@ -127,7 +127,7 @@ bool GraphicNativeTransform::rotateGeneric(sal_uInt16 aRotation, const OUString&
BitmapEx aBitmap = mrGraphic.GetBitmapEx();
aBitmap.Rotate(aRotation, COL_BLACK);
- rFilter.ExportGraphic( aBitmap, OUString( "none" ), aStream, nFilterFormat, &aFilterData );
+ rFilter.ExportGraphic( aBitmap, "none", aStream, nFilterFormat, &aFilterData );
aStream.Seek( STREAM_SEEK_TO_BEGIN );
@@ -145,7 +145,7 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation)
if (aBitmap.GetSizePixel().Width() % 16 != 0 ||
aBitmap.GetSizePixel().Height() % 16 != 0 )
{
- rotateGeneric(aRotation, OUString("png"));
+ rotateGeneric(aRotation, "png");
}
else
{
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 4882248dbcac..e666b3f0f570 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -841,7 +841,7 @@ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, const INetURLObject& _aIni
bool bRet=false; // return value
INetURLObject aIniPath = _aIniPath;
- aIniPath.Append(OUString("sgf.ini"));
+ aIniPath.Append("sgf.ini");
pSgfFonts = new SgfFontLst;
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index ecd1c8f5c47b..31613aa22c78 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -360,7 +360,7 @@ void ImpGraphic::ImplClear()
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aCnt.executeCommand( OUString("delete"),
+ aCnt.executeCommand( "delete",
::com::sun::star::uno::makeAny( true ) );
}
catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1190,7 +1190,7 @@ bool ImpGraphic::ImplSwapOut()
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aCnt.executeCommand( OUString("delete"),
+ aCnt.executeCommand( "delete",
::com::sun::star::uno::makeAny( true ) );
}
catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1288,7 +1288,7 @@ bool ImpGraphic::ImplSwapIn()
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aCnt.executeCommand( OUString("delete"),
+ aCnt.executeCommand( "delete",
::com::sun::star::uno::makeAny( true ) );
}
catch( const ::com::sun::star::ucb::ContentCreationException& )
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 9bec5dcfe83f..b7620c8a072c 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -213,7 +213,7 @@ bool ImplImageTree::loadImage(OUString const & name, OUString const & style, Bit
bool ImplImageTree::loadDefaultImage(OUString const & style, BitmapEx& bitmap)
{
return doLoadImage(
- OUString("res/grafikde.png"),
+ "res/grafikde.png",
style, bitmap, false);
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index ae009788aaa5..156dc694f456 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1783,7 +1783,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
m_aStructure[0].m_nParentElement = 0;
Font aFont;
- aFont.SetName( OUString( "Times" ) );
+ aFont.SetName( "Times" );
aFont.SetSize( Size( 0, 12 ) );
GraphicsState aState;
@@ -2339,7 +2339,7 @@ void PDFWriterImpl::endPage()
// reset the default font
Font aFont;
- aFont.SetName( OUString( "Times" ) );
+ aFont.SetName( "Times" );
aFont.SetSize( Size( 0, 12 ) );
m_aCurrentPDFState = m_aGraphicsStack.front();
@@ -4552,7 +4552,7 @@ we check in the following sequence:
else if( aFileExtension.equalsIgnoreAsciiCase( "ods" ) )
bChangeFileExtensionToPDF = true;
if( bChangeFileExtensionToPDF )
- aTargetURL.setExtension(OUString( "pdf" ) );
+ aTargetURL.setExtension("pdf" );
}
//check if extension is pdf, see if GoToR should be forced
bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase( "pdf" );
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 560f6951890a..9a1fbf187115 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -309,7 +309,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController,
"vcl/ui/errornoprinterdialog.ui");
aBox->Execute();
}
- xController->setValue( OUString( "IsDirect" ),
+ xController->setValue( "IsDirect",
makeAny( false ) );
}
@@ -356,7 +356,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController,
if( pContentVal )
{
pContentVal->Value = makeAny( sal_Int32( 1 ) );
- xController->setValue(OUString("PageRange"), pPagesVal->Value);
+ xController->setValue("PageRange", pPagesVal->Value);
}
}
}
@@ -385,7 +385,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController,
aBuf.append( "-" );
aBuf.append( nPages );
}
- xController->setValue(OUString("PageRange"), makeAny(aBuf.makeStringAndClear()));
+ xController->setValue("PageRange", makeAny(aBuf.makeStringAndClear()));
}
}
}
@@ -409,33 +409,33 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController,
}
// setup NUp printing from properties
- sal_Int32 nRows = xController->getIntProperty(OUString("NUpRows"), 1);
- sal_Int32 nCols = xController->getIntProperty(OUString("NUpColumns"), 1);
+ sal_Int32 nRows = xController->getIntProperty("NUpRows", 1);
+ sal_Int32 nCols = xController->getIntProperty("NUpColumns", 1);
if( nRows > 1 || nCols > 1 )
{
PrinterController::MultiPageSetup aMPS;
aMPS.nRows = nRows > 1 ? nRows : 1;
aMPS.nColumns = nCols > 1 ? nCols : 1;
- sal_Int32 nValue = xController->getIntProperty(OUString("NUpPageMarginLeft"), aMPS.nLeftMargin);
+ sal_Int32 nValue = xController->getIntProperty("NUpPageMarginLeft", aMPS.nLeftMargin);
if( nValue >= 0 )
aMPS.nLeftMargin = nValue;
- nValue = xController->getIntProperty(OUString("NUpPageMarginRight"), aMPS.nRightMargin);
+ nValue = xController->getIntProperty("NUpPageMarginRight", aMPS.nRightMargin);
if( nValue >= 0 )
aMPS.nRightMargin = nValue;
- nValue = xController->getIntProperty( OUString( "NUpPageMarginTop" ), aMPS.nTopMargin );
+ nValue = xController->getIntProperty( "NUpPageMarginTop", aMPS.nTopMargin );
if( nValue >= 0 )
aMPS.nTopMargin = nValue;
- nValue = xController->getIntProperty( OUString( "NUpPageMarginBottom" ), aMPS.nBottomMargin );
+ nValue = xController->getIntProperty( "NUpPageMarginBottom", aMPS.nBottomMargin );
if( nValue >= 0 )
aMPS.nBottomMargin = nValue;
- nValue = xController->getIntProperty( OUString( "NUpHorizontalSpacing" ), aMPS.nHorizontalSpacing );
+ nValue = xController->getIntProperty( "NUpHorizontalSpacing", aMPS.nHorizontalSpacing );
if( nValue >= 0 )
aMPS.nHorizontalSpacing = nValue;
- nValue = xController->getIntProperty( OUString( "NUpVerticalSpacing" ), aMPS.nVerticalSpacing );
+ nValue = xController->getIntProperty( "NUpVerticalSpacing", aMPS.nVerticalSpacing );
if( nValue >= 0 )
aMPS.nVerticalSpacing = nValue;
- aMPS.bDrawBorder = xController->getBoolProperty( OUString( "NUpDrawBorder" ), aMPS.bDrawBorder );
- aMPS.nOrder = static_cast<PrinterController::NupOrderType>(xController->getIntProperty( OUString( "NUpSubPageOrder" ), aMPS.nOrder ));
+ aMPS.bDrawBorder = xController->getBoolProperty( "NUpDrawBorder", aMPS.bDrawBorder );
+ aMPS.nOrder = static_cast<PrinterController::NupOrderType>(xController->getIntProperty( "NUpSubPageOrder", aMPS.nOrder ));
aMPS.aPaperSize = xController->getPrinter()->PixelToLogic( xController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
PropertyValue* pPgSizeVal = xController->getValue( OUString( "NUpPaperSize" ) );
awt::Size aSizeVal;
@@ -485,12 +485,12 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController,
xController->abortJob();
return false;
}
- xController->setValue( OUString( "LocalFileName" ),
+ xController->setValue( "LocalFileName",
makeAny( aFile ) );
}
else if( aDlg->isSingleJobs() )
{
- xController->setValue( OUString( "PrintCollateAsSingleJobs" ),
+ xController->setValue( "PrintCollateAsSingleJobs",
makeAny( true ) );
}
}
@@ -751,8 +751,8 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer
if (i_xController->isShowDialogs() && !i_xController->isDirectPrint())
{
SettingsConfigItem* pItem = SettingsConfigItem::get();
- pItem->setValue( OUString( "PrintDialog" ),
- OUString( "LastPrinterUsed" ),
+ pItem->setValue( "PrintDialog",
+ "LastPrinterUsed",
GetName()
);
}
@@ -783,7 +783,7 @@ const VclPtr<Printer>& PrinterController::getPrinter() const
void PrinterController::setPrinter( const VclPtr<Printer>& i_rPrinter )
{
mpImplData->mxPrinter = i_rPrinter;
- setValue( OUString( "Name" ),
+ setValue( "Name",
makeAny( OUString( i_rPrinter->GetName() ) ) );
mpImplData->mnDefaultPaperBin = mpImplData->mxPrinter->GetPaperBin();
mpImplData->mxPrinter->Push();
@@ -1731,13 +1731,13 @@ void PrinterController::pushPropertiesToPrinter()
bool PrinterController::isShowDialogs() const
{
- bool bApi = getBoolProperty( OUString( "IsApi" ), false );
+ bool bApi = getBoolProperty( "IsApi", false );
return ! bApi && ! Application::IsHeadlessModeEnabled();
}
bool PrinterController::isDirectPrint() const
{
- bool bDirect = getBoolProperty( OUString( "IsDirect" ), false );
+ bool bDirect = getBoolProperty( "IsDirect", false );
return bDirect;
}
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 9335b791d6f4..21f9c4abc3c4 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1383,7 +1383,7 @@ ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( PhysicalFontCollection* pFon
//sufficient heavy-weight code that's likely to undo the value of the
//optimization
if (nFallbackLevel == 1)
- pFallbackData = pFontCollection->FindFontFamily(OUString("EUDC"));
+ pFallbackData = pFontCollection->FindFontFamily("EUDC");
if (!pFallbackData)
pFallbackData = pFontCollection->GetGlyphFallbackFont(rFontSelData, rMissingCodes, nFallbackLevel-1);
// escape when there are no font candidates
diff --git a/vcl/source/uipreviewer/previewer.cxx b/vcl/source/uipreviewer/previewer.cxx
index 0650e425598e..63f7ae51e066 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -77,7 +77,7 @@ int UIPreviewApp::Main()
if (!pRealDialog)
pRealDialog = pDialog;
- pRealDialog->SetText(OUString("LibreOffice ui-previewer"));
+ pRealDialog->SetText("LibreOffice ui-previewer");
pRealDialog->SetStyle(pDialog->GetStyle()|WB_CLOSEABLE);
/*
Force a new StateChangedType::InitShow for the edge case where pRoot
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index d741dd015f00..ef58f37eea17 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -79,8 +79,8 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( vcl::Window* i_pParent )
maHorzDim->Show();
maVertDim->Show();
- maHorzDim->SetText( OUString( "2.0in" ) );
- maVertDim->SetText( OUString( "2.0in" ) );
+ maHorzDim->SetText( "2.0in" );
+ maVertDim->SetText( "2.0in" );
}
PrintDialog::PrintPreviewWindow::~PrintPreviewWindow()
@@ -504,8 +504,8 @@ void PrintDialog::JobTabPage::readFromSettings()
SettingsConfigItem* pItem = SettingsConfigItem::get();
OUString aValue;
- aValue = pItem->getValue( OUString( "PrintDialog" ),
- OUString( "CollateBox" ) );
+ aValue = pItem->getValue( "PrintDialog",
+ "CollateBox" );
if( aValue.equalsIgnoreAsciiCase("alwaysoff") )
{
mnCollateUIMode = 1;
@@ -515,8 +515,8 @@ void PrintDialog::JobTabPage::readFromSettings()
else
{
mnCollateUIMode = 0;
- aValue = pItem->getValue( OUString( "PrintDialog" ),
- OUString( "Collate" ) );
+ aValue = pItem->getValue( "PrintDialog",
+ "Collate" );
mpCollateBox->Check( aValue.equalsIgnoreAsciiCase("true") );
}
}
@@ -524,11 +524,11 @@ void PrintDialog::JobTabPage::readFromSettings()
void PrintDialog::JobTabPage::storeToSettings()
{
SettingsConfigItem* pItem = SettingsConfigItem::get();
- pItem->setValue( OUString( "PrintDialog" ),
- OUString( "CopyCount" ),
+ pItem->setValue( "PrintDialog",
+ "CopyCount",
mpCopyCountField->GetText() );
- pItem->setValue( OUString( "PrintDialog" ),
- OUString( "Collate" ),
+ pItem->setValue( "PrintDialog",
+ "Collate",
mpCollateBox->IsChecked() ? OUString("true") :
OUString("false") );
}
@@ -544,8 +544,8 @@ void PrintDialog::OutputOptPage::readFromSettings()
{
SettingsConfigItem* pItem = SettingsConfigItem::get();
OUString aValue;
- aValue = pItem->getValue( OUString( "PrintDialog" ),
- OUString( "CollateSingleJobs" ) );
+ aValue = pItem->getValue( "PrintDialog",
+ "CollateSingleJobs" );
if ( aValue.equalsIgnoreAsciiCase("true") )
{
mpCollateSingleJobsBox->Check();
@@ -559,12 +559,12 @@ void PrintDialog::OutputOptPage::readFromSettings()
void PrintDialog::OutputOptPage::storeToSettings()
{
SettingsConfigItem* pItem = SettingsConfigItem::get();
- pItem->setValue( OUString( "PrintDialog" ),
- OUString( "ToFile" ),
+ pItem->setValue( "PrintDialog",
+ "ToFile",
mpToFileBox->IsChecked() ? OUString("true")
: OUString("false") );
- pItem->setValue( OUString( "PrintDialog" ),
- OUString( "CollateSingleJobs" ),
+ pItem->setValue( "PrintDialog",
+ "CollateSingleJobs",
mpCollateSingleJobsBox->IsChecked() ? OUString("true") :
OUString("false") );
}
@@ -623,8 +623,8 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
{
// fall back to last printer
SettingsConfigItem* pItem = SettingsConfigItem::get();
- OUString aValue( pItem->getValue( OUString( "PrintDialog" ),
- OUString( "LastPrinter" ) ) );
+ OUString aValue( pItem->getValue( "PrintDialog",
+ "LastPrinter" ) );
if( maJobPage.mpPrinters->GetEntryPos( aValue ) != LISTBOX_ENTRY_NOTFOUND )
{
maJobPage.mpPrinters->SelectEntry( aValue );
@@ -707,7 +707,7 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
// setup dependencies
checkControlDependencies();
- if ( maPController->getBoolProperty( OUString( "HideHelpButton" ), false ) )
+ if ( maPController->getBoolProperty( "HideHelpButton", false ) )
mpHelpButton->Hide();
// set initial focus to "Number of copies"
maJobPage.mpCopyCountField->GrabFocus();
@@ -744,8 +744,8 @@ void PrintDialog::readFromSettings()
// read last selected tab page; if it exists, activate it
SettingsConfigItem* pItem = SettingsConfigItem::get();
- OUString aValue = pItem->getValue( OUString( "PrintDialog" ),
- OUString( "LastPage" ) );
+ OUString aValue = pItem->getValue( "PrintDialog",
+ "LastPage" );
sal_uInt16 nCount = mpTabCtrl->GetPageCount();
for( sal_uInt16 i = 0; i < nCount; i++ )
{
@@ -759,8 +759,8 @@ void PrintDialog::readFromSettings()
mpOKButton->SetText( maOptionsPage.mpToFileBox->IsChecked() ? maPrintToFileText : maPrintText );
// persistent window state
- OUString aWinState( pItem->getValue( OUString( "PrintDialog" ),
- OUString( "WindowState" ) ) );
+ OUString aWinState( pItem->getValue( "PrintDialog",
+ "WindowState" ) );
if( !aWinState.isEmpty() )
SetWindowState( OUStringToOString( aWinState, RTL_TEXTENCODING_UTF8 ) );
@@ -778,15 +778,15 @@ void PrintDialog::storeToSettings()
// store last selected printer
SettingsConfigItem* pItem = SettingsConfigItem::get();
- pItem->setValue( OUString( "PrintDialog" ),
- OUString( "LastPrinter" ),
+ pItem->setValue( "PrintDialog",
+ "LastPrinter",
maJobPage.mpPrinters->GetSelectEntry() );
- pItem->setValue( OUString( "PrintDialog" ),
- OUString( "LastPage" ),
+ pItem->setValue( "PrintDialog",
+ "LastPage",
mpTabCtrl->GetPageText( mpTabCtrl->GetCurPageId() ) );
- pItem->setValue( OUString( "PrintDialog" ),
- OUString( "WindowState" ),
+ pItem->setValue( "PrintDialog",
+ "WindowState",
OStringToOUString( GetWindowState(), RTL_TEXTENCODING_UTF8 )
);
pItem->Commit();
@@ -1564,7 +1564,7 @@ IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void )
Help* pHelp = Application::GetHelp();
if( pHelp )
{
- pHelp->Start( OUString("vcl/ui/printdialog"), mpOKButton );
+ pHelp->Start( "vcl/ui/printdialog", mpOKButton );
}
}
else if( pButton == mpForwardBtn )
@@ -1585,7 +1585,7 @@ IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void )
{
bool bChecked = maOptionsPage.mpPapersizeFromSetup->IsChecked();
maPController->setPapersizeFromSetup( bChecked );
- maPController->setValue( OUString( "PapersizeFromSetup" ),
+ maPController->setValue( "PapersizeFromSetup",
makeAny( bChecked ) );
preparePreview( true, true );
}
@@ -1617,7 +1617,7 @@ IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void )
}
else if( pButton == maJobPage.mpCollateBox )
{
- maPController->setValue( OUString( "Collate" ),
+ maPController->setValue( "Collate",
makeAny( isCollate() ) );
checkControlDependencies();
}
@@ -1625,7 +1625,7 @@ IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void )
{
bool bChecked = maJobPage.mpReverseOrderBox->IsChecked();
maPController->setReversePrint( bChecked );
- maPController->setValue( OUString( "PrintReverse" ),
+ maPController->setValue( "PrintReverse",
makeAny( bChecked ) );
preparePreview( true, true );
}
@@ -1662,9 +1662,9 @@ IMPL_LINK_TYPED( PrintDialog, ModifyHdl, Edit&, rEdit, void )
}
else if( &rEdit == maJobPage.mpCopyCountField )
{
- maPController->setValue( OUString( "CopyCount" ),
+ maPController->setValue( "CopyCount",
makeAny( sal_Int32(maJobPage.mpCopyCountField->GetValue()) ) );
- maPController->setValue( OUString( "Collate" ),
+ maPController->setValue( "Collate",
makeAny( isCollate() ) );
}
}
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index 4e0e4ed86b71..500dede9626f 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -244,7 +244,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
bool bAutoHCMode = true;
utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext(
comphelper::getProcessComponentContext(),
- OUString("org.openoffice.Office.Common/Accessibility") ); // note: case sensitive !
+ "org.openoffice.Office.Common/Accessibility" ); // note: case sensitive !
if ( aNode.isValid() )
{
::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("AutoDetectSystemHC") );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index f0e5008e6982..f8dd351fab23 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1999,7 +1999,7 @@ bool ToolBox::AlwaysLocked()
utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext(
comphelper::getProcessComponentContext(),
- OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars") ); // note: case sensitive !
+ "/org.openoffice.Office.UI.GlobalSettings/Toolbars" ); // note: case sensitive !
if ( aNode.isValid() )
{
// feature enabled ?
@@ -2012,7 +2012,7 @@ bool ToolBox::AlwaysLocked()
// now read the locking state
utl::OConfigurationNode aNode2 = utl::OConfigurationTreeRoot::tryCreateWithComponentContext(
comphelper::getProcessComponentContext(),
- OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars/States") ); // note: case sensitive !
+ "/org.openoffice.Office.UI.GlobalSettings/Toolbars/States" ); // note: case sensitive !
bool bLocked = bool();
::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString("Locked") );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 97a29915da9d..c7f4fd615fd9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2039,7 +2039,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
if( !aStrHelpId.isEmpty() )
pHelp->Start( aStrHelpId, this );
else
- pHelp->Start( OUString( OOO_HELP_INDEX ), this );
+ pHelp->Start( OOO_HELP_INDEX, this );
}
}
}
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 24e3854a4c32..82fc6774cf6a 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -334,7 +334,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) :
m_bShow( true ),
m_bOn( bOn )
{
- SetText( OUString( "IME Status" ) );
+ SetText( "IME Status" );
layout();
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 300954e89db3..3822d09beaae 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -880,8 +880,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const
pWMA->m_bWMshouldSwitchWorkspace = true;
vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get();
- OUString aSetting( pItem->getValue( OUString( "WM" ),
- OUString( "ShouldSwitchWorkspace" ) ) );
+ OUString aSetting( pItem->getValue( "WM",
+ "ShouldSwitchWorkspace" ) );
if( aSetting.isEmpty() )
{
if( m_aWMName == "awesome" )
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 0ec568fadd4c..498374287ed7 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -71,7 +71,7 @@ X11Clipboard::create( SelectionManager& rManager, Atom aSelection )
else
{
rManager.registerHandler( XA_PRIMARY, *cb.get() );
- rManager.registerHandler( rManager.getAtom( OUString("CLIPBOARD") ), *cb.get() );
+ rManager.registerHandler( rManager.getAtom( "CLIPBOARD" ), *cb.get() );
}
return cb.get();
}
@@ -88,7 +88,7 @@ X11Clipboard::~X11Clipboard()
else
{
m_rSelectionManager.deregisterHandler( XA_PRIMARY );
- m_rSelectionManager.deregisterHandler( m_rSelectionManager.getAtom( OUString("CLIPBOARD") ) );
+ m_rSelectionManager.deregisterHandler( m_rSelectionManager.getAtom( "CLIPBOARD" ) );
}
}
@@ -164,7 +164,7 @@ void SAL_CALL X11Clipboard::setContents(
else
{
m_rSelectionManager.requestOwnership( XA_PRIMARY );
- m_rSelectionManager.requestOwnership( m_rSelectionManager.getAtom( OUString("CLIPBOARD") ) );
+ m_rSelectionManager.requestOwnership( m_rSelectionManager.getAtom( "CLIPBOARD" ) );
}
// notify old owner on loss of ownership
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 427cb67a2c02..c42ca79ff33e 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -362,34 +362,34 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
XSynchronize( m_pDisplay, True );
#endif
// clipboard selection
- m_nCLIPBOARDAtom = getAtom( OUString("CLIPBOARD") );
+ m_nCLIPBOARDAtom = getAtom( "CLIPBOARD" );
// special targets
- m_nTARGETSAtom = getAtom( OUString("TARGETS") );
- m_nTIMESTAMPAtom = getAtom( OUString("TIMESTAMP") );
- m_nTEXTAtom = getAtom( OUString("TEXT") );
- m_nINCRAtom = getAtom( OUString("INCR") );
- m_nCOMPOUNDAtom = getAtom( OUString("COMPOUND_TEXT") );
- m_nMULTIPLEAtom = getAtom( OUString("MULTIPLE") );
- m_nUTF16Atom = getAtom( OUString("ISO10646-1") );
- m_nImageBmpAtom = getAtom( OUString("image/bmp") );
+ m_nTARGETSAtom = getAtom( "TARGETS" );
+ m_nTIMESTAMPAtom = getAtom( "TIMESTAMP" );
+ m_nTEXTAtom = getAtom( "TEXT" );
+ m_nINCRAtom = getAtom( "INCR" );
+ m_nCOMPOUNDAtom = getAtom( "COMPOUND_TEXT" );
+ m_nMULTIPLEAtom = getAtom( "MULTIPLE" );
+ m_nUTF16Atom = getAtom( "ISO10646-1" );
+ m_nImageBmpAtom = getAtom( "image/bmp" );
// Atoms for Xdnd protocol
- m_nXdndAware = getAtom( OUString("XdndAware") );
- m_nXdndEnter = getAtom( OUString("XdndEnter") );
- m_nXdndLeave = getAtom( OUString("XdndLeave") );
- m_nXdndPosition = getAtom( OUString("XdndPosition") );
- m_nXdndStatus = getAtom( OUString("XdndStatus") );
- m_nXdndDrop = getAtom( OUString("XdndDrop") );
- m_nXdndFinished = getAtom( OUString("XdndFinished") );
- m_nXdndSelection = getAtom( OUString("XdndSelection") );
- m_nXdndTypeList = getAtom( OUString("XdndTypeList") );
- m_nXdndProxy = getAtom( OUString("XdndProxy") );
- m_nXdndActionCopy = getAtom( OUString("XdndActionCopy") );
- m_nXdndActionMove = getAtom( OUString("XdndActionMove") );
- m_nXdndActionLink = getAtom( OUString("XdndActionLink") );
- m_nXdndActionAsk = getAtom( OUString("XdndActionAsk") );
- m_nXdndActionPrivate= getAtom( OUString("XdndActionPrivate") );
+ m_nXdndAware = getAtom( "XdndAware" );
+ m_nXdndEnter = getAtom( "XdndEnter" );
+ m_nXdndLeave = getAtom( "XdndLeave" );
+ m_nXdndPosition = getAtom( "XdndPosition" );
+ m_nXdndStatus = getAtom( "XdndStatus" );
+ m_nXdndDrop = getAtom( "XdndDrop" );
+ m_nXdndFinished = getAtom( "XdndFinished" );
+ m_nXdndSelection = getAtom( "XdndSelection" );
+ m_nXdndTypeList = getAtom( "XdndTypeList" );
+ m_nXdndProxy = getAtom( "XdndProxy" );
+ m_nXdndActionCopy = getAtom( "XdndActionCopy" );
+ m_nXdndActionMove = getAtom( "XdndActionMove" );
+ m_nXdndActionLink = getAtom( "XdndActionLink" );
+ m_nXdndActionAsk = getAtom( "XdndActionAsk" );
+ m_nXdndActionPrivate= getAtom( "XdndActionPrivate" );
// initialize map with member none
m_aAtomToString[ 0 ]= "None";
@@ -827,7 +827,7 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes,
rOutTypeList.push_front( XA_STRING );
rOutTypeList.push_front( m_nCOMPOUNDAtom );
}
- convertTypeToNative( OUString("text/plain;charset=utf-8"), targetselection, nFormat, rOutTypeList, true );
+ convertTypeToNative( "text/plain;charset=utf-8", targetselection, nFormat, rOutTypeList, true );
}
if( targetselection != m_nXdndSelection )
rOutTypeList.push_back( m_nMULTIPLEAtom );
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx
index 45a38cd1c8e9..9bd683da0874 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -50,7 +50,7 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor )
Sequence< sal_Int8 > aData;
bool bSuccess = m_rManager.getPasteData( m_aSelection ? m_aSelection : XA_PRIMARY, rFlavor.MimeType, aData );
if( ! bSuccess && m_aSelection == 0 )
- bSuccess = m_rManager.getPasteData( m_rManager.getAtom( OUString("CLIPBOARD") ), rFlavor.MimeType, aData );
+ bSuccess = m_rManager.getPasteData( m_rManager.getAtom( "CLIPBOARD" ), rFlavor.MimeType, aData );
if( ! bSuccess )
{
@@ -76,7 +76,7 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors()
Sequence< DataFlavor > aFlavorList;
bool bSuccess = m_rManager.getPasteDataTypes( m_aSelection ? m_aSelection : XA_PRIMARY, aFlavorList );
if( ! bSuccess && m_aSelection == 0 )
- m_rManager.getPasteDataTypes( m_rManager.getAtom( OUString("CLIPBOARD") ), aFlavorList );
+ m_rManager.getPasteDataTypes( m_rManager.getAtom( "CLIPBOARD" ), aFlavorList );
return aFlavorList;
}
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 67d6da55b98a..5d171d8bb64d 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -491,7 +491,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
if( ! pNewParser )
{
// get the default PPD
- pNewParser = PPDParser::getParser( OUString( "SGENPRT" ) );
+ pNewParser = PPDParser::getParser( "SGENPRT" );
PrinterInfo& rInfo = m_aPrinters[ aPrinter ].m_aInfo;
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 9018b5152c66..e4ddbc8d3ba6 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -194,7 +194,7 @@ void PrinterInfoManager::initialize()
m_aGlobalDefaults = PrinterInfo();
// need a parser for the PPDContext. generic printer should do.
- m_aGlobalDefaults.m_pParser = PPDParser::getParser( OUString( "SGENPRT" ) );
+ m_aGlobalDefaults.m_pParser = PPDParser::getParser( "SGENPRT" );
m_aGlobalDefaults.m_aContext.setParser( m_aGlobalDefaults.m_pParser );
if( ! m_aGlobalDefaults.m_pParser )
@@ -211,7 +211,7 @@ void PrinterInfoManager::initialize()
for( print_dir_it = aDirList.begin(); print_dir_it != aDirList.end(); ++print_dir_it )
{
INetURLObject aFile( *print_dir_it, INetProtocol::File, INetURLObject::ENCODE_ALL );
- aFile.Append( OUString( PRINT_FILENAME ) );
+ aFile.Append( PRINT_FILENAME );
Config aConfig( aFile.PathToFileName() );
if( aConfig.HasGroup( GLOBAL_DEFAULTS_GROUP ) )
{
@@ -279,7 +279,7 @@ void PrinterInfoManager::initialize()
{
INetURLObject aDir( *print_dir_it, INetProtocol::File, INetURLObject::ENCODE_ALL );
INetURLObject aFile( aDir );
- aFile.Append( OUString( PRINT_FILENAME ) );
+ aFile.Append( PRINT_FILENAME );
// check directory validity
OUString aUniPath;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 0b4ccda90023..78682cb738aa 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -72,7 +72,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirector
OString aTxt = unicodetouri( aDirectory );
if( aTxt.isEmpty() ){
- aTxt = unicodetouri(OUString("file:///."));
+ aTxt = unicodetouri("file:///.");
}
if( aTxt.endsWith("/") )
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 87c41b210b65..a071bdaee5a6 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -211,7 +211,7 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory
OString aTxt = unicodetouri(aDirectory);
if( aTxt.isEmpty() ){
- aTxt = unicodetouri(OUString("file:///."));
+ aTxt = unicodetouri("file:///.");
}
if( aTxt.endsWith("/") )
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index ce4088bf971f..3615f8c0c4d2 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -1083,9 +1083,9 @@ GtkPrintDialog::impl_readFromSettings()
const OUString aPrintDialogStr("PrintDialog");
const OUString aCopyCount(pItem->getValue(aPrintDialogStr,
- OUString("CopyCount")));
+ "CopyCount"));
const OUString aCollate(pItem->getValue(aPrintDialogStr,
- OUString("Collate")));
+ "Collate"));
bool bChanged(false);
@@ -1120,10 +1120,10 @@ const
const OUString aPrintDialogStr("PrintDialog");
pItem->setValue(aPrintDialogStr,
- OUString("CopyCount"),
+ "CopyCount",
OUString::number(m_xWrapper->print_settings_get_n_copies(pSettings)));
pItem->setValue(aPrintDialogStr,
- OUString("Collate"),
+ "Collate",
m_xWrapper->print_settings_get_collate(pSettings)
? OUString("true")
: OUString("false"))
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 636c94b17edb..75910f545cae 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -188,7 +188,7 @@ void IconTestApp::DoItWithVcl( const OUString& sImageFile)
{
VclPtrInstance<MyWorkWindow> pWindow( nullptr, WB_APP | WB_STDWORK | WB_SIZEABLE | WB_CLOSEABLE | WB_CLIPCHILDREN );
- pWindow->SetText(OUString("VCL Image Test"));
+ pWindow->SetText("VCL Image Test");
pWindow->LoadGraphic( sImageFile );
pWindow->mpFixedBitmap = VclPtr<FixedBitmap>::Create( pWindow );
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index 3488a1e32b10..ed66ed864998 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -89,7 +89,7 @@ public:
try
{
mpWin = VclPtr<DemoMtfWin>::Create(maFileName);
- mpWin->SetText(OUString("Display metafile"));
+ mpWin->SetText("Display metafile");
mpWin->Show();
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 6326a77c50ee..58777ac501f9 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -67,7 +67,7 @@ class TestWindow : public Dialog
public:
TestWindow() : Dialog( nullptr )
{
- SetText( OUString("OutDev grinding") );
+ SetText( "OutDev grinding" );
SetSizePixel( Size( 1024, 1024 ) );
EnablePaint( true );
Show();
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index 3003f29402e0..d52c745c9168 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -87,7 +87,7 @@ public:
void Main()
{
ScopedVclPtrInstance< MyWin > aMainWin( nullptr, WB_APP | WB_STDWORK );
- aMainWin->SetText(OUString("VCL - Workbench"));
+ aMainWin->SetText("VCL - Workbench");
aMainWin->Show();
Application::Execute();
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 7a1de724ec43..4188221e7b48 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -121,7 +121,7 @@ public:
void Main()
{
ScopedVclPtrInstance< MyWin > aMainWin( nullptr, WB_STDWORK );
- aMainWin->SetText( OUString( "SvpClient" ) );
+ aMainWin->SetText( "SvpClient" );
aMainWin->Show();
Application::Execute();
@@ -135,7 +135,7 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
m_aQuitButton(VclPtr<PushButton>::Create(this, 0))
{
m_aListButton->SetPosSizePixel( Point( 10, 10 ), Size( 120, 25 ) );
- m_aListButton->SetText( OUString( "List Elements" ) );
+ m_aListButton->SetText( "List Elements" );
m_aListButton->SetClickHdl( LINK( this, MyWin, ListHdl ) );
m_aListButton->Show();
@@ -148,7 +148,7 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
m_aImage->Show();
m_aQuitButton->SetPosSizePixel( Point( 10, 300 ), Size( 120,25 ) );
- m_aQuitButton->SetText( OUString( "Quit SVP server" ) );
+ m_aQuitButton->SetText( "Quit SVP server" );
m_aQuitButton->SetClickHdl( LINK( this, MyWin, QuitHdl ) );
m_aQuitButton->Show();
}
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 155576483d20..d0e070a577de 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -97,7 +97,7 @@ public:
void Main()
{
ScopedVclPtrInstance< MyWin > aMainWin( nullptr, WB_APP | WB_STDWORK );
- aMainWin->SetText( OUString( "VCL - Workbench" ) );
+ aMainWin->SetText( "VCL - Workbench" );
aMainWin->Show();
Application::Execute();