diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-27 16:44:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:11 +0200 |
| commit | 25994daa3a186a504c4f1b88bc251a89b96f0d47 (patch) | |
| tree | 94777dcf63f5e88485112a3b6271a20343fd74d2 /include | |
| parent | fc8f0f12805522504642a68af76b495d588883e4 (diff) | |
convert include/sfx2/childwin.hxx from String to OUString
Change-Id: Ide6e1751879c9702299df37c8f14ebed22d31a34
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/basedlgs.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/childwin.hxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 11854d21c31b..c4c939bda5d5 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -55,7 +55,7 @@ SFX2_DLLPUBLIC inline void reverseUniqueHelpIdHack(Window &rWindow) class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog { sal_uInt32 nUniqId; - String aExtraData; + OUString aExtraData; const SfxItemSet* pInputSet; SfxItemSet* pOutputSet; @@ -72,7 +72,7 @@ protected: SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); SfxModalDialog(Window* pParent, sal_uInt32 nUniqueId, WinBits nWinStyle = WB_STDMODAL ); - String& GetExtraData() { return aExtraData; } + OUString& GetExtraData() { return aExtraData; } sal_uInt32 GetUniqId() const { return nUniqId; } void SetUniqId(sal_uInt32 nSettingsId) { nUniqId = nSettingsId; } SfxItemSet* GetItemSet() { return pOutputSet; } diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index d0c5e50fce1f..236f4bd52582 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -50,12 +50,12 @@ class SfxChildWindowContext; // ChildWindow Configuration struct SfxChildWinInfo { - sal_Bool bVisible; + sal_Bool bVisible; Point aPos; Size aSize; - sal_uInt16 nFlags; - String aExtraString; - OString aWinState; + sal_uInt16 nFlags; + OUString aExtraString; + OString aWinState; SfxChildWinInfo() { |