summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-04 08:29:36 +0200
committerNoel Grandin <noel@peralex.com>2015-11-04 14:10:44 +0200
commit59b072e22b0610abc7ffdbc75873ef5cbba58de7 (patch)
tree663c2d01a983508f9b22ec87fae29b16ab5a1683 /vcl
parentbaa411b59c3840a4dddf5447a0b4583eb5edea74 (diff)
yyyyy
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/filter/graphicfilter.cxx4
-rw-r--r--vcl/source/gdi/print.cxx22
-rw-r--r--vcl/source/gdi/print3.cxx6
-rw-r--r--vcl/source/window/abstdlg.cxx2
-rw-r--r--vcl/unx/gtk/gdi/gtkprintwrapper.cxx4
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx2
6 files changed, 20 insertions, 20 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index fc735b5ca3e1..b7ef652b9a9d 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -983,7 +983,7 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
if( !mpfnImport )
{
#ifndef DISABLE_DYNLOADING
- mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol(OUString(IMPORT_FUNCTION_NAME)));
+ mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol(IMPORT_FUNCTION_NAME));
#else
if( maFiltername.equalsAscii( "icd" ) )
mpfnImport = icdGraphicImport;
@@ -2096,7 +2096,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
OUString aPhysicalName( ImpCreateFullFilterPath( aFilterPath.getToken(i, ';'), aFilterName ) );
osl::Module aLibrary( aPhysicalName );
- PFilterCall pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol(OUString(EXPORT_FUNCTION_NAME)));
+ PFilterCall pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol(EXPORT_FUNCTION_NAME));
// Execute dialog in DLL
#else
PFilterCall pFunc = NULL;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 0732483b3915..88d118ca04ec 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -119,17 +119,17 @@ PrinterOptions::~PrinterOptions()
{
}
-#define PROPERTYNAME_REDUCETRANSPARENCY OUString("ReduceTransparency")
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE OUString("ReducedTransparencyMode")
-#define PROPERTYNAME_REDUCEGRADIENTS OUString("ReduceGradients")
-#define PROPERTYNAME_REDUCEDGRADIENTMODE OUString("ReducedGradientMode")
-#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT OUString("ReducedGradientStepCount")
-#define PROPERTYNAME_REDUCEBITMAPS OUString("ReduceBitmaps")
-#define PROPERTYNAME_REDUCEDBITMAPMODE OUString("ReducedBitmapMode")
-#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION OUString("ReducedBitmapResolution")
-#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY OUString("ReducedBitmapIncludesTransparency")
-#define PROPERTYNAME_CONVERTTOGREYSCALES OUString("ConvertToGreyscales")
-#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT OUString("PDFAsStandardPrintJobFormat")
+#define PROPERTYNAME_REDUCETRANSPARENCY "ReduceTransparency"
+#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE "ReducedTransparencyMode"
+#define PROPERTYNAME_REDUCEGRADIENTS "ReduceGradients"
+#define PROPERTYNAME_REDUCEDGRADIENTMODE "ReducedGradientMode"
+#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT "ReducedGradientStepCount"
+#define PROPERTYNAME_REDUCEBITMAPS "ReduceBitmaps"
+#define PROPERTYNAME_REDUCEDBITMAPMODE "ReducedBitmapMode"
+#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION "ReducedBitmapResolution"
+#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY "ReducedBitmapIncludesTransparency"
+#define PROPERTYNAME_CONVERTTOGREYSCALES "ConvertToGreyscales"
+#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT "PDFAsStandardPrintJobFormat"
bool PrinterOptions::ReadFromConfig( bool i_bFile )
{
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index ab0a88275aea..560f6951890a 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -234,12 +234,12 @@ static OUString queryFile( Printer* pPrinter )
bPDF = false;
}
if( bPS )
- xFilePicker->appendFilter( OUString( "PostScript" ), OUString( "*.ps" ) );
+ xFilePicker->appendFilter( "PostScript", "*.ps" );
if( bPDF )
- xFilePicker->appendFilter( OUString( "Portable Document Format" ), OUString( "*.pdf" ) );
+ xFilePicker->appendFilter( "Portable Document Format", "*.pdf" );
#elif defined WNT
(void)pPrinter;
- xFilePicker->appendFilter( OUString( "*.PRN" ), OUString( "*.prn" ) );
+ xFilePicker->appendFilter( "*.PRN", "*.prn" );
#endif
// add arbitrary files
xFilePicker->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), "*.*");
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 0b3101129df4..3ae9e30fafc7 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -42,7 +42,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY))
{
fp = reinterpret_cast<VclAbstractDialogFactory* (SAL_CALL*)()>(
- aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") ) );
+ aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" ) );
}
#else
fp = CreateDialogFactory;
diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
index 1db42c84095d..5e610fe1f2e1 100644
--- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
@@ -60,9 +60,9 @@ GtkPrintWrapper::~GtkPrintWrapper()
void GtkPrintWrapper::impl_load()
{
- m_aModule.load(OUString("libgtk-x11-2.0.so.0"));
+ m_aModule.load("libgtk-x11-2.0.so.0");
if (!m_aModule.is())
- m_aModule.load(OUString("libgtk-x11-2.0.so"));
+ m_aModule.load("libgtk-x11-2.0.so");
if (!m_aModule.is())
return;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 3e0749fd0d0d..929fa5e54db9 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -620,7 +620,7 @@ static void activate_uno(GSimpleAction *action, GVariant*, gpointer)
return;
uno::Sequence < css::beans::PropertyValue > args(0);
- xDesktop->loadComponentFromURL(sFactoryService, OUString("_blank"), 0, args);
+ xDesktop->loadComponentFromURL(sFactoryService, "_blank", 0, args);
return;
}