summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/generic/geninst.h2
-rw-r--r--vcl/inc/generic/genprn.h20
-rw-r--r--vcl/inc/generic/genpspgraphics.h10
-rw-r--r--vcl/inc/generic/gensys.h10
-rw-r--r--vcl/inc/headless/svpdummies.hxx4
-rw-r--r--vcl/inc/headless/svpframe.hxx6
-rw-r--r--vcl/inc/headless/svpgdi.hxx2
-rw-r--r--vcl/inc/headless/svpinst.hxx2
-rw-r--r--vcl/inc/jobset.h5
-rw-r--r--vcl/inc/salframe.hxx6
-rw-r--r--vcl/inc/salgdi.hxx11
-rw-r--r--vcl/inc/salinst.hxx12
-rw-r--r--vcl/inc/salmenu.hxx6
-rw-r--r--vcl/inc/salprn.hxx25
-rw-r--r--vcl/inc/salsys.hxx9
-rw-r--r--vcl/inc/unx/saldisp.hxx6
-rw-r--r--vcl/inc/unx/salframe.h8
-rw-r--r--vcl/inc/unx/salgdi.h2
-rw-r--r--vcl/inc/unx/salmenu.h4
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx6
-rw-r--r--vcl/inc/vcl/jobset.hxx12
-rw-r--r--vcl/inc/vcl/print.hxx46
22 files changed, 114 insertions, 100 deletions
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index b3fb0ce31a23..b4f834127b9e 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -103,7 +103,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 void PostPrintersChanged() = 0;
virtual void updatePrinterUpdate();
virtual void jobStartedPrinterUpdate();
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h
index 4b8661e4e30c..7d4197d6dc21 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/generic/genprn.h
@@ -58,7 +58,7 @@ public:
long& rPageWidth, long& rPageHeight );
virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType );
virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData );
- virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
+ virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
virtual void InitPaperFormats( const ImplJobSetup* pSetupData );
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData );
};
@@ -66,9 +66,9 @@ public:
class VCL_DLLPUBLIC PspSalPrinter : public SalPrinter
{
public:
- String m_aFileName;
- String m_aTmpFile;
- String m_aFaxNr;
+ rtl::OUString m_aFileName;
+ rtl::OUString m_aTmpFile;
+ rtl::OUString m_aFaxNr;
bool m_bFax:1;
bool m_bPdf:1;
bool m_bSwallowFaxNo:1;
@@ -85,16 +85,16 @@ public:
virtual ~PspSalPrinter();
// overload all pure virtual methods
- virtual sal_Bool StartJob( const XubString* pFileName,
- const XubString& rJobName,
- const XubString& rAppName,
+ virtual sal_Bool StartJob( const rtl::OUString* pFileName,
+ const rtl::OUString& rJobName,
+ const rtl::OUString& rAppName,
sal_uIntPtr nCopies,
bool bCollate,
bool bDirect,
ImplJobSetup* pSetupData );
- virtual sal_Bool StartJob( const String*,
- const String&,
- const String&,
+ virtual sal_Bool StartJob( const rtl::OUString*,
+ const rtl::OUString&,
+ const rtl::OUString&,
ImplJobSetup*,
vcl::PrinterController& i_rController );
virtual sal_Bool EndJob();
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index b20db0d6aa29..c09849679968 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -48,9 +48,9 @@ class VCL_DLLPUBLIC GenPspGraphics : public SalGraphics
protected:
psp::JobData* m_pJobData;
psp::PrinterGfx* m_pPrinterGfx;
- String* m_pPhoneNr;
+ rtl::OUString* m_pPhoneNr;
bool m_bSwallowFaxNo;
- String m_aPhoneCollection;
+ rtl::OUString m_aPhoneCollection;
bool m_bPhoneCollectionActive;
ServerFont* m_pServerFont[ MAX_FALLBACK ];
@@ -61,7 +61,7 @@ public:
virtual ~GenPspGraphics();
void Init( psp::JobData* pJob, psp::PrinterGfx* pGfx,
- String* pPhone, bool bSwallow,
+ rtl::OUString* pPhone, bool bSwallow,
SalInfoPrinter* pInfoPrinter );
// helper methods
@@ -104,7 +104,7 @@ public:
virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
virtual void GetDevFontList( ImplDevFontList* );
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 );
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
const ImplFontData*,
@@ -177,7 +177,7 @@ public:
virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
- virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
+ virtual bool filterText( const rtl::OUString& rOrigText, rtl::OUString& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h
index a5f52d6d0010..e485cc50f215 100644
--- a/vcl/inc/generic/gensys.h
+++ b/vcl/inc/generic/gensys.h
@@ -43,13 +43,13 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
public:
SalGenericSystem();
virtual ~SalGenericSystem();
- virtual int ShowNativeDialog( const String& rTitle,
- const String& rMessage,
- const std::list< String >& rButtons,
+ virtual int ShowNativeDialog( const rtl::OUString& rTitle,
+ const rtl::OUString& rMessage,
+ const std::list< rtl::OUString >& rButtons,
int nDefButton ) = 0;
- virtual int ShowNativeMessageBox( const String& rTitle,
- const String& rMessage,
+ virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
+ const rtl::OUString& rMessage,
int nButtonCombination,
int nDefaultButton);
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index bc46e9b22f70..54c7ef4cbf33 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -88,8 +88,8 @@ class SvpSalSystem : public SalSystem
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);
};
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index e57381780f61..5f88e64df3e1 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -76,7 +76,7 @@ public:
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 SetMenu( SalMenu* pMenu );
virtual void DrawMenuBar();
@@ -104,8 +104,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();
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 31ae2530ccc5..906a76eca59e 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -106,7 +106,7 @@ public:
virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
virtual void GetDevFontList( ImplDevFontList* );
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 );
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
const ImplFontData*,
sal_Int32* pGlyphIDs,
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 4977fa44f767..605f0ae53bed 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -145,7 +145,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 void PostPrintersChanged();
// SalTimer
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index b1cbdb9853f9..19f3c5ef2873 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -29,7 +29,6 @@
#ifndef _SV_JOBSET_H
#define _SV_JOBSET_H
-#include <tools/string.hxx>
#include <vcl/sv.h>
#include <vcl/prntypes.hxx>
#include <boost/unordered_map.hpp>
@@ -55,8 +54,8 @@ struct ImplJobSetup
{
sal_uInt16 mnRefCount; // RefCount (only independ data)
sal_uInt16 mnSystem; // Sytem - JOBSETUP_SYSTEM_xxxx
- String maPrinterName; // Printer-Name
- String maDriver; // Driver-Name
+ rtl::OUString maPrinterName; // Printer-Name
+ rtl::OUString maDriver; // Driver-Name
Orientation meOrientation; // Orientation
DuplexMode meDuplexMode; // Duplex
sal_uInt16 mnPaperBin; // paper bin / in tray
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 51c6bcf7e73e..3ebd4488ed13 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -163,7 +163,7 @@ public:
// When Event is called, SalInstance::Yield() must be returned
virtual sal_Bool PostEvent( void* pData ) = 0;
- virtual void SetTitle( const XubString& rTitle ) = 0;
+ virtual void SetTitle( const rtl::OUString& rTitle ) = 0;
virtual void SetIcon( sal_uInt16 nIcon ) = 0;
virtual void SetRepresentedURL( const rtl::OUString& );
virtual void SetMenu( SalMenu *pSalMenu ) = 0;
@@ -212,8 +212,8 @@ public:
virtual void SetInputContext( SalInputContext* pContext ) = 0;
virtual void EndExtTextInput( sal_uInt16 nFlags ) = 0;
- virtual String GetKeyName( sal_uInt16 nKeyCode ) = 0;
- virtual String GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode ) = 0;
+ virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ) = 0;
+ virtual rtl::OUString GetSymbolKeyName( const rtl::OUString& rFontName, sal_uInt16 nKeyCode ) = 0;
// returns in 'rKeyCode' the single keycode that translates to the given unicode when using a keyboard layout of language 'aLangType'
// returns sal_False if no mapping exists or function not supported
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 1394c1725e22..7736832c1735 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -29,8 +29,6 @@
#ifndef _SV_SALGDI_HXX
#define _SV_SALGDI_HXX
-#include "tools/string.hxx"
-#include "rtl/ustring.hxx"
#include "vcl/sv.h"
#include "vcl/dllapi.h"
#include "vcl/salgtype.hxx"
@@ -41,6 +39,11 @@
#include <map>
+namespace rtl
+{
+ class OUString;
+}
+
class ImplDevFontList;
class SalBitmap;
class FontSelectPattern;
@@ -242,7 +245,7 @@ public:
// graphics should call ImplAddDevFontSubstitute on supplied
// OutputDevice for all its device specific preferred font substitutions
virtual void GetDevFontSubstList( OutputDevice* ) = 0;
- virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ) = 0;
+ virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ) = 0;
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
// returns sal_True if creation of subset was successfull
@@ -335,7 +338,7 @@ public:
true: a substitution has taken place and rNewText rLen, rCutStart and rCutStop have been filled accordingly
false: no substitution has taken place, rNewText, rLen, rCutStart, rCutStop remain unchanged
*/
- virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
+ virtual bool filterText( const rtl::OUString& rOrigText, rtl::OUString& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
virtual bool supportsOperation( OutDevSupportType ) const = 0;
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 67affdbec700..a676eb07625e 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -38,13 +38,15 @@
#include "vcl/displayconnectiondispatch.hxx"
#include "vcl/dllapi.h"
-#include "tools/string.hxx"
-
#include "rtl/ref.hxx"
-#include "rtl/string.hxx"
#include <list>
+namespace rtl
+{
+ class OUString;
+}
+
struct SystemParentData;
struct SalPrinterQueueInfo;
struct SalStatus;
@@ -113,7 +115,7 @@ public:
virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) = 0;
virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) = 0;
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0;
- virtual String GetDefaultPrinter() = 0;
+ virtual rtl::OUString GetDefaultPrinter() = 0;
// SalTimer
virtual SalTimer* CreateSalTimer() = 0;
@@ -195,7 +197,7 @@ void DestroySalInstance( SalInstance* pInst );
// - SalInstance-Functions -
// -------------------------
-void SalAbort( const XubString& rErrorText, bool bDumpCore );
+void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore );
VCL_PLUGIN_PUBLIC const ::rtl::OUString& SalGetDesktopEnvironment();
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 63fb12ee4a84..1d14a7efadd1 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -45,7 +45,7 @@ struct SalItemParams
MenuItemType eType; // MenuItem-Type
MenuItemBits nBits; // MenuItem-Bits
Menu* pMenu; // Pointer to Menu
- XubString aText; // Menu-Text
+ rtl::OUString aText; // Menu-Text
Image aImage; // Image
};
@@ -83,9 +83,9 @@ public:
virtual void SetFrame( const SalFrame* pFrame ) = 0;
virtual void CheckItem( unsigned nPos, sal_Bool bCheck ) = 0;
virtual void EnableItem( unsigned nPos, sal_Bool bEnable ) = 0;
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const XubString& rText )= 0;
+ virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText )= 0;
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0;
- virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ) = 0;
+ virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ) = 0;
virtual void GetSystemMenuData( SystemMenuData* pData ) = 0;
virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags);
virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index e820614e4cdd..195bc80698f4 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -29,7 +29,8 @@
#ifndef _SV_SALPRN_HXX
#define _SV_SALPRN_HXX
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+
#include <vcl/sv.h>
#include <vcl/dllapi.h>
#include <vcl/prntypes.hxx>
@@ -47,10 +48,10 @@ namespace vcl { class PrinterController; }
struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
{
- XubString maPrinterName;
- XubString maDriver;
- XubString maLocation;
- XubString maComment;
+ rtl::OUString maPrinterName;
+ rtl::OUString maDriver;
+ rtl::OUString maLocation;
+ rtl::OUString maComment;
sal_uLong mnStatus;
sal_uLong mnJobs;
void* mpSysData;
@@ -94,7 +95,7 @@ public:
long& rPageWidth, long& rPageHeight ) = 0;
virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) = 0;
virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0;
- virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0;
+ virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0;
// fills m_aPaperFormats and sets m_bPapersInit to true
virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0;
// returns angle that a landscape page will be turned counterclockwise wrt to portrait
@@ -111,9 +112,9 @@ public: // public for Sal Implementation
SalPrinter() {}
virtual ~SalPrinter();
- virtual sal_Bool StartJob( const String* pFileName,
- const String& rJobName,
- const String& rAppName,
+ virtual sal_Bool StartJob( const rtl::OUString* pFileName,
+ const rtl::OUString& rJobName,
+ const rtl::OUString& rAppName,
sal_uLong nCopies,
bool bCollate,
bool bDirect,
@@ -121,9 +122,9 @@ public: // public for Sal Implementation
// implement for pull model print systems only,
// default implementations (see salvtables.cxx) just returns sal_False
- virtual sal_Bool StartJob( const String* pFileName,
- const String& rJobName,
- const String& rAppName,
+ virtual sal_Bool StartJob( const rtl::OUString* pFileName,
+ const rtl::OUString& rJobName,
+ const rtl::OUString& rAppName,
ImplJobSetup* pSetupData,
vcl::PrinterController& rController );
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 2f2f6d08e9e6..1a53ec978441 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -29,10 +29,13 @@
#ifndef _SV_SALSYS_HXX
#define _SV_SALSYS_HXX
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include <vcl/dllapi.h>
+namespace rtl
+{
+ class OUString;
+}
/* Button combinations for ShowNativeMessageBox
*/
@@ -136,8 +139,8 @@ public:
See button identifier above. If the function fails the
return value is 0.
*/
- virtual int ShowNativeMessageBox( const String& rTitle,
- const String& rMessage,
+ virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
+ const rtl::OUString& rMessage,
int nButtonCombination,
int nDefaultButton) = 0;
};
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index e65b8bd21be9..ded2d1c65ac8 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -363,8 +363,8 @@ public:
void ModifierMapping();
void SimulateKeyPress( sal_uInt16 nKeyCode );
sal_uInt16 GetIndicatorState() const;
- String GetKeyNameFromKeySym( KeySym keysym ) const;
- XubString GetKeyName( sal_uInt16 nKeyCode ) const;
+ rtl::OUString GetKeyNameFromKeySym( KeySym keysym ) const;
+ rtl::OUString GetKeyName( sal_uInt16 nKeyCode ) const;
sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const;
KeySym GetKeySym( XKeyEvent *pEvent,
unsigned char *pPrintable,
@@ -474,7 +474,7 @@ public:
*/
// get foreign key names
namespace vcl_sal {
- String getKeysymReplacementName(
+ rtl::OUString getKeysymReplacementName(
const char* pKeyboard,
KeySym nSymbol );
}
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 32d2459cb12b..6343d44f2417 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -128,7 +128,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
// icon id
int mnIconID;
- String m_aTitle;
+ rtl::OUString m_aTitle;
rtl::OUString m_sWMClass;
@@ -224,7 +224,7 @@ public:
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 SetMenu( SalMenu* pMenu );
virtual void DrawMenuBar();
@@ -252,8 +252,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();
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 59bb8b7688dc..9ef77738d89a 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -267,7 +267,7 @@ public:
virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
virtual void GetDevFontList( ImplDevFontList* );
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 );
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
const ImplFontData*,
sal_Int32* pGlyphIDs,
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
index e7b5effed653..f693a3393907 100644
--- a/vcl/inc/unx/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
@@ -49,9 +49,9 @@ public:
virtual void SetFrame( const SalFrame* pFrame );
virtual void CheckItem( unsigned nPos, BOOL bCheck );
virtual void EnableItem( unsigned nPos, 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 );
};
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 04598346c7e3..403625f20aa7 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -49,9 +49,9 @@ public:
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
virtual rtl::OUString GetScreenName( unsigned int nScreen );
- virtual int ShowNativeDialog( const String& rTitle,
- const String& rMessage,
- const std::list< String >& rButtons,
+ virtual int ShowNativeDialog( const rtl::OUString& rTitle,
+ const rtl::OUString& rMessage,
+ const std::list< rtl::OUString >& rButtons,
int nDefButton );
};
diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx
index 3ec52df2644e..7df5853bb736 100644
--- a/vcl/inc/vcl/jobset.hxx
+++ b/vcl/inc/vcl/jobset.hxx
@@ -29,11 +29,15 @@
#ifndef _SV_JOBSET_HXX
#define _SV_JOBSET_HXX
-#include <tools/string.hxx>
#include <vcl/sv.h>
#include <vcl/dllapi.h>
#include <vcl/prntypes.hxx>
+namespace rtl
+{
+ class OUString;
+}
+
class SvStream;
struct ImplJobSetup;
@@ -58,15 +62,15 @@ public:
JobSetup( const JobSetup& rJob );
~JobSetup();
- String GetPrinterName() const;
- String GetDriverName() const;
+ rtl::OUString GetPrinterName() const;
+ rtl::OUString GetDriverName() const;
/* Get/SetValue are used to read/store additional
* Parameters in the job setup that may be used
* by the printer driver. One possible use are phone
* numbers for faxes (which disguise as printers)
*/
- void SetValue( const String& rKey, const String& rValue );
+ void SetValue( const rtl::OUString& rKey, const rtl::OUString& rValue );
JobSetup& operator=( const JobSetup& rJob );
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index d154b045d52f..54bcc42ec359 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -29,6 +29,8 @@
#ifndef _SV_PRINT_HXX
#define _SV_PRINT_HXX
+#include <rtl/ustring.hxx>
+
#include "tools/errcode.hxx"
#include "vcl/sv.h"
#include "vcl/dllapi.h"
@@ -106,10 +108,10 @@ class VCL_DLLPUBLIC QueueInfo
friend class Printer;
private:
- XubString maPrinterName;
- XubString maDriver;
- XubString maLocation;
- XubString maComment;
+ rtl::OUString maPrinterName;
+ rtl::OUString maDriver;
+ rtl::OUString maLocation;
+ rtl::OUString maComment;
sal_uInt32 mnStatus;
sal_uInt32 mnJobs;
@@ -118,10 +120,10 @@ public:
QueueInfo( const QueueInfo& rInfo );
~QueueInfo();
- const XubString& GetPrinterName() const { return maPrinterName; }
- const XubString& GetDriver() const { return maDriver; }
- const XubString& GetLocation() const { return maLocation; }
- const XubString& GetComment() const { return maComment; }
+ const rtl::OUString& GetPrinterName() const { return maPrinterName; }
+ const rtl::OUString& GetDriver() const { return maDriver; }
+ const rtl::OUString& GetLocation() const { return maLocation; }
+ const rtl::OUString& GetComment() const { return maComment; }
sal_uInt32 GetStatus() const { return mnStatus; }
sal_uInt32 GetJobs() const { return mnJobs; }
@@ -233,10 +235,10 @@ private:
Printer* mpNext;
VirtualDevice* mpDisplayDev;
PrinterOptions* mpPrinterOptions;
- XubString maPrinterName;
- XubString maDriver;
- XubString maPrintFile;
- XubString maJobName;
+ rtl::OUString maPrinterName;
+ rtl::OUString maDriver;
+ rtl::OUString maPrintFile;
+ rtl::OUString maJobName;
JobSetup maJobSetup;
Point maPageOffset;
Size maPaperSize;
@@ -260,8 +262,8 @@ private:
SAL_DLLPRIVATE void ImplInitData();
SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow );
- SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const XubString& rPrinterName,
- const XubString* pDriver );
+ SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const rtl::OUString& rPrinterName,
+ const rtl::OUString* pDriver );
SAL_DLLPRIVATE void ImplUpdatePageData();
SAL_DLLPRIVATE void ImplUpdateFontList();
SAL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest );
@@ -289,17 +291,17 @@ public:
Printer();
Printer( const JobSetup& rJobSetup );
Printer( const QueueInfo& rQueueInfo );
- Printer( const XubString& rPrinterName );
+ Printer( const rtl::OUString& rPrinterName );
virtual ~Printer();
static const std::vector< rtl::OUString >& GetPrinterQueues();
- static const QueueInfo* GetQueueInfo( const String& rPrinterName, bool bStatusUpdate );
- static XubString GetDefaultPrinterName();
+ static const QueueInfo* GetQueueInfo( const rtl::OUString& rPrinterName, bool bStatusUpdate );
+ static rtl::OUString GetDefaultPrinterName();
virtual void Error();
- const XubString& GetName() const { return maPrinterName; }
- const XubString& GetDriverName() const { return maDriver; }
+ const rtl::OUString& GetName() const { return maPrinterName; }
+ const rtl::OUString& GetDriverName() const { return maDriver; }
sal_Bool IsDefPrinter() const { return mbDefPrinter; }
sal_Bool IsDisplayPrinter() const { return mpDisplayDev != NULL; }
sal_Bool IsValid() const { return !IsDisplayPrinter(); }
@@ -309,7 +311,7 @@ public:
sal_Bool SetJobSetup( const JobSetup& rSetup );
const JobSetup& GetJobSetup() const { return maJobSetup; }
- void SetJobValue( const String& rKey, const String& rValue ) { maJobSetup.SetValue( rKey, rValue ); }
+ void SetJobValue( const rtl::OUString& rKey, const rtl::OUString& rValue ) { maJobSetup.SetValue( rKey, rValue ); }
sal_Bool Setup( Window* pWindow = NULL );
sal_Bool SetPrinterProps( const Printer* pPrinter );
@@ -344,7 +346,7 @@ public:
// returns info about paper format nPaper
const PaperInfo& GetPaperInfo( int nPaper ) const;
sal_uInt16 GetPaperBinCount() const;
- XubString GetPaperBinName( sal_uInt16 nPaperBin ) const;
+ rtl::OUString GetPaperBinName( sal_uInt16 nPaperBin ) const;
const Size& GetPaperSizePixel() const { return maPaperSize; }
Size GetPaperSize() const { return PixelToLogic( maPaperSize ); }
@@ -357,7 +359,7 @@ public:
sal_Bool IsPrinting() const { return mbPrinting; }
- const XubString& GetCurJobName() const { return maJobName; }
+ const rtl::OUString& GetCurJobName() const { return maJobName; }
sal_uInt16 GetCurPage() const { return mnCurPage; }
sal_Bool IsJobActive() const { return mbJobActive; }
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-06 01:49:00 +0000