Kaydet (Commit) 08a990fd authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Fix build breakages with gcc 4.7. It doesn't like '<::'.

"<::" -> "< ::"

Change-Id: Ie83b0e6c09972b175ce72e37d20b5122a16e922b
üst d6aaff5d
......@@ -84,7 +84,7 @@ Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId);
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
Rectangle aBBox(static_cast<::vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L));
Rectangle aBBox(static_cast<vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L));
return rOutDev.LogicToPixel (rPoint) + aBBox.TopLeft();
}
else
......@@ -114,7 +114,7 @@ Point AccessibleViewForwarder::PixelToLogic (const Point& rPoint) const
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId);
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
Rectangle aBBox (static_cast<::vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L));
Rectangle aBBox (static_cast<vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L));
return rOutDev.PixelToLogic (rPoint - aBBox.TopLeft());
}
else
......
......@@ -36,7 +36,7 @@ class FontProvider
: public SdGlobalResource
{
public:
typedef ::boost::shared_ptr<::vcl::Font> SharedFontPointer;
typedef boost::shared_ptr< ::vcl::Font> SharedFontPointer;
/** Return the single instance of this class. Throws a RuntimeException
when no instance can be created.
......
......@@ -25,6 +25,8 @@
#include "tools/gen.hxx"
#include <vcl/image.hxx>
namespace vcl { class Font; }
namespace sd { namespace slidesorter { namespace view {
/** In contrast to the Layouter that places page objects in the view, the
......@@ -133,7 +135,7 @@ private:
Rectangle maCustomAnimationEffectBoundingBox;
const Image maTransitionEffectIcon;
const Image maCustomAnimationEffectIcon;
const ::boost::shared_ptr<::vcl::Font> mpPageNumberFont;
const boost::shared_ptr< ::vcl::Font> mpPageNumberFont;
Size GetPageNumberAreaSize (const int nPageCount);
Rectangle CalculatePreviewBoundingBox (
......
......@@ -73,7 +73,7 @@ private:
::boost::shared_ptr<cache::PageCache> mpCache;
::boost::shared_ptr<controller::Properties> mpProperties;
::boost::shared_ptr<view::Theme> mpTheme;
::boost::shared_ptr<::vcl::Font> mpPageNumberFont;
::boost::shared_ptr< ::vcl::Font> mpPageNumberFont;
::boost::scoped_ptr<FramePainter> mpShadowPainter;
::boost::scoped_ptr<FramePainter> mpFocusBorderPainter;
Bitmap maNormalBackground;
......
......@@ -58,7 +58,7 @@ public:
Font_PageNumber,
Font_PageCount
};
static ::boost::shared_ptr<::vcl::Font> GetFont (
static boost::shared_ptr< ::vcl::Font> GetFont (
const FontType eType,
const OutputDevice& rDevice);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment