diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/print/printerjob.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/app/brand.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 54 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 148 | ||||
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 74 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_droptarget.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 66 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 8 | ||||
| -rw-r--r-- | vcl/workben/svpclient.cxx | 4 |
9 files changed, 187 insertions, 189 deletions
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx index f961e1e3c844..afbc24031b2b 100644 --- a/vcl/generic/print/printerjob.cxx +++ b/vcl/generic/print/printerjob.cxx @@ -113,7 +113,7 @@ PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rE nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL ); if (nError != osl::File::E_None) return NULL; - aFileURL = maSpoolDirName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/")) + aFileURL; + aFileURL = maSpoolDirName + rtl::OUString("/") + aFileURL; pFile = new osl::File (aFileURL); nError = pFile->open (osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); @@ -335,7 +335,7 @@ PrinterJob::StartJob ( maSpoolDirName = createSpoolDir (); maJobTitle = rJobName; - rtl::OUString aExt(RTL_CONSTASCII_USTRINGPARAM (".ps")); + rtl::OUString aExt(".ps"); mpJobHeader = CreateSpoolFile (rtl::OUString("psp_head"), aExt); mpJobTrailer = CreateSpoolFile (rtl::OUString("psp_tail"), aExt); if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor @@ -601,12 +601,10 @@ PrinterJob::StartPage (const JobData& rJobSetup) InitPaperSize (rJobSetup); rtl::OUString aPageNo = rtl::OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1 - rtl::OUString aExt = aPageNo + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (".ps")); + rtl::OUString aExt = aPageNo + rtl::OUString(".ps"); - osl::File* pPageHeader = CreateSpoolFile ( - rtl::OUString("psp_pghead"), aExt); - osl::File* pPageBody = CreateSpoolFile ( - rtl::OUString("psp_pgbody"), aExt); + osl::File* pPageHeader = CreateSpoolFile ( rtl::OUString("psp_pghead"), aExt); + osl::File* pPageBody = CreateSpoolFile ( rtl::OUString("psp_pgbody"), aExt); maHeaderList.push_back (pPageHeader); maPageList.push_back (pPageBody); diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index ae925a2da1b5..f1c27ac89330 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -86,9 +86,9 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap) rtl::OLocale aLoc( pLoc ); rtl::OUString aName = aBaseName + aPng; - rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("-")) + + rtl::OUString aLocaleName = ( aBaseName + rtl::OUString("-") + aLoc.getLanguage() + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("_")) + + rtl::OUString("_") + aLoc.getCountry() + aPng ); return ( loadPng ("$BRAND_BASE_DIR/program/edition", aLocaleName, rBitmap) || @@ -108,9 +108,9 @@ vcl::RenderGraphicRasterizer Application::LoadBrandSVG (const char* pName) rtl::OLocale aLoc( pLoc ); rtl::OUString aName = aBaseName + aSvg; - rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("-")) + + rtl::OUString aLocaleName = ( aBaseName + rtl::OUString("-") + aLoc.getLanguage() + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("_")) + + rtl::OUString("_") + aLoc.getCountry() + aSvg ); vcl::RenderGraphicRasterizer aRasterizer = loadSvg ("$BRAND_BASE_DIR/program/edition", aLocaleName); diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 3f953ff36f9f..f30ce5c282d6 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -350,7 +350,7 @@ void ImplStyleData::SetStandardStyles() Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) ); aStdFont.SetCharSet( osl_getThreadTextEncoding() ); aStdFont.SetWeight( WEIGHT_NORMAL ); - aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) ); + aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( "en" ), rtl::OUString(), rtl::OUString() ) ) ); maAppFont = aStdFont; maHelpFont = aStdFont; maMenuFont = aStdFont; @@ -498,38 +498,38 @@ void StyleSettings::Set3DColors( const Color& rColor ) { switch ( nStyle ) { - case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")); - case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hicontrast")); - case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango")); // industrial is dead - case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("crystal")); - case STYLE_SYMBOLS_TANGO: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango")); - case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxygen")); - case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic")); - case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("human")); + case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString("default"); + case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString("hicontrast"); + case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString("tango"); // industrial is dead + case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString("crystal"); + case STYLE_SYMBOLS_TANGO: return ::rtl::OUString("tango"); + case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString("oxygen"); + case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString("classic"); + case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString("human"); } - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("auto")); + return ::rtl::OUString("auto"); } // ----------------------------------------------------------------------- sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const { - if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")) ) + if ( rName == ::rtl::OUString("default") ) return STYLE_SYMBOLS_DEFAULT; - else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hicontrast")) ) + else if ( rName == ::rtl::OUString("hicontrast") ) return STYLE_SYMBOLS_HICONTRAST; - else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("industrial")) ) + else if ( rName == ::rtl::OUString("industrial") ) return STYLE_SYMBOLS_TANGO; // industrial is dead - else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("crystal")) ) + else if ( rName == ::rtl::OUString("crystal") ) return STYLE_SYMBOLS_CRYSTAL; - else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango")) ) + else if ( rName == ::rtl::OUString("tango") ) return STYLE_SYMBOLS_TANGO; - else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxygen")) ) + else if ( rName == ::rtl::OUString("oxygen") ) return STYLE_SYMBOLS_OXYGEN; - else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic")) ) + else if ( rName == ::rtl::OUString("classic") ) return STYLE_SYMBOLS_CLASSIC; - else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("human")) ) + else if ( rName == ::rtl::OUString("human") ) return STYLE_SYMBOLS_HUMAN; return STYLE_SYMBOLS_AUTO; @@ -957,8 +957,8 @@ sal_Bool MiscSettings::GetDisablePrinting() const { rtl::OUString aEnable = vcl::SettingsConfigItem::get()-> - getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DesktopManagement" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisablePrinting" ) ) ); + getValue( rtl::OUString( "DesktopManagement" ), + rtl::OUString( "DisablePrinting" ) ); mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0; } @@ -1013,8 +1013,8 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const { rtl::OUString aEnable = vcl::SettingsConfigItem::get()-> - getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accessibility" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableATToolSupport" ) ) ); + getValue( rtl::OUString( "Accessibility" ), + rtl::OUString( "EnableATToolSupport" ) ); mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0; } else @@ -1072,9 +1072,9 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable ) } vcl::SettingsConfigItem::get()-> - setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accessibility" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableATToolSupport" ) ), - bEnable ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false" )) ); + setValue( rtl::OUString( "Accessibility" ), + rtl::OUString( "EnableATToolSupport" ), + bEnable ? rtl::OUString("true") : rtl::OUString("false" ) ); mpData->mnEnableATT = bEnable ? 1 : 0; } } @@ -1506,11 +1506,11 @@ bool AllSettings::GetLayoutRTL() const nUIMirroring = 0; // ask configuration only once utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( vcl::unohelper::GetMultiServiceFactory(), - OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/I18N/CTL")) ); // note: case sensisitive ! + OUString("org.openoffice.Office.Common/I18N/CTL") ); // note: case sensisitive ! if ( aNode.isValid() ) { sal_Bool bTmp = sal_Bool(); - ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("UIMirroring")) ); + ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("UIMirroring") ); if( aValue >>= bTmp ) { // found true or false; if it was nil, nothing is changed diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 797159edb436..c1159759e912 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -122,17 +122,17 @@ void PDFTestOutputStream::write( const com::sun::star::uno::Reference< com::sun: void doTestCode() { static const char* pHome = getenv( "HOME" ); - rtl::OUString aTestFile( RTL_CONSTASCII_USTRINGPARAM( "file://" ) ); + rtl::OUString aTestFile( "file://" ); aTestFile += rtl::OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 ); - aTestFile += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/pdf_export_test.pdf" ) ); + aTestFile += rtl::OUString( "/pdf_export_test.pdf" ); PDFWriter::PDFWriterContext aContext; aContext.URL = aTestFile; aContext.Version = PDFWriter::PDF_1_4; aContext.Tagged = true; aContext.InitialPage = 2; - aContext.DocumentInfo.Title = OUString( RTL_CONSTASCII_USTRINGPARAM( "PDF export test document" ) ); - aContext.DocumentInfo.Producer = OUString( RTL_CONSTASCII_USTRINGPARAM( "VCL" ) ); + aContext.DocumentInfo.Title = OUString( "PDF export test document" ); + aContext.DocumentInfo.Producer = OUString( "VCL" ); PDFWriter aWriter( aContext ); aWriter.NewPage( 595, 842 ); @@ -358,53 +358,53 @@ void doTestCode() aWriter.DrawRect( aRect ); aWriter.DrawText( aRect, String( RTL_CONSTASCII_USTRINGPARAM( "www.heise.de" ) ) ); sal_Int32 nURILink = aWriter.CreateLink( aRect ); - aWriter.SetLinkURL( nURILink, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.heise.de" ) ) ); + aWriter.SetLinkURL( nURILink, OUString( "http://www.heise.de" ) ); aWriter.SetLinkDest( nFirstLink, nFirstDest ); aWriter.SetLinkDest( nSecondLink, nSecondDest ); // include a button PDFWriter::PushButtonWidget aBtn; - aBtn.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testButton" ) ); - aBtn.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A test button" ) ); - aBtn.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "hit me" ) ); + aBtn.Name = OUString( "testButton" ); + aBtn.Description = OUString( "A test button" ); + aBtn.Text = OUString( "hit me" ); aBtn.Location = Rectangle( Point( 4500, 9000 ), Size( 4500, 3000 ) ); aBtn.Border = aBtn.Background = true; aWriter.CreateControl( aBtn ); // include a uri button PDFWriter::PushButtonWidget aUriBtn; - aUriBtn.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "wwwButton" ) ); - aUriBtn.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A URI button" ) ); - aUriBtn.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "to www" ) ); + aUriBtn.Name = OUString( "wwwButton" ); + aUriBtn.Description = OUString( "A URI button" ); + aUriBtn.Text = OUString( "to www" ); aUriBtn.Location = Rectangle( Point( 9500, 9000 ), Size( 4500, 3000 ) ); aUriBtn.Border = aUriBtn.Background = true; - aUriBtn.URL = OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.heise.de" ) ); + aUriBtn.URL = OUString( "http://www.heise.de" ); aWriter.CreateControl( aUriBtn ); // include a dest button PDFWriter::PushButtonWidget aDstBtn; - aDstBtn.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "destButton" ) ); - aDstBtn.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A Dest button" ) ); - aDstBtn.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "to paragraph" ) ); + aDstBtn.Name = OUString( "destButton" ); + aDstBtn.Description = OUString( "A Dest button" ); + aDstBtn.Text = OUString( "to paragraph" ); aDstBtn.Location = Rectangle( Point( 14500, 9000 ), Size( 4500, 3000 ) ); aDstBtn.Border = aDstBtn.Background = true; aDstBtn.Dest = nFirstDest; aWriter.CreateControl( aDstBtn ); PDFWriter::CheckBoxWidget aCBox; - aCBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "textCheckBox" ) ); - aCBox.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A test check box" ) ); - aCBox.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "check me" ) ); + aCBox.Name = OUString( "textCheckBox" ); + aCBox.Description = OUString( "A test check box" ); + aCBox.Text = OUString( "check me" ); aCBox.Location = Rectangle( Point( 4500, 13500 ), Size( 3000, 750 ) ); aCBox.Checked = true; aCBox.Border = aCBox.Background = false; aWriter.CreateControl( aCBox ); PDFWriter::CheckBoxWidget aCBox2; - aCBox2.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "textCheckBox2" ) ); - aCBox2.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "Another test check box" ) ); - aCBox2.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "check me right" ) ); + aCBox2.Name = OUString( "textCheckBox2" ); + aCBox2.Description = OUString( "Another test check box" ); + aCBox2.Text = OUString( "check me right" ); aCBox2.Location = Rectangle( Point( 4500, 14250 ), Size( 3000, 750 ) ); aCBox2.Checked = true; aCBox2.Border = aCBox2.Background = false; @@ -412,9 +412,9 @@ void doTestCode() aWriter.CreateControl( aCBox2 ); PDFWriter::RadioButtonWidget aRB1; - aRB1.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "rb1_1" ) ); - aRB1.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "radio 1 button 1" ) ); - aRB1.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "Despair" ) ); + aRB1.Name = OUString( "rb1_1" ); + aRB1.Description = OUString( "radio 1 button 1" ); + aRB1.Text = OUString( "Despair" ); aRB1.Location = Rectangle( Point( 4500, 15000 ), Size( 6000, 1000 ) ); aRB1.Selected = true; aRB1.RadioGroup = 1; @@ -427,27 +427,27 @@ void doTestCode() aWriter.CreateControl( aRB1 ); PDFWriter::RadioButtonWidget aRB2; - aRB2.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "rb2_1" ) ); - aRB2.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "radio 2 button 1" ) ); - aRB2.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "Joy" ) ); + aRB2.Name = OUString( "rb2_1" ); + aRB2.Description = OUString( "radio 2 button 1" ); + aRB2.Text = OUString( "Joy" ); aRB2.Location = Rectangle( Point( 10500, 15000 ), Size( 3000, 1000 ) ); aRB2.Selected = true; aRB2.RadioGroup = 2; aWriter.CreateControl( aRB2 ); PDFWriter::RadioButtonWidget aRB3; - aRB3.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "rb1_2" ) ); - aRB3.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "radio 1 button 2" ) ); - aRB3.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "Desperation" ) ); + aRB3.Name = OUString( "rb1_2" ); + aRB3.Description = OUString( "radio 1 button 2" ); + aRB3.Text = OUString( "Desperation" ); aRB3.Location = Rectangle( Point( 4500, 16000 ), Size( 3000, 1000 ) ); aRB3.Selected = true; aRB3.RadioGroup = 1; aWriter.CreateControl( aRB3 ); PDFWriter::EditWidget aEditBox; - aEditBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testEdit" ) ); - aEditBox.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A test edit field" ) ); - aEditBox.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "A little test text" ) ); + aEditBox.Name = OUString( "testEdit" ); + aEditBox.Description = OUString( "A test edit field" ); + aEditBox.Text = OUString( "A little test text" ); aEditBox.TextStyle = TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER; aEditBox.Location = Rectangle( Point( 10000, 18000 ), Size( 5000, 1500 ) ); aEditBox.MaxLen = 100; @@ -457,48 +457,48 @@ void doTestCode() // normal list box PDFWriter::ListBoxWidget aLstBox; - aLstBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testListBox" ) ); - aLstBox.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "One" ) ); - aLstBox.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "select me" ) ); + aLstBox.Name = OUString( "testListBox" ); + aLstBox.Text = OUString( "One" ); + aLstBox.Description = OUString( "select me" ); aLstBox.Location = Rectangle( Point( 4500, 18000 ), Size( 3000, 1500 ) ); aLstBox.Sort = true; aLstBox.MultiSelect = true; aLstBox.Border = aLstBox.Background = true; aLstBox.BorderColor = Color( COL_BLACK ); - aLstBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "One" ) ) ); - aLstBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Two" ) ) ); - aLstBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Three" ) ) ); - aLstBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Four" ) ) ); + aLstBox.Entries.push_back( OUString( "One" ) ); + aLstBox.Entries.push_back( OUString( "Two" ) ); + aLstBox.Entries.push_back( OUString( "Three" ) ); + aLstBox.Entries.push_back( OUString( "Four" ) ); aLstBox.SelectedEntries.push_back( 1 ); aLstBox.SelectedEntries.push_back( 2 ); aWriter.CreateControl( aLstBox ); // dropdown list box - aLstBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testDropDownListBox" ) ); + aLstBox.Name = OUString( "testDropDownListBox" ); aLstBox.DropDown = true; aLstBox.Location = Rectangle( Point( 4500, 19500 ), Size( 3000, 500 ) ); aWriter.CreateControl( aLstBox ); // combo box PDFWriter::ComboBoxWidget aComboBox; - aComboBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testComboBox" ) ); - aComboBox.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "test a combobox" ) ); - aComboBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Larry" ) ) ); - aComboBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Curly" ) ) ); - aComboBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Moe" ) ) ); + aComboBox.Name = OUString( "testComboBox" ); + aComboBox.Text = OUString( "test a combobox" ); + aComboBox.Entries.push_back( OUString( "Larry" ) ); + aComboBox.Entries.push_back( OUString( "Curly" ) ); + aComboBox.Entries.push_back( OUString( "Moe" ) ); aComboBox.Location = Rectangle( Point( 4500, 20000 ), Size( 3000, 500 ) ); aWriter.CreateControl( aComboBox ); // test outlines sal_Int32 nPage1OL = aWriter.CreateOutlineItem(); - aWriter.SetOutlineItemText( nPage1OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Page 1" ) ) ); + aWriter.SetOutlineItemText( nPage1OL, OUString( "Page 1" ) ); aWriter.SetOutlineItemDest( nPage1OL, nSecondDest ); - aWriter.CreateOutlineItem( nPage1OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Dest 2" ) ), nSecondDest ); - aWriter.CreateOutlineItem( nPage1OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Dest 2 revisited" ) ), nSecondDest ); - aWriter.CreateOutlineItem( nPage1OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Dest 2 again" ) ), nSecondDest ); + aWriter.CreateOutlineItem( nPage1OL, OUString( "Dest 2" ), nSecondDest ); + aWriter.CreateOutlineItem( nPage1OL, OUString( "Dest 2 revisited" ), nSecondDest ); + aWriter.CreateOutlineItem( nPage1OL, OUString( "Dest 2 again" ), nSecondDest ); sal_Int32 nPage2OL = aWriter.CreateOutlineItem(); - aWriter.SetOutlineItemText( nPage2OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Page 2" ) ) ); - aWriter.CreateOutlineItem( nPage2OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Dest 1" ) ), nFirstDest ); + aWriter.SetOutlineItemText( nPage2OL, OUString( "Page 2" ) ); + aWriter.CreateOutlineItem( nPage2OL, OUString( "Dest 1" ), nFirstDest ); aWriter.EndStructureElement(); // close document aWriter.Emit(); @@ -4628,21 +4628,21 @@ we check in the following sequence: { sal_Int32 bChangeFileExtensionToPDF = false; //examine the file type (.odm .odt. .odp, odg, ods) - if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "odm" ) ) ) ) + if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odm" ) ) ) bChangeFileExtensionToPDF = true; - if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "odt" ) ) ) ) + if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odt" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "odp" ) ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odp" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "odg" ) ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odg" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ods" ) ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "ods" ) ) ) bChangeFileExtensionToPDF = true; if( bChangeFileExtensionToPDF ) - aTargetURL.setExtension(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf" ) ) ); + aTargetURL.setExtension(rtl::OUString( "pdf" ) ); } //check if extension is pdf, see if GoToR should be forced - bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf" ) ) ); + bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(rtl::OUString( "pdf" ) ); if( m_aContext.ForcePDFAction && bTargetHasPDFExtension ) nSetGoToRMode++; } @@ -4835,13 +4835,13 @@ sal_Int32 PDFWriterImpl::getBestBuiltinFont( const Font& rFont ) OUString aFontName( rFont.GetName() ); aFontName = aFontName.toAsciiLowerCase(); - if( aFontName.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( "times" ) ) ) != -1 ) + if( aFontName.indexOf( OUString( "times" ) ) != -1 ) nBest = 8; - else if( aFontName.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( "courier" ) ) ) != -1 ) + else if( aFontName.indexOf( OUString( "courier" ) ) != -1 ) nBest = 0; - else if( aFontName.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( "dingbats" ) ) ) != -1 ) + else if( aFontName.indexOf( OUString( "dingbats" ) ) != -1 ) nBest = 13; - else if( aFontName.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( "symbol" ) ) ) != -1 ) + else if( aFontName.indexOf( OUString( "symbol" ) ) != -1 ) nBest = 12; if( nBest < 12 ) { @@ -6100,7 +6100,7 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations() // need to set the name of the destination the same way it will be encoded // in an Internet link INetURLObject aLocalURL( - OUString( RTL_CONSTASCII_USTRINGPARAM( "http://ahost.ax" ) ) ); //dummy location, won't be used + OUString( "http://ahost.ax" ) ); //dummy location, won't be used aLocalURL.SetMark( rDest.m_aDestName ); const rtl::OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as @@ -6231,7 +6231,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() aLine.append( " 0 obj\n" "<</Type/OutputIntent/S/GTS_PDFA1/OutputConditionIdentifier"); - rtl::OUString aComment( RTL_CONSTASCII_USTRINGPARAM( "sRGB IEC61966-2.1" ) ); + rtl::OUString aComment( "sRGB IEC61966-2.1" ); appendLiteralStringEncrypt( aComment ,nOIObject, aLine ); aLine.append("/DestOutputProfile "); aLine.append( nICCObject ); @@ -6251,19 +6251,19 @@ static void escapeStringXML( const rtl::OUString& rStr, rtl::OUString &rValue) switch( *pUni ) { case sal_Unicode('&'): - rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "&" ) ); + rValue += rtl::OUString( "&" ); break; case sal_Unicode('<'): - rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "<" ) ); + rValue += rtl::OUString( "<" ); break; case sal_Unicode('>'): - rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ">" ) ); + rValue += rtl::OUString( ">" ); break; case sal_Unicode('\''): - rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "'" ) ); + rValue += rtl::OUString( "'" ); break; case sal_Unicode('"'): - rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( """ ) ); + rValue += rtl::OUString( """ ); break; default: rValue += rtl::OUString( *pUni ); @@ -10556,7 +10556,7 @@ sal_Int32 PDFWriterImpl::setLinkURL( sal_Int32 nLinkId, const OUString& rURL ) if( xFact.is() ) { m_xTrans = uno::Reference < util::XURLTransformer >( - xFact->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) ) ), uno::UNO_QUERY ); + xFact->createInstance( OUString( "com.sun.star.util.URLTransformer" ) ), uno::UNO_QUERY ); } } @@ -11606,7 +11606,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa rRadioButton.m_aKidsIndex.push_back( nNewWidget ); rNewWidget.m_nParent = rRadioButton.m_nObject; - rNewWidget.m_aValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "Off" ) ); + rNewWidget.m_aValue = OUString( "Off" ); rNewWidget.m_aOnValue = rBtn.OnValue; if( rRadioButton.m_aValue.isEmpty() && rBtn.Selected ) { @@ -11627,7 +11627,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa rNewWidget.m_nTextStyle = TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK; - rNewWidget.m_aValue = rBox.Checked ? OUString(RTL_CONSTASCII_USTRINGPARAM("Yes")) : OUString(RTL_CONSTASCII_USTRINGPARAM("Off" )); + rNewWidget.m_aValue = rBox.Checked ? OUString("Yes") : OUString("Off" ); // create default appearance before m_aRect gets transformed createDefaultCheckBoxAppearance( rNewWidget, rBox ); } @@ -11722,7 +11722,7 @@ void PDFWriterImpl::addStream( const String& rMimeType, PDFOutputStream* pStream PDFAddStream& rStream = m_aAdditionalStreams.back(); rStream.m_aMimeType = rMimeType.Len() ? OUString( rMimeType ) - : OUString( RTL_CONSTASCII_USTRINGPARAM( "application/octet-stream" ) ); + : OUString( "application/octet-stream" ); rStream.m_pStream = pStream; rStream.m_bCompress = bCompress; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index f3386100d5ef..d9aa5dd08b94 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -626,8 +626,8 @@ void PrintDialog::JobTabPage::readFromSettings() SettingsConfigItem* pItem = SettingsConfigItem::get(); rtl::OUString aValue; - aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateBox" ) ) ); + aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "CollateBox" ) ); if( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("alwaysoff")) ) { mnCollateUIMode = 1; @@ -637,8 +637,8 @@ void PrintDialog::JobTabPage::readFromSettings() else { mnCollateUIMode = 0; - aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ) ); + aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "Collate" ) ); maCollateBox.Check( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ); } Resize(); @@ -647,13 +647,13 @@ void PrintDialog::JobTabPage::readFromSettings() void PrintDialog::JobTabPage::storeToSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CopyCount" ) ), + pItem->setValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "CopyCount" ), maCopyCountField.GetText() ); - pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ), - maCollateBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) ); + pItem->setValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "Collate" ), + maCollateBox.IsChecked() ? rtl::OUString("true") : + rtl::OUString("false") ); } PrintDialog::OutputOptPage::OutputOptPage( Window* i_pParent, const ResId& i_rResId ) @@ -690,8 +690,8 @@ void PrintDialog::OutputOptPage::readFromSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); rtl::OUString aValue; - aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateSingleJobs" ) ) ); + aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "CollateSingleJobs" ) ); if ( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ) { maCollateSingleJobsBox.Check( sal_True ); @@ -706,14 +706,14 @@ void PrintDialog::OutputOptPage::readFromSettings() void PrintDialog::OutputOptPage::storeToSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToFile" ) ), - maToFileBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) - : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) ); - pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateSingleJobs" ) ), - maCollateSingleJobsBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) ); + pItem->setValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "ToFile" ), + maToFileBox.IsChecked() ? rtl::OUString("true") + : rtl::OUString("false") ); + pItem->setValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "CollateSingleJobs" ), + maCollateSingleJobsBox.IsChecked() ? rtl::OUString("true") : + rtl::OUString("false") ); } PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController ) @@ -780,8 +780,8 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont { // fall back to last printer SettingsConfigItem* pItem = SettingsConfigItem::get(); - String aValue( pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPrinter" ) ) ) ); + String aValue( pItem->getValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "LastPrinter" ) ) ); if( maJobPage.maPrinters.GetEntryPos( aValue ) != LISTBOX_ENTRY_NOTFOUND ) { maJobPage.maPrinters.SelectEntry( aValue ); @@ -974,8 +974,8 @@ void PrintDialog::readFromSettings() // read last selected tab page; if it exists, actiavte it SettingsConfigItem* pItem = SettingsConfigItem::get(); - rtl::OUString aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPage" ) ) ); + rtl::OUString aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "LastPage" ) ); sal_uInt16 nCount = maTabCtrl.GetPageCount(); for( sal_uInt16 i = 0; i < nCount; i++ ) { @@ -989,8 +989,8 @@ void PrintDialog::readFromSettings() maOKButton.SetText( maOptionsPage.maToFileBox.IsChecked() ? maPrintToFileText : maPrintText ); // persistent window state - rtl::OUString aWinState( pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WindowState" ) ) ) ); + rtl::OUString aWinState( pItem->getValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "WindowState" ) ) ); if( !aWinState.isEmpty() ) SetWindowState( rtl::OUStringToOString( aWinState, RTL_TEXTENCODING_UTF8 ) ); @@ -1009,15 +1009,15 @@ void PrintDialog::storeToSettings() // store last selected printer SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPrinter" ) ), + pItem->setValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "LastPrinter" ), maJobPage.maPrinters.GetSelectEntry() ); - pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPage" ) ), + pItem->setValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "LastPage" ), maTabCtrl.GetPageText( maTabCtrl.GetCurPageId() ) ); - pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WindowState" ) ), + pItem->setValue( rtl::OUString( "PrintDialog" ), + rtl::OUString( "WindowState" ), rtl::OStringToOUString( GetWindowState(), RTL_TEXTENCODING_UTF8 ) ); pItem->Commit(); @@ -2042,7 +2042,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:OK" ) ), &maOKButton ); + pHelp->Start( rtl::OUString( ".HelpID:vcl:PrintDialog:OK" ), &maOKButton ); } } else if( pButton == &maForwardBtn ) @@ -2119,7 +2119,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) } else if( pButton == &maJobPage.maCollateBox ) { - maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ), + maPController->setValue( rtl::OUString( "Collate" ), makeAny( sal_Bool(isCollate()) ) ); checkControlDependencies(); } @@ -2127,7 +2127,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) { sal_Bool bChecked = maJobPage.maReverseOrderBox.IsChecked(); maPController->setReversePrint( bChecked ); - maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintReverse" ) ), + maPController->setValue( rtl::OUString( "PrintReverse" ), makeAny( bChecked ) ); preparePreview( true, true ); } @@ -2163,9 +2163,9 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit ) } else if( pEdit == &maJobPage.maCopyCountField ) { - maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CopyCount" ) ), + maPController->setValue( rtl::OUString( "CopyCount" ), makeAny( sal_Int32(maJobPage.maCopyCountField.GetValue()) ) ); - maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ), + maPController->setValue( rtl::OUString( "Collate" ), makeAny( sal_Bool(isCollate()) ) ); } return 0; diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index ac71dbfc849c..a6e69683d0ee 100644 --- a/vcl/unx/generic/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx @@ -202,7 +202,7 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw() OUString DropTarget::getImplementationName() throw() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_DROPTARGET_IMPLEMENTATION_NAME)); + return OUString(XDND_DROPTARGET_IMPLEMENTATION_NAME); } // ------------------------------------------------------------------------ diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index ede6fa881c3c..6321b1c2357e 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -384,38 +384,38 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c XSynchronize( m_pDisplay, True ); #endif // clipboard selection - m_nCLIPBOARDAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ); + m_nCLIPBOARDAtom = getAtom( OUString("CLIPBOARD") ); // special targets - m_nTARGETSAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("TARGETS")) ); - m_nTIMESTAMPAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")) ); - m_nTEXTAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("TEXT")) ); - m_nINCRAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("INCR")) ); - m_nCOMPOUNDAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("COMPOUND_TEXT")) ); - m_nMULTIPLEAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("MULTIPLE")) ); - m_nUTF16Atom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("ISO10646-1")) ); - m_nImageBmpAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("image/bmp")) ); + 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") ); // Atoms for Xdnd protocol - m_nXdndAware = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndAware")) ); - m_nXdndEnter = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndEnter")) ); - m_nXdndLeave = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndLeave")) ); - m_nXdndPosition = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndPosition")) ); - m_nXdndStatus = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndStatus")) ); - m_nXdndDrop = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndDrop")) ); - m_nXdndFinished = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndFinished")) ); - m_nXdndSelection = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndSelection")) ); - m_nXdndTypeList = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndTypeList")) ); - m_nXdndProxy = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndProxy")) ); - m_nXdndActionCopy = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionCopy")) ); - m_nXdndActionMove = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionMove")) ); - m_nXdndActionLink = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionLink")) ); - m_nXdndActionAsk = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionAsk")) ); - m_nXdndActionPrivate= getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionPrivate")) ); + 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") ); // initialize map with member none - m_aAtomToString[ 0 ]= OUString(RTL_CONSTASCII_USTRINGPARAM("None")); - m_aAtomToString[ XA_PRIMARY ] = OUString(RTL_CONSTASCII_USTRINGPARAM("PRIMARY")); + m_aAtomToString[ 0 ]= OUString("None"); + m_aAtomToString[ XA_PRIMARY ] = OUString("PRIMARY"); // create a (invisible) message window m_aWindow = XCreateSimpleWindow( m_pDisplay, DefaultRootWindow( m_pDisplay ), @@ -677,7 +677,7 @@ bool SelectionManager::convertData( aEncoding = getTextPlainEncoding( aFlavor.MimeType ); if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText ) { - aFlavor.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")); + aFlavor.MimeType = OUString("text/plain;charset=utf-16"); aFlavor.DataType = getCppuType( (OUString *) 0 ); if( xTransferable->isDataFlavorSupported( aFlavor ) ) { @@ -869,7 +869,7 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, rOutTypeList.push_front( XA_STRING ); rOutTypeList.push_front( m_nCOMPOUNDAtom ); } - convertTypeToNative( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-8")), targetselection, nFormat, rOutTypeList, true ); + convertTypeToNative( OUString("text/plain;charset=utf-8"), targetselection, nFormat, rOutTypeList, true ); } if( targetselection != m_nXdndSelection ) rOutTypeList.push_back( m_nMULTIPLEAtom ); @@ -1402,7 +1402,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(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")); + aTemp.getArray()[0].MimeType = OUString("text/plain;charset=utf-16"); aTemp.getArray()[0].DataType = getCppuType( (OUString*)0 ); rTypes = aTemp; @@ -1522,7 +1522,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, try { Any aResult = - m_xBitmapConverter->invoke( OUString(RTL_CONSTASCII_USTRINGPARAM("convert-bitmap-depth")), + m_xBitmapConverter->invoke( OUString("convert-bitmap-depth"), aArgs, aOutIndex, aOutArgs ); if( aResult >>= xBM ) aData = xBM->getDIB(); @@ -2071,7 +2071,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) // notification about success/failure of one of our conversion requests #if OSL_DEBUG_LEVEL > 1 OUString aSelection( getString( rNotify.selection ) ); - OUString aProperty(RTL_CONSTASCII_USTRINGPARAM("None")); + OUString aProperty("None"); if( rNotify.property ) aProperty = getString( rNotify.property ); fprintf( stderr, "handleSelectionNotify for selection %s and property %s (0x%lx)\n", @@ -3764,7 +3764,7 @@ void SelectionManager::run( void* pThis ) css::uno::Reference< XMultiServiceFactory > xFact( ::comphelper::getProcessServiceFactory() ); if( xFact.is() ) { - This->m_xDesktop.set(xFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY); + This->m_xDesktop.set(xFact->createInstance( ::rtl::OUString("com.sun.star.frame.Desktop") ), UNO_QUERY); if (This->m_xDesktop.is()) This->m_xDesktop->addTerminateListener(This); } @@ -4163,7 +4163,7 @@ void SelectionManagerHolder::startDrag( OUString SelectionManagerHolder::getImplementationName() throw() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_IMPLEMENTATION_NAME)); + return OUString(XDND_IMPLEMENTATION_NAME); } // ------------------------------------------------------------------------ diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 0f45b46c32bf..858cf2ac45d0 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -172,11 +172,11 @@ CUPSWrapper::CUPSWrapper() : m_pLib( NULL ), m_bPPDThreadRunning( false ) { - OUString aLib( RTL_CONSTASCII_USTRINGPARAM( CUPS_LIB_NAME ) ); + OUString aLib( CUPS_LIB_NAME ); m_pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY ); if( ! m_pLib ) { - aLib = OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "cups" ) ) ); + aLib = OUString( SAL_MODULENAME( "cups" ) ); m_pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY ); } @@ -1100,11 +1100,11 @@ const char* CUPSManager::authenticateUser( const char* /*pIn*/ ) { const char* pRet = NULL; - OUString aLib(RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME )); + OUString aLib(_XSALSET_LIBNAME ); oslModule pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY ); if( pLib ) { - OUString aSym( RTL_CONSTASCII_USTRINGPARAM( "Sal_authenticateQuery" ) ); + OUString aSym( "Sal_authenticateQuery" ); bool (*getpw)( const OString& rServer, OString& rUser, OString& rPw) = (bool(*)(const OString&,OString&,OString&))osl_getFunctionSymbol( pLib, aSym.pData ); if( getpw ) diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index dc0717c40f67..a059735ae8cb 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -106,8 +106,8 @@ SAL_IMPLEMENT_MAIN() * Create UCB. */ Sequence< Any > aArgs( 2 ); - aArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )); - aArgs[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )); + aArgs[ 0 ] <<= OUString(UCB_CONFIGURATION_KEY1_LOCAL ); + aArgs[ 1 ] <<= OUString(UCB_CONFIGURATION_KEY2_OFFICE ); #if OSL_DEBUG_LEVEL > 1 sal_Bool bSuccess = #endif |