[Libreoffice-commits] core.git: sd/source

[Kohei Yoshida]

 sd/source/ui/accessibility/AccessibleViewForwarder.cxx      |    4 ++--
 sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx       |    2 +-
 sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx |    4 +++-
 sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx  |    2 +-
 sd/source/ui/slidesorter/inc/view/SlsTheme.hxx              |    2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 08a990fd27f5a416c2a73902792e93df7499d703
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Sep 23 16:11:48 2014 -0400

    Fix build breakages with gcc 4.7.  It doesn't like '<::'.
    
    "<::" -> "< ::"
    
    Change-Id: Ie83b0e6c09972b175ce72e37d20b5122a16e922b

diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 929c92d..ea1fb77 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -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
diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
index b054324..23459c7 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -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.
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 7391e458..56d3803 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -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 (
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 32b91b9..054dbbd 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -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;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 33b6bee..58666fb 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -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);