summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/ctypeitm.hxx4
-rw-r--r--svtools/inc/sychconv.hxx4
-rw-r--r--svtools/inc/unoevent.hxx8
-rw-r--r--svtools/source/edit/sychconv.cxx4
-rw-r--r--svtools/source/filter.vcl/wmf/winmtf.cxx6
-rw-r--r--svtools/source/filter.vcl/wmf/winmtf.hxx4
-rw-r--r--svtools/source/filter.vcl/wmf/winwmf.cxx6
-rw-r--r--svtools/source/items1/ctypeitm.cxx4
-rw-r--r--svtools/source/items1/frqitem.cxx4
-rw-r--r--svtools/source/items1/stylepool.cxx6
-rw-r--r--svtools/source/misc/ownlist.cxx4
-rw-r--r--svtools/source/misc/urihelper.cxx22
-rw-r--r--svtools/source/misc1/strmadpt.cxx4
-rw-r--r--svtools/source/numbers/zforscan.hxx8
-rw-r--r--svtools/source/uno/unoevent.cxx8
15 files changed, 48 insertions, 48 deletions
diff --git a/svtools/inc/svtools/ctypeitm.hxx b/svtools/inc/svtools/ctypeitm.hxx
index 191ae467b634..2592c6e0f388 100644
--- a/svtools/inc/svtools/ctypeitm.hxx
+++ b/svtools/inc/svtools/ctypeitm.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ctypeitm.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -76,7 +76,7 @@ public:
virtual BOOL PutValue ( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0);
- const INetContentType GetEnumValue() const;
+ INetContentType GetEnumValue() const;
void SetValue( const INetContentType eType );
};
diff --git a/svtools/inc/sychconv.hxx b/svtools/inc/sychconv.hxx
index d1cca69a950a..2e570dfe2550 100644
--- a/svtools/inc/sychconv.hxx
+++ b/svtools/inc/sychconv.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: sychconv.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -44,7 +44,7 @@ class SymCharConverter
{
public:
- static const BOOL Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL );
+ static BOOL Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL );
};
#endif // _CHARCONV_HXX
diff --git a/svtools/inc/unoevent.hxx b/svtools/inc/unoevent.hxx
index d30fb24c6d78..e8507722e31b 100644
--- a/svtools/inc/unoevent.hxx
+++ b/svtools/inc/unoevent.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: unoevent.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -282,7 +282,7 @@ public:
protected:
- sal_Int16 getIndex(const sal_uInt16 nID);
+ sal_Int16 getIndex(const sal_uInt16 nID) const;
using SvBaseEventDescriptor::replaceByName;
virtual void replaceByName(
@@ -308,8 +308,8 @@ protected:
/// return sal_False: no macro; getByName() will return an empty macro
/// IllegalArgumentException: the event is not supported
using SvBaseEventDescriptor::hasByName;
- virtual const sal_Bool hasByName(
- const sal_uInt16 nEvent ) /// item ID of event
+ virtual sal_Bool hasByName(
+ const sal_uInt16 nEvent ) const /// item ID of event
throw(
::com::sun::star::lang::IllegalArgumentException);
diff --git a/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx
index a9671f648785..0a394207d051 100644
--- a/svtools/source/edit/sychconv.cxx
+++ b/svtools/source/edit/sychconv.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: sychconv.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,7 +33,7 @@
#include "sychconv.hxx"
#include <vcl/outdev.hxx>
-const BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev )
+BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev )
{
// hibyte 0 = exact matching
// 1 = little differences,
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index b5e5d6c69b7d..6f1caae18750 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: winmtf.cxx,v $
- * $Revision: 1.54 $
+ * $Revision: 1.54.136.2 $
*
* This file is part of OpenOffice.org.
*
@@ -310,7 +310,7 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
// ------------------------------------------------------------------------
#ifdef WIN_MTF_ASSERT
-const void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags )
+void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags )
{
static sal_Bool bOnlyOnce;
static sal_Int32 nAssertCount;
@@ -573,7 +573,7 @@ Polygon& WinMtfOutput::ImplMap( Polygon& rPolygon )
PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon )
{
UINT16 nPolys = rPolyPolygon.Count();
- for ( UINT16 i = 0; i < nPolys; ImplMap( rPolyPolygon[ i++ ] ) );
+ for ( UINT16 i = 0; i < nPolys; ImplMap( rPolyPolygon[ i++ ] ) ) ;
return rPolyPolygon;
}
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index 4b333b67e0c6..ada590a19675 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: winmtf.hxx,v $
- * $Revision: 1.35 $
+ * $Revision: 1.34.134.2 $
*
* This file is part of OpenOffice.org.
*
@@ -308,7 +308,7 @@ struct LOGFONTW
#define WIN_MTF_ASSERT_ONCE 0x40000000
#define WIN_MTF_ASSERT_MIFE 0x20000000
-const void WinMtfAssertHandler( const sal_Char*, sal_uInt32 nFlags = WIN_MTF_ASSERT_MIFE );
+void WinMtfAssertHandler( const sal_Char*, sal_uInt32 nFlags = WIN_MTF_ASSERT_MIFE );
#endif
enum WinMtfClipPathType{ EMPTY, RECTANGLE, COMPLEX };
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index 9bc34210e780..490ddaa82d40 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: winwmf.cxx,v $
- * $Revision: 1.36 $
+ * $Revision: 1.36.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -1085,7 +1085,7 @@ void WMFReader::ReadWMF()
// ------------------------------------------------------------------------
-const static void GetWinExtMax( const Point& rSource, Rectangle& rPlaceableBound, const sal_Int16 nMapMode )
+static void GetWinExtMax( const Point& rSource, Rectangle& rPlaceableBound, const sal_Int16 nMapMode )
{
Point aSource( rSource );
if ( nMapMode == MM_HIMETRIC )
@@ -1100,7 +1100,7 @@ const static void GetWinExtMax( const Point& rSource, Rectangle& rPlaceableBound
rPlaceableBound.Bottom() = aSource.Y();
}
-const static void GetWinExtMax( const Rectangle& rSource, Rectangle& rPlaceableBound, const sal_Int16 nMapMode )
+static void GetWinExtMax( const Rectangle& rSource, Rectangle& rPlaceableBound, const sal_Int16 nMapMode )
{
GetWinExtMax( rSource.TopLeft(), rPlaceableBound, nMapMode );
GetWinExtMax( rSource.BottomRight(), rPlaceableBound, nMapMode );
diff --git a/svtools/source/items1/ctypeitm.cxx b/svtools/source/items1/ctypeitm.cxx
index 30eda4342219..552d4a6a9041 100644
--- a/svtools/source/items1/ctypeitm.cxx
+++ b/svtools/source/items1/ctypeitm.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ctypeitm.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -200,7 +200,7 @@ SfxItemPresentation CntContentTypeItem::GetPresentation(
}
//----------------------------------------------------------------------------
-const INetContentType CntContentTypeItem::GetEnumValue() const
+INetContentType CntContentTypeItem::GetEnumValue() const
{
if ( _eType == CONTENT_TYPE_NOT_INIT )
{
diff --git a/svtools/source/items1/frqitem.cxx b/svtools/source/items1/frqitem.cxx
index 7b2e9f4e2cbf..4068ef8f97f1 100644
--- a/svtools/source/items1/frqitem.cxx
+++ b/svtools/source/items1/frqitem.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: frqitem.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -533,7 +533,7 @@ DateTime SfxFrequencyItem::CalcNextTick( const DateTime& rBase, BOOL bFirst )
aDT.SetDay( 1 );
aDT += (long)(aNextDate.GetDaysInMonth() - 1);
if( aDT.GetDayOfWeek() != nDay )
- for( aDT--; aDT.GetDayOfWeek() != nDay; aDT-- );
+ for( aDT--; aDT.GetDayOfWeek() != nDay; aDT-- ) ;
aNextDate = aDT;
}
else
diff --git a/svtools/source/items1/stylepool.cxx b/svtools/source/items1/stylepool.cxx
index 3aa8e7645919..5f31500be73c 100644
--- a/svtools/source/items1/stylepool.cxx
+++ b/svtools/source/items1/stylepool.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: stylepool.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.78.1 $
*
* This file is part of OpenOffice.org.
*
@@ -77,7 +77,7 @@ namespace {
// <--
~Node();
// --> OD 2008-03-11 #i86923#
- const bool hasItemSet( const bool bCheckUsage ) const;
+ bool hasItemSet( const bool bCheckUsage ) const;
// <--
// --> OD 2008-04-29 #i87808#
// const StylePool::SfxItemSet_Pointer_t getItemSet() const { return aItemSet[aItemSet.size()-1]; }
@@ -121,7 +121,7 @@ namespace {
// <--
// --> OD 2008-05-06 #i86923#
- const bool Node::hasItemSet( const bool bCheckUsage ) const
+ bool Node::hasItemSet( const bool bCheckUsage ) const
{
bool bHasItemSet = false;
diff --git a/svtools/source/misc/ownlist.cxx b/svtools/source/misc/ownlist.cxx
index 8a972595ad65..346b4ff7251e 100644
--- a/svtools/source/misc/ownlist.cxx
+++ b/svtools/source/misc/ownlist.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ownlist.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -53,7 +53,7 @@ static String parseString(const String & rCmd, USHORT * pIndex)
USHORT begin = *pIndex;
- while(*pIndex < rCmd.Len() && rCmd.GetChar((*pIndex) ++) != '\"');
+ while(*pIndex < rCmd.Len() && rCmd.GetChar((*pIndex) ++) != '\"') ;
result = String(rCmd.Copy(begin, *pIndex - begin - 1));
}
diff --git a/svtools/source/misc/urihelper.cxx b/svtools/source/misc/urihelper.cxx
index 970078b4ba6d..1ddb4c6dd6f9 100644
--- a/svtools/source/misc/urihelper.cxx
+++ b/svtools/source/misc/urihelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: urihelper.cxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.22.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -661,17 +661,17 @@ URIHelper::FindFirstURLInText(UniString const & rText,
rEnd));
if (eScheme == INET_PROT_FILE) // 2nd
{
- while (rText.GetChar(i++) != ':');
+ while (rText.GetChar(i++) != ':') ;
xub_StrLen nPrefixEnd = i;
xub_StrLen nUriEnd = i;
while (i != rEnd
&& checkWChar(rCharClass, rText, &i, &nUriEnd, true,
- true));
+ true)) ;
if (i != nPrefixEnd && rText.GetChar(i) == '#')
{
++i;
while (i != rEnd
- && checkWChar(rCharClass, rText, &i, &nUriEnd));
+ && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
}
if (nUriEnd != nPrefixEnd
&& isBoundary1(rCharClass, rText, nUriEnd, rEnd))
@@ -691,16 +691,16 @@ URIHelper::FindFirstURLInText(UniString const & rText,
}
else if (eScheme != INET_PROT_NOT_VALID) // 1st
{
- while (rText.GetChar(i++) != ':');
+ while (rText.GetChar(i++) != ':') ;
xub_StrLen nPrefixEnd = i;
xub_StrLen nUriEnd = i;
while (i != rEnd
- && checkWChar(rCharClass, rText, &i, &nUriEnd));
+ && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
if (i != nPrefixEnd && rText.GetChar(i) == '#')
{
++i;
while (i != rEnd
- && checkWChar(rCharClass, rText, &i, &nUriEnd));
+ && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
}
if (nUriEnd != nPrefixEnd
&& (isBoundary1(rCharClass, rText, nUriEnd, rEnd)
@@ -745,13 +745,13 @@ URIHelper::FindFirstURLInText(UniString const & rText,
{
nUriEnd = ++i;
while (i != rEnd
- && checkWChar(rCharClass, rText, &i, &nUriEnd));
+ && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
}
if (i != rEnd && rText.GetChar(i) == '#')
{
++i;
while (i != rEnd
- && checkWChar(rCharClass, rText, &i, &nUriEnd));
+ && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
}
if (isBoundary1(rCharClass, rText, nUriEnd, rEnd)
|| rText.GetChar(nUriEnd) == '\\')
@@ -778,7 +778,7 @@ URIHelper::FindFirstURLInText(UniString const & rText,
i = nPos + 3;
xub_StrLen nUriEnd = i;
while (i != rEnd
- && checkWChar(rCharClass, rText, &i, &nUriEnd));
+ && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
if (isBoundary1(rCharClass, rText, nUriEnd, rEnd))
{
INetURLObject aUri(UniString(rText, nPos,
@@ -808,7 +808,7 @@ URIHelper::FindFirstURLInText(UniString const & rText,
xub_StrLen nUriEnd = ++i;
while (i != rEnd
&& checkWChar(rCharClass, rText, &i, &nUriEnd,
- true));
+ true)) ;
if (isBoundary1(rCharClass, rText, nUriEnd, rEnd))
{
INetURLObject aUri(UniString(rText, nPos,
diff --git a/svtools/source/misc1/strmadpt.cxx b/svtools/source/misc1/strmadpt.cxx
index b0823437db00..8686f1ab24c2 100644
--- a/svtools/source/misc1/strmadpt.cxx
+++ b/svtools/source/misc1/strmadpt.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: strmadpt.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -971,7 +971,7 @@ bool SvDataPipe_Impl::removeMark(sal_uInt32 nPosition)
if (t == m_aMarks.end())
return false;
m_aMarks.erase(t);
- while (remove(m_pFirstPage));
+ while (remove(m_pFirstPage)) ;
return true;
}
diff --git a/svtools/source/numbers/zforscan.hxx b/svtools/source/numbers/zforscan.hxx
index 5dfecce61935..bc19ac5b633f 100644
--- a/svtools/source/numbers/zforscan.hxx
+++ b/svtools/source/numbers/zforscan.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: zforscan.hxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.24.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -137,11 +137,11 @@ public:
// Veraendert nur die Bool-Variable
// (zum temporaeren Unterbrechen des
// Convert-Modus)
- const BOOL GetConvertMode() { return bConvertMode; }
- const LanguageType GetNewLnge() { return eNewLnge; }
+ BOOL GetConvertMode() const { return bConvertMode; }
+ LanguageType GetNewLnge() const { return eNewLnge; }
// Lesezugriff auf ConvertMode
// und Konvertierungsland/Spr.
- const LanguageType GetTmpLnge() { return eTmpLnge; }
+ LanguageType GetTmpLnge() const { return eTmpLnge; }
// Lesezugriff auf
// und Ausgangsland/Spr.
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index a3bb9e8fac84..14321ecdd84c 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: unoevent.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.136.1 $
*
* This file is part of OpenOffice.org.
*
@@ -495,7 +495,7 @@ SvDetachedEventDescriptor::~SvDetachedEventDescriptor()
delete aMacros;
}
-sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID)
+sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID) const
{
// iterate over supported events
sal_Int16 nIndex = 0;
@@ -548,8 +548,8 @@ void SvDetachedEventDescriptor::getByName(
rMacro = (*aMacros[nIndex]);
}
-const sal_Bool SvDetachedEventDescriptor::hasByName(
- const sal_uInt16 nEvent ) /// item ID of event
+sal_Bool SvDetachedEventDescriptor::hasByName(
+ const sal_uInt16 nEvent ) const /// item ID of event
throw(IllegalArgumentException)
{
sal_Int16 nIndex = getIndex(nEvent);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 17:38:17 +0000