diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-16 11:18:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-18 09:59:25 +0200 |
| commit | 8051bb7e18ccae0f639e65dfa86bcc18a5fb9108 (patch) | |
| tree | bc2d6c98c3161c4530a6e97bf0b3aa65b6284185 /sw/inc | |
| parent | b4d116ef8f0b405fd9b12967766b138c21605489 (diff) | |
converting remaining usage of String in SW to OUString
Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/paratr.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/swtypes.hxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 69384cc875ff..b6b5543d21eb 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -135,7 +135,7 @@ public: TYPEINFO(); SwNumRuleItem() - : SfxStringItem( RES_PARATR_NUMRULE, aEmptyStr ) {} + : SfxStringItem( RES_PARATR_NUMRULE, aEmptyOUStr ) {} SwNumRuleItem( const OUString& rRuleName ) : SfxStringItem( RES_PARATR_NUMRULE, rRuleName ) {} diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 786769a5947e..1426b0260768 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -45,7 +45,6 @@ namespace utl{ class Size; class ResMgr; -class String; class SwPathFinder; class Graphic; class OutputDevice; @@ -81,8 +80,7 @@ const SwTwips lMinBorder = 1134; #define GAPBETWEENPAGES 284L // Constant strings. -SW_DLLPUBLIC extern String aEmptyStr; // "" -SW_DLLPUBLIC extern OUString aEmptyOUStr; // remove once aEmptyStr can be changed to OUString +SW_DLLPUBLIC extern OUString aEmptyOUStr; // remove once aEmptyOUStr can be changed to OUString SW_DLLPUBLIC extern OUString aDotStr; // '.' // For inserting of captions (what and where to insert). |