summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-04 14:00:40 +0200
committerNoel Grandin <noel@peralex.com>2013-11-11 11:21:26 +0200
commite52779d2f8722c713f72aedbf475267440d729f0 (patch)
tree0f2f15b2a7645e0b75f8057c96c90e05e1a6e7df /sdext
parente9c4ee996d5a6bf895072613ac4e488346ee5b05 (diff)
remove unnecessary use of OUString constructor
Change-Id: Ifb220af71857ddacd64e8204fb6d3e4aad8eef71
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/pdfimport/filterdet.cxx26
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx20
2 files changed, 23 insertions, 23 deletions
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 8dc8453cad1f..d11d8f43adc6 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -139,9 +139,9 @@ namespace {
uno::makeAny(aLabel));
uno::Sequence<OUString> aListboxItems(3);
- aListboxItems[DRAW_INDEX] = OUString( "Drawing" );
- aListboxItems[IMPRESS_INDEX] = OUString( "Presentation" );
- aListboxItems[WRITER_INDEX] = OUString( "Text Document" );
+ aListboxItems[DRAW_INDEX] = "Drawing";
+ aListboxItems[IMPRESS_INDEX] = "Presentation";
+ aListboxItems[WRITER_INDEX] = "Text Document";
m_xListbox->addItems(aListboxItems,0);
m_xListbox->selectItemPos(0,sal_True);
@@ -167,7 +167,7 @@ namespace {
virtual uno::Sequence< OUString > SAL_CALL getSupportedMethodNames( ) throw (uno::RuntimeException)
{
uno::Sequence< OUString > aMethods(1);
- aMethods[0] = OUString( "SelectionChanged" );
+ aMethods[0] = "SelectionChanged";
return aMethods;
}
};
@@ -434,14 +434,14 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
{
if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text" ) )
|| aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text-master" ) ) )
- aOutFilterName = OUString( "writer_pdf_addstream_import" );
+ aOutFilterName = "writer_pdf_addstream_import";
else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.presentation" )
- aOutFilterName = OUString( "impress_pdf_addstream_import" );
+ aOutFilterName = "impress_pdf_addstream_import";
else if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.graphics" ) )
|| aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.drawing" ) ) )
- aOutFilterName = OUString( "draw_pdf_addstream_import" );
+ aOutFilterName = "draw_pdf_addstream_import";
else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.spreadsheet" )
- aOutFilterName = OUString( "calc_pdf_addstream_import" );
+ aOutFilterName = "calc_pdf_addstream_import";
}
}
@@ -456,7 +456,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
rFilterData[ nFilterNamePos ].Name =
OUString( "FilterName" );
}
- aOutTypeName = OUString("pdf_Portable_Document_Format");
+ aOutTypeName = "pdf_Portable_Document_Format";
OSL_TRACE( "setting filter name %s, input stream %s\n",
OUStringToOString( aOutFilterName, RTL_TEXTENCODING_UTF8 ).getStr(),
@@ -466,7 +466,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
if( xEmbedStream.is() )
{
rFilterData.realloc( ++nAttribs );
- rFilterData[nAttribs-1].Name = OUString( "EmbeddedSubstream" );
+ rFilterData[nAttribs-1].Name = "EmbeddedSubstream";
rFilterData[nAttribs-1].Value <<= xEmbedStream;
}
if( !aPwd.isEmpty() )
@@ -475,7 +475,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
{
nPwdPos = nAttribs;
rFilterData.realloc( ++nAttribs );
- rFilterData[ nPwdPos ].Name = OUString( "Password" );
+ rFilterData[ nPwdPos ].Name = "Password";
}
rFilterData[ nPwdPos ].Value <<= aPwd;
}
@@ -486,7 +486,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
{
nFilterNamePos = nAttribs;
rFilterData.realloc( ++nAttribs );
- rFilterData[ nFilterNamePos ].Name = OUString( "FilterName" );
+ rFilterData[ nFilterNamePos ].Name = "FilterName";
}
const sal_Int32 nDocumentType = 0; //const sal_Int32 nDocumentType = queryDocumentTypeDialog(m_xContext,aURL);
@@ -512,7 +512,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
OSL_FAIL("Unexpected case");
}
- aOutTypeName = OUString("pdf_Portable_Document_Format");
+ aOutTypeName = "pdf_Portable_Document_Format";
}
}
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 6e88fbef2d8a..bd80b60a5aaa 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -701,12 +701,12 @@ void PresenterScreen::ProcessLayout (
UNO_QUERY_THROW);
::std::vector<OUString> aProperties (6);
- aProperties[0] = OUString("PaneURL");
- aProperties[1] = OUString("ViewURL");
- aProperties[2] = OUString("RelativeX");
- aProperties[3] = OUString("RelativeY");
- aProperties[4] = OUString("RelativeWidth");
- aProperties[5] = OUString("RelativeHeight");
+ aProperties[0] = "PaneURL";
+ aProperties[1] = "ViewURL";
+ aProperties[2] = "RelativeX";
+ aProperties[3] = "RelativeY";
+ aProperties[4] = "RelativeWidth";
+ aProperties[5] = "RelativeHeight";
mnComponentIndex = 1;
PresenterConfigurationAccess::ForAll(
xList,
@@ -732,10 +732,10 @@ void PresenterScreen::ProcessViewDescriptions (
UNO_QUERY_THROW);
::std::vector<OUString> aProperties (4);
- aProperties[0] = OUString("ViewURL");
- aProperties[1] = OUString("Title");
- aProperties[2] = OUString("AccessibleTitle");
- aProperties[3] = OUString("IsOpaque");
+ aProperties[0] = "ViewURL";
+ aProperties[1] = "Title";
+ aProperties[2] = "AccessibleTitle";
+ aProperties[3] = "IsOpaque";
mnComponentIndex = 1;
PresenterConfigurationAccess::ForAll(
xViewDescriptionsNode,