mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:cstylecast, involving pointer to incomplete type

Browse Source 
Change-Id: I4a53ebf42add80bbac2d6698ac5d2950c0a6a067
This commit is contained in:
Stephan Bergmann
2014-12-05 17:02:38 +01:00
parent 170dbaf19f
commit 42e9c74001
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lotuswordpro/source/filter/xfilter/xfparastyle.hxx
View File

@@ -66,6 +66,7 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include "xffont.hxx"
#include "xfglobal.hxx" #include "xfglobal.hxx"
#include "xfstyle.hxx" #include "xfstyle.hxx"
#include "xfcolor.hxx" #include "xfcolor.hxx"
@@ -81,7 +82,6 @@
#define XFPARA_FLAG_DROPCAP 0X00000002 #define XFPARA_FLAG_DROPCAP 0X00000002
#define XFPARA_FLAG_BACKCOLOR 0X00000004 #define XFPARA_FLAG_BACKCOLOR 0X00000004
class XFFont;
class XFBorders; class XFBorders;
class XFBGImage; class XFBGImage;

17
lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
View File

@@ -57,7 +57,12 @@
* @file * @file
* Style manager for the filter. * Style manager for the filter.
************************************************************************/ ************************************************************************/
#include <sal/config.h>
#include <xfparastyle.hxx>
#include "xfstylemanager.hxx" #include "xfstylemanager.hxx"
#include <xftextstyle.hxx>
#include "ixfstyle.hxx" #include "ixfstyle.hxx"
XFStyleManager::XFStyleManager() : s_aStdArrowStyles( "arrow" ), s_aTextStyles( "T" ), XFStyleManager::XFStyleManager() : s_aStdArrowStyles( "arrow" ), s_aTextStyles( "T" ),
@@ -226,10 +231,10 @@ IXFStyleRet XFStyleManager::AddStyle(IXFStyle *pStyle)
IXFStyle* XFStyleManager::FindStyle(const OUString& name) IXFStyle* XFStyleManager::FindStyle(const OUString& name)
{ {
IXFStyle *pStyle = (IXFStyle*)FindParaStyle(name); IXFStyle *pStyle = FindParaStyle(name);
if( pStyle ) if( pStyle )
return pStyle; return pStyle;
pStyle = (IXFStyle*)FindTextStyle(name); pStyle = FindTextStyle(name);
if( pStyle ) if( pStyle )
return pStyle; return pStyle;
pStyle = s_aListStyles.FindStyle(name); pStyle = s_aListStyles.FindStyle(name);
@@ -281,18 +286,18 @@ XFParaStyle* XFStyleManager::FindParaStyle(const OUString& name)
{ {
IXFStyle *pStyle = s_aParaStyles.FindStyle(name); IXFStyle *pStyle = s_aParaStyles.FindStyle(name);
if( pStyle ) if( pStyle )
return (XFParaStyle*)pStyle; return static_cast<XFParaStyle*>(pStyle);
else else
return (XFParaStyle*)s_aStdParaStyles.FindStyle(name); return static_cast<XFParaStyle*>(s_aStdParaStyles.FindStyle(name));
} }
XFTextStyle* XFStyleManager::FindTextStyle(const OUString& name) XFTextStyle* XFStyleManager::FindTextStyle(const OUString& name)
{ {
IXFStyle *pStyle = s_aTextStyles.FindStyle(name); IXFStyle *pStyle = s_aTextStyles.FindStyle(name);
if( pStyle ) if( pStyle )
return (XFTextStyle*)pStyle; return static_cast<XFTextStyle*>(pStyle);
else else
return (XFTextStyle*)s_aStdTextStyles.FindStyle(name); return static_cast<XFTextStyle*>(s_aStdTextStyles.FindStyle(name));
} }
void XFStyleManager::SetLineNumberConfig(XFLineNumberConfig *pLNConf) void XFStyleManager::SetLineNumberConfig(XFLineNumberConfig *pLNConf)