[Libreoffice-commits] .: Branch 'integration/dev300_m98' - sw/inc sw/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Mar 7 12:49:58 PST 2011
sw/inc/doc.hxx | 1
sw/inc/tblafmt.hxx | 1
sw/inc/unocrsrhelper.hxx | 82 ---------------------------
sw/inc/unoidx.hxx | 12 ----
sw/source/core/access/accfrmobj.cxx | 93 -------------------------------
sw/source/core/access/accfrmobjslist.cxx | 4 -
sw/source/core/access/accmap.cxx | 2
sw/source/core/crsr/bookmrk.cxx | 11 ---
sw/source/core/crsr/crstrvl.cxx | 3 -
sw/source/core/crsr/pam.cxx | 14 ----
sw/source/core/doc/doc.cxx | 16 -----
sw/source/core/docnode/ndtbl.cxx | 50 ----------------
sw/source/core/docnode/section.cxx | 1
sw/source/core/docnode/swbaslnk.cxx | 1
sw/source/core/draw/dflyobj.cxx | 5 -
sw/source/core/edit/edfld.cxx | 1
sw/source/core/except/dbgloop.cxx | 4 -
sw/source/core/fields/fldbas.cxx | 17 -----
sw/source/core/fields/postithelper.cxx | 35 -----------
sw/source/core/frmedt/fefly1.cxx | 10 +--
sw/source/core/inc/bodyfrm.hxx | 2
sw/source/core/layout/dbg_lay.cxx | 6 --
sw/source/core/layout/layact.cxx | 10 ---
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/layout/trvlfrm.cxx | 2
sw/source/core/text/txtfly.cxx | 1
sw/source/core/txtnode/atrfld.cxx | 1
sw/source/core/txtnode/ndtxt.cxx | 3 -
sw/source/core/txtnode/thints.cxx | 12 ----
sw/source/core/txtnode/txtatr2.cxx | 10 ---
sw/source/core/unocore/unobkm.cxx | 19 ------
sw/source/core/unocore/unostyle.cxx | 1
sw/source/core/view/vprint.cxx | 2
sw/source/ui/app/docsh2.cxx | 3 -
sw/source/ui/config/usrpref.cxx | 10 +--
sw/source/ui/dochdl/swdtflvr.cxx | 24 --------
sw/source/ui/docvw/edtwin.cxx | 3 -
37 files changed, 25 insertions(+), 449 deletions(-)
New commits:
commit f413336acc8549577ffd25bd9f2aac2693b147d0
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Mar 7 20:48:57 2011 +0000
yet more merge conflicts solved
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 8be211c..ab37ff4 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -575,6 +575,7 @@ private:
// to consider the wrapping style of
// floating screen objects as given by its
// attribute 'WrapInfluenceOnObjPos'.
+ bool mbMathBaselineAlignment : 1; // #i972#
// non-ui-compatibility flags:
bool mbOldNumbering : 1;
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index aafdadf..ea003a6 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -60,6 +60,7 @@
#include <editeng/boxitem.hxx>
#include <editeng/brshitem.hxx>
#include <editeng/adjitem.hxx>
+#include <editeng/justifyitem.hxx>
#include <svx/rotmodit.hxx>
#include <svl/intitem.hxx>
#include <editeng/bolnitem.hxx>
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 423d349..353a786 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -208,88 +208,6 @@ namespace SwUnoCursorHelper
SwPaM & rPam, SfxItemSet & rItemSet)
throw (::com::sun::star::lang::IllegalArgumentException);
-
- /// @param bTableMode: attributes should be applied to a table selection
- void SetCrsrAttr(SwPaM & rPam, const SfxItemSet & rSet,
- const SetAttrMode nAttrMode,
- const bool bTableMode = false);
- void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet,
- const bool bOnlyTxtAttr = false,
- const bool bGetFromChrFmt = true);
- void GetTextFromPam(SwPaM & rPam, ::rtl::OUString & rBuffer);
- SwFmtColl * GetCurTxtFmtColl(SwPaM & rPam, const bool bConditional);
-
- void SelectPam(SwPaM & rPam, const bool bExpand);
- void SetString(SwCursor & rCursor, const ::rtl::OUString & rString);
-
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
- CreateSortDescriptor(const bool bFromTable);
- sal_Bool ConvertSortProperties(
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue >& rDescriptor,
- SwSortOptions & rSortOpt);
-
- /// @param bTableMode: attributes should be applied to a table selection
- void SetPropertyValue(
- SwPaM& rPaM,
- const SfxItemPropertySet & rPropSet,
- const ::rtl::OUString & rPropertyName,
- const ::com::sun::star::uno::Any & rValue,
- const SetAttrMode nAttrMode = nsSetAttrMode::SETATTR_DEFAULT,
- const bool bTableMode = false)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Any GetPropertyValue(
- SwPaM& rPaM,
- const SfxItemPropertySet & rPropSet,
- const ::rtl::OUString & rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyState > GetPropertyStates(
- SwPaM & rPaM,
- const SfxItemPropertySet & rPropSet,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
- rPropertyNames,
- const SwGetPropertyStatesCaller eCaller =
- SW_PROPERTY_STATE_CALLER_DEFAULT)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException);
- ::com::sun::star::beans::PropertyState GetPropertyState(
- SwPaM & rPaM,
- const SfxItemPropertySet & rPropSet,
- const ::rtl::OUString & rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException);
- void SetPropertyToDefault(
- SwPaM & rPaM,
- const SfxItemPropertySet & rPropSet,
- const ::rtl::OUString & rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Any GetPropertyDefault(
- SwPaM & rPaM,
- const SfxItemPropertySet & rPropSet,
- const ::rtl::OUString & rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
-
- bool SetPageDesc(
- const ::com::sun::star::uno::Any& rValue,
- SwDoc & rDoc, SfxItemSet & rSet);
- void SetTxtFmtColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM)
- throw (::com::sun::star::lang::IllegalArgumentException);
- bool SetCursorPropertyValue(
- SfxItemPropertySimpleEntry const& rEntry,
- ::com::sun::star::uno::Any const& rValue,
- SwPaM & rPam, SfxItemSet & rItemSet)
- throw (::com::sun::star::lang::IllegalArgumentException);
-
} // namespace SwUnoCursorHelper
#endif
diff --git a/sw/inc/unoidx.hxx b/sw/inc/unoidx.hxx
index 4424fa5..79a6e70 100644
--- a/sw/inc/unoidx.hxx
+++ b/sw/inc/unoidx.hxx
@@ -116,18 +116,6 @@ public:
::com::sun::star::lang::XEventListener > & xListener)
throw (::com::sun::star::uno::RuntimeException);
- // XComponent
- virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException);
-
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index 038eca9..1e72847 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -427,97 +427,4 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const
} } // eof of namespace sw::access
-const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const
-{
- const SwFrm* pParent( 0 );
-
- if ( mpFrm )
- {
- if( mpFrm->IsFlyFrm() )
- {
- const SwFlyFrm* pFly = static_cast< const SwFlyFrm *>( mpFrm );
- if( pFly->IsFlyInCntFrm() )
- {
- // For FLY_AS_CHAR the parent is the anchor
- pParent = pFly->GetAnchorFrm();
- OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
- "parent is not accessible" );
- }
- else
- {
- // In any other case the parent is the root frm
- // (in page preview, the page frame)
- if( bInPagePreview )
- pParent = pFly->FindPageFrm();
- else
- pParent = pFly->FindRootFrm();
- }
- }
- else
- {
- SwAccessibleChild aUpper( mpFrm->GetUpper() );
- while( aUpper.GetSwFrm() && !aUpper.IsAccessible(bInPagePreview) )
- {
- aUpper = aUpper.GetSwFrm()->GetUpper();
- }
- pParent = aUpper.GetSwFrm();
- }
- }
- else if( mpDrawObj )
- {
- const SwDrawContact *pContact =
- static_cast< const SwDrawContact* >( GetUserCall( mpDrawObj ) );
- OSL_ENSURE( pContact, "sdr contact is missing" );
- if( pContact )
- {
- const SwFrmFmt *pFrmFmt = pContact->GetFmt();
- OSL_ENSURE( pFrmFmt, "frame format is missing" );
- if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
- {
- // For FLY_AS_CHAR the parent is the anchor
- pParent = pContact->GetAnchorFrm();
- OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
- "parent is not accessible" );
-
- }
- else
- {
- // In any other case the parent is the root frm
- if( bInPagePreview )
- pParent = pContact->GetAnchorFrm()->FindPageFrm();
- else
- pParent = pContact->GetAnchorFrm()->FindRootFrm();
- }
- }
- }
- else if ( mpWindow )
- {
- css::uno::Reference < css::accessibility::XAccessible > xAcc =
- mpWindow->GetAccessible();
- if ( xAcc.is() )
- {
- css::uno::Reference < css::accessibility::XAccessibleContext > xAccContext =
- xAcc->getAccessibleContext();
- if ( xAccContext.is() )
- {
- css::uno::Reference < css::accessibility::XAccessible > xAccParent =
- xAccContext->getAccessibleParent();
- if ( xAccParent.is() )
- {
- SwAccessibleContext* pAccParentImpl =
- dynamic_cast< SwAccessibleContext *>( xAccParent.get() );
- if ( pAccParentImpl )
- {
- pParent = pAccParentImpl->GetFrm();
- }
- }
- }
- }
- }
-
- return pParent;
-}
-
-} } // eof of namespace sw::access
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 559672b..846e06a 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -75,9 +75,9 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
{
::rtl::Reference < SwAccessibleContext > xAccImpl =
rAccMap.GetContextImpl( &rFrm, sal_False );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
- SwAccessibleContext* pAccImpl = xAccImpl.getBodyPtr();
+ SwAccessibleContext* pAccImpl = xAccImpl.get();
aCurr = SwAccessibleChild( pAccImpl->GetAdditionalAccessibleChild( 0 ) );
++nNextObj;
}
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 300d806..3f493bd 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1658,8 +1658,6 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) )
{
- if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) )
- {
::rtl::Reference< SwAccessibleContext > xAccImpl;
::rtl::Reference< SwAccessibleContext > xParentAccImpl;
::rtl::Reference< ::accessibility::AccessibleShape > xShapeAccImpl;
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 6a03978..c032664 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -144,17 +144,6 @@ namespace sw { namespace mark
return buf.makeStringAndClear( );
}
- rtl::OUString MarkBase::ToString( ) const
- {
- rtl::OUStringBuffer buf;
- buf.appendAscii( "Mark: ( Name, [ Node1, Index1 ] ): ( " );
- buf.append( m_aName ).appendAscii( ", [ " );
- buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " );
- buf.append( sal_Int32( GetMarkPos().nContent.GetIndex( ) ) ).appendAscii( " ] )" );
-
- return buf.makeStringAndClear( );
- }
-
MarkBase::~MarkBase()
{ }
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 0b42236..95f6cb6 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -712,8 +712,7 @@ BOOL SwCrsrShell::MoveFldType( const SwFieldType* pFldType, BOOL bNext,
SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
(SwDateTimeFieldType*)pDoc->GetSysFldType( RES_DATETIMEFLD ) ) );
- pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(),
- pDoc->IsClipBoard() );
+ pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex() );
pTxtFld->ChgTxtNode( pTNd );
}
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 47c06bf..5349974 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1236,20 +1236,6 @@ void SwPaM::InvalidatePaM()
}
}
-void SwPaM::InvalidatePaM()
-{
- const SwNode *_pNd=this->GetNode();
- const SwTxtNode *_pTxtNd=(_pNd!=NULL?_pNd->GetTxtNode():NULL);
- if (_pTxtNd!=NULL)
- {
- // pretent that the PaM marks inserted text to recalc the portion...
- SwInsTxt aHint( Start()->nContent.GetIndex(),
- End()->nContent.GetIndex() - Start()->nContent.GetIndex() + 1 );
- SwModify *_pModify=(SwModify*)_pTxtNd;
- _pModify->Modify( 0, &aHint);
- }
-}
-
BOOL SwPaM::LessThan(const SwPaM & a, const SwPaM & b)
{
return (*a.Start() < *b.Start()) || (*a.Start() == *b.Start() && *a.End() < *b.End());
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index a845a27..713b7bf 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1216,22 +1216,6 @@ static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
return nRes;
}
-
-// provide the paper tray to use according to the page style in use,
-// but do that only if the respective item is NOT just the default item
-static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
-{
- sal_Int32 nRes = -1;
-
- const SwFrmFmt &rFmt = pStartFrm->GetPageDesc()->GetMaster();
- const SfxPoolItem *pItem = NULL;
- SfxItemState eState = rFmt.GetItemState( RES_PAPER_BIN, FALSE, &pItem );
- const SvxPaperBinItem *pPaperBinItem = dynamic_cast< const SvxPaperBinItem * >(pItem);
- if (eState > SFX_ITEM_DEFAULT && pPaperBinItem)
- nRes = pPaperBinItem->GetValue();
-
- return nRes;
-}
void SwDoc::CalculatePagesForPrinting(
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 1e3c0f6..0a59101 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -334,13 +334,6 @@ BOOL SwNodes::InsBoxen( SwTableNode* pTblNd,
rTabBoxes.C40_INSERT( SwTableBox, pPrvBox, nRealInsPos );
- SwTableBoxes & rTabBoxes = pLine->GetTabBoxes();
- USHORT nRealInsPos = nInsPos + n;
- if (nRealInsPos > rTabBoxes.Count())
- nRealInsPos = rTabBoxes.Count();
-
- rTabBoxes.C40_INSERT( SwTableBox, pPrvBox, nRealInsPos );
-
if( ! pTxtColl->IsAssignedToListLevelOfOutlineStyle()//<-end,zhaojianwei
//FEATURE::CONDCOLL
&& RES_CONDTXTFMTCOLL != pTxtColl->Which()
@@ -1270,49 +1263,6 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
++aIndex;
}
-SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
-{
- SwNodeRange * pResult = NULL;
- bool bChanged = false;
-
- SwNodeIndex aNewStart = rRange.aStart;
- SwNodeIndex aNewEnd = rRange.aEnd;
-
- SwNodeIndex aEndIndex = rRange.aEnd;
- SwNodeIndex aIndex = rRange.aStart;
-
- while (aIndex < aEndIndex)
- {
- SwNode& rNode = aIndex.GetNode();
-
- if (rNode.IsStartNode())
- {
- // advance aIndex to the end node of this start node
- SwNode * pEndNode = rNode.EndOfSectionNode();
- aIndex = *pEndNode;
-
- if (aIndex > aNewEnd)
- {
- aNewEnd = aIndex;
- bChanged = true;
- }
- }
- else if (rNode.IsEndNode())
- {
- SwNode * pStartNode = rNode.StartOfSectionNode();
- SwNodeIndex aStartIndex = *pStartNode;
-
- if (aStartIndex < aNewStart)
- {
- aNewStart = aStartIndex;
- bChanged = true;
- }
- }
-
- if (aIndex < aEndIndex)
- ++aIndex;
- }
-
SwNode * pNode = &aIndex.GetNode();
while (pNode->IsEndNode())
{
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 8fed7bd..82037eb 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -298,7 +298,6 @@ void SwSection::SetSectionData(SwSectionData const& rData)
if (bOldHidden != m_Data.IsHidden()) // check if changed...
ImplSetHiddenFlag(m_Data.IsHidden(), m_Data.IsCondHidden());
}
-}
bool SwSection::DataEquals(SwSectionData const& rCmp) const
{
// note that the old code compared the flags of the parameter with the
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 00f03bf..bbe87ba 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -472,7 +472,6 @@ const SwNode* SwBaseLink::GetAnchor() const
}
return 0;
}
- }
}
OSL_ENSURE( !this, "GetAnchor nicht ueberlagert" );
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index cfea408..c417c0e 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -536,11 +536,6 @@ const Rectangle& SwVirtFlyDrawObj::GetCurrentBoundRect() const
return aOutRect;
}
-const Rectangle& __EXPORT SwVirtFlyDrawObj::GetLastBoundRect() const
-{
- return GetCurrentBoundRect();
-}
-
const Rectangle& SwVirtFlyDrawObj::GetLastBoundRect() const
{
return GetCurrentBoundRect();
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index 5a5ec05..ec2761f 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -226,7 +226,6 @@ void SwEditShell::FieldToText( SwFieldType* pType )
// Feldinhalt durch Text ersetzen
String const aEntry( pFmtFld->GetFld()->ExpandField(true) );
- pFmtFld->GetFld()->ExpandField(GetDoc()->IsClipBoard()) );
pPaM->SetMark();
pPaM->Move( fnMoveForward );
GetDoc()->DeleteRange( *pPaM );
diff --git a/sw/source/core/except/dbgloop.cxx b/sw/source/core/except/dbgloop.cxx
index f28f0cd..99171ae 100644
--- a/sw/source/core/except/dbgloop.cxx
+++ b/sw/source/core/except/dbgloop.cxx
@@ -29,8 +29,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL == 0
-#error Who broke the makefiles?
+#ifdef DBG_UTIL
+
#include <tools/stream.hxx>
#include "dbgloop.hxx"
#include "errhdl.hxx"
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 53fd18c..a89ffde 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -439,23 +439,6 @@ SwField * SwField::CopyField() const
return pNew;
}
-String SwField::ExpandField(bool const bInClipboard) const
-{
- if (!bInClipboard) // #i85766# do not expand fields in clipboard documents
- {
- m_Cache = Expand();
- }
- return m_Cache;
-}
-
-SwField * SwField::CopyField() const
-{
- SwField *const pNew = Copy();
- // #i85766# cache expansion of source (for clipboard)
- pNew->m_Cache = Expand();
- return pNew;
-}
-
/*--------------------------------------------------------------------
Beschreibung: Numerierung expandieren
--------------------------------------------------------------------*/
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 7964323..b7e4cde 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -87,41 +87,6 @@ struct LayoutInfoOrder
} // eof anonymous namespace
-struct LayoutInfoOrder
-{
- bool operator()( const SwLayoutInfo& rLayoutInfo,
- const SwLayoutInfo& rNewLayoutInfo )
- {
- if ( rLayoutInfo.mnPageNumber != rNewLayoutInfo.mnPageNumber )
- {
- // corresponding <SwFrm> instances are on different pages
- return rLayoutInfo.mnPageNumber < rNewLayoutInfo.mnPageNumber;
- }
- else
- {
- // corresponding <SwFrm> instances are in different repeating table header rows
- OSL_ENSURE( rLayoutInfo.mpAnchorFrm->FindTabFrm(),
- "<LayoutInfoOrder::operator()> - table frame not found" );
- OSL_ENSURE( rNewLayoutInfo.mpAnchorFrm->FindTabFrm(),
- "<LayoutInfoOrder::operator()> - table frame not found" );
- const SwTabFrm* pLayoutInfoTabFrm( rLayoutInfo.mpAnchorFrm->FindTabFrm() );
- const SwTabFrm* pNewLayoutInfoTabFrm( rNewLayoutInfo.mpAnchorFrm->FindTabFrm() );
- const SwTabFrm* pTmpTabFrm( pNewLayoutInfoTabFrm );
- while ( pTmpTabFrm && pTmpTabFrm->GetFollow() )
- {
- pTmpTabFrm = static_cast<const SwTabFrm*>(pTmpTabFrm->GetFollow()->GetFrm());
- if ( pTmpTabFrm == pLayoutInfoTabFrm )
- {
- return false;
- }
- }
- return true;
- }
- }
-};
-
-} // eof anonymous namespace
-
SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos( std::vector< SwLayoutInfo >& rInfo, SwPosition& rPos )
{
SwLayoutStatus aRet = INVISIBLE;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index cf89006..bfa79f1 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1467,7 +1467,7 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
}
SwFlyFrmFmt *pFlyFrmFmt = pFly->GetFmt();
- ASSERT( pFlyFrmFmt, "fly frame format missing!" );
+ OSL_ENSURE( pFlyFrmFmt, "fly frame format missing!" );
if ( pFlyFrmFmt )
pFlyFrmFmt->SetLastFlyFrmPrtRectPos( pFly->Prt().Pos() ); //stores the value of last Prt rect
@@ -2124,7 +2124,7 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO
if (!pFly)
pFly = FindFlyFrm( xObj );
- ASSERT( pFly , "No fly frame!" );
+ OSL_ENSURE( pFly , "No fly frame!" );
SwFrmFmt * pFrmFmt = pFly ? pFly->GetFmt() : 0;
// baseline to baseline alignment should only be applied to formulas anchored as char
@@ -2143,7 +2143,7 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO
}
catch ( uno::Exception& )
{
- ASSERT( FALSE , "Baseline could not be retrieved from Starmath!" );
+ OSL_ENSURE( FALSE , "Baseline could not be retrieved from Starmath!" );
}
}
}
@@ -2153,10 +2153,10 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO
const MapMode aTargetMapMode( MAP_TWIP );
nBaseline = OutputDevice::LogicToLogic( nBaseline, aSourceMapMode.GetMapUnit(), aTargetMapMode.GetMapUnit() );
- ASSERT( nBaseline > 0, "Wrong value of Baseline while retrieving from Starmath!" );
+ OSL_ENSURE( nBaseline > 0, "Wrong value of Baseline while retrieving from Starmath!" );
//nBaseline must be moved by aPrt position
const SwFlyFrmFmt *pFlyFrmFmt = pFly->GetFmt();
- ASSERT( pFlyFrmFmt, "fly frame format missing!" );
+ OSL_ENSURE( pFlyFrmFmt, "fly frame format missing!" );
if ( pFlyFrmFmt )
nBaseline += pFlyFrmFmt->GetLastFlyFrmPrtRectPos().Y();
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index 5694c0b..10205d4 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -44,7 +44,7 @@ protected:
public:
SwBodyFrm( SwFrmFmt* );
- virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
+ virtual void Paint( const SwRect&, const SwPrintData *pPrintData = NULL ) const;
DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm)
};
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 074f5ef..a9558e6 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -105,11 +105,7 @@
*
* --------------------------------------------------*/
-#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL <= 1
-#error Who broken the makefiles?
-#endif
-
-
+#ifdef DBG_UTIL
#include "dbg_lay.hxx"
#include <tools/stream.hxx>
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index bcc84ee..a18464b 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1059,15 +1059,7 @@ static bool lcl_IsInvaLay( const SwFrm *pFrm, long nBottom )
static const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom )
{
- if (
- !pFrm->IsValid() ||
- (pFrm->IsCompletePaint() && pFrm->Frm().Top() < nBottom)
- )
- {
- return true;
- }
- return false;
-}
+ OSL_ENSURE( pFrm->IsLayoutFrm(), "FindFirstInvaLay, no LayFrm" );
if (lcl_IsInvaLay(pFrm, nBottom))
return pFrm;
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index c17f588..2d44559 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -183,7 +183,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
bValidSize = bValidPrtArea = TRUE;
}
-void SwBodyFrm::Paint( const SwRect& rRect, const SwPrtOptions* ) const
+void SwBodyFrm::Paint( const SwRect& rRect, const SwPrintData* ) const
{
#if OSL_DEBUG_LAYOUT > 1
// Paint a red border around the SwBodyFrm in debug mode
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 77a2cee..b81dd2d 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -567,7 +567,7 @@ const SwCntntFrm * MA_FASTCALL lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
while ( pCell && !pCell->IsCellFrm() )
pCell = pCell->GetUpper();
if ( !pCell ||
- (( ( bInReadOnly || !pCell->GetFmt()->GetProtect().IsCntntProtected() ) &&
+ ( ( bInReadOnly || !pCell->GetFmt()->GetProtect().IsCntntProtected() ) &&
( !bMissHeadline || !lcl_IsInRepeatedHeadline( pCell ) ) &&
( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) &&
!pCell->IsCoveredCell() ) )
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 36da923..35559d8 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -2354,7 +2354,6 @@ SwSurround SwTxtFly::_GetSurroundForTextWrap( const SwAnchoredObject* pAnchoredO
{
return SURROUND_NONE;
}
- }
}
// Beim Durchlauf und Nowrap wird smart ignoriert.
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 4f09acd..8c1ad92 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -259,7 +259,6 @@ BOOL SwFmtFld::IsProtect() const
*************************************************************************/
SwTxtFld::SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStartPos)
- bool const bInClipboard)
: SwTxtAttr( rAttr, nStartPos )
, m_aExpand( rAttr.GetFld()->ExpandField(true) )
, m_pTxtNode( 0 )
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 82d630b..1f85925 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2892,7 +2892,6 @@ void SwTxtNode::Replace0xFF( XubString& rTxt, xub_StrLen& rTxtStt,
const XubString aExpand(
static_cast<SwTxtFld const*>(pAttr)->GetFld()
.GetFld()->ExpandField(true));
- GetDoc()->IsClipBoard()));
rTxt.Insert( aExpand, nPos );
nPos = nPos + aExpand.Len();
nEndPos = nEndPos + aExpand.Len();
@@ -4836,8 +4835,6 @@ bool SwTxtNode::IsInContent() const
using namespace ::com::sun::star;
uno::Reference< rdf::XMetadatable >
-
-uno::Reference< rdf::XMetadatable >
SwTxtNode::MakeUnoObject()
{
const uno::Reference<rdf::XMetadatable> xMeta(
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index faa619e..6ff2a82 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1044,7 +1044,6 @@ SwTxtAttr* MakeTxtAttr( SwDoc & rDoc, SfxPoolItem& rAttr,
break;
case RES_TXTATR_FIELD:
pNew = new SwTxtFld( static_cast<SwFmtFld &>(rNew), nStt );
- rDoc.IsClipBoard() );
break;
case RES_TXTATR_FLYCNT:
{
@@ -2164,17 +2163,6 @@ lcl_FillWhichIds(const SfxItemSet& i_rAttrSet, std::vector<USHORT>& o_rClearIds)
o_rClearIds.reserve(i_rAttrSet.Count());
SfxItemIter aIter(i_rAttrSet);
const SfxPoolItem* pItem(aIter.GetCurItem());
- while (true)
- {
- o_rClearIds.push_back(pItem->Which());
-
-
-void
-lcl_FillWhichIds(const SfxItemSet& i_rAttrSet, std::vector<USHORT>& o_rClearIds)
-{
- o_rClearIds.reserve(i_rAttrSet.Count());
- SfxItemIter aIter(i_rAttrSet);
- const SfxPoolItem* pItem(aIter.GetCurItem());
while (pItem)
{
o_rClearIds.push_back(pItem->Which());
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index a7e6e99..de3a164 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -337,14 +337,4 @@ void SwTxtMeta::ChgTxtNode(SwTxtNode * const pNode)
}
}
-void SwTxtMeta::ChgTxtNode(SwTxtNode * const pNode)
-{
- m_pTxtNode = pNode; // before Notify!
- SwFmtMeta & rFmtMeta( static_cast<SwFmtMeta &>(GetAttr()) );
- if (rFmtMeta.GetTxtAttr() == this)
- {
- rFmtMeta.NotifyChangeTxtNode(pNode);
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 3b79e63..99a3ee8 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -577,18 +577,6 @@ uno::Sequence<OUString> SwXFieldmarkParameters::getElementNames()
return vResult;
}
-::sal_Bool SwXFieldmarkParameters::hasElements()
- throw (uno::RuntimeException)
-{
- SolarMutexGuard aGuard;
- IFieldmark::parameter_map_t* pParameters = getCoreParameters();
- uno::Sequence<OUString> vResult(pParameters->size());
- OUString* pOutEntry = vResult.getArray();
- for(IFieldmark::parameter_map_t::iterator pEntry = pParameters->begin(); pEntry!=pParameters->end(); ++pEntry, ++pOutEntry)
- *pOutEntry = pEntry->first;
- return vResult;
-}
-
::sal_Bool SwXFieldmarkParameters::hasByName(const OUString& aName)
throw (uno::RuntimeException)
{
@@ -636,13 +624,6 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe
::rtl::OUString SwXFieldmark::getFieldType(void)
throw(uno::RuntimeException)
{
- attachToRangeEx( xTextRange,
- ( isReplacementObject ? IDocumentMarkAccess::CHECKBOX_FIELDMARK : IDocumentMarkAccess::TEXT_FIELDMARK ) );
-}
-
-::rtl::OUString SwXFieldmark::getFieldType(void)
- throw(uno::RuntimeException)
-{
SolarMutexGuard aGuard;
const IFieldmark *pBkm = dynamic_cast<const IFieldmark*>(GetBookmark());
if(!pBkm)
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index ad185f2..1dddc1f 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3451,6 +3451,7 @@ MakeObject:
pFrmFmt = &rDesc.GetLeft();
}
else
+ {
pFrmFmt = &rDesc.GetMaster();
}
const uno::Reference< text::XText > xRet =
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 7211054..34c19a5 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -443,7 +443,7 @@ SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
sal_Bool ViewShell::PrintOrPDFExport(
OutputDevice *pOutDev,
- const SwPrtOptions &rPrintData,
+ const SwPrintData &rPrintData,
sal_Int32 nRenderer /* the index in the vector of pages to be printed */ )
{
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 2a60569..702d856 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -114,7 +114,6 @@
#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
#include <com/sun/star/script/vba/VBAEventId.hpp>
#include <editeng/acorrcfg.hxx>
-#endif
#include <editeng/acorrcfg.hxx>
#include <SwStyleNameMapper.hxx>
@@ -199,8 +198,6 @@ void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XVBAEventP
}
}
}
-}
-#endif
/*--------------------------------------------------------------------
Beschreibung: Benachrichtigung bei geaenderter DocInfo
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index ded24c7..5642c55 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -316,9 +316,10 @@ void SwLayoutViewConfig::Commit()
case 17: rVal <<= (sal_Int32)rParent.GetViewLayoutColumns(); break; // "ViewLayout/Columns",
case 18: rVal <<= (sal_Bool) rParent.IsViewLayoutBookMode(); break; // "ViewLayout/BookMode",
case 19: rVal <<= (sal_Bool) rParent.IsSquaredPageMode(); break; // "Other/IsSquaredPageMode",
- case 20: bSet = rParent.IsApplyCharUnit(); break;// "Other/ApplyCharUnit",
+ case 20: rVal <<= (sal_Bool ) rParent.IsApplyCharUnit(); break; // "Other/ApplyCharUnit",
}
- if(nProp < 8 || nProp == 10 || nProp == 15 || nProp == 17 || nProp == 18 || nProp == 19 )
+#warning these Magic numbers need post-merge checking ...
+ if(nProp < 8 || nProp == 10 || nProp == 15 || nProp == 17 || nProp == 18 || nProp == 19 || nProp == 20 )
pValues[nProp].setValue(&bSet, ::getBooleanCppuType());
}
PutProperties(aNames, aValues);
@@ -336,8 +337,7 @@ void SwLayoutViewConfig::Load()
{
if(pValues[nProp].hasValue())
{
-#warning thes Magic numbers are almost certainly wrong !...
- sal_Bool bSet = nProp < 8 || nProp == 10 || nProp == 17 || nProp == 18 || nProp == 19 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
+ sal_Int32 nInt32Val = 0;
sal_Bool bSet = sal_False;
pValues[nProp] >>= nInt32Val;
pValues[nProp] >>= bSet;
@@ -374,7 +374,7 @@ void SwLayoutViewConfig::Load()
case 17: rParent.SetViewLayoutColumns( static_cast<USHORT>(nInt32Val) ); break;// "ViewLayout/Columns",
case 18: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode",
case 19: rParent.SetDefaultPageMode(bSet,TRUE); break;// "Other/IsSquaredPageMode",
- case 19: rParent.SetApplyCharUnit(bSet); break;// "Other/ApplyUserChar"
+ case 20: rParent.SetApplyCharUnit(bSet); break;// "Other/ApplyUserChar"
}
}
}
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index a4c8791..5dbe491 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -325,17 +325,6 @@ static SwDoc * lcl_GetDoc(SwDocFac & rDocFac)
return pDoc;
}
-static SwDoc * lcl_GetDoc(SwDocFac & rDocFac)
-{
- SwDoc *const pDoc = rDocFac.GetDoc();
- ASSERT( pDoc, "Document not found" );
- if (pDoc)
- {
- pDoc->SetClipBoard( true );
- }
- return pDoc;
-}
-
// -----------------------------------------------------------------------
void SwTransferable::ObjectReleased()
@@ -3500,19 +3489,6 @@ SwTransferable* SwTransferable::GetSwTransferable( const TransferableDataHelper&
}
-
- uno::Reference<XUnoTunnel> xTunnel( rData.GetTransferable(), UNO_QUERY );
- if ( xTunnel.is() )
- {
- sal_Int64 nHandle = xTunnel->getSomething( getUnoTunnelId() );
- if ( nHandle )
- pSwTransferable = (SwTransferable*) (sal_IntPtr) nHandle;
- }
-
- return pSwTransferable;
-
-}
-
SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
: rTrnsfr( rTrans ), pDocShell( 0 ),
bDelBookmrk( FALSE ), bInDisconnect( FALSE )
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index e129b90..3e6cab7 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -187,8 +187,7 @@ class SwAnchorMarker
Point aHdlPos;
Point aLastPos;
bool bTopRightHandle;
- bool bTopRightHandle;
- // <--
+
public:
SwAnchorMarker( SdrHdl* pH )
: pHdl( pH )
More information about the Libreoffice-commits
mailing list