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

loplugin: unused return values

Browse Source 
Change-Id: I4eb1f0c9245c04058fd5e47046f043f8840a79c7
Reviewed-on: https://gerrit.libreoffice.org/21628
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2016-01-20 16:36:19 +02:00 committed by Noel Grandin
parent ea6fdbaeeb
commit 90d892664a
75 changed files with 128 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
basegfx/source/polygon/b2dpolypolygontools.cxx
View File

@ -170,35 +170,6 @@ namespace basegfx
} }
} }
B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount)
{
if(rCandidate.areControlPointsUsed())
{
const sal_uInt32 nPolygonCount(rCandidate.count());
B2DPolyPolygon aRetval;
for(sal_uInt32 a(0L); a < nPolygonCount; a++)
{
const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
if(aCandidate.areControlPointsUsed())
{
aRetval.append(tools::adaptiveSubdivideByCount(aCandidate, nCount));
}
else
{
aRetval.append(aCandidate);
}
}
return aRetval;
}
else
{
return rCandidate;
}
}
bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder) bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder)
{ {
const sal_uInt32 nPolygonCount(rCandidate.count()); const sal_uInt32 nPolygonCount(rCandidate.count());

8
basegfx/source/tools/canvastools.cxx
View File

@ -471,14 +471,6 @@ namespace basegfx
rRect.Y + rRect.Height ); rRect.Y + rRect.Height );
} }
::basegfx::B2IBox b2ISurroundingBoxFromB2DRange( const ::basegfx::B2DRange& rRange )
{
return ::basegfx::B2IBox( static_cast<sal_Int32>( floor(rRange.getMinX()) ),
static_cast<sal_Int32>( floor(rRange.getMinY()) ),
static_cast<sal_Int32>( ceil(rRange.getMaxX()) ),
static_cast<sal_Int32>( ceil(rRange.getMaxY()) ) );
}
::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange ) ::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange )
{ {
return ::basegfx::B2IRange( static_cast<sal_Int32>( floor(rRange.getMinX()) ), return ::basegfx::B2IRange( static_cast<sal_Int32>( floor(rRange.getMinX()) ),

2
canvas/source/vcl/canvasbitmaphelper.hxx
View File

@ -82,7 +82,7 @@ namespace vclcanvas
css::geometry::IntegerSize2D getSize(); css::geometry::IntegerSize2D getSize();
css::uno::Reference< css::rendering::XBitmapCanvas > queryBitmapCanvas(); void queryBitmapCanvas();
css::uno::Reference< css::rendering::XBitmap > css::uno::Reference< css::rendering::XBitmap >
getScaledBitmap( const css::geometry::RealSize2D& newSize, getScaledBitmap( const css::geometry::RealSize2D& newSize,

2
canvas/source/vcl/canvashelper.hxx
View File

@ -233,7 +233,7 @@ namespace vclcanvas
css::geometry::IntegerSize2D getSize(); css::geometry::IntegerSize2D getSize();
css::uno::Reference< css::rendering::XBitmapCanvas > queryBitmapCanvas(); void queryBitmapCanvas();
css::uno::Reference< css::rendering::XBitmap > css::uno::Reference< css::rendering::XBitmap >
getScaledBitmap( const css::geometry::RealSize2D& newSize, getScaledBitmap( const css::geometry::RealSize2D& newSize,

11
compilerplugins/clang/unusedmethods.py
View File

@ -241,10 +241,10 @@ def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
tmp1list = sorted(tmp1set, key=lambda v: natural_sort_key(v[1])) tmp1list = sorted(tmp1set, key=lambda v: natural_sort_key(v[1]))
# print out the results # print out the results
for t in tmp1list: #for t in tmp1list:
print t[1] # print t[1]
print " ", t[0] # print " ", t[0]
sys.exit(0) #sys.exit(0)
# ------------------------------------------- # -------------------------------------------
# Do the "unused return types" part # Do the "unused return types" part
@ -261,6 +261,9 @@ for d in definitionSet:
continue continue
if d[0] == "void": if d[0] == "void":
continue continue
# ignore bool returns, provides important documentation in the code
if d[0] == "_Bool":
continue
# ignore UNO constructor method entrypoints # ignore UNO constructor method entrypoints
if "_get_implementation" in d[1] or "_getFactory" in d[1]: if "_get_implementation" in d[1] or "_getFactory" in d[1]:
continue continue

56
connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
View File

@ -48,45 +48,6 @@ jclass java_sql_DriverPropertyInfo::getMyClass() const
} }
OUString java_sql_DriverPropertyInfo::name()
{
OUString aStr;
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
jfieldID id = t.pEnv->GetFieldID(getMyClass(),"name","Ljava/lang/String;");
if(id)
aStr = JavaString2String(t.pEnv, static_cast<jstring>(t.pEnv->GetObjectField( object, id)));
} //t.pEnv
return aStr;
}
OUString java_sql_DriverPropertyInfo::description()
{
OUString aStr;
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
jfieldID id = t.pEnv->GetFieldID(getMyClass(),"description","Ljava/lang/String;");
if(id)
aStr = JavaString2String(t.pEnv, static_cast<jstring>(t.pEnv->GetObjectField( object, id)));
} //t.pEnv
return aStr;
}
OUString java_sql_DriverPropertyInfo::value()
{
OUString aStr;
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
jfieldID id = t.pEnv->GetFieldID(getMyClass(),"value","Ljava/lang/String;");
if(id)
aStr = JavaString2String(t.pEnv, static_cast<jstring>(t.pEnv->GetObjectField( object, id)));
} //t.pEnv
return aStr;
}
bool java_sql_DriverPropertyInfo::required() bool java_sql_DriverPropertyInfo::required()
{ {
jboolean out(0); jboolean out(0);
@ -100,21 +61,4 @@ bool java_sql_DriverPropertyInfo::required()
return out; return out;
} }
Sequence< OUString> java_sql_DriverPropertyInfo::choices()
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
jfieldID id = t.pEnv->GetFieldID(getMyClass(),"choices","[Ljava/lang/String;");
if(id)
{
const java_lang_String * pEmpty = nullptr;
const OUString * pEmpty2 = nullptr;
return copyArrayAndDelete(t.pEnv, static_cast<jobjectArray>(t.pEnv->GetObjectField( object, id)), pEmpty2, pEmpty);
}
} //t.pEnv
return Sequence< OUString>();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
connectivity/source/drivers/mork/MPreparedStatement.cxx
View File

@ -387,11 +387,8 @@ ORowSetValue& x)
} }
size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol) void OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
{ {
// Count of the newly added Parameters
size_t nParameter = m_xParamColumns->get().size()+1;
OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument is not a Parameter"); OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument is not a Parameter");
OSL_ENSURE(pParameter->count() > 0,"OResultSet: error in parse tree"); OSL_ENSURE(pParameter->count() > 0,"OResultSet: error in parse tree");
@ -431,7 +428,6 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
,OUString() ,OUString()
,OUString()); ,OUString());
m_xParamColumns->get().push_back(xParaColumn); m_xParamColumns->get().push_back(xParaColumn);
return nParameter;
} }
void OPreparedStatement::describeColumn(OSQLParseNode* void OPreparedStatement::describeColumn(OSQLParseNode*

2
connectivity/source/drivers/mork/MPreparedStatement.hxx
View File

@ -71,7 +71,7 @@ namespace connectivity
void checkAndResizeParameters(sal_Int32 parameterIndex); void checkAndResizeParameters(sal_Int32 parameterIndex);
void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x); void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
size_t AddParameter(connectivity::OSQLParseNode * pParameter, void AddParameter(connectivity::OSQLParseNode * pParameter,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol); const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol);
void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes);
void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);

4
connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
View File

@ -40,11 +40,7 @@ namespace connectivity
// A ctor that is needed for returning the object // A ctor that is needed for returning the object
java_sql_DriverPropertyInfo( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} java_sql_DriverPropertyInfo( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
OUString name();
OUString description();
OUString value();
bool required(); bool required();
::com::sun::star::uno::Sequence< OUString> choices();
}; };
} }

4
desktop/inc/app.hxx
View File

@ -75,8 +75,8 @@ class Desktop : public Application
virtual void Init() override; virtual void Init() override;
virtual void InitFinished() override; virtual void InitFinished() override;
virtual void DeInit() override; virtual void DeInit() override;
virtual bool QueryExit() override; virtual bool QueryExit() override;
virtual sal_uInt16 Exception(sal_uInt16 nError) override; virtual void Exception(sal_uInt16 nError) override;
virtual void OverrideSystemSettings( AllSettings& rSettings ) override; virtual void OverrideSystemSettings( AllSettings& rSettings ) override;
virtual void AppEvent( const ApplicationEvent& rAppEvent ) override; virtual void AppEvent( const ApplicationEvent& rAppEvent ) override;

3
desktop/source/app/app.cxx
View File

@ -1184,7 +1184,7 @@ void restartOnMac(bool passArguments) {
} }
sal_uInt16 Desktop::Exception(sal_uInt16 nError) void Desktop::Exception(sal_uInt16 nError)
{ {
// protect against recursive calls // protect against recursive calls
static bool bInException = false; static bool bInException = false;
@ -1250,7 +1250,6 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError)
} }
OSL_ASSERT(false); // unreachable OSL_ASSERT(false); // unreachable
return 0;
} }
void Desktop::AppEvent( const ApplicationEvent& rAppEvent ) void Desktop::AppEvent( const ApplicationEvent& rAppEvent )

7
fpicker/source/office/OfficeFilePicker.cxx
View File

@ -78,10 +78,8 @@ public:
bool hasSubFilters( ) const; bool hasSubFilters( ) const;
/** retrieves the filters belonging to the entry /** retrieves the filters belonging to the entry
@return
the number of sub filters
*/ */
sal_Int32 getSubFilters( UnoFilterList& _rSubFilterList ); void getSubFilters( UnoFilterList& _rSubFilterList );
// helpers for iterating the sub filters // helpers for iterating the sub filters
const UnoFilterEntry* beginSubFilters() const { return m_aSubFilters.getConstArray(); } const UnoFilterEntry* beginSubFilters() const { return m_aSubFilters.getConstArray(); }
@ -104,10 +102,9 @@ bool FilterEntry::hasSubFilters( ) const
} }
sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) void FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
{ {
_rSubFilterList = m_aSubFilters; _rSubFilterList = m_aSubFilters;
return m_aSubFilters.getLength();
} }
struct ElementEntry_Impl struct ElementEntry_Impl

3
include/basegfx/color/bcolor.hxx
View File

@ -174,12 +174,11 @@ namespace basegfx
return *this; return *this;
} }
BColor& invert() void invert()
{ {
mfX = 1.0 - mfX; mfX = 1.0 - mfX;
mfY = 1.0 - mfY; mfY = 1.0 - mfY;
mfZ = 1.0 - mfZ; mfZ = 1.0 - mfZ;
return *this;
} }
static const BColor& getEmptyBColor() static const BColor& getEmptyBColor()

4
include/basegfx/polygon/b2dpolypolygontools.hxx
View File

@ -60,10 +60,6 @@ namespace basegfx
// is created. // is created.
BASEGFX_DLLPUBLIC B2DPolyPolygon adaptiveSubdivideByAngle(const B2DPolyPolygon& rCandidate, double fAngleBound = 0.0); BASEGFX_DLLPUBLIC B2DPolyPolygon adaptiveSubdivideByAngle(const B2DPolyPolygon& rCandidate, double fAngleBound = 0.0);
// Subdivide all contained curves. Use nCount divisions if given. Else, a convenient one
// is created.
BASEGFX_DLLPUBLIC B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount = 0L);
// isInside test for B2dPoint. On border is not inside as long as not true is given // isInside test for B2dPoint. On border is not inside as long as not true is given
// in bWithBorder flag. It is assumed that the orientations of the given polygon are correct. // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct.
BASEGFX_DLLPUBLIC bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false); BASEGFX_DLLPUBLIC bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false);

18
include/basegfx/range/b2ibox.hxx
View File

@ -152,24 +152,6 @@ namespace basegfx
return maRangeY.getRange(); return maRangeY.getRange();
} }
/// get lower bound of the set. returns arbitrary values for empty sets.
B2IPoint getMinimum() const
{
return B2IPoint(
maRangeX.getMinimum(),
maRangeY.getMinimum()
);
}
/// get upper bound of the set. returns arbitrary values for empty sets.
B2IPoint getMaximum() const
{
return B2IPoint(
maRangeX.getMaximum(),
maRangeY.getMaximum()
);
}
/// yields true if point is contained in set /// yields true if point is contained in set
bool isInside(const B2ITuple& rTuple) const bool isInside(const B2ITuple& rTuple) const
{ {

13
include/basegfx/tools/canvastools.hxx
View File

@ -156,19 +156,6 @@ namespace basegfx
*/ */
BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange ); BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange );
/** Return smalltest integer box, which completely contains
given floating point range.
@param rRange
Input range. Values must be within the representable
bounds of sal_Int32
@return the closest integer box, which completely contains
rRange. Note that this box will contain all pixel affected
by a polygon fill operation over the input range.
*/
BASEGFX_DLLPUBLIC ::basegfx::B2IBox b2ISurroundingBoxFromB2DRange( const ::basegfx::B2DRange& rRange );
/** Return smalltest B2DRange with integer values, which /** Return smalltest B2DRange with integer values, which
completely contains given floating point range. completely contains given floating point range.

18
include/basegfx/tools/rectcliptools.hxx
View File

@ -70,24 +70,6 @@ namespace basegfx
return clip; return clip;
} }
/** Determine number of clip planes hit by given clip mask
This method returns the number of one bits in the four
least significant bits of the argument, which amounts to
the number of clip planes hit within the
getCohenSutherlandClipFlags() method.
*/
inline sal_uInt32 getNumberOfClipPlanes( sal_uInt32 nFlags )
{
// classic bit count algo, see e.g. Reingold, Nievergelt,
// Deo: Combinatorial Algorithms, Theory and Practice,
// Prentice-Hall 1977
nFlags = (nFlags & 0x05) + ((nFlags >> 1) & 0x05);
nFlags = (nFlags & 0x03) + (nFlags >> 2); // no need for &
// 0x03, can't
// overflow
return nFlags;
}
} }
} }

35
include/vcl/pdfwriter.hxx
View File

@ -683,11 +683,8 @@ The following structure describes the permissions used in PDF security
resets the graphics state: MapMode, Font resets the graphics state: MapMode, Font
Colors and other state information MUST Colors and other state information MUST
be set again or are undefined. be set again or are undefined.
@returns
returns the page id of the new page
*/ */
sal_Int32 NewPage( sal_Int32 nPageWidth = 0, sal_Int32 nPageHeight = 0, Orientation eOrientation = Inherit ); void NewPage( sal_Int32 nPageWidth = 0, sal_Int32 nPageHeight = 0, Orientation eOrientation = Inherit );
/** Play a metafile like an outputdevice would do /** Play a metafile like an outputdevice would do
*/ */
struct PlayMetafileContext struct PlayMetafileContext
@ -959,12 +956,8 @@ The following structure describes the permissions used in PDF security
@param nDestId @param nDestId
the dest the link shall point to the dest the link shall point to
@returns
0 for success
-1 in case the link id does not exist
-2 in case the dest id does not exist
*/ */
sal_Int32 SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ); void SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId );
/** Set the URL for a link /** Set the URL for a link
will change a dest type link to an URL type link if necessary will change a dest type link to an URL type link if necessary
@param nLinkId @param nLinkId
@ -974,12 +967,8 @@ The following structure describes the permissions used in PDF security
the URL the link shall point to. the URL the link shall point to.
The URL will be parsed (and corrected) by the com.sun.star.util.URLTransformer The URL will be parsed (and corrected) by the com.sun.star.util.URLTransformer
service; the result will then appear literally in the PDF file produced service; the result will then appear literally in the PDF file produced
@returns
0 for success
-1 in case the link id does not exist
*/ */
sal_Int32 SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ); void SetLinkURL( sal_Int32 nLinkId, const OUString& rURL );
/** Resolve link in logical structure /** Resolve link in logical structure
If a link is created after the corresponding visual appearance was drawn If a link is created after the corresponding visual appearance was drawn
@ -1033,12 +1022,8 @@ The following structure describes the permissions used in PDF security
@param nNewParent @param nNewParent
specifies which outline item will be the item's new parent. specifies which outline item will be the item's new parent.
Use 0 for reparenting to top level. Use 0 for reparenting to top level.
@returns
-1 if the item does not exist
-2 if the new parent does not exist, item will be reparented to top level.
*/ */
sal_Int32 SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent ); void SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent );
/** Set an outline item's title text /** Set an outline item's title text
@ -1047,12 +1032,8 @@ The following structure describes the permissions used in PDF security
@param rText @param rText
sets the title text of the item sets the title text of the item
@returns
0 if the item exists and the text was changed
-1 if the item does not exist
*/ */
sal_Int32 SetOutlineItemText( sal_Int32 nItem, const OUString& rText ); void SetOutlineItemText( sal_Int32 nItem, const OUString& rText );
/** Set an outline item's destination /** Set an outline item's destination
@ -1061,12 +1042,8 @@ The following structure describes the permissions used in PDF security
@param nDestID @param nDestID
specifies the item's new destination specifies the item's new destination
@returns
-1 if the item does not exist
-2 if the new dest does not exist, dest will remain unchanged
*/ */
sal_Int32 SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID ); void SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID );
/** Create a new note on a page /** Create a new note on a page

4
include/vcl/slider.hxx
View File

@ -75,8 +75,8 @@ private:
SAL_DLLPRIVATE long ImplSlide( long nNewPos, bool bCallEndSlide ); SAL_DLLPRIVATE long ImplSlide( long nNewPos, bool bCallEndSlide );
SAL_DLLPRIVATE long ImplDoAction( bool bCallEndSlide ); SAL_DLLPRIVATE long ImplDoAction( bool bCallEndSlide );
SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction = true ); SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction = true );
SAL_DLLPRIVATE long ImplDoSlide( long nNewPos ); SAL_DLLPRIVATE void ImplDoSlide( long nNewPos );
SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType ); SAL_DLLPRIVATE void ImplDoSlideAction( ScrollType eScrollType );
SAL_DLLPRIVATE void ImplUpdateLinkedField(); SAL_DLLPRIVATE void ImplUpdateLinkedField();
public: public:

4
include/vcl/svapp.hxx
View File

@ -429,11 +429,9 @@ public:
@param nError The error code identifier @param nError The error code identifier
@returns sal_uInt16 value - if it is 0, then the error wasn't handled.
@see Abort @see Abort
*/ */
virtual sal_uInt16 Exception( sal_uInt16 nError ); virtual void Exception( sal_uInt16 nError );
/** Ends the program prematurely with an error message. /** Ends the program prematurely with an error message.

4
sc/source/filter/html/htmlexp.cxx
View File

@ -315,7 +315,7 @@ Size ScHTMLExport::MMToPixel( const Size& rSize )
return aSize; return aSize;
} }
sal_uLong ScHTMLExport::Write() void ScHTMLExport::Write()
{ {
if (!mbSkipHeaderFooter) if (!mbSkipHeaderFooter)
{ {
@ -329,8 +329,6 @@ sal_uLong ScHTMLExport::Write()
OUT_LF(); OUT_LF();
if (!mbSkipHeaderFooter) if (!mbSkipHeaderFooter)
TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_html ); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_html );
return rStrm.GetError();
} }
void ScHTMLExport::WriteHeader() void ScHTMLExport::WriteHeader()

2
sc/source/filter/inc/htmlexp.hxx
View File

@ -178,7 +178,7 @@ public:
ScHTMLExport( SvStream&, const OUString&, ScDocument*, const ScRange&, ScHTMLExport( SvStream&, const OUString&, ScDocument*, const ScRange&,
bool bAll, const OUString& aStreamPath, const OUString& rFilterOptions ); bool bAll, const OUString& aStreamPath, const OUString& rFilterOptions );
virtual ~ScHTMLExport(); virtual ~ScHTMLExport();
sal_uLong Write(); void Write();
const OUString& GetNonConvertibleChars() const const OUString& GetNonConvertibleChars() const
{ {
return aNonConvertibleChars; return aNonConvertibleChars;

2
sc/source/filter/inc/rtfexp.hxx
View File

@ -35,7 +35,7 @@ public:
ScRTFExport( SvStream&, ScDocument*, const ScRange& ); ScRTFExport( SvStream&, ScDocument*, const ScRange& );
virtual ~ScRTFExport(); virtual ~ScRTFExport();
sal_uLong Write(); void Write();
}; };
#endif // INCLUDED_SC_SOURCE_FILTER_INC_RTFEXP_HXX #endif // INCLUDED_SC_SOURCE_FILTER_INC_RTFEXP_HXX

3
sc/source/filter/rtf/rtfexp.cxx
View File

@ -60,7 +60,7 @@ ScRTFExport::~ScRTFExport()
delete [] pCellX; delete [] pCellX;
} }
sal_uLong ScRTFExport::Write() void ScRTFExport::Write()
{ {
rStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF ); rStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING ); rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING );
@ -74,7 +74,6 @@ sal_uLong ScRTFExport::Write()
} }
rStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING ); rStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
return rStrm.GetError();
} }
void ScRTFExport::WriteTab( SCTAB nTab ) void ScRTFExport::WriteTab( SCTAB nTab )

14
sd/source/ui/slidesorter/controller/SlideSorterController.cxx
View File

@ -695,17 +695,15 @@ void SlideSorterController::Resize (const Rectangle& rAvailableSpace)
} }
} }
Rectangle SlideSorterController::Rearrange (bool bForce) void SlideSorterController::Rearrange (bool bForce)
{ {
Rectangle aNewContentArea (maTotalWindowArea); if (maTotalWindowArea.IsEmpty())
return;
if (aNewContentArea.IsEmpty())
return aNewContentArea;
if (mnModelChangeLockCount>0) if (mnModelChangeLockCount>0)
{ {
mbIsForcedRearrangePending |= bForce; mbIsForcedRearrangePending |= bForce;
return aNewContentArea; return;
} }
else else
mbIsForcedRearrangePending = false; mbIsForcedRearrangePending = false;
@ -717,7 +715,7 @@ Rectangle SlideSorterController::Rearrange (bool bForce)
mrView.UpdateOrientation(); mrView.UpdateOrientation();
// Place the scroll bars. // Place the scroll bars.
aNewContentArea = GetScrollBarManager().PlaceScrollBars( Rectangle aNewContentArea = GetScrollBarManager().PlaceScrollBars(
maTotalWindowArea, maTotalWindowArea,
mrView.GetOrientation() != view::Layouter::VERTICAL, mrView.GetOrientation() != view::Layouter::VERTICAL,
mrView.GetOrientation() != view::Layouter::HORIZONTAL); mrView.GetOrientation() != view::Layouter::HORIZONTAL);
@ -746,8 +744,6 @@ Rectangle SlideSorterController::Rearrange (bool bForce)
mrView.RequestRepaint(); mrView.RequestRepaint();
} }
return aNewContentArea;
} }
rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxRequest& rRequest) rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxRequest& rRequest)

4
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
View File

@ -93,10 +93,8 @@ public:
window and with it the SlideSorterView is resized event when its window and with it the SlideSorterView is resized event when its
size does not change (the size does change when the visibility size does not change (the size does change when the visibility
of scroll bars changes.) of scroll bars changes.)
@return
Returns the space occupied by the browser window.
*/ */
Rectangle Rearrange (bool bForce = false); void Rearrange (bool bForce = false);
/** Return the descriptor of the page that is rendered under the /** Return the descriptor of the page that is rendered under the
given position. This takes the IsOnlyPreviewTriggersMouseOver given position. This takes the IsOnlyPreviewTriggersMouseOver

6
sfx2/source/dialog/templdlg.cxx
View File

@ -929,13 +929,13 @@ const SfxStyleFamilyItem *SfxCommonTemplateDialog_Impl::GetFamilyItem_Impl() con
return nullptr; return nullptr;
} }
SfxStyleSheetBase *SfxCommonTemplateDialog_Impl::GetSelectedStyle() const void SfxCommonTemplateDialog_Impl::GetSelectedStyle() const
{ {
if (!IsInitialized() || !pStyleSheetPool || !HasSelectedStyle()) if (!IsInitialized() || !pStyleSheetPool || !HasSelectedStyle())
return nullptr; return;
const OUString aTemplName( GetSelectedEntry() ); const OUString aTemplName( GetSelectedEntry() );
const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl(); const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
return pStyleSheetPool->Find( aTemplName, pItem->GetFamily() ); pStyleSheetPool->Find( aTemplName, pItem->GetFamily() );
} }
/** /**

2
sfx2/source/inc/templdgi.hxx
View File

@ -265,7 +265,7 @@ protected:
void SelectStyle( const OUString& rStyle ); void SelectStyle( const OUString& rStyle );
bool HasSelectedStyle() const; bool HasSelectedStyle() const;
SfxStyleSheetBase* GetSelectedStyle() const; void GetSelectedStyle() const;
void FillTreeBox(); void FillTreeBox();
void Update_Impl(); void Update_Impl();
void UpdateFamily_Impl(); void UpdateFamily_Impl();

6
svtools/source/contnr/svimpbox.cxx
View File

@ -1181,12 +1181,11 @@ void SvImpLBox::PositionScrollBars( Size& rSize, sal_uInt16 nMask )
aScrBarBox->Hide(); aScrBarBox->Hide();
} }
// nResult: Bit0 == VerSBar Bit1 == HorSBar void SvImpLBox::AdjustScrollBars( Size& rSize )
sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize )
{ {
long nEntryHeight = pView->GetEntryHeight(); long nEntryHeight = pView->GetEntryHeight();
if( !nEntryHeight ) if( !nEntryHeight )
return 0; return;
sal_uInt16 nResult = 0; sal_uInt16 nResult = 0;
@ -1303,7 +1302,6 @@ sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize )
aHorSBar->Hide(); aHorSBar->Hide();
} }
rSize = aOSize; rSize = aOSize;
return nResult;
} }
void SvImpLBox::InitScrollBarBox() void SvImpLBox::InitScrollBarBox()

2
svtools/source/inc/svimpbox.hxx
View File

@ -201,7 +201,7 @@ private:
bool ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry*,long nY ); bool ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry*,long nY );
void PositionScrollBars( Size& rOSize, sal_uInt16 nMask ); void PositionScrollBars( Size& rOSize, sal_uInt16 nMask );
sal_uInt16 AdjustScrollBars( Size& rSize ); void AdjustScrollBars( Size& rSize );
void BeginScroll(); void BeginScroll();
void EndScroll(); void EndScroll();

8
svtools/source/uno/treecontrolpeer.cxx
View File

@ -89,7 +89,7 @@ public:
virtual ~UnoTreeListBoxImpl(); virtual ~UnoTreeListBoxImpl();
virtual void dispose() override; virtual void dispose() override;
sal_uInt32 insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos=TREELIST_APPEND ); void insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos=TREELIST_APPEND );
virtual void RequestingChildren( SvTreeListEntry* pParent ) override; virtual void RequestingChildren( SvTreeListEntry* pParent ) override;
@ -1535,12 +1535,12 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void)
sal_uInt32 UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos ) void UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos )
{ {
if( pParent ) if( pParent )
return SvTreeListBox::Insert( pEntry, pParent, nPos ); SvTreeListBox::Insert( pEntry, pParent, nPos );
else else
return SvTreeListBox::Insert( pEntry, nPos ); SvTreeListBox::Insert( pEntry, nPos );
} }

7
sw/inc/dbmgr.hxx
View File

@ -352,9 +352,6 @@ public:
SvNumberFormatter* pNFormatr, SvNumberFormatter* pNFormatr,
long nLanguage ); long nLanguage );
static sal_Int32 GetRowCount(css::uno::Reference< css::sdbc::XConnection> xConnection,
const OUString& rTableName);
sal_uLong GetColumnFormat( const OUString& rDBName, sal_uLong GetColumnFormat( const OUString& rDBName,
const OUString& rTableName, const OUString& rTableName,
const OUString& rColNm, const OUString& rColNm,
@ -389,8 +386,8 @@ public:
css::uno::Reference< css::sdbc::XConnection> css::uno::Reference< css::sdbc::XConnection>
RegisterConnection(OUString const& rSource); RegisterConnection(OUString const& rSource);
const SwDSParam* CreateDSData(const SwDBData& rData) void CreateDSData(const SwDBData& rData)
{return FindDSData(rData, true);} { FindDSData(rData, true); }
const SwDSParams_t& GetDSParamArray() const { return m_DataSourceParams; } const SwDSParams_t& GetDSParamArray() const { return m_DataSourceParams; }
/// close all data sources - after fields were updated /// close all data sources - after fields were updated

4
sw/inc/doc.hxx
View File

@ -960,7 +960,7 @@ public:
const SwTOXBase& rTOX, const SwTOXBase& rTOX,
const SfxItemSet* pSet = nullptr, const SfxItemSet* pSet = nullptr,
bool bExpand = false ); bool bExpand = false );
const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd, void InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
const SwTOXBase& rTOX, const SwTOXBase& rTOX,
const SfxItemSet* pSet = nullptr ); const SfxItemSet* pSet = nullptr );
static SwTOXBase* GetCurTOX( const SwPosition& rPos ); static SwTOXBase* GetCurTOX( const SwPosition& rPos );
@ -1523,7 +1523,7 @@ public:
// Interface for the list of Ruby - texts/attributes // Interface for the list of Ruby - texts/attributes
static sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList, static sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList,
sal_uInt16 nMode ); sal_uInt16 nMode );
sal_uInt16 SetRubyList( const SwPaM& rPam, const SwRubyList& rList, void SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
sal_uInt16 nMode ); sal_uInt16 nMode );
void ReadLayoutCache( SvStream& rStream ); void ReadLayoutCache( SvStream& rStream );

4
sw/inc/editsh.hxx
View File

@ -415,7 +415,7 @@ public:
void DeleteTOXMark(SwTOXMark* pMark); void DeleteTOXMark(SwTOXMark* pMark);
/// Get all marks at current SPoint. /// Get all marks at current SPoint.
sal_uInt16 GetCurTOXMarks(SwTOXMarks& rMarks) const ; void GetCurTOXMarks(SwTOXMarks& rMarks) const ;
/// Insert content table. Renew if required. /// Insert content table. Renew if required.
void InsertTableOf(const SwTOXBase& rTOX, void InsertTableOf(const SwTOXBase& rTOX,
@ -926,7 +926,7 @@ public:
bool IsLabelDoc() const; bool IsLabelDoc() const;
/// Interface for TextInputData - (for input of Japanese/Chinese chars.) /// Interface for TextInputData - (for input of Japanese/Chinese chars.)
SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage); void CreateExtTextInput(LanguageType eInputLanguage);
OUString DeleteExtTextInput( SwExtTextInput* pDel = nullptr, bool bInsText = true); OUString DeleteExtTextInput( SwExtTextInput* pDel = nullptr, bool bInsText = true);
void SetExtTextInputData( const CommandExtTextInputData& ); void SetExtTextInputData( const CommandExtTextInputData& );

2
sw/inc/expfld.hxx
View File

@ -175,7 +175,7 @@ public:
/// Overlay, because set-field takes care for its being updated by itself. /// Overlay, because set-field takes care for its being updated by itself.
inline OUString GetSetRefName() const; inline OUString GetSetRefName() const;
sal_uInt16 SetSeqRefNo( SwSetExpField& rField ); void SetSeqRefNo( SwSetExpField& rField );
size_t GetSeqFieldList( SwSeqFieldList& rList ); size_t GetSeqFieldList( SwSeqFieldList& rList );

2
sw/inc/fesh.hxx
View File

@ -341,7 +341,7 @@ public:
long BeginDrag( const Point *pPt, bool bProp ); long BeginDrag( const Point *pPt, bool bProp );
long Drag ( const Point *pPt, bool bProp ); long Drag ( const Point *pPt, bool bProp );
long EndDrag ( const Point *pPt, bool bProp ); void EndDrag ( const Point *pPt, bool bProp );
void BreakDrag(); void BreakDrag();
/// Methods for status line. /// Methods for status line.

2
sw/inc/ndtxt.hxx
View File

@ -355,7 +355,7 @@ public:
virtual SwContentFrame *MakeFrame( SwFrame* ) override; virtual SwContentFrame *MakeFrame( SwFrame* ) override;
virtual SwContentNode *SplitContentNode( const SwPosition & ) override; virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
virtual SwContentNode *JoinNext() override; virtual SwContentNode *JoinNext() override;
virtual SwContentNode *JoinPrev() override; virtual void JoinPrev() override;
SwContentNode *AppendNode( const SwPosition & ); SwContentNode *AppendNode( const SwPosition & );

2
sw/inc/node.hxx
View File

@ -387,7 +387,7 @@ public:
virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0; virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0;
virtual SwContentNode *JoinNext(); virtual SwContentNode *JoinNext();
virtual SwContentNode *JoinPrev(); virtual void JoinPrev();
/** Is it possible to join two nodes? /** Is it possible to join two nodes?
In pIdx the second position can be returned. */ In pIdx the second position can be returned. */
bool CanJoinNext( SwNodeIndex* pIdx =nullptr ) const; bool CanJoinNext( SwNodeIndex* pIdx =nullptr ) const;

