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

[Stephan Bergmann]

 lotuswordpro/source/filter/xfilter/xfparastyle.hxx    |    2 +-
 lotuswordpro/source/filter/xfilter/xfstylemanager.cxx |   17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 42e9c74001b4799d8b874a000af2b11ebad2d8cc
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Fri Dec 5 17:02:38 2014 +0100

    loplugin:cstylecast, involving pointer to incomplete type
    
    Change-Id: I4a53ebf42add80bbac2d6698ac5d2950c0a6a067

diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx 
b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index 9f3c4af..58ce28c 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -66,6 +66,7 @@
 
 #include <rtl/ref.hxx>
 
+#include "xffont.hxx"
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
 #include "xfcolor.hxx"
@@ -81,7 +82,6 @@
 #define     XFPARA_FLAG_DROPCAP     0X00000002
 #define     XFPARA_FLAG_BACKCOLOR   0X00000004
 
-class XFFont;
 class XFBorders;
 class XFBGImage;
 
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx 
b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
index 5503805..c5857988 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -57,7 +57,12 @@
  * @file
  * Style manager for the filter.
  ************************************************************************/
+
+#include <sal/config.h>
+
+#include <xfparastyle.hxx>
 #include "xfstylemanager.hxx"
+#include <xftextstyle.hxx>
 #include "ixfstyle.hxx"
 
 XFStyleManager::XFStyleManager() : s_aStdArrowStyles( "arrow" ), 
s_aTextStyles( "T" ),
@@ -226,10 +231,10 @@ IXFStyleRet XFStyleManager::AddStyle(IXFStyle *pStyle)
 
 IXFStyle*   XFStyleManager::FindStyle(const OUString& name)
 {
-    IXFStyle *pStyle = (IXFStyle*)FindParaStyle(name);
+    IXFStyle *pStyle = FindParaStyle(name);
     if( pStyle )
         return pStyle;
-    pStyle = (IXFStyle*)FindTextStyle(name);
+    pStyle = FindTextStyle(name);
     if( pStyle )
         return pStyle;
     pStyle = s_aListStyles.FindStyle(name);
@@ -281,18 +286,18 @@ XFParaStyle*    XFStyleManager::FindParaStyle(const 
OUString& name)
 {
     IXFStyle *pStyle = s_aParaStyles.FindStyle(name);
     if( pStyle )
-        return (XFParaStyle*)pStyle;
+        return static_cast<XFParaStyle*>(pStyle);
     else
-        return (XFParaStyle*)s_aStdParaStyles.FindStyle(name);
+        return static_cast<XFParaStyle*>(s_aStdParaStyles.FindStyle(name));
 }
 
 XFTextStyle*    XFStyleManager::FindTextStyle(const OUString& name)
 {
     IXFStyle *pStyle = s_aTextStyles.FindStyle(name);
     if( pStyle )
-        return (XFTextStyle*)pStyle;
+        return static_cast<XFTextStyle*>(pStyle);
     else
-        return (XFTextStyle*)s_aStdTextStyles.FindStyle(name);
+        return static_cast<XFTextStyle*>(s_aStdTextStyles.FindStyle(name));
 }
 
 void    XFStyleManager::SetLineNumberConfig(XFLineNumberConfig *pLNConf)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits