[Libreoffice-commits] .: 4 commits - filter/inc sfx2/inc sfx2/source sw/source

[Michael Stahl]

 filter/inc/filter/msfilter/msdffimp.hxx        |    2 +-
 sfx2/inc/sfx2/thumbnailview.hxx                |    2 +-
 sfx2/source/control/templatefolderviewitem.cxx |    4 ++--
 sfx2/source/control/thumbnailviewacc.hxx       |    2 +-
 sw/source/ui/utlui/content.cxx                 |    4 +++-
 5 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 765c7ddf2d883c25ca7e59928ff4ee091a6abb3c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 20:50:29 2012 +0200

    warning C4305: truncation from 'double' to 'float'
    
    Change-Id: I27110c810b1d4d3dd3541625eff861be3e058ef6

diff --git a/sfx2/source/control/templatefolderviewitem.cxx b/sfx2/source/control/templatefolderviewitem.cxx
index 8e9e381..d996c98 100644
--- a/sfx2/source/control/templatefolderviewitem.cxx
+++ b/sfx2/source/control/templatefolderviewitem.cxx
@@ -68,8 +68,8 @@ void TemplateFolderViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *
 
     if (!maPreview2.IsEmpty())
     {
-        fScaleX = 0.8;
-        fScaleY = 0.8;
+        fScaleX = 0.8f;
+        fScaleY = 0.8f;
 
         aSeq[nCount++] = Primitive2DReference( new FillBitmapPrimitive2D(
                                             createScaleTranslateB2DHomMatrix(fScaleX,fScaleY,aPos.X(),aPos.Y()),
commit 28d2bb72939494cd65986e6d454a74a612e6ad50
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 20:46:11 2012 +0200

    warning C4099: type name first seen using 'struct' now seen using 'class'
    
    Change-Id: Ibbf92a0156cbb086901a59c6ed0fa950601570f5

diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 4a45370..da69b2b 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -28,7 +28,7 @@ class DataChangedEvent;
 class ScrollBar;
 typedef ::std::vector< ThumbnailViewItem* > ValueItemList;
 
-class ThumbnailItemAttributes;
+struct ThumbnailItemAttributes;
 class ThumbnailViewAcc;
 class ThumbnailViewItemAcc;
 
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index f74cadd..cb061c7 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -45,7 +45,7 @@
 #include <vector>
 
 class ThumbnailView;
-struct ThumbnailViewItem;
+class ThumbnailViewItem;
 
 typedef ::cppu::PartialWeakComponentImplHelper6<
     ::com::sun::star::accessibility::XAccessible,
commit 0866e0f41f359feef99ede2d27c883c3b27b65e9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 20:40:29 2012 +0200

    MSVC doesn't like dll-public MSDffImportRecords
    
    Change-Id: Ic1320988e7b47cfc2b0d589390341a56b1ff8aa7

diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 24137ad..22a8d72 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -329,7 +329,7 @@ private:
 };
 
 /** list of all SvxMSDffImportRec instances of/for a group */
-class MSFILTER_DLLPUBLIC MSDffImportRecords
+class MSDffImportRecords
     : public ::boost::ptr_set<SvxMSDffImportRec>
 {};
 
commit 1e7276f52e3e89f794711d65eaaf5221d6bd9547
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 20:38:33 2012 +0200

    SwContentArr: fix C++11ism
    
    Change-Id: Id4151d24fbb12688c7916dbcdac21ca4c6df0b42

diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index db0fcd2..e14e88f 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -106,7 +106,9 @@ using namespace ::com::sun::star::container;
 
 #define NAVI_BOOKMARK_DELIM     (sal_Unicode)1
 
-class SwContentArr : public o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent>> {
+class SwContentArr
+    : public o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent> >
+{
 public:
     ~SwContentArr() { DeleteAndDestroyAll(); }
 };