diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /sfx2/source/appl | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/appinit.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 80eaf8395a97..862c76ba3d0e 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -153,7 +153,7 @@ Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceName -typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const Font& i_rFont, OUString& o_rOutString ); +typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); // Lazy binding of the GetSpecialCharsForEdit function as it resides in @@ -166,11 +166,11 @@ extern "C" { static void SAL_CALL thisModule() {} } #else -extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const Font& i_rFont, OUString& o_rOutString ); +extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); #endif -OUString GetSpecialCharsForEdit(Window* pParent, const Font& rFont) +OUString GetSpecialCharsForEdit(Window* pParent, const vcl::Font& rFont) { static bool bDetermineFunction = false; static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = 0; |