diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-07-22 15:56:02 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-07-22 22:08:26 -0400 |
| commit | dbf2ca3d9c034866546f40c13c5b2c7020e35725 (patch) | |
| tree | bcd98f44e639ef53093c76dcead8e61f1a6f924d /sfx2/inc | |
| parent | b49b655394facab29aa41281730bc013ee5de144 (diff) | |
Adjusted for GetOptions() return type change.
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/sfx2/frmhtml.hxx | 2 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/sfxhtml.hxx | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx index c6d007bea86d..b365ab9efebd 100644 --- a/sfx2/inc/sfx2/frmhtml.hxx +++ b/sfx2/inc/sfx2/frmhtml.hxx @@ -52,7 +52,7 @@ protected: public: // These methods can also be used by other parsers. - static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions*, const String& ); + static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const String& ); }; diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index 9a03eb3afacb..88e3cecf026e 100644 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -65,12 +65,11 @@ public: // Read the options of an image map // <MAP>: sal_True = Image-Map has a name // <AREA>: sal_True = Image-Map has now one Region more - static sal_Bool ParseMapOptions(ImageMap * pImageMap, - const HTMLOptions * pOptions ); - sal_Bool ParseMapOptions(ImageMap * pImageMap) + static bool ParseMapOptions(ImageMap* pImageMap, const HTMLOptions& rOptions); + bool ParseMapOptions(ImageMap * pImageMap) { return ParseMapOptions(pImageMap, GetOptions()); } - static sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, - const HTMLOptions * pOptions, + static bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, + const HTMLOptions& rOptions, sal_uInt16 nEventMouseOver = 0, sal_uInt16 nEventMouseOut = 0 ); inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, |