2
sw/inc/pam.hxx
View File

@ -282,7 +282,7 @@ public:
@param bPointFirst true: If the point is behind the mark then swap. @param bPointFirst true: If the point is behind the mark then swap.
false: If the mark is behind the point then swap. false: If the mark is behind the point then swap.
*/ */
SwPaM & Normalize(bool bPointFirst = true); void Normalize(bool bPointFirst = true);
/// @return the document (SwDoc) at which the PaM is registered /// @return the document (SwDoc) at which the PaM is registered
SwDoc* GetDoc() const { return m_pPoint->nNode.GetNode().GetDoc(); } SwDoc* GetDoc() const { return m_pPoint->nNode.GetNode().GetDoc(); }

2
sw/inc/shellio.hxx
View File

@ -313,7 +313,7 @@ public:
OUString GetLongName( sal_uInt16 ) const; // Get long name for index. OUString GetLongName( sal_uInt16 ) const; // Get long name for index.
bool Delete( sal_uInt16 ); bool Delete( sal_uInt16 );
sal_uInt16 Rename( sal_uInt16, const OUString*, const OUString* ); void Rename( sal_uInt16, const OUString*, const OUString* );
sal_uLong CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort, sal_uLong CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort,
const OUString& rLong ); const OUString& rLong );

6
sw/inc/tox.hxx
View File

@ -431,12 +431,12 @@ public:
virtual bool GetInfo( SfxPoolItem& rInfo ) const override; virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
// a kind of CopyCtor - check if the TOXBase is at TOXType of the doc. // a kind of CopyCtor - check if the TOXBase is at TOXType of the doc.
// If not, so create it an copy all other used things. The return is this // If not, so create it an copy all other used things.
SwTOXBase& CopyTOXBase( SwDoc*, const SwTOXBase& ); void CopyTOXBase( SwDoc*, const SwTOXBase& );
const SwTOXType* GetTOXType() const; const SwTOXType* GetTOXType() const;
sal_uInt16 GetCreateType() const; // creation types sal_uInt16 GetCreateType() const; // creation types
OUString GetTOXName() const {return m_aName;} OUString GetTOXName() const {return m_aName;}
void SetTOXName(const OUString& rSet) {m_aName = rSet;} void SetTOXName(const OUString& rSet) {m_aName = rSet;}

2
sw/inc/txtftn.hxx
View File

@ -58,7 +58,7 @@ public:
void CheckCondColl(); void CheckCondColl();
// For references to footnotes. // For references to footnotes.
sal_uInt16 SetSeqRefNo(); void SetSeqRefNo();
void SetSeqNo( sal_uInt16 n ) { m_nSeqNo = n; } // For Readers. void SetSeqNo( sal_uInt16 n ) { m_nSeqNo = n; } // For Readers.
sal_uInt16 GetSeqRefNo() const { return m_nSeqNo; } sal_uInt16 GetSeqRefNo() const { return m_nSeqNo; }

2
sw/inc/view.hxx
View File

@ -285,7 +285,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SAL_DLLPRIVATE long PhyPageUp(); SAL_DLLPRIVATE long PhyPageUp();
SAL_DLLPRIVATE long PhyPageDown(); SAL_DLLPRIVATE long PhyPageDown();
SAL_DLLPRIVATE int _CreateScrollbar( bool bHori ); SAL_DLLPRIVATE void _CreateScrollbar( bool bHori );
DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void );
DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar*, void );
SAL_DLLPRIVATE bool UpdateScrollbars(); SAL_DLLPRIVATE bool UpdateScrollbars();

2
sw/inc/viewsh.hxx
View File

@ -370,7 +370,7 @@ public:
vcl::RenderContext& rRenderContext, const Rectangle& rRect ); vcl::RenderContext& rRenderContext, const Rectangle& rRect );
// Fill temporary doc with selected text for Print or PDF export. // Fill temporary doc with selected text for Print or PDF export.
SwDoc * FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt ); void FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt );
// Called internally for Shell. Formats pages. // Called internally for Shell. Formats pages.
void CalcPagesForPrint( sal_uInt16 nMax ); void CalcPagesForPrint( sal_uInt16 nMax );

3
sw/source/core/crsr/pam.cxx
View File

@ -529,7 +529,7 @@ SwPaM* SwPaM::MakeRegion( SwMoveFn fnMove, const SwPaM * pOrigRg )
return pPam; return pPam;
} }
SwPaM & SwPaM::Normalize(bool bPointFirst) void SwPaM::Normalize(bool bPointFirst)
{ {
if (HasMark()) if (HasMark())
if ( ( bPointFirst && *m_pPoint > *m_pMark) || if ( ( bPointFirst && *m_pPoint > *m_pMark) ||
@ -537,7 +537,6 @@ SwPaM & SwPaM::Normalize(bool bPointFirst)
{ {
Exchange(); Exchange();
} }
return *this;
} }
/// return page number at cursor (for reader and page bound frames) /// return page number at cursor (for reader and page bound frames)

4
sw/source/core/doc/docruby.cxx
View File

@ -90,7 +90,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
return rList.size(); return rList.size();
} }
sal_uInt16 SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
sal_uInt16 nMode ) sal_uInt16 nMode )
{ {
GetIDocumentUndoRedo().StartUndo( UNDO_SETRUBYATTR, nullptr ); GetIDocumentUndoRedo().StartUndo( UNDO_SETRUBYATTR, nullptr );
@ -175,8 +175,6 @@ sal_uInt16 SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
(_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor ); (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor );
GetIDocumentUndoRedo().EndUndo( UNDO_SETRUBYATTR, nullptr ); GetIDocumentUndoRedo().EndUndo( UNDO_SETRUBYATTR, nullptr );
return nListEntry;
} }
bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 ) bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 )

9
sw/source/core/doc/doctxm.cxx
View File

@ -370,18 +370,18 @@ SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
return pNewSection; return pNewSection;
} }
const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd, void SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
const SwTOXBase& rTOX, const SwTOXBase& rTOX,
const SfxItemSet* pSet ) const SfxItemSet* pSet )
{ {
// check for recursiv TOX // check for recursive TOX
SwNode* pNd = GetNodes()[ nSttNd ]; SwNode* pNd = GetNodes()[ nSttNd ];
SwSectionNode* pSectNd = pNd->FindSectionNode(); SwSectionNode* pSectNd = pNd->FindSectionNode();
while( pSectNd ) while( pSectNd )
{ {
SectionType eT = pSectNd->GetSection().GetType(); SectionType eT = pSectNd->GetSection().GetType();
if( TOX_HEADER_SECTION == eT || TOX_CONTENT_SECTION == eT ) if( TOX_HEADER_SECTION == eT || TOX_CONTENT_SECTION == eT )
return nullptr; return;
pSectNd = pSectNd->StartOfSectionNode()->FindSectionNode(); pSectNd = pSectNd->StartOfSectionNode()->FindSectionNode();
} }
@ -399,14 +399,13 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd
if (!pNewSectionNode) if (!pNewSectionNode)
{ {
DelSectionFormat( pFormat ); DelSectionFormat( pFormat );
return nullptr; return;
} }
SwTOXBaseSection *const pNewSection( SwTOXBaseSection *const pNewSection(
dynamic_cast<SwTOXBaseSection*>(& pNewSectionNode->GetSection())); dynamic_cast<SwTOXBaseSection*>(& pNewSectionNode->GetSection()));
if (pNewSection) if (pNewSection)
pNewSection->SetTOXName(sSectNm); // rTOX may have had no name... pNewSection->SetTOXName(sSectNm); // rTOX may have had no name...
return pNewSection;
} }
/// Get current table of contents /// Get current table of contents

3
sw/source/core/docnode/node.cxx
View File

@ -1385,9 +1385,8 @@ SwContentNode *SwContentNode::JoinNext()
return this; return this;
} }
SwContentNode *SwContentNode::JoinPrev() void SwContentNode::JoinPrev()
{ {
return this;
} }
/// Get info from Modify /// Get info from Modify

3
sw/source/core/edit/editsh.cxx
View File

@ -934,12 +934,11 @@ void SwEditShell::SetLinkUpdMode( sal_uInt16 nMode )
} }
// Interface for TextInputData - (for text input of japanese/chinese characters) // Interface for TextInputData - (for text input of japanese/chinese characters)
SwExtTextInput* SwEditShell::CreateExtTextInput(LanguageType eInputLanguage) void SwEditShell::CreateExtTextInput(LanguageType eInputLanguage)
{ {
SwExtTextInput* pRet = GetDoc()->CreateExtTextInput( *GetCursor() ); SwExtTextInput* pRet = GetDoc()->CreateExtTextInput( *GetCursor() );
pRet->SetLanguage(eInputLanguage); pRet->SetLanguage(eInputLanguage);
pRet->SetOverwriteCursor( SwCursorShell::IsOverwriteCursor() ); pRet->SetOverwriteCursor( SwCursorShell::IsOverwriteCursor() );
return pRet;
} }
OUString SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, bool bInsText ) OUString SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, bool bInsText )

4
sw/source/core/edit/edtox.cxx
View File

@ -90,9 +90,9 @@ void SwEditShell::DeleteTOXMark( SwTOXMark* pMark )
} }
/// Collect all listing markers /// Collect all listing markers
sal_uInt16 SwEditShell::GetCurTOXMarks(SwTOXMarks& rMarks) const void SwEditShell::GetCurTOXMarks(SwTOXMarks& rMarks) const
{ {
return SwDoc::GetCurTOXMark( *GetCursor()->Start(), rMarks ); SwDoc::GetCurTOXMark( *GetCursor()->Start(), rMarks );
} }
bool SwEditShell::IsTOXBaseReadonly(const SwTOXBase& rTOXBase) bool SwEditShell::IsTOXBaseReadonly(const SwTOXBase& rTOXBase)

7
sw/source/core/fields/expfld.cxx
View File

@ -532,10 +532,10 @@ sal_uLong SwSetExpFieldType::GetSeqFormat()
return pField->GetFormat(); return pField->GetFormat();
} }
sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField ) void SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField )
{ {
if( !HasWriterListeners() || !(nsSwGetSetExpType::GSE_SEQ & nType) ) if( !HasWriterListeners() || !(nsSwGetSetExpType::GSE_SEQ & nType) )
return USHRT_MAX; return;
std::vector<sal_uInt16> aArr; std::vector<sal_uInt16> aArr;
@ -563,7 +563,7 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField )
break; break;
if( n == aArr.size() || aArr[ n ] > nNum ) if( n == aArr.size() || aArr[ n ] > nNum )
return nNum; // no -> use it return; // no -> use it
} }
// flagged all numbers, so determine the right number // flagged all numbers, so determine the right number
@ -578,7 +578,6 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField )
} }
rField.SetSeqNumber( n ); rField.SetSeqNumber( n );
return n;
} }
size_t SwSetExpFieldType::GetSeqFieldList( SwSeqFieldList& rList ) size_t SwSetExpFieldType::GetSeqFieldList( SwSeqFieldList& rList )

5
sw/source/core/frmedt/feshview.cxx
View File

@ -684,7 +684,7 @@ long SwFEShell::Drag( const Point *pPt, bool )
return 0; return 0;
} }
long SwFEShell::EndDrag( const Point *, bool ) void SwFEShell::EndDrag( const Point *, bool )
{ {
OSL_ENSURE( Imp()->HasDrawView(), "EndDrag without DrawView?" ); OSL_ENSURE( Imp()->HasDrawView(), "EndDrag without DrawView?" );
SdrView *pView = Imp()->GetDrawView(); SdrView *pView = Imp()->GetDrawView();
@ -721,10 +721,7 @@ long SwFEShell::EndDrag( const Point *, bool )
GetDoc()->getIDocumentState().SetModified(); GetDoc()->getIDocumentState().SetModified();
::FrameNotify( this ); ::FrameNotify( this );
return 1;
} }
return 0;
} }
void SwFEShell::BreakDrag() void SwFEShell::BreakDrag()

2
sw/source/core/inc/SwXMLBlockExport.hxx
View File

@ -57,7 +57,7 @@ public:
virtual ~SwXMLTextBlockExport() {} virtual ~SwXMLTextBlockExport() {}
sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) override {return 0;} sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) override {return 0;}
sal_uInt32 exportDoc(const OUString & rText); void exportDoc(const OUString & rText);
void _ExportAutoStyles() override {} void _ExportAutoStyles() override {}
void _ExportMasterStyles () override {} void _ExportMasterStyles () override {}
void _ExportContent() override {} void _ExportContent() override {}

4
sw/source/core/inc/frmtool.hxx
View File

@ -401,10 +401,10 @@ public:
void Current( const SdrObject *pNew ) { m_pCurrent = pNew; } void Current( const SdrObject *pNew ) { m_pCurrent = pNew; }
const SdrObject *operator()() const { return m_pCurrent; } const SdrObject *operator()() const { return m_pCurrent; }
const SdrObject *Top(); void Top();
const SdrObject *Bottom(); const SdrObject *Bottom();
const SdrObject *Next(); const SdrObject *Next();
const SdrObject *Prev(); void Prev();
}; };
class StackHack class StackHack

3
sw/source/core/inc/scriptinfo.hxx
View File

