diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-09 12:04:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-09 12:04:12 +0200 |
commit | 9c51f5b80640034097457de9603f4ffa021e42ff (patch) | |
tree | 42c7e043617e03029bd2b8eb85238f9dd782728a /xmloff/source/draw | |
parent | e1bc666cda47eff1305253923ab16b9fd4eb3d42 (diff) |
Clean up function declarations and some unused functions
Change-Id: I2ca50a15209503020047975ac848df98b74089af
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r-- | xmloff/source/draw/animationimport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlimp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/xexptran.cxx | 104 | ||||
-rw-r--r-- | xmloff/source/draw/ximpcustomshape.cxx | 16 |
5 files changed, 3 insertions, 124 deletions
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 92d0ac3e2192..4ea112dc3705 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -62,6 +62,7 @@ #include <osl/mutex.hxx> #include <xmloff/nmspmap.hxx> #include "anim.hxx" +#include "facreg.hxx" #include "animations.hxx" #include "animationimport.hxx" @@ -124,7 +125,6 @@ public: Sequence< double > convertKeyTimes( const OUString& rValue ); Sequence< TimeFilterPair > convertTimeFilter( const OUString& rValue ); - bool convertAnimationValue( XMLTokenEnum eAttributeName, Any& rValue ); const OUString mastrHSL; }; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 80f35802ba39..46b714f621c0 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -60,6 +60,7 @@ #include "sdpropls.hxx" #include <xmloff/xmlexppr.hxx> #include <com/sun/star/beans/XPropertyState.hpp> +#include "facreg.hxx" #include "xexptran.hxx" #include <cppuhelper/implbase1.hxx> diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index c184ea0375a3..dbd834787359 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -21,6 +21,7 @@ #include <comphelper/processfactory.hxx> #include <xmloff/xmlscripti.hxx> +#include "facreg.hxx" #include "sdxmlimp_impl.hxx" #include "ximpbody.hxx" @@ -52,8 +53,6 @@ using namespace ::xmloff::token; class SdXMLBodyContext_Impl : public SvXMLImportContext { - const SdXMLImport& GetSdImport() const - { return (const SdXMLImport&)GetImport(); } SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: @@ -92,7 +91,6 @@ SvXMLImportContext *SdXMLBodyContext_Impl::CreateChildContext( class SdXMLDocContext_Impl : public virtual SvXMLImportContext { protected: - const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); } SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 0d7b5a0e52cb..6882cf6ce4ef 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -36,26 +36,6 @@ using namespace ::com::sun::star; -// Defines - -#define BORDER_INTEGERS_ARE_EQUAL (4) - -// Predeclarations - -void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen); -void Imp_CalcVectorValues(::basegfx::B2DVector& aVec1, ::basegfx::B2DVector& aVec2, bool& bSameLength, bool& bSameDirection) -{ - const sal_Int32 nLen1(FRound(aVec1.getLength())); - const sal_Int32 nLen2(FRound(aVec2.getLength())); - aVec1.normalize(); - aVec2.normalize(); - aVec1 += aVec2; - const sal_Int32 nLen3(FRound(aVec1.getLength() * ((nLen1 + nLen2) / 2.0))); - - bSameLength = (abs(nLen1 - nLen2) <= BORDER_INTEGERS_ARE_EQUAL); - bSameDirection = (nLen3 <= BORDER_INTEGERS_ARE_EQUAL); -} - // parsing help functions for simple chars void Imp_SkipSpaces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen) { @@ -87,18 +67,6 @@ void Imp_SkipSpacesAndClosingBraces(const OUString& rStr, sal_Int32& rPos, const // parsing help functions for integer numbers -bool Imp_IsOnNumberChar(const OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true) -{ - sal_Unicode aChar(rStr[nPos]); - - if(('0' <= aChar && '9' >= aChar) - || (bSignAllowed && '+' == aChar) - || (bSignAllowed && '-' == aChar) - ) - return true; - return false; -} - bool Imp_IsOnUnitChar(const OUString& rStr, const sal_Int32 nPos) { sal_Unicode aChar(rStr[nPos]); @@ -111,78 +79,6 @@ bool Imp_IsOnUnitChar(const OUString& rStr, const sal_Int32 nPos) return false; } -void Imp_SkipNumber(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen) -{ - bool bSignAllowed(true); - - while(rPos < nLen && Imp_IsOnNumberChar(rStr, rPos, bSignAllowed)) - { - bSignAllowed = false; - rPos++; - } -} - -void Imp_SkipNumberAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos, - const sal_Int32 nLen) -{ - Imp_SkipNumber(rStr, rPos, nLen); - Imp_SkipSpacesAndCommas(rStr, rPos, nLen); -} - -void Imp_PutNumberChar(OUString& rStr, sal_Int32 nValue) -{ - OUStringBuffer sStringBuffer; - ::sax::Converter::convertNumber(sStringBuffer, nValue); - rStr += OUString(sStringBuffer.makeStringAndClear()); -} - -void Imp_PutNumberCharWithSpace(OUString& rStr, sal_Int32 nValue) -{ - const sal_Int32 aLen(rStr.getLength()); - if(aLen) - if(Imp_IsOnNumberChar(rStr, aLen - 1, false) && nValue >= 0) - rStr += OUString(' '); - Imp_PutNumberChar(rStr, nValue); -} - -// parsing help functions for double numbers - -void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32) -{ - sal_Unicode aChar(rStr[rPos]); - - if('+' == aChar || '-' == aChar) - { - ++rPos; - aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; - } - - while(('0' <= aChar && '9' >= aChar) - || '.' == aChar) - { - ++rPos; - aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; - } - - if('e' == aChar || 'E' == aChar) - { - ++rPos; - aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; - - if('+' == aChar || '-' == aChar) - { - ++rPos; - aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; - } - - while('0' <= aChar && '9' >= aChar) - { - ++rPos; - aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos]; - } - } -} - double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen, const SvXMLUnitConverter& rConv, double fRetval, bool bLookForUnits = false) { diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 31c9e31a177e..38c41f87c6fa 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -113,22 +113,6 @@ void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetDistance( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) -{ - double fAttrDouble; - sal_Int16 const eSrcUnit( ::sax::Converter::GetUnitFromString( - rValue, util::MeasureUnit::MM_100TH) ); - if (::sax::Converter::convertDouble(fAttrDouble, rValue, eSrcUnit, - util::MeasureUnit::MM_100TH)) - { - beans::PropertyValue aProp; - aProp.Name = EASGet( eDestProp ); - aProp.Value <<= fAttrDouble; - rDest.push_back( aProp ); - } -} - void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { |