[Libreoffice-commits] core.git: editeng/source sc/source sw/source vcl/source xmloff/source
Thomas Arnhold
thomas at arnhold.org
Tue Mar 26 19:15:13 PDT 2013
editeng/source/items/frmitems.cxx | 22 ----------------------
sc/source/core/data/fillinfo.cxx | 17 -----------------
sc/source/core/data/olinetab.cxx | 7 -------
sc/source/filter/inc/xihelper.hxx | 2 --
sc/source/ui/miscdlgs/acredlin.cxx | 8 --------
sc/source/ui/miscdlgs/highred.cxx | 8 --------
sc/source/ui/view/drawutil.cxx | 9 ---------
sw/source/core/doc/number.cxx | 9 ---------
sw/source/core/docnode/nodes.cxx | 5 -----
sw/source/ui/dialog/uiregionsw.cxx | 5 -----
vcl/source/app/settings.cxx | 8 --------
xmloff/source/text/txtflde.cxx | 12 ------------
12 files changed, 112 deletions(-)
New commits:
commit 646daee253b69404591c006ec6e717b6660af30b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Mar 27 02:57:35 2013 +0100
kill some unused inlines
Change-Id: I17160b264b547067c694dd268eb0d3bd1086565d
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 869f3a1..65b5fa0 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -88,28 +88,6 @@ using namespace ::com::sun::star::table::BorderLineStyle;
#define TWIP_TO_MM100_UNSIGNED(TWIP) ((((TWIP)*127L+36L)/72L))
#define MM100_TO_TWIP_UNSIGNED(MM100) ((((MM100)*72L+63L)/127L))
-// STATIC DATA -----------------------------------------------------------
-
-inline void SetValueProp( XubString& rStr, const sal_uInt16 nValue,
- const sal_uInt16 nProp )
-{
- if( 100 == nProp )
- rStr += OUString::number( nValue );
- else
- rStr += OUString::number(nProp) + "%";
-}
-
-inline void SetValueProp( XubString& rStr, const short nValue,
- const sal_uInt16 nProp )
-{
- if( 100 == nProp )
- rStr += OUString::number( nValue );
- else
- rStr += OUString::number(nProp) + "%";
-}
-
-// -----------------------------------------------------------------------
-
/*
SvxBorderLine is not an SfxPoolItem, and has no Store/Create serialization/deserialization methods.
Since border line information needs to be serialized by the table autoformat code, these file-local
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index f7366cd..40ed6ba 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -57,23 +57,6 @@ enum FillInfoLinePos
};
-inline const ::editeng::SvxBorderLine* GetNullOrLine( const SvxBoxItem* pBox, FillInfoLinePos eWhich )
-{
- if (pBox)
- {
- if (eWhich==FILP_TOP)
- return pBox->GetTop();
- else if (eWhich==FILP_BOTTOM)
- return pBox->GetBottom();
- else if (eWhich==FILP_LEFT)
- return pBox->GetLeft();
- else
- return pBox->GetRight();
- }
- else
- return NULL;
-}
-
// aehnlich wie in output.cxx
static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index eb6461b..307aba1 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -108,13 +108,6 @@ void ScOutlineEntry::SetVisible( bool bNewVisible )
ScOutlineCollection::ScOutlineCollection() {}
-inline short IntCompare( SCCOLROW nX, SCCOLROW nY )
-{
- if ( nX==nY ) return 0;
- else if ( nX<nY ) return -1;
- else return 1;
-}
-
size_t ScOutlineCollection::size() const
{
return maEntries.size();
diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx
index 33f7cea..8057fff 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -310,8 +310,6 @@ public:
inline sal_uInt8 GetXclError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? mnBoolErr : EXC_ERR_NA; }
/** Returns the cached Calc error code, if this value has Error type, else 0. */
sal_uInt16 GetScError() const;
- /** Returns the token array if this is a Boolean value or error value, else 0. */
- inline const ScTokenArray* GetBoolErrFmla() const { return mxTokArr.get(); }
protected:
typedef ::std::auto_ptr< String > StringPtr;
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 004cf24..8415540 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -51,14 +51,6 @@
#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
-inline void EnableDisable( Window& rWin, bool bEnable )
-{
- if (bEnable)
- rWin.Enable();
- else
- rWin.Disable();
-}
-
#define RD_SPECIAL_NONE 0
#define RD_SPECIAL_CONTENT 1
#define RD_SPECIAL_VISCONTENT 2
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 6b0a227..752bf70 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -42,14 +42,6 @@
#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
-inline void EnableDisable( Window& rWin, sal_Bool bEnable )
-{
- if (bEnable)
- rWin.Enable();
- else
- rWin.Disable();
-}
-
//============================================================================
// class ScHighlightChgDlg
diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx
index dc1c5db..7fbb498 100644
--- a/sc/source/ui/view/drawutil.cxx
+++ b/sc/source/ui/view/drawutil.cxx
@@ -24,15 +24,6 @@
#include "global.hxx"
#include "viewdata.hxx"
-// STATIC DATA -----------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-
-inline Fraction MakeFraction( long nA, long nB )
-{
- return ( nA && nB ) ? Fraction(nA,nB) : Fraction(1,1);
-}
void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 7dd9b3d..6efe572 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1104,15 +1104,6 @@ namespace numfunc
return *mpFont;
}
- inline short GetFontWeight() const
- {
- return static_cast<short>(meFontWeight);
- }
-
- inline short GetFontItalic() const
- {
- return static_cast<short>(meFontItalic);
- }
inline sal_Unicode GetChar( sal_uInt8 p_nListLevel ) const
{
if (p_nListLevel >= MAXLEVEL)
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 7ce9e62..543aa24 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1836,11 +1836,6 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
|*
*************************************************************************/
-inline sal_uInt8 MaxLvl( sal_uInt8 nMin, sal_uInt8 nMax, short nNew )
-{
- return (sal_uInt8)(nNew < nMin ? nMin : nNew > nMax ? nMax : nNew);
-}
-
void SwNodes::_CopyNodes( const SwNodeRange& rRange,
const SwNodeIndex& rIndex, sal_Bool bNewFrms, sal_Bool bTblInsDummyNode ) const
{
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index e4a741b..4e7f724 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1900,11 +1900,6 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
// 5 - A, .., AA, .., - 9
// 6 - a, .., aa, .., - 10
-inline sal_uInt16 GetNumPos( sal_uInt16 n )
-{
- return SVX_NUM_ARABIC < n ? n - 4 : n;
-}
-
inline SvxExtNumType GetNumType( sal_uInt16 n )
{
return (SvxExtNumType)(4 < n ? n + 4 : n );
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 3749e56..d8b1ce5 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -834,14 +834,6 @@ void StyleSettings::CopyData()
// -----------------------------------------------------------------------
-inline sal_Bool ImplIsBackOrWhite( const Color& rColor )
-{
- sal_uInt8 nLuminance = rColor.GetLuminance();
- return ( nLuminance < 8 ) || ( nLuminance > 250 );
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool StyleSettings::operator ==( const StyleSettings& rSet ) const
{
if ( mpData == rSet.mpData )
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 92bc85b..62c8bdf 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -266,8 +266,6 @@ inline sal_Int8 GetInt8Property(const OUString&,
const Reference<XPropertySet> &);
inline util::DateTime const GetDateTimeProperty( const OUString& sPropName,
const Reference<XPropertySet> & xPropSet);
-inline util::Date const GetDateProperty( const OUString& sPropName,
- const Reference<XPropertySet> & xPropSet);
inline Sequence<OUString> const GetStringSequenceProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet);
@@ -3587,16 +3585,6 @@ inline util::DateTime const GetDateTimeProperty(
return aTime;
}
-inline util::Date const GetDateProperty(
- const OUString& sPropName,
- const Reference<XPropertySet> & xPropSet)
-{
- Any aAny = xPropSet->getPropertyValue(sPropName);
- util::Date aDate;
- aAny >>= aDate;
- return aDate;
-}
-
inline Sequence<OUString> const GetStringSequenceProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
More information about the Libreoffice-commits
mailing list