summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-31 13:48:17 +0200
committerNoel Grandin <noel@peralex.com>2013-11-07 13:22:57 +0200
commitc980158a8286d5f583bd9d844aed2018bea310ea (patch)
tree0c9421e4ce87b61274de2ccdaf217e1a580cbb14 /vcl/unx
parent8bfbd27f8da5bfcc40e3bc53afdc153156d2f874 (diff)
remove unnecessary use of OUString constructor in VCL module
Change-Id: Ie2b9aca5c3db46b43c53f72699fe828b28daeaa1
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx8
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx6
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx14
-rw-r--r--vcl/unx/kde/UnxFilePicker.cxx8
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx6
5 files changed, 21 insertions, 21 deletions
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 11560fa3d596..9b9ac19cda6c 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -393,8 +393,8 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
m_nXdndActionPrivate= getAtom( OUString("XdndActionPrivate") );
// initialize map with member none
- m_aAtomToString[ 0 ]= OUString("None");
- m_aAtomToString[ XA_PRIMARY ] = OUString("PRIMARY");
+ m_aAtomToString[ 0 ]= "None";
+ m_aAtomToString[ XA_PRIMARY ] = "PRIMARY";
// create a (invisible) message window
m_aWindow = XCreateSimpleWindow( m_pDisplay, DefaultRootWindow( m_pDisplay ),
@@ -663,7 +663,7 @@ bool SelectionManager::convertData(
aEncoding = getTextPlainEncoding( aFlavor.MimeType );
if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText )
{
- aFlavor.MimeType = OUString("text/plain;charset=utf-16");
+ aFlavor.MimeType = "text/plain;charset=utf-16";
aFlavor.DataType = getCppuType( (OUString *) 0 );
if( xTransferable->isDataFlavorSupported( aFlavor ) )
{
@@ -1387,7 +1387,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
Sequence< DataFlavor > aTemp( nNewFlavors );
for( i = 0; i < nNewFlavors-1; i++ )
aTemp.getArray()[i+1] = rTypes.getConstArray()[i];
- aTemp.getArray()[0].MimeType = OUString("text/plain;charset=utf-16");
+ aTemp.getArray()[0].MimeType = "text/plain;charset=utf-16";
aTemp.getArray()[0].DataType = getCppuType( (OUString*)0 );
rTypes = aTemp;
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index d99347b9d9ca..644e88db036f 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -39,21 +39,21 @@ using namespace x11;
Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString("com.sun.star.datatransfer.clipboard.SystemClipboard");
+ aRet[0] = "com.sun.star.datatransfer.clipboard.SystemClipboard";
return aRet;
}
Sequence< OUString > SAL_CALL x11::Xdnd_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString("com.sun.star.datatransfer.dnd.X11DragSource");
+ aRet[0] = "com.sun.star.datatransfer.dnd.X11DragSource";
return aRet;
}
Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString("com.sun.star.datatransfer.dnd.X11DropTarget");
+ aRet[0] = "com.sun.star.datatransfer.dnd.X11DropTarget";
return aRet;
}
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 4a28fcd7d23f..85404f1e6fb9 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -946,9 +946,9 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
uno::Reference< XExporter > xExport(xFilter, UNO_QUERY);
xExport->setSourceDocument(xDoc);
uno::Sequence<beans::PropertyValue> aFilterData(2);
- aFilterData[0].Name = OUString("PageLayout");
+ aFilterData[0].Name = "PageLayout";
aFilterData[0].Value <<= sal_Int32(0);
- aFilterData[1].Name = OUString("FirstPageOnLeft");
+ aFilterData[1].Name = "FirstPageOnLeft";
aFilterData[1].Value <<= sal_False;
@@ -971,7 +971,7 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
aRangeText.AppendAscii(",");
}
aFilterData.realloc(aFilterData.getLength()+1);
- aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange");
+ aFilterData[aFilterData.getLength()-1].Name = "PageRange";
aFilterData[aFilterData.getLength()-1].Value <<= OUString(aRangeText);
}
else if (pStr && !strcmp(pStr, "current"))
@@ -1011,7 +1011,7 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
if (i < xSheets->getCount())
{
aFilterData.realloc(aFilterData.getLength()+1);
- aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange");
+ aFilterData[aFilterData.getLength()-1].Name = "PageRange";
aFilterData[aFilterData.getLength()-1].Value <<= OUString(OUString::number(i + 1));
}
}
@@ -1037,15 +1037,15 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
if (aSelection.hasValue())
{
aFilterData.realloc(aFilterData.getLength()+1);
- aFilterData[aFilterData.getLength()-1].Name = OUString("Selection");
+ aFilterData[aFilterData.getLength()-1].Name = "Selection";
aFilterData[aFilterData.getLength()-1].Value <<= aSelection;
}
}
#endif
uno::Sequence<beans::PropertyValue> aArgs(2);
- aArgs[0].Name = OUString("FilterData");
+ aArgs[0].Name = "FilterData";
aArgs[0].Value <<= aFilterData;
- aArgs[1].Name = OUString("OutputStream");
+ aArgs[1].Name = "OutputStream";
aArgs[1].Value <<= xOStm;
xFilter->filter(aArgs);
}
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 08d8fdb61ea5..86df48b65739 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -68,12 +68,12 @@ namespace
uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(3);
- aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker");
- aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker");
+ aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
+ aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
#if ENABLE_TDE
- aRet[2] = OUString("com.sun.star.ui.dialogs.TDEFilePicker");
+ aRet[2] = "com.sun.star.ui.dialogs.TDEFilePicker";
#else // ENABLE_TDE
- aRet[2] = OUString("com.sun.star.ui.dialogs.KDEFilePicker");
+ aRet[2] = "com.sun.star.ui.dialogs.KDEFilePicker";
#endif // ENABLE_TDE
return aRet;
}
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 6d4475474a15..6688c6d6cc6f 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -89,9 +89,9 @@ namespace
uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(3);
- aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker");
- aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker");
- aRet[2] = OUString("com.sun.star.ui.dialogs.KDE4FilePicker");
+ aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
+ aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
+ aRet[2] = "com.sun.star.ui.dialogs.KDE4FilePicker";
return aRet;
}
}