Skip to content

C
core
Kaydet (Commit) 13bbf43b authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

convert aqua plugin to rtl::O(U)String

üst 5ec60397
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
vcl/aqua/source/app/salinst.cxx
Dosyayı görüntüle @ 13bbf43b
......@@ -258,13 +258,13 @@ sal_Bool ImplSVMainHook( int * pnInit )
// =======================================================================
void SalAbort( const XubString& rErrorText, bool bDumpCore )
void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
{
if( !rErrorText.Len() )
fprintf( stderr, "Application Error " );
else
fprintf( stderr, "%s ",
ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
rtl::OUStringToOString( rErrorText, gsl_getSystemTextEncoding() ).getStr() );
if( bDumpCore )
abort();
else
......@@ -997,7 +997,7 @@ void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
// -----------------------------------------------------------------------
XubString AquaSalInstance::GetDefaultPrinter()
rtl::OUString AquaSalInstance::GetDefaultPrinter()
{
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
......
vcl/aqua/source/app/salsys.cxx
Dosyayı görüntüle @ 13bbf43b
......@@ -138,8 +138,8 @@ static NSString* getStandardString( int nButtonId )
return aText.getLength() ? CreateNSString( aText) : nil;
}
int AquaSalSystem::ShowNativeMessageBox( const String& rTitle,
const String& rMessage,
int AquaSalSystem::ShowNativeMessageBox( const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
int nButtonCombination,
int nDefaultButton)
{
......
vcl/aqua/source/gdi/salgdi.cxx
Dosyayı görüntüle @ 13bbf43b
......@@ -1726,7 +1726,7 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
// -----------------------------------------------------------------------
bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
const String& rFontFileURL, const String& /*rFontName*/ )
const rtl::OUString& rFontFileURL, const rtl::OUString& /*rFontName*/ )
{
::rtl::OUString aUSytemPath;
OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) );
......
vcl/aqua/source/gdi/salprn.cxx
Dosyayı görüntüle @ 13bbf43b
......@@ -300,9 +300,9 @@ sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* )
// -----------------------------------------------------------------------
XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
rtl::OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
{
return XubString();
return rtl::OUString();
}
// -----------------------------------------------------------------------
......@@ -451,9 +451,9 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag
return aPageSize;
}
sal_Bool AquaSalInfoPrinter::StartJob( const String* i_pFileName,
const String& i_rJobName,
const String& /*i_rAppName*/,
sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
const rtl::OUString& i_rJobName,
const rtl::OUString& /*i_rAppName*/,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rController
)
......@@ -693,9 +693,9 @@ AquaSalPrinter::~AquaSalPrinter()
// -----------------------------------------------------------------------
sal_Bool AquaSalPrinter::StartJob( const String* i_pFileName,
const String& i_rJobName,
const String& i_rAppName,
sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName,
const rtl::OUString& i_rJobName,
const rtl::OUString& i_rAppName,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rController )
{
......@@ -704,9 +704,9 @@ sal_Bool AquaSalPrinter::StartJob( const String* i_pFileName,
// -----------------------------------------------------------------------
sal_Bool AquaSalPrinter::StartJob( const XubString* /*i_pFileName*/,
const XubString& /*i_rJobName*/,
const XubString& /*i_rAppName*/,
sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* /*i_pFileName*/,
const rtl::OUString& /*i_rJobName*/,
const rtl::OUString& /*i_rAppName*/,
sal_uLong /*i_nCopies*/,
bool /*i_bCollate*/,
bool /*i_bDirect*/,
......
vcl/aqua/source/window/salframe.cxx
Dosyayı görüntüle @ 13bbf43b
......@@ -314,7 +314,7 @@ sal_Bool AquaSalFrame::PostEvent( void *pData )
}
// -----------------------------------------------------------------------
void AquaSalFrame::SetTitle(const XubString& rTitle)
void AquaSalFrame::SetTitle(const rtl::OUString& rTitle)
{
if ( !mpWindow )
return;
......@@ -1057,7 +1057,7 @@ void AquaSalFrame::EndExtTextInput( sal_uInt16 )
// -----------------------------------------------------------------------
XubString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
static std::map< sal_uInt16, rtl::OUString > aKeyMap;
if( aKeyMap.empty() )
......@@ -1144,7 +1144,7 @@ XubString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
// -----------------------------------------------------------------------
XubString AquaSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode )
rtl::OUString AquaSalFrame::GetSymbolKeyName( const rtl::OUString&, sal_uInt16 nKeyCode )
{
return GetKeyName( nKeyCode );
}
......
vcl/aqua/source/window/salmenu.cxx
Dosyayı görüntüle @ 13bbf43b
......@@ -677,7 +677,7 @@ void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Imag
[pImage release];
}
void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const XubString& i_rText )
void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const rtl::OUString& i_rText )
{
if (!i_pSalMenuItem)
return;
......@@ -712,7 +712,7 @@ void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem,
}
}
void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& /*rKeyName*/ )
void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& /*rKeyName*/ )
{
sal_uInt16 nModifier;
sal_Unicode nCommandKey = 0;
......
vcl/inc/aqua/salframe.h
Dosyayı görüntüle @ 13bbf43b
......@@ -116,7 +116,7 @@ public:
virtual SalGraphics* GetGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual sal_Bool PostEvent( void* pData );
virtual void SetTitle( const XubString& rTitle );
virtual void SetTitle( const rtl::OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
virtual void SetRepresentedURL( const rtl::OUString& );
virtual void SetMenu( SalMenu* pSalMenu );
......@@ -143,8 +143,8 @@ public:
virtual void Sync();
virtual void SetInputContext( SalInputContext* pContext );
virtual void EndExtTextInput( sal_uInt16 nFlags );
virtual String GetKeyName( sal_uInt16 nKeyCode );
virtual String GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode );
virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
virtual rtl::OUString GetSymbolKeyName( const rtl::OUString& rFontName, sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual SalBitmap* SnapShot();
......
vcl/inc/aqua/salgdi.h
Dosyayı görüntüle @ 13bbf43b
......@@ -287,7 +287,7 @@ public:
// graphics should call ImplAddDevFontSubstitute on supplied
// OutputDevice for all its device specific preferred font substitutions
virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
// returns TRUE if creation of subset was successfull
......
vcl/inc/aqua/salinst.h
Dosyayı görüntüle @ 13bbf43b
......@@ -128,7 +128,7 @@ public:
virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList );
virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
virtual String GetDefaultPrinter();
virtual rtl::OUString GetDefaultPrinter();
virtual SalTimer* CreateSalTimer();
virtual SalI18NImeStatus* CreateI18NImeStatus();
virtual SalSystem* CreateSalSystem();
......
vcl/inc/aqua/salmenu.h
Dosyayı görüntüle @ 13bbf43b
......@@ -74,9 +74,9 @@ public:
virtual void SetFrame( const SalFrame* pFrame );
virtual void CheckItem( unsigned nPos, sal_Bool bCheck );
virtual void EnableItem( unsigned nPos, sal_Bool bEnable );
virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const XubString& rText );
virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText );
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName );
virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
virtual void GetSystemMenuData( SystemMenuData* pData );
virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags);
virtual bool AddMenuBarButton( const SalMenuButtonItem& );
......
vcl/inc/aqua/salprn.h
Dosyayı görüntüle @ 13bbf43b
......@@ -91,7 +91,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter
long& o_rPageWidth, long& o_rPageHeight );
virtual sal_uLong GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType );
virtual sal_uLong GetPaperBinCount( const ImplJobSetup* i_pSetupData );
virtual String GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
virtual rtl::OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData );
virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData );
......@@ -100,9 +100,9 @@ class AquaSalInfoPrinter : public SalInfoPrinter
// so let's make AquaSalPrinter just a forwarder to AquaSalInfoPrinter
// and concentrate the real work in one class
// implement pull model print system
sal_Bool StartJob( const String* i_pFileName,
const String& rJobName,
const String& i_rAppName,
sal_Bool StartJob( const rtl::OUString* i_pFileName,
const rtl::OUString& rJobName,
const rtl::OUString& i_rAppName,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rController );
sal_Bool EndJob();
......@@ -136,17 +136,17 @@ class AquaSalPrinter : public SalPrinter
AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter );
virtual ~AquaSalPrinter();
virtual sal_Bool StartJob( const XubString* i_pFileName,
const XubString& i_rJobName,
const XubString& i_rAppName,
virtual sal_Bool StartJob( const rtl::OUString* i_pFileName,
const rtl::OUString& i_rJobName,
const rtl::OUString& i_rAppName,
sal_uLong i_nCopies,
bool i_bCollate,
bool i_bDirect,
ImplJobSetup* i_pSetupData );
// implement pull model print system
virtual sal_Bool StartJob( const String* i_pFileName,
const String& rJobName,
const String& i_rAppName,
virtual sal_Bool StartJob( const rtl::OUString* i_pFileName,
const rtl::OUString& rJobName,
const rtl::OUString& i_rAppName,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rListener );
......
vcl/inc/aqua/salsys.h
Dosyayı görüntüle @ 13bbf43b
......@@ -51,8 +51,8 @@ public:
virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
virtual rtl::OUString GetScreenName( unsigned int nScreen );
virtual int ShowNativeMessageBox( const String& rTitle,
const String& rMessage,
virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
int nButtonCombination,
int nDefaultButton);
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment