connectivity/source/commontools/dbexception.cxx | 18 +---
connectivity/source/commontools/dbtools.cxx | 4
connectivity/source/commontools/predicateinput.cxx | 14 ---
connectivity/source/commontools/sqlerror.cxx | 12 +-
filter/source/flash/swfwriter.cxx | 11 --
filter/source/flash/swfwriter.hxx | 4
filter/source/graphicfilter/eps/eps.cxx | 36 ++++----
filter/source/msfilter/dffpropset.cxx | 4
filter/source/msfilter/escherex.cxx | 15 +--
filter/source/msfilter/eschesdo.cxx | 2
filter/source/msfilter/eschesdo.hxx | 7 -
filter/source/msfilter/msdffimp.cxx | 21 +----
filter/source/svg/svgwriter.cxx | 87 +++++++--------------
filter/source/svg/svgwriter.hxx | 18 +---
formula/source/core/api/FormulaCompiler.cxx | 5 -
include/connectivity/dbexception.hxx | 17 ----
include/connectivity/dbtools.hxx | 3
include/connectivity/predicateinput.hxx | 15 ---
include/connectivity/sqlerror.hxx | 24 -----
include/filter/msfilter/dffpropset.hxx | 2
include/filter/msfilter/escherex.hxx | 2
include/filter/msfilter/msdffimp.hxx | 3
include/formula/FormulaCompiler.hxx | 3
include/formula/IControlReferenceHandler.hxx | 2
reportdesign/source/ui/dlg/Formula.cxx | 2
reportdesign/source/ui/inc/Formula.hxx | 2
sc/source/ui/formdlg/formula.cxx | 4
sc/source/ui/inc/anyrefdg.hxx | 2
sc/source/ui/inc/formula.hxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 4
30 files changed, 128 insertions(+), 217 deletions(-)
New commits:
commit 2437ccd3e90db011fb7e04f31eb4033d50919d77
Author: Noel Grandin <n...@peralex.com>
Date: Thu Mar 3 11:15:36 2016 +0200
loplugin:unuseddefaultparams in formula
Change-Id: I7f0baa2709db24e8299f0e1c19c0703aee1cbf4f
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 6b0eb35..4813cfc 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1866,11 +1866,10 @@ void FormulaCompiler::CreateStringFromTokenArray(
OUStringBuffer& rBuffer )
}
}
-const FormulaToken* FormulaCompiler::CreateStringFromToken( OUString&
rFormula, const FormulaToken* pTokenP,
- bool bAllowArrAdvance )
+const FormulaToken* FormulaCompiler::CreateStringFromToken( OUString&
rFormula, const FormulaToken* pTokenP )
{
OUStringBuffer aBuffer;
- const FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP,
bAllowArrAdvance );
+ const FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP );
rFormula += aBuffer.makeStringAndClear();
return p;
}
diff --git a/include/formula/FormulaCompiler.hxx
b/include/formula/FormulaCompiler.hxx
index 00e76fa..24956d6 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -237,8 +237,7 @@ public:
void CreateStringFromTokenArray( OUString& rFormula );
void CreateStringFromTokenArray( OUStringBuffer& rBuffer );
- const FormulaToken* CreateStringFromToken( OUString& rFormula, const
FormulaToken* pToken,
- bool bAllowArrAdvance = false );
+ const FormulaToken* CreateStringFromToken( OUString& rFormula, const
FormulaToken* pToken );
const FormulaToken* CreateStringFromToken( OUStringBuffer& rBuffer, const
FormulaToken* pToken,
bool bAllowArrAdvance = false );
diff --git a/include/formula/IControlReferenceHandler.hxx
b/include/formula/IControlReferenceHandler.hxx
index 9dbde6c..595eb13 100644
--- a/include/formula/IControlReferenceHandler.hxx
+++ b/include/formula/IControlReferenceHandler.hxx
@@ -31,7 +31,7 @@ namespace formula
public:
virtual void ShowReference(const OUString& _sRef) = 0;
virtual void HideReference( bool bDoneRefMode = true ) = 0;
- virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton =
nullptr ) = 0;
+ virtual void ReleaseFocus( RefEdit* pEdit ) = 0;
virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton =
nullptr ) = 0;
protected:
diff --git a/reportdesign/source/ui/dlg/Formula.cxx
b/reportdesign/source/ui/dlg/Formula.cxx
index 03f4a7a..4fbd9a3 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -189,7 +189,7 @@ void FormulaDialog::HideReference( bool /*bDoneRefMode*/)
{
}
-void FormulaDialog::ReleaseFocus( RefEdit* /*pEdit*/, RefButton* /*pButton*/)
+void FormulaDialog::ReleaseFocus( RefEdit* /*pEdit*/)
{
}
diff --git a/reportdesign/source/ui/inc/Formula.hxx
b/reportdesign/source/ui/inc/Formula.hxx
index 60b1d56..3df4361 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -99,7 +99,7 @@ public:
// IControlReferenceHandler
virtual void ShowReference(const OUString& _sRef) override;
virtual void HideReference( bool bDoneRefMode = true ) override;
- virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton*
pButton = nullptr ) override;
+ virtual void ReleaseFocus( formula::RefEdit* pEdit ) override;
virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
pButton = nullptr ) override;
};
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 9e15801..943e386 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -510,9 +510,9 @@ void ScFormulaDlg::ToggleCollapsed( formula::RefEdit*
pEdit, formula::RefButton*
{
m_aHelper.ToggleCollapsed(pEdit,pButton);
}
-void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton*
pButton)
+void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit)
{
- m_aHelper.ReleaseFocus(pEdit,pButton);
+ m_aHelper.ReleaseFocus(pEdit);
}
void ScFormulaDlg::dispatch(bool _bOK, bool _bMatrixChecked)
{
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index d84d000..7ef76ad 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -149,7 +149,7 @@ public:
virtual void HideReference( bool bDoneRefMode = true ) override;
virtual void ToggleCollapsed( formula::RefEdit* pEdit,
formula::RefButton* pButton = nullptr ) override;
- virtual void ReleaseFocus( formula::RefEdit* pEdit,
formula::RefButton* pButton = nullptr ) override;
+ virtual void ReleaseFocus( formula::RefEdit* pEdit ) override;
virtual void ViewShellChanged() override;
void SwitchToDocument();
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 60613b7..fc72393 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -88,7 +88,7 @@ public:
virtual void HideReference( bool bDoneRefMode = true ) override;
virtual void SetReference( const ScRange& rRef, ScDocument* pD ) override;
- virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton*
pButton = nullptr ) override;
+ virtual void ReleaseFocus( formula::RefEdit* pEdit ) override;
virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
pButton = nullptr ) override;
virtual void RefInputDone( bool bForced = false ) override;
virtual bool IsTableLocked() const override;
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 1814f5e..c44ec1b 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -962,9 +962,9 @@ void ScRefHandler::ShowReference(const OUString& rStr)
m_aHelper.ShowReference(rStr);
}
-void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton*
pButton )
+void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit )
{
- m_aHelper.ReleaseFocus( pEdit,pButton );
+ m_aHelper.ReleaseFocus( pEdit );
}
void ScRefHandler::RefInputDone( bool bForced )
commit a9b7c6f4b72ecf141203c03664bed0ca81057e01
Author: Noel Grandin <n...@peralex.com>
Date: Thu Mar 3 10:15:51 2016 +0200
loplugin:unuseddefaultparams in include/filter
Change-Id: I893b50835717d449e495e00e9b33de0b60467a6e
diff --git a/connectivity/source/commontools/dbexception.cxx
b/connectivity/source/commontools/dbexception.cxx
index 911c212..04a71ee 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -185,11 +185,11 @@ SQLExceptionInfo::operator const
::com::sun::star::sdb::SQLContext*() const
}
-void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const
OUString& _rSQLState, const sal_Int32 _nErrorCode )
+void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const
OUString& _rSQLState )
{
SQLException aException;
aException.Message = _rErrorMessage;
- aException.ErrorCode = _nErrorCode;
+ aException.ErrorCode = 0;
aException.SQLState = !_rSQLState.isEmpty() ? _rSQLState : "S1000";
aException.NextException = m_aContent;
m_aContent <<= aException;
@@ -369,8 +369,7 @@ void throwInvalidIndexException(const
::com::sun::star::uno::Reference< ::com::s
}
void throwFunctionNotSupportedSQLException(const OUString& _rFunctionName,
- const css::uno::Reference<css::uno::XInterface>& _rxContext,
- const css::uno::Any& _rNextException) throw (css::sdbc::SQLException)
+ const css::uno::Reference<css::uno::XInterface>& _rxContext) throw
(css::sdbc::SQLException)
{
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(
@@ -382,7 +381,7 @@ void throwFunctionNotSupportedSQLException(const OUString&
_rFunctionName,
_rxContext,
getStandardSQLState( StandardSQLState::FUNCTION_NOT_SUPPORTED ),
0,
- _rNextException
+ css::uno::Any()
);
}
@@ -413,7 +412,7 @@ void throwGenericSQLException(const OUString& _rMsg, const
Reference< XInterface
throw SQLException( _rMsg, _rxSource, getStandardSQLState(
StandardSQLState::GENERAL_ERROR ), 0, _rNextException);
}
-void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName,
const Reference< XInterface >& _rxContext, const Any* _pNextException )
+void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName,
const Reference< XInterface >& _rxContext )
throw (SQLException)
{
::connectivity::SharedResources aResources;
@@ -427,7 +426,7 @@ void throwFeatureNotImplementedSQLException( const
OUString& _rFeatureName, cons
_rxContext,
getStandardSQLState( StandardSQLState::FEATURE_NOT_IMPLEMENTED ),
0,
- _pNextException ? *_pNextException : Any()
+ Any()
);
}
@@ -467,10 +466,9 @@ void throwSQLException( const OUString& _rMessage, const
OUString& _rSQLState,
void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState,
- const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode,
- const Any* _pNextException ) throw (SQLException)
+ const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode
) throw (SQLException)
{
- throwSQLException( _rMessage, getStandardSQLState( _eSQLState ),
_rxContext, _nErrorCode, _pNextException );
+ throwSQLException( _rMessage, getStandardSQLState( _eSQLState ),
_rxContext, _nErrorCode );
}
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 3baab99..639df3b 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -734,11 +734,11 @@ Sequence< OUString > getFieldNamesByCommandDescriptor(
const Reference< XConnect
}
SQLException prependErrorInfo( const SQLException& _rChainedException, const
Reference< XInterface >& _rxContext,
- const OUString& _rAdditionalError, const StandardSQLState _eSQLState,
const sal_Int32 _nErrorCode )
+ const OUString& _rAdditionalError, const StandardSQLState _eSQLState )
{
return SQLException( _rAdditionalError, _rxContext,
_eSQLState == StandardSQLState::ERROR_UNSPECIFIED ? OUString() :
getStandardSQLState( _eSQLState ),
- _nErrorCode, makeAny( _rChainedException ) );
+ 0, makeAny( _rChainedException ) );
}
namespace
diff --git a/connectivity/source/commontools/predicateinput.cxx
b/connectivity/source/commontools/predicateinput.cxx
index 63446ed..fe1614b 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -276,8 +276,7 @@ namespace dbtools
OUString OPredicateInputController::getPredicateValueStr(
- const OUString& _rPredicateValue, const Reference< XPropertySet > &
_rxField,
- OUString* _pErrorMessage ) const
+ const OUString& _rPredicateValue, const Reference< XPropertySet > &
_rxField ) const
{
OSL_ENSURE( _rxField.is(),
"OPredicateInputController::getPredicateValue: invalid params!" );
OUString sReturn;
@@ -290,8 +289,6 @@ namespace dbtools
OUString sError;
OSQLParseNode* pParseNode = implPredicateTree( sError, sValue,
_rxField );
- if ( _pErrorMessage )
- *_pErrorMessage = sError;
implParseNode(pParseNode, true) >>= sReturn;
}
@@ -300,7 +297,7 @@ namespace dbtools
}
OUString OPredicateInputController::getPredicateValueStr(
- const OUString& _sField, const OUString& _rPredicateValue, OUString*
_pErrorMessage ) const
+ const OUString& _sField, const OUString& _rPredicateValue ) const
{
OUString sReturn = _rPredicateValue;
OUString sError;
@@ -345,8 +342,6 @@ namespace dbtools
pColumn->setRealName(sField);
OSQLParseNode* pParseNode = implPredicateTree( sError,
_rPredicateValue, xColumn );
- if ( _pErrorMessage )
- *_pErrorMessage = sError;
if(pParseNode)
{
implParseNode(pParseNode, true) >>= sReturn;
@@ -355,8 +350,7 @@ namespace dbtools
}
Any OPredicateInputController::getPredicateValue(
- const OUString& _rPredicateValue, const Reference< XPropertySet > &
_rxField,
- OUString* _pErrorMessage ) const
+ const OUString& _rPredicateValue, const Reference< XPropertySet > &
_rxField ) const
{
OSL_ENSURE( _rxField.is(),
"OPredicateInputController::getPredicateValue: invalid params!" );
@@ -369,8 +363,6 @@ namespace dbtools
OUString sError;
OSQLParseNode* pParseNode = implPredicateTree( sError, sValue,
_rxField );
- if ( _pErrorMessage )
- *_pErrorMessage = sError;
return implParseNode(pParseNode, false);
}
diff --git a/connectivity/source/commontools/sqlerror.cxx
b/connectivity/source/commontools/sqlerror.cxx
index 3b5eda4..8054c59 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -293,9 +293,9 @@ namespace connectivity
}
- OUString SQLError::getErrorMessage( const ErrorCondition _eCondition,
const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const
ParamValue& _rParamValue3 ) const
+ OUString SQLError::getErrorMessage( const ErrorCondition _eCondition,
const ParamValue& _rParamValue1, const ParamValue& _rParamValue2 ) const
{
- return m_pImpl->getErrorMessage( _eCondition, _rParamValue1,
_rParamValue2, _rParamValue3 );
+ return m_pImpl->getErrorMessage( _eCondition, _rParamValue1,
_rParamValue2, ParamValue() );
}
@@ -311,16 +311,16 @@ namespace connectivity
}
- void SQLError::raiseException( const ErrorCondition _eCondition, const
ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue&
_rParamValue3 ) const
+ void SQLError::raiseException( const ErrorCondition _eCondition, const
ParamValue& _rParamValue1, const ParamValue& _rParamValue2 ) const
{
- m_pImpl->raiseException( _eCondition, _rParamValue1, _rParamValue2,
_rParamValue3 );
+ m_pImpl->raiseException( _eCondition, _rParamValue1, _rParamValue2,
ParamValue() );
}
void SQLError::raiseTypedException( const ErrorCondition _eCondition,
const Reference< XInterface >& _rxContext,
- const Type& _rExceptionType, const ParamValue& _rParamValue1, const
ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const
+ const Type& _rExceptionType, const ParamValue& _rParamValue1, const
ParamValue& _rParamValue2 ) const
{
- m_pImpl->raiseTypedException( _eCondition, _rxContext,
_rExceptionType, _rParamValue1, _rParamValue2, _rParamValue3 );
+ m_pImpl->raiseTypedException( _eCondition, _rxContext,
_rExceptionType, _rParamValue1, _rParamValue2, ParamValue() );
}
diff --git a/include/connectivity/dbexception.hxx
b/include/connectivity/dbexception.hxx
index 83caae0..e524c84 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -93,10 +93,8 @@ public:
the error message to prepend
@param _rSQLState
the SQLState of the to-be-constructed SQLException, or NULL if
this should be defaulted to HY000
- @param _nErrorCode
- the ErrorCode of the to-be-constructed SQLException
*/
- void prepend( const OUString& _rErrorMessage, const OUString&
_rSQLState = OUString(), const sal_Int32 _nErrorCode = 0 );
+ void prepend( const OUString& _rErrorMessage, const OUString&
_rSQLState = OUString() );
/** appends a plain message to the chain of exceptions
@param _eType
@@ -222,8 +220,7 @@ OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState(
StandardSQLState _eState );
*/
OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedSQLException(
const OUString& _rFunctionName,
- const css::uno::Reference< css::uno::XInterface >& _rxContext,
- const css::uno::Any& _rNextException = css::uno::Any()
+ const css::uno::Reference< css::uno::XInterface >& _rxContext
)
throw ( css::sdbc::SQLException );
@@ -276,13 +273,10 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
name is built from the name of the interface plus its method, for
instance "XParameters::updateBinaryStream"
@param _rxContext
the context of the exception
- @param _pNextException
- the next exception to chain into the thrown exception, if any
*/
OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedSQLException(
const OUString& _rFeatureName,
- const css::uno::Reference< css::uno::XInterface >& _rxContext,
- const css::uno::Any* _pNextException = nullptr
+ const css::uno::Reference< css::uno::XInterface >& _rxContext
)
throw (css::sdbc::SQLException);
@@ -292,8 +286,6 @@ OOO_DLLPUBLIC_DBTOOLS void
throwFeatureNotImplementedSQLException(
name is built from the name of the interface plus its method, for
instance "XParameters::updateBinaryStream"
@param _rxContext
the context of the exception
- @param _pNextException
- the next exception to chain into the thrown exception, if any
*/
OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedRuntimeException(
const OUString& _rFeatureName,
@@ -332,8 +324,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
const OUString& _rMessage,
StandardSQLState _eSQLState,
const css::uno::Reference< css::uno::XInterface >& _rxContext,
- const sal_Int32 _nErrorCode = 0,
- const css::uno::Any* _pNextException = nullptr
+ const sal_Int32 _nErrorCode = 0
)
throw (css::sdbc::SQLException);
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 515a4dc..18e0919 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -306,8 +306,7 @@ namespace dbtools
const css::sdbc::SQLException& _rChainedException,
const css::uno::Reference< css::uno::XInterface >& _rxContext,
const OUString& _rAdditionalError,
- const StandardSQLState _eSQLState =
StandardSQLState::ERROR_UNSPECIFIED,
- const sal_Int32 _nErrorCode = 0);
+ const StandardSQLState _eSQLState =
StandardSQLState::ERROR_UNSPECIFIED);
/** search the parent hierarchy for a data source.
*/
diff --git a/include/connectivity/predicateinput.hxx
b/include/connectivity/predicateinput.hxx
index 0d80598..16ace17 100644
--- a/include/connectivity/predicateinput.hxx
+++ b/include/connectivity/predicateinput.hxx
@@ -79,36 +79,27 @@ namespace dbtools
the value which has been normalized using normalizePredicateString
@param _rxField
is the field for which a predicate is to be entered
- @param _pErrorMessage
- If not <NULL/>, and a parsing error occurs, the error message will
be copied to the string the argument
- points to.
@see normalizePredicateString
*/
OUString getPredicateValueStr(
const OUString& _rPredicateValue,
- const css::uno::Reference< css::beans::XPropertySet > & _rxField,
- OUString* _pErrorMessage = nullptr
+ const css::uno::Reference< css::beans::XPropertySet > & _rxField
) const;
OUString getPredicateValueStr(
const OUString& _sField
- , const OUString& _rPredicateValue
- , OUString* _pErrorMessage = nullptr) const;
+ , const OUString& _rPredicateValue) const;
/** get the value of the predicate, either as an empty or as a string
@param _rPredicateValue
the value which has been normalized using normalizePredicateString
@param _rxField
is the field for which a predicate is to be entered
- @param _pErrorMessage
- If not <NULL/>, and a parsing error occurs, the error message will
be copied to the string the argument
- points to.
@see normalizePredicateString
*/
css::uno::Any getPredicateValue(
const OUString& _rPredicateValue,
- const css::uno::Reference< css::beans::XPropertySet > & _rxField,
- OUString* _pErrorMessage = nullptr
+ const css::uno::Reference< css::beans::XPropertySet > & _rxField
) const;
private:
diff --git a/include/connectivity/sqlerror.hxx
b/include/connectivity/sqlerror.hxx
index 1484b90..87ff66f 100644
--- a/include/connectivity/sqlerror.hxx
+++ b/include/connectivity/sqlerror.hxx
@@ -108,18 +108,12 @@ namespace connectivity
not present (see <code>::boost::optional::operator !</code>),
then no replacement
will happen, and <code>_rParamValue3</code> will be ignored.
- @param _rParamValue1
- the value which the placeholder $1$ should be replaced with.
If this value is
- not present (see <code>::boost::optional::operator !</code>),
then no replacement
- will happen.
-
@see css::sdb::ErrorCondition
*/
OUString getErrorMessage(
const ErrorCondition _eCondition,
const ParamValue& _rParamValue1 = ParamValue(),
- const ParamValue& _rParamValue2 = ParamValue(),
- const ParamValue& _rParamValue3 = ParamValue()
+ const ParamValue& _rParamValue2 = ParamValue()
) const;
/** returns the error code associated with a given error condition
@@ -204,19 +198,13 @@ namespace connectivity
which is associated with <arg>_eCondition</arg>, replacing the
second placeholder
in this message.
- @param _rParamValue3
- a runtime-dependent value which should be filled into the
error message
- which is associated with <arg>_eCondition</arg>, replacing the
third placeholder
- in this message.
-
@see getErrorMessage
@see getErrorCode
*/
void raiseException(
const ErrorCondition _eCondition,
const ParamValue& _rParamValue1 = ParamValue(),
- const ParamValue& _rParamValue2 = ParamValue(),
- const ParamValue& _rParamValue3 = ParamValue()
+ const ParamValue& _rParamValue2 = ParamValue()
) const;
/** raises a typed exception, that is, a UNO exception which is
derived from
@@ -243,11 +231,6 @@ namespace connectivity
which is associated with <arg>_eCondition</arg>, replacing the
second placeholder
in this message.
- @param _rParamValue3
- a runtime-dependent value which should be filled into the
error message
- which is associated with <arg>_eCondition</arg>, replacing the
third placeholder
- in this message.
-
@throws ::std::bad_cast
if <arg>_rExceptionType</arg> does not specify an exception
class derived from
css::sdbc::SQLException.
@@ -260,8 +243,7 @@ namespace connectivity
const css::uno::Reference< css::uno::XInterface >&
_rxContext,
const css::uno::Type& _rExceptionType,
const ParamValue& _rParamValue1 = ParamValue(),
- const ParamValue& _rParamValue2 = ParamValue(),
- const ParamValue& _rParamValue3 = ParamValue()
+ const ParamValue& _rParamValue2 = ParamValue()
) const;
/** retrieves an <code>SQLException</code> object which contains
information about
commit 99469ae7b9e3c6311ad2d5f894345df03efe7587
Author: Noel Grandin <n...@peralex.com>
Date: Thu Mar 3 10:04:50 2016 +0200
loplugin:unuseddefaultparams in filter
Change-Id: Ife21ac3fc2ede30694a1c7e2f9296105aa548218
diff --git a/filter/source/flash/swfwriter.cxx
b/filter/source/flash/swfwriter.cxx
index 9a627dc..6838e71 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -206,7 +206,7 @@ void Writer::endSprite()
}
-void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x,
sal_Int32 y, sal_uInt16 nClip, const char* pName )
+void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x,
sal_Int32 y, sal_uInt16 nClip )
{
startTag( TAG_PLACEOBJECT2 );
@@ -214,7 +214,7 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth,
sal_Int32 x, sal_Int
aBits.writeUB( sal_uInt32(nClip != 0), 1 ); // Has Clip Actions?
aBits.writeUB( 0, 1 ); // reserved
- aBits.writeUB( sal_uInt32(pName != nullptr), 1 ); // has a name
+ aBits.writeUB( sal_uInt32(0), 1 ); // has a name
aBits.writeUB( 0, 1 ); // no ratio
aBits.writeUB( 0, 1 ); // no color transform
aBits.writeUB( 1, 1 ); // has a matrix
@@ -231,9 +231,6 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth,
sal_Int32 x, sal_Int
_Int16(static_cast<long>(map100thmm(y)*mnDocYScale))));
mpTag->addMatrix( aMatrix ); // transformation matrix
- if( pName )
- mpTag->addString( pName );
-
if( nClip != 0 )
mpTag->addUI16( nClip );
@@ -285,7 +282,7 @@ void Writer::showFrame()
}
-sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x,
sal_Int16 y )
+sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x )
{
mpVDev->SetMapMode( rMtf.GetPrefMapMode() );
Impl_writeActions( rMtf );
@@ -304,7 +301,7 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf,
sal_Int16 x, sal_Int16
sal_uInt16 iDepth = 1;
for(; aIter != aEnd; ++aIter)
{
- placeShape( *aIter, iDepth++, x, y );
+ placeShape( *aIter, iDepth++, x, 0 );
}
endSprite();
diff --git a/filter/source/flash/swfwriter.hxx
b/filter/source/flash/swfwriter.hxx
index 198c049..62ac8ca 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -284,7 +284,7 @@ public:
A character id of a flash sprite is returned that contains all geometry
from the metafile.
*/
- sal_uInt16 defineShape( const GDIMetaFile& rMtf, sal_Int16 x = 0,
sal_Int16 y = 0 );
+ sal_uInt16 defineShape( const GDIMetaFile& rMtf, sal_Int16 x = 0 );
/** defines a bitmap and returns its flash id.
*/
@@ -293,7 +293,7 @@ public:
// control tags
/** inserts a place shape tag into the movie stream or the current sprite
*/
- void placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32
y, sal_uInt16 nClipDepth = 0, const char* pName = nullptr );
+ void placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32
y, sal_uInt16 nClipDepth = 0 );
/** inserts a remove shape tag into the movie stream or the current sprite
*/
void removeShape( sal_uInt16 nDepth );
diff --git a/filter/source/graphicfilter/eps/eps.cxx
b/filter/source/graphicfilter/eps/eps.cxx
index 0704a13..786c112 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -179,14 +179,14 @@ private:
void ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode =
PS_WRAP );
// writes nNumb as number from 0.000 till 1.000 in
ASCII format to stream
- void ImplWriteB1( sal_uInt8 nNumb, sal_uLong nMode =
PS_SPACE );
+ void ImplWriteB1( sal_uInt8 nNumb );
- inline void ImplWritePoint( const Point&, sal_uInt32 nMode =
PS_SPACE );
- void ImplMoveTo( const Point&, sal_uInt32 nMode = PS_SPACE
);
+ inline void ImplWritePoint( const Point& );
+ void ImplMoveTo( const Point& );
void ImplLineTo( const Point&, sal_uInt32 nMode = PS_SPACE
);
void ImplCurveTo( const Point& rP1, const Point& rP2, const
Point& rP3, sal_uInt32 nMode = PS_SPACE );
- void ImplTranslate( const double& fX, const double& fY,
sal_uInt32 nMode = PS_RET );
- void ImplScale( const double& fX, const double& fY,
sal_uInt32 nMode = PS_RET );
+ void ImplTranslate( const double& fX, const double& fY );
+ void ImplScale( const double& fX, const double& fY );
void ImplAddPath( const tools::Polygon & rPolygon );
void ImplWriteLineInfo( double fLineWidth, double
fMiterLimit, SvtGraphicStroke::CapType eLineCap,
@@ -207,7 +207,7 @@ private:
void ImplWriteString( const OString&, VirtualDevice& rVDev,
const long* pDXArry = nullptr, bool bStretch = false );
void ImplDefineFont( const char*, const char* );
- void ImplClosePathDraw( sal_uLong nMode = PS_RET );
+ void ImplClosePathDraw();
void ImplPathDraw();
inline void ImplWriteLineColor( sal_uLong nMode = PS_RET );
@@ -1423,17 +1423,17 @@ void PSWriter::ImplWriteActions( const GDIMetaFile&
rMtf, VirtualDevice& rVDev )
}
}
-inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode )
+inline void PSWriter::ImplWritePoint( const Point& rPoint )
{
ImplWriteDouble( rPoint.X() );
- ImplWriteDouble( rPoint.Y(), nMode );
+ ImplWriteDouble( rPoint.Y() );
}
-void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode )
+void PSWriter::ImplMoveTo( const Point& rPoint )
{
ImplWritePoint( rPoint );
ImplWriteByte( 'm' );
- ImplExecMode( nMode );
+ ImplExecMode( PS_SPACE );
}
void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode )
@@ -1452,20 +1452,20 @@ void PSWriter::ImplCurveTo( const Point& rP1, const
Point& rP2, const Point& rP3
ImplExecMode( nMode );
}
-void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32
nMode )
+void PSWriter::ImplTranslate( const double& fX, const double& fY )
{
ImplWriteDouble( fX );
ImplWriteDouble( fY );
ImplWriteByte( 't' );
- ImplExecMode( nMode );
+ ImplExecMode( PS_RET );
}
-void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode
)
+void PSWriter::ImplScale( const double& fX, const double& fY )
{
ImplWriteDouble( fX );
ImplWriteDouble( fY );
ImplWriteByte( 's' );
- ImplExecMode( nMode );
+ ImplExecMode( PS_RET );
}
void PSWriter::ImplRect( const Rectangle & rRect )
@@ -2137,11 +2137,11 @@ void PSWriter::ImplDefineFont( const char*
pOriginalName, const char* pItalic )
ImplWriteLine( " f" );
}
-void PSWriter::ImplClosePathDraw( sal_uLong nMode )
+void PSWriter::ImplClosePathDraw()
{
mpPS->WriteCharPtr( "pc" );
mnCursorPos += 2;
- ImplExecMode( nMode );
+ ImplExecMode( PS_RET );
}
void PSWriter::ImplPathDraw()
@@ -2447,9 +2447,9 @@ void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb,
sal_uLong nMode )
// writes the sal_uInt8 nNumb as a Number from 0.000 up to 1.000
-void PSWriter::ImplWriteB1( sal_uInt8 nNumb, sal_uLong nMode )
+void PSWriter::ImplWriteB1( sal_uInt8 nNumb )
{
- ImplWriteF( 1000 * ( nNumb + 1 ) / 256 , 3, nMode );
+ ImplWriteF( 1000 * ( nNumb + 1 ) / 256 );
}
inline void PSWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen )
diff --git a/filter/source/msfilter/dffpropset.cxx
b/filter/source/msfilter/dffpropset.cxx
index a351733..68eb93f 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -1284,12 +1284,12 @@ sal_uInt32 DffPropSet::GetPropertyValue( sal_uInt32
nId, sal_uInt32 nDefault ) c
return ( mpPropSetEntries[ nId ].aFlags.bSet ) ? mpPropSetEntries[ nId
].nContent : nDefault;
};
-bool DffPropSet::GetPropertyBool( sal_uInt32 nId, bool bDefault ) const
+bool DffPropSet::GetPropertyBool( sal_uInt32 nId ) const
{
sal_uInt32 nBaseId = nId | 31; // base ID to get the
sal_uInt32 property value
sal_uInt32 nMask = 1 << (nBaseId - nId); // bit mask of the boolean
property
- sal_uInt32 nPropValue = GetPropertyValue( nBaseId, bDefault ? nMask : 0 );
+ sal_uInt32 nPropValue = GetPropertyValue( nBaseId, 0 );
return (nPropValue & nMask) != 0;
}
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 0dbec5d..b51989e 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -5373,17 +5373,12 @@ void EscherEx::Commit( EscherPropertyContainer& rProps,
const Rectangle& )
rProps.Commit( GetStream() );
}
-sal_uInt32 EscherEx::GetColor( const sal_uInt32 nSOColor, bool bSwap )
+sal_uInt32 EscherEx::GetColor( const sal_uInt32 nSOColor )
{
- if ( bSwap )
- {
- sal_uInt32 nColor = nSOColor & 0xff00; // Green
- nColor |= (sal_uInt8)( nSOColor ) << 16; // Red
- nColor |= (sal_uInt8)( nSOColor >> 16 ); // Blue
- return nColor;
- }
- else
- return nSOColor & 0xffffff;
+ sal_uInt32 nColor = nSOColor & 0xff00; // Green
+ nColor |= (sal_uInt8)( nSOColor ) << 16; // Red
+ nColor |= (sal_uInt8)( nSOColor >> 16 ); // Blue
+ return nColor;
}
sal_uInt32 EscherEx::GetColor( const Color& rSOColor, bool bSwap )
diff --git a/filter/source/msfilter/eschesdo.cxx
b/filter/source/msfilter/eschesdo.cxx
index 971b65b..6e94cb52 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -822,7 +822,7 @@ bool ImplEESdrWriter::ImplInitPageValues()
void ImplEESdrWriter::ImplWritePage(
EscherSolverContainer& rSolverContainer,
- ImplEESdrPageType ePageType, bool /* bBackGround */ )
+ ImplEESdrPageType ePageType )
{
ImplInitPageValues();
diff --git a/filter/source/msfilter/eschesdo.hxx
b/filter/source/msfilter/eschesdo.hxx
index e7a089b..6a3f58c 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -58,8 +58,8 @@ public:
sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32
nDef = 0 )
{ return ImplGetPropertyValue( pStr ) ? *static_cast<sal_Int32 const
*>(mAny.getValue()) : nDef; }
- sal_Int32 ImplGetInt32PropertyValue( const OUString& rStr, sal_uInt32 nDef
= 0 )
- { return ImplGetInt32PropertyValue(rStr.getStr(), nDef); }
+ sal_Int32 ImplGetInt32PropertyValue( const OUString& rStr )
+ { return ImplGetInt32PropertyValue(rStr.getStr()); }
const css::uno::Reference< css::drawing::XShape >& GetShapeRef() const
{ return mXShape; }
const css::uno::Any& GetUsrAny() const { return mAny; }
@@ -141,8 +141,7 @@ protected:
void ImplWritePage(
EscherSolverContainer& rSolver,
- ImplEESdrPageType ePageType,
- bool bBackGround = false );
+ ImplEESdrPageType ePageType );
sal_uInt32 ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolver,
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 2806895..1bbd826 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3290,7 +3290,7 @@ bool SvxMSDffManager::SeekToRec( SvStream& rSt,
sal_uInt16 nRecId, sal_uLong nMa
return bRet;
}
-bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2,
sal_uLong nMaxFilePos, DffRecordHeader* pRecHd, sal_uLong nSkipCount ) const
+bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2,
sal_uLong nMaxFilePos, DffRecordHeader* pRecHd ) const
{
bool bRet = false;
sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for
conditionally later restoration
@@ -3301,21 +3301,16 @@ bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1,
sal_uInt16 nRecId2, sal_uL
break;
if ( aHd.nRecType == nRecId1 || aHd.nRecType == nRecId2 )
{
- if ( nSkipCount )
- nSkipCount--;
+ bRet = true;
+ if ( pRecHd )
+ *pRecHd = aHd;
else
{
- bRet = true;
- if ( pRecHd )
- *pRecHd = aHd;
- else
+ bool bSeekSuccess = aHd.SeekToBegOfRecord(rStCtrl);
+ if (!bSeekSuccess)
{
- bool bSeekSuccess = aHd.SeekToBegOfRecord(rStCtrl);
- if (!bSeekSuccess)
- {
- bRet = false;
- break;
- }
+ bRet = false;
+ break;
}
}
}
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 2caae96..67bc12b 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -107,9 +107,9 @@ SVGAttributeWriter::~SVGAttributeWriter()
}
-double SVGAttributeWriter::ImplRound( double fValue, sal_Int32 nDecs )
+double SVGAttributeWriter::ImplRound( double fValue )
{
- return floor( fValue * pow( 10.0, (int)nDecs ) + 0.5 ) / pow( 10.0,
(int)nDecs );
+ return floor( fValue * pow( 10.0, 3 ) + 0.5 ) / pow( 10.0, 3 );
}
@@ -1497,8 +1497,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
void SVGTextWriter::writeTextPortion( const Point& rPos,
- const OUString& rText,
- bool bApplyMapping )
+ const OUString& rText )
{
if( rText.isEmpty() )
return;
@@ -1564,14 +1563,14 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
if( true || !bTextSpecial )
{
- implWriteTextPortion( rPos, rText, mpVDev->GetTextColor(),
bApplyMapping );
+ implWriteTextPortion( rPos, rText, mpVDev->GetTextColor(),
true/*bApplyMapping*/ );
}
else
{
// to be implemented
}
#else
- implWriteTextPortion( rPos, rText, mpVDev->GetTextColor(), bApplyMapping );
+ implWriteTextPortion( rPos, rText, mpVDev->GetTextColor(),
true/*bApplyMapping*/ );
#endif
if( bStandAloneTextPortion )
@@ -1918,20 +1917,16 @@ void SVGActionWriter::ImplWriteRect( const Rectangle&
rRect, long nRadX, long nR
}
-void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long
nRadY,
- bool bApplyMapping )
+void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long
nRadY )
{
Point aCenter;
- if( bApplyMapping )
- ImplMap( rCenter, aCenter );
- else
- aCenter = rCenter;
+ ImplMap( rCenter, aCenter );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, OUString::number(
aCenter.X() ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::number(
aCenter.Y() ) );
- mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::number(
bApplyMapping ? ImplMap( nRadX ) : nRadX ) );
- mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number(
bApplyMapping ? ImplMap( nRadY ) : nRadY ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::number(
ImplMap( nRadX ) ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number(
ImplMap( nRadY ) ) );
{
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemEllipse, true, true );
@@ -1939,12 +1934,11 @@ void SVGActionWriter::ImplWriteEllipse( const Point&
rCenter, long nRadX, long n
}
-void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs,
- bool bApplyMapping )
+void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs )
{
if ( !rAttrs.IsDefault() )
{
- sal_Int32 nStrokeWidth = bApplyMapping ? ImplMap( rAttrs.GetWidth() )
: rAttrs.GetWidth();
+ sal_Int32 nStrokeWidth = ImplMap( rAttrs.GetWidth() );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
OUString::number( nStrokeWidth ) );
// support for LineJoint
@@ -2015,14 +2009,11 @@ void SVGActionWriter::ImplWritePolyPolygon( const
tools::PolyPolygon& rPolyPoly,
}
-void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool
bApplyMapping )
+void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape )
{
tools::PolyPolygon aPolyPoly;
- if( bApplyMapping )
- ImplMap( rShape.maShapePolyPoly, aPolyPoly );
- else
- aPolyPoly = rShape.maShapePolyPoly;
+ ImplMap( rShape.maShapePolyPoly, aPolyPoly );
const bool bLineOnly = ( rShape.maShapeFillColor == Color(
COL_TRANSPARENT ) ) && ( !rShape.mapShapeGradient.get() );
Rectangle aBoundRect( aPolyPoly.GetBoundRect() );
@@ -2034,7 +2025,7 @@ void SVGActionWriter::ImplWriteShape( const
SVGShapeDescriptor& rShape, bool bAp
if( rShape.mnStrokeWidth )
{
- sal_Int32 nStrokeWidth = ( bApplyMapping ? ImplMap(
rShape.mnStrokeWidth ) : rShape.mnStrokeWidth );
+ sal_Int32 nStrokeWidth = ImplMap( rShape.mnStrokeWidth );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
OUString::number( nStrokeWidth ) );
}
@@ -2090,9 +2081,7 @@ void SVGActionWriter::ImplWriteShape( const
SVGShapeDescriptor& rShape, bool bAp
for( size_t k = 0; k < rShape.maDashArray.size(); ++k )
{
- const sal_Int32 nDash = ( bApplyMapping ?
- ImplMap( FRound( rShape.maDashArray[ k
] ) ) :
- FRound( rShape.maDashArray[ k ] ) );
+ const sal_Int32 nDash = ImplMap( FRound( rShape.maDashArray[ k ] )
);
if( k )
aDashArrayStr += aComma;
@@ -2397,8 +2386,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
- const long* pDXArray, long nWidth,
- bool bApplyMapping )
+ const long* pDXArray, long nWidth )
{
const FontMetric aMetric( mpVDev->GetFontMetric() );
@@ -2406,7 +2394,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos,
const OUString& rText,
if( !bTextSpecial )
{
- ImplWriteText( rPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(),
bApplyMapping );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(),
true/*bApplyMapping*/ );
}
else
{
@@ -2434,8 +2422,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos,
const OUString& rText,
aPos += aOffset;
}
- ImplWriteText( aPos, rText, pDXArray, nWidth, aReliefColor,
bApplyMapping );
- ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor,
bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, aReliefColor,
true/*bApplyMapping*/ );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor,
true/*bApplyMapping*/ );
}
else
{
@@ -2453,34 +2441,34 @@ void SVGActionWriter::ImplWriteText( const Point& rPos,
const OUString& rText,
Point aPos( rPos );
aPos += Point( nOff, nOff );
- ImplWriteText( aPos, rText, pDXArray, nWidth, aShadowColor,
bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, aShadowColor,
true/*bApplyMapping*/ );
if( !aMetric.IsOutline() )
{
- ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor,
bApplyMapping );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor,
true/*bApplyMapping*/ );
}
}
if( aMetric.IsOutline() )
{
Point aPos = rPos + Point( -6, -6 );
- ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), true/*bApplyMapping*/ );
aPos = rPos + Point( +6, +6);
- ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), true/*bApplyMapping*/ );
aPos = rPos + Point( -6, +0);
- ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), true/*bApplyMapping*/ );
aPos = rPos + Point( -6, +6);
- ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), true/*bApplyMapping*/ );
aPos = rPos + Point( +0, +6);
- ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), true/*bApplyMapping*/ );
aPos = rPos + Point( +0, -6);
- ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), true/*bApplyMapping*/ );
aPos = rPos + Point( +6, -1);
- ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), true/*bApplyMapping*/ );
aPos = rPos + Point( +6, +0);
- ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), bApplyMapping );
+ ImplWriteText( aPos, rText, pDXArray, nWidth,
mpVDev->GetTextColor(), true/*bApplyMapping*/ );
- ImplWriteText( rPos, rText, pDXArray, nWidth, Color( COL_WHITE
), bApplyMapping );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, Color( COL_WHITE
), true/*bApplyMapping*/ );
}
}
}
@@ -2674,8 +2662,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos,
const OUString& rText,
void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
const Point& rPt, const Size& rSz,
- const Point& rSrcPt, const Size& rSrcSz,
- bool bApplyMapping )
+ const Point& rSrcPt, const Size& rSrcSz )
{
if( !!rBmpEx )
{
@@ -2699,16 +2686,8 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx&
rBmpEx,
OUStringBuffer aBuffer( "data:image/png;base64," );
::sax::Converter::encodeBase64( aBuffer, aSeq );
- if( bApplyMapping )
- {
- ImplMap( rPt, aPt );
- ImplMap( rSz, aSz );
- }
- else
- {
- aPt = rPt;
- aSz = rSz;
- }
+ ImplMap( rPt, aPt );
+ ImplMap( rSz, aSz );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX,
OUString::number( aPt.X() ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY,
OUString::number( aPt.Y() ) );
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 28c9eae..5c01077 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -91,7 +91,7 @@ private:
SVGAttributeWriter();
- static double ImplRound( double fVal, sal_Int32 nDecs = 3 );
+ static double ImplRound( double fVal );
public:
@@ -213,8 +213,7 @@ class SVGTextWriter
template< typename MetaBitmapActionType >
void writeBitmapPlaceholder( const MetaBitmapActionType* pAction );
void implWriteEmbeddedBitmaps();
- void writeTextPortion( const Point& rPos, const OUString& rText,
- bool bApplyMapping = true );
+ void writeTextPortion( const Point& rPos, const OUString& rText );
void implWriteTextPortion( const Point& rPos, const OUString& rText,
Color aTextColor, bool bApplyMapping );
@@ -303,24 +302,21 @@ private:
bool bApplyMapping = true );
void ImplWriteRect( const Rectangle& rRect, long nRadX
= 0, long nRadY = 0,
bool bApplyMapping = true );
- void ImplWriteEllipse( const Point& rCenter, long
nRadX, long nRadY,
- bool bApplyMapping = true );
+ void ImplWriteEllipse( const Point& rCenter, long
nRadX, long nRadY );
void ImplWritePattern( const tools::PolyPolygon&
rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, sal_uInt32
nWriteFlags );
- void ImplAddLineAttr( const LineInfo &rAttrs,
- bool bApplyMapping = true );
+ void ImplAddLineAttr( const LineInfo &rAttrs );
void ImplWritePolyPolygon( const tools::PolyPolygon&
rPolyPoly, bool bLineOnly,
bool bApplyMapping = true );
- void ImplWriteShape( const SVGShapeDescriptor& rShape,
bool bApplyMapping = true );
+ void ImplWriteShape( const SVGShapeDescriptor& rShape );
void ImplWriteGradientEx( const tools::PolyPolygon&
rPolyPoly, const Gradient& rGradient, sal_uInt32 nWriteFlags);
void ImplWriteGradientLinear( const tools::PolyPolygon&
rPolyPoly, const Gradient& rGradient );
void ImplWriteGradientStop( const Color& rColor, double
fOffset );
static Color ImplGetColorWithIntensity( const Color& rColor,
sal_uInt16 nIntensity );
static Color ImplGetGradientColor( const Color& rStartColor,
const Color& rEndColor, double fOffset );
void ImplWriteMask( GDIMetaFile& rMtf, const Point&
rDestPt, const Size& rDestSize, const Gradient& rGradient, sal_uInt32
nWriteFlags );
- void ImplWriteText( const Point& rPos, const OUString&
rText, const long* pDXArray, long nWidth, bool bApplyMapping = true );
+ void ImplWriteText( const Point& rPos, const OUString&
rText, const long* pDXArray, long nWidth );
void ImplWriteText( const Point& rPos, const OUString&
rText, const long* pDXArray, long nWidth, Color aTextColor, bool bApplyMapping
);
- void ImplWriteBmp( const BitmapEx& rBmpEx, const Point&
rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz,
- bool bApplyMapping = true );
+ void ImplWriteBmp( const BitmapEx& rBmpEx, const Point&
rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz );
void ImplWriteActions( const GDIMetaFile& rMtf,
sal_uInt32 nWriteFlags,
diff --git a/include/filter/msfilter/dffpropset.hxx
b/include/filter/msfilter/dffpropset.hxx
index ff2173c..57da2de 100644
--- a/include/filter/msfilter/dffpropset.hxx
+++ b/include/filter/msfilter/dffpropset.hxx
@@ -56,7 +56,7 @@ class MSFILTER_DLLPUBLIC DffPropSet
bool IsHardAttribute( sal_uInt32 nId ) const;
sal_uInt32 GetPropertyValue( sal_uInt32 nId, sal_uInt32 nDefault )
const;
/** Returns a boolean property by its real identifier. */
- bool GetPropertyBool( sal_uInt32 nId, bool bDefault = false )
const;
+ bool GetPropertyBool( sal_uInt32 nId ) const;
/** Returns a string property. */
OUString GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const;
bool SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const;
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index c6c9065..9648f66 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1242,7 +1242,7 @@ public:
virtual void Commit( EscherPropertyContainer& rProps, const Rectangle&
rRect);
- static sal_uInt32 GetColor( const sal_uInt32 nColor, bool bSwap = true );
+ static sal_uInt32 GetColor( const sal_uInt32 nColor );
static sal_uInt32 GetColor( const Color& rColor, bool bSwap = true );
// ...Sdr... implemented in eschesdo.cxx
diff --git a/include/filter/msfilter/msdffimp.hxx
b/include/filter/msfilter/msdffimp.hxx
index fed255e..3e3f414 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -526,8 +526,7 @@ public:
bool SeekToRec2( sal_uInt16 nRecId1,
sal_uInt16 nRecId2,
sal_uLong nMaxFilePos,
- DffRecordHeader* pRecHd = nullptr,
- sal_uLong nSkipCount = 0 ) const;
+ DffRecordHeader* pRecHd = nullptr ) const;
static OUString MSDFFReadZString( SvStream& rIn,
sal_uInt32 nMaxLen,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
