diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-04-28 23:09:13 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:27:52 +0300 |
| commit | d883c12556a71c5d3719454b1f95809a505f0ace (patch) | |
| tree | 6f0c1cc518a3727db95b72d609ec9db793041b20 /include/vcl/outdev.hxx | |
| parent | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (diff) | |
Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even
in many files in include. So let's be consistent. In the majority of
cases, prefer the easier-on-the-eyes choice, not the "safe" one.
In those files in include where *all* existing uses of ::vcl:: indeed
used the :: prefix, there let's keep it for consistency.
Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
Diffstat (limited to 'include/vcl/outdev.hxx')
| -rw-r--r-- | include/vcl/outdev.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 16f44b8085f5..4259258ad133 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -940,11 +940,11 @@ public: void DrawText( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle = 0, MetricVector* pVector = NULL, OUString* pDisplayText = NULL, - ::vcl::ITextLayout* _pTextLayout = NULL ); + vcl::ITextLayout* _pTextLayout = NULL ); static void ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect, const OUString& rOrigStr, sal_uInt16 nStyle, - MetricVector* pVector, OUString* pDisplayText, ::vcl::ITextLayout& _rLayout ); + MetricVector* pVector, OUString* pDisplayText, vcl::ITextLayout& _rLayout ); void ImplDrawText( SalLayout& ); @@ -974,7 +974,7 @@ public: Rectangle GetTextRect( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK, TextRectInfo* pInfo = NULL, - const ::vcl::ITextLayout* _pTextLayout = NULL ) const; + const vcl::ITextLayout* _pTextLayout = NULL ) const; /** Return the exact bounding rectangle of rStr. @@ -1157,7 +1157,7 @@ private: SAL_DLLPRIVATE static bool ImplIsUnderlineAbove( const vcl::Font& ); static - SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); + SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ); ///@} @@ -1258,7 +1258,7 @@ private: static SAL_DLLPRIVATE OUString ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rStr, - long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); + long nMaxWidth, sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ); SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); SAL_DLLPRIVATE void ImplDrawEmphasisMarks( SalLayout& ); |