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 /chart2/source/view/main/DummyXShape.cxx | |
| 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 'chart2/source/view/main/DummyXShape.cxx')
| -rw-r--r-- | chart2/source/view/main/DummyXShape.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 13a3731b281f..9c4ec1140a23 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -767,7 +767,7 @@ namespace { struct FontAttribSetter { - FontAttribSetter(Font& rFont): + FontAttribSetter(vcl::Font& rFont): mrFont(rFont) {} void operator()(const std::pair<OUString, uno::Any>& rProp) @@ -807,7 +807,7 @@ struct FontAttribSetter } } private: - Font& mrFont; + vcl::Font& mrFont; }; } @@ -836,7 +836,7 @@ DummyText::DummyText(const OUString& rText, const tNameSequence& rNames, } else { - Font aFont; + vcl::Font aFont; std::for_each(maProperties.begin(), maProperties.end(), FontAttribSetter(aFont)); VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0); aDevice.Erase(); |