[Libreoffice-commits] .: 8 commits - binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Aug 15 01:23:06 PDT 2011
binfilter/bf_sc/source/core/data/sc_validat.cxx | 13
binfilter/bf_sc/source/core/tool/sc_rangenam.cxx | 17
binfilter/bf_sc/source/ui/inc/tabview.hxx | 3
binfilter/bf_sc/source/ui/inc/viewdata.hxx | 1
binfilter/bf_sc/source/ui/view/sc_viewdata.cxx | 75 -
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 37
binfilter/bf_svtools/source/filerec/svt_filerec.cxx | 71 -
binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx | 5
binfilter/bf_svtools/source/items/svt_macitem.cxx | 26
binfilter/bf_svtools/source/items1/svt_poolitem.cxx | 8
binfilter/bf_svtools/source/memtools/svt_svarray.cxx | 3
binfilter/bf_svtools/source/misc/svt_urihelper.cxx | 149 --
binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx | 23
binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx | 67 -
binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx | 28
binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx | 30
binfilter/bf_sw/source/core/attr/sw_cellatr.cxx | 15
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 23
binfilter/bf_sw/source/core/doc/sw_doc.cxx | 4
binfilter/bf_sw/source/core/doc/sw_doccorr.cxx | 17
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 164 --
binfilter/bf_sw/source/core/doc/sw_docdraw.cxx | 21
binfilter/bf_sw/source/core/doc/sw_docedt.cxx | 10
binfilter/bf_sw/source/core/doc/sw_docftn.cxx | 10
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 74 -
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 9
binfilter/bf_sw/source/core/doc/sw_docredln.cxx | 9
binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx | 16
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 190 ---
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 2
binfilter/bf_sw/source/core/inc/frame.hxx | 7
binfilter/bf_sw/source/core/inc/frmsh.hxx | 3
binfilter/bf_sw/source/core/inc/layact.hxx | 33
binfilter/bf_sw/source/core/inc/pagefrm.hxx | 2
binfilter/bf_sw/source/core/inc/rootfrm.hxx | 243 ----
binfilter/bf_sw/source/core/inc/viewimp.hxx | 77 -
binfilter/bf_sw/source/core/layout/layhelp.hxx | 4
binfilter/bf_sw/source/core/layout/sw_calcmove.cxx | 5
binfilter/bf_sw/source/core/layout/sw_colfrm.cxx | 4
binfilter/bf_sw/source/core/layout/sw_findfrm.cxx | 22
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 80 -
binfilter/bf_sw/source/core/layout/sw_flycnt.cxx | 4
binfilter/bf_sw/source/core/layout/sw_flylay.cxx | 111 --
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 27
binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx | 58 -
binfilter/bf_sw/source/core/layout/sw_layact.cxx | 368 ------
binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 62 -
binfilter/bf_sw/source/core/layout/sw_newfrm.cxx | 227 ----
binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 554 ----------
binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx | 90 -
binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx | 24
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 40
binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 170 ---
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 8
binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx | 89 -
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 411 -------
binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx | 20
binfilter/bf_sw/source/core/text/sw_redlnitr.cxx | 3
binfilter/bf_sw/source/core/text/sw_txtfld.cxx | 12
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 14
binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx | 11
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 17
binfilter/bf_sw/source/core/view/sw_vdraw.cxx | 139 --
binfilter/bf_sw/source/core/view/sw_viewimp.cxx | 40
binfilter/bf_sw/source/core/view/sw_viewsh.cxx | 78 -
binfilter/bf_sw/source/core/view/sw_vnew.cxx | 10
binfilter/bf_sw/source/core/view/sw_vprint.cxx | 26
binfilter/inc/bf_sc/rangenam.hxx | 2
binfilter/inc/bf_sc/validat.hxx | 1
binfilter/inc/bf_sfx2/docinf.hxx | 1
binfilter/inc/bf_svtools/filerec.hxx | 56 -
binfilter/inc/bf_svtools/macitem.hxx | 1
binfilter/inc/bf_svtools/poolitem.hxx | 10
binfilter/inc/bf_svtools/svstdarr.hxx | 5
binfilter/inc/bf_svtools/urihelper.hxx | 51
binfilter/inc/bf_svx/svdpagv.hxx | 9
binfilter/inc/bf_svx/svdsuro.hxx | 13
binfilter/inc/bf_svx/xtable.hxx | 8
binfilter/inc/bf_sw/cellatr.hxx | 4
binfilter/inc/bf_sw/crsrsh.hxx | 29
binfilter/inc/bf_sw/doc.hxx | 15
binfilter/inc/bf_sw/editsh.hxx | 21
binfilter/inc/bf_sw/fmtflcnt.hxx | 2
binfilter/inc/bf_sw/viewsh.hxx | 10
85 files changed, 34 insertions(+), 4419 deletions(-)
New commits:
commit 3fdcd2578faece26aad554e3ae8b04ff578cfc01
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 15 09:12:33 2011 +0100
ditch some more unused foo
diff --git a/binfilter/bf_svtools/source/misc/svt_urihelper.cxx b/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
index 8d37a28..ab4e8f5 100644
--- a/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
@@ -247,90 +247,6 @@ Result normalizePrefix(
return Success;
}
-rtl::OUString normalize(
- css::uno::Reference< css::ucb::XContentProvider > const & broker,
- css::uno::Reference< css::uri::XUriReferenceFactory > const & uriFactory,
- rtl::OUString const & uriReference)
-{
- // normalizePrefix can potentially fail (a typically example being a file
- // URL that denotes a non-existing resource); in such a case, try to
- // normalize as long a prefix of the given URL as possible (i.e., normalize
- // all the existing directories within the path):
- rtl::OUString normalized;
- sal_Int32 n = uriReference.indexOf('#');
- normalized = n == -1 ? uriReference : uriReference.copy(0, n);
- switch (normalizePrefix(broker, normalized, &normalized)) {
- case Success:
- return n == -1 ? normalized : normalized + uriReference.copy(n);
- case GeneralFailure:
- return uriReference;
- case SpecificFailure:
- default:
- break;
- }
- css::uno::Reference< css::uri::XUriReference > ref(
- uriFactory->parse(uriReference));
- if (!isAbsoluteHierarchicalUriReference(ref)) {
- return uriReference;
- }
- sal_Int32 count = ref->getPathSegmentCount();
- if (count < 2) {
- return uriReference;
- }
- rtl::OUStringBuffer head(ref->getScheme());
- head.append(static_cast< sal_Unicode >(':'));
- if (ref->hasAuthority()) {
- head.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
- head.append(ref->getAuthority());
- }
- for (sal_Int32 i = count - 1; i > 0; --i) {
- rtl::OUStringBuffer buf(head);
- for (sal_Int32 j = 0; j < i; ++j) {
- buf.append(static_cast< sal_Unicode >('/'));
- buf.append(ref->getPathSegment(j));
- }
- normalized = buf.makeStringAndClear();
- if (normalizePrefix(broker, normalized, &normalized) != SpecificFailure)
- {
- buf.append(normalized);
- css::uno::Reference< css::uri::XUriReference > preRef(
- uriFactory->parse(normalized));
- if (!isAbsoluteHierarchicalUriReference(preRef)) {
- // This could only happen if something is inconsistent:
- break;
- }
- sal_Int32 preCount = preRef->getPathSegmentCount();
- // normalizePrefix may have added or removed a final slash:
- if (preCount != i) {
- if (preCount == i - 1) {
- buf.append(static_cast< sal_Unicode >('/'));
- } else if (preCount - 1 == i && buf.getLength() > 0
- && buf.charAt(buf.getLength() - 1) == '/')
- {
- buf.setLength(buf.getLength() - 1);
- } else {
- // This could only happen if something is inconsistent:
- break;
- }
- }
- for (sal_Int32 j = i; j < count; ++j) {
- buf.append(static_cast< sal_Unicode >('/'));
- buf.append(ref->getPathSegment(j));
- }
- if (ref->hasQuery()) {
- buf.append(static_cast< sal_Unicode >('?'));
- buf.append(ref->getQuery());
- }
- if (ref->hasFragment()) {
- buf.append(static_cast< sal_Unicode >('#'));
- buf.append(ref->getFragment());
- }
- return buf.makeStringAndClear();
- }
- }
- return uriReference;
-}
-
}
//============================================================================
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index a67dd11..029ed22 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -227,26 +227,6 @@ using namespace ::com::sun::star::util;
/*N*/ }
-/*?*/ #if defined(DBG_UTIL)
-/*?*/
-/*?*/ void SwCrsrShell::SttCrsrMove()
-/*?*/ {
-/*?*/ OSL_ENSURE( nCrsrMove < USHRT_MAX, "To many nested CrsrMoves." );
-/*?*/ ++nCrsrMove;
-/*?*/ StartAction();
-/*?*/ }
-/*?*/
-/*?*/ void SwCrsrShell::EndCrsrMove( const BOOL bIdleEnd )
-/*?*/ {
-/*?*/ OSL_ENSURE( nCrsrMove, "EndCrsrMove() ohne SttCrsrMove()." );
-/*?*/ EndAction( bIdleEnd );
-/*?*/ if( !--nCrsrMove )
-/*?*/ bInCMvVisportChgd = FALSE;
-/*?*/ }
-/*?*/
-/*?*/ #endif
-
-
/*N*/ void SwCrsrShell::UpdateCrsrPos()
/*N*/ {
/*N*/ SET_CURR_SHELL( this );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
index bed22e6..a20651f 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
@@ -81,33 +81,6 @@ SwFmt* lcl_sw3io__GetUserPoolFmt( USHORT nId, const SvPtrarr* pFmtArr )
return 0;
}
-// Whichwerte werden nach Gruppen gespreizt, so dass die einzelnen
-// Gruppen getrennt um neue Attribute erweitert werden koennen.
-
-// Umwandeln eines normalen Whichwertes in einen gespreizten Wert
-
-/*N*/ USHORT lcl_sw3io__ExpandWhich( USHORT nWhich )
-/*N*/ {
-/*N*/ // #95500#: There is no seperate range for box attributes in the file
-/*N*/ // format, but they are treated as graphic attributes!
-/*N*/ // Since we have extended the range of graphic attributes, we have
-/*N*/ // to move them back to RES_GRFATR_ROTATION, because that's where the
-/*N*/ // box attributes reange started in the 5.2..
-/*N*/ if( nWhich >= RES_BOXATR_BEGIN )
-/*N*/ return (nWhich <= RES_BOXATR_VALUE) ? (nWhich - RES_BOXATR_BEGIN + RES_GRFATR_ROTATION - RES_GRFATR_BEGIN + 0x6000) : 0;
-/*N*/ if( nWhich >= RES_GRFATR_BEGIN )
-/*N*/ return (nWhich <= RES_GRFATR_CROPGRF) ? (nWhich - RES_GRFATR_BEGIN + 0x6000) : 0;
-/*N*/ if( nWhich >= RES_FRMATR_BEGIN )
-/*N*/ return (nWhich <= RES_COLUMNBALANCE) ? (nWhich - RES_FRMATR_BEGIN + 0x5000) : 0;
-/*N*/ if( nWhich >= RES_PARATR_BEGIN )
-/*N*/ return (nWhich <= RES_PARATR_NUMRULE) ? (nWhich - RES_PARATR_BEGIN + 0x4000) : 0;
-/*N*/ if( nWhich >= RES_TXTATR_NOEND_BEGIN )
-/*N*/ return (nWhich <= RES_TXTATR_HARDBLANK) ? (nWhich - RES_TXTATR_NOEND_BEGIN + 0x3000) : 0;
-/*N*/ if( nWhich >= RES_TXTATR_WITHEND_BEGIN )
-/*N*/ return (nWhich <= RES_TXTATR_CHARFMT) ? (nWhich - RES_TXTATR_WITHEND_BEGIN + 0x2000) : 0;
-/*N*/ return (nWhich <= RES_CHRATR_BACKGROUND) ? (nWhich - RES_CHRATR_BEGIN + 0x1000) : 0;
-/*N*/ }
-
// Umwandeln eines gespreizten Whichwertes in den normalen Wert
/*N*/ USHORT lcl_sw3io__CompressWhich( USHORT nWhich, USHORT nVersion )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
index 5c0d45b..2526b60 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
@@ -286,26 +286,6 @@ namespace binfilter {
/*?*/ return NULL;
/*N*/ }
-// OD 27.06.2003 #108784# - method to determine, if frame format is allowed
-// to be exported in SW3IO.
-// Drawing frame formats aren't allowed to be exported.
-bool SwFmtFlyCnt::Sw3ioExportAllowed() const
-{
- bool bSw3ioExportAllowed = true;
-
- if ( RES_DRAWFRMFMT == pFmt->Which() )
- {
- const SwFmtAnchor& rFmtAnchor = pFmt->GetAnchor();
- if ( rFmtAnchor.GetAnchorId() != FLY_PAGE &&
- pFmt->GetDoc()->IsInHeaderFooter( rFmtAnchor.GetCntntAnchor()->nNode ) )
- {
- bSw3ioExportAllowed = false;
- }
- }
-
- return bSw3ioExportAllowed;
-}
-
//////////////////////////////// Text-Attribute ////////////////////////////
/*N*/ SfxPoolItem* SwFmtRefMark::Create( SvStream& rStrm, USHORT ) const
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index 3c88544..b9d471e 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -198,12 +198,6 @@ private:
USHORT nAktNdTyp;
bool bAktSelection;
- /*
- * Mit den Methoden SttCrsrMove und EndCrsrMove wird dieser Zaehler
- * Inc-/Decrementiert. Solange der Zaehler ungleich 0 ist, erfolgt
- * auf den akt. Cursor kein Update. Dadurch koennen "komplizierte"
- * Cursorbewegungen (ueber Find()) realisiert werden.
- */
USHORT nCrsrMove;
USHORT nBasicActionCnt; // Actions, die vom Basic geklammert wurden
CrsrMoveState eMvState; // Status fuers Crsr-Travelling - GetCrsrOfst
@@ -323,29 +317,6 @@ public:
*/
void NormalizePam(BOOL bPointFirst = TRUE);
-
- // erzeuge eine Kopie vom Cursor und speicher diese im Stack
- /*
- * Loescht einen Cursor (gesteuert durch bOldCrsr)
- * - vom Stack oder ( bOldCrsr = TRUE )
- * - den aktuellen und der auf dem Stack stehende wird zum aktuellen
- *
- * Return: es war auf dem Stack noch einer vorhanden
- */
- /*
- * Verbinde zwei Cursor miteinander.
- * Loesche vom Stack den obersten und setzen dessen Mark im Aktuellen.
- */
-
-#if !defined(DBG_UTIL)
- void SttCrsrMove() { ++nCrsrMove; StartAction(); }
- void EndCrsrMove( const BOOL bIdleEnd = FALSE )
- { EndAction( bIdleEnd ); --nCrsrMove; }
-#else
- void SttCrsrMove();
- void EndCrsrMove( const BOOL bIdleEnd = FALSE );
-#endif
-
/*
* Beim Abgeben des Focuses werden die selektierten Bereiche nicht mehr
* angezeigt; andererseits beim Erhalten des Focuses, werden alle selek-
diff --git a/binfilter/inc/bf_sw/editsh.hxx b/binfilter/inc/bf_sw/editsh.hxx
index 20d5dc0..a704045 100644
--- a/binfilter/inc/bf_sw/editsh.hxx
+++ b/binfilter/inc/bf_sw/editsh.hxx
@@ -274,27 +274,6 @@ inline void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt )
inline const SvxLinkManager& SwEditShell::GetLinkManager() const
{ return ((SwEditShell*)this)->GetLinkManager(); }
-/*
- * Klasse fuer den automatisierten Aufruf von Start- und
- * EndAction();
- */
-
-
-/*
- * Klasse fuer den automatisierten Aufruf von Start- und
- * EndCrsrMove();
- */
-class SwMvKontext {
- SwEditShell *pSh;
-public:
- SwMvKontext(SwEditShell *pShell );
- ~SwMvKontext();
-};
-
-#define MV_KONTEXT(x) SwMvKontext _aMvKontext_(x)
-
-
-
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtflcnt.hxx b/binfilter/inc/bf_sw/fmtflcnt.hxx
index e28902e..6276f4c 100644
--- a/binfilter/inc/bf_sw/fmtflcnt.hxx
+++ b/binfilter/inc/bf_sw/fmtflcnt.hxx
@@ -59,8 +59,6 @@ public:
const SwTxtFlyCnt *GetTxtFlyCnt() const { return pTxtAttr; }
SwTxtFlyCnt *GetTxtFlyCnt() { return pTxtAttr; }
-
- bool Sw3ioExportAllowed() const;
};
} //namespace binfilter
commit d29613ad7586d9b98f6afc42bdc9d4f35c095ae7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 15 01:38:31 2011 +0100
GetRootFrm can only be NULL
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 4877dd9..55688a6 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -934,27 +934,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ // ein Redline-Objekt in einer Kopf- oder Fusszeile befindet. Da
/*N*/ // Redlines auch an Start- und Endnodes haengen, muss der Index nicht
/*N*/ // unbedingt der eines Content-Nodes sein.
-/*N*/ SwNode* pNd = &rIdx.GetNode();
-/*N*/ if( pNd->IsCntntNode() && pLayout )
-/*N*/ {
-/*N*/ SwFrm *pFrm = pNd->GetCntntNode()->GetFrm();
-/*N*/ if( pFrm )
-/*N*/ {
-/*N*/ SwFrm *pUp = pFrm->GetUpper();
-/*N*/ while ( pUp && !pUp->IsHeaderFrm() && !pUp->IsFooterFrm() )
-/*N*/ {
-/*N*/ if ( pUp->IsFlyFrm() )
-/*N*/ pUp = ((SwFlyFrm*)pUp)->GetAnchor();
-/*N*/ pUp = pUp->GetUpper();
-/*N*/ }
-/*N*/ if ( pUp )
-/*N*/ return sal_True;
-/*N*/
-/*N*/ return sal_False;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/
+/*N*/ const SwNode* pNd = &rIdx.GetNode();
/*N*/ const SwNode* pFlyNd = pNd->FindFlyStartNode();
/*N*/ while( pFlyNd )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index eb6281e..9d78d28 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -132,7 +132,6 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ , pBookmarkTbl( new SwBookmarks( 0, 16 ) )
/*N*/ , pTOXTypes( new SwTOXTypes() )
/*N*/ , pDefTOXBases( new SwDefTOXBase_Impl() )
-/*N*/ , pLayout( 0 ) // Rootframe des spezifischen Layouts.
/*N*/ , pDrawModel( 0 )
/*N*/ , pUpdtFlds( new SwDocUpdtFld() )
/*N*/ , pFldTypes( new SwFldTypes() )
@@ -335,7 +334,6 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ // damit die Fussnotenattribute die Fussnotennodes in Frieden lassen.
/*N*/ bDtor = TRUE;
/*N*/
-/*N*/ DELETEZ( pLayout );
/*N*/ DELETEZ( pOutlineRule );
/*N*/
/*N*/ delete pRedlineTbl;
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 3ec5ea8..363feba 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -777,169 +777,9 @@ void SwDrawContact::RemoveMasterFromDrawPage()
|*
|*************************************************************************/
-void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
+void SwDrawContact::ConnectToLayout( const SwFmtAnchor* /*pAnch*/ )
{
- SwFrmFmt* pDrawFrmFmt = (SwFrmFmt*)pRegisteredIn;
-
- SwRootFrm* pRoot = pDrawFrmFmt->GetDoc()->GetRootFrm();
- if ( !pRoot )
- {
- return;
- }
-
- // remove 'virtual' drawing objects from writer
- // layout and from drawing page, and remove 'master' drawing object from
- // writer layout - 'master' object will remain in drawing page.
- DisconnectFromLayout( false );
-
- if ( !pAnch )
- {
- pAnch = &(pDrawFrmFmt->GetAnchor());
- }
-
- bool bSetAnchorPos = true;
-
- switch ( pAnch->GetAnchorId() )
- {
- case FLY_PAGE:
- {
- USHORT nPgNum = pAnch->GetPageNum();
- SwPageFrm *pPage3 = static_cast<SwPageFrm*>(pRoot->Lower());
-
- for ( USHORT i = 1; i < nPgNum && pPage3; ++i )
- {
- pPage3 = static_cast<SwPageFrm*>(pPage3->GetNext());
- }
-
- if ( pPage3 )
- {
- bSetAnchorPos = false;
- pPage3->SwFrm::AppendDrawObj( this );
- }
- }
- break;
-
- case FLY_AUTO_CNTNT:
- case FLY_AT_CNTNT:
- case FLY_AT_FLY:
- case FLY_IN_CNTNT:
- {
- if ( pAnch->GetAnchorId() == FLY_IN_CNTNT )
- {
- ClrContourCache( GetMaster() );
- }
- // support drawing objects in header/footer, but not control
- // objects: anchor at first found frame the 'master' object and
- // at the following frames 'virtual' drawing objects.
- // Note: method is similar to <SwFlyFrmFmt::MakeFrms(..)>
- SwModify *pModify = 0;
- if( pAnch->GetCntntAnchor() )
- {
- if ( pAnch->GetAnchorId() == FLY_AT_FLY )
- {
- SwNodeIndex aIdx( pAnch->GetCntntAnchor()->nNode );
- SwCntntNode* pCNd = pDrawFrmFmt->GetDoc()->GetNodes().GoNext( &aIdx );
- SwClientIter aIter( *pCNd );
- if ( aIter.First( TYPE(SwFrm) ) )
- pModify = pCNd;
- else
- {
- const SwNodeIndex& rIdx = pAnch->GetCntntAnchor()->nNode;
- SwSpzFrmFmts& rFmts = *(pDrawFrmFmt->GetDoc()->GetSpzFrmFmts());
- for( sal_uInt16 i = 0; i < rFmts.Count(); ++i )
- {
- SwFrmFmt* pFlyFmt = rFmts[i];
- if( pFlyFmt->GetCntnt().GetCntntIdx() &&
- rIdx == *(pFlyFmt->GetCntnt().GetCntntIdx()) )
- {
- pModify = pFlyFmt;
- break;
- }
- }
- }
- }
- else
- {
- pModify = pAnch->GetCntntAnchor()->nNode.GetNode().GetCntntNode();
- }
- }
- SwClientIter aIter( *pModify );
- SwFrm* pAnchorFrmOfMaster = 0;
- for( SwFrm *pFrm = (SwFrm*)aIter.First( TYPE(SwFrm) );
- pFrm;
- pFrm = (SwFrm*)aIter.Next() )
- {
- // append drawing object, if
- // (1) proposed anchor frame isn't a follow and
- // (2) drawing object isn't a control object to be anchored
- // in header/footer.
- const bool bAdd = ( !pFrm->IsCntntFrm() ||
- !((SwCntntFrm*)pFrm)->IsFollow() ) &&
- ( !CheckControlLayer( GetMaster() ) ||
- !pFrm->FindFooterOrHeader() );
-
- if( bAdd )
- {
- if ( FLY_AT_FLY == pAnch->GetAnchorId() && !pFrm->IsFlyFrm() )
- {
- pFrm = pFrm->FindFlyFrm();
- }
-
- if ( !pAnchorFrmOfMaster )
- {
- // check, if 'master' drawing
- // objects is inserted into drawing page. If not,
- // assert and insert 'master' drawing object.
- if ( !GetMaster()->IsInserted() )
- {
- // debug assert
- OSL_FAIL( "<SwDrawContact::ConnectToLayout(..)> - master drawing object not inserted!?" );
-
- pDrawFrmFmt->GetDoc()->GetDrawModel()->GetPage(0)->
- InsertObject( GetMaster(), GetMaster()->GetOrdNumDirect() );
- }
- // append 'master' drawing object
- pAnchorFrmOfMaster = pFrm;
- pFrm->AppendDrawObj( this );
- }
- else
- {
- // append 'virtual' drawing object
- SwDrawVirtObj* pDrawVirtObj = AddVirtObj();
- if ( pAnch->GetAnchorId() == FLY_IN_CNTNT )
- {
- ClrContourCache( pDrawVirtObj );
- }
- pFrm->AppendVirtDrawObj( this, pDrawVirtObj );
- pDrawVirtObj->SendRepaintBroadcast();
- }
-
- if ( pAnch->GetAnchorId() == FLY_IN_CNTNT )
- {
- pFrm->InvalidatePrt();
- }
-
- bSetAnchorPos = false;
- }
- }
- }
- break;
- default:
- break;
- }
- if ( GetAnchor() )
- {
- if( bSetAnchorPos )
- {
- GetMaster()->SetAnchorPos( GetAnchor()->GetFrmAnchorPos( ::binfilter::HasWrap( GetMaster() ) ) );
- }
- if ( !pDrawFrmFmt->GetDoc()->IsVisibleLayerId( GetMaster()->GetLayer() ) )
- {
- SdrLayerID nVisibleLayerId =
- pDrawFrmFmt->GetDoc()->GetVisibleLayerIdByInvisibleOne( GetMaster()->GetLayer() );
- GetMaster()->SetLayer( nVisibleLayerId );
- }
- }
+ return;
}
// method in order to correct relative positioning of
diff --git a/binfilter/bf_sw/source/core/inc/frame.hxx b/binfilter/bf_sw/source/core/inc/frame.hxx
index 5263134..adb086a 100644
--- a/binfilter/bf_sw/source/core/inc/frame.hxx
+++ b/binfilter/bf_sw/source/core/inc/frame.hxx
@@ -550,7 +550,7 @@ public:
SwFrm *GetNext() { return pNext; }
SwFrm *GetPrev() { return pPrev; }
SwLayoutFrm *GetUpper() { return pUpper; }
- SwRootFrm *FindRootFrm();
+ const SwRootFrm *FindRootFrm() const { return NULL; }
SwPageFrm *FindPageFrm();
SwFrm *FindColFrm();
SwFtnBossFrm *FindFtnBossFrm( BOOL bFootnotes = FALSE );
@@ -571,7 +571,6 @@ public:
inline SwCntntFrm *FindNextCnt();
inline SwFrm *FindPrev();
inline const SwPageFrm *FindPageFrm() const;
- inline const SwRootFrm *FindRootFrm() const;
inline const SwFtnBossFrm *FindFtnBossFrm( BOOL bFtn = FALSE ) const;
inline const SwFrm *FindColFrm() const;
inline const SwFrm *FindFooterOrHeader() const;
@@ -889,10 +888,6 @@ inline const SwPageFrm *SwFrm::FindPageFrm() const
{
return ((SwFrm*)this)->FindPageFrm();
}
-inline const SwRootFrm *SwFrm::FindRootFrm() const
-{
- return ((SwFrm*)this)->FindRootFrm();
-}
inline const SwFrm *SwFrm::FindColFrm() const
{
return ((SwFrm*)this)->FindColFrm();
diff --git a/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx
index 373ec77..4dd1ae1 100644
--- a/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx
@@ -347,28 +347,6 @@ SwCntntFrm *SwPageFrm::FindLastBodyCntnt()
/*N*/ return pLayoutFrm;
/*N*/ }
-/*************************************************************************
-|*
-|* SwFrm::FindRootFrm(), FindTabFrm(), FindFtnFrm(), FindFlyFrm(),
-|* FindPageFrm(), FindColFrm()
-|*
-|*************************************************************************/
-/*N*/ SwRootFrm* SwFrm::FindRootFrm()
-/*N*/ {
-/*N*/ // MIB: A layout frame is always registerd at a SwFrmFmt and a content
-/*N*/ // frame alyways at a SwCntntNode. For any other case we won't find
-/*N*/ // a root frame.
-/*N*/ // Casting the GetDep() result instead of the frame itself (that has
-/*N*/ // been done before) makes it save to use that method in constructors
-/*N*/ // and destructors.
-/*N*/ OSL_ENSURE( GetDep(), "frame is not registered any longer" );
-/*N*/ OSL_ENSURE( IsLayoutFrm() || IsCntntFrm(), "invalid frame type" );
-/*N*/ SwDoc *pDoc = IsLayoutFrm()
-/*N*/ ? static_cast < SwFrmFmt * >( GetDep() )->GetDoc()
-/*N*/ : static_cast < SwCntntNode * >( GetDep() )->GetDoc();
-/*N*/ return pDoc->GetRootFrm();
-/*N*/ }
-
/*N*/ SwPageFrm* SwFrm::FindPageFrm()
/*N*/ {
/*N*/ SwFrm *pRet = this;
diff --git a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
index fd57f5e..50dc54c 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
@@ -427,7 +427,7 @@ namespace binfilter {
/*?*/ if( FLY_PAGE == pAnch->GetAnchorId() )
/*?*/ {
/*?*/ USHORT nPgNum = pAnch->GetPageNum();
-/*?*/ SwRootFrm *pRoot = FindRootFrm();
+/*?*/ const SwRootFrm *pRoot = FindRootFrm();
/*?*/ SwPageFrm *pPage1 = (SwPageFrm*)pRoot->Lower();
/*?*/ for ( USHORT i = 1; (i <= nPgNum) && pPage1; ++i,
/*?*/ pPage1 = (SwPageFrm*)pPage1->GetNext() )
diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
index 1516cb9..9495bd8 100644
--- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
@@ -667,12 +667,7 @@ namespace binfilter {
/*N*/ //er die Retouche uebernehmen.
/*N*/ //Ausserdem kann eine Leerseite entstanden sein.
/*N*/ else
-/*N*/ { SwRootFrm *pRoot = FindRootFrm();
-/*N*/ if ( pRoot )
-/*N*/ {
-/*N*/ GetUpper()->SetCompletePaint();
-/*N*/ GetUpper()->InvalidatePage( pPage );
-/*N*/ }
+/*N*/ {
/*N*/ if( IsInSct() )
/*N*/ {
/*N*/ SwSectionFrm* pSct = FindSctFrm();
diff --git a/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx b/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
index 1254187..0a4a8b9 100644
--- a/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
@@ -67,8 +67,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ void SwAttrIter::CtorInit( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm )
/*N*/ {
/*N*/ // Beim HTML-Import kann es vorkommen, dass kein Layout existiert.
-/*N*/ SwRootFrm *pRootFrm = rTxtNode.GetDoc()->GetRootFrm();
-/*N*/ pShell = pRootFrm ? pRootFrm->GetShell() : 0;
+/*N*/ pShell = 0;
/*N*/
/*N*/ pScriptInfo = &rScrInf;
/*N*/ pAttrSet = &rTxtNode.GetSwAttrSet();
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index bdf7a80..aba0785 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -429,7 +429,7 @@ bool bInSizeNotify = FALSE;
/*N*/ SwRootFrm *ViewShell::GetLayout() const
/*N*/ {
-/*N*/ return GetDoc()->GetRootFrm();
+/*N*/ return NULL;
/*N*/ }
/*N*/ OutputDevice& ViewShell::GetRefDev() const
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 1cd39c1..2888c78 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -276,7 +276,6 @@ class SwDoc
SwTOXTypes *pTOXTypes; // Verzeichnisse
SwDefTOXBase_Impl * pDefTOXBases; // defaults of SwTOXBase's
- SwRootFrm *pLayout; // Rootframe des spezifischen Layouts.
SdrModel *pDrawModel; // StarView Drawing
SwDocUpdtFld *pUpdtFlds; // Struktur zum Field-Update
@@ -489,10 +488,7 @@ public:
const SvxLinkManager& GetLinkManager() const { return *pLinkMgr; }
// erfrage das spezifische Layout
- const SwRootFrm* GetRootFrm() const { return pLayout; }
- SwRootFrm* GetRootFrm() { return pLayout; }
- // der alte muss !! von der Shell geloescht werden !!
- void SetRootFrm( SwRootFrm* pNew ) { pLayout = pNew; }
+ const SwRootFrm* GetRootFrm() const { return NULL; }
void StartIdleTimer() { aIdleTimer.Start(); }
void StopIdleTimer() { aIdleTimer.Stop(); }
commit 90cf8d0aa04eee5a0f794cd5be354c2b615bcbc0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 14 22:00:01 2011 +0100
SwLayIdle cannot be constructed, remove logical consequences of that
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
index 813ce81..f9d09e8 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
@@ -77,20 +77,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ XGradientEntry* XGradientTable::Replace(long nIndex, XGradientEntry* pEntry )
-/*N*/ {
-/*N*/ return (XGradientEntry*) XPropertyTable::Replace(nIndex, pEntry);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XGradientEntry* XGradientTable::Remove(long nIndex)
-/*N*/ {
-/*N*/ return (XGradientEntry*) XPropertyTable::Remove(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ XGradientEntry* XGradientTable::Get(long nIndex) const
/*N*/ {
/*N*/ return (XGradientEntry*) XPropertyTable::Get(nIndex, 0);
@@ -156,20 +142,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ XGradientEntry* XGradientList::Replace(XGradientEntry* pEntry, long nIndex )
-/*N*/ {
-/*N*/ return( (XGradientEntry*) XPropertyList::Replace( pEntry, nIndex ) );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XGradientEntry* XGradientList::Remove(long nIndex)
-/*N*/ {
-/*N*/ return( (XGradientEntry*) XPropertyList::Remove( nIndex, 0 ) );
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ XGradientEntry* XGradientList::Get(long nIndex) const
/*N*/ {
/*N*/ return( (XGradientEntry*) XPropertyList::Get( nIndex, 0 ) );
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index b58c6e2..a67dd11 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -409,9 +409,6 @@ using namespace ::com::sun::star::util;
/*M*/ &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() );
/*M*/ } while( !pFrm );
/*M*/ }
-/*M*/ else if ( Imp()->IsIdleAction() )
-/*M*/ //Wir stellen sicher, dass anstaendig Formatiert wurde #42224#
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*M*/
/*M*/ // im geschuetzten Fly? aber bei Rahmenselektion ignorieren
/*M*/ if( !IsReadOnlyAvailable() && pFrm->IsProtected() &&
diff --git a/binfilter/bf_sw/source/core/inc/layact.hxx b/binfilter/bf_sw/source/core/inc/layact.hxx
index 5d16036..81c1a0c 100644
--- a/binfilter/bf_sw/source/core/inc/layact.hxx
+++ b/binfilter/bf_sw/source/core/inc/layact.hxx
@@ -202,36 +202,6 @@ public:
void CheckWaitCrsr();
};
-class SwLayIdle
-{
-
- SwRootFrm *pRoot;
- SwViewImp *pImp; // Hier Meldet sich der Idler an und ab.
- SwCntntNode *pCntntNode; // Hier wird die aktuelle Cursorposition
- xub_StrLen nTxtPos; // zwischengespeichert.
- BOOL bPageValid; // Konnte die Seite alles validiert werden?
- BOOL bAllValid; // Konnte alles validiert werden?
-
-#ifdef DBG_UTIL
- BOOL bIndicator;
-#endif
-
-#ifdef _LAYACT_CXX
-
-#ifdef DBG_UTIL
- void ShowIdle( ColorData eName );
-#endif
-
- BOOL _CollectAutoCmplWords( const SwCntntFrm *, BOOL bOnlyVisArea );
- BOOL CollectAutoCmplWords( BOOL );
-
-#endif
-
-public:
- SwLayIdle( SwRootFrm *pRt, SwViewImp *pImp );
- ~SwLayIdle();
-};
-
inline void SwLayAction::SetCheckPageNum( USHORT nNew )
{
if ( nNew < nCheckPageNum )
diff --git a/binfilter/bf_sw/source/core/inc/viewimp.hxx b/binfilter/bf_sw/source/core/inc/viewimp.hxx
index 38f2f47..711289c 100644
--- a/binfilter/bf_sw/source/core/inc/viewimp.hxx
+++ b/binfilter/bf_sw/source/core/inc/viewimp.hxx
@@ -50,7 +50,6 @@ class SwScrollAreas;
class SwScrollColumn;
class SwFrm;
class SwLayAction;
-class SwLayIdle;
class SwDrawView;
class SdrPageView;
class SwPageFrm;
@@ -73,7 +72,6 @@ class SwViewImp
friend class ViewShell;
friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus.
- friend class SwLayIdle;
// for paint of page preview
friend class SwPagePreviewLayout;
@@ -93,7 +91,6 @@ class SwViewImp
SwLayAction *pLayAct; //Ist gesetzt wenn ein Action-Objekt existiert
//Wird vom SwLayAction-CTor ein- und vom DTor
//ausgetragen.
- SwLayIdle *pIdleAct; //Analog zur SwLayAction fuer SwLayIdle.
#ifdef ACCESSIBLE_LAYOUT
#endif
@@ -192,11 +189,8 @@ public:
//SS Fuer die Lay- bzw. IdleAction und verwandtes
BOOL IsAction() const { return pLayAct != 0; }
- BOOL IsIdleAction() const { return pIdleAct != 0; }
SwLayAction &GetLayAction() { return *pLayAct; }
const SwLayAction &GetLayAction() const { return *pLayAct; }
- SwLayIdle &GetIdleAction() { return *pIdleAct;}
- const SwLayIdle &GetIdleAction() const { return *pIdleAct;}
//Wenn eine Aktion laueft wird diese gebeten zu pruefen ob es
//an der zeit ist den WaitCrsr einzuschalten.
diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
index 80cc66a..36fbdf3 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
@@ -2151,185 +2151,6 @@ namespace binfilter {
/*N*/
/*N*/ return bResult;
/*N*/ }
-
-/*N*/ #ifdef DBG_UTIL
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-
-/*************************************************************************
-|*
-|* void SwLayIdle::SwLayIdle()
-|*
-|*************************************************************************/
-/*N*/ void SwLayIdle::ShowIdle( ColorData eName )
-/*N*/ {
-/*N*/ if ( !bIndicator )
-/*N*/ {
-/*N*/ bIndicator = TRUE;
-/*N*/ Window *pWin = pImp->GetShell()->GetWin();
-/*N*/ if ( pWin )
-/*N*/ {
-/*N*/ Rectangle aRect( 0, 0, 5, 5 );
-/*N*/ aRect = pWin->PixelToLogic( aRect );
-/*N*/ pWin->Push( PUSH_FILLCOLOR );
-/*N*/ pWin->SetFillColor( eName );
-/*N*/ pWin->DrawRect( aRect );
-/*N*/ pWin->Pop();
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ #define SHOW_IDLE( ColorData ) ShowIdle( ColorData )
-/*N*/ #else
-/*N*/ #define SHOW_IDLE( ColorData )
-/*N*/ #endif
-/*N*/ #else
-/*N*/ #define SHOW_IDLE( ColorData )
-/*N*/ #endif
-
-/*************************************************************************
-|*
-|* void SwLayIdle::SwLayIdle()
-|*
-|*************************************************************************/
-/*N*/ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
-/*N*/ pRoot( pRt ),
-/*N*/ pImp( pI )
-/*N*/ #ifdef DBG_UTIL
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ , bIndicator( FALSE )
-/*N*/ #endif
-/*N*/ #endif
-/*N*/ {
-/*N*/ pImp->pIdleAct = this;
-/*N*/
-/*N*/ SHOW_IDLE( COL_LIGHTRED );
-/*N*/
-/*N*/ pImp->GetShell()->EnableSmooth( FALSE );
-/*N*/
-/*N*/ //Zuerst den Sichtbaren Bereich Spellchecken, nur wenn dort nichts
-/*N*/ //zu tun war wird das IdleFormat angestossen.
-/*N*/ {
-/*N*/ //Formatieren und ggf. Repaint-Rechtecke an der ViewShell vormerken.
-/*N*/ //Dabei muessen kuenstliche Actions laufen, damit es z.B. bei
-/*N*/ //Veraenderungen der Seitenzahl nicht zu unerwuenschten Effekten kommt.
-/*N*/ //Wir merken uns bei welchen Shells der Cursor sichtbar ist, damit
-/*N*/ //wir ihn bei Dokumentaenderung ggf. wieder sichbar machen koennen.
-/*N*/ SvBools aBools;
-/*N*/ ViewShell *pSh = pImp->GetShell();
-/*N*/ do
-/*N*/ { ++pSh->nStartAction;
-/*N*/ BOOL bVis = FALSE;
-/*N*/ if ( pSh->ISA(SwCrsrShell) )
-/*N*/ {
-/*N*/ #ifdef SW_CRSR_TIMER
-/*N*/ ((SwCrsrShell*)pSh)->ChgCrsrTimerFlag( FALSE );
-/*N*/ #endif
-/*N*/ bVis = ((SwCrsrShell*)pSh)->GetCharRect().IsOver(pSh->VisArea());
-/*N*/ }
-/*N*/ aBools.Insert( bVis, aBools.Count() );
-/*N*/ pSh = (ViewShell*)pSh->GetNext();
-/*N*/ } while ( pSh != pImp->GetShell() );
-/*N*/
-/*N*/ SwLayAction aAction( pRoot, pImp );
-/*N*/ aAction.SetInputType( INPUT_ANY );
-/*N*/ aAction.SetIdle( TRUE );
-/*N*/ aAction.SetWaitAllowed( FALSE );
-/*N*/ aAction.Action();
-/*N*/
-/*N*/ //Weitere Start-/EndActions nur auf wenn irgendwo Paints aufgelaufen
-/*N*/ //sind oder wenn sich die Sichtbarkeit des CharRects veraendert hat.
-/*N*/ bool bActions = FALSE;
-/*N*/ USHORT nBoolIdx = 0;
-/*N*/ do
-/*N*/ { --pSh->nStartAction;
-/*N*/
-/*N*/ if ( pSh->Imp()->GetRegion() || pSh->Imp()->GetScrollRects() )
-/*?*/ bActions = TRUE;
-/*N*/ else
-/*N*/ {
-/*N*/ SwRect aTmp( pSh->VisArea() );
-/*N*/ pSh->UISizeNotify();
-/*N*/
-/*N*/ bActions |= aTmp != pSh->VisArea() ||
-/*N*/ aBools[nBoolIdx] !=
-/*N*/ ((SwCrsrShell*)pSh)->GetCharRect().IsOver(pSh->VisArea());
-/*N*/ }
-/*N*/
-/*N*/ pSh = (ViewShell*)pSh->GetNext();
-/*N*/ ++nBoolIdx;
-/*N*/ } while ( pSh != pImp->GetShell() );
-/*N*/
-/*N*/ if ( bActions )
-/*N*/ {
-/*?*/ //Start- EndActions aufsetzen. ueber die CrsrShell, damit der
-/*?*/ //Cursor/Selektion und die VisArea korrekt gesetzt werden.
-/*?*/ nBoolIdx = 0;
-/*?*/ do
-/*?*/ { bool bCrsrShell = pSh->IsA( TYPE(SwCrsrShell) );
-/*?*/
-/*?*/ if ( bCrsrShell )
-/*?*/ ((SwCrsrShell*)pSh)->SttCrsrMove();
-/*?*/
-/*?*/ //Wenn Paints aufgelaufen sind, ist es am sinnvollsten schlicht das
-/*?*/ //gesamte Window zu invalidieren. Anderfalls gibt es Paintprobleme
-/*?*/ //deren Loesung unverhaeltnissmaessig aufwendig waere.
-/*?*/ //fix(18176):
-/*?*/ SwViewImp *pImp1 = pSh->Imp();
-/*?*/ bool bUnlock = FALSE;
-/*?*/ if ( pImp1->GetRegion() || pImp1->GetScrollRects() )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
-/*?*/ if ( bCrsrShell )
-/*?*/ //Wenn der Crsr sichbar war wieder sichbar machen, sonst
-/*?*/ //EndCrsrMove mit TRUE fuer IdleEnd.
-/*?*/ ((SwCrsrShell*)pSh)->EndCrsrMove( TRUE^aBools[nBoolIdx] );
-/*?*/ if( bUnlock )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
-/*?*/ pSh = (ViewShell*)pSh->GetNext();
-/*?*/ ++nBoolIdx;
-/*?*/
-/*?*/ } while ( pSh != pImp->GetShell() );
-/*N*/ }
-/*N*/
-/*N*/ bool bInValid;
-/*N*/ pImp->GetShell()->GetViewOptions();
-/*N*/ SwPageFrm *pPg = (SwPageFrm*)pRoot->Lower();
-/*N*/ do
-/*N*/ { bInValid = pPg->IsInvalidCntnt() || pPg->IsInvalidLayout() ||
-/*N*/ pPg->IsInvalidFlyCntnt() || pPg->IsInvalidFlyLayout() ||
-/*N*/ pPg->IsInvalidFlyInCnt();
-/*N*/
-/*N*/ pPg = (SwPageFrm*)pPg->GetNext();
-/*N*/
-/*N*/ } while ( pPg && TRUE^bInValid );
-/*N*/ }
-/*N*/
-/*N*/ pImp->GetShell()->EnableSmooth( TRUE );
-/*N*/
-/*N*/ #ifdef ACCESSIBLE_LAYOUT
-/*N*/ #endif
-/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ if ( bIndicator && pImp->GetShell()->GetWin() )
-/*N*/ {
-/*N*/ Rectangle aRect( 0, 0, 5, 5 );
-/*N*/ aRect = pImp->GetShell()->GetWin()->PixelToLogic( aRect );
-/*N*/ pImp->GetShell()->GetWin()->Invalidate( aRect );
-/*N*/ }
-/*N*/ #endif
-/*N*/ #endif
-/*N*/ }
-
-/*N*/ SwLayIdle::~SwLayIdle()
-/*N*/ {
-/*N*/ pImp->pIdleAct = 0;
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index c636c30..48c047d 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -499,8 +499,6 @@ class XGradientTable : public XPropertyTable
public:
virtual ~XGradientTable();
- XGradientEntry* Replace(long nIndex, XGradientEntry* pEntry );
- XGradientEntry* Remove(long nIndex);
XGradientEntry* Get(long nIndex) const;
virtual BOOL Load();
@@ -532,8 +530,6 @@ public:
USHORT nReSize = 16 );
virtual ~XGradientList();
- XGradientEntry* Replace(XGradientEntry* pEntry, long nIndex );
- XGradientEntry* Remove(long nIndex);
XGradientEntry* Get(long nIndex) const;
virtual BOOL Load();
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index 997591e..869dd31 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -62,7 +62,6 @@ class SwViewOption;
class SwViewImp;
class SwPrtOptions;
class SwPagePreViewPrtData;
-class SwLayIdle;
struct ShellResource;
class SwRegionRects;
class SwFrm;
@@ -86,7 +85,6 @@ class ViewShell : public Ring
Window *pWin, sal_uInt16 nZoom );
friend class SwViewImp;
- friend class SwLayIdle;
// OD 12.12.2002 #103492# - for setting visible area for page preview paint
friend class SwPagePreviewLayout;
commit 859e46b9ebcb69ae114a529640b290a23222678e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 14 21:49:27 2011 +0100
callcatcher: strip freshly unused layer of methods
diff --git a/binfilter/bf_sc/source/ui/inc/tabview.hxx b/binfilter/bf_sc/source/ui/inc/tabview.hxx
index e31b2de..f3cb90a 100644
--- a/binfilter/bf_sc/source/ui/inc/tabview.hxx
+++ b/binfilter/bf_sc/source/ui/inc/tabview.hxx
@@ -187,11 +187,8 @@ protected:
void DrawEnableAnim(BOOL bSet);
- void MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE );
-
void HideNoteMarker();
-
public:
ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell );
ScTabView( Window* pParent, const ScTabView& rScTabView, ScTabViewShell* pViewShell );
diff --git a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
index 07c69a0..656f550 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
@@ -223,14 +223,6 @@ bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString)
//============================================================================
// static
-void SfxPoolItem::writeByteString(SvStream & rStream,
- UniString const & rString)
-{
- rStream.WriteByteString(rString);
-}
-
-//============================================================================
-// static
bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString,
bool bUnicode)
{
diff --git a/binfilter/bf_svtools/source/misc/svt_urihelper.cxx b/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
index 0433fff..8d37a28 100644
--- a/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
@@ -333,52 +333,6 @@ rtl::OUString normalize(
}
-css::uno::Reference< css::uri::XUriReference >
-normalizedMakeRelative(
- css::uno::Reference< css::uno::XComponentContext > const & context,
- rtl::OUString const & baseUriReference, rtl::OUString const & uriReference)
-{
- OSL_ASSERT(context.is());
- css::uno::Reference< css::lang::XMultiComponentFactory > componentFactory(
- context->getServiceManager());
- if (!componentFactory.is()) {
- throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "component context has no service manager")),
- css::uno::Reference< css::uno::XInterface >());
- }
- css::uno::Sequence< css::uno::Any > args(2);
- args[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
- args[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
- css::uno::Reference< css::ucb::XContentProvider > broker;
- try {
- broker = css::uno::Reference< css::ucb::XContentProvider >(
- componentFactory->createInstanceWithArgumentsAndContext(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ucb.UniversalContentBroker")),
- args, context),
- css::uno::UNO_QUERY_THROW);
- } catch (css::uno::RuntimeException &) {
- throw;
- } catch (css::uno::Exception &) {
- css::uno::Any exception(cppu::getCaughtException());
- throw css::lang::WrappedTargetRuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "creating com.sun.star.ucb.UniversalContentBroker failed")),
- css::uno::Reference< css::uno::XInterface >(),
- exception);
- }
- css::uno::Reference< css::uri::XUriReferenceFactory > uriFactory(
- css::uri::UriReferenceFactory::create(context));
- return uriFactory->makeRelative(
- uriFactory->parse(normalize(broker, uriFactory, baseUriReference)),
- uriFactory->parse(normalize(broker, uriFactory, uriReference)), true,
- true, false);
-}
-
//============================================================================
//
// FindFirstURLInText
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx b/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx
index 3c770fc..dc9e97b 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx
@@ -70,62 +70,6 @@ namespace binfilter {
/*N*/ nPageNum=0;
/*N*/ }
-/*N*/ void SdrObjSurrogate::ImpMakeSurrogate()
-/*N*/ {
-/*N*/ if (pObj!=NULL) { // ansonsten bleibt eList=SDROBJLIST_UNKNOWN, weil Obj=NULL
-/*N*/ bool bSameList=FALSE;
-/*N*/ bool bSamePage=FALSE;
-/*N*/ pModel=pObj->GetModel();
-/*N*/ pList=pObj->GetObjList();
-/*N*/ pRootList=pList;
-/*N*/ pPage=pObj->GetPage();
-/*N*/ nOrdNum=pObj->GetOrdNum();
-/*N*/ DBG_ASSERT(pModel!=NULL,"ImpMakeSurrogate(): Zielobjekt hat kein Model");
-/*N*/ DBG_ASSERT(pList!=NULL,"ImpMakeSurrogate(): Zielobjekt hat keine ObjList");
-/*N*/ if (pModel!=NULL && pList!=NULL) {
-/*N*/ if (pRefObj!=NULL) {
-/*N*/ if (pList==pRefObj->GetObjList()) bSameList=TRUE;
-/*N*/ else if (pPage!=NULL && pPage==pRefObj->GetPage()) bSamePage=TRUE;
-/*N*/ }
-/*N*/ if (!bSameList) {
-/*N*/ //if (eList==SDROBJLIST_UNKNOWN) eList=pList->GetListKind();
-/*N*/ SdrObjList* pL=pList->GetUpList();
-/*N*/ nGrpLevel=0;
-/*N*/ while (pL!=NULL) { pL=pL->GetUpList(); nGrpLevel++; }
-/*N*/ if (nGrpLevel!=0) { DBG_BF_ASSERT(0, "STRIP");
-/*N*/ } // if (nGrpLevel!=0)
-/*N*/ } // if (eList!=SDROBJLIST_SAMELIST)
-/*N*/ if (bSameList) eList=SDROBJLIST_SAMELIST;
-/*N*/ else if (bSamePage) eList=SDROBJLIST_SAMEPAGE;
-/*N*/ else eList=pRootList->GetListKind();
-/*N*/ if (eList==SDROBJLIST_GROUPOBJ || eList==SDROBJLIST_UNKNOWN) {
-/*?*/ if (pGrpOrdNums!=NULL) {
-/*?*/ delete [] pGrpOrdNums;
-/*?*/ pGrpOrdNums=NULL;
-/*?*/ nGrpLevel=0;
-/*?*/ }
-/*?*/ eList=SDROBJLIST_UNKNOWN;
-/*?*/ return;
-/*N*/ }
-/*N*/ if (SdrIsPageKind(eList)) {
-/*N*/ if (pPage!=NULL) {
-/*N*/ nPageNum=pPage->GetPageNum();
-/*N*/ } else {
-/*?*/ OSL_FAIL("ImpMakeSurrogate(): eList ist eine Page, aber pPage==NULL");
-/*?*/ if (pGrpOrdNums!=NULL) {
-/*?*/ delete [] pGrpOrdNums;
-/*?*/ pGrpOrdNums=NULL;
-/*?*/ nGrpLevel=0;
-/*N*/ }
-/*N*/ eList=SDROBJLIST_UNKNOWN;
-/*N*/ return;
-/*N*/ }
-/*N*/ }
-/*N*/ // so, nun ist alles beisammen und kann gestreamt werden.
-/*N*/ } // if (pModel!=NULL && pList!=NULL)
-/*N*/ } // if (pObj!=NULL)
-/*N*/ }
-
/*N*/ void SdrObjSurrogate::ImpWriteValue(SvStream& rOut, UINT32 nVal, unsigned nByteAnz) const
/*N*/ {
/*N*/ switch (nByteAnz) {
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
index 0c49eb3..41f361d 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
@@ -75,20 +75,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ XHatchEntry* XHatchTable::Replace(long nIndex, XHatchEntry* pEntry )
-/*N*/ {
-/*N*/ return (XHatchEntry*) XPropertyTable::Replace(nIndex, pEntry);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XHatchEntry* XHatchTable::Remove(long nIndex)
-/*N*/ {
-/*N*/ return (XHatchEntry*) XPropertyTable::Remove(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ XHatchEntry* XHatchTable::Get(long nIndex) const
/*N*/ {
/*N*/ return (XHatchEntry*) XPropertyTable::Get(nIndex, 0);
@@ -152,22 +138,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ if( pXFSet ) delete pXFSet;
/*N*/ }
-/************************************************************************/
-
-/*N*/ XHatchEntry* XHatchList::Replace(XHatchEntry* pEntry, long nIndex )
-/*N*/ {
-/*N*/ return (XHatchEntry*) XPropertyList::Replace(pEntry, nIndex);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XHatchEntry* XHatchList::Remove(long nIndex)
-/*N*/ {
-/*N*/ return (XHatchEntry*) XPropertyList::Remove(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ XHatchEntry* XHatchList::Get(long nIndex) const
/*N*/ {
/*N*/ return (XHatchEntry*) XPropertyList::Get(nIndex, 0);
diff --git a/binfilter/bf_sw/source/core/inc/viewimp.hxx b/binfilter/bf_sw/source/core/inc/viewimp.hxx
index c1e1932..38f2f47 100644
--- a/binfilter/bf_sw/source/core/inc/viewimp.hxx
+++ b/binfilter/bf_sw/source/core/inc/viewimp.hxx
@@ -189,7 +189,6 @@ public:
const SwDrawView* GetDrawView() const { return pDrawView; }
SdrPageView*GetPageView() { return pSdrPageView; }
const SdrPageView*GetPageView() const { return pSdrPageView; }
- void MakeDrawView();
//SS Fuer die Lay- bzw. IdleAction und verwandtes
BOOL IsAction() const { return pLayAct != 0; }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 02d3c77..60f7c6f 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -584,7 +584,6 @@ public:
// SW3FMTS.CXX
SfxPoolItem* InAttr( xub_StrLen&, xub_StrLen&,
const SwTxtNode *pTxtNd=0 );// I: Attribut
- void OutAttr( const SfxPoolItem&, xub_StrLen nBgn, xub_StrLen nEnd );
void InAttrSet( SwAttrSet& rSet ); // I: AttrSet
SwFmt* InFormat( BYTE cKind, SwFmt* ); // I: Format
void InFlyFrames(); // I: globale FlyFrames
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
index d9d3843..bed22e6 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
@@ -226,68 +226,6 @@ sal_Bool lcl_sw3io_insFtn( const SwTxtNode *pTxtNd )
/*N*/ return pItem;
/*N*/ }
-// Schreiben eines Attributs
-
-/*N*/ void Sw3IoImp::OutAttr( const SfxPoolItem& rAttr, xub_StrLen nBgn,
-/*N*/ xub_StrLen nEnd )
-/*N*/ {
-/*N*/ USHORT nWhich = rAttr.Which();
-/*N*/
-/*N*/ // Items, die als Version USHRT_MAX zurueckgeben, wollen nicht
-/*N*/ // geschrieben werden
-/*N*/ long nFFVersion = pStrm->GetVersion();
-/*N*/ OSL_ENSURE( IsSw31Export() ? nFFVersion==SOFFICE_FILEFORMAT_31
-/*N*/ : (nFFVersion==SOFFICE_FILEFORMAT_40 ||
-/*N*/ nFFVersion==SOFFICE_FILEFORMAT_50),
-/*N*/ "FF-Version am Stream stimmt nicht" );
-/*N*/ USHORT nIVer = rAttr.GetVersion( (USHORT)nFFVersion );
-/*N*/ if( USHRT_MAX == nIVer )
-/*N*/ return;
-/*N*/
-/*N*/ // Das Zeichen-Hintergrund-Attribut gab es in der 3.1 auch noch nicht
-/*N*/ if( IsSw31Export() && RES_CHRATR_BACKGROUND==nWhich)
-/*N*/ return;
-/*N*/
-/*N*/ // Hints that start behind the maximum string length of version 5.2
-/*N*/ // don't have to be exported.
-/*N*/
-/*N*/ if( nWhich != RES_TXTATR_FTN || nFlyLevel == 0 )
-/*N*/ {
-/*N*/ nWhich = lcl_sw3io__ExpandWhich( nWhich );
-/*N*/ // disable export of drawing frame format in header/footer.
-/*N*/ bool bExport = true;
-/*N*/ {
-/*N*/ if ( RES_TXTATR_FLYCNT == rAttr.Which() )
-/*N*/ {
-/*N*/ bExport = static_cast<const SwFmtFlyCnt&>(rAttr).Sw3ioExportAllowed();
-/*N*/ }
-/*N*/ }
-/*N*/ if( bExport && nWhich )
-/*N*/ {
-/*N*/
-/*N*/ OpenRec( SWG_ATTRIBUTE );
-/*N*/ BYTE cFlags = 0x04; // Which + Version
-/*N*/ if( nBgn != STRING_LEN )
-/*N*/ cFlags += 0x12; // Begin
-/*N*/ if( nEnd != nBgn && nBgn != STRING_LEN )
-/*N*/ cFlags += 0x22; // End
-/*N*/ *pStrm << (BYTE) cFlags
-/*N*/ << (UINT16) nWhich
-/*N*/ << (UINT16) nIVer;
-/*N*/ if( cFlags & 0x10 )
-/*N*/ *pStrm << (UINT16) nBgn;
-/*N*/ if( cFlags & 0x20 )
-/*N*/ *pStrm << (UINT16) nEnd;
-/*N*/ rAttr.Store( *pStrm, nIVer );
-/*N*/ CloseRec( SWG_ATTRIBUTE );
-/*N*/ }
-/*N*/ }
-/*N*/ #ifdef DBG_UTIL
-/*N*/ else
-/*N*/ OSL_ENSURE( !this, "Fussnoten im Fly sind nicht erlaubt" );
-/*N*/ #endif
-/*N*/ }
-
// Einlesen eines AttrSets
/*N*/ void Sw3IoImp::InAttrSet( SwAttrSet& rSet )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 60d9e01..ae436f1 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -126,7 +126,6 @@ public:
SwInsHardBlankSoftHyph() {}
~SwInsHardBlankSoftHyph();
void AddItem( xub_StrLen nPos, sal_Unicode c );
- void ChangePos( xub_StrLen nHtEnd, xub_StrLen nOffs );
};
/*N*/ sal_Char Sw3IoImp::ConvStarSymbolCharToStarBats( sal_Unicode c )
@@ -1145,15 +1144,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ aItems.C40_INSERT( SfxPoolItem, pItem, nInsPos );
/*N*/ }
/*N*/ }
-/*N*/ void SwInsHardBlankSoftHyph::ChangePos( xub_StrLen nHtEnd, xub_StrLen nOffs )
-/*N*/ {
-/*N*/ for( USHORT n = 0, nCnt = aItemStarts.Count(); n < nCnt; ++n )
-/*N*/ {
-/*?*/ xub_StrLen& rStt = aItemStarts[ n ];
-/*?*/ if( rStt >= nHtEnd )
-/*?*/ rStt -= nOffs;
-/*N*/ }
-/*N*/ }
// nOffset ist ungleich Null, wenn innerhalb eines Nodes eingefuegt werden
// soll. Dann ist nOffset die Start-Position des Textes.
diff --git a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx
index 7731d91..447eb53 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx
@@ -158,14 +158,6 @@ namespace binfilter {
/*N*/ }
/*N*/ bFirstPageInvalid = FALSE;
/*N*/ }
-
-/******************************************************************************
-|*
-|* SwViewImp::MakeDrawView();
-|*
-******************************************************************************/
-
-/*N*/ void SwViewImp::MakeDrawView() { }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svtools/poolitem.hxx b/binfilter/inc/bf_svtools/poolitem.hxx
index 37d644b..3de9456 100644
--- a/binfilter/inc/bf_svtools/poolitem.hxx
+++ b/binfilter/inc/bf_svtools/poolitem.hxx
@@ -239,16 +239,6 @@ public:
*/
static bool readByteString(SvStream & rStream, UniString & rString);
- /** Write a byte string representation of a Unicode string into a stream.
-
- @param rStream Some (output) stream. Its Stream/TargetCharSets must
- be set to correct values!
-
- @param rString Some Unicode string.
- */
- static void writeByteString(SvStream & rStream,
- UniString const & rString);
-
/** Read in a Unicode string from either a streamed Unicode or byte string
representation.
diff --git a/binfilter/inc/bf_svtools/urihelper.hxx b/binfilter/inc/bf_svtools/urihelper.hxx
index bb50328..131d428 100644
--- a/binfilter/inc/bf_svtools/urihelper.hxx
+++ b/binfilter/inc/bf_svtools/urihelper.hxx
@@ -80,32 +80,6 @@ SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
//============================================================================
Link GetMaybeFileHdl();
-/**
- Converts a URI reference to a relative one, ignoring certain differences (for
- example, treating file URLs for case-ignoring file systems
- case-insensitively).
-
- @param context a component context; must not be null
-
- @param baseUriReference a base URI reference
-
- @param uriReference a URI reference
-
- @return a URI reference representing the given uriReference relative to the
- given baseUriReference; if the given baseUriReference is not an absolute,
- hierarchical URI reference, or the given uriReference is not a valid URI
- reference, null is returned
-
- @exception std::bad_alloc if an out-of-memory condition occurs
-
- @exception com::sun::star::uno::RuntimeException if any error occurs
- */
- com::sun::star::uno::Reference< com::sun::star::uri::XUriReference >
-normalizedMakeRelative(
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
- const & context,
- rtl::OUString const & baseUriReference, rtl::OUString const & uriReference);
-
//============================================================================
UniString
FindFirstURLInText(UniString const & rText,
diff --git a/binfilter/inc/bf_svx/svdsuro.hxx b/binfilter/inc/bf_svx/svdsuro.hxx
index 16cf6f8..0c6d571 100644
--- a/binfilter/inc/bf_svx/svdsuro.hxx
+++ b/binfilter/inc/bf_svx/svdsuro.hxx
@@ -56,7 +56,6 @@ protected:
#if _SOLAR__PRIVATE
private:
void ImpClearVars();
- void ImpMakeSurrogate();
void ImpFindObj();
void ImpRead(SvStream& rIn);
void ImpWriteValue(SvStream& rOut, UINT32 nVal, unsigned nByteAnz) const;
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index 2e2d461..c636c30 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -446,8 +446,6 @@ class XHatchTable : public XPropertyTable
public:
virtual ~XHatchTable();
- XHatchEntry* Replace(long nIndex, XHatchEntry* pEntry );
- XHatchEntry* Remove(long nIndex);
XHatchEntry* Get(long nIndex) const;
virtual BOOL Load();
@@ -479,8 +477,6 @@ public:
USHORT nReSize = 16 );
~XHatchList();
- XHatchEntry* Replace(XHatchEntry* pEntry, long nIndex );
- XHatchEntry* Remove(long nIndex);
XHatchEntry* Get(long nIndex) const;
virtual BOOL Load();
commit c01caacd60a71aaa0b04072dfeb90dccaebbe06e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 14 01:39:46 2011 +0100
ByteString::IsNumericAscii->comphelper::string::isAsciiDecimalString
shrink ByteString api, remove need for intermediate OString/ByteString
with random-ish encoding solely for check
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
index ab90ca7..ec17f1b 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
@@ -30,6 +30,7 @@
#include <tools/config.hxx>
#include <bf_svtools/filter.hxx>
+#include <comphelper/string.hxx>
#include "sgffilt.hxx"
#include "sgfbram.hxx"
#include "sgvmain.hxx"
@@ -1204,7 +1205,7 @@ void SgfFontOne::ReadOne( ByteString& ID, ByteString& Dsc )
else if ( s.CompareTo( "MAC", 3 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
else if ( s.CompareTo( "SYMBOL", 6 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_SYMBOL;
else if ( s.CompareTo( "SYSTEM", 6 ) == COMPARE_EQUAL ) SVChSet = gsl_getSystemTextEncoding();
- else if ( s.IsNumericAscii() ) SVWidth=sal::static_int_cast< USHORT >(s.ToInt32());
+ else if ( comphelper::string::isAsciiDecimalString(s) ) SVWidth=sal::static_int_cast< USHORT >(s.ToInt32());
}
}
}
@@ -1263,7 +1264,7 @@ void SgfFontLst::ReadList()
FID = aCfg.GetKeyName( i );
FID = FID.EraseAllChars(); // Leerzeichen weg
Dsc = aCfg.ReadKey( i );
- if ( FID.IsNumericAscii() )
+ if ( comphelper::string::isAsciiDecimalString(FID) )
{
P=new SgfFontOne; // neuer Eintrag
if (Last!=NULL) Last->Next=P; else pList=P; Last=P; // einklinken
commit 56718d9b871bc2601bf10993b43ac95d5a94b59b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 13 23:25:29 2011 +0100
SvByteStringsSortDtor is now finally gone
diff --git a/binfilter/bf_svtools/source/memtools/svt_svarray.cxx b/binfilter/bf_svtools/source/memtools/svt_svarray.cxx
index e93cf83..25e2b67 100644
--- a/binfilter/bf_svtools/source/memtools/svt_svarray.cxx
+++ b/binfilter/bf_svtools/source/memtools/svt_svarray.cxx
@@ -89,9 +89,6 @@ SV_IMPL_OP_PTRARR_SORT( SvStringsSort, StringPtr )
SV_IMPL_OP_PTRARR_SORT( SvStringsSortDtor, StringPtr )
SV_IMPL_PTRARR( SvByteStrings, ByteStringPtr )
-SV_IMPL_OP_PTRARR_SORT( SvByteStringsSortDtor, ByteStringPtr )
-
-
// ---------------- strings -------------------------------------
diff --git a/binfilter/inc/bf_svtools/svstdarr.hxx b/binfilter/inc/bf_svtools/svstdarr.hxx
index e28fa82..4ff866e 100644
--- a/binfilter/inc/bf_svtools/svstdarr.hxx
+++ b/binfilter/inc/bf_svtools/svstdarr.hxx
@@ -145,11 +145,6 @@ SV_DECL_PTRARR_VISIBILITY( SvByteStrings, ByteStringPtr, 1, 1, )
#define _SVSTDARR_BYTESTRINGS_DECL
#endif
-#ifndef _SVSTDARR_BYTESTRINGSSORTDTOR_DECL
-SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvByteStringsSortDtor, ByteStringPtr, 1, 1, )
-#define _SVSTDARR_BYTESTRINGSSORTDTOR_DECL
-#endif
-
#ifndef _SVSTDARR_XUB_STRLEN_DECL
SV_DECL_VARARR_VISIBILITY( SvXub_StrLens, xub_StrLen, 1, 1, )
#define _SVSTDARR_XUB_STRLEN_DECL
commit 60c1a6ae0ca5877530656d9a9377c400267e85c6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 13 22:53:25 2011 +0100
callcatcher: reduce further
diff --git a/binfilter/bf_sc/source/core/data/sc_validat.cxx b/binfilter/bf_sc/source/core/data/sc_validat.cxx
index cb948f2..022f15a 100644
--- a/binfilter/bf_sc/source/core/data/sc_validat.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_validat.cxx
@@ -237,25 +237,12 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void ScValidationDataList::ResetUsed()
-/*N*/ {
-/*N*/ USHORT nCount = Count();
-/*N*/ for (USHORT i=0; i<nCount; i++)
-/*N*/ (*this)[i]->SetUsed(FALSE);
-/*N*/ }
-
/*N*/ void ScValidationDataList::CompileXML()
/*N*/ {
/*N*/ USHORT nCount = Count();
/*N*/ for (USHORT i=0; i<nCount; i++)
/*N*/ (*this)[i]->CompileXML();
/*N*/ }
-
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
index 770319a..109034a 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
@@ -145,23 +145,6 @@ namespace binfilter {
/*N*/ rHdr.EndEntry();
/*N*/ }
-/*N*/ BOOL ScRangeData::IsBeyond( USHORT nMaxRow ) const
-/*N*/ {
-/*N*/ if ( aPos.Row() > nMaxRow )
-/*N*/ return TRUE;
-/*N*/
-/*N*/ ScToken* t;
-/*N*/ pCode->Reset();
-/*N*/ while (( t = pCode->GetNextReference() ))
-/*N*/ if ( t->GetSingleRef().nRow > nMaxRow ||
-/*N*/ (t->GetType() == svDoubleRef &&
-/*N*/ t->GetDoubleRef().Ref2.nRow > nMaxRow) )
-/*N*/ return TRUE;
-/*N*/
-/*N*/ return FALSE;
-/*N*/ }
-
-
/*N*/ void ScRangeData::GetSymbol (String& rSymbol) const
/*N*/ {
/*N*/ ScCompiler aScComp(pDoc, aPos, *pCode);
diff --git a/binfilter/bf_sc/source/ui/inc/viewdata.hxx b/binfilter/bf_sc/source/ui/inc/viewdata.hxx
index 7c14393..9f622db 100644
--- a/binfilter/bf_sc/source/ui/inc/viewdata.hxx
+++ b/binfilter/bf_sc/source/ui/inc/viewdata.hxx
@@ -191,7 +191,6 @@ public:
ScDocShell* GetDocShell() const { return pDocShell; }
ScMarkData& GetMarkData() { return aMarkData; }
- void WriteUserData(String& rData);
void ReadUserData(const String& rData); // #116578#
void WriteUserDataSequence(::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue>& rSettings);
void ReadUserDataSequence(const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue>& rSettings); // #116578#
diff --git a/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx b/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx
index ea6b8c1..e5e706d 100644
--- a/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx
+++ b/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx
@@ -383,81 +383,6 @@ void ScViewData::SetTabNo( USHORT nNewTab )
#define SC_OLD_TABSEP '/'
#define SC_NEW_TABSEP '+'
-// #116578# WriteUserData must not access pView
-/*N*/ void ScViewData::WriteUserData(String& rData)
-/*N*/ {
-/*N*/ // nZoom (bis 364v) oder nZoom/nPageZoom/bPageMode (ab 364w)
-/*N*/ // nTab
-/*N*/ // Tab-ControlBreite
-/*N*/ // pro Tabelle:
-/*N*/ // CursorX/CursorY/HSplitMode/VSplitMode/HSplitPos/VSplitPos/SplitActive/
-/*N*/ // PosX[links]/PosX[rechts]/PosY[oben]/PosY[unten]
-/*N*/ // wenn Zeilen groesser 8192, "+" statt "/"
-/*N*/
-/*N*/ USHORT nZoom = (USHORT)((aZoomY.GetNumerator() * 100) / aZoomY.GetDenominator());
-/*N*/ rData = String::CreateFromInt32( nZoom );
-/*N*/ rData += '/';
-/*N*/ nZoom = (USHORT)((aPageZoomY.GetNumerator() * 100) / aPageZoomY.GetDenominator());
-/*N*/ rData += String::CreateFromInt32( nZoom );
-/*N*/ rData += '/';
-/*N*/ if (bPagebreak)
-/*N*/ rData += '1';
-/*N*/ else
-/*N*/ rData += '0';
-/*N*/
-/*N*/ rData += ';';
-/*N*/ rData += String::CreateFromInt32( nTabNo );
-/*N*/ rData += ';';
-/*N*/ rData.AppendAscii(RTL_CONSTASCII_STRINGPARAM( TAG_TABBARWIDTH ));
-/*N*/ rData += String::CreateFromInt32( nTabBarWidth ); // #116578#
-/*N*/
-/*N*/ USHORT nTabCount = pDoc->GetTableCount();
-/*N*/ for (USHORT i=0; i<nTabCount; i++)
-/*N*/ {
-/*N*/ rData += ';'; // Numerierung darf auf keinen Fall durcheinanderkommen
-/*N*/ if (pTabData[i])
-/*N*/ {
-/*N*/ sal_Unicode cTabSep = SC_OLD_TABSEP; // wie 3.1
-/*N*/ if ( pTabData[i]->nCurY > MAXROW_30 ||
-/*N*/ pTabData[i]->nPosY[0] > MAXROW_30 || pTabData[i]->nPosY[1] > MAXROW_30 ||
-/*N*/ ( pTabData[i]->eVSplitMode == SC_SPLIT_FIX &&
-/*N*/ pTabData[i]->nFixPosY > MAXROW_30 ) )
-/*N*/ {
-/*N*/ cTabSep = SC_NEW_TABSEP; // um eine 3.1-Version nicht umzubringen
-/*N*/ }
-/*N*/
-/*N*/
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nCurX );
-/*N*/ rData += cTabSep;
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nCurY );
-/*N*/ rData += cTabSep;
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->eHSplitMode );
-/*N*/ rData += cTabSep;
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->eVSplitMode );
-/*N*/ rData += cTabSep;
-/*N*/ if ( pTabData[i]->eHSplitMode == SC_SPLIT_FIX )
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nFixPosX );
-/*N*/ else
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nHSplitPos );
-/*N*/ rData += cTabSep;
-/*N*/ if ( pTabData[i]->eVSplitMode == SC_SPLIT_FIX )
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nFixPosY );
-/*N*/ else
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nVSplitPos );
-/*N*/ rData += cTabSep;
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->eWhichActive );
-/*N*/ rData += cTabSep;
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nPosX[0] );
-/*N*/ rData += cTabSep;
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nPosX[1] );
-/*N*/ rData += cTabSep;
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nPosY[0] );
-/*N*/ rData += cTabSep;
-/*N*/ rData += String::CreateFromInt32( pTabData[i]->nPosY[1] );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
// #116578# ReadUserData is needed, must not access pView
void ScViewData::ReadUserData(const String& rData)
{
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index 0a5bf9c..77d49f6 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -603,43 +603,6 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ return bOK;
/*N*/ }
-//-------------------------------------------------------------------------
-/*N*/ BOOL SfxDocumentInfo::SavePropertySet( SvStorage *pStorage) const
-/*N*/ {
-/*N*/ SfxPS_Impl* pPS = new SfxPS_Impl;
-/*N*/ SvStorageStreamRef aStrPropSet = pStorage->OpenStream(
-/*N*/ String::CreateFromAscii( pPropSlot ), STREAM_TRUNC | STREAM_STD_WRITE );
-/*N*/ if ( !aStrPropSet.Is() )
-/*N*/ {
-/*N*/ DBG_ERRORFILE( "can not open the property set" );
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/
-/*N*/ pPS->SetSectionName( SvGlobalName(
-/*N*/ 0xf29f85e0, 0x4ff9, 0x1068, 0xab, 0x91, 0x08, 0x00, 0x2b, 0x27, 0xb3, 0xd9 ) );
-/*N*/ pPS->AddProperty( new SfxPSStringProperty_Impl( PID_TITLE, GetTitle() ) );
-/*N*/ pPS->AddProperty( new SfxPSStringProperty_Impl( PID_SUBJECT, GetTheme() ) );
-/*N*/ pPS->AddProperty( new SfxPSStringProperty_Impl( PID_KEYWORDS, GetKeywords() ) );
-/*N*/ pPS->AddProperty( new SfxPSStringProperty_Impl( PID_TEMPLATE, GetTemplateName() ) );
-/*N*/ pPS->AddProperty( new SfxPSStringProperty_Impl( PID_COMMENTS, GetComment() ) );
-/*N*/ pPS->AddProperty( new SfxPSStringProperty_Impl( PID_AUTHOR, GetCreated().GetName() ) );
-/*N*/ pPS->AddProperty( new SfxPSStringProperty_Impl( PID_LASTAUTHOR, GetChanged().GetName() ) );
-/*N*/ pPS->AddProperty( new SfxPSDateTimeProperty_Impl( PID_CREATE_DTM, GetCreated().GetTime() ) );
-/*N*/ pPS->AddProperty( new SfxPSDateTimeProperty_Impl( PID_LASTSAVED_DTM, GetChanged().GetTime() ) );
-/*N*/ if ( GetPrinted().GetTime() != GetCreated().GetTime() )
-/*N*/ pPS->AddProperty( new SfxPSDateTimeProperty_Impl( PID_LASTPRINTED_DTM, GetPrinted().GetTime() ) );
-/*N*/ DateTime aEditTime( Date( 1, 1, 1601 ), Time( GetTime() ) );
-/*N*/ aEditTime.ConvertToLocalTime();
-/*N*/ pPS->AddProperty( new SfxPSDateTimeProperty_Impl( PID_EDITTIME, aEditTime ) );
-/*N*/ pPS->AddProperty( new SfxPSStringProperty_Impl(
-/*N*/ PID_REVNUMBER, String::CreateFromInt32( GetDocumentNumber() ) ) );
-/*N*/ pPS->AddProperty( new SfxPSCodePageProperty_Impl( RTL_TEXTENCODING_UTF8 ));
-/*N*/ pPS->Save( *aStrPropSet );
-/*N*/ delete pPS;
-/*N*/ return ( aStrPropSet->GetErrorCode() == 0 );
-/*N*/ }
-
-//-------------------------------------------------------------------------
/*N*/ BOOL SfxDocumentInfo::Load(SvStorage* pStorage)
/*N*/ {
/*N*/ #ifdef DBG_UTIL
diff --git a/binfilter/bf_svtools/source/filerec/svt_filerec.cxx b/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
index ec1f7ef..2ee22bc 100644
--- a/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
+++ b/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
@@ -479,34 +479,6 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter
//-------------------------------------------------------------------------
-SfxMultiVarRecordWriter::SfxMultiVarRecordWriter
-(
- SvStream* pStream, // Stream, in dem der Record angelegt wird
- UINT16 nRecordTag, // Gesamt-Art-Kennung
- BYTE nRecordVer // Gesamt-Versions-Kennung
-)
-
-/* [Beschreibung]
-
- Legt in 'pStream' einen 'SfxMultiVarRecord' an, dessen Content-Gr"o\sen
- weder bekannt sind noch identisch sein m"ussen, sondern jeweils nach dem
- Streamen jedes einzelnen Contents errechnet werden sollen.
-
-
- [Anmerkung]
-
- Diese Methode ist nicht inline, da f"ur die Initialisierung eines
- <SvULongs>-Members zu viel Code generiert werden w"urde.
-*/
-
-: SfxMultiFixRecordWriter( SFX_REC_TYPE_VARSIZE,
- pStream, nRecordTag, nRecordVer, 0 ),
- _nContentVer( 0 )
-{
-}
-
-//-------------------------------------------------------------------------
-
SfxMultiVarRecordWriter::~SfxMultiVarRecordWriter()
/* [Beschreibung]
@@ -541,22 +513,6 @@ void SfxMultiVarRecordWriter::FlushContent_Impl()
//-------------------------------------------------------------------------
-void SfxMultiVarRecordWriter::NewContent()
-
-// siehe <SfxMultiFixRecordWriter>
-
-{
- // schon ein Content geschrieben?
- if ( _nContentCount )
- FlushContent_Impl();
-
- // neuen Content beginnen
- _nContentStartPos = _pStream->Tell();
- ++_nContentCount;
-}
-
-//-------------------------------------------------------------------------
-
UINT32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec )
// siehe <SfxMiniRecordWriter>
@@ -603,33 +559,6 @@ UINT32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec )
//=========================================================================
-void SfxMultiMixRecordWriter::NewContent
-(
- UINT16 nContentTag, // Kennung f"ur die Art des Contents
- BYTE nContentVer // Kennung f"ur die Version des Contents
-)
-
-/* [Beschreibung]
-
- Mit dieser Methode wird in den Record ein neuer Content eingef"ugt
- und dessen Content-Tag sowie dessen Content-Version angegeben. Jeder,
- auch der 1. Record mu\s durch Aufruf dieser Methode eingeleitet werden.
-*/
-
-{
- // ggf. vorherigen Record abschlie\sen
- if ( _nContentCount )
- FlushContent_Impl();
-
- // Tag vor den Content schreiben, Version und Startposition merken
- _nContentStartPos = _pStream->Tell();
- ++_nContentCount;
- *_pStream << nContentTag;
- _nContentVer = nContentVer;
-}
-
-//=========================================================================
-
bool SfxMultiRecordReader::ReadHeader_Impl()
/* [Beschreibung]
diff --git a/binfilter/bf_svtools/source/items/svt_macitem.cxx b/binfilter/bf_svtools/source/items/svt_macitem.cxx
index ff3b9b1..46fdbd3 100644
--- a/binfilter/bf_svtools/source/items/svt_macitem.cxx
+++ b/binfilter/bf_svtools/source/items/svt_macitem.cxx
@@ -130,32 +130,6 @@ SvStream& SvxMacroTableDtor::Read( SvStream& rStrm, USHORT nVersion )
return rStrm;
}
-
-SvStream& SvxMacroTableDtor::Write( SvStream& rStream ) const
-{
- USHORT nVersion = SOFFICE_FILEFORMAT_31 == rStream.GetVersion()
- ? SVX_MACROTBL_VERSION31
- : SVX_MACROTBL_AKTVERSION;
-
- if( SVX_MACROTBL_VERSION40 <= nVersion )
- rStream << nVersion;
-
- rStream << (USHORT)Count();
-
- SvxMacro* pMac = ((SvxMacroTableDtor*)this)->First();
- while( pMac && rStream.GetError() == SVSTREAM_OK )
- {
- rStream << (short)GetCurKey();
- SfxPoolItem::writeByteString(rStream, pMac->GetLibName());
- SfxPoolItem::writeByteString(rStream, pMac->GetMacName());
-
- if( SVX_MACROTBL_VERSION40 <= nVersion )
- rStream << (USHORT)pMac->GetScriptType();
- pMac = ((SvxMacroTableDtor*)this)->Next();
- }
- return rStream;
-}
-
// -----------------------------------------------------------------------
void SvxMacroTableDtor::DelDtor()
diff --git a/binfilter/bf_svtools/source/misc/svt_urihelper.cxx b/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
index 2b27184..0433fff 100644
--- a/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
@@ -379,25 +379,6 @@ normalizedMakeRelative(
true, false);
}
-rtl::OUString simpleNormalizedMakeRelative(
- rtl::OUString const & baseUriReference, rtl::OUString const & uriReference)
-{
- com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > rel(
- normalizedMakeRelative(
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >(
- (com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertySet >(
- comphelper::getProcessServiceFactory(),
- com::sun::star::uno::UNO_QUERY_THROW)->
- getPropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("DefaultContext")))),
- com::sun::star::uno::UNO_QUERY_THROW),
- baseUriReference, uriReference));
- return rel.is() ? rel->getUriReference() : uriReference;
-}
-
//============================================================================
//
// FindFirstURLInText
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx
index 3d95e47..4d95245 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx
@@ -683,29 +683,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
-#ifdef OS2
-#define RGBCOLOR(r,g,b) ((ULONG)(((BYTE)(b) | ((USHORT)(g)<<8)) | (((ULONG)(BYTE)(r))<<16)))
-#endif
-
-/*N*/ bool SdrPageView::IsLayer(const XubString& rName, const SetOfByte& rBS) const
-/*N*/ {
-/*N*/ if(!pPage)
-/*N*/ return FALSE;
-/*N*/
-/*N*/ BOOL bRet(FALSE);
-/*N*/
-/*N*/ if(rName.Len())
-/*N*/ {
-/*N*/ SdrLayerID nId = pPage->GetLayerAdmin().GetLayerID(rName, TRUE);
-/*N*/
-/*N*/ if(nId != SDRLAYER_NOTFOUND)
-/*N*/ {
-/*N*/ bRet = rBS.IsSet(nId);
-/*N*/ }
-/*N*/ }
-/*N*/ return bRet;
-/*N*/ }
-
/*N*/ bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
/*N*/ {
/*N*/ if(pObj)
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx b/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx
index bfe7cab..3c770fc 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx
@@ -33,17 +33,6 @@
namespace binfilter {
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// fuer Schreiben
-/*N*/ SdrObjSurrogate::SdrObjSurrogate(SdrObject* pObj1, const SdrObject* pRefObj1)
-/*N*/ {
-/*N*/ ImpClearVars();
-/*N*/ pObj=pObj1;
-/*N*/ pRefObj=pRefObj1;
-/*N*/ ImpMakeSurrogate();
-/*N*/ }
-
// fuer Lesen
/*N*/ SdrObjSurrogate::SdrObjSurrogate(const SdrModel& rMod, SvStream& rIn)
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx b/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx
index f3671a6..91ca7f3 100644
--- a/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx
@@ -123,21 +123,6 @@ namespace binfilter {
return pRet;
/*N*/ }
-
-SwTableBox* SwTblBoxFormula::GetTableBox()
-{
- SwTableBox* pBox = 0;
- if( pDefinedIn )
- pBox = (SwTableBox*)SwClientIter( *pDefinedIn ).
- First( TYPE( SwTableBox ));
- return pBox;
-}
-
-/*************************************************************************
-|*
-*************************************************************************/
-
-
/*N*/ SwTblBoxValue::SwTblBoxValue()
/*N*/ : SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
index 9978b15..4ae4de3 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
@@ -490,16 +490,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*?*/ return sal_True;
/*N*/ }
-// liefert sal_True zurueck, wenn es weitergehen soll.
-/*N*/ sal_Bool SwDoc::Replace( SwPaM& /*rPam*/, const String& /*rStr*/, sal_Bool /*bRegExpRplc*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return sal_True;
-/*N*/ }
-
- // speicher die akt. Werte fuer die automatische Aufnahme von Ausnahmen
- // in die Autokorrektur
-
/*N*/ sal_Bool SwDoc::DelFullPara( SwPaM& rPam )
/*N*/ {
/*N*/ const SwPosition &rStt = *rPam.Start(), &rEnd = *rPam.End();
diff --git a/binfilter/bf_sw/source/core/inc/layact.hxx b/binfilter/bf_sw/source/core/inc/layact.hxx
index cd0ca51..5d16036 100644
--- a/binfilter/bf_sw/source/core/inc/layact.hxx
+++ b/binfilter/bf_sw/source/core/inc/layact.hxx
@@ -134,8 +134,6 @@ class SwLayAction
const SwPageFrm* pPage );
BOOL IsShortCut( SwPageFrm *& );
- BOOL TurboAction();
- BOOL _TurboAction( const SwCntntFrm * );
void InternalAction();
SwPageFrm *CheckFirstVisPage( SwPageFrm *pPage );
diff --git a/binfilter/bf_sw/source/core/inc/rootfrm.hxx b/binfilter/bf_sw/source/core/inc/rootfrm.hxx
index fec242b..1ef2ab7 100644
--- a/binfilter/bf_sw/source/core/inc/rootfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/rootfrm.hxx
@@ -75,9 +75,6 @@ class SwRootFrm : public SwLayoutFrm
static BOOL bNoVirDev; //Bei SystemPaints kein virt. Device
public:
- //MasterObjekte aus der Page entfernen (von den Ctoren gerufen).
- static void RemoveMasterObjs( SdrPage *pPg );
-
static BOOL IsInPaint() { return bInPaint; }
static void SetNoVirDev( const BOOL bNew ) { bNoVirDev = bNew; }
};
diff --git a/binfilter/bf_sw/source/core/inc/viewimp.hxx b/binfilter/bf_sw/source/core/inc/viewimp.hxx
index 4761f15..c1e1932 100644
--- a/binfilter/bf_sw/source/core/inc/viewimp.hxx
+++ b/binfilter/bf_sw/source/core/inc/viewimp.hxx
@@ -191,21 +191,6 @@ public:
const SdrPageView*GetPageView() const { return pSdrPageView; }
void MakeDrawView();
- // add 3rd parameter <const Color* pPageBackgrdColor> for setting this
- // color as the background color at the outliner of the draw view
- // for painting layers <hell> and <heaven>
- // add 4th parameter for the horizontal text
- // direction of the page in order to set the default horizontal text
- // direction at the outliner of the draw view for painting layers <hell>
- // and <heaven>.
- // correct type of 1st parameter
-
- //wird als Link an die DrawEngine uebergeben, entscheidet was wie
- //gepaintet wird oder nicht.
-
- // Interface Drawing
- void NotifySizeChg( const Size &rNewSz );
-
//SS Fuer die Lay- bzw. IdleAction und verwandtes
BOOL IsAction() const { return pLayAct != 0; }
BOOL IsIdleAction() const { return pIdleAct != 0; }
@@ -224,43 +209,6 @@ public:
void SetRestoreActions(USHORT nSet){nRestoreActions = nSet;}
USHORT GetRestoreActions() const{return nRestoreActions;}
-
-#ifdef ACCESSIBLE_LAYOUT
- // Is this view accessible?
-
-
- // Update (this) accessible view
-
- // Remove a frame from the accessible view
- void DisposeAccessible( const SwFrm *pFrm, const SdrObject *pObj,
- sal_Bool bRecursive );
- inline void DisposeAccessibleObj( const SdrObject *pObj );
-
- // Move a frame's position in the accessible view
- void MoveAccessible( const SwFrm *pFrm, const SdrObject *pObj,
- const SwRect& rOldFrm );
-
- // Add a frame in the accessible view
-
- inline void AddAccessibleObj( const SdrObject *pObj );
-
- // Invalidate accessible frame's frame's content
- void InvalidateAccessibleFrmContent( const SwFrm *pFrm );
-
- // Invalidate accessible frame's cursor position
-
- // Invalidate editable state for all accessible frames
-
- // Invalidate opaque state for all accessible frames
-
- // Invalidate frame's relation set (for chained frames)
-
- // update data for accessible preview
- // change method signature due to new page preview functionality
-
-
- // Fire all accessible events that have been collected so far
-#endif
};
//Kann auf dem Stack angelegt werden, wenn etwas ausgegeben oder
@@ -283,24 +231,6 @@ inline const SwPageFrm *SwViewImp::GetFirstVisPage() const
return pFirstVisPage;
}
-#ifdef ACCESSIBLE_LAYOUT
-
-
-inline void SwViewImp::DisposeAccessibleObj( const SdrObject *pObj )
-{
- DisposeAccessible( 0, pObj, sal_False );
-}
-
-
-
-inline void SwViewImp::AddAccessibleObj( const SdrObject *pObj )
-{
- SwRect aEmptyRect;
- MoveAccessible( 0, pObj, aEmptyRect );
-}
-
-#endif
-
} //namespace binfilter
#endif //_VIEWIMP_HXX
diff --git a/binfilter/bf_sw/source/core/layout/layhelp.hxx b/binfilter/bf_sw/source/core/layout/layhelp.hxx
index 890fdce..f16bff3 100644
--- a/binfilter/bf_sw/source/core/layout/layhelp.hxx
+++ b/binfilter/bf_sw/source/core/layout/layhelp.hxx
@@ -149,10 +149,6 @@ public:
// position, if they are in the fly cache.
void CheckFlyCache( SwPageFrm* pPage )
{ if( pImpl && nFlyIdx < pImpl->GetFlyCount() ) _CheckFlyCache( pPage ); }
-
- // Look for this text frame and set it to the right position,
- // if it's in the fly cache.
- static BOOL CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly );
};
#define SW_LAYCACHE_IO_REC_PAGES 'p'
diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
index 9c86856..80cc66a 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
@@ -804,81 +804,7 @@ namespace binfilter {
/*N*/ if( bNoLoop )
/*N*/ pDoc->GetLayouter()->EndLoopControl();
/*N*/ }
-/*************************************************************************
-|*
-|* SwLayAction::TurboAction(), _TurboAction()
-|*
-|*************************************************************************/
-/*N*/ BOOL SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
-/*N*/ {
-/*N*/
-/*N*/ const SwPageFrm *pPage = 0;
-/*N*/ if ( !pCnt->IsValid() || pCnt->IsCompletePaint() || pCnt->IsRetouche() )
-/*N*/ {
-/*N*/ const SwRect aOldRect( pCnt->UnionFrm( TRUE ) );
-/*N*/ const long nOldBottom = pCnt->Frm().Top() + pCnt->Prt().Bottom();
-/*N*/ pCnt->Calc();
-/*N*/ if ( pCnt->Frm().Bottom() < aOldRect.Bottom() )
-/*N*/ pCnt->SetRetouche();
-/*N*/
-/*N*/ pPage = pCnt->FindPageFrm();
-/*N*/ PaintCntnt( pCnt, pPage, aOldRect, nOldBottom );
-/*N*/
-/*N*/ if ( !pCnt->GetValidLineNumFlag() && pCnt->IsTxtFrm() )
-/*N*/ {
-/*N*/ const ULONG nAllLines = ((SwTxtFrm*)pCnt)->GetAllLines();
-/*N*/ ((SwTxtFrm*)pCnt)->RecalcAllLines();
-/*N*/ if ( nAllLines != ((SwTxtFrm*)pCnt)->GetAllLines() )
-/*N*/ {
-/*N*/ if ( IsPaintExtraData() )
-/*?*/ pImp->GetShell()->AddPaintRect( pCnt->Frm() );
-/*N*/ //Damit die restlichen LineNums auf der Seite bereichnet werden
-/*N*/ //und nicht hier abgebrochen wird.
-/*N*/ //Das im RecalcAllLines zu erledigen waere teuer, weil dort
-/*N*/ //auch in unnoetigen Faellen (normale Action) auch immer die
-/*N*/ //Seite benachrichtigt werden muesste.
-/*N*/ const SwCntntFrm *pNxt = pCnt->GetNextCntntFrm();
-/*N*/ while ( pNxt &&
-/*N*/ (pNxt->IsInTab() || pNxt->IsInDocBody() != pCnt->IsInDocBody()) )
-/*N*/ pNxt = pNxt->GetNextCntntFrm();
-/*N*/ if ( pNxt )
-/*N*/ pNxt->InvalidatePage();
-/*N*/ }
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/
-/*N*/ if ( pPage->IsInvalidLayout() || (IS_FLYS && IS_INVAFLY) )
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/ if ( !pPage )
-/*?*/ pPage = pCnt->FindPageFrm();
-/*N*/ //Die im Absatz verankerten Flys wollen auch beachtet werden.
-/*N*/ if ( pPage->IsInvalidFlyInCnt() && pCnt->GetDrawObjs() )
-/*N*/ {
-/*N*/ const SwDrawObjs *pObjs = pCnt->GetDrawObjs();
-/*N*/ for ( USHORT i = 0; i < pObjs->Count(); ++i )
-/*N*/ {
-/*N*/ SdrObject *pO = (*pObjs)[i];
-/*N*/ if ( pO->IsWriterFlyFrame() )
-/*N*/ {
-/*N*/ SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm();
-/*N*/ if ( pFly->IsFlyInCntFrm() && ((SwFlyInCntFrm*)pFly)->IsInvalid() )
-/*N*/ {
-/*N*/ FormatFlyInCnt( (SwFlyInCntFrm*)pFly );
-/*N*/ pObjs = pCnt->GetDrawObjs();
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ if ( pPage->IsInvalidCntnt() )
-/*N*/ return FALSE;
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ BOOL SwLayAction::TurboAction()
-/*N*/ {
-/*N*/ return FALSE;
-/*N*/ }
/*************************************************************************
|*
|* SwLayAction::IsShortCut()
diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
index 5c925e8..6f35e6e 100644
--- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
@@ -604,63 +604,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ }
-
-/*
- * SwLayHelper::CheckPageFlyCache(..)
- * looks for the given text frame in the fly cache and sets
- * the position and size, if possible.
- * The fly cache is sorted by pages and we start searching with the given page.
- * If we found the page number in the fly cache, we set
- * the rpPage parameter to the right page, if possible.
- */
-
-/*N*/ BOOL SwLayHelper::CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly )
-/*N*/ {
-/*N*/ if( !pFly->GetAnchor() || !pFly->GetVirtDrawObj() ||
-/*N*/ pFly->GetAnchor()->FindFooterOrHeader() )
-/*N*/ return FALSE;
-/*N*/ BOOL bRet = FALSE;
-/*N*/ SwDoc* pDoc = rpPage->GetFmt()->GetDoc();
-/*N*/ SwLayCacheImpl *pCache = pDoc->GetLayoutCache() ?
-/*N*/ pDoc->GetLayoutCache()->LockImpl() : NULL;
-/*N*/ if( pCache )
-/*N*/ {
-/*?*/ USHORT nPgNum = rpPage->GetPhyPageNum();
-/*?*/ USHORT nIdx = 0;
-/*?*/ USHORT nCnt = pCache->GetFlyCount();
-/*?*/ ULONG nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
-/*?*/ SwFlyCache* pFlyC;
-/*?*/
-/*?*/ // skip fly frames from pages before the current page
-/*?*/ while( nIdx < nCnt &&
-/*?*/ nPgNum > (pFlyC = pCache->GetFlyCache( nIdx ))->nPageNum )
-/*?*/ ++nIdx;
-/*?*/
-/*?*/ while( nIdx < nCnt &&
-/*?*/ nOrdNum != (pFlyC = pCache->GetFlyCache( nIdx ))->nOrdNum )
-/*?*/ ++nIdx;
-/*?*/ if( nIdx < nCnt )
-/*?*/ {
-/*?*/ SwPageFrm *pPage = rpPage;
-/*?*/ while( pPage && pPage->GetPhyPageNum() < pFlyC->nPageNum )
-/*?*/ pPage = (SwPageFrm*)pPage->GetNext();
-/*?*/ if( pPage )
-/*?*/ {
-/*?*/ rpPage = pPage;
-/*?*/ pFly->Frm().Pos().X() = pFlyC->Left() + pPage->Frm().Left();
-/*?*/ pFly->Frm().Pos().Y() = pFlyC->Top() + pPage->Frm().Top();
-/*?*/ if ( pCache->IsUseFlyCache() )
-/*?*/ {
-/*?*/ pFly->Frm().Width( pFlyC->Width() );
-/*?*/ pFly->Frm().Height( pFlyC->Height() );
-/*?*/ }
-/*?*/ bRet = TRUE;
-/*?*/ }
-/*?*/ }
-/*?*/ pDoc->GetLayoutCache()->UnlockImpl();
-/*N*/ }
-/*N*/ return bRet;
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx
index a1070b2..4fb6696 100644
--- a/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx
@@ -364,24 +364,6 @@ namespace binfilter {
/*N*/ CurrShell::~CurrShell()
/*N*/ {
/*N*/ }
-
-/*************************************************************************
-|*
-|* SwRootFrm::RemoveMasterObjs()
-|*
-|*************************************************************************/
-
-
-/*N*/ void SwRootFrm::RemoveMasterObjs( SdrPage *pPg )
-/*N*/ {
-/*N*/ //Alle Masterobjekte aus der Page entfernen. Nicht loeschen!!
-/*N*/ for( ULONG i = pPg ? pPg->GetObjCount() : 0; i; )
-/*N*/ {
-/*N*/ SdrObject* pObj = pPg->GetObj( --i );
-/*N*/ if( pObj->ISA(SwFlyDrawObj ) )
-/*N*/ pPg->RemoveObject( i );
-/*N*/ }
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 8d6a234..02d3c77 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -306,8 +306,6 @@ struct Sw3ExportInfo
~Sw3ExportInfo();
};
-struct Sw3ExportTxtAttrs;
-
class Sw3IoImp
{ // I/O fuer Records:
Sw3Bytes aRecTypes; // Satztyp-Stack
@@ -616,14 +614,9 @@ public:
xub_StrLen, SvUShorts*, SvXub_StrLens* ); // I: Zeichensatz-Konversion
void InTxtNode( SwTxtNode*, SwNodeIndex&, xub_StrLen, BYTE = 0 );
// I: hartes Attribut
- Sw3ExportTxtAttrs *ExportTxtNode( const SwTxtNode& rNd,
- xub_StrLen nStart, xub_StrLen nEnd,
- rtl_TextEncoding eEnc,
- SwInsHardBlankSoftHyph& rHBSH );
void InTxtAttr( SwTxtNode&, const ByteString& rText8,
xub_StrLen, SvStringsDtor**, SvXub_StrLens**,
SvXub_StrLens**, SvUShorts**, SvXub_StrLens** );
- void ExportTxtAttrs( const Sw3ExportTxtAttrs*, xub_StrLen, xub_StrLen);
void InGrfNode( SwNodeIndex& rPos ); // I: Grafik-Node
void InOLENode( SwNodeIndex& rPos ); // I: OLE-Node
void InRepTxtNode( SwNodeIndex& ); // I: Textwiederholung
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index efddee2..60d9e01 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -117,19 +117,6 @@ namespace binfilter {
// angepasst.
SV_DECL_PTRARR(SfxPoolItems,SfxPoolItem * ,16,16)
-struct Sw3ExportTxtAttrs
-{
- SvXub_StrLens aItemStarts; // Start-Pos der Hints
- SvXub_StrLens aItemEnds; // End-Pos der Hints
- SfxPoolItems aItems; // Items der Hints
- SvByteStrings aINetFmtTexts; // Texte der SwFmtINetFmt-Hints
-
- ByteString aText; // Node-Text
-
- USHORT nDrawFrmFmts; // Anzahl zeichengeb. Zeichen-Objekte
-
- Sw3ExportTxtAttrs() : nDrawFrmFmts( 0 ) {}
-};
class SwInsHardBlankSoftHyph
{
@@ -140,7 +127,6 @@ public:
~SwInsHardBlankSoftHyph();
void AddItem( xub_StrLen nPos, sal_Unicode c );
void ChangePos( xub_StrLen nHtEnd, xub_StrLen nOffs );
- void OutAttr( Sw3IoImp& rIo, xub_StrLen nStt, xub_StrLen nEnd );
};
/*N*/ sal_Char Sw3IoImp::ConvStarSymbolCharToStarBats( sal_Unicode c )
@@ -1168,331 +1154,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*?*/ rStt -= nOffs;
/*N*/ }
/*N*/ }
-/*N*/ void SwInsHardBlankSoftHyph::OutAttr( Sw3IoImp& rIo, xub_StrLen nStt,
-/*N*/ xub_StrLen nEnd )
-/*N*/ {
-/*N*/ for( USHORT n = 0, nCnt = aItemStarts.Count(); n < nCnt; ++n )
-/*N*/ {
-/*N*/ xub_StrLen nHtStt = aItemStarts[ n ];
-/*N*/ if( nHtStt >= nStt && nHtStt < nEnd )
-/*N*/ {
-/*N*/ nHtStt -= nStt;
-/*N*/ const SfxPoolItem* pAttr = aItems[ n ];
-/*N*/ rIo.OutAttr( *pAttr, nHtStt, nHtStt );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ Sw3ExportTxtAttrs *Sw3IoImp::ExportTxtNode( const SwTxtNode& rNd,
-/*N*/ xub_StrLen nStart, xub_StrLen nEnd,
-/*N*/ rtl_TextEncoding eEnc,
-/*N*/ SwInsHardBlankSoftHyph& rHBSH )
-/*N*/ {
-/*N*/ USHORT nCntAttr = rNd.HasHints() ? rNd.GetSwpHints().Count() : 0;
-/*N*/ if( !nCntAttr )
-/*N*/ return 0;
-/*N*/
-/*N*/ // Erstmal nachschauen, ob es ueberhaupt Hints gibt, die einen Export
-/*N*/ // erfordern. Der zusaetzliche Schleifendurchlauf sollte sich in den
-/*N*/ // meisten Faellen lohnen, weil keine Arrays gewartet werden muessen.
-/*N*/ USHORT n;
-/*N*/ BOOL bExport = FALSE;
-/*N*/ for( n = 0; !bExport && n < nCntAttr; n++ )
-/*N*/ {
-/*N*/ const SwTxtAttr* pHt = rNd.GetSwpHints()[n];
-/*N*/ BOOL bHtEnd = BOOL( pHt->GetEnd() != NULL );
-/*N*/ xub_StrLen nHtStart = *pHt->GetStart();
-/*N*/ xub_StrLen nHtEnd = *pHt->GetAnyEnd();
-/*N*/
-/*N*/ if( (bHtEnd && nHtEnd > nStart && nHtStart < nEnd) ||
-/*N*/ (!bHtEnd && nHtStart >= nStart && nHtStart < nEnd ) )
-/*N*/ {
-/*N*/ switch( pHt->GetAttr().Which() )
-/*N*/ {
-/*N*/ case RES_TXTATR_INETFMT:
-/*N*/ // SwFmtINetFmt-Attribute werden als Felder exportiert
-/*N*/ bExport = TRUE;
-/*N*/ break;
-/*N*/
-/*N*/ case RES_TXTATR_FIELD:
-/*N*/ {
-/*N*/ // alle neuen Felder (ab Script-Feld) werden ignoriert
-/*N*/ const SwFmtFld& rFmtFld =
-/*N*/ (const SwFmtFld&)pHt->GetAttr();
-/*N*/ bExport = rFmtFld.GetFld()->Which() >= RES_SCRIPTFLD;
-/*N*/ }
-/*N*/ break;
-/*N*/
-/*N*/ case RES_TXTATR_FLYCNT:
-/*N*/ {
-/*N*/ // zeichengebunde Draw-Formate werden absatz-gebunden
-/*N*/ const SwFmtFlyCnt& rFlyCnt =
-/*N*/ (const SwFmtFlyCnt&)pHt->GetAttr();
-/*N*/ bExport = RES_DRAWFRMFMT == rFlyCnt.GetFrmFmt()->Which();
-/*N*/ }
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( !bExport )
-/*N*/ return 0;
-/*N*/
-/*N*/ Sw3ExportTxtAttrs *pInfo = new Sw3ExportTxtAttrs;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list