diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-04-06 14:15:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-04-06 14:15:57 +0100 |
| commit | 043c8b2297c53da05a06ab6dd345be3756240b87 (patch) | |
| tree | 773176e534c77aa3f6c4d11bcda5c9f02025b669 /sfx2/inc | |
| parent | dd1b82491ea1d7a47e44b7ed38a976f659622886 (diff) | |
fix build error from bad merge
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/sfx2/linkmgr.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx index 50662c5dc33a..39fcd6bd3918 100644 --- a/sfx2/inc/sfx2/linkmgr.hxx +++ b/sfx2/inc/sfx2/linkmgr.hxx @@ -170,7 +170,7 @@ public: // got the appropriate information as a string. // Is now required for FileObject in conjunction with JavaScript // this needs information about Load/Abort/Error - static ULONG RegisterStatusInfoId(); + static sal_uIntPtr RegisterStatusInfoId(); // if the mimetype says graphic/bitmap/gdimetafile then get the // graphic from the Any. Return says no errors |