diff options
57 files changed, 236 insertions, 1633 deletions
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index 1448fc13aa8b..6735908db22f 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -23,7 +23,6 @@ #include <memory> - #include "rtl/ustring.hxx" #include "rtl/ustrbuf.hxx" #include "uno/sequence2.h" @@ -34,7 +33,6 @@ #using <cli_uretypes.dll> - #undef VOID namespace sri = System::Runtime::InteropServices; @@ -44,8 +42,6 @@ namespace ucss = unoidl::com::sun::star; using namespace std; - - namespace cli_uno { System::String^ mapUnoPolymorphicName(System::String^ unoName); @@ -63,7 +59,6 @@ inline auto_ptr< rtl_mem > seq_allocate( sal_Int32 nElements, sal_Int32 nSize ) return seq; } - System::Object^ Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceTypeDescription *pTD) const { System::Object^ retVal= nullptr; @@ -187,7 +182,6 @@ System::Type^ loadCliType(System::String ^ unoName) return retVal; } - System::Type^ mapUnoType(typelib_TypeDescription const * pTD) { return mapUnoType(pTD->pWeakRef); @@ -530,9 +524,6 @@ System::String^ mapUnoTypeName(rtl_uString const * typeName) return buf->ToString(); } - - - /** For example, there is a uno type com.sun.star.Foo<char, long>. The values in the type list @@ -544,6 +535,7 @@ inline System::String^ mapUnoPolymorphicName(System::String^ unoName) { return mapPolymorphicName(unoName, false); } + /** For example, there is a type name such as com.sun.star.Foo<System.Char, System.Int32>. The values in the type list @@ -714,6 +706,7 @@ OUString mapCliTypeName(System::String^ typeName) } return mapCliString(buf->ToString()); } + /** Maps uno types to dot net types. * If uno_data is null then the type description is converted to System::Type */ @@ -1489,7 +1482,6 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data, OSL_ASSERT(0); throw; } - } /** diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index a4880d4416f2..b5fc41d193a6 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "connectivity/CommonTools.hxx" #include "diagnose_ex.h" #include "TConnection.hxx" @@ -100,11 +99,8 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::form; using namespace connectivity; -//......................................................................... namespace dbtools { -//......................................................................... - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; @@ -112,14 +108,11 @@ namespace dbtools using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::task; -//============================================================================== -//============================================================================== namespace { typedef sal_Bool (SAL_CALL XDatabaseMetaData::*FMetaDataSupport)(); } -//============================================================================== -//============================================================================== + sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn, const Reference< XNumberFormatTypes >& _xTypes, const Locale& _rLocale) @@ -149,7 +142,6 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn, _rLocale); } -//------------------------------------------------------------------ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, sal_Int32 _nScale, sal_Bool _bIsCurrency, @@ -231,8 +223,6 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, return nFormat; } -//============================================================================== -//------------------------------------------------------------------------------ Reference< XConnection> findConnection(const Reference< XInterface >& xParent) { Reference< XConnection> xConnection(xParent, UNO_QUERY); @@ -245,7 +235,6 @@ Reference< XConnection> findConnection(const Reference< XInterface >& xParent) return xConnection; } -//------------------------------------------------------------------------------ Reference< XDataSource> getDataSource_allowException( const OUString& _rsTitleOrPath, const Reference< XComponentContext >& _rxContext ) @@ -257,7 +246,6 @@ Reference< XDataSource> getDataSource_allowException( return Reference< XDataSource >( xDatabaseContext->getByName( _rsTitleOrPath ), UNO_QUERY ); } -//------------------------------------------------------------------------------ Reference< XDataSource > getDataSource( const OUString& _rsTitleOrPath, const Reference< XComponentContext >& _rxContext ) @@ -275,7 +263,6 @@ Reference< XDataSource > getDataSource( return xDS; } -//------------------------------------------------------------------------------ Reference< XConnection > getConnection_allowException( const OUString& _rsTitleOrPath, const OUString& _rsUser, @@ -321,7 +308,6 @@ Reference< XConnection > getConnection_allowException( return xConnection; } -//------------------------------------------------------------------------------ Reference< XConnection> getConnection_withFeedback(const OUString& _rDataSourceName, const OUString& _rUser, const OUString& _rPwd, const Reference< XComponentContext>& _rxContext) SAL_THROW ( (SQLException) ) @@ -343,7 +329,6 @@ Reference< XConnection> getConnection_withFeedback(const OUString& _rDataSourceN return xReturn; } -//------------------------------------------------------------------------------ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) throw (RuntimeException) { Reference< XConnection> xReturn; @@ -353,7 +338,6 @@ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) thro return xReturn; } -//------------------------------------------------------------------------------ // helper function which allows to implement both the connectRowset and the ensureRowSetConnection semantics // if connectRowset (which is deprecated) is removed, this function and one of its parameters are // not needed anymore, the whole implementation can be moved into ensureRowSetConnection then) @@ -473,7 +457,6 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R return xConnection; } -//------------------------------------------------------------------------------ Reference< XConnection> connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext, sal_Bool _bSetAsActiveConnection ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) { @@ -481,26 +464,24 @@ Reference< XConnection> connectRowset(const Reference< XRowSet>& _rxRowSet, cons return xConnection.getTyped(); } -//------------------------------------------------------------------------------ SharedConnection ensureRowSetConnection(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext>& _rxContext, bool _bUseAutoConnectionDisposer ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) { return lcl_connectRowSet( _rxRowSet, _rxContext, true, _bUseAutoConnectionDisposer ); } -//------------------------------------------------------------------------------ Reference< XNameAccess> getTableFields(const Reference< XConnection>& _rxConn,const OUString& _rName) { Reference< XComponent > xDummy; return getFieldsByCommandDescriptor( _rxConn, CommandType::TABLE, _rName, xDummy ); } -//------------------------------------------------------------------------------ + Reference< XNameAccess> getPrimaryKeyColumns_throw(const Any& i_aTable) { const Reference< XPropertySet > xTable(i_aTable,UNO_QUERY_THROW); return getPrimaryKeyColumns_throw(xTable); } -//------------------------------------------------------------------------------ + Reference< XNameAccess> getPrimaryKeyColumns_throw(const Reference< XPropertySet >& i_xTable) { Reference<XNameAccess> xKeyColumns; @@ -535,7 +516,6 @@ Reference< XNameAccess> getPrimaryKeyColumns_throw(const Reference< XPropertySet return xKeyColumns; } -//------------------------------------------------------------------------------ namespace { enum FieldLookupState @@ -544,7 +524,6 @@ namespace }; } -//------------------------------------------------------------------------------ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType, const OUString& _rCommand, Reference< XComponent >& _rxKeepFieldsAlive, SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) @@ -740,7 +719,6 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect return xFields; } -//------------------------------------------------------------------------------ Sequence< OUString > getFieldNamesByCommandDescriptor( const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType, const OUString& _rCommand, SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) @@ -761,12 +739,11 @@ Sequence< OUString > getFieldNamesByCommandDescriptor( const Reference< XConnect return aNames; } -//------------------------------------------------------------------------------ SQLContext prependContextInfo(const SQLException& _rException, const Reference< XInterface >& _rxContext, const OUString& _rContextDescription, const OUString& _rContextDetails) { return SQLContext( _rContextDescription, _rxContext, OUString(), 0, makeAny( _rException ), _rContextDetails ); } -//------------------------------------------------------------------------------ + SQLException prependErrorInfo( const SQLException& _rChainedException, const Reference< XInterface >& _rxContext, const OUString& _rAdditionalError, const StandardSQLState _eSQLState, const sal_Int32 _nErrorCode ) { @@ -775,7 +752,6 @@ SQLException prependErrorInfo( const SQLException& _rChainedException, const Ref _nErrorCode, makeAny( _rChainedException ) ); } -//-------------------------------------------------------------------------- namespace { struct NameComponentSupport @@ -836,7 +812,6 @@ namespace } } -//-------------------------------------------------------------------------- static OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName, sal_Bool _bQuote, EComposeRule _eComposeRule ) @@ -886,7 +861,6 @@ static OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _ return aComposedName.makeStringAndClear(); } -//------------------------------------------------------------------------------ OUString quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta , const OUString& _rName , EComposeRule _eComposeRule) @@ -896,7 +870,6 @@ OUString quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta return impl_doComposeTableName( _rxMeta, sCatalog, sSchema, sTable, sal_True, _eComposeRule ); } -//------------------------------------------------------------------------------ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const OUString& _rQualifiedName, OUString& _rCatalog, OUString& _rSchema, OUString& _rName,EComposeRule _eComposeRule) { OSL_ENSURE(_rxConnMetaData.is(), "QualifiedNameComponents : invalid meta data!"); @@ -943,7 +916,6 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaDa _rName = sName; } -//------------------------------------------------------------------------------ Reference< XNumberFormatsSupplier> getNumberFormats( const Reference< XConnection>& _rxConn, sal_Bool _bAlloweDefault, @@ -966,8 +938,6 @@ Reference< XNumberFormatsSupplier> getNumberFormats( return xReturn; } -//============================================================================== -//------------------------------------------------------------------------------ void TransferFormComponentProperties( const Reference< XPropertySet>& xOldProps, const Reference< XPropertySet>& xNewProps, @@ -1233,24 +1203,21 @@ catch(const Exception&) } } -//------------------------------------------------------------------------------ sal_Bool canInsert(const Reference< XPropertySet>& _rxCursorSet) { return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue("Privileges")) & Privilege::INSERT) != 0)); } -//------------------------------------------------------------------------------ sal_Bool canUpdate(const Reference< XPropertySet>& _rxCursorSet) { return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue("Privileges")) & Privilege::UPDATE) != 0)); } -//------------------------------------------------------------------------------ sal_Bool canDelete(const Reference< XPropertySet>& _rxCursorSet) { return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue("Privileges")) & Privilege::DELETE) != 0)); } -// ----------------------------------------------------------------------------- + Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) { Reference< XOfficeDatabaseDocument> xDatabaseDocument(_xParent, UNO_QUERY); @@ -1268,7 +1235,6 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) return xDataSource; } -//------------------------------------------------------------------------------ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Reference< XPropertySet >& _rxRowSet, const Reference< XComponentContext >& _rxContext ) SAL_THROW( ( SQLException ) ) { @@ -1317,7 +1283,6 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere return xComposer; } -//------------------------------------------------------------------------------ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( const Reference< XPropertySet>& _rxRowSetProps, const Reference< XComponentContext>& _rxContext) @@ -1338,7 +1303,7 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( return xReturn; } -//-------------------------------------------------------------------------- + OUString composeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, const OUString& _rCatalog, const OUString& _rSchema, @@ -1349,7 +1314,6 @@ OUString composeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, return impl_doComposeTableName( _rxMetaData, _rCatalog, _rSchema, _rName, _bQuote, _eComposeRule ); } -// ----------------------------------------------------------------------------- OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName ) { @@ -1366,7 +1330,6 @@ OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnectio ); } -// ----------------------------------------------------------------------------- namespace { static void lcl_getTableNameComponents( const Reference<XPropertySet>& _xTable, @@ -1392,7 +1355,6 @@ namespace } } -// ----------------------------------------------------------------------------- OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference<XPropertySet>& _xTable ) { OUString sCatalog, sSchema, sName; @@ -1401,7 +1363,6 @@ OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnectio return composeTableNameForSelect( _rxConnection, sCatalog, sSchema, sName ); } -// ----------------------------------------------------------------------------- OUString composeTableName(const Reference<XDatabaseMetaData>& _xMetaData, const Reference<XPropertySet>& _xTable, EComposeRule _eComposeRule, @@ -1421,7 +1382,7 @@ OUString composeTableName(const Reference<XDatabaseMetaData>& _xMetaData, _eComposeRule ); } -// ----------------------------------------------------------------------------- + sal_Int32 getSearchColumnFlag( const Reference< XConnection>& _rxConn,sal_Int32 _nDataType) { sal_Int32 nSearchFlag = 0; @@ -1441,7 +1402,6 @@ sal_Int32 getSearchColumnFlag( const Reference< XConnection>& _rxConn,sal_Int32 return nSearchFlag; } -// ----------------------------------------------------------------------------- OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& _rBaseName, sal_Bool _bStartWithNumber ) { ::std::set< OUString > aUsedNames; @@ -1464,7 +1424,6 @@ OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& return sName; } -// ----------------------------------------------------------------------------- OUString createUniqueName(const Reference<XNameAccess>& _rxContainer,const OUString& _rBaseName,sal_Bool _bStartWithNumber) { Sequence< OUString > aElementNames; @@ -1476,7 +1435,6 @@ OUString createUniqueName(const Reference<XNameAccess>& _rxContainer,const OUStr return createUniqueName( aElementNames, _rBaseName, _bStartWithNumber ); } -// ----------------------------------------------------------------------------- void showError(const SQLExceptionInfo& _rInfo, const Reference< XWindow>& _xParent, const Reference< XComponentContext >& _rxContext) @@ -1495,7 +1453,6 @@ void showError(const SQLExceptionInfo& _rInfo, } } -// ------------------------------------------------------------------------- sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) ) { @@ -1588,7 +1545,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, return bSuccessfullyReRouted; } -// ------------------------------------------------------------------------- + sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) ) { @@ -1697,7 +1654,6 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, return bSuccessfullyReRouted; } -//.................................................................. namespace { class OParameterWrapper : public ::cppu::WeakImplHelper1< XIndexAccess > @@ -1749,7 +1705,6 @@ namespace }; } -// ----------------------------------------------------------------------------- void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, const Reference<XParameters>& _xParameters, const Reference< XConnection>& _xConnection, @@ -1844,7 +1799,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, } } } -// ----------------------------------------------------------------------------- + void setObjectWithInfo(const Reference<XParameters>& _xParams, sal_Int32 parameterIndex, const Any& x, @@ -1855,7 +1810,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams, aVal.fill(x); setObjectWithInfo(_xParams,parameterIndex,aVal,sqlType,scale); } -// ----------------------------------------------------------------------------- + void setObjectWithInfo(const Reference<XParameters>& _xParams, sal_Int32 parameterIndex, const ::connectivity::ORowSetValue& _rValue, @@ -1984,7 +1939,6 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams, } } -// -------------------------------------------------------------------- void getBoleanComparisonPredicate( const OUString& _rExpression, const sal_Bool _bValue, const sal_Int32 _nBooleanComparisonMode, OUStringBuffer& _out_rSQLPredicate ) { @@ -2028,15 +1982,10 @@ void getBoleanComparisonPredicate( const OUString& _rExpression, const sal_Bool } } -//......................................................................... } // namespace dbtools -//......................................................................... -//......................................................................... namespace connectivity { -//......................................................................... - void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, Reference< XInterface >& _xInterface, @@ -2083,7 +2032,7 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) throw DisposedException(); } -// ------------------------------------------------------------------------- + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, const OUString& _rVal, @@ -2092,7 +2041,7 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); return find(__first,__last,sName,_rVal,_rCase); } - // ------------------------------------------------------------------------- + OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, const OUString& _rVal, @@ -2101,7 +2050,7 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); return find(__first,__last,sRealName,_rVal,_rCase); } - // ------------------------------------------------------------------------- + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, const OUString& _rProp, @@ -2112,9 +2061,6 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) ++__first; return __first; } - -// ----------------------------------------------------------------------------- } //namespace connectivity -// ----------------------------------------------------------------------------- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 14c44de7c088..d402d07df8e9 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -41,8 +41,6 @@ # undef max #endif -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ using namespace connectivity::ado; using namespace connectivity; using namespace com::sun::star::uno; @@ -51,7 +49,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::util; - IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.APreparedStatement","com.sun.star.sdbc.PreparedStatement"); OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql) @@ -85,7 +82,6 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInf osl_atomic_decrement( &m_refCount ); } -// ------------------------------------------------------------------------- OPreparedStatement::~OPreparedStatement() { if (m_pParameters) @@ -96,8 +92,6 @@ OPreparedStatement::~OPreparedStatement() } } -// ------------------------------------------------------------------------- - Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = OStatement_Base::queryInterface(rType); @@ -107,7 +101,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt static_cast< XPreparedBatchExecution*>(this), static_cast< XResultSetMetaDataSupplier*>(this)); } -// ------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ), @@ -117,7 +111,6 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_Base::getTypes()); } -// ------------------------------------------------------------------------- Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException) { @@ -125,7 +118,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr m_xMetaData = new OResultSetMetaData(m_RecordSet); return m_xMetaData; } -// ------------------------------------------------------------------------- + void OPreparedStatement::disposing() { m_xMetaData.clear(); @@ -136,7 +129,6 @@ m_xMetaData.clear(); } OStatement_Base::disposing(); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException) { @@ -149,26 +141,21 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException dispose(); } -// ------------------------------------------------------------------------- sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - SQLWarning warning; // Reset warnings - clearWarnings (); // Reset the statement handle, warning and saved Resultset - // reset(); // Call SQLExecute - try { ADORecordset* pSet=NULL; CHECK_RETURN(m_Command.Execute(m_RecordsAffected,m_Parameters,adCmdUnknown,&pSet)) @@ -176,7 +163,6 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } catch (SQLWarning& ex) { - // Save pointer to warning and save with ResultSet // object once it is created. @@ -184,7 +170,6 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } return m_RecordSet.IsValid(); } -// ------------------------------------------------------------------------- sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException) { @@ -204,7 +189,6 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run return static_cast<sal_Int32>(m_RecordsAffected); } -// ------------------------------------------------------------------------- void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType, const sal_Int32& _nSize,const OLEVariant& _Val) throw(SQLException, RuntimeException) { @@ -264,29 +248,25 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn } ADOS::ThrowException(*m_pConnection->getConnection(),*this); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { setParameter( parameterIndex, adLongVarWChar, ::std::numeric_limits< sal_Int32 >::max(), x ); } -// ------------------------------------------------------------------------- Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - return (Reference< XConnection >)m_pConnection; } -// ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - // first clear the old things m_xMetaData.clear(); disposeResultSet(); @@ -294,7 +274,6 @@ m_xMetaData.clear(); m_RecordSet.Close(); m_RecordSet.clear(); - // the create the new onces m_RecordSet.Create(); OLEVariant aCmd; @@ -317,62 +296,51 @@ m_xMetaData.clear(); return xRs; } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adBoolean,sizeof(x),x); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adTinyInt,sizeof(x),x); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adDBDate,sizeof(x),x); } -// ------------------------------------------------------------------------- - void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adDBTime,sizeof(x),x); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adDBTimeStamp,sizeof(x),x); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adDouble,sizeof(x),x); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adSingle,sizeof(x),x); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adInteger,sizeof(x),x); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adBigInt,sizeof(x),x); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException) { @@ -380,31 +348,26 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / aVal.setNull(); setParameter(parameterIndex,adEmpty,0,aVal); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::setClob", *this ); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::setBlob", *this ); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::setArray", *this ); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::setRef", *this ); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException) { @@ -419,13 +382,11 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c break; } } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { setNull(parameterIndex,sqlType); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException) { @@ -439,29 +400,22 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any } // setObject (parameterIndex, x, sqlType, 0); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adSmallInt,sizeof(x),x); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adVarBinary,sizeof(sal_Int8)*x.getLength(),x); } -// ------------------------------------------------------------------------- - - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setCharacterStream", *this ); } -// ------------------------------------------------------------------------- - void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) { if(x.is()) @@ -471,7 +425,6 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con setBytes(parameterIndex,aData); } } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException) { @@ -497,38 +450,34 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim } } // m_pParameters->Delete(OLEVariant(i)); - } } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeException) { // clearParameters( ); // m_aBatchList.erase(); } -// ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException, RuntimeException) { } -// ------------------------------------------------------------------------- Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLException, RuntimeException) { return Sequence< sal_Int32 > (); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::acquire() throw() { OStatement_Base::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::release() throw() { OStatement_Base::release(); } -// ----------------------------------------------------------------------------- + void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode, const OUString& _sDefaultName, sal_Int32& _rParameterCount) @@ -550,8 +499,5 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode, } } -// ----------------------------------------------------------------------------- - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index ca88cc47ca43..c4860e4eb410 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -109,6 +109,7 @@ namespace dbaui { return getSupportedServiceNames_Static(); } + public: OViewController(const Reference< XComponentContext >& _rM) : OQueryController(_rM){} diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index cbca9cbab371..67fa57db3fa0 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -34,6 +34,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace dbaui; + OTableFieldControl::OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar) { } diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 7418a9ccdffe..f3bd629f3d14 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -53,7 +53,6 @@ #include "getdigitlanguage.hxx" -////////////////////////////////////////////////////////////////////////////// // control support #include <com/sun/star/awt/XWindow2.hpp> @@ -62,18 +61,13 @@ #include <drawinglayer/primitive2d/controlprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> -////////////////////////////////////////////////////////////////////////////// // for test, can be removed again - #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <basegfx/polygon/b2dtrapezoid.hxx> - -////////////////////////////////////////////////////////////////////////////// +// <- for test using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// - namespace { sal_uInt32 calculateStepsForSvgGradient(const basegfx::BColor& rColorA, const basegfx::BColor& rColorB, double fDelta, double fDiscreteUnit) @@ -98,15 +92,12 @@ namespace return nSteps; } -} // end of anonymous namespace - -////////////////////////////////////////////////////////////////////////////// +} namespace drawinglayer { namespace processor2d { - ////////////////////////////////////////////////////////////////////////////// // UNO class usages using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; @@ -117,7 +108,6 @@ namespace drawinglayer using ::com::sun::star::awt::XWindow; using ::com::sun::star::awt::PosSize::POSSIZE; - ////////////////////////////////////////////////////////////////////////////// // rendering support // directdraw of text simple portion or decorated portion primitive. When decorated, all the extra @@ -1586,7 +1576,6 @@ namespace drawinglayer } } - ////////////////////////////////////////////////////////////////////////////// // process support VclProcessor2D::VclProcessor2D( @@ -1607,7 +1596,7 @@ namespace drawinglayer VclProcessor2D::~VclProcessor2D() { } - } // end of namespace processor2d -} // end of namespace drawinglayer + } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx index 75fb1e2ad730..b9f5dbd2739b 100644 --- a/extensions/source/abpilot/admininvokationimpl.hxx +++ b/extensions/source/abpilot/admininvokationimpl.hxx @@ -23,16 +23,10 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> - class Window; -//......................................................................... + namespace abp { -//......................................................................... - - //===================================================================== - //= OAdminDialogInvokation - //===================================================================== /** outsourced from AdminDialogInvokationPage, 'cause this class here, in opposite to the page, needs exception handling to be enabled. */ @@ -53,11 +47,8 @@ namespace abp sal_Bool invokeAdministration( sal_Bool _bFixedType ); }; +} -//......................................................................... -} // namespace abp -//......................................................................... - -#endif // EXTENSIONS_ABP_ADMININVOKATIONIMPL_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 6313a2d4d05b..aa01d11f14e6 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -26,7 +26,6 @@ #include <list> #include <boost/unordered_map.hpp> - #include <osl/diagnose.h> #include <salhelper/simplereferenceobject.hxx> #include <rtl/ustring.hxx> @@ -65,7 +64,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::bridge::ModelDependent; using namespace com::sun::star::reflection; - #ifndef _MSC_VER extern "C" const GUID IID_IDispatchEx; #endif @@ -77,7 +75,6 @@ static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource); static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource); static HRESULT mapCannotConvertException(const CannotConvertException &e, unsigned int * puArgErr); - /* Does not throw any exceptions. Param pInfo can be NULL. */ @@ -91,11 +88,6 @@ static void writeExcepinfo(EXCEPINFO * pInfo, const OUString& message) } } -/***************************************************************************** - - class implementation: InterfaceOleWrapper_Impl - -*****************************************************************************/ InterfaceOleWrapper_Impl::InterfaceOleWrapper_Impl( Reference<XMultiServiceFactory>& xFactory, sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass): m_defaultValueType( 0), @@ -212,7 +204,6 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/, if( ! rgdispid) return E_POINTER; - // ---------------------------------------- if( ! _wcsicmp( *rgszNames, JSCRIPT_VALUE_FUNC) || ! _wcsicmp( *rgszNames, BRIDGE_VALUE_FUNC)) { @@ -231,7 +222,6 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/, return S_OK; } - // ---------------------------------------- if (m_xInvocation.is() && (cNames > 0)) { OUString name(reinterpret_cast<const sal_Unicode*>(rgszNames[0])); @@ -477,6 +467,7 @@ sal_Bool InterfaceOleWrapper_Impl::getInvocationInfoForCall( DISPID id, Invocat } return bTypesAvailable; } + // XBridgeSupplier2 --------------------------------------------------- // only bridges itself ( this instance of InterfaceOleWrapper_Impl)from UNO to IDispatch // If sourceModelType is UNO than any UNO interface implemented by InterfaceOleWrapper_Impl @@ -514,7 +505,6 @@ Any SAL_CALL InterfaceOleWrapper_Impl::createBridge(const Any& modelDepObject, return retAny; } - // XInitialization -------------------------------------------------- void SAL_CALL InterfaceOleWrapper_Impl::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) @@ -549,8 +539,6 @@ Reference<XInterface> InterfaceOleWrapper_Impl::createComWrapperInstance() return Reference<XInterface>( xWeak, UNO_QUERY); } - - // "getType" is used in convertValueObject to map the string denoting the type // to an actual Type object. bool getType( const BSTR name, Type & type) @@ -642,6 +630,7 @@ static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource) } return ret; } + // VisualBasic Script passes arguments as VT_VARIANT | VT_BYREF be it in or out parameter. // Thus we are in charge of freeing an eventual value contained by the inner VARIANT // Please note: VariantCopy doesn't free a VT_BYREF value @@ -1185,9 +1174,6 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s return ret; } - - - STDMETHODIMP InterfaceOleWrapper_Impl::GetDispID(BSTR /*bstrName*/, DWORD /*grfdex*/, DISPID __RPC_FAR* /*pid*/) { HRESULT ret = ResultFromScode(E_NOTIMPL); @@ -1209,7 +1195,6 @@ STDMETHODIMP InterfaceOleWrapper_Impl::InvokeEx( return ret; } - STDMETHODIMP InterfaceOleWrapper_Impl::DeleteMemberByName( /* [in] */ BSTR /*bstr*/, /* [in] */ DWORD /*grfdex*/) @@ -1263,12 +1248,8 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetNameSpaceParent( return ret; } +// UnoObjectWrapperRemoteOpt --------------------------------------------------- -/************************************************************************* - - UnoObjectWrapperRemoteOpt - -*************************************************************************/ UnoObjectWrapperRemoteOpt::UnoObjectWrapperRemoteOpt( Reference<XMultiServiceFactory>& aFactory, sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass): InterfaceOleWrapper_Impl( aFactory, unoWrapperClass, comWrapperClass), @@ -1296,7 +1277,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID /*riid*/, OLECHA if( ! rgdispid) return E_POINTER; HRESULT ret = E_UNEXPECTED; - // ---------------------------------------- + // _GetValueObject if( ! wcscmp( *rgszNames, JSCRIPT_VALUE_FUNC)) { @@ -1309,7 +1290,6 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID /*riid*/, OLECHA return S_OK; } - // ---------------------------------------- if (m_xInvocation.is() && (cNames > 0)) { OUString name(reinterpret_cast<const sal_Unicode*>(rgszNames[0])); @@ -1384,8 +1364,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* } if( SUCCEEDED( ret ) ) info.flags= DISPATCH_METHOD; - } //if( wFlags == DISPATCH_METHOD ) - + } else if( wFlags == DISPATCH_PROPERTYPUT || wFlags == DISPATCH_PROPERTYPUTREF) { convertDispparamsArgs(dispidMember, wFlags, pdispparams, params ); @@ -1410,7 +1389,6 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* if( SUCCEEDED( ret ) ) info.flags= DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYGET; } - else if( wFlags == DISPATCH_PROPERTYGET) { if( FAILED( ret= doGetProperty( pdispparams, pvarResult, @@ -1593,7 +1571,6 @@ HRESULT UnoObjectWrapperRemoteOpt::methodInvoke( DISPID /*dispidMember*/, DISPPA return S_OK; } - // The returned HRESULT is only appropriate for IDispatch::Invoke static HRESULT mapCannotConvertException(const CannotConvertException &e, unsigned int * puArgErr) { @@ -1664,9 +1641,6 @@ const VARTYPE getVarType( const Any& value) return ret; } - - - } // end namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index f50ec54c188e..54b20738280b 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -307,7 +307,6 @@ OString ConvertColor( const Color &rColor ) return color; } - #define IN2MM100( v ) static_cast< sal_Int32 >( (v) * 2540.0 + 0.5 ) #define MM2MM100( v ) static_cast< sal_Int32 >( (v) * 100.0 + 0.5 ) diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 4056651ea2bc..62ebac4c4c68 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -56,20 +56,11 @@ namespace framework{ @devstatus deprecated *//*-*************************************************************************************************************/ - class OFrames : private ThreadHelpBase , // Must be the first of baseclasses - Is necessary for right initialization of objects! public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFrames > { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard ctor @descr These initialize a new instance of this class with all needed information for work. @@ -83,13 +74,10 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror - *//*-*****************************************************************************************************/ - OFrames( const css::uno::Reference< css::frame::XFrame >& xOwner , FrameContainer* pFrameContainer ); - //--------------------------------------------------------------------------------------------------------- // XFrames - //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short append frame to container @@ -103,7 +91,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror We do nothing in release or throw an assert in debug version. *//*-*****************************************************************************************************/ - virtual void SAL_CALL append( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @@ -118,7 +105,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror We do nothing in release or throw an assert in debug version. *//*-*****************************************************************************************************/ - virtual void SAL_CALL remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @@ -132,12 +118,9 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror An empty list is returned. *//*-*****************************************************************************************************/ - virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > SAL_CALL queryFrames( sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- // XIndexAccess - //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short get count of all current frames in container @@ -152,7 +135,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror If a lock is set, we return 0 for prevent further access! *//*-*****************************************************************************************************/ - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @@ -169,14 +151,11 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror If a lock is set, we return an empty Any! @onerror If index out of range, an IndexOutOfBoundsException is thrown. *//*-*****************************************************************************************************/ - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw( css::lang::IndexOutOfBoundsException , css::lang::WrappedTargetException , css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- // XElementAccess - //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short get uno-type of all container items @@ -190,7 +169,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror - *//*-*****************************************************************************************************/ - virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @@ -206,13 +184,8 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror We return sal_False. *//*-*****************************************************************************************************/ - virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------------------------------- - // protected methods - //------------------------------------------------------------------------------------------------------------- - protected: /*-****************************************************************************************************//** @@ -228,7 +201,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror - *//*-*****************************************************************************************************/ - virtual ~OFrames(); /*-****************************************************************************************************//** @@ -247,13 +219,8 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror - *//*-*****************************************************************************************************/ - virtual void impl_resetObject(); - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -268,14 +235,11 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror - *//*-*****************************************************************************************************/ - void impl_appendSequence( css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqDestination , const css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqSource ); - //------------------------------------------------------------------------------------------------------------- // debug methods // (should be private everyway!) - //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short debug-method to check incoming parameter of some other mehods of this class @@ -294,7 +258,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base #ifdef ENABLE_ASSERTIONS private: - static sal_Bool impldbg_checkParameter_OFramesCtor ( const css::uno::Reference< css::frame::XFrame >& xOwner , FrameContainer* pFrameContainer ); static sal_Bool impldbg_checkParameter_append ( const css::uno::Reference< css::frame::XFrame >& xFrame ); @@ -303,21 +266,18 @@ class OFrames : private ThreadHelpBase , // Must be the first of base #endif // #ifdef ENABLE_ASSERTIONS - //------------------------------------------------------------------------------------------------------------- // variables // (should be private everyway!) - //------------------------------------------------------------------------------------------------------------- private: - css::uno::WeakReference< css::frame::XFrame > m_xOwner ; /// reference to owner of this instance (Hold no hard reference!) FrameContainer* m_pFrameContainer ; /// with owner shared list to hold all direct children of an XFramesSupplier sal_Bool m_bRecursiveSearchProtection ; /// flag to protect against recursive searches of frames at parents -}; // class OFrames +}; -} // namespace framework +} -#endif // #ifndef __FRAMEWORK_HELPER_OFRAMES_HXX_ +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index 52ed4895c616..9a5353486b2b 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -48,20 +48,17 @@ class QuietInteraction : private ThreadHelpBase , public ::cppu::WeakImplHelper1< css::task::XInteractionHandler > { - //_____________________________________ // member private: /// in case an unknown interaction was aborted - we save it for our external user! css::uno::Any m_aRequest; - //_____________________________________ // uno interface public: // XInterface, XTypeProvider - //_________________________________ /** @interface XInteractionHandler @short called from outside to handle a problem @@ -80,11 +77,8 @@ class QuietInteraction : private ThreadHelpBase */ virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException ); - //_____________________________________ // c++ interface public: - - //_________________________________ /** @short ctor to guarantee right initialized instances of this class @descr - @@ -93,7 +87,6 @@ class QuietInteraction : private ThreadHelpBase */ QuietInteraction(); - //_________________________________ /** @short return the handled interaction request @descr We saved any getted interaction request internaly. @@ -109,7 +102,6 @@ class QuietInteraction : private ThreadHelpBase */ css::uno::Any getRequest() const; - //_________________________________ /** @short returns information if interaction was used @descr It can be useful to know the reason for a failed operation. diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index fe9fb240c2ae..274613c9a74e 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -62,8 +62,6 @@ PatternHash::iterator PatternHash::findPatternKey( const OUString& sURL ) return pItem; } -//_________________________________________________________________________________________________________________ - /** @short initialize static member of class HandlerCache @descr We use a singleton pattern to implement this handler cache. @@ -75,8 +73,6 @@ PatternHash* HandlerCache::m_pPattern = NULL; sal_Int32 HandlerCache::m_nRefCount = 0 ; HandlerCFGAccess* HandlerCache::m_pConfig = NULL; -//_________________________________________________________________________________________________________________ - /** @short ctor of the cache of all registered protoco handler @descr It tries to open the right configuration package automaticly @@ -102,8 +98,6 @@ HandlerCache::HandlerCache() /* SAFE */} } -//_________________________________________________________________________________________________________________ - /** @short dtor of the cache @descr It frees all used memory. In further implementations (may if we support write access too) @@ -132,8 +126,6 @@ HandlerCache::~HandlerCache() /* SAFE */} } -//_________________________________________________________________________________________________________________ - /** @short dtor of the cache @descr It frees all used memory. In further implementations (may if we support write access too) @@ -154,8 +146,6 @@ sal_Bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) return bFound; } -//_________________________________________________________________________________________________________________ - /** @short search for a registered handler by using an URL struct @descr We combine neccessary parts of this struct to a valid URL string @@ -167,7 +157,6 @@ sal_Bool HandlerCache::search( const css::util::URL& aURL, ProtocolHandler* pRet return search( aURL.Complete, pReturn ); } -//_________________________________________________________________________________________________________________ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) { // SAFE -> @@ -188,8 +177,6 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) // <- SAFE } -//_________________________________________________________________________________________________________________ - /** @short dtor of the config access class @descr It opens the configuration package automaticly by using base class mechanism. @@ -206,8 +193,6 @@ HandlerCFGAccess::HandlerCFGAccess( const OUString& sPackage ) EnableNotification(lListenPaths); } -//_________________________________________________________________________________________________________________ - /** @short use base class mechanism to fill given structures @descr User use us as a wrapper between configuration api and his internal structures. @@ -275,7 +260,6 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler , } } -//_________________________________________________________________________________________________________________ void HandlerCFGAccess::Notify(const css::uno::Sequence< OUString >& /*lPropertyNames*/) { HandlerHash* pHandler = new HandlerHash; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 7e7b35f357e0..1892d9c6fe07 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -20,7 +20,6 @@ #ifndef __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_ #define __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_ - /** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble with solaris headers ... */ @@ -107,7 +106,6 @@ namespace framework class ImageManagerImpl : public ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses. { public: - ImageManagerImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ,::cppu::OWeakObject *pOwner ,bool _bUseGlobal); @@ -198,6 +196,6 @@ namespace framework }; } -#endif // __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_ +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 83793a853a44..b37d2d1769a0 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <uielement/statusbarmanager.hxx> #include <uielement/genericstatusbarcontroller.hxx> diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index 0ab4f0b11250..1c3e4d8ea063 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/ustrbuf.hxx> #include <i18nutil/casefolding.hxx> #include <i18nutil/unicode.hxx> @@ -40,7 +39,6 @@ using namespace ::rtl; namespace com { namespace sun { namespace star { namespace i18n { - Transliteration_body::Transliteration_body() { nMappingType = 0; @@ -71,7 +69,6 @@ Transliteration_body::transliterateRange( const OUString& str1, const OUString& return ostr; } - static sal_uInt8 lcl_getMappingTypeForToggleCase( sal_uInt8 nMappingType, sal_Unicode cChar ) { sal_uInt8 nRes = nMappingType; @@ -94,14 +91,12 @@ static sal_uInt8 lcl_getMappingTypeForToggleCase( sal_uInt8 nMappingType, sal_Un return nRes; } - OUString SAL_CALL Transliteration_body::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset) throw(RuntimeException) { - const sal_Unicode *in = inStr.getStr() + startPos; // Two different blocks to eliminate the if(useOffset) condition inside the @@ -314,7 +309,6 @@ static OUString transliterate_titlecase_Impl( return aRes; } - // this function expects to be called on a word-by-word basis, // namely that startPos points to the first char of the word OUString SAL_CALL Transliteration_titlecase::transliterate( @@ -325,7 +319,6 @@ OUString SAL_CALL Transliteration_titlecase::transliterate( return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset ); } - Transliteration_sentencecase::Transliteration_sentencecase() { nMappingType = MappingTypeToTitle; // though only to be applied to the first word... @@ -333,7 +326,6 @@ Transliteration_sentencecase::Transliteration_sentencecase() implementationName = "com.sun.star.i18n.Transliteration.Transliteration_sentencecase"; } - // this function expects to be called on a sentence-by-sentence basis, // namely that startPos points to the first word (NOT first char!) in the sentence OUString SAL_CALL Transliteration_sentencecase::transliterate( @@ -344,7 +336,6 @@ OUString SAL_CALL Transliteration_sentencecase::transliterate( return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset ); } - } } } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx index 9ed04b46fe6b..89b23f130f79 100644 --- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -25,9 +25,6 @@ #include <drawinglayer/processor3d/defaultprocessor3d.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// -// predefines - namespace basegfx { class BZPixelRaster; } @@ -46,8 +43,6 @@ namespace drawinglayer { class ZBufferRasterConverter3D; class RasterPrimitive3D; -////////////////////////////////////////////////////////////////////////////// - namespace drawinglayer { namespace processor3d @@ -80,7 +75,6 @@ namespace drawinglayer */ std::vector< RasterPrimitive3D >* mpRasterPrimitive3Ds; - ////////////////////////////////////////////////////////////////////////////// // rasterconversions for filled and non-filled polygons virtual void rasterconvertB3DPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolygon& rHairline) const; @@ -103,11 +97,9 @@ namespace drawinglayer /// get the result as bitmapEx BitmapEx getBitmapEx() const; }; - } // end of namespace processor3d -} // end of namespace drawinglayer - -////////////////////////////////////////////////////////////////////////////// + } +} -#endif //INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index d8739128fb8b..587bc1264845 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -16,6 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef _SVX_BOXITEM_HXX #define _SVX_BOXITEM_HXX diff --git a/include/o3tl/lazy_update.hxx b/include/o3tl/lazy_update.hxx index 192df24ca9f2..eac479f4d65b 100644 --- a/include/o3tl/lazy_update.hxx +++ b/include/o3tl/lazy_update.hxx @@ -56,8 +56,6 @@ output( myValue.getOutValue() ); /// LazyUpdate specialization can directly convert, OutputType ctor must take InputType argument struct LAZYUPDATE_DIRECT_TAG {}; - // ----------------------------------------------------------------------------------------------------- - namespace detail { /// @internal @@ -169,10 +167,7 @@ output( myValue.getOutValue() ); }; } - // ----------------------------------------------------------------------------------------------------- - // partial specializations for the three LAZYUPDATE_* tags - template< typename InputType, typename OutputType > class LazyUpdate<InputType, OutputType, LAZYUPDATE_DIRECT_TAG> : @@ -194,8 +189,6 @@ output( myValue.getOutValue() ); {} }; - // ----------------------------------------------------------------------------------------------------- - template< typename InputType, typename OutputType > class LazyUpdate<InputType, OutputType, LAZYUPDATE_FUNCTION_TAG> : @@ -226,8 +219,6 @@ output( myValue.getOutValue() ); {} }; - // ----------------------------------------------------------------------------------------------------- - template< typename InputType, typename OutputType > class LazyUpdate<InputType, OutputType, LAZYUPDATE_FUNCTOR_TAG> : @@ -260,6 +251,6 @@ output( myValue.getOutValue() ); } -#endif /* INCLUDED_O3TL_LAZY_UPDATE_HXX */ +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx index a0ff6a972678..c73515762ff2 100644 --- a/include/sot/exchange.hxx +++ b/include/sot/exchange.hxx @@ -34,16 +34,8 @@ namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } } -// --------------------- -// - SotFormatStringId - -// --------------------- - typedef sal_uLong SotFormatStringId; -// ---------------- -// - DataFlavorEx - -// ---------------- - struct DataFlavorEx : public ::com::sun::star::datatransfer::DataFlavor { SotFormatStringId mnSotId; @@ -65,9 +57,7 @@ typedef ::std::list< DataFlavorEx > DataFlavorEx SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, sal_uLong nId ); -// ------------------------- // - Vordefinierte Formate - -// ------------------------- // Die Reihenfolge und die Werte d?rfen nicht ge?ndert werden, // da die Implementation sich darauf verl??t. @@ -152,9 +142,6 @@ SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVec #define EXCHG_DEST_DOC_TEXTFRAME_WEB 16 #define EXCHG_DEST_SWDOC_FREE_AREA_WEB 17 -// ------------ -// - Exchange - -// ------------ class SvGlobalName; class SOT_DLLPUBLIC SotExchange { @@ -204,6 +191,6 @@ public: static sal_uInt16 IsMath( const SvGlobalName& rName ); }; -#endif // _EXCHANGE_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 8178c5ea712a..5aeb0b9ccccf 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -20,15 +20,11 @@ #ifndef _SFXFILEREC_HXX #define _SFXFILEREC_HXX -//========================================================================= - #include "svl/svldllapi.h" #include <tools/debug.hxx> #include <tools/stream.hxx> #include <vector> -//------------------------------------------------------------------------ - #define SFX_REC_PRETAG_EXT sal_uInt8(0x00) // Pre-Tag f"ur Extended-Records #define SFX_REC_PRETAG_EOR sal_uInt8(0xFF) // Pre-Tag f"ur End-Of-Records @@ -45,14 +41,10 @@ #define SFX_REC_TYPE_DRAWENG 0x400 // Drawing-Engine-Record #define SFX_REC_TYPE_EOR 0xF00 // End-Of-Records -//------------------------------------------------------------------------ - #define SFX_REC_HEADERSIZE_MINI 4 // Gr"o\se des Mini-Record-Headers #define SFX_REC_HEADERSIZE_SINGLE 4 // zzgl. HEADERSIZE_MINI => 8 #define SFX_REC_HEADERSIZE_MULTI 6 // zzgl. HEADERSIZE_SINGLE => 14 -//------------------------------------------------------------------------ - #ifndef DBG #ifdef DBG_UTIL #define DBG(x) x @@ -61,8 +53,6 @@ #endif #endif -//------------------------------------------------------------------------ - /* [Fileformat] Jeder Record beginnt mit einem Byte, dem sogenannten 'Pre-Tag'. @@ -172,10 +162,6 @@ High-Nibble des Typs bei Vergleichen nicht ber"ucksichtigt wird. */ -//------------------------------------------------------------------------ - -class SVL_DLLPUBLIC SfxMiniRecordWriter - /* [Beschreibung] Mit Instanzen dieser Klasse kann ein einfacher Record in einen Stream @@ -206,7 +192,7 @@ class SVL_DLLPUBLIC SfxMiniRecordWriter *aRecord << aMember2; } */ - +class SVL_DLLPUBLIC SfxMiniRecordWriter { protected: SvStream* _pStream; // <SvStream>, in dem der Record liegt @@ -234,10 +220,6 @@ private: SfxMiniRecordWriter& operator=(const SfxMiniRecordWriter&); }; -//------------------------------------------------------------------------ - -class SVL_DLLPUBLIC SfxMiniRecordReader - /* [Beschreibung] Mit Instanzen dieser Klasse kann ein einfacher Record aus einem Stream @@ -261,7 +243,7 @@ class SVL_DLLPUBLIC SfxMiniRecordReader } } */ - +class SVL_DLLPUBLIC SfxMiniRecordReader { protected: SvStream* _pStream; // <SvStream>, aus dem gelesen wird @@ -303,10 +285,6 @@ private: SfxMiniRecordReader& operator=(const SfxMiniRecordReader&); }; -//------------------------------------------------------------------------ - -class SVL_DLLPUBLIC SfxSingleRecordWriter: public SfxMiniRecordWriter - /* [Beschreibung] Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben @@ -332,7 +310,7 @@ class SVL_DLLPUBLIC SfxSingleRecordWriter: public SfxMiniRecordWriter 1* sal_uInt16 Content-Tag SizeOfContent* sal_uInt8 Content */ - +class SVL_DLLPUBLIC SfxSingleRecordWriter: public SfxMiniRecordWriter { protected: SfxSingleRecordWriter( sal_uInt8 nRecordType, @@ -345,10 +323,6 @@ public: sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; -//------------------------------------------------------------------------ - -class SVL_DLLPUBLIC SfxSingleRecordReader: public SfxMiniRecordReader - /* [Beschreibung] Mit Instanzen dieser Klasse kann ein einfacher Record aus einem Stream @@ -358,7 +332,7 @@ class SVL_DLLPUBLIC SfxSingleRecordReader: public SfxMiniRecordReader Es ist auch m"oglich, den Record zu "uberspringen, ohne sein internes Format zu kennen. */ - +class SVL_DLLPUBLIC SfxSingleRecordReader: public SfxMiniRecordReader { protected: sal_uInt16 _nRecordTag; // Art des Gesamt-Inhalts @@ -383,10 +357,6 @@ public: inline bool HasVersion( sal_uInt16 nVersion ) const; }; -//------------------------------------------------------------------------ - -class SVL_DLLPUBLIC SfxMultiFixRecordWriter: public SfxSingleRecordWriter - /* [Beschreibung] Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben @@ -431,7 +401,7 @@ class SVL_DLLPUBLIC SfxMultiFixRecordWriter: public SfxSingleRecordWriter } } */ - +class SVL_DLLPUBLIC SfxMultiFixRecordWriter: public SfxSingleRecordWriter { protected: sal_uInt32 _nContentStartPos; /* Startposition des jeweiligen @@ -455,10 +425,6 @@ public: sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; -//------------------------------------------------------------------------ - -class SVL_DLLPUBLIC SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter - /* [Beschreibung] Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben @@ -502,7 +468,7 @@ class SVL_DLLPUBLIC SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter } } */ - +class SVL_DLLPUBLIC SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter { protected: std::vector<sal_uInt32> _aContentOfs; @@ -526,10 +492,6 @@ public: virtual sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; -//------------------------------------------------------------------------ - -class SVL_DLLPUBLIC SfxMultiMixRecordWriter: public SfxMultiVarRecordWriter - /* [Beschreibung] Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben @@ -561,7 +523,7 @@ class SVL_DLLPUBLIC SfxMultiMixRecordWriter: public SfxMultiVarRecordWriter ) NumberOfContents* sal_uInt32 ( ContentOfs << 8 + Version ) */ - +class SVL_DLLPUBLIC SfxMultiMixRecordWriter: public SfxMultiVarRecordWriter { public: inline SfxMultiMixRecordWriter( SvStream *pStream, @@ -575,10 +537,6 @@ public: { OSL_FAIL( "NewContent() only allowed with args" ); } }; -//------------------------------------------------------------------------ - -class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader - /* [Beschreibung] Mit Instanzen dieser Klasse kann ein aus mehreren Contents bestehender @@ -610,7 +568,7 @@ class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader } } */ - +class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader { sal_uInt32 _nStartPos; // Start-Position des Records sal_uInt32* _pContentOfs; // Offsets der Startpositionen @@ -637,21 +595,17 @@ public: inline sal_uInt32 ContentCount() const; }; -//========================================================================= - -inline SfxMiniRecordWriter::SfxMiniRecordWriter -( - SvStream* pStream, // Stream, in dem der Record angelegt wird - sal_uInt8 nTag // Record-Tag zwischen 0x01 und 0xFE -) - /* [Beschreibung] Legt in 'pStream' einen 'SfxMiniRecord' an, dessen Content-Gr"o\se nicht bekannt ist, sondern nach dam Streamen des Contents errechnet werden soll. */ - +inline SfxMiniRecordWriter::SfxMiniRecordWriter +( + SvStream* pStream, // Stream, in dem der Record angelegt wird + sal_uInt8 nTag // Record-Tag zwischen 0x01 und 0xFE +) : _pStream( pStream ), _nStartPos( pStream->Tell() ), _bHeaderOk(false), @@ -663,21 +617,17 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter pStream->SeekRel( + SFX_REC_HEADERSIZE_MINI ); } -//------------------------------------------------------------------------- +/* [Beschreibung] + Legt in 'pStream' einen 'SfxMiniRecord' an, dessen Content-Gr"o\se + von vornherein bekannt ist. +*/ inline SfxMiniRecordWriter::SfxMiniRecordWriter ( SvStream* pStream, // Stream, in dem der Record angelegt wird sal_uInt8 nTag, // Record-Tag zwischen 0x01 und 0xFE sal_uInt32 nSize // Gr"o\se der Daten in Bytes ) - -/* [Beschreibung] - - Legt in 'pStream' einen 'SfxMiniRecord' an, dessen Content-Gr"o\se - von vornherein bekannt ist. -*/ - : _pStream( pStream ), // _nTag( uninitialized ), // _nStarPos( uninitialized ), @@ -690,82 +640,60 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter *pStream << ( ( nTag << 24 ) | nSize ); } -//------------------------------------------------------------------------- - -inline SfxMiniRecordWriter::~SfxMiniRecordWriter() - /* [Beschreibung] Der Dtor der Klasse <SfxMiniRecordWriter> schlie\st den Record automatisch, falls <SfxMiniRecordWriter::Close()> nicht bereits explizit gerufen wurde. */ - +inline SfxMiniRecordWriter::~SfxMiniRecordWriter() { // wurde der Header noch nicht geschrieben oder mu\s er gepr"uft werden if ( !_bHeaderOk ) Close(); } -//------------------------------------------------------------------------- - -inline SvStream& SfxMiniRecordWriter::operator*() const - /* [Beschreibung] Dieser Operator liefert den Stream, in dem der Record liegt. Der Record darf noch nicht geschlossen worden sein. */ - +inline SvStream& SfxMiniRecordWriter::operator*() const { DBG_ASSERT( !_bHeaderOk, "getting Stream of closed record" ); return *_pStream; } -//------------------------------------------------------------------------- - inline void SfxMiniRecordWriter::Reset() { _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI ); _bHeaderOk = false; } -//========================================================================= - -inline SfxMiniRecordReader::~SfxMiniRecordReader() - /* [Beschreibung] Der Dtor der Klasse <SfxMiniRecordReader> positioniert den Stream automatisch auf die Position direkt hinter dem Record, falls nicht <SfxMiniRecordReader::Skip()> bereits explizit gerufen wurde. */ - +inline SfxMiniRecordReader::~SfxMiniRecordReader() { // noch nicht explizit ans Ende gesprungen? if ( !_bSkipped ) Skip(); } -//------------------------------------------------------------------------- - -inline void SfxMiniRecordReader::Skip() - /* [Beschreibung] Mit dieser Methode wird der Stream direkt hinter das Ende des Records positioniert. */ - +inline void SfxMiniRecordReader::Skip() { _pStream->Seek(_nEofRec); _bSkipped = sal_True; } -//------------------------------------------------------------------------- - -inline sal_uInt8 SfxMiniRecordReader::GetTag() const - /* [Beschreibung] Liefert des aus dem Header gelesene Pre-Tag des Records. Dieses kann @@ -774,47 +702,35 @@ inline sal_uInt8 SfxMiniRecordReader::GetTag() const gesetzt. SFX_REC_PRETAG_EXT ist g"ultig, da diese extended-Records nur eine Erweiterung des SfxMiniRecord darstellen. */ - +inline sal_uInt8 SfxMiniRecordReader::GetTag() const { return _nPreTag; } -//------------------------------------------------------------------------- - -inline bool SfxMiniRecordReader::IsValid() const - /* [Beschreibung] Hiermit kann abgefragt werden, ob der Record erfolgreich aus dem Stream konstruiert werden konnte, der Header also f"ur diesen Record-Typ passend war. */ - +inline bool SfxMiniRecordReader::IsValid() const { return _nPreTag != SFX_REC_PRETAG_EOR; } -//------------------------------------------------------------------------- - -inline SvStream& SfxMiniRecordReader::operator*() const - /* [Beschreibung] Dieser Operator liefert den Stream in dem der Record liegt. Die aktuelle Position des Streams mu\s innerhalb des Records liegen. */ - +inline SvStream& SfxMiniRecordReader::operator*() const { DBG_ASSERT( _pStream->Tell() < _nEofRec, "read behind record" ); return *_pStream; } -//========================================================================= - -inline sal_uInt32 SfxSingleRecordWriter::Close( bool bSeekToEndOfRec ) - // siehe <SfxMiniRecordWriter::Close(bool)> - +inline sal_uInt32 SfxSingleRecordWriter::Close( bool bSeekToEndOfRec ) { sal_uInt32 nRet = 0; @@ -840,8 +756,6 @@ inline sal_uInt32 SfxSingleRecordWriter::Close( bool bSeekToEndOfRec ) return nRet; } -//------------------------------------------------------------------------- - inline void SfxSingleRecordWriter::Reset() { _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI + @@ -849,74 +763,54 @@ inline void SfxSingleRecordWriter::Reset() _bHeaderOk = false; } -//========================================================================= - -inline sal_uInt16 SfxSingleRecordReader::GetTag() const - /* [Beschreibung] Liefert des aus dem Header gelesene Tag f"ur den Gesamt-Record. */ - +inline sal_uInt16 SfxSingleRecordReader::GetTag() const { return _nRecordTag; } -//------------------------------------------------------------------------- - -inline sal_uInt8 SfxSingleRecordReader::GetVersion() const - /* [Beschreibung] Liefert die Version des aus dem Stream gelesenen Records. */ - +inline sal_uInt8 SfxSingleRecordReader::GetVersion() const { return _nRecordVer; } -//------------------------------------------------------------------------- - -inline bool SfxSingleRecordReader::HasVersion( sal_uInt16 nVersion ) const - /* [Beschreibung] Stellt fest, ob der aus dem Stream gelese Record in der Version 'nVersion' oder h"oher vorliegt. */ - +inline bool SfxSingleRecordReader::HasVersion( sal_uInt16 nVersion ) const { return _nRecordVer >= nVersion; } -//========================================================================= - -inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter() - /* [Beschreibung] Der Dtor der Klasse <SfxMultiFixRecordWriter> schlie\st den Record automatisch, falls <SfxMutiFixRecordWriter::Close()> nicht bereits explizit gerufen wurde. */ - +inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter() { // wurde der Header noch nicht geschrieben oder mu\s er gepr"uft werden if ( !_bHeaderOk ) Close(); } -//------------------------------------------------------------------------- - -inline void SfxMultiFixRecordWriter::NewContent() - /* [Beschreibung] Mit dieser Methode wird in den Record ein neuer Content eingef"ugt. Jeder, auch der 1. Record mu\s durch Aufruf dieser Methode eingeleitet werden. */ - +inline void SfxMultiFixRecordWriter::NewContent() { #ifdef DBG_UTIL sal_uLong nOldStartPos; @@ -939,29 +833,23 @@ inline void SfxMultiFixRecordWriter::NewContent() ++_nContentCount; } -//========================================================================= +/* [Beschreibung] + Legt in 'pStream' einen 'SfxMultiMixRecord' an, f"ur dessen Contents + je eine separate Kennung f"ur Art (Tag) und Version gespeichert wird. + Die Gr"o\sen der einzelnen Contents werden automatisch ermittelt. +*/ inline SfxMultiMixRecordWriter::SfxMultiMixRecordWriter ( SvStream* pStream, // Stream, in dem der Record angelegt wird sal_uInt16 nRecordTag, // Gesamt-Record-Art-Kennung sal_uInt8 nRecordVer // Gesamt-Record-Versions-Kennung ) - -/* [Beschreibung] - - Legt in 'pStream' einen 'SfxMultiMixRecord' an, f"ur dessen Contents - je eine separate Kennung f"ur Art (Tag) und Version gespeichert wird. - Die Gr"o\sen der einzelnen Contents werden automatisch ermittelt. -*/ - : SfxMultiVarRecordWriter( SFX_REC_TYPE_MIXTAGS, pStream, nRecordTag, nRecordVer ) { } -//========================================================================= - inline void SfxMultiFixRecordWriter::Reset() { _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI + @@ -970,58 +858,42 @@ inline void SfxMultiFixRecordWriter::Reset() _bHeaderOk = false; } -//========================================================================= - -inline sal_uInt16 SfxMultiRecordReader::GetContentTag() - /* [Beschreibung] Diese Methode liefert die Art-Kennung des zuletzt mit der Methode <SfxMultiRecordReder::GetContent()> ge"offneten Contents. */ - +inline sal_uInt16 SfxMultiRecordReader::GetContentTag() { return _nContentTag; } -//------------------------------------------------------------------------- - -inline sal_uInt8 SfxMultiRecordReader::GetContentVersion() const - /* [Beschreibung] Diese Methode liefert die Version-Kennung des zuletzt mit der Methode <SfxMultiRecordReder::GetContent()> ge"offneten Contents. */ - +inline sal_uInt8 SfxMultiRecordReader::GetContentVersion() const { return _nContentVer; } -//------------------------------------------------------------------------- - -inline bool SfxMultiRecordReader::HasContentVersion( sal_uInt16 nVersion ) const - /* [Beschreibung] Diese Methode stellt fest, ob die Version 'nVersion' in der Version des zuletzt mit der Methode <SfxMultiRecordReder::GetContent()> ge"offneten Contents enthalten ist. */ - +inline bool SfxMultiRecordReader::HasContentVersion( sal_uInt16 nVersion ) const { return _nContentVer >= nVersion; } -//------------------------------------------------------------------------- - -inline sal_uInt32 SfxMultiRecordReader::ContentCount() const - /* [Beschreibung] Diese Methode liefert die Anzahl im Record befindlichen Contents. */ - +inline sal_uInt32 SfxMultiRecordReader::ContentCount() const { return _nContentCount; } diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 01c9e5bbed70..4fba3e33b213 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -36,21 +36,15 @@ struct SfxItemPool_Impl; DBG_NAMEEX(SfxItemPool) -//==================================================================== - #define SFX_ITEM_POOLABLE 0x0001 #define SFX_ITEM_NOT_POOLABLE 0x0002 -//==================================================================== - struct SfxItemInfo { sal_uInt16 _nSID; sal_uInt16 _nFlags; }; -//==================================================================== - class SfxStyleSheetIterator; struct SfxPoolItemArray_Impl; class SfxItemPool; @@ -64,8 +58,6 @@ protected: ~SfxItemPoolUser() {} }; -class SVL_DLLPUBLIC SfxItemPool - /* [Beschreibung] Die von dieser Klasse abgeleiteten Klassen dienen der Bereitstellung von @@ -78,7 +70,7 @@ class SVL_DLLPUBLIC SfxItemPool beschleunigt und ein einfaches Laden und Speichern von Attributen bereitstellt. */ - +class SVL_DLLPUBLIC SfxItemPool { friend struct SfxItemPool_Impl; @@ -89,9 +81,7 @@ public: void AddSfxItemPoolUser(SfxItemPoolUser& rNewUser); void RemoveSfxItemPoolUser(SfxItemPoolUser& rOldUser); - //--------------------------------------------------------------------- #ifndef _SFXITEMS_HXX - private: sal_uInt16 GetIndex_Impl(sal_uInt16 nWhich) const; sal_uInt16 GetSize_Impl() const; @@ -103,9 +93,7 @@ public: // fuer dflt. SfxItemSet::CTOR, setze dflt. WhichRanges void FillItemIdRanges_Impl( sal_uInt16*& pWhichRanges ) const; const sal_uInt16* GetFrozenIdRanges() const; - #endif - //--------------------------------------------------------------------- protected: static inline void SetRefCount( SfxPoolItem& rItem, sal_uLong n ); @@ -121,8 +109,10 @@ public: const SfxItemInfo *pItemInfos, SfxPoolItem **pDefaults = 0, bool bLoadRefCounts = true ); + protected: virtual ~SfxItemPool(); + public: static void Free(SfxItemPool* pPool); @@ -240,8 +230,6 @@ private: static const SfxItemPool* pStoringPool_; }; -// --------------- Inline Implementierungen ------------------------------ - // nur der Pool darf den Referenz-Zaehler manipulieren !!! inline void SfxItemPool::SetRefCount( SfxPoolItem& rItem, sal_uLong n ) { diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index f9d4cec53bb8..b705e12b03dd 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -43,9 +43,7 @@ #include <boost/optional.hpp> #include <boost/ptr_container/ptr_vector.hpp> -//************************************************************ -// Vorausdeklarationen -//************************************************************ +// forward declarations class SfxBroadcaster; class Pointer; @@ -96,9 +94,7 @@ namespace svx class PropertyChangeNotifier; } -//************************************************************ -// Defines -//************************************************************ +// Defines enum SdrObjKind {OBJ_NONE = 0, // Abstraktes Objekt (SdrObject) OBJ_GRUP = 1, // Objektgruppe @@ -153,10 +149,7 @@ enum SdrUserCallType {SDRUSERCALL_MOVEONLY, // Nur verschoben, Groesse u SDRUSERCALL_CHILD_INSERTED, // Ein Child einer Gruppe hat sich veraendert SDRUSERCALL_CHILD_REMOVED}; // Ein Child einer Gruppe hat sich veraendert -//************************************************************ // Hilfsklasse SdrObjUserCall -//************************************************************ - class SVX_DLLPUBLIC SdrObjUserCall { public: @@ -165,10 +158,7 @@ public: virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect); }; -//************************************************************ // Hilfsklasse SdrObjMacroHitRec -//************************************************************ - class SVX_DLLPUBLIC SdrObjMacroHitRec { public: @@ -183,7 +173,6 @@ public: SdrObjMacroHitRec(); }; -//************************************************************ // Hilfsklasse SdrObjUserData // // Anwenderdaten an einem Zeichenobjekt, z.B. applikationsspezifische Daten. @@ -191,8 +180,6 @@ public: // Wer hier Daten halten will, muss sich ableiten und auch an der Factory // einen entsprechenden Link setzen. // -//************************************************************ - class SVX_DLLPUBLIC SdrObjUserData { protected: @@ -224,10 +211,7 @@ public: virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; }; -//************************************************************ // Hilfsklasse SdrObjUserDataList -//************************************************************ - class SdrObjUserDataList { typedef boost::ptr_vector<SdrObjUserData> ListType; @@ -244,13 +228,9 @@ public: void DeleteUserData(size_t nNum); }; -//************************************************************ // Hilfsklasse SdrObjGeoData // // Alle geometrischen Daten eines beliebigen Objektes zur ??bergabe an's Undo/Redo -// -//************************************************************ - class SVX_DLLPUBLIC SdrObjGeoData { public: @@ -269,13 +249,9 @@ public: virtual ~SdrObjGeoData(); }; -//************************************************************ // Hilfsklasse SdrObjPlusData // // Bitsack fuer DrawObjekte -// -//************************************************************ - class SdrObjPlusData { friend class SdrObject; @@ -299,13 +275,9 @@ public: void SetGluePoints(const SdrGluePointList& rPts); }; -//************************************************************ // Hilfsklasse SdrObjTransformInfoRec // // gibt Auskunft ueber verschiedene Eigenschaften eines ZObjects -// -//************************************************************ - class SVX_DLLPUBLIC SdrObjTransformInfoRec { public: @@ -1087,9 +1059,6 @@ private: bool mbDoNotInsertIntoPageAutomatically; }; -//************************************************************ -// SdrDummyObj -// // Wer sich eigene Objekte schafft muss einen Link in der Klasse // SdrObjFactory setzen. Der Handler hat folgendes aussehen: // void Hdl(SdrObjFactory*) @@ -1097,9 +1066,6 @@ private: // nIdentifier ansehen und entsprechend mit new eine Zeichenobjektinstanz // erzeugen. Einen Zeiger auf diese Instanz hat er in der Membervariablen // pNewObj zu hinterlassen. -// -//************************************************************ - class SVX_DLLPUBLIC SdrObjFactory { public: diff --git a/include/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx index 779d990816e3..ebbe582127bd 100644 --- a/include/unotools/bootstrap.hxx +++ b/include/unotools/bootstrap.hxx @@ -25,7 +25,6 @@ namespace utl { -//----------------------------------------------------------------------------- /** provides configuration information needed for application startup. <p>This class handles the startup information for the office application. It encapsulates knowledge of how to retriev such information and how @@ -112,9 +111,8 @@ namespace utl class Impl; static const Impl& data(); // the data related to the bootstrap.ini file }; -//----------------------------------------------------------------------------- -} // namespace utl +} -#endif // _UTL_BOOTSTRAP_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index baeee5a4d84d..1f9b310c176e 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -201,6 +201,6 @@ public: sal_Int32 GetLineNumberOfCursorInSelection() const; }; -#endif // _TEXTVIEW_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 31d695a9048c..d5b96bd69903 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -56,11 +56,9 @@ using namespace com::sun::star::uno; using namespace com::sun::star::i18n; using namespace com::sun::star::linguistic2; - namespace linguistic { - //!! multi-thread safe mutex for all platforms !! struct LinguMutex : public rtl::Static< osl::Mutex, LinguMutex > { @@ -71,7 +69,6 @@ osl::Mutex & GetLinguMutex() return LinguMutex::get(); } - LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ) { static LocaleDataWrapper aLclDtaWrp( SvtSysLocale().GetLanguageTag() ); @@ -83,7 +80,6 @@ LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ) return aLclDtaWrp; } - LanguageType LinguLocaleToLanguage( const ::com::sun::star::lang::Locale& rLocale ) { if ( rLocale.Language.isEmpty() ) @@ -91,7 +87,6 @@ LanguageType LinguLocaleToLanguage( const ::com::sun::star::lang::Locale& rLocal return LanguageTag::convertToLanguageType( rLocale ); } - ::com::sun::star::lang::Locale LinguLanguageToLocale( LanguageType nLanguage ) { if (nLanguage == LANGUAGE_NONE) @@ -99,7 +94,6 @@ LanguageType LinguLocaleToLanguage( const ::com::sun::star::lang::Locale& rLocal return LanguageTag::convertToLocale( nLanguage); } - bool LinguIsUnspecified( LanguageType nLanguage ) { switch (nLanguage) @@ -112,7 +106,6 @@ bool LinguIsUnspecified( LanguageType nLanguage ) return false; } - static inline sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 ) { sal_Int32 nMin = n1 < n2 ? n1 : n2; @@ -152,7 +145,6 @@ sal_Int32 & IntArray2D::Value( int i, int k ) return pData[ i * n2 + k ]; } - sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 ) { sal_Int32 nLen1 = rTxt1.getLength(); @@ -197,8 +189,7 @@ sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 ) } sal_Int32 nDist = aData.Value(nLen1, nLen2); return nDist; - } - +} sal_Bool IsUseDicList( const PropertyValues &rProperties, const uno::Reference< XPropertySet > &rxProp ) @@ -227,7 +218,6 @@ sal_Bool IsUseDicList( const PropertyValues &rProperties, return bRes; } - sal_Bool IsIgnoreControlChars( const PropertyValues &rProperties, const uno::Reference< XPropertySet > &rxProp ) { @@ -255,7 +245,6 @@ sal_Bool IsIgnoreControlChars( const PropertyValues &rProperties, return bRes; } - static sal_Bool lcl_HasHyphInfo( const uno::Reference<XDictionaryEntry> &xEntry ) { sal_Bool bRes = sal_False; @@ -269,7 +258,6 @@ static sal_Bool lcl_HasHyphInfo( const uno::Reference<XDictionaryEntry> &xEntry return bRes; } - uno::Reference< XDictionaryEntry > SearchDicList( const uno::Reference< XSearchableDictionaryList > &xDicList, const OUString &rWord, sal_Int16 nLanguage, @@ -318,7 +306,6 @@ uno::Reference< XDictionaryEntry > SearchDicList( return xEntry; } - sal_Bool SaveDictionaries( const uno::Reference< XSearchableDictionaryList > &xDicList ) { if (!xDicList.is()) @@ -349,7 +336,6 @@ sal_Bool SaveDictionaries( const uno::Reference< XSearchableDictionaryList > &xD return bRet; } - sal_uInt8 AddEntryToDic( uno::Reference< XDictionary > &rxDic, const OUString &rWord, sal_Bool bIsNeg, @@ -390,7 +376,6 @@ sal_uInt8 AddEntryToDic( return nRes; } - uno::Sequence< sal_Int16 > LocaleSeqToLangSeq( uno::Sequence< Locale > &rLocaleSeq ) { @@ -407,7 +392,6 @@ uno::Sequence< sal_Int16 > return aLangs; } - sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist ) { sal_Bool bRes = sal_False; @@ -438,8 +422,6 @@ sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist ) return bRes; } - - static sal_Bool GetAltSpelling( sal_Int16 &rnChgPos, sal_Int16 &rnChgLen, OUString &rRplc, uno::Reference< XHyphenatedWord > &rxHyphWord ) { @@ -492,7 +474,6 @@ static sal_Bool GetAltSpelling( sal_Int16 &rnChgPos, sal_Int16 &rnChgLen, OUStri return bRes; } - static sal_Int16 GetOrigWordPos( const OUString &rOrigWord, sal_Int16 nPos ) { sal_Int32 nLen = rOrigWord.getLength(); @@ -507,7 +488,6 @@ static sal_Int16 GetOrigWordPos( const OUString &rOrigWord, sal_Int16 nPos ) return sal::static_int_cast< sal_Int16 >((0 <= i && i < nLen) ? i : -1); } - sal_Int32 GetPosInWordToCheck( const OUString &rTxt, sal_Int32 nPos ) { sal_Int32 nRes = -1; @@ -526,7 +506,6 @@ sal_Int32 GetPosInWordToCheck( const OUString &rTxt, sal_Int32 nPos ) return nRes; } - uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars( const OUString &rOrigWord, uno::Reference< XHyphenatedWord > &rxHyphWord ) @@ -592,23 +571,18 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars( return xRes; } - - - static CharClass & lcl_GetCharClass() { static CharClass aCC( LanguageTag( LANGUAGE_ENGLISH_US )); return aCC; } - osl::Mutex & lcl_GetCharClassMutex() { static osl::Mutex aMutex; return aMutex; } - sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage ) { MutexGuard aGuard( lcl_GetCharClassMutex() ); @@ -646,7 +620,6 @@ CapType SAL_CALL capitalType(const OUString& aTerm, CharClass * pCC) return CAPTYPE_UNKNOWN; } - String ToLower( const String &rText, sal_Int16 nLanguage ) { MutexGuard aGuard( lcl_GetCharClassMutex() ); @@ -656,7 +629,6 @@ String ToLower( const String &rText, sal_Int16 nLanguage ) return rCC.lowercase( rText ); } - // sorted(!) array of unicode ranges for code points that are exclusively(!) used as numbers // and thus may NOT not be part of names or words like the Chinese/Japanese number characters static const sal_uInt32 the_aDigitZeroes [] = @@ -717,7 +689,6 @@ sal_Bool HasDigits( const OUString &rText ) return sal_False; } - sal_Bool IsNumeric( const String &rText ) { sal_Bool bRes = sal_False; @@ -739,8 +710,6 @@ sal_Bool IsNumeric( const String &rText ) return bRes; } - - uno::Reference< XLinguProperties > GetLinguProperties() { return LinguProperties::create( comphelper::getProcessComponentContext() ); @@ -771,7 +740,6 @@ uno::Reference< XDictionary > GetIgnoreAllList() return xRes; } - AppExitListener::AppExitListener() { // add object to Desktop EventListeners in order to properly call @@ -792,21 +760,18 @@ AppExitListener::~AppExitListener() { } - void AppExitListener::Activate() { if (xDesktop.is()) xDesktop->addTerminateListener( this ); } - void AppExitListener::Deactivate() { if (xDesktop.is()) xDesktop->removeTerminateListener( this ); } - void SAL_CALL AppExitListener::disposing( const EventObject& rEvtSource ) throw(RuntimeException) @@ -819,14 +784,12 @@ void SAL_CALL } } - void SAL_CALL AppExitListener::queryTermination( const EventObject& /*rEvtSource*/ ) throw(frame::TerminationVetoException, RuntimeException) { } - void SAL_CALL AppExitListener::notifyTermination( const EventObject& rEvtSource ) throw(RuntimeException) @@ -839,7 +802,6 @@ void SAL_CALL } } - } // namespace linguistic /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 502af9db97fe..21314995cfc9 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -57,10 +57,7 @@ * @file * For LWP filter architecture prototype - table object */ -/************************************************************************* - * Change History - Mar 2005 Created - ************************************************************************/ + #ifndef _LWPNUMBERICFMT_HXX #define _LWPNUMBERICFMT_HXX @@ -85,11 +82,13 @@ public: sal_Bool IsDefaultPrefix(){ return !(cSubFlags&SF_OVER_PREFIX); } sal_Bool IsDefaultSuffix(){ return !(cSubFlags&SF_OVER_SUFFIX); } LwpColor GetColor(); + protected: LwpColor cColor; LwpAtomHolder cPrefix; LwpAtomHolder cSuffix; sal_uInt16 cSubFlags; + enum // for cSubFlags { SF_OVER_PREFIX = 0x0001, @@ -188,6 +187,7 @@ public: String GetCurrencySymbol(sal_uInt16 nFormat); sal_Bool IsShowSpace(sal_uInt16 nFormat); sal_Bool IsSymbolPost(sal_uInt16 nFormat); + private: std::map<sal_uInt16,LwpCurrencyInfo> m_aCurrencyInfo; void InitCurrencySymbol() @@ -254,6 +254,7 @@ public: sal_Bool IsNegativeOverridden(void); sal_Bool IsZeroOverridden(void); XFStyle* Convert(); + private: LwpObjectStream * m_pObjStrm; @@ -286,11 +287,13 @@ LwpNumericFormat::IsDecimalPlacesOverridden(void) { return (cFlags & NF_OVER_DECIMAL_PLACES) != 0; } + inline sal_Bool LwpNumericFormat::IsNegativeOverridden(void) { return (cFlags & NF_OVER_NEGATIVE) != 0; } + inline sal_Bool LwpNumericFormat::IsZeroOverridden(void) { @@ -306,6 +309,7 @@ public: ~LwpLayoutNumerics(){} XFStyle* Convert(); virtual void Read(); + protected: LwpNumericFormat cNumerics; }; diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 67e9daf7f810..5147b4c135d1 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -35,10 +35,6 @@ namespace reportdesign } namespace rptui { -//============================================================================ -// OReportModel -//============================================================================ - class OReportPage; class OXUndoEnvironment; @@ -55,6 +51,7 @@ private: OReportModel( const OReportModel& ); void operator=(const OReportModel& rSrcModel); + public: TYPEINFO(); @@ -90,6 +87,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createShape(const OUString& aServiceSpecifier,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1); }; } + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx index 8837ed397ee7..5b79b7f18940 100644 --- a/rsc/inc/rsckey.hxx +++ b/rsc/inc/rsckey.hxx @@ -19,7 +19,7 @@ #ifndef _RSCKEY_HXX #define _RSCKEY_HXX -/****************** C l a s s F o r w a r d s **************************/ +// class forwards class RscTop; #include <rscall.h> @@ -49,7 +49,6 @@ public: bool Get( Atom nName, KEY_STRUCT * pEle ); }; - #endif// _RSCKEY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index b776a146554e..42d7529e5133 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -44,12 +44,7 @@ using namespace ::com::sun::star::xml::sax; #include "factory.hxx" -/**** -* test szenarios : -* -* -* -****/ +// test szenarios namespace sax_test { @@ -59,7 +54,7 @@ public: OSaxParserTest( const Reference < XMultiServiceFactory > & rFactory ) : m_rFactory( rFactory ) { } -public: + virtual void SAL_CALL testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject) @@ -83,27 +78,19 @@ private: void testEncoding( const Reference < XParser > &rParser ); void testPerformance( const Reference < XParser > &rParser ); -private: Sequence<Any> m_seqExceptions; Sequence<OUString> m_seqErrors; Sequence<OUString> m_seqWarnings; Reference < XMultiServiceFactory > m_rFactory; }; - - -/** -* for external binding -* -* -**/ +/// @note for external binding Reference < XInterface > SAL_CALL OSaxParserTest_CreateInstance( const Reference < XMultiServiceFactory > & rSMgr ) throw(Exception) { OSaxParserTest *p = new OSaxParserTest( rSMgr ); return Reference < XInterface > ( (static_cast< OWeakObject * >(p)) ); } - OUString OSaxParserTest_getServiceName( ) throw () { return OUString( "test.com.sun.star.xml.sax.Parser" ); @@ -123,9 +110,6 @@ Sequence<OUString> OSaxParserTest_getSupportedServiceNames( ) throw () return aRet; } - - - void OSaxParserTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) @@ -138,7 +122,6 @@ void OSaxParserTest::testInvariant( } } - sal_Int32 OSaxParserTest::test( const OUString& TestName, const Reference < XInterface >& TestObject, @@ -195,26 +178,21 @@ sal_Int32 OSaxParserTest::test( return hTestHandle; } - - sal_Bool OSaxParserTest::testPassed(void) throw (RuntimeException) { return m_seqErrors.getLength() == 0; } - Sequence< OUString > OSaxParserTest::getErrors(void) throw (RuntimeException) { return m_seqErrors; } - Sequence< Any > OSaxParserTest::getErrorExceptions(void) throw (RuntimeException) { return m_seqExceptions; } - Sequence< OUString > OSaxParserTest::getWarnings(void) throw (RuntimeException) { return m_seqWarnings; @@ -261,11 +239,6 @@ Reference< XInputStream > createStreamFromFile( return r; } - - - - - class TestDocumentHandler : public WeakImplHelper3< XExtendedDocumentHandler , XEntityResolver , XErrorHandler > { @@ -276,7 +249,7 @@ public: m_bPrint = bPrint; } -public: // Error handler + // Error handler virtual void SAL_CALL error(const Any& aSAXParseException) throw (SAXException, RuntimeException) { printf( "Error !\n" ); @@ -294,9 +267,7 @@ public: // Error handler printf( "Warning !\n" ); } - -public: // ExtendedDocumentHandler - + // ExtendedDocumentHandler virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException) { m_iLevel = 0; @@ -376,6 +347,7 @@ public: // ExtendedDocumentHandler } m_iCharCount += aChars.getLength(); } + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw (SAXException,RuntimeException) { m_iWhitespaceCount += aWhitespaces.getLength(); @@ -445,8 +417,6 @@ public: // ExtendedDocumentHandler } - -public: int m_iLevel; int m_iElementCount; int m_iAttributeCount; @@ -458,10 +428,8 @@ public: Reference < XLocator > m_rLocator; }; - void OSaxParserTest::testSimple( const Reference < XParser > &rParser ) { - char TestString[] = "<!DOCTYPE personnel [\n" "<!ENTITY testInternal \"internal Test!\">\n" "<!ENTITY test SYSTEM \"external_entity.xml\">\n" @@ -485,7 +453,6 @@ void OSaxParserTest::testSimple( const Reference < XParser > &rParser ) Sequence< sal_Int8> seqBytes( strlen( TestString ) ); memcpy( seqBytes.getArray() , TestString , strlen( TestString ) ); - Reference< XInputStream > rInStream; OUString sInput; rInStream = createStreamFromSequence( seqBytes , m_rFactory ); @@ -550,7 +517,6 @@ void OSaxParserTest::testNamespaces( const Reference < XParser > &rParser ) Sequence<sal_Int8> seqBytes( strlen( TestString ) ); memcpy( seqBytes.getArray() , TestString , strlen( TestString ) ); - Reference< XInputStream > rInStream; OUString sInput; @@ -604,7 +570,6 @@ void OSaxParserTest::testEncoding( const Reference < XParser > &rParser ) Sequence<sal_Int8> seqBytes( strlen( TestString ) ); memcpy( seqBytes.getArray() , TestString , strlen( TestString ) ); - Reference< XInputStream > rInStream; OUString sInput; @@ -645,7 +610,6 @@ void OSaxParserTest::testFile( const Reference < XParser > & rParser ) Reference< XInputStream > rInStream = createStreamFromFile( "testsax.xml" , m_rFactory ); OUString sInput = OUString( "testsax.xml" ); - if( rParser.is() && rInStream.is() ) { InputSource source; @@ -700,7 +664,6 @@ void OSaxParserTest::testFile( const Reference < XParser > & rParser ) void OSaxParserTest::testPerformance( const Reference < XParser > & rParser ) { - Reference < XInputStream > rInStream = createStreamFromFile( "testPerformance.xml" , m_rFactory ); OUString sInput = OUString( "testperformance.xml" ); @@ -760,7 +723,8 @@ void OSaxParserTest::testPerformance( const Reference < XParser > & rParser ) } } } -} +} // namespace + using namespace sax_test; extern "C" @@ -798,7 +762,6 @@ sal_Bool SAL_CALL component_writeInfo( OSL_FAIL( "### InvalidRegistryException!" ); } } - return sal_False; } @@ -834,11 +797,9 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pRet = xRet.get(); } } - return pRet; } -} - +} // extern C /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 2295c97d07b6..c188d2b22279 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -110,14 +110,10 @@ using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::container::XNameAccess; using ::com::sun::star::beans::PropertyValue; -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdDrawDocument, FmFormModel ); SdDrawDocument* SdDrawDocument::pDocLockedInsertingLinks = NULL; -////////////////////////////////////////////////////////////////////////////// - PresentationSettings::PresentationSettings() : mbAll( true ), mbEndless( false ), @@ -135,8 +131,6 @@ PresentationSettings::PresentationSettings() { } -// --------------------------------------------------------------------------- - PresentationSettings::PresentationSettings( const PresentationSettings& r ) : maPresPage( r.maPresPage ), mbAll( r.mbAll ), @@ -155,8 +149,6 @@ PresentationSettings::PresentationSettings( const PresentationSettings& r ) { } -// --------------------------------------------------------------------------- - SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) : FmFormModel( SvtPathOptions().GetPalettePath(), NULL, pDrDocSh ) , mpOutliner(NULL) @@ -380,9 +372,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) } - // Destructor - SdDrawDocument::~SdDrawDocument() { Broadcast(SdrHint(HINT_MODELCLEARED)); @@ -447,11 +437,9 @@ SdDrawDocument::~SdDrawDocument() mpCharClass = NULL; } - // This method creates a new document (SdDrawDocument) and returns a pointer to // said document. The drawing engine uses this method to put the document (or // parts of it) into the clipboard/DragServer. - SdrModel* SdDrawDocument::AllocModel() const { SdDrawDocument* pNewModel = NULL; @@ -516,7 +504,6 @@ SdrModel* SdDrawDocument::AllocModel() const // This method creates a new page (SdPage) and returns a pointer to said page. // The drawing engine uses this method to create pages (whose types it does // not know, as they are _derivatives_ of SdrPage) when loading. - SdrPage* SdDrawDocument::AllocPage(bool bMasterPage) { return new SdPage(*this, NULL, bMasterPage); @@ -552,7 +539,6 @@ void SdDrawDocument::NbcSetChanged(sal_Bool bFlag) // NewOrLoadCompleted is called when the document is loaded, or when it is clear // it won't load any more. - void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) { if (eMode == NEW_DOC) @@ -806,7 +792,6 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool return(mpOutliner); } - // Internal outliner that is used to create text objects. We don't insert any // OutlinerViews into this outliner! ::sd::Outliner* SdDrawDocument::GetInternalOutliner(sal_Bool bCreateOutliner) @@ -891,7 +876,6 @@ void SdDrawDocument::SetOnlineSpell(sal_Bool bIn) } } - // OnlineSpelling: highlighting on/off uno::Reference< uno::XInterface > SdDrawDocument::createUnoModel() { @@ -914,9 +898,6 @@ SvxNumType SdDrawDocument::GetPageNumType() const return mePageNumType; } - - - void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode) { switch (nMode) @@ -1059,4 +1040,5 @@ void SdDrawDocument::InitLayoutVector() maLayoutInfo.push_back( layoutlist->item(index) ); } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 2e3a7e540348..66d424913eeb 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -89,7 +89,6 @@ struct SdParaAndPos TYPEINIT1( OutlineView, ::sd::View ); - OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewShell& rOutlineViewSh) : ::sd::View(*rDocSh.GetDoc(), pWindow, &rOutlineViewSh) , mrOutlineViewShell(rOutlineViewSh) @@ -205,27 +204,17 @@ OutlineView::~OutlineView() } } - - - void OutlineView::ConnectToApplication (void) { mrOutlineViewShell.GetActiveWindow()->GrabFocus(); Application::AddEventListener(LINK(this, OutlineView, AppEventListenerHdl)); } - - - void OutlineView::DisconnectFromApplication (void) { Application::RemoveEventListener(LINK(this, OutlineView, AppEventListenerHdl)); } - - - - void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) { OutlinerView* pOlView = GetViewByWindow(pWin); @@ -248,12 +237,10 @@ void OutlineView::InvalidateSlideNumberArea() /** * Window size was changed */ - void OutlineView::AdjustPosSizePixel(const Point &,const Size &,::sd::Window*) { } - void OutlineView::AddWindowToPaintView(OutputDevice* pWin) { sal_Bool bAdded = sal_False; @@ -291,7 +278,6 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) ::sd::View::AddWindowToPaintView(pWin); } - void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) { sal_Bool bRemoved = sal_False; @@ -338,7 +324,6 @@ OutlinerView* OutlineView::GetViewByWindow (::Window* pWin) const return (pOlView); } - /** * Return the title before a random paragraph */ @@ -981,7 +966,6 @@ SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage) return pResult; } - /** * Look for the outline text object in one page of the model */ @@ -1075,7 +1059,6 @@ sal_Bool OutlineView::PrepareClose(sal_Bool) return sal_True; } - /** * Set attributes of the selected text */ @@ -1344,8 +1327,6 @@ SfxStyleSheet* OutlineView::GetStyleSheet() const return pResult; } - - /** * Mark pages as selected / not selected */ @@ -1390,7 +1371,6 @@ void OutlineView::SetSelectedPages() } } - /** * Set new links */ @@ -1412,8 +1392,6 @@ void OutlineView::SetLinks() mrOutliner.SetEndPasteOrDropHdl(LINK(this,OutlineView, EndPasteOrDropHdl)); } - - /** * Restore old links */ @@ -1433,13 +1411,11 @@ void OutlineView::ResetLinks() const mrOutliner.SetEndPasteOrDropHdl(aEmptyLink); } - sal_Int8 OutlineView::AcceptDrop( const AcceptDropEvent&, DropTargetHelper&, ::sd::Window*, sal_uInt16, sal_uInt16) { return DND_ACTION_NONE; } - sal_Int8 OutlineView::ExecuteDrop( const ExecuteDropEvent&, DropTargetHelper&, ::sd::Window*, sal_uInt16, sal_uInt16) { return DND_ACTION_NONE; @@ -1493,9 +1469,6 @@ IMPL_LINK_NOARG(OutlineView, AppEventListenerHdl) return 0; } - - - IMPL_LINK(OutlineView, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent*, pEvent) { if (pEvent != NULL) @@ -1796,8 +1769,6 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) return 0; } -// -------------------------------------------------------------------- - void OutlineView::UpdateParagraph( sal_Int32 nPara ) { SfxItemSet aNewAttrs2( mrOutliner.GetParaAttribs( nPara ) ); @@ -1805,8 +1776,6 @@ void OutlineView::UpdateParagraph( sal_Int32 nPara ) mrOutliner.SetParaAttribs( nPara, aNewAttrs2 ); } -// -------------------------------------------------------------------- - void OutlineView::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfos*/ ) { } @@ -1877,7 +1846,6 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) // ==================================================================== - OutlineViewModelChangeGuard::OutlineViewModelChangeGuard( OutlineView& rView ) : mrView( rView ) { @@ -1902,7 +1870,6 @@ OutlineViewPageChangesGuard::~OutlineViewPageChangesGuard() mpView->IgnoreCurrentPageChanges( false ); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index cd5758fe18f9..686af9752d7d 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/document/XDocumentProperties.hpp> #include "com/sun/star/view/XRenderable.hpp" @@ -56,7 +55,6 @@ using namespace com::sun::star::uno; TYPEINIT1(SfxPrintingHint, SfxViewEventHint); -// ----------------------------------------------------------------------- class SfxPrinterController : public vcl::PrinterController, public SfxListener { Any maCompleteSelection; @@ -403,18 +401,13 @@ void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nSt } } -//==================================================================== - -class SfxDialogExecutor_Impl - -/* [Description] - +/** An instance of this class is created for the life span of the printer dialogue, to create in its click handler for the additions by the virtual method of the derived SfxViewShell generated print options dialogue and to cache the options set there as SfxItemSet. */ - +class SfxDialogExecutor_Impl { private: SfxViewShell* _pViewSh; @@ -433,8 +426,6 @@ public: void DisableHelp() { _bHelpDisabled = sal_True; } }; -//-------------------------------------------------------------------- - SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent ) : _pViewSh ( pViewSh ), @@ -445,8 +436,6 @@ SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSe { } -//-------------------------------------------------------------------- - IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute) { // Options noted locally @@ -473,15 +462,11 @@ IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute) return 0; } -//------------------------------------------------------------------------- - -SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) - - -/* Internal method for setting the differences between 'pNewPrinter' to the +/** + Internal method for setting the differences between 'pNewPrinter' to the current printer. pNewPrinter is either taken over or deleted. */ - +SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) { // get current Printer SfxPrinter *pDocPrinter = GetPrinter(); @@ -769,6 +754,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) rReq.Done(); break; } + case SID_SETUPPRINTER : // display the printer settings dialogue : File > Printer Settings... case SID_PRINTER_NAME : // only for recorded macros { @@ -892,22 +878,16 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) } } -//-------------------------------------------------------------------- - SfxPrinter* SfxViewShell::GetPrinter( sal_Bool /*bCreate*/ ) { return 0; } -//-------------------------------------------------------------------- - sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, sal_uInt16 /*nDiffFlags*/, bool ) { return 0; } -//-------------------------------------------------------------------- - SfxTabPage* SfxViewShell::CreatePrintOptionsPage ( Window* /*pParent*/, diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index f897d9197149..e3d04dec9949 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> @@ -87,34 +86,28 @@ namespace validation sal_Bool implValidateNormalized( const OUString& _rText ); }; - //-------------------------------------------------------------------------- - //.......................................................................... static void lcl_insertStopTransition( StateTransitions& _rRow ) { _rRow.insert( Transition( '_', END ) ); } - //.......................................................................... static void lcl_insertStartExponentTransition( StateTransitions& _rRow ) { _rRow.insert( Transition( 'e', EXPONENT_START ) ); } - //.......................................................................... static void lcl_insertSignTransitions( StateTransitions& _rRow, const State eNextState ) { _rRow.insert( Transition( '-', eNextState ) ); _rRow.insert( Transition( '+', eNextState ) ); } - //.......................................................................... static void lcl_insertDigitTransitions( StateTransitions& _rRow, const State eNextState ) { for ( sal_Unicode aChar = '0'; aChar <= '9'; ++aChar ) _rRow.insert( Transition( aChar, eNextState ) ); } - //.......................................................................... static void lcl_insertCommonPreCommaTransitions( StateTransitions& _rRow, const sal_Unicode _cThSep, const sal_Unicode _cDecSep ) { // digits are allowed @@ -127,7 +120,6 @@ namespace validation _rRow.insert( Transition( _cDecSep, DIGIT_POST_COMMA ) ); } - //-------------------------------------------------------------------------- NumberValidator::NumberValidator( const sal_Unicode _cThSep, const sal_Unicode _cDecSep ) :m_cThSep( _cThSep ) ,m_cDecSep( _cDecSep ) @@ -218,7 +210,6 @@ namespace validation } } - //-------------------------------------------------------------------------- sal_Bool NumberValidator::implValidateNormalized( const OUString& _rText ) { const sal_Unicode* pCheckPos = _rText.getStr(); @@ -258,7 +249,6 @@ namespace validation return ( END == eCurrentState ); } - //-------------------------------------------------------------------------- sal_Bool NumberValidator::isValidNumericFragment( const OUString& _rText ) { if ( _rText.isEmpty() ) @@ -274,11 +264,9 @@ namespace validation } } -//============================================================================== SvNumberFormatter* FormattedField::StaticFormatter::s_cFormatter = NULL; sal_uLong FormattedField::StaticFormatter::s_nReferences = 0; -//------------------------------------------------------------------------------ SvNumberFormatter* FormattedField::StaticFormatter::GetFormatter() { if (!s_cFormatter) @@ -292,13 +280,11 @@ SvNumberFormatter* FormattedField::StaticFormatter::GetFormatter() return s_cFormatter; } -//------------------------------------------------------------------------------ FormattedField::StaticFormatter::StaticFormatter() { ++s_nReferences; } -//------------------------------------------------------------------------------ FormattedField::StaticFormatter::~StaticFormatter() { if (--s_nReferences == 0) @@ -308,7 +294,6 @@ FormattedField::StaticFormatter::~StaticFormatter() } } -//============================================================================== DBG_NAME(FormattedField); #define INIT_MEMBERS() \ @@ -333,7 +318,6 @@ DBG_NAME(FormattedField); ,m_pLastOutputColor(NULL) \ ,m_bUseInputStringForFormatting(false) -//------------------------------------------------------------------------------ FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatter* pInitialFormatter, sal_Int32 nFormatKey) :SpinField(pParent, nStyle) ,INIT_MEMBERS() @@ -347,7 +331,6 @@ FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatte } } -//------------------------------------------------------------------------------ FormattedField::FormattedField(Window* pParent, const ResId& rResId, SvNumberFormatter* pInitialFormatter, sal_Int32 nFormatKey) :SpinField(pParent, rResId) ,INIT_MEMBERS() @@ -361,13 +344,11 @@ FormattedField::FormattedField(Window* pParent, const ResId& rResId, SvNumberFor } } -//------------------------------------------------------------------------------ FormattedField::~FormattedField() { DBG_DTOR(FormattedField, NULL); } -//------------------------------------------------------------------------------ void FormattedField::SetText(const OUString& rStr) { DBG_CHKTHIS(FormattedField, NULL); @@ -376,7 +357,6 @@ void FormattedField::SetText(const OUString& rStr) m_bValueDirty = sal_True; } -//------------------------------------------------------------------------------ void FormattedField::SetText( const OUString& rStr, const Selection& rNewSelection ) { DBG_CHKTHIS(FormattedField, NULL); @@ -385,7 +365,6 @@ void FormattedField::SetText( const OUString& rStr, const Selection& rNewSelecti m_bValueDirty = sal_True; } -//------------------------------------------------------------------------------ void FormattedField::SetTextFormatted(const OUString& rStr) { DBG_CHKTHIS(FormattedField, NULL); @@ -450,7 +429,6 @@ void FormattedField::SetTextFormatted(const OUString& rStr) m_bValueDirty = sal_False; } -//------------------------------------------------------------------------------ OUString FormattedField::GetTextValue() const { if (m_bValueDirty) @@ -461,7 +439,6 @@ OUString FormattedField::GetTextValue() const return m_sCurrentTextValue; } -//------------------------------------------------------------------------------ void FormattedField::EnableNotANumber( sal_Bool _bEnable ) { if ( m_bEnableNaN == _bEnable ) @@ -470,7 +447,6 @@ void FormattedField::EnableNotANumber( sal_Bool _bEnable ) m_bEnableNaN = _bEnable; } -//------------------------------------------------------------------------------ void FormattedField::SetAutoColor(sal_Bool _bAutomatic) { if (_bAutomatic == m_bAutoColor) @@ -486,7 +462,6 @@ void FormattedField::SetAutoColor(sal_Bool _bAutomatic) } } -//------------------------------------------------------------------------------ void FormattedField::impl_Modify(bool makeValueDirty) { DBG_CHKTHIS(FormattedField, NULL); @@ -515,7 +490,6 @@ void FormattedField::impl_Modify(bool makeValueDirty) SpinField::Modify(); } -//------------------------------------------------------------------------------ void FormattedField::Modify() { DBG_CHKTHIS(FormattedField, NULL); @@ -523,7 +497,6 @@ void FormattedField::Modify() impl_Modify(); } -//------------------------------------------------------------------------------ void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel) { DBG_CHKTHIS(FormattedField, NULL); @@ -576,7 +549,6 @@ void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel) // muss nicht stimmen, aber sicherheitshalber ... } -//------------------------------------------------------------------------------ long FormattedField::PreNotify(NotifyEvent& rNEvt) { DBG_CHKTHIS(FormattedField, NULL); @@ -585,7 +557,6 @@ long FormattedField::PreNotify(NotifyEvent& rNEvt) return SpinField::PreNotify(rNEvt); } -//------------------------------------------------------------------------------ void FormattedField::ImplSetFormatKey(sal_uLong nFormatKey) { DBG_CHKTHIS(FormattedField, NULL); @@ -605,7 +576,6 @@ void FormattedField::ImplSetFormatKey(sal_uLong nFormatKey) } } -//------------------------------------------------------------------------------ void FormattedField::SetFormatKey(sal_uLong nFormatKey) { DBG_CHKTHIS(FormattedField, NULL); @@ -614,7 +584,6 @@ void FormattedField::SetFormatKey(sal_uLong nFormatKey) FormatChanged((bNoFormatter && (m_pFormatter != NULL)) ? FCT_FORMATTER : FCT_KEYONLY); } -//------------------------------------------------------------------------------ void FormattedField::SetFormatter(SvNumberFormatter* pFormatter, sal_Bool bResetFormat) { DBG_CHKTHIS(FormattedField, NULL); @@ -658,7 +627,6 @@ void FormattedField::SetFormatter(SvNumberFormatter* pFormatter, sal_Bool bReset FormatChanged(FCT_FORMATTER); } -//------------------------------------------------------------------------------ OUString FormattedField::GetFormat(LanguageType& eLang) const { DBG_CHKTHIS(FormattedField, NULL); @@ -670,7 +638,6 @@ OUString FormattedField::GetFormat(LanguageType& eLang) const return sFormatString; } -//------------------------------------------------------------------------------ sal_Bool FormattedField::SetFormat(const OUString& rFormatString, LanguageType eLang) { DBG_CHKTHIS(FormattedField, NULL); @@ -690,7 +657,6 @@ sal_Bool FormattedField::SetFormat(const OUString& rFormatString, LanguageType e return sal_True; } -//------------------------------------------------------------------------------ sal_Bool FormattedField::GetThousandsSep() const { DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey), @@ -703,7 +669,6 @@ sal_Bool FormattedField::GetThousandsSep() const return bThousand; } -//------------------------------------------------------------------------------ void FormattedField::SetThousandsSep(sal_Bool _bUseSeparator) { DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey), @@ -733,7 +698,6 @@ void FormattedField::SetThousandsSep(sal_Bool _bUseSeparator) FormatChanged(FCT_THOUSANDSSEP); } -//------------------------------------------------------------------------------ sal_uInt16 FormattedField::GetDecimalDigits() const { DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey), @@ -746,7 +710,6 @@ sal_uInt16 FormattedField::GetDecimalDigits() const return nPrecision; } -//------------------------------------------------------------------------------ void FormattedField::SetDecimalDigits(sal_uInt16 _nPrecision) { DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey), @@ -776,7 +739,6 @@ void FormattedField::SetDecimalDigits(sal_uInt16 _nPrecision) FormatChanged(FCT_PRECISION); } -//------------------------------------------------------------------------------ void FormattedField::FormatChanged( FORMAT_CHANGE_TYPE _nWhat ) { DBG_CHKTHIS(FormattedField, NULL); @@ -788,7 +750,6 @@ void FormattedField::FormatChanged( FORMAT_CHANGE_TYPE _nWhat ) ReFormat(); } -//------------------------------------------------------------------------------ void FormattedField::Commit() { // remember the old text @@ -808,7 +769,6 @@ void FormattedField::Commit() } } -//------------------------------------------------------------------------------ void FormattedField::ReFormat() { if (!IsEmptyFieldEnabled() || !GetText().isEmpty()) @@ -825,7 +785,6 @@ void FormattedField::ReFormat() } } -//------------------------------------------------------------------------------ long FormattedField::Notify(NotifyEvent& rNEvt) { DBG_CHKTHIS(FormattedField, NULL); @@ -897,7 +856,6 @@ long FormattedField::Notify(NotifyEvent& rNEvt) return SpinField::Notify( rNEvt ); } -//------------------------------------------------------------------------------ void FormattedField::SetMinValue(double dMin) { DBG_CHKTHIS(FormattedField, NULL); @@ -909,7 +867,6 @@ void FormattedField::SetMinValue(double dMin) ReFormat(); } -//------------------------------------------------------------------------------ void FormattedField::SetMaxValue(double dMax) { DBG_CHKTHIS(FormattedField, NULL); @@ -921,7 +878,6 @@ void FormattedField::SetMaxValue(double dMax) ReFormat(); } -//------------------------------------------------------------------------------ void FormattedField::SetTextValue(const OUString& rText) { DBG_CHKTHIS(FormattedField, NULL); @@ -929,7 +885,6 @@ void FormattedField::SetTextValue(const OUString& rText) ReFormat(); } -//------------------------------------------------------------------------------ void FormattedField::EnableEmptyField(sal_Bool bEnable) { DBG_CHKTHIS(FormattedField, NULL); @@ -941,7 +896,6 @@ void FormattedField::EnableEmptyField(sal_Bool bEnable) ImplSetValue(m_dCurrentValue, sal_True); } -//------------------------------------------------------------------------------ void FormattedField::ImplSetValue(double dVal, sal_Bool bForce) { DBG_CHKTHIS(FormattedField, NULL); @@ -986,7 +940,6 @@ void FormattedField::ImplSetValue(double dVal, sal_Bool bForce) DBG_ASSERT(CheckText(sNewText), "FormattedField::ImplSetValue : formatted string doesn't match the criteria !"); } -//------------------------------------------------------------------------------ sal_Bool FormattedField::ImplGetValue(double& dNewVal) { DBG_CHKTHIS(FormattedField, NULL); @@ -1038,14 +991,12 @@ sal_Bool FormattedField::ImplGetValue(double& dNewVal) return sal_True; } -//------------------------------------------------------------------------------ void FormattedField::SetValue(double dVal) { DBG_CHKTHIS(FormattedField, NULL); ImplSetValue(dVal, m_bValueDirty); } -//------------------------------------------------------------------------------ double FormattedField::GetValue() { DBG_CHKTHIS(FormattedField, NULL); @@ -1062,7 +1013,6 @@ double FormattedField::GetValue() return m_dCurrentValue; } -//------------------------------------------------------------------------------ void FormattedField::Up() { DBG_CHKTHIS(FormattedField, NULL); @@ -1074,7 +1024,6 @@ void FormattedField::Up() SpinField::Up(); } -//------------------------------------------------------------------------------ void FormattedField::Down() { DBG_CHKTHIS(FormattedField, NULL); @@ -1085,7 +1034,6 @@ void FormattedField::Down() SpinField::Down(); } -//------------------------------------------------------------------------------ void FormattedField::First() { DBG_CHKTHIS(FormattedField, NULL); @@ -1099,7 +1047,6 @@ void FormattedField::First() SpinField::First(); } -//------------------------------------------------------------------------------ void FormattedField::Last() { DBG_CHKTHIS(FormattedField, NULL); @@ -1113,34 +1060,27 @@ void FormattedField::Last() SpinField::Last(); } -//------------------------------------------------------------------------------ void FormattedField::UseInputStringForFormatting( bool bUseInputStr /* = true */ ) { m_bUseInputStringForFormatting = bUseInputStr; } -//------------------------------------------------------------------------------ bool FormattedField::IsUsingInputStringForFormatting() const { return m_bUseInputStringForFormatting; } - -//============================================================================== -//------------------------------------------------------------------------------ DoubleNumericField::~DoubleNumericField() { delete m_pNumberValidator; } -//------------------------------------------------------------------------------ void DoubleNumericField::FormatChanged(FORMAT_CHANGE_TYPE nWhat) { ResetConformanceTester(); FormattedField::FormatChanged(nWhat); } -//------------------------------------------------------------------------------ sal_Bool DoubleNumericField::CheckText(const OUString& sText) const { // We'd like to implement this using the NumberFormatter::IsNumberFormat, but unfortunately, this doesn't @@ -1149,7 +1089,6 @@ sal_Bool DoubleNumericField::CheckText(const OUString& sText) const return m_pNumberValidator->isValidNumericFragment( sText ); } -//------------------------------------------------------------------------------ void DoubleNumericField::ResetConformanceTester() { // the thousands and the decimal separator are language dependent @@ -1174,10 +1113,6 @@ void DoubleNumericField::ResetConformanceTester() m_pNumberValidator = new validation::NumberValidator( cSeparatorThousand, cSeparatorDecimal ); } - -//============================================================================== - -//------------------------------------------------------------------------------ DoubleCurrencyField::DoubleCurrencyField(Window* pParent, WinBits nStyle) :FormattedField(pParent, nStyle) ,m_bChangingFormat(sal_False) @@ -1189,7 +1124,6 @@ DoubleCurrencyField::DoubleCurrencyField(Window* pParent, WinBits nStyle) UpdateCurrencyFormat(); } -//------------------------------------------------------------------------------ void DoubleCurrencyField::FormatChanged(FORMAT_CHANGE_TYPE nWhat) { if (m_bChangingFormat) @@ -1217,7 +1151,6 @@ void DoubleCurrencyField::FormatChanged(FORMAT_CHANGE_TYPE nWhat) FormattedField::FormatChanged(nWhat); } -//------------------------------------------------------------------------------ void DoubleCurrencyField::setCurrencySymbol(const OUString& rSymbol) { if (m_sCurrencySymbol == rSymbol) @@ -1228,7 +1161,6 @@ void DoubleCurrencyField::setCurrencySymbol(const OUString& rSymbol) FormatChanged(FCT_CURRENCY_SYMBOL); } -//------------------------------------------------------------------------------ void DoubleCurrencyField::setPrependCurrSym(sal_Bool _bPrepend) { if (m_bPrependCurrSym == _bPrepend) @@ -1239,7 +1171,6 @@ void DoubleCurrencyField::setPrependCurrSym(sal_Bool _bPrepend) FormatChanged(FCT_CURRSYM_POSITION); } -//------------------------------------------------------------------------------ void DoubleCurrencyField::UpdateCurrencyFormat() { // the old settings diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index da5805e12b70..a683bc9c74e6 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -87,8 +87,6 @@ using namespace ::cppu; using namespace ::svxform; using namespace ::svx; -//============================================================================== -//------------------------------------------------------------------------------ OUString FieldServiceFromId(sal_Int32 nID) { switch (nID) @@ -107,7 +105,6 @@ OUString FieldServiceFromId(sal_Int32 nID) return OUString(); } -//============================================================================== struct FmGridHeaderData { ODataAccessDescriptor aDropData; @@ -117,8 +114,6 @@ struct FmGridHeaderData Reference< XInterface > xDroppedResultSet; }; -//============================================================================== -//------------------------------------------------------------------------------ const sal_Int16 nChangeTypeOffset = 1000; void SetMenuItem(const ImageList& rList, sal_uInt16 nID, Menu* pMenu, Menu& rNewMenu, sal_Bool bDesignMode = sal_True, sal_Int16 nOffset = nChangeTypeOffset) { @@ -130,7 +125,6 @@ void SetMenuItem(const ImageList& rList, sal_uInt16 nID, Menu* pMenu, Menu& rNew rNewMenu.EnableItem(nID + nOffset, bDesignMode); } -//------------------------------------------------------------------------------ FmGridHeader::FmGridHeader( BrowseBox* pParent, WinBits nWinBits) :EditBrowserHeader(pParent, nWinBits) ,DropTargetHelper(this) @@ -138,18 +132,16 @@ FmGridHeader::FmGridHeader( BrowseBox* pParent, WinBits nWinBits) { } -//------------------------------------------------------------------------------ FmGridHeader::~FmGridHeader() { delete m_pImpl; } -//------------------------------------------------------------------------------ sal_uInt16 FmGridHeader::GetModelColumnPos(sal_uInt16 nId) const { return static_cast<FmGridControl*>(GetParent())->GetModelColumnPos(nId); } -//--------------------------------------------------------------------------------------- + void FmGridHeader::notifyColumnSelect(sal_uInt16 nColumnId) { sal_uInt16 nPos = GetModelColumnPos(nColumnId); @@ -165,14 +157,13 @@ void FmGridHeader::notifyColumnSelect(sal_uInt16 nColumnId) } } } -//------------------------------------------------------------------------------ + void FmGridHeader::Select() { EditBrowserHeader::Select(); notifyColumnSelect(GetCurItemId()); } -//------------------------------------------------------------------------------ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt ) { sal_uInt16 nItemId = GetItemId( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ) ); @@ -215,7 +206,6 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt ) EditBrowserHeader::RequestHelp( rHEvt ); } -//------------------------------------------------------------------------------ sal_Int8 FmGridHeader::AcceptDrop( const AcceptDropEvent& rEvt ) { // drop allowed in design mode only @@ -230,7 +220,6 @@ sal_Int8 FmGridHeader::AcceptDrop( const AcceptDropEvent& rEvt ) return DND_ACTION_NONE; } -//------------------------------------------------------------------------------ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { if (!static_cast<FmGridControl*>(GetParent())->IsDesignMode()) @@ -378,7 +367,6 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) return DND_ACTION_LINK; } -//------------------------------------------------------------------------------ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) { OUString sCommand, sFieldName,sURL; @@ -637,7 +625,6 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) return 1L; } -//------------------------------------------------------------------------------ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu) { sal_Bool bDesignMode = static_cast<FmGridControl*>(GetParent())->IsDesignMode(); @@ -784,7 +771,6 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe enum InspectorAction { eOpenInspector, eCloseInspector, eUpdateInspector, eNone }; -//------------------------------------------------------------------------------ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult) { Reference< ::com::sun::star::container::XIndexContainer > xCols(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns()); @@ -977,7 +963,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe } } -//------------------------------------------------------------------------------ void FmGridHeader::triggerColumnContextMenu( const ::Point& _rPreferredPos ) { // the affected col @@ -997,7 +982,6 @@ void FmGridHeader::triggerColumnContextMenu( const ::Point& _rPreferredPos ) PostExecuteColumnContextMenu( nColId, aContextMenu, nResult ); } -//------------------------------------------------------------------------------ void FmGridHeader::Command(const CommandEvent& rEvt) { switch (rEvt.GetCommand()) @@ -1015,7 +999,6 @@ void FmGridHeader::Command(const CommandEvent& rEvt) } } -//------------------------------------------------------------------------------ FmGridControl::FmGridControl( const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Window* pParent, @@ -1031,7 +1014,6 @@ FmGridControl::FmGridControl( EnableInteractiveRowHeight( ); } -//------------------------------------------------------------------------------ void FmGridControl::Command(const CommandEvent& _rEvt) { if ( COMMAND_CONTEXTMENU == _rEvt.GetCommand() ) @@ -1058,7 +1040,6 @@ void FmGridControl::Command(const CommandEvent& _rEvt) } // ::com::sun::star::beans::XPropertyChangeListener -//------------------------------------------------------------------------------ void FmGridControl::propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) { if (evt.PropertyName == FM_PROP_ROWCOUNT) @@ -1087,7 +1068,6 @@ void FmGridControl::propertyChange(const ::com::sun::star::beans::PropertyChange } } -//------------------------------------------------------------------------------ void FmGridControl::SetDesignMode(sal_Bool bMode) { sal_Bool bOldMode = IsDesignMode(); @@ -1124,7 +1104,6 @@ void FmGridControl::SetDesignMode(sal_Bool bMode) } } -//------------------------------------------------------------------------------ void FmGridControl::DeleteSelectedRows() { if (!m_pSeekCursor) @@ -1398,9 +1377,7 @@ void FmGridControl::DeleteSelectedRows() ActivateCell(); } - // XCurrentRecordListener -//------------------------------------------------------------------------------ void FmGridControl::positioned(const ::com::sun::star::lang::EventObject& /*rEvent*/) { SAL_INFO("svx.fmcmop", "FmGridControl::positioned"); @@ -1408,7 +1385,6 @@ void FmGridControl::positioned(const ::com::sun::star::lang::EventObject& /*rEve implAdjustInSolarThread(sal_False); } -//------------------------------------------------------------------------------ sal_Bool FmGridControl::commit() { // Commit nur ausfuehren, wenn nicht bereits ein Update vom ::com::sun::star::form::component::GridControl ausgefuehrt @@ -1424,7 +1400,6 @@ sal_Bool FmGridControl::commit() return sal_True; } -//------------------------------------------------------------------------------ void FmGridControl::inserted(const ::com::sun::star::lang::EventObject& /*rEvent*/) { const DbGridRowRef& xRow = GetCurrentRow(); @@ -1437,14 +1412,12 @@ void FmGridControl::inserted(const ::com::sun::star::lang::EventObject& /*rEvent } -//------------------------------------------------------------------------------ BrowserHeader* FmGridControl::imp_CreateHeaderBar(BrowseBox* pParent) { DBG_ASSERT( pParent == this, "FmGridControl::imp_CreateHeaderBar: parent?" ); return new FmGridHeader( pParent ); } -//------------------------------------------------------------------------------ void FmGridControl::markColumn(sal_uInt16 nId) { if (GetHeaderBar() && m_nMarkedColumnId != nId) @@ -1466,13 +1439,11 @@ void FmGridControl::markColumn(sal_uInt16 nId) } } -//------------------------------------------------------------------------------ sal_Bool FmGridControl::isColumnMarked(sal_uInt16 nId) const { return m_nMarkedColumnId == nId; } -//------------------------------------------------------------------------------ long FmGridControl::QueryMinimumRowHeight() { long nMinimalLogicHeight = 20; // 0.2 cm @@ -1480,7 +1451,6 @@ long FmGridControl::QueryMinimumRowHeight() return CalcZoom( nMinimalPixelHeight ); } -//------------------------------------------------------------------------------ void FmGridControl::RowHeightChanged() { DbGridControl::RowHeightChanged(); @@ -1502,7 +1472,6 @@ void FmGridControl::RowHeightChanged() } } -//------------------------------------------------------------------------------ void FmGridControl::ColumnResized(sal_uInt16 nId) { DbGridControl::ColumnResized(nId); @@ -1521,28 +1490,24 @@ void FmGridControl::ColumnResized(sal_uInt16 nId) } } -//------------------------------------------------------------------------------ void FmGridControl::CellModified() { DbGridControl::CellModified(); GetPeer()->CellModified(); } -//------------------------------------------------------------------------------ void FmGridControl::BeginCursorAction() { DbGridControl::BeginCursorAction(); m_pPeer->stopCursorListening(); } -//------------------------------------------------------------------------------ void FmGridControl::EndCursorAction() { m_pPeer->startCursorListening(); DbGridControl::EndCursorAction(); } -//------------------------------------------------------------------------------ void FmGridControl::ColumnMoved(sal_uInt16 nId) { m_bInColumnMove = sal_True; @@ -1584,7 +1549,6 @@ void FmGridControl::ColumnMoved(sal_uInt16 nId) m_bInColumnMove = sal_False; } -//------------------------------------------------------------------------------ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::container::XIndexContainer >& xColumns) { // Spalten wieder neu setzen @@ -1638,7 +1602,6 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta SetUpdateMode(sal_True); } -//------------------------------------------------------------------------------ void FmGridControl::InitColumnByField( DbGridColumn* _pColumn, const Reference< XPropertySet >& _rxColumnModel, const Reference< XNameAccess >& _rxFieldsByNames, const Reference< XIndexAccess >& _rxFieldsByIndex ) @@ -1711,7 +1674,6 @@ void FmGridControl::InitColumnByField( _pColumn->CreateControl( nFieldPos, xField, nTypeId ); } -//------------------------------------------------------------------------------ void FmGridControl::InitColumnsByFields(const Reference< ::com::sun::star::container::XIndexAccess >& _rxFields) { if ( !_rxFields.is() ) @@ -1736,7 +1698,6 @@ void FmGridControl::InitColumnsByFields(const Reference< ::com::sun::star::conta } } -//------------------------------------------------------------------------------ void FmGridControl::HideColumn(sal_uInt16 nId) { DbGridControl::HideColumn(nId); @@ -1752,7 +1713,7 @@ void FmGridControl::HideColumn(sal_uInt16 nId) if (nId == m_nMarkedColumnId) m_nMarkedColumnId = (sal_uInt16)-1; } -// ----------------------------------------------------------------------------- + sal_Bool FmGridControl::isColumnSelected(sal_uInt16 /*nId*/,DbGridColumn* _pColumn) { OSL_ENSURE(_pColumn,"Column can not be null!"); @@ -1768,7 +1729,6 @@ sal_Bool FmGridControl::isColumnSelected(sal_uInt16 /*nId*/,DbGridColumn* _pColu return bSelected; } -//------------------------------------------------------------------------------ void FmGridControl::ShowColumn(sal_uInt16 nId) { DbGridControl::ShowColumn(nId); @@ -1786,7 +1746,6 @@ void FmGridControl::ShowColumn(sal_uInt16 nId) markColumn(nId); // ... -> mark it } -//------------------------------------------------------------------------------ sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks) { SolarMutexGuard aGuard; @@ -1824,7 +1783,6 @@ sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks) return bAllSuccessfull; } -//------------------------------------------------------------------------------ Sequence< Any> FmGridControl::getSelectionBookmarks() { // lock our update so no paint-triggered seeks interfere ... @@ -1894,7 +1852,7 @@ Sequence< Any> FmGridControl::getSelectionBookmarks() return aBookmarks; } -// ----------------------------------------------------------------------------- + namespace { OUString getColumnPropertyFromPeer(FmXGridPeer* _pPeer,sal_Int32 _nPosition,const OUString& _sPropName) @@ -1921,6 +1879,7 @@ namespace return sRetText; } } + // Object data and state ------------------------------------------------------ OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const { @@ -1947,7 +1906,6 @@ OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjTy } return sRetText; } -// ----------------------------------------------------------------------------- OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const { @@ -1985,7 +1943,7 @@ OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseB } return sRetText; } -// ----------------------------------------------------------------------------- + void FmGridControl::Select() { DbGridControl::Select(); @@ -2045,12 +2003,12 @@ void FmGridControl::Select() } } } -// ----------------------------------------------------------------------------- + sal_Int32 FmGridControl::GetSelectedColumn() const { return m_nCurrentSelectedColumn; } -// ----------------------------------------------------------------------------- + void FmGridControl::KeyInput( const KeyEvent& rKEvt ) { sal_Bool bDone = sal_False; @@ -2096,8 +2054,5 @@ void FmGridControl::KeyInput( const KeyEvent& rKEvt ) if ( !bDone ) DbGridControl::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------------- - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 1a36a866240d..90c5905e9e0c 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -72,7 +72,6 @@ using namespace com::sun::star::accessibility; #define ROWSTATUS(row) (!row.Is() ? "NULL" : row->GetStatus() == GRS_CLEAN ? "CLEAN" : row->GetStatus() == GRS_MODIFIED ? "MODIFIED" : row->GetStatus() == GRS_DELETED ? "DELETED" : "INVALID") - #define DEFAULT_BROWSE_MODE \ BROWSER_COLUMNSELECTION \ | BROWSER_MULTISELECTION \ @@ -89,6 +88,7 @@ public: RowSetEventListener(DbGridControl* i_pControl) : m_pControl(i_pControl) { } + private: // XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*i_aEvt*/) throw ( RuntimeException ) @@ -115,13 +115,10 @@ private: } } }; -//============================================================================== class GridFieldValueListener; DECLARE_STL_MAP(sal_uInt16, GridFieldValueListener*, ::std::less<sal_uInt16>, ColumnFieldValueListeners); -//============================================================================== - DBG_NAME(GridFieldValueListener) class GridFieldValueListener : protected ::comphelper::OPropertyChangeListener { @@ -143,7 +140,7 @@ public: void dispose(); }; -//------------------------------------------------------------------------------ + GridFieldValueListener::GridFieldValueListener(DbGridControl& _rParent, const Reference< XPropertySet >& _rField, sal_uInt16 _nId) :OPropertyChangeListener(m_aMutex) ,m_rParent(_rParent) @@ -161,14 +158,12 @@ GridFieldValueListener::GridFieldValueListener(DbGridControl& _rParent, const Re } } -//------------------------------------------------------------------------------ GridFieldValueListener::~GridFieldValueListener() { DBG_DTOR(GridFieldValueListener, NULL); dispose(); } -//------------------------------------------------------------------------------ void GridFieldValueListener::_propertyChanged(const PropertyChangeEvent& _evt) throw( RuntimeException ) { DBG_ASSERT(m_nSuspended>=0, "GridFieldValueListener::_propertyChanged : resume > suspend !"); @@ -176,7 +171,6 @@ void GridFieldValueListener::_propertyChanged(const PropertyChangeEvent& _evt) t m_rParent.FieldValueChanged(m_nId, _evt); } -//------------------------------------------------------------------------------ void GridFieldValueListener::dispose() { if (m_bDisposed) @@ -196,8 +190,6 @@ void GridFieldValueListener::dispose() m_rParent.FieldListenerDisposing(m_nId); } -//============================================================================== - class DisposeListenerGridBridge : public FmXDisposeListener { osl::Mutex m_aMutex; @@ -211,11 +203,8 @@ public: virtual void disposing(const EventObject& _rEvent, sal_Int16 _nId) throw( RuntimeException ) { m_rParent.disposing(_nId, _rEvent); } }; -//============================================================================== - DBG_NAME(DisposeListenerGridBridge) -//------------------------------------------------------------------------------ DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject, sal_Int16 _rId) :FmXDisposeListener(m_aMutex) ,m_rParent(_rParent) @@ -230,7 +219,6 @@ DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, co } } -//------------------------------------------------------------------------------ DisposeListenerGridBridge::~DisposeListenerGridBridge() { if (m_pRealListener) @@ -243,8 +231,6 @@ DisposeListenerGridBridge::~DisposeListenerGridBridge() DBG_DTOR(DisposeListenerGridBridge,NULL); } -//============================================================================== - static const sal_uInt16 ControlMap[] = { DbGridControl::NavigationBar::RECORD_TEXT, @@ -259,13 +245,11 @@ static const sal_uInt16 ControlMap[] = 0 }; -//------------------------------------------------------------------------------ sal_Bool CompareBookmark(const Any& aLeft, const Any& aRight) { return ::comphelper::compare(aLeft, aRight); } -//============================================================================== class FmXGridSourcePropListener : public ::comphelper::OPropertyChangeListener { DbGridControl* m_pParent; @@ -283,7 +267,6 @@ public: virtual void _propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException ); }; -//------------------------------------------------------------------------------ FmXGridSourcePropListener::FmXGridSourcePropListener(DbGridControl* _pParent) :OPropertyChangeListener(m_aMutex) ,m_pParent(_pParent) @@ -292,7 +275,6 @@ FmXGridSourcePropListener::FmXGridSourcePropListener(DbGridControl* _pParent) DBG_ASSERT(m_pParent, "FmXGridSourcePropListener::FmXGridSourcePropListener : invalid parent !"); } -//------------------------------------------------------------------------------ void FmXGridSourcePropListener::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException ) { DBG_ASSERT(m_nSuspended>=0, "FmXGridSourcePropListener::_propertyChanged : resume > suspend !"); @@ -300,8 +282,6 @@ void FmXGridSourcePropListener::_propertyChanged(const PropertyChangeEvent& evt) m_pParent->DataSourcePropertyChanged(evt); } -//============================================================================== -//------------------------------------------------------------------------------ DbGridControl::NavigationBar::AbsolutePos::AbsolutePos(Window* pParent, WinBits nStyle) :NumericField(pParent, nStyle) { @@ -313,7 +293,6 @@ DbGridControl::NavigationBar::AbsolutePos::AbsolutePos(Window* pParent, WinBits SetStrictFormat(sal_True); } -//------------------------------------------------------------------------------ void DbGridControl::NavigationBar::AbsolutePos::KeyInput(const KeyEvent& rEvt) { if (rEvt.GetKeyCode() == KEY_RETURN && !GetText().isEmpty()) @@ -330,7 +309,6 @@ void DbGridControl::NavigationBar::AbsolutePos::KeyInput(const KeyEvent& rEvt) NumericField::KeyInput(rEvt); } -//------------------------------------------------------------------------------ void DbGridControl::NavigationBar::AbsolutePos::LoseFocus() { NumericField::LoseFocus(); @@ -344,7 +322,6 @@ void DbGridControl::NavigationBar::AbsolutePos::LoseFocus() } } -//------------------------------------------------------------------------------ void DbGridControl::NavigationBar::PositionDataSource(sal_Int32 nRecord) { if (m_bPositioning) @@ -357,7 +334,6 @@ void DbGridControl::NavigationBar::PositionDataSource(sal_Int32 nRecord) m_bPositioning = sal_False; } -//------------------------------------------------------------------------------ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) :Control(pParent, nStyle) ,m_aRecordText(this, WB_VCENTER) @@ -437,7 +413,7 @@ namespace _rPos.X() += (sal_uInt16)_rSize.Width(); } } -//------------------------------------------------------------------------------ + sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() { // Positionierung der Controls @@ -464,7 +440,6 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() } // Controls Groessen und Positionen setzen - // OUString aText = m_aRecordText.GetText(); long nTextWidth = m_aRecordText.GetTextWidth(aText); m_aRecordText.SetPosPixel(Point(nX,nY)); @@ -507,7 +482,6 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() return nX; } -//------------------------------------------------------------------------------ IMPL_LINK(DbGridControl::NavigationBar, OnClick, Button *, pButton ) { DbGridControl* pParent = (DbGridControl*)GetParent(); @@ -544,7 +518,6 @@ IMPL_LINK(DbGridControl::NavigationBar, OnClick, Button *, pButton ) return 0; } -//------------------------------------------------------------------------------ void DbGridControl::NavigationBar::InvalidateAll(sal_Int32 nCurrentPos, sal_Bool bAll) { if (m_nCurrentPos != nCurrentPos || nCurrentPos < 0 || bAll) @@ -575,7 +548,6 @@ void DbGridControl::NavigationBar::InvalidateAll(sal_Int32 nCurrentPos, sal_Bool } } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::NavigationBar::GetState(sal_uInt16 nWhich) const { DbGridControl* pParent = (DbGridControl*)GetParent(); @@ -630,7 +602,6 @@ sal_Bool DbGridControl::NavigationBar::GetState(sal_uInt16 nWhich) const } } -//------------------------------------------------------------------------------ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) { sal_Bool bAvailable = GetState(nWhich); @@ -723,14 +694,12 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) pWnd->Enable(bAvailable); } -//------------------------------------------------------------------------------ void DbGridControl::NavigationBar::Resize() { Control::Resize(); ArrangeControls(); } -//------------------------------------------------------------------------------ void DbGridControl::NavigationBar::Paint(const Rectangle& rRect) { Control::Paint(rRect); @@ -744,7 +713,6 @@ void DbGridControl::NavigationBar::Paint(const Rectangle& rRect) Point(aAbsolutePos.X() + aAbsoluteSize.Width() + 1, aAbsolutePos.Y() + aAbsoluteSize.Height())); } -//------------------------------------------------------------------------------ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); @@ -794,7 +762,6 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType ) } } -//------------------------------------------------------------------------------ DbGridRow::DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor) :m_bIsNew(sal_False) { @@ -843,7 +810,6 @@ DbGridRow::DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor) m_eStatus = GRS_INVALID; } -//------------------------------------------------------------------------------ DbGridRow::~DbGridRow() { for ( size_t i = 0, n = m_aVariants.size(); i < n; ++i ) @@ -851,7 +817,6 @@ DbGridRow::~DbGridRow() m_aVariants.clear(); } -//------------------------------------------------------------------------------ void DbGridRow::SetState(CursorWrapper* pCur, sal_Bool bPaintCursor) { if (pCur && pCur->Is()) @@ -901,7 +866,6 @@ void DbGridRow::SetState(CursorWrapper* pCur, sal_Bool bPaintCursor) } DBG_NAME(DbGridControl); -//------------------------------------------------------------------------------ DbGridControl::DbGridControl( Reference< XComponentContext > _rxContext, Window* pParent, @@ -949,7 +913,6 @@ DbGridControl::DbGridControl( ImplInitWindow( InitAll ); } -//------------------------------------------------------------------------------ void DbGridControl::InsertHandleColumn() { // Handle Column einfuegen @@ -961,7 +924,6 @@ void DbGridControl::InsertHandleColumn() BrowseBox::InsertHandleColumn(0); } -//------------------------------------------------------------------------------ void DbGridControl::Init() { BrowserHeader* pNewHeader = CreateHeaderBar(this); @@ -974,7 +936,6 @@ void DbGridControl::Init() InsertHandleColumn(); } -//------------------------------------------------------------------------------ DbGridControl::~DbGridControl() { RemoveColumns(); @@ -1010,7 +971,6 @@ DbGridControl::~DbGridControl() DBG_DTOR(DbGridControl,NULL); } -//------------------------------------------------------------------------------ void DbGridControl::StateChanged( StateChangedType nType ) { DbGridControl_Base::StateChanged( nType ); @@ -1048,7 +1008,6 @@ void DbGridControl::StateChanged( StateChangedType nType ) } } -//------------------------------------------------------------------------------ void DbGridControl::DataChanged( const DataChangedEvent& rDCEvt ) { DbGridControl_Base::DataChanged( rDCEvt ); @@ -1060,7 +1019,6 @@ void DbGridControl::DataChanged( const DataChangedEvent& rDCEvt ) } } -//------------------------------------------------------------------------------ void DbGridControl::Select() { DbGridControl_Base::Select(); @@ -1072,7 +1030,6 @@ void DbGridControl::Select() m_pGridListener->selectionChanged(); } -//------------------------------------------------------------------------------ void DbGridControl::ImplInitWindow( const InitWindowFacet _eInitWhat ) { for ( size_t i = 0; i < m_aColumns.size(); ++i ) @@ -1120,7 +1077,6 @@ void DbGridControl::ImplInitWindow( const InitWindowFacet _eInitWhat ) } } -//------------------------------------------------------------------------------ void DbGridControl::RemoveRows(sal_Bool bNewCursor) { // Hat sich der DatenCursor verandert ? @@ -1140,7 +1096,6 @@ void DbGridControl::RemoveRows(sal_Bool bNewCursor) } } -//------------------------------------------------------------------------------ void DbGridControl::RemoveRows() { // we're going to remove all columns and all row, so deactivate the current cell @@ -1164,7 +1119,6 @@ void DbGridControl::RemoveRows() m_aBar.InvalidateAll(m_nCurrentPos, sal_True); } -//------------------------------------------------------------------------------ void DbGridControl::ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) { // Positionierung der Controls @@ -1176,7 +1130,6 @@ void DbGridControl::ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) } } -//------------------------------------------------------------------------------ void DbGridControl::EnableHandle(sal_Bool bEnable) { if (m_bHandle == bEnable) @@ -1189,7 +1142,6 @@ void DbGridControl::EnableHandle(sal_Bool bEnable) InsertHandleColumn(); } -//------------------------------------------------------------------------------ namespace { bool adjustModeForScrollbars( BrowserMode& _rMode, sal_Bool _bNavigationBar, sal_Bool _bHideScrollbars ) @@ -1224,7 +1176,6 @@ namespace } } -//------------------------------------------------------------------------------ void DbGridControl::EnableNavigationBar(sal_Bool bEnable) { if (m_bNavigationBar == bEnable) @@ -1260,7 +1211,6 @@ void DbGridControl::EnableNavigationBar(sal_Bool bEnable) } } -//------------------------------------------------------------------------------ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt) { DBG_ASSERT(!m_xCurrentRow || !m_xCurrentRow->IsModified(), @@ -1340,7 +1290,6 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt) return m_nOptions; } -//------------------------------------------------------------------------------ void DbGridControl::ForceHideScrollbars( sal_Bool _bForce ) { if ( m_bHideScrollbars == _bForce ) @@ -1352,7 +1301,6 @@ void DbGridControl::ForceHideScrollbars( sal_Bool _bForce ) SetMode( m_nMode ); } -//------------------------------------------------------------------------------ void DbGridControl::EnablePermanentCursor(sal_Bool bEnable) { if (IsPermanentCursorEnabled() == bEnable) @@ -1380,13 +1328,11 @@ void DbGridControl::EnablePermanentCursor(sal_Bool bEnable) ActivateCell(); } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::IsPermanentCursorEnabled() const { return ((m_nMode & BROWSER_CURSOR_WO_FOCUS) != 0) && ((m_nMode & BROWSER_HIDECURSOR) == 0); } -//------------------------------------------------------------------------------ void DbGridControl::refreshController(sal_uInt16 _nColId, GrantControlAccess /*_aAccess*/) { if ((GetCurColumnId() == _nColId) && IsEditing()) @@ -1396,7 +1342,6 @@ void DbGridControl::refreshController(sal_uInt16 _nColId, GrantControlAccess /*_ } } -//------------------------------------------------------------------------------ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt16 nOpts) { if (!_xCursor.is() && !m_pDataCursor) @@ -1632,7 +1577,6 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt m_pCursorDisposeListener = new DisposeListenerGridBridge(*this, Reference< XComponent > ((Reference< XInterface >)*m_pSeekCursor, UNO_QUERY), 0); } -//------------------------------------------------------------------------------ void DbGridControl::RemoveColumns() { if ( IsEditing() ) @@ -1645,13 +1589,11 @@ void DbGridControl::RemoveColumns() DbGridControl_Base::RemoveColumns(); } -//------------------------------------------------------------------------------ DbGridColumn* DbGridControl::CreateColumn(sal_uInt16 nId) const { return new DbGridColumn(nId, *(DbGridControl*)this); } -//------------------------------------------------------------------------------ sal_uInt16 DbGridControl::AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nModelPos, sal_uInt16 nId) { DBG_ASSERT(nId == BROWSER_INVALIDID, "DbGridControl::AppendColumn : I want to set the ID myself ..."); @@ -1691,7 +1633,6 @@ sal_uInt16 DbGridControl::AppendColumn(const OUString& rName, sal_uInt16 nWidth, return nId; } -//------------------------------------------------------------------------------ void DbGridControl::RemoveColumn(sal_uInt16 nId) { DbGridControl_Base::RemoveColumn(nId); @@ -1704,7 +1645,6 @@ void DbGridControl::RemoveColumn(sal_uInt16 nId) } } -//------------------------------------------------------------------------------ void DbGridControl::ColumnMoved(sal_uInt16 nId) { DbGridControl_Base::ColumnMoved(nId); @@ -1794,7 +1734,6 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) // that. It's because it took me a while to see it myself, and the whole theme (hidden cols, model col // positions, view col positions) is really painful (at least for me) so the above pictures helped me a lot ;) - DbGridColumn* temp = m_aColumns[ nOldModelPos ]; DbGridColumns::iterator it = m_aColumns.begin(); @@ -1806,7 +1745,6 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) m_aColumns.insert( it, temp ); } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::SeekRow(long nRow) { // in filter mode or in insert only mode we don't have any cursor! @@ -1838,15 +1776,13 @@ sal_Bool DbGridControl::SeekRow(long nRow) return m_nSeekPos >= 0; } -//------------------------------------------------------------------------------ + // Wird aufgerufen, wenn die dargestellte Datenmenge sich aendert -//------------------------------------------------------------------------------ void DbGridControl::VisibleRowsChanged( long nNewTopRow, sal_uInt16 nLinesOnScreen ) { RecalcRows(nNewTopRow, nLinesOnScreen , sal_False); } -//------------------------------------------------------------------------------ void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_Bool bUpdateCursor) { DBG_CHKTHIS( DbGridControl, NULL ); @@ -1904,7 +1840,6 @@ void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_B EnablePaint(sal_True); } -//------------------------------------------------------------------------------ void DbGridControl::RowInserted(long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bool bKeepSelection) { if (nNumRows) @@ -1925,7 +1860,6 @@ void DbGridControl::RowInserted(long nRow, long nNumRows, sal_Bool bDoPaint, sal } } -//------------------------------------------------------------------------------ void DbGridControl::RowRemoved(long nRow, long nNumRows, sal_Bool bDoPaint) { if (nNumRows) @@ -1945,7 +1879,6 @@ void DbGridControl::RowRemoved(long nRow, long nNumRows, sal_Bool bDoPaint) } } -//------------------------------------------------------------------------------ void DbGridControl::AdjustRows() { if (!m_pSeekCursor) @@ -2011,7 +1944,6 @@ void DbGridControl::AdjustRows() m_aBar.InvalidateState(NavigationBar::RECORD_COUNT); } -//------------------------------------------------------------------------------ DbGridControl_Base::RowStatus DbGridControl::GetRowStatus(long nRow) const { if (IsFilterRow(nRow)) @@ -2036,13 +1968,11 @@ DbGridControl_Base::RowStatus DbGridControl::GetRowStatus(long nRow) const return DbGridControl_Base::CLEAN; } -//------------------------------------------------------------------------------ void DbGridControl::PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const { DbGridControl_Base::PaintStatusCell(rDev, rRect); } -//------------------------------------------------------------------------------ void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const { if (!IsValid(m_xPaintRow)) @@ -2062,7 +1992,6 @@ void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uI } } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) { DBG_CHKTHIS( DbGridControl, NULL ); @@ -2084,7 +2013,6 @@ sal_Bool DbGridControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) return sal_True; } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::SetCurrent(long nNewRow) { // Each movement of the datacursor must start with BeginCursorAction and end with @@ -2170,7 +2098,6 @@ sal_Bool DbGridControl::SetCurrent(long nNewRow) return sal_True; } -//------------------------------------------------------------------------------ void DbGridControl::CursorMoved() { DBG_CHKTHIS( DbGridControl, NULL ); @@ -2200,20 +2127,17 @@ void DbGridControl::CursorMoved() m_nLastRowId = GetCurRow(); } -//------------------------------------------------------------------------------ void DbGridControl::onRowChange() { // not interested in } -//------------------------------------------------------------------------------ void DbGridControl::onColumnChange() { if ( m_pGridListener ) m_pGridListener->columnChanged(); } -//------------------------------------------------------------------------------ void DbGridControl::setDisplaySynchron(sal_Bool bSync) { if (bSync != m_bSynchDisplay) @@ -2224,7 +2148,6 @@ void DbGridControl::setDisplaySynchron(sal_Bool bSync) } } -//------------------------------------------------------------------------------ void DbGridControl::AdjustDataSource(sal_Bool bFull) { SAL_INFO("svx.fmcomp", "DbGridControl::AdjustDataSource"); @@ -2298,7 +2221,6 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull) m_aBar.InvalidateAll(m_nCurrentPos, m_xCurrentRow.Is()); } -//------------------------------------------------------------------------------ sal_Int32 DbGridControl::AlignSeekCursor() { DBG_CHKTHIS( DbGridControl, NULL ); @@ -2350,7 +2272,7 @@ sal_Int32 DbGridControl::AlignSeekCursor() } return m_nSeekPos; } -//------------------------------------------------------------------------------ + sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute) { DBG_CHKTHIS( DbGridControl, NULL ); @@ -2480,14 +2402,13 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute) } return m_nSeekPos == nRow; } -//------------------------------------------------------------------------------ + void DbGridControl::MoveToFirst() { if (m_pSeekCursor && (GetCurRow() != 0)) MoveToPosition(0); } -//------------------------------------------------------------------------------ void DbGridControl::MoveToLast() { if (!m_pSeekCursor) @@ -2520,7 +2441,6 @@ void DbGridControl::MoveToLast() MoveToPosition(GetRowCount() - 1); } -//------------------------------------------------------------------------------ void DbGridControl::MoveToPrev() { long nNewRow = std::max(GetCurRow() - 1L, 0L); @@ -2528,7 +2448,6 @@ void DbGridControl::MoveToPrev() MoveToPosition(nNewRow); } -//------------------------------------------------------------------------------ void DbGridControl::MoveToNext() { if (!m_pSeekCursor) @@ -2571,7 +2490,6 @@ void DbGridControl::MoveToNext() } } -//------------------------------------------------------------------------------ void DbGridControl::MoveToPosition(sal_uInt32 nPos) { if (!m_pSeekCursor) @@ -2601,7 +2519,6 @@ void DbGridControl::MoveToPosition(sal_uInt32 nPos) m_aBar.InvalidateAll(m_nCurrentPos); } -//------------------------------------------------------------------------------ void DbGridControl::AppendNew() { if (!m_pSeekCursor || !(m_nOptions & OPT_INSERT)) @@ -2630,7 +2547,6 @@ void DbGridControl::AppendNew() MoveToPosition(nNewRow - 1); } -//------------------------------------------------------------------------------ void DbGridControl::SetDesignMode(sal_Bool bMode) { if (IsDesignMode() != bMode) @@ -2659,7 +2575,6 @@ void DbGridControl::SetDesignMode(sal_Bool bMode) } } -//------------------------------------------------------------------------------ void DbGridControl::SetFilterMode(sal_Bool bMode) { if (IsFilterMode() != bMode) @@ -2693,7 +2608,7 @@ void DbGridControl::SetFilterMode(sal_Bool bMode) setDataSource(Reference< XRowSet > ()); } } -// ----------------------------------------------------------------------------- + OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const { size_t Location = GetModelColumnPos( _nColId ); @@ -2703,7 +2618,7 @@ OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const sRet = GetCurrentRowCellText(pColumn, m_xPaintRow); return sRet; } -//------------------------------------------------------------------------------ + OUString DbGridControl::GetCurrentRowCellText(DbGridColumn* pColumn,const DbGridRowRef& _rRow) const { // Ausgabe des Textes fuer eine Zelle @@ -2713,7 +2628,6 @@ OUString DbGridControl::GetCurrentRowCellText(DbGridColumn* pColumn,const DbGrid return aText; } -//------------------------------------------------------------------------------ sal_uInt32 DbGridControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) { if (SeekRow(nRow)) @@ -2726,7 +2640,6 @@ sal_uInt32 DbGridControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) return 30; //xxxx } -//------------------------------------------------------------------------------ void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 /*nRow*/, PopupMenu& rMenu) { sal_Bool bDelete = (m_nOptions & OPT_DELETE) && GetSelectRowCount() && !IsCurrentAppending(); @@ -2746,7 +2659,6 @@ void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 /*nRow*/, PopupMenu& rMe rMenu.EnableItem(SID_FM_RECORD_UNDO, bCanUndo); } -//------------------------------------------------------------------------------ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMenu& /*rMenu*/, sal_uInt16 nExecutionResult) { switch (nExecutionResult) @@ -2768,7 +2680,6 @@ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMe } } -//------------------------------------------------------------------------------ void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException ) { SAL_INFO("svx.fmcomp", "DbGridControl::DataSourcePropertyChanged"); @@ -2821,7 +2732,6 @@ void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) th } } -//------------------------------------------------------------------------------ void DbGridControl::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) { if (!m_pSeekCursor || IsResizing()) @@ -2842,7 +2752,6 @@ void DbGridControl::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) } } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId) { return (_nRow >= 0) @@ -2851,7 +2760,6 @@ sal_Bool DbGridControl::canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId) && (_nColId <= ColCount()); } -//------------------------------------------------------------------------------ void DbGridControl::copyCellText(sal_Int32 _nRow, sal_Int16 _nColId) { DBG_ASSERT(canCopyCellText(_nRow, _nColId), "DbGridControl::copyCellText: invalid call!"); @@ -2860,7 +2768,6 @@ void DbGridControl::copyCellText(sal_Int32 _nRow, sal_Int16 _nColId) OStringTransfer::CopyString( GetCurrentRowCellText( pColumn,m_xPaintRow ), this ); } -//------------------------------------------------------------------------------ void DbGridControl::executeRowContextMenu( long _nRow, const Point& _rPreferredPos ) { PopupMenu aContextMenu( SVX_RES( RID_SVXMNU_ROWS ) ); @@ -2873,7 +2780,6 @@ void DbGridControl::executeRowContextMenu( long _nRow, const Point& _rPreferredP // -> change this to sal_uInt32 } -//------------------------------------------------------------------------------ void DbGridControl::Command(const CommandEvent& rEvt) { switch (rEvt.GetCommand()) @@ -2929,7 +2835,6 @@ void DbGridControl::Command(const CommandEvent& rEvt) } } -//------------------------------------------------------------------------------ IMPL_LINK(DbGridControl, OnDelete, void*, /*EMPTYTAG*/ ) { DBG_CHKTHIS(DbGridControl, NULL ); @@ -2938,7 +2843,6 @@ IMPL_LINK(DbGridControl, OnDelete, void*, /*EMPTYTAG*/ ) return 0; } -//------------------------------------------------------------------------------ void DbGridControl::DeleteSelectedRows() { DBG_ASSERT(GetSelection(), "keine selection!!!"); @@ -2947,7 +2851,6 @@ void DbGridControl::DeleteSelectedRows() return; } -//------------------------------------------------------------------------------ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId) { if (!IsValid(m_xCurrentRow) || !IsEnabled()) @@ -2990,7 +2893,6 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId return pReturn; } -//------------------------------------------------------------------------------ void DbGridControl::InitController(CellControllerRef& /*rController*/, long /*nRow*/, sal_uInt16 nColumnId) { size_t Location = GetModelColumnPos(nColumnId); @@ -2999,7 +2901,6 @@ void DbGridControl::InitController(CellControllerRef& /*rController*/, long /*nR pColumn->UpdateFromField(m_xCurrentRow, m_xFormatter); } -//------------------------------------------------------------------------------ void DbGridControl::CellModified() { SAL_INFO("svx.fmcomp", "DbGridControl::CellModified"); @@ -3049,7 +2950,6 @@ void DbGridControl::CellModified() } } -//------------------------------------------------------------------------------ void DbGridControl::Dispatch(sal_uInt16 nId) { if (nId == BROWSER_CURSORENDOFFILE) @@ -3063,7 +2963,6 @@ void DbGridControl::Dispatch(sal_uInt16 nId) DbGridControl_Base::Dispatch(nId); } -//------------------------------------------------------------------------------ void DbGridControl::Undo() { if (!IsFilterMode() && IsValid(m_xCurrentRow) && IsModified()) @@ -3127,7 +3026,6 @@ void DbGridControl::Undo() } } -//------------------------------------------------------------------------------ void DbGridControl::resetCurrentRow() { if (IsModified()) @@ -3164,7 +3062,6 @@ void DbGridControl::resetCurrentRow() RowModified(GetCurRow()); // will update the current controller if affected } -//------------------------------------------------------------------------------ void DbGridControl::RowModified( long nRow, sal_uInt16 /*nColId*/ ) { if (nRow == m_nCurrentPos && IsEditing()) @@ -3176,25 +3073,21 @@ void DbGridControl::RowModified( long nRow, sal_uInt16 /*nColId*/ ) DbGridControl_Base::RowModified(nRow); } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::IsModified() const { return !IsFilterMode() && IsValid(m_xCurrentRow) && (m_xCurrentRow->IsModified() || DbGridControl_Base::IsModified()); } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::IsCurrentAppending() const { return m_xCurrentRow.Is() && m_xCurrentRow->IsNew(); } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::IsInsertionRow(long nRow) const { return (m_nOptions & OPT_INSERT) && m_nTotalCount >= 0 && (nRow == GetRowCount() - 1); } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::SaveModified() { SAL_INFO("svx.fmcomp", "DbGridControl::SaveModified"); @@ -3244,7 +3137,6 @@ sal_Bool DbGridControl::SaveModified() return bOK; } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::SaveRow() { SAL_INFO("svx.fmcomp", "DbGridControl::SaveRow"); @@ -3318,7 +3210,6 @@ sal_Bool DbGridControl::SaveRow() return sal_True; } -//------------------------------------------------------------------------------ long DbGridControl::PreNotify(NotifyEvent& rEvt) { // keine Events der Navbar behandeln @@ -3374,7 +3265,6 @@ long DbGridControl::PreNotify(NotifyEvent& rEvt) } } -//------------------------------------------------------------------------------ sal_Bool DbGridControl::IsTabAllowed(sal_Bool bRight) const { if (bRight) @@ -3388,7 +3278,6 @@ sal_Bool DbGridControl::IsTabAllowed(sal_Bool bRight) const } } -//------------------------------------------------------------------------------ void DbGridControl::KeyInput( const KeyEvent& rEvt ) { if (rEvt.GetKeyCode().GetFunction() == KEYFUNC_COPY) @@ -3406,7 +3295,6 @@ void DbGridControl::KeyInput( const KeyEvent& rEvt ) DbGridControl_Base::KeyInput(rEvt); } -//------------------------------------------------------------------------------ void DbGridControl::HideColumn(sal_uInt16 nId) { DeactivateCell(); @@ -3436,7 +3324,6 @@ void DbGridControl::HideColumn(sal_uInt16 nId) GoToColumnId( nNewColId ); } -//------------------------------------------------------------------------------ void DbGridControl::ShowColumn(sal_uInt16 nId) { sal_uInt16 nPos = GetModelColumnPos(nId); @@ -3502,7 +3389,6 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) Invalidate(); } -//------------------------------------------------------------------------------ sal_uInt16 DbGridControl::GetColumnIdFromModelPos( sal_uInt16 nPos ) const { if (nPos >= m_aColumns.size()) @@ -3530,7 +3416,6 @@ sal_uInt16 DbGridControl::GetColumnIdFromModelPos( sal_uInt16 nPos ) const return pCol->GetId(); } -//------------------------------------------------------------------------------ sal_uInt16 DbGridControl::GetModelColumnPos( sal_uInt16 nId ) const { for ( size_t i = 0; i < m_aColumns.size(); ++i ) @@ -3540,7 +3425,6 @@ sal_uInt16 DbGridControl::GetModelColumnPos( sal_uInt16 nId ) const return GRID_COLUMN_NOT_FOUND; } -//------------------------------------------------------------------------------ void DbGridControl::implAdjustInSolarThread(sal_Bool _bRows) { SAL_INFO("svx.fmcomp", "DbGridControl::implAdjustInSolarThread"); @@ -3573,7 +3457,6 @@ void DbGridControl::implAdjustInSolarThread(sal_Bool _bRows) } } -//------------------------------------------------------------------------------ IMPL_LINK(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat) { m_nAsynAdjustEvent = 0; @@ -3587,7 +3470,6 @@ IMPL_LINK(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat) return 0L; } -//------------------------------------------------------------------------------ void DbGridControl::BeginCursorAction() { if (m_pFieldListeners) @@ -3607,7 +3489,6 @@ void DbGridControl::BeginCursorAction() m_pDataSourcePropListener->suspend(); } -//------------------------------------------------------------------------------ void DbGridControl::EndCursorAction() { if (m_pFieldListeners) @@ -3627,7 +3508,6 @@ void DbGridControl::EndCursorAction() m_pDataSourcePropListener->resume(); } -//------------------------------------------------------------------------------ void DbGridControl::ConnectToFields() { ColumnFieldValueListeners* pListeners = (ColumnFieldValueListeners*)m_pFieldListeners; @@ -3657,7 +3537,6 @@ void DbGridControl::ConnectToFields() } } -//------------------------------------------------------------------------------ void DbGridControl::DisconnectFromFields() { if (!m_pFieldListeners) @@ -3677,7 +3556,6 @@ void DbGridControl::DisconnectFromFields() m_pFieldListeners = NULL; } -//------------------------------------------------------------------------------ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent& /*_evt*/) { osl::MutexGuard aPreventDestruction(m_aDestructionSafety); @@ -3714,7 +3592,6 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent } } -//------------------------------------------------------------------------------ void DbGridControl::FieldListenerDisposing(sal_uInt16 _nId) { ColumnFieldValueListeners* pListeners = (ColumnFieldValueListeners*)m_pFieldListeners; @@ -3736,7 +3613,6 @@ void DbGridControl::FieldListenerDisposing(sal_uInt16 _nId) pListeners->erase(aPos); } -//------------------------------------------------------------------------------ void DbGridControl::disposing(sal_uInt16 _nId, const EventObject& /*_rEvt*/) { if (_nId == 0) @@ -3750,12 +3626,12 @@ void DbGridControl::disposing(sal_uInt16 _nId, const EventObject& /*_rEvt*/) } } } -// ----------------------------------------------------------------------------- + sal_Int32 DbGridControl::GetAccessibleControlCount() const { return DbGridControl_Base::GetAccessibleControlCount() + 1; // the navigation control } -// ----------------------------------------------------------------------------- + Reference<XAccessible > DbGridControl::CreateAccessibleControl( sal_Int32 _nIndex ) { Reference<XAccessible > xRet; @@ -3767,7 +3643,7 @@ Reference<XAccessible > DbGridControl::CreateAccessibleControl( sal_Int32 _nInde xRet = DbGridControl_Base::CreateAccessibleControl( _nIndex ); return xRet; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { sal_uInt16 nColumnId = GetColumnId( _nColumnPos ); @@ -3797,7 +3673,5 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s } return DbGridControl_Base::CreateAccessibleCell( _nRow, _nColumnPos ); } -// ----------------------------------------------------------------------------- - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 68c566336d84..d116719111a1 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1258,5 +1258,4 @@ IMPL_LINK_NOARG(SdrItemBrowser, SetDirtyHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 502dc80ca88c..6406435542ce 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/bigint.hxx> #include <tools/helpers.hxx> #include <svx/svdopath.hxx> @@ -907,7 +906,6 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag) return true; } - String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) const { XubString aStr; @@ -1636,7 +1634,6 @@ SdrPathObjGeoData::~SdrPathObjGeoData() { } -////////////////////////////////////////////////////////////////////////////// // DrawContact section sdr::contact::ViewContact* SdrPathObj::CreateObjectSpecificViewContact() diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index c90cc44d0fd7..df64c9bf9e24 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -55,9 +55,7 @@ using namespace ::com::sun::star::drawing; #define INTERFACE_TYPE( xint ) \ ::getCppuType((const Reference< xint >*)0) -/********************************************************************** -* class SvxDrawPage * -**********************************************************************/ +// class SvxDrawPage * UNO3_GETIMPLEMENTATION_IMPL( SvxDrawPage ); DBG_NAME(SvxDrawPage) @@ -80,7 +78,6 @@ SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw() mpView->SetDesignMode(sal_True); } -//---------------------------------------------------------------------- SvxDrawPage::~SvxDrawPage() throw() { DBG_ASSERT( mrBHelper.bDisposed, "SvxDrawPage must be disposed!" ); @@ -92,8 +89,6 @@ SvxDrawPage::~SvxDrawPage() throw() DBG_DTOR(SvxDrawPage,NULL); } -//---------------------------------------------------------------------- - // XInterface void SvxDrawPage::release() throw() { @@ -117,10 +112,7 @@ void SvxDrawPage::disposing() throw() mpPage = 0; } -//---------------------------------------------------------------------- // XComponent -//---------------------------------------------------------------------- - void SvxDrawPage::dispose() throw(::com::sun::star::uno::RuntimeException) { @@ -177,8 +169,6 @@ void SvxDrawPage::dispose() } -//---------------------------------------------------------------------- - void SAL_CALL SvxDrawPage::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -189,8 +179,6 @@ void SAL_CALL SvxDrawPage::addEventListener( const ::com::sun::star::uno::Refere mrBHelper.addListener( ::getCppuType( &aListener ) , aListener ); } -//---------------------------------------------------------------------- - void SAL_CALL SvxDrawPage::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -201,18 +189,11 @@ void SAL_CALL SvxDrawPage::removeEventListener( const ::com::sun::star::uno::Ref mrBHelper.removeListener( ::getCppuType( &aListener ) , aListener ); } -//---------------------------------------------------------------------- // SfxListener -//---------------------------------------------------------------------- - void SvxDrawPage::Notify( SfxBroadcaster&, const SfxHint& /*rHint*/ ) { } -//---------------------------------------------------------------------- -// ::com::sun::star::drawing::XShapes -//---------------------------------------------------------------------- - void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { @@ -251,7 +232,6 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape mpModel->SetChanged(); } -//---------------------------------------------------------------------- void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { @@ -285,10 +265,7 @@ void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) mpModel->SetChanged(); } -//---------------------------------------------------------------------- // ::com::sun::star::container::XIndexAccess -//---------------------------------------------------------------------- - sal_Int32 SAL_CALL SvxDrawPage::getCount() throw( uno::RuntimeException ) { @@ -300,7 +277,6 @@ sal_Int32 SAL_CALL SvxDrawPage::getCount() return( (sal_Int32) mpPage->GetObjCount() ); } -//---------------------------------------------------------------------- uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { @@ -320,18 +296,13 @@ uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) return makeAny(Reference< drawing::XShape >( pObj->getUnoShape(), uno::UNO_QUERY )); } - -//---------------------------------------------------------------------- // ::com::sun::star::container::XElementAccess -//---------------------------------------------------------------------- - uno::Type SAL_CALL SvxDrawPage::getElementType() throw( uno::RuntimeException ) { return INTERFACE_TYPE( drawing::XShape ); } -//---------------------------------------------------------------------- sal_Bool SAL_CALL SvxDrawPage::hasElements() throw( uno::RuntimeException ) { @@ -359,10 +330,8 @@ namespace } } -//---------------------------------------------------------------------- // ACHTUNG: _SelectObjectsInView selektiert die ::com::sun::star::drawing::Shapes nur in der angegebennen // SdrPageView. Dies muss nicht die sichtbare SdrPageView sein. -//---------------------------------------------------------------------- void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw () { DBG_ASSERT(pPageView,"SdrPageView ist NULL! [CL]"); @@ -383,10 +352,8 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS } } -//---------------------------------------------------------------------- // ACHTUNG: _SelectObjectInView selektiert das Shape *nur* in der angegebennen // SdrPageView. Dies muss nicht die sichtbare SdrPageView sein. -//---------------------------------------------------------------------- void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw() { DBG_ASSERT(pPageView,"SdrPageView ist NULL! [CL]"); @@ -399,7 +366,6 @@ void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xSha } } -//---------------------------------------------------------------------- Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< drawing::XShapes >& xShapes ) throw( uno::RuntimeException ) { @@ -438,7 +404,6 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< return xShapeGroup; } -//---------------------------------------------------------------------- void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGroup ) throw( uno::RuntimeException ) { @@ -465,7 +430,6 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr mpModel->SetChanged(); } -//---------------------------------------------------------------------- SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & xShape ) throw() { sal_uInt16 nType; @@ -562,7 +526,6 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x return pNewObj; } -//---------------------------------------------------------------------- void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) const throw() { sal_uInt32 nTempType = UHashMap::getId( aName ); @@ -602,7 +565,6 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, } } -//---------------------------------------------------------------------- SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj, SvxDrawPage *mpPage ) throw() { SvxShape* pRet = NULL; @@ -827,7 +789,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 return pRet; } -//---------------------------------------------------------------------- Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj ) const throw() { Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(), @@ -837,7 +798,6 @@ Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj ) const return xShape; } -//---------------------------------------------------------------------- SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xShape ) throw() { SdrObject* pObj = _CreateSdrObject( xShape ); @@ -851,9 +811,7 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS return pObj; } -//---------------------------------------------------------------------- // ::com::sun::star::lang::XServiceInfo -//---------------------------------------------------------------------- OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeException ) { return OUString("SvxDrawPage"); diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 61fdabe99e6b..e2f3bae339f4 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -69,7 +69,6 @@ using namespace ::com::sun::star; /************************************************************************ * Hintergrundbrush setzen, z.B. bei Zeichenvorlagen ***********************************************************************/ - void SwFont::SetBackColor( Color* pNewColor ) { delete pBackColor; @@ -468,10 +467,6 @@ void SwFont::SetVertical( sal_uInt16 nDir, const sal_Bool bVertFormat ) *************************************************************************/ -/************************************************************************* - * SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) - *************************************************************************/ - // nEsc ist der Prozentwert sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const { @@ -486,10 +481,6 @@ sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const return nOrgAscent; } -/************************************************************************* - * SwFont::SetDiffFnt() - *************************************************************************/ - void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, const IDocumentSettingAccess *pIDocumentSettingAccess ) { @@ -712,9 +703,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, OSL_ENSURE( aSub[SW_LATIN].IsTransparent(), "SwFont: Transparent revolution" ); } -/************************************************************************* - * class SwFont - *************************************************************************/ +// SwFont SwFont::SwFont() : pBackColor(0) @@ -975,30 +964,18 @@ SwFont& SwFont::operator=( const SwFont &rFont ) return *this; } -/************************************************************************* - * SwFont::GoMagic() - *************************************************************************/ - void SwFont::GoMagic( ViewShell *pSh, sal_uInt8 nWhich ) { SwFntAccess aFntAccess( aSub[nWhich].pMagic, aSub[nWhich].nFntIndex, &aSub[nWhich], pSh, sal_True ); } -/************************************************************************* - * SwSubFont::IsSymbol() - *************************************************************************/ - sal_Bool SwSubFont::IsSymbol( ViewShell *pSh ) { SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh, sal_False ); return aFntAccess.Get()->IsSymbol(); } -/************************************************************************* - * SwSubFont::ChgFnt() - *************************************************************************/ - sal_Bool SwSubFont::ChgFnt( ViewShell *pSh, OutputDevice& rOut ) { if ( pLastFont ) @@ -1016,10 +993,6 @@ sal_Bool SwSubFont::ChgFnt( ViewShell *pSh, OutputDevice& rOut ) STRIKEOUT_NONE != GetStrikeout(); } -/************************************************************************* - * SwFont::ChgPhysFnt() - *************************************************************************/ - void SwFont::ChgPhysFnt( ViewShell *pSh, OutputDevice& rOut ) { if( bOrgChg && aSub[nActual].IsEsc() ) @@ -1053,7 +1026,6 @@ void SwFont::ChgPhysFnt( ViewShell *pSh, OutputDevice& rOut ) * MaxDescent = Max (T1_height-T1_ascent, * T2_height-T2_ascent - (Esc * T1_height) *************************************************************************/ - sal_uInt16 SwSubFont::CalcEscHeight( const sal_uInt16 nOldHeight, const sal_uInt16 nOldAscent ) const { @@ -1078,10 +1050,6 @@ short SwSubFont::_CheckKerning( ) return nKernx; } -/************************************************************************* - * SwSubFont::GetAscent() - *************************************************************************/ - sal_uInt16 SwSubFont::GetAscent( ViewShell *pSh, const OutputDevice& rOut ) { sal_uInt16 nAscent; @@ -1092,10 +1060,6 @@ sal_uInt16 SwSubFont::GetAscent( ViewShell *pSh, const OutputDevice& rOut ) return nAscent; } -/************************************************************************* - * SwSubFont::GetHeight() - *************************************************************************/ - sal_uInt16 SwSubFont::GetHeight( ViewShell *pSh, const OutputDevice& rOut ) { SV_STAT( nGetTextSize ); @@ -1109,9 +1073,6 @@ sal_uInt16 SwSubFont::GetHeight( ViewShell *pSh, const OutputDevice& rOut ) return nHeight; // + nLeading; } -/************************************************************************* - * SwSubFont::_GetTxtSize() - *************************************************************************/ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) { // Robust: Eigentlich sollte der Font bereits eingestellt sein, aber @@ -1211,10 +1172,6 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) return aTxtSize; } -/************************************************************************* - * SwSubFont::_DrawText() - *************************************************************************/ - void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) { rInf.SetGreyWave( bGrey ); @@ -1431,10 +1388,6 @@ static sal_Char const sDoubleSpace[] = " "; rInf.SetPos( rOld ); } -/************************************************************************* - * SwSubFont::_GetCrsrOfst() - *************************************************************************/ - xub_StrLen SwSubFont::_GetCrsrOfst( SwDrawTextInfo& rInf ) { if ( !pLastFont || pLastFont->GetOwner()!=pMagic ) @@ -1468,10 +1421,6 @@ xub_StrLen SwSubFont::_GetCrsrOfst( SwDrawTextInfo& rInf ) return nCrsr; } -/************************************************************************* - * SwSubFont::CalcEsc() - *************************************************************************/ - void SwSubFont::CalcEsc( SwDrawTextInfo& rInf, Point& rPos ) { long nOfst; @@ -1570,12 +1519,9 @@ void SwDrawTextInfo::Shift( sal_uInt16 nDir ) } } -/************************************************************************* - * SwUnderlineFont::~SwUnderlineFont - * - * Used for the "continuous underline" feature. - *************************************************************************/ - +/** + * @note Used for the "continuous underline" feature. + **/ SwUnderlineFont::SwUnderlineFont( SwFont& rFnt, const Point& rPoint ) : aPos( rPoint ), pFnt( &rFnt ) { diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index b830f517af1b..0f5dd17cccb4 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <vcl/svapp.hxx> #include <svl/itemiter.hxx> @@ -141,7 +140,6 @@ lcl_MaskRedlines( const SwTxtNode& rNode, OUStringBuffer& rText, /* * Used for spell checking. Deleted redlines and hidden characters are masked */ - static sal_uInt16 lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText, const xub_StrLen nStt, const xub_StrLen nEnd, @@ -177,7 +175,6 @@ lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText, /* * Used for spell checking. Calculates a rectangle for repaint. */ - static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, xub_StrLen nChgStart, xub_StrLen nChgEnd ) { SwRect aRect; @@ -370,7 +367,6 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, * 5) The attribute is outside the deletion range * -> nothing to do */ - void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich, const SfxItemSet* pSet, sal_Bool bInclRefToxMark ) { @@ -614,7 +610,6 @@ sal_Int32 clipIndexBounds(const OUString &rStr, sal_Int32 nPos) * Wenn dieses erste Wort nur aus Whitespaces besteht, returnen wir * einen leeren String. *************************************************************************/ - OUString SwTxtNode::GetCurWord( xub_StrLen nPos ) const { assert(nPos <= m_Text.getLength()); // invalid index @@ -1475,18 +1470,14 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/ if( pSmartTagList ) { - // // Update WrongList stuff - // pSmartTagList->SetInvalid( STRING_LEN, 0 ); pNode->SetSmartTagDirty( STRING_LEN != pSmartTagList->GetBeginInv() ); if( !pSmartTagList->Count() && !pNode->IsSmartTagDirty() ) pNode->SetSmartTags( NULL ); - // // Calculate repaint area: - // #if OSL_DEBUG_LEVEL > 1 const sal_uInt16 nNumberOfEntriesAfterRecognize2 = pSmartTagList->Count(); (void) nNumberOfEntriesAfterRecognize2; @@ -1553,11 +1544,7 @@ void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, xub_StrLen nActPos ) pNode->SetAutoCompleteWordDirty( sal_False ); } -/************************************************************************* - * SwTxtNode::Hyphenate - *************************************************************************/ -// Findet den TxtFrm und sucht dessen CalcHyph - +/** Findet den TxtFrm und sucht dessen CalcHyph */ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf ) { // Abkuerzung: am Absatz ist keine Sprache eingestellt: @@ -2066,9 +2053,8 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, return true; } -// -// Paragraph statistics start -// +// Paragraph statistics start --> + struct SwParaIdleData_Impl { SwWrongList* pWrong; // for spell checking @@ -2239,6 +2225,7 @@ bool SwTxtNode::IsWordCountDirty() const { return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bWordCountDirty : 0; } + void SwTxtNode::SetWrongDirty( bool bNew ) const { if ( m_pParaIdleData_Impl ) @@ -2246,10 +2233,12 @@ void SwTxtNode::SetWrongDirty( bool bNew ) const m_pParaIdleData_Impl->bWrongDirty = bNew; } } + bool SwTxtNode::IsWrongDirty() const { return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bWrongDirty : 0; } + void SwTxtNode::SetGrammarCheckDirty( bool bNew ) const { if ( m_pParaIdleData_Impl ) @@ -2257,10 +2246,12 @@ void SwTxtNode::SetGrammarCheckDirty( bool bNew ) const m_pParaIdleData_Impl->bGrammarCheckDirty = bNew; } } + bool SwTxtNode::IsGrammarCheckDirty() const { return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bGrammarCheckDirty : 0; } + void SwTxtNode::SetSmartTagDirty( bool bNew ) const { if ( m_pParaIdleData_Impl ) @@ -2268,10 +2259,12 @@ void SwTxtNode::SetSmartTagDirty( bool bNew ) const m_pParaIdleData_Impl->bSmartTagDirty = bNew; } } + bool SwTxtNode::IsSmartTagDirty() const { return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bSmartTagDirty : 0; } + void SwTxtNode::SetAutoCompleteWordDirty( bool bNew ) const { if ( m_pParaIdleData_Impl ) @@ -2279,12 +2272,12 @@ void SwTxtNode::SetAutoCompleteWordDirty( bool bNew ) const m_pParaIdleData_Impl->bAutoComplDirty = bNew; } } + bool SwTxtNode::IsAutoCompleteWordDirty() const { return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bAutoComplDirty : 0; } -// -// Paragraph statistics end -// + +// <-- Paragraph statistics end /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 16f10e85238b..73989d5c4b28 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -74,7 +74,6 @@ #include "swhtml.hxx" #include "htmlform.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -171,7 +170,6 @@ const sal_Char * aEventOptionTable[] = 0 }; - class SwHTMLForm_Impl { SwDocShell *pDocSh; @@ -198,7 +196,6 @@ class SwHTMLForm_Impl std::vector<sal_uInt16> aSelectedList; public: - SwHTMLForm_Impl( SwDocShell *pDSh ) : pDocSh( pDSh ), pHeaderAttrs( pDSh ? pDSh->GetHeaderAttributes() : 0 ) @@ -278,7 +275,6 @@ const uno::Reference< XMultiServiceFactory >& SwHTMLForm_Impl::GetServiceFactory return xServiceFactory; } - const uno::Reference< drawing::XDrawPage >& SwHTMLForm_Impl::GetDrawPage() { if( !xDrawPage.is() && pDocSh ) @@ -315,7 +311,6 @@ const uno::Reference< container::XIndexContainer >& SwHTMLForm_Impl::GetForms() return xForms; } - const uno::Reference< drawing::XShapes > & SwHTMLForm_Impl::GetShapes() { if( !xShapes.is() ) @@ -375,7 +370,6 @@ class SwHTMLImageWatcher : void clear(); public: - SwHTMLImageWatcher( const uno::Reference< drawing::XShape > & rShape, sal_Bool bWidth, sal_Bool bHeight ); ~SwHTMLImageWatcher(); @@ -458,8 +452,6 @@ void SwHTMLImageWatcher::clear() xProd->removeConsumer( xThis ); } -//------------------------------------------------------------------------------ - void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height ) throw( uno::RuntimeException ) { @@ -573,7 +565,6 @@ void SwHTMLImageWatcher::setPixelsByBytes( { } - void SwHTMLImageWatcher::setPixelsByLongs( sal_Int32, sal_Int32, sal_Int32, sal_Int32, const Sequence< sal_Int32 >&, sal_Int32, sal_Int32 ) @@ -581,7 +572,6 @@ void SwHTMLImageWatcher::setPixelsByLongs( { } - void SwHTMLImageWatcher::complete( sal_Int32 Status, const uno::Reference< awt::XImageProducer >& ) throw( uno::RuntimeException ) @@ -652,7 +642,6 @@ class SwHTMLFormPendingStackData_Impl: public SwPendingStackData sal_Bool bMinHeight; public: - SwHTMLFormPendingStackData_Impl( const uno::Reference< drawing::XShape > & rShape, const Size& rTextSz, sal_Bool bMinW, sal_Bool bMinH ) : @@ -2213,7 +2202,6 @@ void SwHTMLParser::EndTextArea() bTextArea = sal_False; } - void SwHTMLParser::InsertTextAreaText( sal_uInt16 nToken ) { OSL_ENSURE( bTextArea, "keine TextArea oder falscher Typ" ); diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx index 60f02a64aca5..ad047d2e45df 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -97,7 +97,6 @@ class CSS1Selector CSS1Selector *pNext; // die naechste Komponente public: - CSS1Selector( CSS1SelectorType eTyp, const OUString &rSel ) : eType(eTyp), aSelector( rSel ), pNext( 0 ) {} @@ -129,7 +128,6 @@ struct CSS1Expression CSS1Expression *pNext; // die naechste Komponente public: - CSS1Expression( CSS1Token eTyp, const OUString &rVal, double nVal, sal_Unicode cO = 0 ) : cOp(cO), eType(eTyp), aValue(rVal), nValue(nVal), pNext(0) @@ -228,7 +226,6 @@ class CSS1Parser CSS1Expression *ParseDeclaration( OUString& rProperty ); protected: - void ParseStyleSheet(); // Den Inhalt eines HTML-Style-Elements parsen. @@ -254,7 +251,6 @@ protected: const CSS1Expression *pExpr ); public: - CSS1Parser(); virtual ~CSS1Parser(); @@ -269,8 +265,6 @@ inline sal_uInt32 CSS1Parser::SetLinePos( sal_uInt32 nlPos ) return nlOld; } - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 7f798f343cf5..d3c6c736cc8d 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -93,6 +93,7 @@ private: sal_uInt8 SprmDataOfs(sal_uInt16 nId) const; enum SprmType {L_FIX=0, L_VAR=1, L_VAR2=2}; + public: //7- ids are very different to 8+ ones wwSprmParser(ww::WordVersion eVersion); @@ -192,6 +193,7 @@ private: long nIMax; ///< Anzahl der Elemente long nIdx; ///< Merker, wo wir gerade sind sal_uInt32 nStru; + public: WW8PLCFspecial(SvStream* pSt, sal_uInt32 nFilePos, sal_uInt32 nPLCF, sal_uInt32 nStruct); @@ -236,6 +238,7 @@ private: long nRemLen; // length of remaining SPRMs (including akt. SPRM) void UpdateMyMembers(); + public: explicit WW8SprmIter( const sal_uInt8* pSprms_, long nLen_, const wwSprmParser &rSprmParser); @@ -246,6 +249,7 @@ public: { return ( pSprms && (0 < nRemLen) ) ? pSprms : 0; } const sal_uInt8* GetAktParams() const { return pAktParams; } sal_uInt16 GetAktId() const { return nAktId; } + private: //No copying WW8SprmIter(const WW8SprmIter&); @@ -271,6 +275,7 @@ private: void GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN); void MakeFailedPLCF(); + public: WW8PLCF(SvStream& rSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct, WW8_CP nStartPos = -1); @@ -301,10 +306,12 @@ public: class WW8PLCFpcd { friend class WW8PLCFpcd_Iter; + sal_Int32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur sal_uInt8* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array long nIMax; sal_uInt32 nStru; + public: WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos, sal_uInt32 nPLCF, sal_uInt32 nStruct); @@ -321,6 +328,7 @@ private: //No copying WW8PLCFpcd_Iter(const WW8PLCFpcd_Iter&); WW8PLCFpcd_Iter& operator=(const WW8PLCFpcd_Iter&); + public: WW8PLCFpcd_Iter( WW8PLCFpcd& rPLCFpcd, long nStartPos = -1 ); long GetIdx() const { return nIdx; } @@ -356,6 +364,7 @@ private: //No copying WW8PLCFx(const WW8PLCFx&); WW8PLCFx& operator=(const WW8PLCFx&); + public: WW8PLCFx(ww::WordVersion eVersion, bool bSprm) : meVer(eVersion), bIsSprm(bSprm), bDirty(false) {} @@ -393,6 +402,7 @@ private: //No copying WW8PLCFx_PCDAttrs(const WW8PLCFx_PCDAttrs&); WW8PLCFx_PCDAttrs& operator=(const WW8PLCFx_PCDAttrs&); + public: WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase ); @@ -416,6 +426,7 @@ private: //No copying WW8PLCFx_PCD(const WW8PLCFx_PCD&); WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&); + public: WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd, WW8_CP nStartCp, bool bVer67P); @@ -485,6 +496,7 @@ public: //Fill in an Entry with sanity testing void FillEntry(Entry &rEntry, sal_Size nDataOffset, sal_uInt16 nLen); + public: WW8Fkp (ww::WordVersion eVersion, SvStream* pFKPStrm, SvStream* pDataStrm, long _nFilePos, long nItemSiz, ePLCFT ePl, @@ -520,6 +532,7 @@ public: const wwSprmParser &GetSprmParser() const { return maSprmParser; } }; + private: SvStream* pFKPStrm; // Input-File SvStream* pDataStrm; // Input-File @@ -547,9 +560,11 @@ private: //No copying WW8PLCFx_Fc_FKP(const WW8PLCFx_Fc_FKP&); WW8PLCFx_Fc_FKP& operator=(const WW8PLCFx_Fc_FKP&); + protected: ePLCFT ePLCF; WW8PLCFx_PCDAttrs* pPCDAttrs; + public: WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL ); @@ -581,6 +596,7 @@ private: //No copying WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&); WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&); + public: WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, const WW8ScannerBase& rBase, ePLCFT ePl ); @@ -613,6 +629,7 @@ private: //no copying WW8PLCFx_SEPX(const WW8PLCFx_SEPX&); WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&); + public: WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib, WW8_CP nStartCp ); @@ -642,6 +659,7 @@ private: //No copying WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&); WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&); + public: WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruc = 0); @@ -673,6 +691,7 @@ private: //No copying WW8PLCFx_FLD(const WW8PLCFx_FLD&); WW8PLCFx_FLD& operator=(const WW8PLCFx_FLD &); + public: WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType); virtual ~WW8PLCFx_FLD(); @@ -703,6 +722,7 @@ private: //No copying WW8PLCFx_Book(const WW8PLCFx_Book&); WW8PLCFx_Book& operator=(const WW8PLCFx_Book&); + public: WW8PLCFx_Book(SvStream* pTblSt,const WW8Fib& rFib); virtual ~WW8PLCFx_Book(); @@ -802,6 +822,7 @@ class WW8PLCFMan { public: enum WW8PLCFManLimits {MAN_ANZ_PLCF = 10}; + private: wwSprmParser maSprmParser; long nCpO; // Origin Cp -- the basis for nNewCp @@ -834,6 +855,7 @@ private: void AdvSprm(short nIdx, bool bStart); void AdvNoSprm(short nIdx, bool bStart); sal_uInt16 GetId(const WW8PLCFxDesc* p ) const; + public: WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, bool bDoingDrawTextBox = false); @@ -937,6 +959,7 @@ private: WW8PLCFpcd* OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ); void DeletePieceTable(); + public: WW8ScannerBase( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, WW8Fib* pWwF ); @@ -1453,6 +1476,7 @@ protected: //No copying WW8Style(const WW8Style&); WW8Style& operator=(const WW8Style&); + public: WW8Style( SvStream& rSt, WW8Fib& rFibPara ); WW8_STD* Read1STDFixed( short& rSkip, short* pcbStd ); @@ -1465,6 +1489,7 @@ class WW8Fonts protected: WW8_FFN* pFontA; // Array of Pointers to Font Description sal_uInt16 nMax; // Array-Size + public: WW8Fonts( SvStream& rSt, WW8Fib& rFib ); ~WW8Fonts() { delete[] pFontA; } @@ -1746,6 +1771,7 @@ private: WW8PLCF aPLCF; long nTextOfs; short nIdxOffset; + public: WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ); bool GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rStart, long& rLen); diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index e321fc8a2925..c4f6d6840637 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -36,6 +36,7 @@ class MSOWordCommandConvertor : public MSOCommandConvertor { IdToString msoToOOcmd; IdToString tcidToOOcmd; + public: MSOWordCommandConvertor(); virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); @@ -72,7 +73,6 @@ OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) return sResult; } - SwCTBWrapper::SwCTBWrapper( bool bReadId ) : Tcg255SubStruct( bReadId ) ,reserved2(0) ,reserved3(0) @@ -486,7 +486,6 @@ bool SwCTB::IsMenuToolbar() return tb.IsMenuToolbar(); } - bool SwCTB::Read( SvStream &rS) { SAL_INFO("sw.ww8","SwCTB::Read() stream pos 0x" << std::hex << rS.Tell() ); @@ -758,8 +757,6 @@ SwTBC::GetCustomText() if ( tbcd.get() ) sCustomText = tbcd->getGeneralInfo().CustomText(); return sCustomText; - - } bool @@ -887,7 +884,6 @@ bool Tcg255::ImportCustomToolBar( SfxObjectShell& rDocSh ) return true; } - bool Tcg255::Read(SvStream &rS) { SAL_INFO("sw.ww8","Tcg255::Read() stream pos 0x" << std::hex << rS.Tell() ); @@ -921,7 +917,6 @@ void Tcg255::Print( FILE* fp) } } - Tcg255SubStruct::Tcg255SubStruct( bool bReadId ) : mbReadId( bReadId ), ch(0) { } @@ -979,7 +974,6 @@ PlfAcd::PlfAcd( bool bReadId ) : Tcg255SubStruct( bReadId ) { } - PlfAcd::~PlfAcd() { if ( rgacd ) @@ -1003,6 +997,7 @@ bool PlfAcd::Read( SvStream &rS) } return true; } + void PlfAcd::Print( FILE* fp ) { Indent a; @@ -1126,6 +1121,7 @@ void TcgSttbfCore::Print( FILE* fp ) } } + MacroNames::MacroNames( bool bReadId ) : Tcg255SubStruct( bReadId ) ,iMac( 0 ) ,rgNames( NULL ) @@ -1174,7 +1170,6 @@ MacroName::MacroName():ibst(0) { } - bool MacroName::Read(SvStream &rS) { SAL_INFO("sw.ww8","MacroName::Read() stream pos 0x" << std::hex << rS.Tell() ); @@ -1191,8 +1186,6 @@ void MacroName::Print( FILE* fp ) xstz.Print( fp ); } - - Xstz::Xstz():chTerm(0) { } diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 3bca70f63396..943166672aef 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -14,6 +14,7 @@ class Xst : public TBBase { OUString sString; + public: Xst(){} bool Read(SvStream &rS); @@ -27,6 +28,7 @@ class SwTBC : public TBBase TBCHeader tbch; boost::shared_ptr< sal_uInt32 > cid; // optional boost::shared_ptr<TBCData> tbcd; + public: SwTBC(); ~SwTBC(); @@ -50,6 +52,7 @@ class SwCTB : public TBBase SwCTB(const SwCTB&); SwCTB& operator = ( const SwCTB&); + public: SwCTB(); ~SwCTB(); @@ -71,6 +74,7 @@ class TBDelta : public TBBase sal_Int32 fc; sal_uInt16 CiTBDE; // careful of this ( endian matters etc. ) sal_uInt16 cbTBC; + public: TBDelta(); ~TBDelta(){} @@ -88,11 +92,14 @@ public: class Tcg255SubStruct : public TBBase { friend class Tcg255; + bool mbReadId; Tcg255SubStruct(const Tcg255SubStruct&); Tcg255SubStruct& operator = ( const Tcg255SubStruct&); + protected: sal_uInt8 ch; + public: Tcg255SubStruct( bool bReadId ); ~Tcg255SubStruct(){} @@ -101,9 +108,11 @@ public: }; class SwCTBWrapper; + class Customization : public TBBase { friend class SwCTBWrapper; + sal_Int32 tbidForTBD; sal_uInt16 reserved1; sal_Int16 ctbds; @@ -112,6 +121,7 @@ friend class SwCTBWrapper; std::vector< TBDelta > customizationDataTBDelta; bool bIsDroppedMenuTB; bool ImportMenu( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); + public: Customization( SwCTBWrapper* rapper ); ~Customization(); @@ -143,6 +153,7 @@ class SwCTBWrapper : public Tcg255SubStruct std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu SwCTBWrapper(const SwCTBWrapper&); SwCTBWrapper& operator = ( const SwCTBWrapper&); + public: SwCTBWrapper( bool bReadId = true ); ~SwCTBWrapper(); @@ -182,6 +193,7 @@ class PlfMcd : public Tcg255SubStruct std::vector<MCD> rgmcd; // array of MCD's PlfMcd(const PlfMcd&); PlfMcd& operator = ( const PlfMcd&); + public: PlfMcd( bool bReadId = true ); bool Read(SvStream &rS); @@ -194,6 +206,7 @@ class Acd : public TBBase sal_uInt16 fciBasedOnABC; // fciBasedOn(13 bits) A(1bit)B(1bit)C(1Bit) Acd(const Acd&); Acd& operator = ( const Acd&); + public: Acd(); ~Acd(){} @@ -207,6 +220,7 @@ class PlfAcd: public Tcg255SubStruct Acd* rgacd; PlfAcd(const PlfAcd&); PlfAcd& operator = ( const PlfAcd&); + public: PlfAcd( bool bReadId = true ); ~PlfAcd(); @@ -225,6 +239,7 @@ class Kme : public TBBase Kme(const Kme&); Kme& operator = ( const Kme&); + public: Kme(); ~Kme(); @@ -238,6 +253,7 @@ class PlfKme : public Tcg255SubStruct Kme* rgkme; PlfKme(const PlfKme&); PlfKme& operator = ( const PlfKme&); + public: PlfKme( bool bReadId = true ); ~PlfKme(); @@ -254,12 +270,14 @@ struct SBBItem sal_uInt16 extraData; SBBItem() : cchData(0), extraData(0){} }; + sal_uInt16 fExtend; sal_uInt16 cData; sal_uInt16 cbExtra; SBBItem* dataItems; TcgSttbfCore(const TcgSttbfCore&); TcgSttbfCore& operator = ( const TcgSttbfCore&); + public: TcgSttbfCore(); ~TcgSttbfCore(); @@ -272,6 +290,7 @@ class TcgSttbf : public Tcg255SubStruct TcgSttbfCore sttbf; TcgSttbf(const TcgSttbf&); TcgSttbf& operator = ( const TcgSttbf&); + public: TcgSttbf( bool bReadId = true ); ~TcgSttbf(){} @@ -286,6 +305,7 @@ class Xstz : public TBBase Xstz(const Xstz&); Xstz& operator = ( const Xstz&); + public: Xstz(); ~Xstz(){} @@ -299,6 +319,7 @@ class MacroName : public TBBase Xstz xstz; MacroName(const MacroName&); MacroName& operator = ( const MacroName&); + public: MacroName(); ~MacroName(){} @@ -313,6 +334,7 @@ class MacroNames : public Tcg255SubStruct MacroNames(const MacroNames&); MacroNames& operator = ( const MacroNames&); + public: MacroNames( bool bReadId = true ); ~MacroNames(); @@ -326,6 +348,7 @@ class Tcg255 : public TBBase Tcg255(const Tcg255&); Tcg255& operator = ( const Tcg255&); bool processSubStruct( sal_uInt8 nId, SvStream& ); + public: Tcg255(); ~Tcg255(); @@ -340,6 +363,7 @@ class Tcg: public TBBase std::auto_ptr< Tcg255 > tcg; Tcg(const Tcg&); Tcg& operator = ( const Tcg&); + public: Tcg(); ~Tcg(){} diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 5b4bad2a62fc..a24bae455889 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -66,7 +66,9 @@ #include <popup.hrc> #include <svx/extedit.hxx> #include <svx/graphichelper.hxx> + #define SwGrfShell + #include <sfx2/msg.hxx> #include "swslots.hxx" @@ -110,6 +112,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) GetView().ExecuteScan( rReq ); break; } + case SID_SAVE_GRAPHIC: { const Graphic *pGraphic; @@ -122,6 +125,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) } } break; + case SID_COMPRESS_GRAPHIC: { const Graphic* pGraphic = rSh.GetGraphic(); @@ -166,6 +170,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) } } break; + case SID_EXTERNAL_EDIT: { // When the graphic is selected to be opened via some external tool @@ -178,6 +183,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) } } break; + case SID_INSERT_GRAPHIC: case FN_FORMAT_GRAFIC_DLG: case FN_DRAW_WRAP_DLG: @@ -485,26 +491,31 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) aGrfSet.Put( SwLuminanceGrf( ((SfxInt16Item*)pItem)->GetValue() )); break; + case SID_ATTR_GRAF_CONTRAST: if( pItem ) aGrfSet.Put( SwContrastGrf( ((SfxInt16Item*)pItem)->GetValue() )); break; + case SID_ATTR_GRAF_RED: if( pItem ) aGrfSet.Put( SwChannelRGrf( ((SfxInt16Item*)pItem)->GetValue() )); break; + case SID_ATTR_GRAF_GREEN: if( pItem ) aGrfSet.Put( SwChannelGGrf( ((SfxInt16Item*)pItem)->GetValue() )); break; + case SID_ATTR_GRAF_BLUE: if( pItem ) aGrfSet.Put( SwChannelBGrf( ((SfxInt16Item*)pItem)->GetValue() )); break; + case SID_ATTR_GRAF_GAMMA: if( pItem ) { @@ -512,11 +523,13 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) aGrfSet.Put( SwGammaGrf(fVal/100. )); } break; + case SID_ATTR_GRAF_TRANSPARENCE: if( pItem ) aGrfSet.Put( SwTransparencyGrf( static_cast< sal_Int8 >( ( (SfxUInt16Item*)pItem )->GetValue() ) ) ); break; + case SID_ATTR_GRAF_INVERT: if( pItem ) aGrfSet.Put( SwInvertGrf( @@ -535,6 +548,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) aToolboxAccess.toggleToolbox(); break; } + case SID_GRFFILTER: case SID_GRFFILTER_INVERT: case SID_GRFFILTER_SMOOTH: @@ -565,6 +579,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) default: OSL_ENSURE(!this, "wrong dispatcher"); } + if( aGrfSet.Count() ) GetShell().SetAttr( aGrfSet ); } @@ -594,11 +609,13 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) if( bParentCntProt || !bIsGrfCntnt ) bDisable = true; break; + case SID_SAVE_GRAPHIC: case SID_EXTERNAL_EDIT: if( rSh.GetGraphicType() == GRAPHIC_NONE ) bDisable = true; break; + case SID_COLOR_SETTINGS: { if ( bParentCntProt || !bIsGrfCntnt ) @@ -633,27 +650,30 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) } break; - case SID_ATTR_GRAF_LUMINANCE: if( !bParentCntProt ) rSet.Put( SfxInt16Item( nWhich, ((SwLuminanceGrf&) aCoreSet.Get(RES_GRFATR_LUMINANCE)).GetValue() )); break; + case SID_ATTR_GRAF_CONTRAST: if( !bParentCntProt ) rSet.Put( SfxInt16Item( nWhich, ((SwContrastGrf&) aCoreSet.Get(RES_GRFATR_CONTRAST)).GetValue() )); break; + case SID_ATTR_GRAF_RED: if( !bParentCntProt ) rSet.Put( SfxInt16Item( nWhich, ((SwChannelRGrf&) aCoreSet.Get(RES_GRFATR_CHANNELR)).GetValue() )); break; + case SID_ATTR_GRAF_GREEN: if( !bParentCntProt ) rSet.Put( SfxInt16Item( nWhich, ((SwChannelGGrf&) aCoreSet.Get(RES_GRFATR_CHANNELG)).GetValue() )); break; + case SID_ATTR_GRAF_BLUE: if( !bParentCntProt ) rSet.Put( SfxInt16Item( nWhich, ((SwChannelBGrf&) @@ -665,6 +685,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) rSet.Put( SfxUInt32Item( nWhich, static_cast< sal_uInt32 >( ( (SwGammaGrf&)aCoreSet.Get( RES_GRFATR_GAMMA ) ).GetValue() * 100 ) ) ); break; + case SID_ATTR_GRAF_TRANSPARENCE: if( !bParentCntProt ) { @@ -681,6 +702,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) } } break; + case SID_ATTR_GRAF_INVERT: if( !bParentCntProt ) rSet.Put( SfxBoolItem( nWhich, ((SwInvertGrf&) @@ -838,10 +860,8 @@ void SwGrfShell::GetAttrStateForRotation(SfxItemSet &rSet) SetGetStateSet( 0 ); } - SwGrfShell::SwGrfShell(SwView &_rView) : SwBaseShell(_rView) - { SetName(OUString("Graphic")); SetHelpId(SW_GRFSHELL); diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx index ab0d7180c034..817c660d7be0 100644 --- a/sw/source/ui/uiview/swcli.cxx +++ b/sw/source/ui/uiview/swcli.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <wrtsh.hxx> #include <doc.hxx> diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index c0fc69dab3f3..2be6825398f7 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include "uitool.hxx" #include <sfx2/app.hxx> @@ -59,10 +58,7 @@ using namespace ::com::sun::star; -// Debug Method - // Pack columns - static void lcl_FillSvxColumn(const SwFmtCol& rCol, sal_uInt16 nTotalWidth, SvxColumnItem& rColItem, @@ -102,7 +98,6 @@ static void lcl_FillSvxColumn(const SwFmtCol& rCol, } // Transfer ColumnItem in ColumnInfo - static void lcl_ConvertToCols(const SvxColumnItem& rColItem, sal_uInt16 nTotalWidth, SwFmtCol& rCols) @@ -151,7 +146,6 @@ static void lcl_ConvertToCols(const SvxColumnItem& rColItem, } // Delete tabs - static void lcl_EraseDefTabs(SvxTabStopItem& rTabStops) { // Delete DefTabs @@ -169,7 +163,6 @@ static void lcl_EraseDefTabs(SvxTabStopItem& rTabStops) } // Flip page margin - void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace) { sal_uInt16 nPhyPage, nVirPage; @@ -185,7 +178,6 @@ void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace) // If the frame border is moved, the column separator // should stay in the same absolute position. - static void lcl_Scale(long& nVal, long nScale) { nVal *= nScale; @@ -233,7 +225,6 @@ void ResizeFrameCols(SwFmtCol& rCol, } // Here all changes to the tab bar will be shot again into the model. - void SwView::ExecTabWin( SfxRequest& rReq ) { SwWrtShell &rSh = GetWrtShell(); @@ -973,7 +964,6 @@ void SwView::ExecTabWin( SfxRequest& rReq ) // Here the status of the tab bar will be determined. // This means that all relevant attributes at the CursorPos // will be submittet to the tab bar. - void SwView::StateTabWin(SfxItemSet& rSet) { SwWrtShell &rSh = GetWrtShell(); diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 2dccf4cea2f3..ce6805476dc9 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -55,7 +55,6 @@ struct InfoLogger #define INFO_LOGGER_F(s) #endif // SAL_LOG_INFO - using namespace rtl; using namespace osl; @@ -652,7 +651,6 @@ TeleConference* TeleManager::startGroupSession( TpAccount *pAccount, return pConference; } - static void lcl_ensureLegacyChannel( TpAccount* pAccount, TpContact* pBuddy ) { /* This is a workaround for a Telepathy bug. @@ -680,7 +678,6 @@ static void lcl_ensureLegacyChannel( TpAccount* pAccount, TpContact* pBuddy ) g_hash_table_unref( pRequest ); } - /* TODO: factor out common code with startGroupSession() */ TeleConference* TeleManager::startBuddySession( TpAccount *pAccount, TpContact *pBuddy ) { diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx index 9c9304bc0478..5d49922605a9 100644 --- a/unoxml/test/domtest.cxx +++ b/unoxml/test/domtest.cxx @@ -36,14 +36,12 @@ #include "../source/dom/documentbuilder.hxx" - using namespace ::DOM; using namespace ::comphelper; using namespace ::com::sun::star; namespace { - // valid xml static const char validTestFile[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \ @@ -373,14 +371,10 @@ struct SerializerTest : public CppUnit::TestFixture CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BasicTest, "BasicTest"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SerializerTest, "SerializerTest"); } - -// ----------------------------------------------------------------------------- - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. NOADDITIONAL; diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx index bc9213bbb87e..0e9a6e0430ac 100644 --- a/vcl/coretext/ctlayout.cxx +++ b/vcl/coretext/ctlayout.cxx @@ -21,8 +21,6 @@ #include "ctfonts.hxx" -// ======================================================================= - class CTLayout : public SalLayout { @@ -71,8 +69,6 @@ private: mutable double mfBaseAdv; }; -// ======================================================================= - CTLayout::CTLayout( const CTTextStyle* pTextStyle ) : mpTextStyle( pTextStyle ) , mpAttrString( NULL ) @@ -83,8 +79,6 @@ CTLayout::CTLayout( const CTTextStyle* pTextStyle ) { } -// ----------------------------------------------------------------------- - CTLayout::~CTLayout() { if( mpCTLine ) @@ -93,8 +87,6 @@ CTLayout::~CTLayout() CFRelease( mpAttrString ); } -// ----------------------------------------------------------------------- - bool CTLayout::LayoutText( ImplLayoutArgs& rArgs ) { if( mpAttrString ) @@ -121,8 +113,6 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs ) return true; } -// ----------------------------------------------------------------------- - void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { if( !mpCTLine) @@ -171,8 +161,6 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mfCachedWidth = nPixelWidth; } -// ----------------------------------------------------------------------- - // When drawing right aligned text, rounding errors in the position returned by // GetDrawPosition() cause the right margin of the text to change whenever text // width changes causing "jumping letters" effect. So here we calculate the @@ -247,8 +235,6 @@ void CTLayout::DrawText( SalGraphics& rGraphics ) const CGContextRestoreGState( rAquaGraphics.mrContext ); } -// ----------------------------------------------------------------------- - int CTLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos, int& nStart, sal_Int32* pGlyphAdvances, int* pCharIndexes, const PhysicalFontFace** pFallbackFonts ) const @@ -358,8 +344,6 @@ int CTLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos, int& return nCount; } -// ----------------------------------------------------------------------- - double CTLayout::GetWidth() const { if( (mnCharCount <= 0) || !mpCTLine ) @@ -376,7 +360,6 @@ long CTLayout::GetTextWidth() const { return lrint(GetWidth()); } -// ----------------------------------------------------------------------- long CTLayout::FillDXArray( sal_Int32* pDXArray ) const { @@ -414,8 +397,6 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const return nPixWidth; } -// ----------------------------------------------------------------------- - int CTLayout::GetTextBreak( long nMaxWidth, long /*nCharExtra*/, int nFactor ) const { if( !mpCTLine ) @@ -431,8 +412,6 @@ int CTLayout::GetTextBreak( long nMaxWidth, long /*nCharExtra*/, int nFactor ) c return (int)nIndex; } -// ----------------------------------------------------------------------- - void CTLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const { DBG_ASSERT( ((nMaxIndex>0)&&!(nMaxIndex&1)), @@ -458,8 +437,6 @@ void CTLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const } } -// ----------------------------------------------------------------------- - bool CTLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect ) const { // Closely mimic DrawText(), except that instead of calling @@ -508,8 +485,6 @@ bool CTLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect ) const return true; } -// ======================================================================= - // glyph fallback is supported directly by Aqua // so methods used only by MultiSalLayout can be dummy implementated bool CTLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const { return false; } @@ -518,8 +493,6 @@ void CTLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {} void CTLayout::DropGlyph( int /*nStart*/ ) {} void CTLayout::Simplify( bool /*bIsBase*/ ) {} -// ======================================================================= - SalLayout* CTTextStyle::GetTextLayout( void ) const { return new CTLayout( this); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index b4450c34d833..47222d007158 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -132,17 +132,10 @@ namespace : public rtl::StaticAggregate<ReservedKeys, ImplReservedKeysImpl> {}; } - extern "C" { typedef UnoWrapperBase* (SAL_CALL *FN_TkCreateUnoWrapper)(); } -// ======================================================================= - -// -------------- -// - ImplHotKey - -// -------------- - struct ImplHotKey { ImplHotKey* mpNext; @@ -151,12 +144,6 @@ struct ImplHotKey Link maLink; }; -// ======================================================================= - -// ----------------- -// - ImplEventHook - -// ----------------- - struct ImplEventHook { ImplEventHook* mpNext; @@ -164,12 +151,6 @@ struct ImplEventHook VCLEventHookProc mpProc; }; -// ======================================================================= - -// --------------------- -// - ImplPostEventData - -// --------------------- - struct ImplPostEventData { sal_uLong mnEvent; @@ -196,8 +177,6 @@ typedef ::std::pair< Window*, ImplPostEventData* > ImplPostEventPair; static ::std::list< ImplPostEventPair > aPostedEventList; -// ======================================================================= - Application* GetpApp() { ImplSVData* pSVData = ImplGetSVData(); @@ -206,8 +185,6 @@ Application* GetpApp() return pSVData->mpApp; } -// ----------------------------------------------------------------------- - Application::Application() { // useful for themes at least, perhaps extensions too @@ -220,8 +197,6 @@ Application::Application() InitSalData(); } -// ----------------------------------------------------------------------- - Application::~Application() { ImplDeInitSVData(); @@ -231,8 +206,6 @@ Application::~Application() GlobalDeInitTools(); } -// ----------------------------------------------------------------------- - sal_Bool Application::QueryExit() { WorkWindow* pAppWin = ImplGetSVData()->maWinData.mpAppWin; @@ -244,49 +217,35 @@ sal_Bool Application::QueryExit() return sal_True; } -// ----------------------------------------------------------------------- - void Application::UserEvent( sal_uLong, void* ) { } -// ----------------------------------------------------------------------- - void Application::FocusChanged() { } -// ----------------------------------------------------------------------- - void Application::DataChanged( const DataChangedEvent& ) { } -// ----------------------------------------------------------------------- void Application::Init() { } -// ----------------------------------------------------------------------- void Application::InitFinished() { } -// ----------------------------------------------------------------------- - void Application::DeInit() { } -// ----------------------------------------------------------------------- - sal_uInt16 Application::GetCommandLineParamCount() { return (sal_uInt16)osl_getCommandArgCount(); } -// ----------------------------------------------------------------------- - OUString Application::GetCommandLineParam( sal_uInt16 nParam ) { OUString aParam; @@ -294,8 +253,6 @@ OUString Application::GetCommandLineParam( sal_uInt16 nParam ) return aParam; } -// ----------------------------------------------------------------------- - OUString Application::GetAppFileName() { ImplSVData* pSVData = ImplGetSVData(); @@ -317,8 +274,6 @@ OUString Application::GetAppFileName() return aAppFileName; } -// ----------------------------------------------------------------------- - sal_uInt16 Application::Exception( sal_uInt16 nError ) { switch ( nError & EXC_MAJORTYPE ) @@ -351,8 +306,6 @@ sal_uInt16 Application::Exception( sal_uInt16 nError ) return 0; } -// ----------------------------------------------------------------------- - void Application::Abort( const OUString& rErrorText ) { //HACK: Dump core iff --norestore command line argument is given (assuming @@ -370,8 +323,6 @@ void Application::Abort( const OUString& rErrorText ) SalAbort( rErrorText, dumpCore ); } -// ----------------------------------------------------------------------- - sal_uLong Application::GetReservedKeyCodeCount() { return ImplReservedKeys::get()->second; @@ -385,8 +336,6 @@ const KeyCode* Application::GetReservedKeyCode( sal_uLong i ) return &ImplReservedKeys::get()->first[i].mKeyCode; } -// ----------------------------------------------------------------------- - void Application::Execute() { ImplSVData* pSVData = ImplGetSVData(); @@ -398,8 +347,6 @@ void Application::Execute() pSVData->maAppData.mbInAppExecute = sal_False; } -// ----------------------------------------------------------------------- - inline void ImplYield( bool i_bWait, bool i_bAllEvents ) { ImplSVData* pSVData = ImplGetSVData(); @@ -437,110 +384,80 @@ inline void ImplYield( bool i_bWait, bool i_bAllEvents ) pSVData->maAppData.mpPostYieldListeners->callListeners( NULL ); } -// ----------------------------------------------------------------------- - void Application::Reschedule( bool i_bAllEvents ) { ImplYield( false, i_bAllEvents ); } -// ----------------------------------------------------------------------- - void Application::Yield() { ImplYield( true, false ); } -// ----------------------------------------------------------------------- - IMPL_STATIC_LINK_NOINSTANCE( ImplSVAppData, ImplQuitMsg, void*, EMPTYARG ) { ImplGetSVData()->maAppData.mbAppQuit = sal_True; return 0; } -// ----------------------------------------------------------------------- - void Application::Quit() { Application::PostUserEvent( STATIC_LINK( NULL, ImplSVAppData, ImplQuitMsg ) ); } -// ----------------------------------------------------------------------- - comphelper::SolarMutex& Application::GetSolarMutex() { ImplSVData* pSVData = ImplGetSVData(); return *(pSVData->mpDefInst->GetYieldMutex()); } -// ----------------------------------------------------------------------- - oslThreadIdentifier Application::GetMainThreadIdentifier() { return ImplGetSVData()->mnMainThreadId; } -// ----------------------------------------------------------------------- - sal_uLong Application::ReleaseSolarMutex() { ImplSVData* pSVData = ImplGetSVData(); return pSVData->mpDefInst->ReleaseYieldMutex(); } -// ----------------------------------------------------------------------- - void Application::AcquireSolarMutex( sal_uLong nCount ) { ImplSVData* pSVData = ImplGetSVData(); pSVData->mpDefInst->AcquireYieldMutex( nCount ); } -// ----------------------------------------------------------------------- - sal_Bool Application::IsInMain() { return ImplGetSVData()->maAppData.mbInAppMain; } -// ----------------------------------------------------------------------- - sal_Bool Application::IsInExecute() { return ImplGetSVData()->maAppData.mbInAppExecute; } -// ----------------------------------------------------------------------- - sal_Bool Application::IsInModalMode() { return (ImplGetSVData()->maAppData.mnModalMode != 0); } -// ----------------------------------------------------------------------- - sal_uInt16 Application::GetDispatchLevel() { return ImplGetSVData()->maAppData.mnDispatchLevel; } -// ----------------------------------------------------------------------- - bool Application::AnyInput( sal_uInt16 nType ) { return ImplGetSVData()->mpDefInst->AnyInput( nType ); } -// ----------------------------------------------------------------------- - sal_uLong Application::GetLastInputInterval() { return (Time::GetSystemTicks()-ImplGetSVData()->maAppData.mnLastInputTime); } -// ----------------------------------------------------------------------- - extern int nImplSysDialog; sal_Bool Application::IsUICaptured() @@ -557,15 +474,11 @@ sal_Bool Application::IsUICaptured() return sal_False; } -// ----------------------------------------------------------------------- - void Application::SystemSettingsChanging( AllSettings& /*rSettings*/, Window* /*pFrame*/ ) { } -// ----------------------------------------------------------------------- - void Application::MergeSystemSettings( AllSettings& rSettings ) { Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame; @@ -585,8 +498,6 @@ void Application::MergeSystemSettings( AllSettings& rSettings ) } } -// ----------------------------------------------------------------------- - bool Application::ValidateSystemFont() { Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame; @@ -602,8 +513,6 @@ bool Application::ValidateSystemFont() return false; } -// ----------------------------------------------------------------------- - void Application::SetSettings( const AllSettings& rSettings ) { ImplSVData* pSVData = ImplGetSVData(); @@ -703,8 +612,6 @@ void Application::SetSettings( const AllSettings& rSettings ) } } -// ----------------------------------------------------------------------- - const AllSettings& Application::GetSettings() { ImplSVData* pSVData = ImplGetSVData(); @@ -718,8 +625,6 @@ const AllSettings& Application::GetSettings() return *(pSVData->maAppData.mpSettings); } -// ----------------------------------------------------------------------- - void Application::NotifyAllWindows( DataChangedEvent& rDCEvt ) { ImplSVData* pSVData = ImplGetSVData(); @@ -739,8 +644,6 @@ void Application::NotifyAllWindows( DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- - void Application::ImplCallEventListeners( sal_uLong nEvent, Window *pWin, void* pData ) { ImplSVData* pSVData = ImplGetSVData(); @@ -750,8 +653,6 @@ void Application::ImplCallEventListeners( sal_uLong nEvent, Window *pWin, void* pSVData->maAppData.mpEventListeners->Call( &aEvent ); } -// ----------------------------------------------------------------------- - void Application::ImplCallEventListeners( VclSimpleEvent* pEvent ) { ImplSVData* pSVData = ImplGetSVData(); @@ -760,8 +661,6 @@ void Application::ImplCallEventListeners( VclSimpleEvent* pEvent ) pSVData->maAppData.mpEventListeners->Call( pEvent ); } -// ----------------------------------------------------------------------- - void Application::AddEventListener( const Link& rEventListener ) { ImplSVData* pSVData = ImplGetSVData(); @@ -770,8 +669,6 @@ void Application::AddEventListener( const Link& rEventListener ) pSVData->maAppData.mpEventListeners->addListener( rEventListener ); } -// ----------------------------------------------------------------------- - void Application::RemoveEventListener( const Link& rEventListener ) { ImplSVData* pSVData = ImplGetSVData(); @@ -779,7 +676,6 @@ void Application::RemoveEventListener( const Link& rEventListener ) pSVData->maAppData.mpEventListeners->removeListener( rEventListener ); } -// ----------------------------------------------------------------------- void Application::AddKeyListener( const Link& rKeyListener ) { ImplSVData* pSVData = ImplGetSVData(); @@ -788,8 +684,6 @@ void Application::AddKeyListener( const Link& rKeyListener ) pSVData->maAppData.mpKeyListeners->addListener( rKeyListener ); } -// ----------------------------------------------------------------------- - void Application::RemoveKeyListener( const Link& rKeyListener ) { ImplSVData* pSVData = ImplGetSVData(); @@ -797,8 +691,6 @@ void Application::RemoveKeyListener( const Link& rKeyListener ) pSVData->maAppData.mpKeyListeners->removeListener( rKeyListener ); } -// ----------------------------------------------------------------------- - sal_Bool Application::HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ) { // let listeners process the key event @@ -813,8 +705,6 @@ sal_Bool Application::HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyE return bProcessed; } -// ----------------------------------------------------------------------------- - sal_uLong Application::PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ) { const SolarMutexGuard aGuard; @@ -840,8 +730,6 @@ sal_uLong Application::PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* p return nEventId; } -// ----------------------------------------------------------------------------- - sal_uLong Application::PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ) { const SolarMutexGuard aGuard; @@ -1007,8 +895,6 @@ IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData ) return 0; } -// ----------------------------------------------------------------------- - void Application::RemoveMouseAndKeyEvents( Window* pWin ) { const SolarMutexGuard aGuard; @@ -1031,8 +917,6 @@ void Application::RemoveMouseAndKeyEvents( Window* pWin ) } } -// ----------------------------------------------------------------------- - sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller ) { sal_uLong nEventId; @@ -1040,8 +924,6 @@ sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller ) return nEventId; } -// ----------------------------------------------------------------------- - sal_Bool Application::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) { ImplSVEvent* pSVEvent = new ImplSVEvent; @@ -1062,8 +944,6 @@ sal_Bool Application::PostUserEvent( sal_uLong& rEventId, const Link& rLink, voi } } -// ----------------------------------------------------------------------- - void Application::RemoveUserEvent( sal_uLong nUserEvent ) { if(nUserEvent) @@ -1086,8 +966,6 @@ void Application::RemoveUserEvent( sal_uLong nUserEvent ) } } -// ----------------------------------------------------------------------- - sal_Bool Application::InsertIdleHdl( const Link& rLink, sal_uInt16 nPrio ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1099,8 +977,6 @@ sal_Bool Application::InsertIdleHdl( const Link& rLink, sal_uInt16 nPrio ) return pSVData->maAppData.mpIdleMgr->InsertIdleHdl( rLink, nPrio ); } -// ----------------------------------------------------------------------- - void Application::RemoveIdleHdl( const Link& rLink ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1109,16 +985,12 @@ void Application::RemoveIdleHdl( const Link& rLink ) pSVData->maAppData.mpIdleMgr->RemoveIdleHdl( rLink ); } -// ----------------------------------------------------------------------- - void Application::EnableNoYieldMode( bool i_bNoYield ) { ImplSVData* pSVData = ImplGetSVData(); pSVData->maAppData.mbNoYield = i_bNoYield; } -// ----------------------------------------------------------------------- - void Application::AddPostYieldListener( const Link& i_rListener ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1127,8 +999,6 @@ void Application::AddPostYieldListener( const Link& i_rListener ) pSVData->maAppData.mpPostYieldListeners->addListener( i_rListener ); } -// ----------------------------------------------------------------------- - void Application::RemovePostYieldListener( const Link& i_rListener ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1136,44 +1006,32 @@ void Application::RemovePostYieldListener( const Link& i_rListener ) pSVData->maAppData.mpPostYieldListeners->removeListener( i_rListener ); } -// ----------------------------------------------------------------------- - WorkWindow* Application::GetAppWindow() { return ImplGetSVData()->maWinData.mpAppWin; } -// ----------------------------------------------------------------------- - Window* Application::GetFocusWindow() { return ImplGetSVData()->maWinData.mpFocusWin; } -// ----------------------------------------------------------------------- - OutputDevice* Application::GetDefaultDevice() { return ImplGetDefaultWindow(); } -// ----------------------------------------------------------------------- - Window* Application::GetFirstTopLevelWindow() { ImplSVData* pSVData = ImplGetSVData(); return pSVData->maWinData.mpFirstFrame; } -// ----------------------------------------------------------------------- - Window* Application::GetNextTopLevelWindow( Window* pWindow ) { return pWindow->mpWindowImpl->mpFrameData->mpNextFrame; } -// ----------------------------------------------------------------------- - long Application::GetTopWindowCount() { long nRet = 0; @@ -1188,8 +1046,6 @@ long Application::GetTopWindowCount() return nRet; } -// ----------------------------------------------------------------------- - Window* Application::GetTopWindow( long nIndex ) { long nIdx = 0; @@ -1209,8 +1065,6 @@ Window* Application::GetTopWindow( long nIndex ) return NULL; } -// ----------------------------------------------------------------------- - Window* Application::GetActiveTopWindow() { Window *pWin = ImplGetSVData()->maWinData.mpFocusWin; @@ -1223,8 +1077,6 @@ Window* Application::GetActiveTopWindow() return NULL; } -// ----------------------------------------------------------------------- - void Application::SetAppName( const OUString& rUniqueName ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1236,8 +1088,6 @@ void Application::SetAppName( const OUString& rUniqueName ) *(pSVData->maAppData.mpAppName) = rUniqueName; } -// ----------------------------------------------------------------------- - OUString Application::GetAppName() { ImplSVData* pSVData = ImplGetSVData(); @@ -1247,8 +1097,6 @@ OUString Application::GetAppName() return ImplGetSVEmptyStr(); } -// ----------------------------------------------------------------------- - void Application::SetDisplayName( const OUString& rName ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1260,8 +1108,6 @@ void Application::SetDisplayName( const OUString& rName ) *(pSVData->maAppData.mpDisplayName) = rName; } -// ----------------------------------------------------------------------- - OUString Application::GetDisplayName() { ImplSVData* pSVData = ImplGetSVData(); @@ -1273,8 +1119,6 @@ OUString Application::GetDisplayName() return OUString(""); } -// ----------------------------------------------------------------------- - unsigned int Application::GetScreenCount() { SalSystem* pSys = ImplGetSalSystem(); @@ -1379,8 +1223,6 @@ unsigned int Application::GetBestScreen( const Rectangle& i_rRect ) return nBestMatchScreen; } -// ----------------------------------------------------------------------- - sal_Bool Application::InsertAccel( Accelerator* pAccel ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1390,8 +1232,6 @@ sal_Bool Application::InsertAccel( Accelerator* pAccel ) return pSVData->maAppData.mpAccelMgr->InsertAccel( pAccel ); } -// ----------------------------------------------------------------------- - void Application::RemoveAccel( Accelerator* pAccel ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1400,36 +1240,26 @@ void Application::RemoveAccel( Accelerator* pAccel ) pSVData->maAppData.mpAccelMgr->RemoveAccel( pAccel ); } -// ----------------------------------------------------------------------- - void Application::SetHelp( Help* pHelp ) { ImplGetSVData()->maAppData.mpHelp = pHelp; } -// ----------------------------------------------------------------------- - Help* Application::GetHelp() { return ImplGetSVData()->maAppData.mpHelp; } -// ----------------------------------------------------------------------- - void Application::EnableAutoHelpId( sal_Bool bEnabled ) { ImplGetSVData()->maHelpData.mbAutoHelpId = bEnabled; } -// ----------------------------------------------------------------------- - sal_Bool Application::IsAutoHelpIdEnabled() { return ImplGetSVData()->maHelpData.mbAutoHelpId; } -// ----------------------------------------------------------------------- - void Application::EnableAutoMnemonic( sal_Bool bEnabled ) { AllSettings aSettings = GetSettings(); @@ -1439,15 +1269,11 @@ void Application::EnableAutoMnemonic( sal_Bool bEnabled ) SetSettings( aSettings ); } -// ----------------------------------------------------------------------- - sal_Bool Application::IsAutoMnemonicEnabled() { return GetSettings().GetStyleSettings().GetAutoMnemonic(); } -// ----------------------------------------------------------------------- - void Application::SetDialogScaleX( short nScale ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1457,15 +1283,11 @@ void Application::SetDialogScaleX( short nScale ) pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*nScale)/100; } -// ----------------------------------------------------------------------- - void Application::SetDefDialogParent( Window* pWindow ) { ImplGetSVData()->maWinData.mpDefDialogParent = pWindow; } -// ----------------------------------------------------------------------- - Window* Application::GetDefDialogParent() { ImplSVData* pSVData = ImplGetSVData(); @@ -1528,8 +1350,6 @@ Window* Application::GetDefDialogParent() } } -// ----------------------------------------------------------------------- - Application::DialogCancelMode Application::GetDialogCancelMode() { return ImplGetSVData()->maAppData.meDialogCancel; @@ -1540,29 +1360,21 @@ void Application::SetDialogCancelMode( DialogCancelMode mode ) ImplGetSVData()->maAppData.meDialogCancel = mode; } -// ----------------------------------------------------------------------- - sal_Bool Application::IsDialogCancelEnabled() { return ImplGetSVData()->maAppData.meDialogCancel != DIALOG_CANCEL_OFF; } -// ----------------------------------------------------------------------- - void Application::SetSystemWindowMode( sal_uInt16 nMode ) { ImplGetSVData()->maAppData.mnSysWinMode = nMode; } -// ----------------------------------------------------------------------- - sal_uInt16 Application::GetSystemWindowMode() { return ImplGetSVData()->maAppData.mnSysWinMode; } -// ----------------------------------------------------------------------- - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > Application::GetVCLToolkit() { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > xT; @@ -1572,8 +1384,6 @@ sal_uInt16 Application::GetSystemWindowMode() return xT; } -// ----------------------------------------------------------------------- - #ifdef DISABLE_DYNLOADING extern "C" { UnoWrapperBase* CreateUnoWrapper(); } @@ -1618,8 +1428,6 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) return pSVData->mpUnoWrapper; } -// ----------------------------------------------------------------------- - void Application::SetUnoWrapper( UnoWrapperBase* pWrapper ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1627,8 +1435,6 @@ void Application::SetUnoWrapper( UnoWrapperBase* pWrapper ) pSVData->mpUnoWrapper = pWrapper; } -// ----------------------------------------------------------------------- - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayConnection > Application::GetDisplayConnection() { ImplSVData* pSVData = ImplGetSVData(); @@ -1642,15 +1448,11 @@ void Application::SetUnoWrapper( UnoWrapperBase* pWrapper ) return pSVData->mxDisplayConnection.get(); } -// ----------------------------------------------------------------------- - void Application::SetFilterHdl( const Link& rLink ) { ImplGetSVData()->maGDIData.mpGrfConverter->SetFilterHdl( rLink ); } -// ----------------------------------------------------------------------- - bool ImplCallHotKey( const KeyCode& rKeyCode ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1669,8 +1471,6 @@ bool ImplCallHotKey( const KeyCode& rKeyCode ) return false; } -// ----------------------------------------------------------------------- - void ImplFreeHotKeyData() { ImplSVData* pSVData = ImplGetSVData(); @@ -1686,8 +1486,6 @@ void ImplFreeHotKeyData() pSVData->maAppData.mpFirstHotKey = NULL; } -// ----------------------------------------------------------------------- - void ImplFreeEventHookData() { ImplSVData* pSVData = ImplGetSVData(); @@ -1703,8 +1501,6 @@ void ImplFreeEventHookData() pSVData->maAppData.mpFirstEventHook = NULL; } -// ----------------------------------------------------------------------- - long Application::CallEventHooks( NotifyEvent& rEvt ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1723,23 +1519,17 @@ long Application::CallEventHooks( NotifyEvent& rEvt ) return nRet; } -// ----------------------------------------------------------------------- - const LocaleDataWrapper& Application::GetAppLocaleDataWrapper() { return GetSettings().GetLocaleDataWrapper(); } -// ----------------------------------------------------------------------- - void Application::EnableHeadlessMode( bool dialogsAreFatal ) { SetDialogCancelMode( dialogsAreFatal ? DIALOG_CANCEL_FATAL : DIALOG_CANCEL_SILENT ); } -// ----------------------------------------------------------------------- - sal_Bool Application::IsHeadlessModeEnabled() { return IsDialogCancelEnabled(); @@ -1770,9 +1560,6 @@ void Application::EnableConsoleOnly() bConsoleOnly = true; } - -// ----------------------------------------------------------------------- - void Application::ShowNativeErrorBox(const OUString& sTitle , const OUString& sMessage) { @@ -1786,8 +1573,6 @@ void Application::ShowNativeErrorBox(const OUString& sTitle , } } -// ----------------------------------------------------------------------- - bool Application::CanToggleImeStatusWindow() { ImplSVData* pSVData = ImplGetSVData(); @@ -1853,8 +1638,6 @@ bool InitAccessBridge( bool bShowCancel, bool &rCancelled ) } // MT: AppEvent was in oldsv.cxx, but is still needed... -// ------------------------------------------------------------------------ - void Application::AppEvent( const ApplicationEvent& /*rAppEvent*/ ) { } diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 802de6c4b0a5..5aee0a0ffcc3 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -24,7 +24,6 @@ #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> - #define UCHAR unsigned char struct PointType { @@ -42,7 +41,6 @@ public: friend void DtHdOverSeek(SvStream& rInp); }; - struct Seitenformat { PointType Size; // 0.00mm...819.175mm (Papiergr"u"ue) sal_Int16 RandL; // links Rand auf @@ -54,7 +52,6 @@ struct Seitenformat { // sal_Bool BorderClip; // Objekte am Rand abschneiden (Schummel wg. Allignment unter NT) }; - #define PageSize 146 class PageType { public: @@ -73,7 +70,6 @@ public: friend SvStream& operator>>(SvStream& rIStream, PageType& rPage); }; - enum ObjArtType {ObjStrk,ObjRect,ObjPoly,ObjCirc,ObjSpln, ObjText,ObjGrup,ObjBmap,ObjVirt,ObjTxtX,ObjMaxi}; @@ -148,7 +144,6 @@ public: virtual void Draw(OutputDevice& rOut); }; - #define StrkSize 38 class StrkType: public ObjkType { public: @@ -161,7 +156,6 @@ public: virtual void Draw(OutputDevice& rOut); }; - #define RectSize 52 class RectType: public ObjkType { public: @@ -178,7 +172,6 @@ public: virtual void Draw(OutputDevice& rOut); }; - #define PolySize 44 class PolyType: public ObjkType { // identisch mit Spline ! public: @@ -195,7 +188,6 @@ public: }; #define PolyClosBit 0x01 // Unterarten von Poly: 0: PolyLine 1: Polygon - #define SplnSize 44 class SplnType: public ObjkType { // identisch mit Poly ! public: @@ -212,7 +204,6 @@ public: }; // Unterarten von Spline: siehe Poly - #define CircSize 52 class CircType: public ObjkType { public: @@ -233,7 +224,6 @@ public: #define CircAbsn 0x02 /* 2: Kreisabschnitt */ #define CircArc 0x03 /* 3: Kreisbogen */ - #define TextSize 116 class TextType: public ObjkType { public: @@ -260,7 +250,6 @@ public: #define TextDrftBit 0x04 /* Bit2: 1=DraftDraw (2.0) */ #define TextFitBits (TextFitSBit | TextFitZBit) - enum GrafStat {NoGraf,Pic,Pcx,Hpgl,Img,Msp,Tiff,Dxf,Lot,Usr,Sgf}; #define BmapSize 132 @@ -288,7 +277,6 @@ public: void SetPaths( const INetURLObject rFltPath ); }; - #define GrupSize 48 class GrupType: public ObjkType { public: @@ -303,7 +291,6 @@ public: // virtual void Draw(OutputDevice& rOut); }; - void SetLine(ObjLineType& rLine, OutputDevice& rOut); void SetArea(ObjAreaType& rArea, OutputDevice& rOut); Color Sgv2SvFarbe(sal_uInt8 nFrb1, sal_uInt8 nFrb2, sal_uInt8 nInts); @@ -312,7 +299,6 @@ void RotatePoint(Point& P, sal_Int16 cx, sal_Int16 cy, double sn, double cs); sal_Int16 iMulDiv(sal_Int16 a, sal_Int16 Mul, sal_Int16 Div); sal_uInt16 MulDiv(sal_uInt16 a, sal_uInt16 Mul, sal_uInt16 Div); - class SgfFontOne { public: SgfFontOne* Next; // Zeiger f"ur Listenverkettung @@ -348,5 +334,4 @@ public: #endif //_SGVMAIN_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 482929d883ba..05a9240c25bc 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -85,7 +85,6 @@ using namespace vcl; - #if (OSL_DEBUG_LEVEL < 3) #define COMPRESS_PAGES #else @@ -836,7 +835,6 @@ static void appendFixedInt( sal_Int32 nValue, OStringBuffer& rBuffer, sal_Int32 } } - // appends a double. PDF does not accept exponential format, only fixed point static void appendDouble( double fValue, OStringBuffer& rBuffer, sal_Int32 nPrecision = 5 ) { @@ -879,7 +877,6 @@ static void appendDouble( double fValue, OStringBuffer& rBuffer, sal_Int32 nPrec } } - static void appendColor( const Color& rColor, OStringBuffer& rBuffer, bool bConvertToGrey = false ) { @@ -1401,11 +1398,8 @@ void PDFWriterImpl::PDFPage::appendPixelPoint( const basegfx::B2DPoint& rPoint, double fValue = pixelToPoint(rPoint.getX()); appendDouble( fValue, rBuffer, nLog10Divisor ); - rBuffer.append( ' ' ); - fValue = double(getHeight()) - pixelToPoint(rPoint.getY()); - appendDouble( fValue, rBuffer, nLog10Divisor ); } @@ -1710,10 +1704,6 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal rBuffer.append( "S\n" ); } -/* - * class PDFWriterImpl - */ - PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& xEnc, PDFWriter& i_rOuterFace) @@ -5532,9 +5522,7 @@ bool PDFWriterImpl::emitAnnotations() return false; CHECK_RETURN( emitLinkAnnotations() ); - CHECK_RETURN( emitNoteAnnotations() ); - CHECK_RETURN( emitWidgetAnnotations() ); return true; @@ -6213,7 +6201,6 @@ sal_Int32 PDFWriterImpl::emitInfoDict( ) //--->i56629 // Part of this function may be shared with method appendDest. -// sal_Int32 PDFWriterImpl::emitNamedDestinations() { sal_Int32 nCount = m_aNamedDests.size(); @@ -6314,7 +6301,6 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations() //--->i59651 // emits the output intent dictionary - sal_Int32 PDFWriterImpl::emitOutputIntent() { if( !m_bIsPDF_A1 ) @@ -8834,7 +8820,6 @@ void PDFWriterImpl::drawRectangle( const Rectangle& rRect, sal_uInt32 nHorzRound aPoints[14] = Point( rRect.TopLeft().X(), rRect.TopLeft().Y()+nVertRound ); aPoints[15] = Point( aPoints[14].X(), aPoints[14].Y()-ky ); - OStringBuffer aLine( 80 ); m_aPages.back().appendPoint( aPoints[1], aLine ); aLine.append( " m " ); @@ -11935,6 +11920,4 @@ void PDFWriterImpl::addStream( const OUString& rMimeType, PDFOutputStream* pStre } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index b9be98d0ccdb..0bdebe44c81e 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -499,7 +499,6 @@ namespace vcl_sal { return OUString(); } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index 9109febcda59..d154dbe2fc26 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define WINVER 0x0500 #include <string.h> @@ -86,7 +85,6 @@ } #endif - using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -164,8 +162,6 @@ static sal_uLong ImplWinQueueStatusToSal( DWORD nWinStatus ) return nStatus; } -// ----------------------------------------------------------------------- - void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) { DWORD i; @@ -191,8 +187,6 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) } } -// ----------------------------------------------------------------------- - void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) { HANDLE hPrinter = 0; @@ -230,15 +224,12 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) } } -// ----------------------------------------------------------------------- - void WinSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) { delete pInfo->mpSysData; delete pInfo; } -// ----------------------------------------------------------------------- OUString WinSalInstance::GetDefaultPrinter() { DWORD nChars = 0; @@ -272,8 +263,6 @@ OUString WinSalInstance::GetDefaultPrinter() return OUString(); } -// ======================================================================= - static DWORD ImplDeviceCaps( WinSalInfoPrinter* pPrinter, WORD nCaps, BYTE* pOutput, const ImplJobSetup* pSetupData ) { @@ -288,8 +277,6 @@ static DWORD ImplDeviceCaps( WinSalInfoPrinter* pPrinter, WORD nCaps, nCaps, (LPWSTR)pOutput, pDevMode ); } -// ----------------------------------------------------------------------- - static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, sal_Bool bDelete ) { @@ -744,8 +731,6 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS } } -// ----------------------------------------------------------------------- - static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, sal_uLong nFlags ) { if ( !pSetupData || !pSetupData->mpDriverData ) @@ -1031,8 +1016,6 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS } } -// ----------------------------------------------------------------------- - static HDC ImplCreateICW_WithCatch( LPWSTR pDriver, LPCWSTR pDevice, LPDEVMODEW pDevMode ) @@ -1068,8 +1051,6 @@ static HDC ImplCreateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetup return hDC; } -// ----------------------------------------------------------------------- - static WinSalGraphics* ImplCreateSalPrnGraphics( HDC hDC ) { WinSalGraphics* pGraphics = new WinSalGraphics; @@ -1084,8 +1065,6 @@ static WinSalGraphics* ImplCreateSalPrnGraphics( HDC hDC ) return pGraphics; } -// ----------------------------------------------------------------------- - static sal_Bool ImplUpdateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData ) { HDC hNewDC = ImplCreateSalPrnIC( pPrinter, pSetupData ); @@ -1139,15 +1118,11 @@ SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn return pPrinter; } -// ----------------------------------------------------------------------- - void WinSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter ) { delete pPrinter; } -// ======================================================================= - WinSalInfoPrinter::WinSalInfoPrinter() : mpGraphics( NULL ), mhDC( 0 ), @@ -1156,8 +1131,6 @@ WinSalInfoPrinter::WinSalInfoPrinter() : m_bPapersInit = FALSE; } -// ----------------------------------------------------------------------- - WinSalInfoPrinter::~WinSalInfoPrinter() { if ( mpGraphics ) @@ -1168,8 +1141,6 @@ WinSalInfoPrinter::~WinSalInfoPrinter() } } -// ----------------------------------------------------------------------- - void WinSalInfoPrinter::InitPaperFormats( const ImplJobSetup* pSetupData ) { m_aPaperFormats.clear(); @@ -1197,8 +1168,6 @@ void WinSalInfoPrinter::InitPaperFormats( const ImplJobSetup* pSetupData ) m_bPapersInit = true; } -// ----------------------------------------------------------------------- - int WinSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* pSetupData ) { int nRet = ImplDeviceCaps( this, DC_ORIENTATION, NULL, pSetupData ); @@ -1209,8 +1178,6 @@ int WinSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* pSetupData ) return 900; // guess } -// ----------------------------------------------------------------------- - SalGraphics* WinSalInfoPrinter::GetGraphics() { if ( mbGraphics ) @@ -1222,15 +1189,11 @@ SalGraphics* WinSalInfoPrinter::GetGraphics() return mpGraphics; } -// ----------------------------------------------------------------------- - void WinSalInfoPrinter::ReleaseGraphics( SalGraphics* ) { mbGraphics = FALSE; } -// ----------------------------------------------------------------------- - sal_Bool WinSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) { if ( ImplUpdateSalJobSetup( this, pSetupData, TRUE, static_cast<WinSalFrame*>(pFrame) ) ) @@ -1242,8 +1205,6 @@ sal_Bool WinSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) return FALSE; } -// ----------------------------------------------------------------------- - sal_Bool WinSalInfoPrinter::SetPrinterData( ImplJobSetup* pSetupData ) { if ( !ImplTestSalJobSetup( this, pSetupData, FALSE ) ) @@ -1251,8 +1212,6 @@ sal_Bool WinSalInfoPrinter::SetPrinterData( ImplJobSetup* pSetupData ) return ImplUpdateSalPrnIC( this, pSetupData ); } -// ----------------------------------------------------------------------- - sal_Bool WinSalInfoPrinter::SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) { ImplJobSetupToDevMode( this, pSetupData, nFlags ); @@ -1265,8 +1224,6 @@ sal_Bool WinSalInfoPrinter::SetData( sal_uLong nFlags, ImplJobSetup* pSetupData return FALSE; } -// ----------------------------------------------------------------------- - sal_uLong WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData ) { DWORD nRet = ImplDeviceCaps( this, DC_BINS, NULL, pSetupData ); @@ -1276,8 +1233,6 @@ sal_uLong WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData ) return 0; } -// ----------------------------------------------------------------------- - OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) { XubString aPaperBinName; @@ -1295,8 +1250,6 @@ OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal return aPaperBinName; } -// ----------------------------------------------------------------------- - sal_uLong WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) { DWORD nRet; @@ -1343,8 +1296,6 @@ sal_uLong WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, sa return 0; } -// ----------------------------------------------------------------------- - void WinSalInfoPrinter::GetPageInfo( const ImplJobSetup*, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, @@ -1370,8 +1321,6 @@ SalPrinter* WinSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) return pPrinter; } -// ----------------------------------------------------------------------- - void WinSalInstance::DestroyPrinter( SalPrinter* pPrinter ) { delete pPrinter; @@ -1419,8 +1368,6 @@ BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ ) return TRUE; } -// ----------------------------------------------------------------------- - static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, sal_Bool bCollate ) { LPDEVMODEW pNewDevMode = pDevMode; @@ -1444,8 +1391,6 @@ static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, sal_ return pNewDevMode; } -// ----------------------------------------------------------------------- - WinSalPrinter::WinSalPrinter() : mpGraphics( NULL ), mpInfoPrinter( NULL ), @@ -1463,8 +1408,6 @@ WinSalPrinter::WinSalPrinter() : pSalData->mpFirstPrinter = this; } -// ----------------------------------------------------------------------- - WinSalPrinter::~WinSalPrinter() { SalData* pSalData = GetSalData(); @@ -1647,8 +1590,6 @@ sal_Bool WinSalPrinter::StartJob( const OUString* pFileName, return TRUE; } -// ----------------------------------------------------------------------- - sal_Bool WinSalPrinter::EndJob() { HDC hDC = mhDC; @@ -1681,8 +1622,6 @@ sal_Bool WinSalPrinter::EndJob() return TRUE; } -// ----------------------------------------------------------------------- - sal_Bool WinSalPrinter::AbortJob() { mbAbort = TRUE; @@ -1699,8 +1638,6 @@ sal_Bool WinSalPrinter::AbortJob() return TRUE; } -// ----------------------------------------------------------------------- - void ImplSalPrinterAbortJobAsync( HDC hPrnDC ) { SalData* pSalData = GetSalData(); @@ -1738,8 +1675,6 @@ void ImplSalPrinterAbortJobAsync( HDC hPrnDC ) } } -// ----------------------------------------------------------------------- - SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ) { if( ! isValid() || mhDC == 0 ) @@ -1780,8 +1715,6 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJo return mpGraphics; } -// ----------------------------------------------------------------------- - sal_Bool WinSalPrinter::EndPage() { HDC hDC = mhDC; @@ -1810,8 +1743,6 @@ sal_Bool WinSalPrinter::EndPage() } } -// ----------------------------------------------------------------------- - sal_uLong WinSalPrinter::GetErrorCode() { return mnError; diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 968024c728a7..b3ba8b3ace8d 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -34,23 +34,16 @@ #include <xmloff/txtimp.hxx> #include <rtl/ustrbuf.hxx> - - namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } namespace text { class XTextField; } namespace beans { class XPropertySet; struct PropertyValue; } } } } - - class SvXMLImport; class XMLTextImportHelper; class SvXMLTokenMap; - - - enum XMLTextFieldAttrTokens { XML_TOK_TEXTFIELD_FIXED = 0, @@ -114,10 +107,6 @@ enum XMLTextFieldAttrTokens XML_TOK_TEXTFIELD_UNKNOWN }; - - - - /// abstract class for text field import class XMLTextFieldImportContext : public SvXMLImportContext { @@ -136,7 +125,6 @@ protected: sal_Bool bValid; /// whether this field is valid ? public: - TYPEINFO(); XMLTextFieldImportContext( @@ -168,9 +156,7 @@ public: const OUString& rName, sal_uInt16 nToken); - protected: - /// get helper inline XMLTextImportHelper& GetImportHelper() { return rTextImportHelper; } @@ -200,8 +186,6 @@ protected: ::com::sun::star::beans::XPropertySet> & rPropertySet); }; - - class XMLSenderFieldImportContext : public XMLTextFieldImportContext { @@ -213,13 +197,11 @@ class XMLSenderFieldImportContext : public XMLTextFieldImportContext const OUString sPropertyContent; protected: - // variables for access in subclass sal_Bool bFixed; sal_uInt16 nElementToken; /// token for this elment field public: - TYPEINFO(); XMLSenderFieldImportContext( @@ -230,7 +212,6 @@ public: sal_uInt16 nToken); /// element token protected: - /// start element virtual void StartElement( const ::com::sun::star::uno::Reference< @@ -246,11 +227,9 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** inherit sender field because of fixed attribute in ProcessAttributes */ class XMLAuthorFieldImportContext : public XMLSenderFieldImportContext { - sal_Bool bAuthorFullName; const OUString sServiceAuthor; const OUString sPropertyAuthorFullName; @@ -258,7 +237,6 @@ class XMLAuthorFieldImportContext : public XMLSenderFieldImportContext const OUString sPropertyContent; public: - TYPEINFO(); XMLAuthorFieldImportContext( @@ -269,7 +247,6 @@ public: sal_uInt16 nToken); /// element token protected: - /// start element virtual void StartElement( const ::com::sun::star::uno::Reference< @@ -281,11 +258,8 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext { - const OUString sEmpty; /// empty string const OUString sServiceJumpEdit; const OUString sPropertyPlaceholderType; @@ -297,7 +271,6 @@ class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext sal_Int16 nPlaceholderType; public: - TYPEINFO(); XMLPlaceholderFieldImportContext( @@ -307,7 +280,6 @@ public: const OUString& sLocalName); /// element name w/o prefix protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -320,7 +292,6 @@ protected: class XMLTimeFieldImportContext : public XMLTextFieldImportContext { - protected: const OUString sPropertyNumberFormat; const OUString sPropertyFixed; @@ -342,7 +313,6 @@ protected: sal_Bool bIsDefaultLanguage; public: - TYPEINFO(); XMLTimeFieldImportContext( @@ -361,14 +331,11 @@ public: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** import date fields (<text:date>); inherit from TimeField to reuse implementation */ class XMLDateFieldImportContext : public XMLTimeFieldImportContext { - public: - TYPEINFO(); XMLDateFieldImportContext( @@ -382,7 +349,6 @@ public: const OUString& sAttrValue ); }; - /** import page continuation fields (<text:page-continuation-string>) */ class XMLPageContinuationImportContext : public XMLTextFieldImportContext { @@ -396,7 +362,6 @@ class XMLPageContinuationImportContext : public XMLTextFieldImportContext sal_Bool sStringOK; /// continuation string encountered? public: - TYPEINFO(); XMLPageContinuationImportContext( @@ -405,7 +370,6 @@ public: sal_uInt16 nPrfx, /// namespace prefix const OUString& sLocalName); /// element name w/o prefix - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -416,7 +380,6 @@ public: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** import page number fields (<text:page-number>) */ class XMLPageNumberImportContext : public XMLTextFieldImportContext { @@ -432,7 +395,6 @@ class XMLPageNumberImportContext : public XMLTextFieldImportContext sal_Bool sNumberFormatOK; public: - TYPEINFO(); XMLPageNumberImportContext( @@ -452,7 +414,6 @@ public: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** superclass for database fields: handle database and table names */ class XMLDatabaseFieldImportContext : public XMLTextFieldImportContext { @@ -488,7 +449,6 @@ protected: bool bUseDisplay ); public: - TYPEINFO(); /// process attribute values @@ -512,7 +472,6 @@ TYPEINFO(); class XMLDatabaseNameImportContext : public XMLDatabaseFieldImportContext { public: - TYPEINFO(); XMLDatabaseNameImportContext(SvXMLImport& rImport, @@ -525,7 +484,6 @@ public: const OUString& sAttrValue ); }; - /** import database next fields (<text:database-next>) */ class XMLDatabaseNextImportContext : public XMLDatabaseFieldImportContext { @@ -535,7 +493,6 @@ class XMLDatabaseNextImportContext : public XMLDatabaseFieldImportContext sal_Bool bConditionOK; protected: - // for use in child classes XMLDatabaseNextImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -544,7 +501,6 @@ protected: const OUString& sLocalName); public: - TYPEINFO(); XMLDatabaseNextImportContext(SvXMLImport& rImport, @@ -562,8 +518,6 @@ public: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import database select fields (<text:database-select>) */ class XMLDatabaseSelectImportContext : public XMLDatabaseNextImportContext { @@ -572,7 +526,6 @@ class XMLDatabaseSelectImportContext : public XMLDatabaseNextImportContext sal_Bool bNumberOK; public: - TYPEINFO(); XMLDatabaseSelectImportContext(SvXMLImport& rImport, @@ -590,7 +543,6 @@ public: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** import database display number fields (<text:database-row-number>) */ class XMLDatabaseNumberImportContext : public XMLDatabaseFieldImportContext { @@ -602,7 +554,6 @@ class XMLDatabaseNumberImportContext : public XMLDatabaseFieldImportContext sal_Bool bValueOK; public: - TYPEINFO(); XMLDatabaseNumberImportContext(SvXMLImport& rImport, @@ -620,7 +571,6 @@ public: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** import docinfo fields with only fixed atribute */ class XMLSimpleDocInfoImportContext : public XMLTextFieldImportContext { @@ -635,7 +585,6 @@ protected: sal_Bool bHasContent; public: - TYPEINFO(); XMLSimpleDocInfoImportContext(SvXMLImport& rImport, @@ -647,7 +596,6 @@ public: sal_Bool bAuthor); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -660,8 +608,6 @@ protected: static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); }; - - /** import docinfo fields with date or time attributes and numberformats */ class XMLDateTimeDocInfoImportContext : public XMLSimpleDocInfoImportContext { @@ -676,7 +622,6 @@ class XMLDateTimeDocInfoImportContext : public XMLSimpleDocInfoImportContext sal_Bool bIsDefaultLanguage; public: - TYPEINFO(); XMLDateTimeDocInfoImportContext(SvXMLImport& rImport, @@ -686,7 +631,6 @@ public: sal_uInt16 nToken); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -697,15 +641,12 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import revision field (<text:editing-cycles>) */ class XMLRevisionDocInfoImportContext : public XMLSimpleDocInfoImportContext { const OUString sPropertyRevision; public: - TYPEINFO(); XMLRevisionDocInfoImportContext(SvXMLImport& rImport, @@ -715,15 +656,12 @@ public: sal_uInt16 nToken); protected: - /// prepare XTextField for insertion into document virtual void PrepareField( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import user docinfo field (<text:user-defined>) */ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext { @@ -736,7 +674,6 @@ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext sal_Bool bIsDefaultLanguage; public: - TYPEINFO(); XMLUserDocInfoImportContext(SvXMLImport& rImport, @@ -746,7 +683,6 @@ public: sal_uInt16 nToken); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -755,8 +691,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import hidden paragraph fields (<text:hidden-paragraph>) */ class XMLHiddenParagraphImportContext : public XMLTextFieldImportContext { @@ -767,7 +701,6 @@ class XMLHiddenParagraphImportContext : public XMLTextFieldImportContext sal_Bool bIsHidden; public: - TYPEINFO(); XMLHiddenParagraphImportContext(SvXMLImport& rImport, @@ -776,7 +709,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -787,8 +719,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import conditional text fields (<text:conditional-text>) */ class XMLConditionalTextImportContext : public XMLTextFieldImportContext { @@ -808,7 +738,6 @@ class XMLConditionalTextImportContext : public XMLTextFieldImportContext sal_Bool bCurrentValue; public: - TYPEINFO(); XMLConditionalTextImportContext(SvXMLImport& rImport, @@ -817,7 +746,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -828,8 +756,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import conditional text fields (<text:hidden-text>) */ class XMLHiddenTextImportContext : public XMLTextFieldImportContext { @@ -845,7 +771,6 @@ class XMLHiddenTextImportContext : public XMLTextFieldImportContext sal_Bool bIsHidden; public: - TYPEINFO(); XMLHiddenTextImportContext(SvXMLImport& rImport, @@ -854,7 +779,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -865,8 +789,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import file name fields (<text:file-name>) */ class XMLFileNameImportContext : public XMLTextFieldImportContext { @@ -878,7 +800,6 @@ class XMLFileNameImportContext : public XMLTextFieldImportContext sal_Bool bFixed; public: - TYPEINFO(); XMLFileNameImportContext(SvXMLImport& rImport, @@ -887,7 +808,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -898,8 +818,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import document template name fields (<text:template-name>) */ class XMLTemplateNameImportContext : public XMLTextFieldImportContext { @@ -908,7 +826,6 @@ class XMLTemplateNameImportContext : public XMLTextFieldImportContext sal_Int16 nFormat; public: - TYPEINFO(); XMLTemplateNameImportContext(SvXMLImport& rImport, @@ -917,7 +834,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -928,7 +844,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** import chapter fields (<text:chapter>) */ class XMLChapterImportContext : public XMLTextFieldImportContext { @@ -939,7 +854,6 @@ class XMLChapterImportContext : public XMLTextFieldImportContext sal_Int8 nLevel; public: - TYPEINFO(); XMLChapterImportContext(SvXMLImport& rImport, @@ -948,7 +862,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -959,8 +872,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import count fields (<text:[XXX]-count>) */ class XMLCountFieldImportContext : public XMLTextFieldImportContext { @@ -972,7 +883,6 @@ class XMLCountFieldImportContext : public XMLTextFieldImportContext sal_Bool bNumberFormatOK; public: - TYPEINFO(); XMLCountFieldImportContext(SvXMLImport& rImport, @@ -982,7 +892,6 @@ public: sal_uInt16 nToken); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -995,7 +904,6 @@ protected: static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); }; - /** import page variable fields (<text:get-page-variable>) */ class XMLPageVarGetFieldImportContext : public XMLTextFieldImportContext { @@ -1007,7 +915,6 @@ class XMLPageVarGetFieldImportContext : public XMLTextFieldImportContext sal_Bool bNumberFormatOK; public: - TYPEINFO(); XMLPageVarGetFieldImportContext(SvXMLImport& rImport, @@ -1016,7 +923,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1027,7 +933,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** import page variable fields (<text:get-page-variable>) */ class XMLPageVarSetFieldImportContext : public XMLTextFieldImportContext { @@ -1038,7 +943,6 @@ class XMLPageVarSetFieldImportContext : public XMLTextFieldImportContext sal_Bool bActive; public: - TYPEINFO(); XMLPageVarSetFieldImportContext(SvXMLImport& rImport, @@ -1047,7 +951,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1058,11 +961,9 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** import macro fields (<text:execute-macro>) */ class XMLMacroFieldImportContext : public XMLTextFieldImportContext { - const OUString sPropertyHint; const OUString sPropertyMacroName; const OUString sPropertyScriptURL; @@ -1076,7 +977,6 @@ class XMLMacroFieldImportContext : public XMLTextFieldImportContext sal_Bool bDescriptionOK; public: - TYPEINFO(); XMLMacroFieldImportContext(SvXMLImport& rImport, @@ -1085,7 +985,6 @@ public: const OUString& sLocalName); protected: - /// for <office:events> children virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, @@ -1103,8 +1002,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import reference fields (<text:reference-get>) */ class XMLReferenceFieldImportContext : public XMLTextFieldImportContext { @@ -1122,7 +1019,6 @@ class XMLReferenceFieldImportContext : public XMLTextFieldImportContext sal_Bool bTypeOK; public: - TYPEINFO(); XMLReferenceFieldImportContext(SvXMLImport& rImport, @@ -1132,7 +1028,6 @@ public: const OUString& sLocalName); protected: - /// start element virtual void StartElement( const ::com::sun::star::uno::Reference< @@ -1148,16 +1043,12 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - - /** import dde field declaration container (<text:dde-connection-decls>) */ class XMLDdeFieldDeclsImportContext : public SvXMLImportContext { - SvXMLTokenMap aTokenMap; public: - TYPEINFO(); XMLDdeFieldDeclsImportContext(SvXMLImport& rImport, @@ -1169,12 +1060,8 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); - - }; - - /** import dde field declaration (<text:dde-connection-decl>) */ class XMLDdeFieldDeclImportContext : public SvXMLImportContext { @@ -1187,7 +1074,6 @@ class XMLDdeFieldDeclImportContext : public SvXMLImportContext const SvXMLTokenMap& rTokenMap; public: - TYPEINFO(); XMLDdeFieldDeclImportContext(SvXMLImport& rImport, @@ -1201,15 +1087,13 @@ public: ::com::sun::star::xml::sax::XAttributeList> & xAttrList); }; - - /** import dde fields (<text:dde-connection>) */ class XMLDdeFieldImportContext : public XMLTextFieldImportContext { OUString sName; OUString sPropertyContent; -public: +public: TYPEINFO(); XMLDdeFieldImportContext(SvXMLImport& rImport, @@ -1218,7 +1102,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1230,16 +1113,13 @@ protected: virtual void PrepareField( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropertySet); - }; - /** import sheet name fields (Calc) dde fields (<text:sheet-name>) */ class XMLSheetNameImportContext : public XMLTextFieldImportContext { public: - TYPEINFO(); XMLSheetNameImportContext(SvXMLImport& rImport, @@ -1248,7 +1128,6 @@ public: const OUString& sLocalName); protected: - /// no attributes -> empty method virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1262,7 +1141,6 @@ protected: /** import hyperlinks as URL fields (Calc, Impress, Draw) (<office:a>) */ class XMLUrlFieldImportContext : public XMLTextFieldImportContext { - const OUString sPropertyURL; const OUString sPropertyTargetFrame; const OUString sPropertyRepresentation; @@ -1272,7 +1150,6 @@ class XMLUrlFieldImportContext : public XMLTextFieldImportContext sal_Bool bFrameOK; public: - TYPEINFO(); XMLUrlFieldImportContext(SvXMLImport& rImport, @@ -1281,7 +1158,6 @@ public: const OUString& sLocalName); protected: - /// no attributes -> empty method virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1295,13 +1171,11 @@ protected: /** import bibliography info fields (<text:bibliography-mark>) */ class XMLBibliographyFieldImportContext : public XMLTextFieldImportContext { - const OUString sPropertyFields; ::std::vector< ::com::sun::star::beans::PropertyValue> aValues; public: - TYPEINFO(); XMLBibliographyFieldImportContext(SvXMLImport& rImport, @@ -1310,7 +1184,6 @@ public: const OUString& sLocalName); protected: - /// process attributes (fill aValues) virtual void StartElement( const ::com::sun::star::uno::Reference< @@ -1326,10 +1199,8 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); static const sal_Char* MapBibliographyFieldName(OUString sName); - }; - /** Import an annotation field (<text:annotation>) */ class XMLAnnotationImportContext : public XMLTextFieldImportContext { @@ -1354,7 +1225,6 @@ class XMLAnnotationImportContext : public XMLTextFieldImportContext sal_uInt16 m_nToken; public: - TYPEINFO(); XMLAnnotationImportContext(SvXMLImport& rImport, @@ -1364,7 +1234,6 @@ public: const OUString& sLocalName); protected: - /// process attributes virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1382,7 +1251,6 @@ protected: virtual void EndElement(); }; - /** Import a script field (<text:script>) */ class XMLScriptImportContext : public XMLTextFieldImportContext { @@ -1397,7 +1265,6 @@ class XMLScriptImportContext : public XMLTextFieldImportContext sal_Bool bScriptTypeOK; public: - TYPEINFO(); XMLScriptImportContext(SvXMLImport& rImport, @@ -1406,7 +1273,6 @@ public: const OUString& sLocalName); protected: - /// process attributes virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1421,8 +1287,8 @@ protected: class XMLMeasureFieldImportContext : public XMLTextFieldImportContext { sal_Int16 mnKind; -public: +public: TYPEINFO(); XMLMeasureFieldImportContext(SvXMLImport& rImport, @@ -1431,7 +1297,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1442,7 +1307,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - /** dropdown field (filter legacy) */ class XMLDropDownFieldImportContext : public XMLTextFieldImportContext { @@ -1475,7 +1339,6 @@ public: const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1560,7 +1423,6 @@ class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext const OUString sPropertyValue; public: - TYPEINFO(); XMLCustomPropertyFieldImportContext (SvXMLImport& rImport, @@ -1569,7 +1431,6 @@ public: const OUString& sLocalName); protected: - /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -1580,7 +1441,6 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |