[Libreoffice-commits] .: 2 commits - binfilter/bf_forms binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jul 29 02:57:38 PDT 2011
binfilter/bf_forms/source/component/Filter.hxx | 5
binfilter/bf_forms/source/component/FormComponent.hxx | 2
binfilter/bf_forms/source/component/ImageControl.hxx | 3
binfilter/bf_forms/source/component/ListBox.hxx | 3
binfilter/bf_forms/source/component/forms_Filter.cxx | 6
binfilter/bf_forms/source/component/forms_FormComponent.cxx | 80 ---------
binfilter/bf_forms/source/component/forms_ImageControl.cxx | 9 -
binfilter/bf_forms/source/component/forms_ListBox.cxx | 57 ------
binfilter/bf_sw/source/core/inc/flyfrm.hxx | 2
binfilter/bf_sw/source/core/inc/viewimp.hxx | 6
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 20 --
binfilter/bf_sw/source/core/ole/sw_ndole.cxx | 53 ------
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 98 ------------
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 50 ------
binfilter/bf_sw/source/core/tox/sw_tox.cxx | 47 -----
binfilter/bf_sw/source/core/view/sw_scrrect.cxx | 13 -
binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx | 45 -----
binfilter/bf_sw/source/ui/app/sw_docsh.cxx | 57 ------
binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx | 15 -
binfilter/bf_sw/source/ui/inc/wrtsh.hxx | 4
binfilter/bf_sw/source/ui/wrtsh/makefile.mk | 1
binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx | 52 ------
binfilter/inc/bf_sw/dbmgr.hxx | 1
binfilter/inc/bf_sw/docsh.hxx | 3
binfilter/inc/bf_sw/ndole.hxx | 4
binfilter/inc/bf_sw/tox.hxx | 2
26 files changed, 638 deletions(-)
New commits:
commit bbba68ee56b8f29f54c8ff273ada6cbbd1517da2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 29 10:53:56 2011 +0100
callcatcher: ditch newly unused code
diff --git a/binfilter/bf_forms/source/component/FormComponent.hxx b/binfilter/bf_forms/source/component/FormComponent.hxx
index d7e0eb8..5b0ef5a 100644
--- a/binfilter/bf_forms/source/component/FormComponent.hxx
+++ b/binfilter/bf_forms/source/component/FormComponent.hxx
@@ -416,7 +416,6 @@ protected:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
- void setField( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxField,sal_Bool _bFire=sal_True);
inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& getField() const
{
return m_xField;
diff --git a/binfilter/bf_forms/source/component/forms_FormComponent.cxx b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
index d62fce1..942626e 100644
--- a/binfilter/bf_forms/source/component/forms_FormComponent.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
@@ -1391,25 +1391,7 @@ void OBoundControlModel::reset() throw (RuntimeException)
{
OSL_ENSURE( false, "OBoundControlModel::reset: dead code!?" );
}
-// -----------------------------------------------------------------------------
-void OBoundControlModel::setField( const Reference< XPropertySet>& _rxField,sal_Bool _bFire)
-{
- // fire a property change event
- if ( m_xField != _rxField )
- {
- Any aOldValue; aOldValue <<= m_xField;
- m_xField = _rxField;
- if ( _bFire )
- {
- Any aNewValue; aNewValue <<= _rxField;
- sal_Int32 nHandle = PROPERTY_ID_BOUNDFIELD;
- OPropertySetHelper::fire(&nHandle, &aNewValue, &aOldValue, 1, sal_False);
- }
- }
-}
-// -----------------------------------------------------------------------------
-//.........................................................................
}
//... namespace frm .......................................................
diff --git a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
index 63d1ed6..f64e6c1 100644
--- a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
+++ b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
@@ -199,59 +199,6 @@ SwOLELRUCache* SwOLEObj::pOLELRU_Cache = 0;
/*N*/ return pOLENd;
/*N*/ }
-
-/*N*/ BOOL SwOLENode::IsInGlobalDocSection() const
-/*N*/ {
-/*N*/ // suche den "Body Anchor"
-/*N*/ ULONG nEndExtraIdx = GetNodes().GetEndOfExtras().GetIndex();
-/*N*/ const SwNode* pAnchorNd = this;
-/*N*/ do {
-/*N*/ SwFrmFmt* pFlyFmt = pAnchorNd->GetFlyFmt();
-/*N*/ if( !pFlyFmt )
-/*N*/ return FALSE;
-/*N*/
-/*N*/ const SwFmtAnchor& rAnchor = pFlyFmt->GetAnchor();
-/*N*/ if( !rAnchor.GetCntntAnchor() )
-/*N*/ return FALSE;
-/*N*/
-/*N*/ pAnchorNd = &rAnchor.GetCntntAnchor()->nNode.GetNode();
-/*N*/ } while( pAnchorNd->GetIndex() < nEndExtraIdx );
-/*N*/
-/*N*/ const SwSectionNode* pSectNd = pAnchorNd->FindSectionNode();
-/*N*/ if( !pSectNd )
-/*N*/ return FALSE;
-/*N*/
-/*N*/ while( pSectNd )
-/*N*/ {
-/*N*/ pAnchorNd = pSectNd;
-/*N*/ pSectNd = pAnchorNd->FindStartNode()->FindSectionNode();
-/*N*/ }
-/*N*/
-/*N*/ // in pAnchorNd steht der zuletzt gefundene Section Node. Der muss
-/*N*/ // jetzt die Bedingung fuers GlobalDoc erfuellen.
-/*N*/ pSectNd = (SwSectionNode*)pAnchorNd;
-/*N*/ return FILE_LINK_SECTION == pSectNd->GetSection().GetType() &&
-/*N*/ pSectNd->GetIndex() > nEndExtraIdx;
-/*N*/ }
-
-
-/*N*/ BOOL SwOLENode::IsOLEObjectDeleted() const
-/*N*/ {
-/*N*/ BOOL bRet = FALSE;
-/*N*/ if( aOLEObj.pOLERef && aOLEObj.pOLERef->Is() )
-/*N*/ {
-/*N*/ SvPersist* p = GetDoc()->GetPersist();
-/*N*/ if( p ) // muss da sein
-/*N*/ {
-/*N*/ SvInfoObjectRef aRef( p->Find( aOLEObj.aName ) );
-/*N*/ if( aRef.Is() )
-/*N*/ bRet = aRef->IsDeleted();
-/*N*/ }
-/*N*/ }
-/*N*/ return bRet;
-/*N*/ }
-
-
/*N*/ SwOLEObj::SwOLEObj( SvInPlaceObject *pObj )
/*N*/ : pOLENd( 0 )
/*N*/ , pOLERef( new SvInPlaceObjectRef( pObj ) )
diff --git a/binfilter/inc/bf_sw/ndole.hxx b/binfilter/inc/bf_sw/ndole.hxx
index e01a57f..55db067 100644
--- a/binfilter/inc/bf_sw/ndole.hxx
+++ b/binfilter/inc/bf_sw/ndole.hxx
@@ -117,10 +117,6 @@ public:
virtual Size GetTwipSize() const;
-
- BOOL IsInGlobalDocSection() const;
- BOOL IsOLEObjectDeleted() const;
-
BOOL IsOLESizeInvalid() const { return bOLESizeInvalid; }
void SetOLESizeInvalid( BOOL b ){ bOLESizeInvalid = b; }
commit 1a9ab6fcc7df582caf70364d1ab48b37be0df06a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 28 22:48:21 2011 +0100
callcatcher: ditch various unused methods
diff --git a/binfilter/bf_forms/source/component/Filter.hxx b/binfilter/bf_forms/source/component/Filter.hxx
index 880baeb..3a93805 100644
--- a/binfilter/bf_forms/source/component/Filter.hxx
+++ b/binfilter/bf_forms/source/component/Filter.hxx
@@ -81,11 +81,6 @@ namespace frm
sal_Bool m_bMultiLine : 1;
sal_Bool m_bFilterListFilled : 1;
- private:
-// OFilterControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
-
- void implInitFilterList();
-
public:
OFilterControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
diff --git a/binfilter/bf_forms/source/component/FormComponent.hxx b/binfilter/bf_forms/source/component/FormComponent.hxx
index 5a17e39..d7e0eb8 100644
--- a/binfilter/bf_forms/source/component/FormComponent.hxx
+++ b/binfilter/bf_forms/source/component/FormComponent.hxx
@@ -474,7 +474,6 @@ public:
virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException);
private:
- sal_Bool connectToField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxForm);
void resetField() { m_xColumnUpdate = NULL; m_xColumn = NULL; m_xField = NULL; }
};
diff --git a/binfilter/bf_forms/source/component/ImageControl.hxx b/binfilter/bf_forms/source/component/ImageControl.hxx
index 81ac3a4..4524a8f 100644
--- a/binfilter/bf_forms/source/component/ImageControl.hxx
+++ b/binfilter/bf_forms/source/component/ImageControl.hxx
@@ -66,9 +66,6 @@ class OImageControlModel
OPropertyChangeMultiplexer* m_pAggregatePropertyMultiplexer;
- // Helper functions
- void UpdateFromField();
-
protected:
// UNO Anbindung
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
diff --git a/binfilter/bf_forms/source/component/ListBox.hxx b/binfilter/bf_forms/source/component/ListBox.hxx
index aeaad0d..d6e717c 100644
--- a/binfilter/bf_forms/source/component/ListBox.hxx
+++ b/binfilter/bf_forms/source/component/ListBox.hxx
@@ -80,9 +80,6 @@ class OListBoxModel :public OBoundControlModel
sal_Int16 m_nNULLPos; // Position an der der NULLwert abgelegt wird
sal_Bool m_bBoundComponent : 1;
- // Helper functions
- StringSequence GetCurValueSeq() const;
-
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
public:
diff --git a/binfilter/bf_forms/source/component/forms_Filter.cxx b/binfilter/bf_forms/source/component/forms_Filter.cxx
index e294f2a..39d7ce4 100644
--- a/binfilter/bf_forms/source/component/forms_Filter.cxx
+++ b/binfilter/bf_forms/source/component/forms_Filter.cxx
@@ -326,12 +326,6 @@ namespace frm
}
}
- //---------------------------------------------------------------------
- void OFilterControl::implInitFilterList()
- {
- OSL_ENSURE( false, "OFilterControl::implInitFilterList: dead code!?" );
- }
-
// XFocusListener
//---------------------------------------------------------------------
void SAL_CALL OFilterControl::focusGained(const FocusEvent& ) throw( RuntimeException )
diff --git a/binfilter/bf_forms/source/component/forms_FormComponent.cxx b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
index 9df6978..d62fce1 100644
--- a/binfilter/bf_forms/source/component/forms_FormComponent.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
@@ -1321,68 +1321,6 @@ sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException)
}
//------------------------------------------------------------------------------
-sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
-{
- // wenn eine Verbindung zur Datenbank existiert
- if (rForm.is() && getConnection(rForm).is())
- {
- // Feld bestimmen und PropertyChangeListener
- m_xCursor = rForm;
- Reference<XPropertySet> xFieldCandidate;
-
- if (m_xCursor.is())
- {
- Reference<XColumnsSupplier> xColumnsSupplier(m_xCursor, UNO_QUERY);
- DBG_ASSERT(xColumnsSupplier.is(), "OBoundControlModel::connectToField : the row set should support the com::sun::star::sdb::ResultSet service !");
- if (xColumnsSupplier.is())
- {
- Reference<XNameAccess> xColumns(xColumnsSupplier->getColumns(), UNO_QUERY);
- if (xColumns.is() && xColumns->hasByName(m_aControlSource))
- {
- Any aElement(xColumns->getByName(m_aControlSource));
- DBG_ASSERT(xColumns->getElementType().equals(::getCppuType(reinterpret_cast<Reference<XPropertySet>*>(NULL))),
- "OBoundControlModel::connectToField : the columns container should contain XPropertySets !");
- // if this assertion fails we probably should do a queryInterface ....
- aElement >>= xFieldCandidate;
- }
- }
- }
-
- // darf ich mich ueberhaupt an dieses Feld binden (Typ-Check)
- if (xFieldCandidate.is())
- {
- sal_Int32 nFieldType(0);
- xFieldCandidate->getPropertyValue(PROPERTY_FIELDTYPE) >>= nFieldType;
- if (_approve(nFieldType))
- setField(xFieldCandidate,sal_False);
- }
- else
- setField(NULL,sal_False);
-
- if (m_xField.is())
- {
- if(m_xField->getPropertySetInfo()->hasPropertyByName(PROPERTY_VALUE))
- {
- // an wertaenderungen horchen
- m_xField->addPropertyChangeListener(PROPERTY_VALUE, this);
- m_xColumnUpdate = Reference<XColumnUpdate>(m_xField, UNO_QUERY);
- m_xColumn = Reference<XColumn>(m_xField, UNO_QUERY);
- INT32 nNullableFlag(0);
- m_xField->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullableFlag;
- m_bRequired = (ColumnValue::NO_NULLS == nNullableFlag);
- // we're optimistic : in case of ColumnValue_NULLABLE_UNKNOWN we assume nullability ....
- }
- else
- {
- OSL_FAIL("OBoundControlModel::connectToField: property NAME not supported!");
- setField(NULL,sal_False);
- }
- }
- }
- return m_xField.is();
-}
-
-//------------------------------------------------------------------------------
sal_Bool OBoundControlModel::_approve(sal_Int32 _nColumnType)
{
if ((_nColumnType == DataType::BINARY) || (_nColumnType == DataType::VARBINARY)
diff --git a/binfilter/bf_forms/source/component/forms_ImageControl.cxx b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
index a93d05f..231dee1 100644
--- a/binfilter/bf_forms/source/component/forms_ImageControl.cxx
+++ b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
@@ -431,15 +431,6 @@ void OImageControlModel::disposing()
m_xImageProducer->startProduction();
}
-// Helper functions
-//------------------------------------------------------------------------------
-void OImageControlModel::UpdateFromField()
-{
- Reference<XInputStream> xInStream = m_xColumn->getBinaryStream();
- GetImageProducer()->setImage(xInStream);
- GetImageProducer()->startProduction();
-}
-
//--------------------------------------------------------------------
Reference< XImageProducer > SAL_CALL OImageControlModel::getImageProducer() throw ( RuntimeException)
{
diff --git a/binfilter/bf_forms/source/component/forms_ListBox.cxx b/binfilter/bf_forms/source/component/forms_ListBox.cxx
index 142168c..5d502df 100644
--- a/binfilter/bf_forms/source/component/forms_ListBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ListBox.cxx
@@ -523,63 +523,6 @@ void OListBoxModel::loadData()
OSL_ENSURE( false, "OListBoxModel::loadData: dead code!?" );
}
-//------------------------------------------------------------------------------
-StringSequence OListBoxModel::GetCurValueSeq() const
-{
- StringSequence aCurValues;
-
- // Aus den selektierten Indizes Werte-Sequence aufbauen
- DBG_ASSERT(m_xAggregateFastSet.is(), "OListBoxModel::GetCurValueSeq : invalid aggregate !");
- if (!m_xAggregateFastSet.is())
- return aCurValues;
- Any aTmp = m_xAggregateFastSet->getFastPropertyValue(OListBoxModel::nSelectHandle);
-
- Sequence<sal_Int16> aSelectSeq; aTmp >>= aSelectSeq;
- const sal_Int16 *pSels = aSelectSeq.getConstArray();
- sal_uInt32 nSelCount = aSelectSeq.getLength();
-
- if (nSelCount)
- {
- const ::rtl::OUString *pVals = NULL;
- sal_Int32 nValCnt = 0;
- if (m_aValueSeq.getLength())
- {
- pVals = m_aValueSeq.getConstArray();
- nValCnt = m_aValueSeq.getLength();
- }
- else
- {
- aTmp = const_cast<OListBoxModel*>(this)->OPropertySetAggregationHelper::getFastPropertyValue(PROPERTY_ID_STRINGITEMLIST);
- pVals = (*(StringSequence*)aTmp.getValue()).getConstArray();
- nValCnt = (*(StringSequence*)aTmp.getValue()).getLength();
- }
-
- if (nSelCount > 1)
- {
- // Einfach- oder Mehrfach-Selektion
- sal_Bool bMultiSel(sal_False);
- const_cast<OListBoxModel*>(this)->OPropertySetAggregationHelper::getFastPropertyValue(PROPERTY_ID_MULTISELECTION) >>= bMultiSel;
- if (bMultiSel)
- nSelCount = 1;
- }
-
- // ist der Eintrag fuer NULL selektiert ?
- // dann leere Selektion liefern
- if (m_nNULLPos != -1 && nSelCount == 1 && pSels[0] == m_nNULLPos)
- nSelCount = 0;
-
- aCurValues.realloc(nSelCount);
- ::rtl::OUString *pCurVals = aCurValues.getArray();
-
- for (sal_uInt16 i = 0; i < nSelCount; i++)
- {
- if (pSels[i] < nValCnt)
- pCurVals[i] = pVals[pSels[i]];
- }
- }
- return aCurValues;
-}
-
//==================================================================
// OListBoxControl
//==================================================================
diff --git a/binfilter/bf_sw/source/core/inc/flyfrm.hxx b/binfilter/bf_sw/source/core/inc/flyfrm.hxx
index 6841bfb..afd3058 100644
--- a/binfilter/bf_sw/source/core/inc/flyfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/flyfrm.hxx
@@ -200,8 +200,6 @@ public:
BOOL GetContour( PolyPolygon& rContour,
const sal_Bool _bForPaint = sal_False ) const;
- BOOL ConvertHoriTo40( SwHoriOrient &rHori, SwRelationOrient &rRel, SwTwips &rPos ) const;
-
//Auf dieser Shell painten (PreView, Print-Flag usw. rekursiv beachten)?.
/** SwFlyFrm::IsBackgroundTransparent
diff --git a/binfilter/bf_sw/source/core/inc/viewimp.hxx b/binfilter/bf_sw/source/core/inc/viewimp.hxx
index f6779f4..b78fd44 100644
--- a/binfilter/bf_sw/source/core/inc/viewimp.hxx
+++ b/binfilter/bf_sw/source/core/inc/viewimp.hxx
@@ -175,13 +175,7 @@ public:
SwRegionRects *GetRegion() { return pRegion; }
void DelRegions(); //Loescht Scroll- und PaintRects
- //Handler fuer das Refresh von gescrollten Bereichen (Korrektur des
- //Alignments). Ruft das Refresh mit der ScrolledArea.
- //RefreshScrolledArea kann z.B. beim Setzen des Crsr genutzt werden, es
- //wird nur der Anteil des Rect refreshed, der mit der ScrolledArea
- //ueberlappt. Das 'reingereichte Rechteck wird veraendert!
void RestartScrollTimer() { aScrollTimer.Start(); }
- DECL_LINK( RefreshScrolledHdl, Timer * );
//Wird vom Layout ggf. waehrend einer Action gerufen, wenn der
//Verdacht besteht, dass es etwas drunter und drueber geht.
diff --git a/binfilter/bf_sw/source/core/layout/sw_fly.cxx b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
index 5819acb..d694170 100644
--- a/binfilter/bf_sw/source/core/layout/sw_fly.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
@@ -1964,26 +1964,6 @@ void SwFrm::CalcFlys( BOOL bPosOnly )
/*N*/ return aRect;
/*N*/ }
-/*************************************************************************
-|*
-|* SwFlyFrm::GetContour()
-|*
-|*************************************************************************/
-/// #i13147# - If called for paint and the <SwNoTxtFrm> contains
-/// a graphic, load of intrinsic graphic has to be avoided.
-
-BOOL SwFlyFrm::ConvertHoriTo40( SwHoriOrient &rHori, SwRelationOrient &rRel,
- SwTwips &rPos ) const
-{
- if( !GetAnchor() )
- return FALSE;
- rHori = HORI_NONE;
- rRel = FRAME;
- rPos = Frm().Left() - GetAnchor()->Frm().Left();
- return TRUE;
-}
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index a2f549d..2fb007a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -1428,65 +1428,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-
-/*N*/ void lcl_sw3io_OutSetExpField40( Sw3IoImp& rIo, SwField *pFld)
-/*N*/ {
-/*N*/ USHORT nPoolId = USHRT_MAX;
-/*N*/ const String& rName = ((SwSetExpField *)pFld)->GetTyp()->GetName();
-/*N*/ if( GSE_SEQ & ((SwSetExpFieldType *)pFld->GetTyp())->GetType() )
-/*N*/ nPoolId = lcl_sw3io_GetSetExpFieldPoolId( rName );
-/*N*/
-/*N*/ *rIo.pStrm << (UINT16)rIo.aStringPool.Find( rName, nPoolId );
-/*N*/
-/*N*/ BYTE cFlags = ((SwSetExpField *)pFld)->GetInputFlag() ? 0x10 : 0;
-/*N*/ String sStr( ((SwSetExpField *)pFld)->GetExpStr() );
-/*N*/
-/*N*/ if( GSE_SEQ & ((SwSetExpFieldType *)pFld->GetTyp())->GetType() )
-/*N*/ {
-/*N*/ USHORT n = (USHORT)((SwSetExpField*)pFld)->GetValue();
-/*N*/ sStr = ::binfilter::FormatNumber( n, SVX_NUM_ARABIC );
-/*N*/ if( !rIo.IsSw31Export() )
-/*N*/ cFlags |= 0x20;
-/*N*/ }
-/*N*/
-/*N*/ *rIo.pStrm << cFlags;
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwSetExpField*)pFld)->GetFormula() );
-/*N*/ rIo.OutString( *rIo.pStrm, sStr );
-/*N*/
-/*N*/ if( cFlags & 0x10 )
-/*?*/ rIo.OutString( *rIo.pStrm, ((SwSetExpField *)pFld)->GetPromptText() );
-/*N*/ if( cFlags & 0x20 )
-/*N*/ *rIo.pStrm << (UINT16)((SwSetExpField *)pFld)->GetSeqNumber();
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutSetExpField( Sw3IoImp& rIo, SwField *pFld )
-/*N*/ {
-/*N*/ USHORT nPoolId = USHRT_MAX;
-/*N*/ BYTE cFlags = ((SwSetExpField *)pFld)->GetInputFlag() ? 0x10 : 0;
-/*N*/
-/*N*/ const String& rName = ((SwSetExpField *)pFld)->GetTyp()->GetName();
-/*N*/ if( ((SwSetExpField *)pFld)->IsSequenceFld() )
-/*N*/ {
-/*N*/ nPoolId = lcl_sw3io_GetSetExpFieldPoolId( rName );
-/*N*/ cFlags |= 0x20;
-/*N*/ if( MAXLEVEL > ((SwSetExpFieldType *)pFld->GetTyp())->GetOutlineLvl() )
-/*N*/ cFlags |= 0x40;
-/*N*/ }
-/*N*/
-/*N*/ *rIo.pStrm << cFlags
-/*N*/ << (UINT16)rIo.aStringPool.Find( rName, nPoolId );
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwSetExpField*)pFld)->GetFormula() );
-/*N*/
-/*N*/ if( cFlags & 0x10 )
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwSetExpField *)pFld)->GetPromptText() );
-/*N*/ if( cFlags & 0x20 )
-/*N*/ *rIo.pStrm << (UINT16)((SwSetExpField*)pFld)->GetValue()
-/*N*/ << (UINT16)((SwSetExpField *)pFld)->GetSeqNumber();
-/*N*/
-/*N*/ if( cFlags & 0x40 || !(cFlags & 0x20) )
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwSetExpField *)pFld)->GetExpStr() );
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InHiddenParaField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1988,45 +1929,6 @@ static Sw3InFieldFn aInFieldFnTbl[] =
/*N*/ return pFld;
/*N*/ }
-// Ausgabe aller Feldtypen, die keine Systemtypen sind
-
-/*N*/ BOOL lcl_sw3io_HasFixedFields40( Sw3IoImp& rIo, USHORT nWhich )
-/*N*/ {
-/*N*/ SwFieldType* pFldType = rIo.pDoc->GetSysFldType( nWhich );
-/*N*/
-/*N*/ SwClientIter aIter( *pFldType );
-/*N*/ for( SwFmtFld* pFmtFld = (SwFmtFld*)aIter.First( TYPE( SwFmtFld ));
-/*N*/ pFmtFld;
-/*N*/ pFmtFld = (SwFmtFld*)aIter.Next() )
-/*N*/ {
-/*N*/ const SwField *pFld = pFmtFld->GetFld();
-/*N*/ BOOL bFixed = FALSE;
-/*N*/ switch( nWhich )
-/*N*/ {
-/*?*/ case RES_DOCINFOFLD:
-/*?*/ bFixed = ((SwDocInfoField*)pFld)->IsFixed();
-/*?*/ break;
-/*?*/ case RES_AUTHORFLD:
-/*?*/ bFixed = ((SwAuthorField*)pFld)->IsFixed();
-/*?*/ break;
-/*N*/ case RES_EXTUSERFLD:
-/*N*/ bFixed = ((SwExtUserField*)pFld)->IsFixed();
-/*N*/ break;
-/*?*/ case RES_FILENAMEFLD:
-/*?*/ bFixed = ((SwFileNameField*)pFld)->IsFixed();
-/*N*/ break;
-/*N*/ }
-/*N*/ const SwTxtFld *pTxtFld = pFmtFld->GetTxtFld();
-/*N*/ if( bFixed && pTxtFld && pTxtFld->GetpTxtNode() &&
-/*N*/ pTxtFld->GetpTxtNode()->GetNodes().IsDocNodes() )
-/*N*/ {
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ return FALSE;
-/*N*/ }
-
/*N*/ SwFieldType* Sw3IoImp::InFieldType()
/*N*/ {
/*N*/ BYTE ch;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
index 42a236c..24b21d0 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
@@ -153,7 +153,6 @@ class SwStyleSheetPool : public SfxStyleSheetBasePool {
using SfxStyleSheetBasePool::Create;
virtual SfxStyleSheetBase* Create( const String&, SfxStyleFamily, USHORT nMask);
void Add( const SwFmt& rFmt, SfxStyleFamily eFam );
- void CopyFromDoc( BOOL bUsed );
void CopyToDoc( BOOL bOverwrite, USHORT eMask );
void Rename( const String&, const String&, SfxStyleFamily );
SwStyleSheet *FindByPoolId( USHORT nPoolId );
@@ -438,55 +437,6 @@ public:
const int RES_POOLCOLL_HTML_LISTING_40_USER = 0x3002 | USER_FMT;
const int RES_POOLCOLL_HTML_XMP_40_USER = 0x3003 | USER_FMT;
-// Auffuellen eines Pools mit allen am Doc definierten Vorlagen
-
-/*N*/ void SwStyleSheetPool::CopyFromDoc( BOOL bUsed )
-/*N*/ {
-/*N*/ Clear();
-/*N*/ // Uebernahme der benannten Formate
-/*N*/ // Die Defaultvorlagen werden nicht uebernommen
-/*N*/ // Zeichenvorlagen: alle uebernehmen
-/*N*/ // Rahmenvorlagen: nur die Nicht-Auto-Vorlagen uebernehmen
-/*N*/ const SwFmt* pFmt;
-/*N*/ USHORT nArrLen = rDoc.GetCharFmts()->Count();
- USHORT i=0;
-/*N*/ for( i = 0; i < nArrLen; i++ )
-/*N*/ {
-/*N*/ pFmt = (*rDoc.GetCharFmts())[ i ];
-/*N*/ if( ( !bUsed || rDoc.IsUsed( *pFmt ) ) && !pFmt->IsDefault() )
-/*N*/ Add( *pFmt, SFX_STYLE_FAMILY_CHAR );
-/*N*/ }
-/*N*/ nArrLen = rDoc.GetFrmFmts()->Count();
-/*N*/ for( i = 0; i < nArrLen; i++ )
-/*N*/ {
-/*N*/ pFmt = (*rDoc.GetFrmFmts())[ i ];
-/*N*/ if( ( !bUsed || rDoc.IsUsed( *pFmt ) )
-/*N*/ && !pFmt->IsDefault() && !pFmt->IsAuto() )
-/*N*/ Add( *pFmt, SFX_STYLE_FAMILY_FRAME );
-/*N*/ }
-/*N*/ // Uebernahme der Absatzvorlagen
-/*N*/ nArrLen = rDoc.GetTxtFmtColls()->Count();
-/*N*/ for( i = 0; i < nArrLen; i++ )
-/*N*/ {
-/*N*/ const SwTxtFmtColl* pColl = (*rDoc.GetTxtFmtColls())[ i ];
-/*N*/ if( ( !bUsed || rDoc.IsUsed( *pColl ) ) && !pColl->IsDefault() )
-/*N*/ Add( *pColl, SFX_STYLE_FAMILY_PARA );
-/*N*/ }
-/*N*/ if( bUsed )
-/*N*/ {
-/*N*/ //JP 30.03.99: falls die Follows nicht angewendet werden, so muessen
-/*N*/ // sie doch kopiert werden!
-/*?*/ for( i = 0; i < nArrLen; i++ )
-/*?*/ {
-/*?*/ const SwTxtFmtColl* pColl = (*rDoc.GetTxtFmtColls())[ i ];
-/*?*/ if( pColl != &pColl->GetNextTxtFmtColl() &&
-/*?*/ !Find( pColl->GetNextTxtFmtColl().GetName(),
-/*?*/ SFX_STYLE_FAMILY_PARA ))
-/*?*/ Add( pColl->GetNextTxtFmtColl(), SFX_STYLE_FAMILY_PARA );
-/*?*/ }
-/*N*/ }
-/*N*/ }
-
// Hinzufuegen eines neuen StyleSheets.
// Es muss mind. ein Bit in der Maske gesetzt werden, da die Suchroutinen
// der Basisklasse ein AND auf die Maske machen!
diff --git a/binfilter/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
index ee20bce..a24f8ab 100644
--- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
@@ -616,53 +616,6 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ return 2 <= lcl_GetPatternCount(aPattern[ 1 ], SwForm::aFormTab);
/*N*/ }
-/*N*/ String SwForm::ConvertPatternTo51(const String& rSource)
-/*N*/ {
-/*N*/ SwFormTokenEnumerator aEnum(rSource);
-/*N*/ String sRet;
-/*N*/ while(aEnum.HasNextToken())
-/*N*/ {
-/*N*/ SwFormToken aToken(aEnum.GetNextToken());
-/*N*/ switch(aToken.eTokenType)
-/*N*/ {
-/*N*/ case TOKEN_ENTRY_NO :
-/*N*/ sRet.AppendAscii( SwForm::aFormEntryNum );
-/*N*/ break;
-/*N*/ case TOKEN_ENTRY_TEXT :
-/*N*/ sRet.AppendAscii( SwForm::aFormEntryTxt );
-/*N*/ break;
-/*N*/ case TOKEN_ENTRY :
-/*N*/ sRet.AppendAscii( SwForm::aFormEntry );
-/*N*/ break;
-/*N*/ case TOKEN_TAB_STOP :
-/*N*/ sRet.AppendAscii( SwForm::aFormTab );
-/*N*/ break;
-/*N*/ case TOKEN_TEXT :
-/*?*/ sRet += aToken.sText;
-/*?*/ break;
-/*N*/ case TOKEN_PAGE_NUMS :
-/*N*/ sRet.AppendAscii( SwForm::aFormPageNums );
-/*N*/ break;
-/*N*/ case TOKEN_CHAPTER_INFO :
-/*N*/ // not available in 5.1
-/*N*/ break;
-/*N*/ case TOKEN_LINK_START :
-/*N*/ sRet.AppendAscii( SwForm::aFormLinkStt );
-/*N*/ break;
-/*N*/ case TOKEN_LINK_END :
-/*N*/ sRet.AppendAscii( SwForm::aFormLinkEnd );
-/*N*/ break;
-/*N*/ case TOKEN_AUTHORITY :
-/*N*/ // no conversion available
-/*?*/ sRet.AppendAscii( SwForm::aFormEntry );
-/*?*/ break;
-/*?*/ default:
-/*?*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ return sRet;
-/*N*/ }
-
/*N*/ String SwForm::ConvertPatternFrom51(const String& rSource, TOXTypes eType)
/*N*/ {
/*N*/ String sRet( rSource );
diff --git a/binfilter/bf_sw/source/core/view/sw_scrrect.cxx b/binfilter/bf_sw/source/core/view/sw_scrrect.cxx
index 0632c53..e72d991 100644
--- a/binfilter/bf_sw/source/core/view/sw_scrrect.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_scrrect.cxx
@@ -132,19 +132,6 @@ namespace binfilter {
/*N*/ AddPaintRect( rRect );
/*N*/ }
-/******************************************************************************
-|*
-|* SwViewImp::RefreshScrolledHdl(..)
-|*
-|* Every timerstop one of the critical lines will be painted.
-|*
-******************************************************************************/
-
-/*N*/ IMPL_LINK( SwViewImp, RefreshScrolledHdl, Timer *, EMPTYARG )
-/*N*/ {
- {DBG_BF_ASSERT(0, "STRIP");} return 0;
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
index aded6a3..6e3bc04 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
@@ -173,51 +173,6 @@ BOOL W4WSttEndPos::operator<( const W4WSttEndPos & rSEPos )
return FALSE;
}
-SV_DECL_VARARR( _W4WEndPosLst, W4WSttEndPos, 5, 5 )
-SV_IMPL_VARARR( _W4WEndPosLst, W4WSttEndPos )
-
-class W4WEndPosLst : private _W4WEndPosLst
-{
-public:
- W4WEndPosLst() : _W4WEndPosLst( 5 ) {}
-
- BOOL Insert( W4WSttEndPos & aNew );
- void Delete( USHORT n = 1 )
- { _W4WEndPosLst::Remove( 0, n ); }
- W4WSttEndPos operator[]( USHORT nPos )
- { return _W4WEndPosLst::operator[]( nPos ); }
- USHORT Count()
- { return _W4WEndPosLst::Count(); }
-// void OutAttr( SwW4WWriter & rWrt, USHORT nStrPos, USHORT nEnde );
-};
-
-BOOL W4WEndPosLst::Insert( W4WSttEndPos & aNew )
-{
- USHORT nPos;
- for( nPos = 0; nPos < Count(); nPos++ )
- {
- W4WSttEndPos aTmp = _W4WEndPosLst::operator[]( nPos );
- if( aNew < aTmp )
- {
- _W4WEndPosLst::Insert( aNew, nPos );
- return TRUE;
- }
- }
- _W4WEndPosLst::Insert( aNew, nPos );
- return TRUE;
-}
-
-
-#define MAX_TAB_OVER 1000 // soviel twips ueberhaengen ist ok
-
-// Wenn beim SWG Tabe bis zu 2 cm ueberhaengen, gelten sie trotzdem noch.
-// Wenn bei WW2-Export die Tabs nur 1 Twip ueberhaengen, werden sie
-// ignoriert. Das passiert innerhalb von Frames leicht. Deshalb wird hier
-// gemogelt. Dass bei Flys die Page-Grenzen statt der Fly-Grenzen genommen
-// werden, ist ok, da WW2 dann die Tabs immer noch anerkennt
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
index 8601198..725d915 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
@@ -526,63 +526,6 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_
/*N*/ SfxObjectShell::CancelTransfers();
/*N*/ }
-
- // embedded alle lokalen Links (Bereiche/Grafiken)
-
-
-/*N*/ void SwDocShell::RemoveOLEObjects()
-/*N*/ {
-/*N*/ SvPersist* pPersist = this;
-/*N*/ SwClientIter aIter( *(SwModify*)pDoc->GetDfltGrfFmtColl() );
-/*N*/ for( SwCntntNode* pNd = (SwCntntNode*)aIter.First( TYPE( SwCntntNode ) );
-/*N*/ pNd; pNd = (SwCntntNode*)aIter.Next() )
-/*N*/ {
-/*N*/ SwOLENode* pOLENd = pNd->GetOLENode();
-/*N*/ if( pOLENd && ( pOLENd->IsOLEObjectDeleted() ||
-/*N*/ pOLENd->IsInGlobalDocSection() ) )
-/*N*/ {
-/*N*/ SvInfoObjectRef aRef( pPersist->Find(
-/*N*/ pOLENd->GetOLEObj().GetName() ) );
-/*N*/ if( aRef.Is() )
-/*N*/ {
-/*N*/ if( !xOLEChildList.Is() )
-/*N*/ {
-/*N*/ xOLEChildList = new SwTmpPersist( *this );
-/*N*/ xOLEChildList->DoInitNew( 0 );
-/*N*/ }
-/*N*/
-/*N*/ xOLEChildList->Move( &aRef, aRef->GetStorageName(), TRUE );
-/*N*/ pPersist->Remove( &aRef );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-// When a document is loaded, SwDoc::PrtOLENotify is called to update
-// the sizes of math objects. However, for objects that do not have a
-// SwFrm at this time, only a flag is set (bIsOLESizeInvalid) and the
-// size change takes place later, while calculating the layout in the
-// idle handler. If this document is saved now, it is saved with invalid
-// sizes. For this reason, the layout has to be calculated before a document is
-// saved, but of course only id there are OLE objects with bOLESizeInvalid set.
-/*N*/ void SwDocShell::CalcLayoutForOLEObjects()
-/*N*/ {
-/*N*/ if( !pWrtShell )
-/*N*/ return;
-/*N*/
-/*N*/ SwClientIter aIter( *(SwModify*)pDoc->GetDfltGrfFmtColl() );
-/*N*/ for( SwCntntNode* pNd = (SwCntntNode*)aIter.First( TYPE( SwCntntNode ) );
-/*N*/ pNd; pNd = (SwCntntNode*)aIter.Next() )
-/*N*/ {
-/*N*/ SwOLENode* pOLENd = pNd->GetOLENode();
-/*N*/ if( pOLENd && pOLENd->IsOLESizeInvalid() )
-/*N*/ {
-/*N*/ pWrtShell->CalcLayout();
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
/*N*/ Sequence< OUString > SwDocShell::GetEventNames()
/*N*/ {
/*N*/ Sequence< OUString > aRet = SfxObjectShell::GetEventNames();
diff --git a/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx b/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx
index 50cd039..77588ed 100644
--- a/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx
+++ b/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx
@@ -588,26 +588,11 @@ const sal_Char cActiveConnection[] = "ActiveConnection";
/*M*/ pFound->aSelection.realloc(0);
/*M*/ }
-
-/*M*/ void SwNewDBMgr::GetDSSelection(const SwDBData& rData, long& rSelStart, long& rSelEnd)
-/*M*/ {
-/*M*/ SwDSParam* pFound = FindDSData(rData, FALSE);
-/*M*/ if(!pFound || !pFound->aSelection.getLength())
-/*M*/ rSelStart = -1L;
-/*M*/ else
-/*M*/ {
-/*M*/ pFound->aSelection.getConstArray()[0] >>= rSelStart;
-/*M*/ pFound->aSelection.getConstArray()[pFound->aSelection.getLength() - 1] >>= rSelEnd;
-/*M*/ }
-/*M*/ }
-
-
/*N*/ const SwDBData& SwNewDBMgr::GetAddressDBName()
/*N*/ {
/*N*/ return SW_MOD()->GetDBConfig()->GetAddressSource();
/*N*/ }
-
/*N*/ SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwNewDBMgr& rMgr) :
/*N*/ rDBMgr(rMgr)
/*N*/ {};
diff --git a/binfilter/bf_sw/source/ui/inc/wrtsh.hxx b/binfilter/bf_sw/source/ui/inc/wrtsh.hxx
index c6f8ee3..765f017 100644
--- a/binfilter/bf_sw/source/ui/inc/wrtsh.hxx
+++ b/binfilter/bf_sw/source/ui/inc/wrtsh.hxx
@@ -122,10 +122,6 @@ public:
//Basiscursortravelling
typedef bool (SwWrtShell:: *FNSimpleMove)();
- //setzen des Cursors; merken der alten Position fuer Zurueckblaettern.
- DECL_LINK( ExecFlyMac, void * );
-
-
// Felder Update
BOOL IsNoEdit() const { return bNoEdit; }
diff --git a/binfilter/bf_sw/source/ui/wrtsh/makefile.mk b/binfilter/bf_sw/source/ui/wrtsh/makefile.mk
index d14f54e..e7933f0 100644
--- a/binfilter/bf_sw/source/ui/wrtsh/makefile.mk
+++ b/binfilter/bf_sw/source/ui/wrtsh/makefile.mk
@@ -48,7 +48,6 @@ SRC1FILES = \
SLOFILES = \
$(SLO)$/sw_move.obj \
- $(SLO)$/sw_select.obj \
$(SLO)$/sw_wrtsh1.obj \
$(SLO)$/sw_wrtsh3.obj
diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx
deleted file mode 100644
index 8e786cd..0000000
--- a/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <limits.h>
-
-#include <cmdid.h>
-
-#include <horiornt.hxx>
-
-#include <wrtsh.hxx>
-
-namespace binfilter {
-
-/*N*/ IMPL_LINK( SwWrtShell, ExecFlyMac, void *, EMPTYARG )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/dbmgr.hxx b/binfilter/inc/bf_sw/dbmgr.hxx
index 8452c08..b26b0dc 100644
--- a/binfilter/inc/bf_sw/dbmgr.hxx
+++ b/binfilter/inc/bf_sw/dbmgr.hxx
@@ -229,7 +229,6 @@ public:
// add data source information to the data source array - was PreInitDBData
void AddDSData(const SwDBData& rData, long nSelStart, long nSelEnd);
- void GetDSSelection(const SwDBData& rData, long& rSelStart, long& rSelEnd);
// open the source while fields are updated - for the calculator only!
BOOL OpenDataSource(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1);
diff --git a/binfilter/inc/bf_sw/docsh.hxx b/binfilter/inc/bf_sw/docsh.hxx
index 9ded94b..ff9c9f1 100644
--- a/binfilter/inc/bf_sw/docsh.hxx
+++ b/binfilter/inc/bf_sw/docsh.hxx
@@ -107,9 +107,6 @@ class SwDocShell: public SfxObjectShell, public SfxInPlaceObject,
inline void SetWrtShell(SwWrtShell* pShell)
{ pWrtShell = pShell; }
- void RemoveOLEObjects();
- void CalcLayoutForOLEObjects();
-
void Init_Impl();
DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
diff --git a/binfilter/inc/bf_sw/tox.hxx b/binfilter/inc/bf_sw/tox.hxx
index 2e1066c..b6b8a8e 100644
--- a/binfilter/inc/bf_sw/tox.hxx
+++ b/binfilter/inc/bf_sw/tox.hxx
@@ -251,8 +251,6 @@ public:
inline void SetPattern(USHORT nLevel, const String& rName);
inline const String& GetPattern(USHORT nLevel) const;
- //convert pattern string from old to new format or vice versa
- static String ConvertPatternTo51(const String& rSource);
static String ConvertPatternFrom51(const String& rSource, TOXTypes eType);
// fill tab stop positions from template to pattern
More information about the Libreoffice-commits
mailing list