diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 13:42:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 14:24:20 +0100 |
commit | 07f1a395098a7a3ac75eb5f05c35aa3982e33e67 (patch) | |
tree | de5521de6b2bc6c9a09ddfab61942a8e27214ebb /include/formula/formdata.hxx | |
parent | d9ac7def8ba320853e8865535a7a14f9af77521e (diff) |
(nearly) nothing uses GetUniqueId anymore, so remove it.
The odd one out is the usage in Formula, which attempts
to restore focus to a particular window identified by
an unique id. In this case restore focus by keeping a VclPtr
to the desired window.
Change-Id: I1dc335325c109d75745c6bba2e12662e6ae50638
Diffstat (limited to 'include/formula/formdata.hxx')
-rw-r--r-- | include/formula/formdata.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx index 5f4877e76d1c..2e16b806bf19 100644 --- a/include/formula/formdata.hxx +++ b/include/formula/formdata.hxx @@ -23,7 +23,7 @@ #include <formula/formuladllapi.h> #include <rtl/ustring.hxx> #include <tools/gen.hxx> - +#include <vcl/window.hxx> namespace formula { @@ -43,7 +43,7 @@ public: inline sal_uInt16 GetEdFocus() const { return nEdFocus; } inline const OUString& GetUndoStr() const { return aUndoStr; } inline bool GetMatrixFlag()const{ return bMatrix;} - const OString& GetUniqueId()const { return aUniqueId;} + const VclPtr<vcl::Window>& GetFocusWindow()const { return xFocusWin; } inline const Selection& GetSelection()const { return aSelection;} inline void SetMode( sal_uInt16 nNew ) { nMode = nNew; } @@ -52,7 +52,7 @@ public: inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; } inline void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; } inline void SetMatrixFlag(bool bNew) { bMatrix=bNew;} - inline void SetUniqueId(const OString& nNew) { aUniqueId=nNew;} + inline void SetFocusWindow(const VclPtr<vcl::Window>& rWin) { xFocusWin=rWin;} inline void SetSelection(const Selection& aSel) { aSelection=aSel;} protected: void Reset(); @@ -69,7 +69,7 @@ private: sal_uInt16 nEdFocus; OUString aUndoStr; bool bMatrix; - OString aUniqueId; + VclPtr<vcl::Window> xFocusWin; Selection aSelection; }; |