summaryrefslogtreecommitdiff
path: root/svtools/source/misc
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source/misc')
-rw-r--r--svtools/source/misc/acceleratorexecute.cxx58
-rw-r--r--svtools/source/misc/imageresourceaccess.cxx8
-rw-r--r--svtools/source/misc/sampletext.cxx2
-rw-r--r--svtools/source/misc/templatefoldercache.cxx8
-rw-r--r--svtools/source/misc/transfer.cxx22
5 files changed, 49 insertions, 49 deletions
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 6bd32c9e3e89..b167234f937d 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -296,65 +296,65 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
switch( aKey.KeyCode )
{
case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfLine" ) );
+ return rtl::OUString( ".uno:DelToStartOfLine" );
case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfLine" ) );
+ return rtl::OUString( ".uno:DelToEndOfLine" );
case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfPara" ) );
+ return rtl::OUString( ".uno:DelToStartOfPara" );
case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfPara" ) );
+ return rtl::OUString( ".uno:DelToEndOfPara" );
case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfWord" ) );
+ return rtl::OUString( ".uno:DelToStartOfWord" );
case com::sun::star::awt::Key::DELETE_WORD_FORWARD:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfWord" ) );
+ return rtl::OUString( ".uno:DelToEndOfWord" );
case com::sun::star::awt::Key::INSERT_LINEBREAK:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertLinebreak" ) );
+ return rtl::OUString( ".uno:InsertLinebreak" );
case com::sun::star::awt::Key::INSERT_PARAGRAPH:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPara" ) );
+ return rtl::OUString( ".uno:InsertPara" );
case com::sun::star::awt::Key::MOVE_WORD_BACKWARD:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToPrevWord" ) );
+ return rtl::OUString( ".uno:GoToPrevWord" );
case com::sun::star::awt::Key::MOVE_WORD_FORWARD:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToNextWord" ) );
+ return rtl::OUString( ".uno:GoToNextWord" );
case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfLine" ) );
+ return rtl::OUString( ".uno:GoToStartOfLine" );
case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfLine" ) );
+ return rtl::OUString( ".uno:GoToEndOfLine" );
case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfPara" ) );
+ return rtl::OUString( ".uno:GoToStartOfPara" );
case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfPara" ) );
+ return rtl::OUString( ".uno:GoToEndOfPara" );
case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfDoc" ) );
+ return rtl::OUString( ".uno:GoToStartOfDoc" );
case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfDoc" ) );
+ return rtl::OUString( ".uno:GoToEndOfDoc" );
case com::sun::star::awt::Key::SELECT_BACKWARD:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharLeftSel" ) );
+ return rtl::OUString( ".uno:CharLeftSel" );
case com::sun::star::awt::Key::SELECT_FORWARD:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharRightSel" ) );
+ return rtl::OUString( ".uno:CharRightSel" );
case com::sun::star::awt::Key::SELECT_WORD_BACKWARD:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordLeftSel" ) );
+ return rtl::OUString( ".uno:WordLeftSel" );
case com::sun::star::awt::Key::SELECT_WORD_FORWARD:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordRightSel" ) );
+ return rtl::OUString( ".uno:WordRightSel" );
case com::sun::star::awt::Key::SELECT_WORD:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectWord" ) );
+ return rtl::OUString( ".uno:SelectWord" );
case com::sun::star::awt::Key::SELECT_LINE:
return rtl::OUString();
case com::sun::star::awt::Key::SELECT_PARAGRAPH:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectText" ) );
+ return rtl::OUString( ".uno:SelectText" );
case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfLineSel" ) );
+ return rtl::OUString( ".uno:StartOfLineSel" );
case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfLineSel" ) );
+ return rtl::OUString( ".uno:EndOfLineSel" );
case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfParaSel" ) );
+ return rtl::OUString( ".uno:StartOfParaSel" );
case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfParaSel" ) );
+ return rtl::OUString( ".uno:EndOfParaSel" );
case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfDocumentSel" ) );
+ return rtl::OUString( ".uno:StartOfDocumentSel" );
case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfDocumentSel" ) );
+ return rtl::OUString( ".uno:EndOfDocumentSel" );
case com::sun::star::awt::Key::SELECT_ALL:
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectAll" ) );
+ return rtl::OUString( ".uno:SelectAll" );
default:
break;
}
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 7a15af515753..b21d576ab632 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -148,7 +148,7 @@ namespace svt
// let it create a graphic from the given URL
Sequence< PropertyValue > aMediaProperties( 1 );
- aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+ aMediaProperties[0].Name = ::rtl::OUString( "URL" );
aMediaProperties[0].Value <<= _rImageResourceURL;
Reference< XGraphic > xGraphic( xProvider->queryGraphic( aMediaProperties ) );
OSL_ENSURE( xGraphic.is(), "GraphicAccess::getImageStream: the provider did not give us a graphic object!" );
@@ -163,10 +163,10 @@ namespace svt
);
aMediaProperties.realloc( 2 );
- aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ) );
+ aMediaProperties[0].Name = ::rtl::OUString( "OutputStream" );
aMediaProperties[0].Value <<= xBufferAccess;
- aMediaProperties[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MimeType" ) );
- aMediaProperties[1].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "image/png" ) );
+ aMediaProperties[1].Name = ::rtl::OUString( "MimeType" );
+ aMediaProperties[1].Value <<= ::rtl::OUString( "image/png" );
xProvider->storeGraphic( xGraphic, aMediaProperties );
pMemBuffer->Seek( 0 );
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index 42be4cad5173..c6d7a719338f 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -425,7 +425,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
break;
}
case USCRIPT_LATIN:
- sSampleText = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lorem ipsum"));
+ sSampleText = rtl::OUString("Lorem ipsum");
break;
default:
break;
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 538c2246111a..2039c3d41c5b 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -602,10 +602,10 @@ namespace svt
// create a content for the current folder root
Reference< XResultSet > xResultSet;
Sequence< ::rtl::OUString > aContentProperties( 4);
- aContentProperties[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ));
- aContentProperties[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ));
- aContentProperties[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ));
- aContentProperties[3] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
+ aContentProperties[0] = ::rtl::OUString( "Title" );
+ aContentProperties[1] = ::rtl::OUString( "DateModified" );
+ aContentProperties[2] = ::rtl::OUString( "DateCreated" );
+ aContentProperties[3] = ::rtl::OUString( "IsFolder" );
// get the set of sub contents in the folder
try
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index e702089e8d08..8b8990903f05 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1393,33 +1393,33 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
aFlavorEx.mnSotId = SOT_FORMATSTR_ID_HTML_NO_COMMENT;
rDataFlavorExVector.push_back( aFlavorEx );
}
- else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ) )
+ else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) )
{
// add, if it is a UTF-8 byte buffer
if( xMimeType->hasParameter( aCharsetStr ) )
{
- if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unicode" )) ) ||
- xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "utf-16" )) ) )
+ if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) ||
+ xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) )
{
rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_STRING;
}
}
}
- else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/rtf" )) ) )
+ else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/rtf" ) ) )
{
rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_RTF;
}
- else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/html" )) ) )
+ else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/html" ) ) )
{
rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_HTML;
}
- else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/uri-list" )) ) )
+ else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/uri-list" ) ) )
{
rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMAT_FILE_LIST;
}
- else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-objectdescriptor-xml" )) ) )
+ else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice-objectdescriptor-xml" ) ) )
{
rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_OBJECTDESCRIPTOR;
}
@@ -2276,19 +2276,19 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::
{
if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( xRequestType2->getFullMediaType() ) )
{
- if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ) )
+ if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) )
{
// special handling for text/plain media types
const ::rtl::OUString aCharsetString(RTL_CONSTASCII_USTRINGPARAM( "charset" ));
if( !xRequestType2->hasParameter( aCharsetString ) ||
- xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "utf-16" )) ) ||
- xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unicode" )) ) )
+ xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) ||
+ xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) )
{
bRet = sal_True;
}
}
- else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice" )) ) )
+ else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice" ) ) )
{
// special handling for application/x-openoffice media types
const ::rtl::OUString aFormatString(RTL_CONSTASCII_USTRINGPARAM( "windows_formatname" ));
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 12:34:27 +0000