diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-08 15:36:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:02 +0200 |
| commit | 36191386f0903f2e8d7b01baf12525d32972b4c0 (patch) | |
| tree | 78d1fb2d4d6bd8ab652aa32ea5415c48826e54df /sw/source/ui/inc | |
| parent | convert sw/source/ui/inc/o*.hxx from String to OUString (diff) | |
| download | core-36191386f0903f2e8d7b01baf12525d32972b4c0.tar.gz core-36191386f0903f2e8d7b01baf12525d32972b4c0.zip | |
convert sw/source/ui/inc/n*.hxx from String to OUString
Change-Id: Ic5d034cdc013910f932d1126204c362a269018b0
Diffstat (limited to 'sw/source/ui/inc')
| -rw-r--r-- | sw/source/ui/inc/navicont.hxx | 12 | ||||
| -rw-r--r-- | sw/source/ui/inc/navipi.hxx | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx index dd8865f8c117..1cfc81a36459 100644 --- a/sw/source/ui/inc/navicont.hxx +++ b/sw/source/ui/inc/navicont.hxx @@ -32,19 +32,19 @@ class TransferableDataHelper; class NaviContentBookmark { - String aUrl; // URL including jump mark - String aDescr; // description + OUString aUrl; // URL including jump mark + OUString aDescr; // description long nDocSh; // address of DocShell sal_uInt16 nDefDrag; // description contains defaultDragType public: NaviContentBookmark(); - NaviContentBookmark( const String &rUrl, const String& rDesc, + NaviContentBookmark( const OUString &rUrl, const OUString& rDesc, sal_uInt16 nDragType, const SwDocShell* ); - const String& GetURL() const { return aUrl; } - const String& GetDescription() const { return aDescr; } - sal_uInt16 GetDefaultDragType() const { return nDefDrag; } + const OUString& GetURL() const { return aUrl; } + const OUString& GetDescription() const { return aDescr; } + sal_uInt16 GetDefaultDragType() const { return nDefDrag; } void Copy( TransferDataContainer& rData ) const; sal_Bool Paste( TransferableDataHelper& rData ); }; diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index 0fb4bd0f3e23..b9a73aa47eb1 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -65,9 +65,9 @@ class SwNavigationPI : public Window, SwGlobalTree aGlobalTree; ListBox aDocListBox; Timer aPageChgTimer; - String sContentFileName; - String aContextArr[3]; - String aStatusArr[4]; + OUString sContentFileName; + OUString aContextArr[3]; + OUString aStatusArr[4]; Point aBoxBottomLeft; // Pos when Box is at bottom SfxObjectShellLock *pxObjectShell; @@ -155,7 +155,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - static String CreateDropFileName( TransferableDataHelper& rData ); + static OUString CreateDropFileName( TransferableDataHelper& rData ); static OUString CleanEntry(const OUString& rEntry); sal_uInt16 GetRegionDropMode() const {return nRegionMode;} |