@ -298,12 +298,11 @@ public:
} }
/** retrieves kashida opportunities for a given text range. /** retrieves kashida opportunities for a given text range.
returns the number of kashida positions in the given text range
pKashidaPositions: buffer to receive the char indices of the pKashidaPositions: buffer to receive the char indices of the
kashida opportunties relative to the paragraph kashida opportunties relative to the paragraph
*/ */
sal_Int32 GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen, void GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
sal_Int32* pKashidaPosition); sal_Int32* pKashidaPosition);
/** Use regular blank justification instead of kashdida justification for the given line of text. /** Use regular blank justification instead of kashdida justification for the given line of text.

2
sw/source/core/inc/txtfrm.hxx
View File

@ -307,7 +307,7 @@ public:
bool& bRight, bool bInsertCursor ); bool& bRight, bool bInsertCursor );
/// Methods to manage the FollowFrame /// Methods to manage the FollowFrame
SwContentFrame *SplitFrame( const sal_Int32 nTextPos ); void SplitFrame( const sal_Int32 nTextPos );
SwContentFrame *JoinFrame(); SwContentFrame *JoinFrame();
inline sal_Int32 GetOfst() const { return mnOffset; } inline sal_Int32 GetOfst() const { return mnOffset; }
void _SetOfst( const sal_Int32 nNewOfst ); void _SetOfst( const sal_Int32 nNewOfst );

6
sw/source/core/layout/frmtool.cxx
View File

@ -2232,7 +2232,7 @@ SwOrderIter::SwOrderIter( const SwPageFrame *pPg, bool bFlys ) :
{ {
} }
const SdrObject *SwOrderIter::Top() void SwOrderIter::Top()
{ {
m_pCurrent = nullptr; m_pCurrent = nullptr;
if ( m_pPage->GetSortedObjs() ) if ( m_pPage->GetSortedObjs() )
@ -2256,7 +2256,6 @@ const SdrObject *SwOrderIter::Top()
} }
} }
} }
return m_pCurrent;
} }
const SdrObject *SwOrderIter::Bottom() const SdrObject *SwOrderIter::Bottom()
@ -2314,7 +2313,7 @@ const SdrObject *SwOrderIter::Next()
return m_pCurrent; return m_pCurrent;
} }
const SdrObject *SwOrderIter::Prev() void SwOrderIter::Prev()
{ {
const sal_uInt32 nCurOrd = m_pCurrent ? m_pCurrent->GetOrdNumDirect() : 0; const sal_uInt32 nCurOrd = m_pCurrent ? m_pCurrent->GetOrdNumDirect() : 0;
m_pCurrent = nullptr; m_pCurrent = nullptr;
@ -2339,7 +2338,6 @@ const SdrObject *SwOrderIter::Prev()
} }
} }
} }
return m_pCurrent;
} }
/// Keep and restore the substructure of a layout frame for an action. /// Keep and restore the substructure of a layout frame for an action.

3
sw/source/core/swg/SwXMLBlockExport.cxx
View File

@ -95,7 +95,7 @@ SwXMLTextBlockExport::SwXMLTextBlockExport(
XML_NAMESPACE_TEXT ); XML_NAMESPACE_TEXT );
} }
sal_uInt32 SwXMLTextBlockExport::exportDoc(const OUString &rText) void SwXMLTextBlockExport::exportDoc(const OUString &rText)
{ {
GetDocHandler()->startDocument(); GetDocHandler()->startDocument();
@ -130,7 +130,6 @@ sal_uInt32 SwXMLTextBlockExport::exportDoc(const OUString &rText)
} }
} }
GetDocHandler()->endDocument(); GetDocHandler()->endDocument();
return 0;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

5
sw/source/core/swg/swblocks.cxx
View File

@ -329,7 +329,7 @@ bool SwTextBlocks::Delete( sal_uInt16 n )
return false; return false;
} }
sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString* l ) void SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString* l )
{ {
sal_uInt16 nIdx = USHRT_MAX; sal_uInt16 nIdx = USHRT_MAX;
if( pImp && !pImp->bInPutMuchBlocks ) if( pImp && !pImp->bInPutMuchBlocks )
@ -345,7 +345,7 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString
{ {
OSL_ENSURE( false, "No short name provided in the rename" ); OSL_ENSURE( false, "No short name provided in the rename" );
nErr = ERR_SWG_INTERNAL_ERROR; nErr = ERR_SWG_INTERNAL_ERROR;
return USHRT_MAX; return;
} }
if( pImp->IsFileChanged() ) if( pImp->IsFileChanged() )
@ -369,7 +369,6 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString
if( !nErr ) if( !nErr )
nIdx = pImp->GetIndex( aNew ); nIdx = pImp->GetIndex( aNew );
} }
return nIdx;
} }
sal_uLong SwTextBlocks::CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort, sal_uLong SwTextBlocks::CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort,

4
sw/source/core/text/frmform.cxx
View File

@ -663,7 +663,7 @@ SwContentFrame *SwTextFrame::JoinFrame()
return pNxt; return pNxt;
} }
SwContentFrame *SwTextFrame::SplitFrame( const sal_Int32 nTextPos ) void SwTextFrame::SplitFrame( const sal_Int32 nTextPos )
{ {
SwSwapIfSwapped swap( this ); SwSwapIfSwapped swap( this );
@ -737,8 +737,6 @@ SwContentFrame *SwTextFrame::SplitFrame( const sal_Int32 nTextPos )
// No SetOfst or CalcFollow, because an AdjustFollow follows immediately anyways // No SetOfst or CalcFollow, because an AdjustFollow follows immediately anyways
pNew->ManipOfst( nTextPos ); pNew->ManipOfst( nTextPos );
return pNew;
} }
void SwTextFrame::_SetOfst( const sal_Int32 nNewOfst ) void SwTextFrame::_SetOfst( const sal_Int32 nNewOfst )

3
sw/source/core/text/itrtxt.cxx
View File

@ -290,13 +290,12 @@ sal_uInt16 SwTextCursor::AdjustBaseLine( const SwLineLayout& rLine,
return nOfst; return nOfst;
} }
const SwLineLayout *SwTextIter::TwipsToLine( const SwTwips y) void SwTextIter::TwipsToLine( const SwTwips y)
{ {
while( m_nY + GetLineHeight() <= y && Next() ) while( m_nY + GetLineHeight() <= y && Next() )
; ;
while( m_nY > y && Prev() ) while( m_nY > y && Prev() )
; ;
return m_pCurr;
} }
// Local helper function to check, if pCurr needs a field rest portion: // Local helper function to check, if pCurr needs a field rest portion:

2
sw/source/core/text/itrtxt.hxx
View File

@ -109,7 +109,7 @@ public:
const SwLineLayout *GetPrevLine(); const SwLineLayout *GetPrevLine();
void CharToLine( const sal_Int32 ); void CharToLine( const sal_Int32 );
const SwLineLayout *TwipsToLine(const SwTwips); void TwipsToLine(const SwTwips);
// Truncates all after pCurr // Truncates all after pCurr
void TruncLines( bool bNoteFollow = false ); void TruncLines( bool bNoteFollow = false );

3
sw/source/core/text/porlay.cxx
View File

@ -1815,7 +1815,7 @@ void SwScriptInfo::MarkKashidaInvalid(sal_Int32 nKashPos)
} }
// retrieve the kashida positions in the given text range // retrieve the kashida positions in the given text range
sal_Int32 SwScriptInfo::GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen, void SwScriptInfo::GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
sal_Int32* pKashidaPosition) sal_Int32* pKashidaPosition)
{ {
size_t nCntKash = 0; size_t nCntKash = 0;
@ -1836,7 +1836,6 @@ sal_Int32 SwScriptInfo::GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
pKashidaPosition [ nCntKashEnd - nCntKash ] = GetKashida ( nCntKashEnd ); pKashidaPosition [ nCntKashEnd - nCntKash ] = GetKashida ( nCntKashEnd );
nCntKashEnd++; nCntKashEnd++;
} }
return nCntKashEnd - nCntKash;
} }
void SwScriptInfo::SetNoKashidaLine(sal_Int32 nStt, sal_Int32 nLen) void SwScriptInfo::SetNoKashidaLine(sal_Int32 nStt, sal_Int32 nLen)

4
sw/source/core/tox/tox.cxx
View File

@ -455,7 +455,7 @@ void SwTOXBase::RegisterToTOXType( SwTOXType& rType )
rType.Add( this ); rType.Add( this );
} }
SwTOXBase& SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource ) void SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
{ {
maMSTOCExpression = rSource.maMSTOCExpression; maMSTOCExpression = rSource.maMSTOCExpression;
SwTOXType* pType = const_cast<SwTOXType*>(rSource.GetTOXType()); SwTOXType* pType = const_cast<SwTOXType*>(rSource.GetTOXType());
@ -507,8 +507,6 @@ SwTOXBase& SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
m_aName = rSource.GetTOXName(); m_aName = rSource.GetTOXName();
else else
m_aName = pDoc->GetUniqueTOXBaseName( *pType, rSource.GetTOXName() ); m_aName = pDoc->GetUniqueTOXBaseName( *pType, rSource.GetTOXName() );
return *this;
} }
// TOX specific functions // TOX specific functions

10
sw/source/core/txtnode/atrftn.cxx
View File

@ -497,23 +497,23 @@ void SwTextFootnote::DelFrames( const SwFrame* pSib )
/// Set the sequence number for the current footnote. /// Set the sequence number for the current footnote.
/// @returns The new sequence number or USHRT_MAX if invalid. /// @returns The new sequence number or USHRT_MAX if invalid.
sal_uInt16 SwTextFootnote::SetSeqRefNo() void SwTextFootnote::SetSeqRefNo()
{ {
if( !m_pTextNode ) if( !m_pTextNode )
return USHRT_MAX; return;
SwDoc* pDoc = m_pTextNode->GetDoc(); SwDoc* pDoc = m_pTextNode->GetDoc();
if( pDoc->IsInReading() ) if( pDoc->IsInReading() )
return USHRT_MAX; return;
std::set<sal_uInt16> aUsedNums; std::set<sal_uInt16> aUsedNums;
std::vector<SwTextFootnote*> badRefNums; std::vector<SwTextFootnote*> badRefNums;
::lcl_FillUsedFootnoteRefNumbers(*pDoc, this, aUsedNums, badRefNums); ::lcl_FillUsedFootnoteRefNumbers(*pDoc, this, aUsedNums, badRefNums);
if ( ::lcl_IsRefNumAvailable(aUsedNums, m_nSeqNo) ) if ( ::lcl_IsRefNumAvailable(aUsedNums, m_nSeqNo) )
return m_nSeqNo; return;
std::vector<sal_uInt16> unused; std::vector<sal_uInt16> unused;
::lcl_FillUnusedSeqRefNums(unused, aUsedNums, 1); ::lcl_FillUnusedSeqRefNums(unused, aUsedNums, 1);
return m_nSeqNo = unused[0]; m_nSeqNo = unused[0];
} }
/// Set a unique sequential reference number for every footnote in the document. /// Set a unique sequential reference number for every footnote in the document.

4
sw/source/core/txtnode/ndtxt.cxx
View File

@ -725,7 +725,7 @@ SwContentNode *SwTextNode::JoinNext()
return this; return this;
} }
SwContentNode *SwTextNode::JoinPrev() void SwTextNode::JoinPrev()
{ {
SwNodes& rNds = GetNodes(); SwNodes& rNds = GetNodes();
SwNodeIndex aIdx( *this ); SwNodeIndex aIdx( *this );
@ -815,8 +815,6 @@ SwContentNode *SwTextNode::JoinPrev()
else { else {
OSL_FAIL( "kein TextNode." ); OSL_FAIL( "kein TextNode." );
} }
return this;
} }
// erzeugt einen AttrSet mit Bereichen fuer Frame-/Para/Char-Attributen // erzeugt einen AttrSet mit Bereichen fuer Frame-/Para/Char-Attributen

3
sw/source/core/view/vprint.cxx
View File

@ -322,7 +322,7 @@ void SwViewShell::CalcPagesForPrint( sal_uInt16 nMax )
pMyLayout->EndAllAction(); pMyLayout->EndAllAction();
} }
SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt) void SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
{ {
OSL_ENSURE( dynamic_cast<const SwFEShell*>( this) != nullptr,"SwViewShell::Prt for FEShell only"); OSL_ENSURE( dynamic_cast<const SwFEShell*>( this) != nullptr,"SwViewShell::Prt for FEShell only");
SwFEShell* pFESh = static_cast<SwFEShell*>(this); SwFEShell* pFESh = static_cast<SwFEShell*>(this);
@ -422,7 +422,6 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
} }
} }
} }
return pPrtDoc;
} }
// TODO: there is already a GetPageByPageNum, but it checks some physical page // TODO: there is already a GetPageByPageNum, but it checks some physical page

5
sw/source/filter/html/htmlform.cxx
View File

@ -206,7 +206,7 @@ public:
} }
const uno::Reference< XMultiServiceFactory >& GetServiceFactory(); const uno::Reference< XMultiServiceFactory >& GetServiceFactory();
const uno::Reference< drawing::XDrawPage >& GetDrawPage(); void GetDrawPage();
const uno::Reference< drawing::XShapes >& GetShapes(); const uno::Reference< drawing::XShapes >& GetShapes();
const uno::Reference< script::XEventAttacherManager >& GetControlEventManager(); const uno::Reference< script::XEventAttacherManager >& GetControlEventManager();
const uno::Reference< script::XEventAttacherManager >& GetFormEventManager(); const uno::Reference< script::XEventAttacherManager >& GetFormEventManager();
@ -276,7 +276,7 @@ const uno::Reference< XMultiServiceFactory >& SwHTMLForm_Impl::GetServiceFactory
return xServiceFactory; return xServiceFactory;
} }
const uno::Reference< drawing::XDrawPage >& SwHTMLForm_Impl::GetDrawPage() void SwHTMLForm_Impl::GetDrawPage()
{ {
if( !xDrawPage.is() && pDocSh ) if( !xDrawPage.is() && pDocSh )
{ {
@ -287,7 +287,6 @@ const uno::Reference< drawing::XDrawPage >& SwHTMLForm_Impl::GetDrawPage()
xDrawPage = xTextDoc->getDrawPage(); xDrawPage = xTextDoc->getDrawPage();
OSL_ENSURE( xDrawPage.is(), "drawing::XDrawPage nicht erhalten" ); OSL_ENSURE( xDrawPage.is(), "drawing::XDrawPage nicht erhalten" );
} }
return xDrawPage;
} }
const uno::Reference< container::XIndexContainer >& SwHTMLForm_Impl::GetForms() const uno::Reference< container::XIndexContainer >& SwHTMLForm_Impl::GetForms()

4
sw/source/filter/html/htmlnum.hxx
View File

@ -71,8 +71,8 @@ public:
void SetDepth( sal_uInt16 nDepth ) { nDeep = nDepth; } void SetDepth( sal_uInt16 nDepth ) { nDeep = nDepth; }
sal_uInt16 GetDepth() const { return nDeep; } sal_uInt16 GetDepth() const { return nDeep; }
sal_uInt16 IncDepth() { return ++nDeep; } void IncDepth() { ++nDeep; }
sal_uInt16 DecDepth() { return nDeep==0 ? 0 : --nDeep; } void DecDepth() { if (nDeep!=0) --nDeep; }
inline sal_uInt8 GetLevel() const; inline sal_uInt8 GetLevel() const;
bool IsRestart() const { return bRestart; } bool IsRestart() const { return bRestart; }

14
sw/source/uibase/dbui/dbmgr.cxx
View File

@ -757,20 +757,6 @@ void SwDBManager::GetColumnNames(ListBox* pListBox,
} }
sal_Int32 SwDBManager::GetRowCount(uno::Reference<sdbc::XConnection> xConnection,
const OUString& rTableName)
{
uno::Reference<beans::XPropertySet> xRow = GetRowSupplier(xConnection, rTableName, SwDBSelect::UNKNOWN);
sal_Int32 nCnt = 0;
if(xRow.is())
xRow->getPropertyValue( "RowCount" ) >>= nCnt;
return nCnt;
}
SwDBManager::SwDBManager(SwDoc* pDoc) SwDBManager::SwDBManager(SwDoc* pDoc)
: bCancel(false) : bCancel(false)
, bInitDBFields(false) , bInitDBFields(false)

4
sw/source/uibase/uiview/viewmdi.cxx
View File

@ -280,7 +280,7 @@ IMPL_LINK_TYPED( SwView, WindowChildEventListener, VclWindowEvent&, rEvent, void
} }
} }
int SwView::_CreateScrollbar( bool bHori ) void SwView::_CreateScrollbar( bool bHori )
{ {
vcl::Window *pMDI = &GetViewFrame()->GetWindow(); vcl::Window *pMDI = &GetViewFrame()->GetWindow();
VclPtr<SwScrollbar>& ppScrollbar = bHori ? m_pHScrollbar : m_pVScrollbar; VclPtr<SwScrollbar>& ppScrollbar = bHori ? m_pHScrollbar : m_pVScrollbar;
@ -302,8 +302,6 @@ int SwView::_CreateScrollbar( bool bHori )
if (!m_bShowAtResize) if (!m_bShowAtResize)
ppScrollbar->ExtendedShow(); ppScrollbar->ExtendedShow();
return 1;
} }
IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void ) IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void )

8
vcl/source/app/svapp.cxx
View File

@ -277,17 +277,15 @@ OUString Application::GetAppFileName()
return aAppFileName; return aAppFileName;
} }
sal_uInt16 Application::Exception( sal_uInt16 nError ) void Application::Exception( sal_uInt16 nError )
{ {
switch ( nError & EXC_MAJORTYPE ) switch ( nError & EXC_MAJORTYPE )
{ {
// System has precedence (so do nothing) // System has precedence (so do nothing)
case EXC_SYSTEM: case EXC_SYSTEM:
return 0;
case EXC_DISPLAY: case EXC_DISPLAY:
case EXC_REMOTE: case EXC_REMOTE:
return 0; break;
#ifdef DBG_UTIL #ifdef DBG_UTIL
case EXC_RSCNOTLOADED: case EXC_RSCNOTLOADED:
@ -302,8 +300,6 @@ sal_uInt16 Application::Exception( sal_uInt16 nError )
break; break;
#endif #endif
} }
return 0;
} }
void Application::Abort( const OUString& rErrorText ) void Application::Abort( const OUString& rErrorText )

14
vcl/source/control/slider.cxx
View File

@ -590,28 +590,26 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction )
} }
} }
long Slider::ImplDoSlide( long nNewPos ) void Slider::ImplDoSlide( long nNewPos )
{ {
if ( meScrollType != SCROLL_DONTKNOW ) if ( meScrollType != SCROLL_DONTKNOW )
return 0; return;
meScrollType = SCROLL_DRAG; meScrollType = SCROLL_DRAG;
long nDelta = ImplSlide( nNewPos, true ); ImplSlide( nNewPos, true );
meScrollType = SCROLL_DONTKNOW; meScrollType = SCROLL_DONTKNOW;
return nDelta;
} }
long Slider::ImplDoSlideAction( ScrollType eScrollType ) void Slider::ImplDoSlideAction( ScrollType eScrollType )
{ {
if ( (meScrollType != SCROLL_DONTKNOW) || if ( (meScrollType != SCROLL_DONTKNOW) ||
(eScrollType == SCROLL_DONTKNOW) || (eScrollType == SCROLL_DONTKNOW) ||
(eScrollType == SCROLL_DRAG) ) (eScrollType == SCROLL_DRAG) )
return 0; return;
meScrollType = eScrollType; meScrollType = eScrollType;
long nDelta = ImplDoAction( true ); ImplDoAction( true );
meScrollType = SCROLL_DONTKNOW; meScrollType = SCROLL_DONTKNOW;
return nDelta;
} }
void Slider::MouseButtonDown( const MouseEvent& rMEvt ) void Slider::MouseButtonDown( const MouseEvent& rMEvt )

24
vcl/source/gdi/pdfwriter.cxx
View File

@ -42,9 +42,9 @@ OutputDevice* PDFWriter::GetReferenceDevice()
return xImplementation->getReferenceDevice(); return xImplementation->getReferenceDevice();
} }
sal_Int32 PDFWriter::NewPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, Orientation eOrientation ) void PDFWriter::NewPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, Orientation eOrientation )
{ {
return xImplementation->newPage( nPageWidth, nPageHeight, eOrientation ); xImplementation->newPage( nPageWidth, nPageHeight, eOrientation );
} }
bool PDFWriter::Emit() bool PDFWriter::Emit()
@ -347,14 +347,14 @@ sal_Int32 PDFWriter::CreateDest( const Rectangle& rRect, sal_Int32 nPageNr, PDFW
return xImplementation->createDest( rRect, nPageNr, eType ); return xImplementation->createDest( rRect, nPageNr, eType );
} }
sal_Int32 PDFWriter::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ) void PDFWriter::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId )
{ {
return xImplementation->setLinkDest( nLinkId, nDestId ); xImplementation->setLinkDest( nLinkId, nDestId );
} }
sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ) void PDFWriter::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL )
{ {
return xImplementation->setLinkURL( nLinkId, rURL ); xImplementation->setLinkURL( nLinkId, rURL );
} }
void PDFWriter::SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyId ) void PDFWriter::SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyId )
@ -367,19 +367,19 @@ sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const OUString& rText
return xImplementation->createOutlineItem( nParent, rText, nDestID ); return xImplementation->createOutlineItem( nParent, rText, nDestID );
} }
sal_Int32 PDFWriter::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent ) void PDFWriter::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent )
{ {
return xImplementation->setOutlineItemParent( nItem, nNewParent ); xImplementation->setOutlineItemParent( nItem, nNewParent );
} }
sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const OUString& rText ) void PDFWriter::SetOutlineItemText( sal_Int32 nItem, const OUString& rText )
{ {
return xImplementation->setOutlineItemText( nItem, rText ); xImplementation->setOutlineItemText( nItem, rText );
} }
sal_Int32 PDFWriter::SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDest ) void PDFWriter::SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDest )
{ {
return xImplementation->setOutlineItemDest( nItem, nDest ); xImplementation->setOutlineItemDest( nItem, nDest );
} }
void PDFWriter::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr ) void PDFWriter::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr )

5
vcl/workben/outdevgrind.cxx
View File

@ -59,7 +59,7 @@ class GrindApp : public Application
{ {
public: public:
virtual int Main() override; virtual int Main() override;
virtual sal_uInt16 Exception( sal_uInt16 nError ) override; virtual void Exception( sal_uInt16 nError ) override;
}; };
class TestWindow : public Dialog class TestWindow : public Dialog
@ -830,7 +830,7 @@ void TestWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
fflush(stdout); fflush(stdout);
} }
sal_uInt16 GrindApp::Exception( sal_uInt16 nError ) void GrindApp::Exception( sal_uInt16 nError )
{ {
switch( nError & EXC_MAJORTYPE ) switch( nError & EXC_MAJORTYPE )
{ {
@ -838,7 +838,6 @@ sal_uInt16 GrindApp::Exception( sal_uInt16 nError )
Abort( "Error: could not load language resources.\nPlease check your installation.\n" ); Abort( "Error: could not load language resources.\nPlease check your installation.\n" );
break; break;
} }
return 0;
} }
int GrindApp::Main() int GrindApp::Main()