[Libreoffice-commits] .: 3 commits - binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Aug 23 02:36:31 PDT 2011
binfilter/bf_svx/source/engine3d/svx_light3d.cxx | 24 -
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 164 -------------
binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx | 63 ----
binfilter/bf_sw/source/filter/lotus/sw_lotimpop.cxx | 2
binfilter/bf_xmloff/source/style/makefile.mk | 1
binfilter/bf_xmloff/source/style/xmloff_VisAreaContext.cxx | 123 ---------
binfilter/inc/bf_svx/light3d.hxx | 2
binfilter/inc/bf_xmloff/VisAreaContext.hxx | 69 -----
8 files changed, 3 insertions(+), 445 deletions(-)
New commits:
commit 364a6f07ca0f7f943ee1093fa5651fc818ba4931
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 23 10:02:07 2011 +0100
can remove this unused .cxx
diff --git a/binfilter/bf_xmloff/source/style/makefile.mk b/binfilter/bf_xmloff/source/style/makefile.mk
index 91d11c4..77a042a 100644
--- a/binfilter/bf_xmloff/source/style/makefile.mk
+++ b/binfilter/bf_xmloff/source/style/makefile.mk
@@ -121,7 +121,6 @@ SLOFILES = \
$(SLO)$/xmloff_XMLFillBitmapSizePropertyHandler.obj \
$(SLO)$/xmloff_XMLBitmapLogicalSizePropertyHandler.obj \
$(SLO)$/xmloff_durationhdl.obj \
- $(SLO)$/xmloff_VisAreaContext.obj \
$(SLO)$/xmloff_DrawAspectHdl.obj
# --- Tagets -------------------------------------------------------
diff --git a/binfilter/bf_xmloff/source/style/xmloff_VisAreaContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_VisAreaContext.cxx
deleted file mode 100644
index 41d0f5f..0000000
--- a/binfilter/bf_xmloff/source/style/xmloff_VisAreaContext.cxx
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-// INCLUDE ---------------------------------------------------------------
-
-#include "VisAreaContext.hxx"
-
-#include "xmlnmspe.hxx"
-#include "nmspmap.hxx"
-#include "xmluconv.hxx"
-#include "xmlimp.hxx"
-
-#include <tools/gen.hxx>
-namespace binfilter {
-
-using namespace ::com::sun::star;
-using namespace ::binfilter::xmloff::token;
-
-//------------------------------------------------------------------
-
-XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rInImport,
- USHORT nPrfx,
- const ::rtl::OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList,
- ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit ) :
- SvXMLImportContext( rInImport, nPrfx, rLName )
-{
- process( xAttrList, rRect, nMeasureUnit );
-}
-
-XMLVisAreaContext::~XMLVisAreaContext()
-{
-}
-
-void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList>& xAttrList, awt::Rectangle& rRect, const sal_Int16 nMeasureUnit )
-{
- MapUnit aMapUnit = (MapUnit)nMeasureUnit;
-
- sal_Int32 nX(0);
- sal_Int32 nY(0);
- sal_Int32 nWidth(0);
- sal_Int32 nHeight(0);
- sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- for( sal_Int16 i=0; i < nAttrCount; i++ )
- {
- ::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLclLocalName;
- USHORT nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLclLocalName );
- ::rtl::OUString sValue = xAttrList->getValueByIndex( i );
-
- if (nLclPrefix == XML_NAMESPACE_OFFICE)
- {
- if (IsXMLToken( aLclLocalName, XML_X ))
- {
- SvXMLUnitConverter::convertMeasure(nX, sValue, aMapUnit);
- rRect.X = nX;
- }
- else if (IsXMLToken( aLclLocalName, XML_Y ))
- {
- SvXMLUnitConverter::convertMeasure(nY, sValue, aMapUnit);
- rRect.Y = nY;
- }
- else if (IsXMLToken( aLclLocalName, XML_WIDTH ))
- {
- SvXMLUnitConverter::convertMeasure(nWidth, sValue, aMapUnit);
- rRect.Width = nWidth;
- }
- else if (IsXMLToken( aLclLocalName, XML_HEIGHT ))
- {
- SvXMLUnitConverter::convertMeasure(nHeight, sValue, aMapUnit);
- rRect.Height = nHeight;
- }
- }
- }
-}
-
-SvXMLImportContext *XMLVisAreaContext::CreateChildContext( USHORT nInPrefix,
- const ::rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
-{
- // here is no context
- SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
-
- return pContext;
-}
-
-void XMLVisAreaContext::EndElement()
-{
-}
-}//end of namespace binfilter
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_xmloff/VisAreaContext.hxx b/binfilter/inc/bf_xmloff/VisAreaContext.hxx
deleted file mode 100644
index 9e6add4..0000000
--- a/binfilter/inc/bf_xmloff/VisAreaContext.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _XMLOFF_VISAREACONTEXT_HXX
-#define _XMLOFF_VISAREACONTEXT_HXX
-
-#include <bf_xmloff/xmlictxt.hxx>
-
-#include <tools/mapunit.hxx>
-class Rectangle;
-namespace com { namespace sun { namespace star { namespace awt {
- struct Rectangle;
-} } } }
-namespace binfilter {
-
-
-class XMLVisAreaContext : public SvXMLImportContext
-{
-public:
- // read all attributes and set the values in rRect
- XMLVisAreaContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
- ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit);
-
- virtual ~XMLVisAreaContext();
-
- virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
- const ::rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
- virtual void EndElement();
-
-private:
- void process( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
- ::com::sun::star::awt::Rectangle& rRect,
- const sal_Int16 nMeasureUnit );
-
-};
-
-}//end of namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c4814d13391188d1666dda609d11ed6b5436965a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 23 00:38:52 2011 +0100
ditch deprecated api
diff --git a/binfilter/bf_sw/source/filter/lotus/sw_lotimpop.cxx b/binfilter/bf_sw/source/filter/lotus/sw_lotimpop.cxx
index 558dd03..893958d 100644
--- a/binfilter/bf_sw/source/filter/lotus/sw_lotimpop.cxx
+++ b/binfilter/bf_sw/source/filter/lotus/sw_lotimpop.cxx
@@ -184,7 +184,7 @@ void SwLotusParser::PutCell( USHORT nCol, USHORT nRow, short nVal )
void SwLotusParser::PutCell( USHORT nCol, USHORT nRow, double fVal )
{
- String sText(String::CreateFromFloat(fVal));
+ String sText(rtl::OUString::valueOf(fVal));
xub_StrLen nLen = sText.Len();
for (xub_StrLen nI = 0; nI < nLen; ++nI)
{
commit c89797d84316851eff34455998216fbab6086efc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 22 21:57:08 2011 +0100
GetRootFrm can only be NULL
diff --git a/binfilter/bf_svx/source/engine3d/svx_light3d.cxx b/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
index 9aab73f..f036c60 100644
--- a/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
@@ -36,30 +36,6 @@ namespace binfilter {
/*N*/ TYPEINIT1(E3dLight, E3dPointObj);
-/*************************************************************************
-|*
-|* E3dLight-Konstruktor
-|*
-\************************************************************************/
-
-/*N*/ E3dLight::E3dLight(const Vector3D& rPos, const Color& rColor,
-/*N*/ double fLightIntensity) :
-/*N*/ E3dPointObj(rPos),
-/*N*/ fIntensity(fLightIntensity),
-/*N*/ bOn(TRUE),
-/*N*/ bVisible(FALSE)
-/*N*/ {
-/*N*/ SetColor(rColor);
-/*N*/ aLocalBoundVol = Volume3D();
-/*N*/ bBoundVolValid = FALSE;
-/*N*/ }
-
-/*************************************************************************
-|*
-|* E3dLight-Konstruktor 2
-|*
-\************************************************************************/
-
/*N*/ E3dLight::E3dLight() :
/*N*/ E3dPointObj(Vector3D()),
/*N*/ aColor(255, 255, 255),
diff --git a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
index f97a982..c155182 100644
--- a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
@@ -2403,171 +2403,9 @@ SwFlyFrmFmt::~SwFlyFrmFmt()
} while( 0 != ( pLast = aIter++ ));
}
-//Erzeugen der Frms wenn das Format einen Absatzgebundenen Rahmen beschreibt.
-// Erzeugen der Frms auch fuer Seitengebundene Rahmen.
-
void SwFlyFrmFmt::MakeFrms()
{
- // gibts ueberhaupt ein Layout ??
- if( !GetDoc()->GetRootFrm() )
- return;
-
- SwModify *pModify = 0;
- // create local copy of anchor attribute for possible changes.
- SwFmtAnchor aAnchorAttr( GetAnchor() );
- switch( aAnchorAttr.GetAnchorId() )
- {
- case FLY_IN_CNTNT:
- case FLY_AT_CNTNT:
- case FLY_AUTO_CNTNT:
- if( aAnchorAttr.GetCntntAnchor() )
- pModify = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
- break;
-
- case FLY_AT_FLY:
- if( aAnchorAttr.GetCntntAnchor() )
- {
- //Erst einmal ueber den Inhalt suchen, weil konstant schnell. Kann
- //Bei verketteten Rahmen aber auch schief gehen, weil dann evtl.
- //niemals ein ::com::sun::star::frame::Frame zu dem Inhalt existiert. Dann muss leider noch
- //die Suche vom StartNode zum FrameFormat sein.
- SwNodeIndex aIdx( aAnchorAttr.GetCntntAnchor()->nNode );
- SwCntntNode *pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
- SwClientIter aIter( *pCNd );
- if ( aIter.First( TYPE(SwFrm) ) )
- pModify = pCNd;
- else
- {
- const SwNodeIndex &rIdx = aAnchorAttr.GetCntntAnchor()->nNode;
- SwSpzFrmFmts& rFmts = *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;
- }
- }
- }
- }
- break;
-
- case FLY_PAGE:
- {
- sal_uInt16 nPgNum = aAnchorAttr.GetPageNum();
- SwPageFrm *pPage = (SwPageFrm*)GetDoc()->GetRootFrm()->Lower();
- if( !nPgNum && aAnchorAttr.GetCntntAnchor() )
- {
- SwCntntNode *pCNd =
- aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
- SwClientIter aIter( *pCNd );
- do
- {
- if( aIter()->ISA( SwFrm ) )
- {
- pPage = ((SwFrm*)aIter())->FindPageFrm();
- if( pPage )
- {
- nPgNum = pPage->GetPhyPageNum();
- // update anchor attribute
- aAnchorAttr.SetPageNum( nPgNum );
- aAnchorAttr.SetAnchor( 0 );
- SetAttr( aAnchorAttr );
- }
- break;
- }
- } while ( aIter++ );
- }
- while ( pPage )
- {
- if ( pPage->GetPhyPageNum() == nPgNum )
- {
- pPage->PlaceFly( 0, this, &aAnchorAttr );
- break;
- }
- pPage = (SwPageFrm*)pPage->GetNext();
- }
- }
- break;
- case RND_STD_HEADER:
- case RND_STD_FOOTER:
- case RND_STD_HEADERL:
- case RND_STD_HEADERR:
- case RND_STD_FOOTERL:
- case RND_STD_FOOTERR:
- case RND_DRAW_OBJECT:
- break;
- }
-
- if( pModify )
- {
- SwClientIter aIter( *pModify );
- for( SwFrm *pFrm = (SwFrm*)aIter.First( TYPE(SwFrm) );
- pFrm;
- pFrm = (SwFrm*)aIter.Next() )
- {
- bool bAdd = !pFrm->IsCntntFrm() ||
- !((SwCntntFrm*)pFrm)->IsFollow();
-
- if ( FLY_AT_FLY == aAnchorAttr.GetAnchorId() && !pFrm->IsFlyFrm() )
- pFrm = pFrm->FindFlyFrm();
-
- if( pFrm->GetDrawObjs() )
- {
- SwDrawObjs &rObjs = *pFrm->GetDrawObjs();
- for( sal_uInt16 i = 0; i < rObjs.Count(); ++i)
- {
- SdrObject *pO = rObjs[i];
- if( pO->ISA( SwVirtFlyDrawObj ) &&
- ((SwVirtFlyDrawObj*)pO)->GetFmt() == this )
- {
- bAdd = sal_False;
- break;
- }
- }
- }
-
- if( bAdd )
- {
- SwFlyFrm *pFly = 0;
- switch( aAnchorAttr.GetAnchorId() )
- {
- case FLY_AT_FLY:
- pFly = new SwFlyLayFrm( this, pFrm );
- break;
-
- case FLY_AT_CNTNT:
- case FLY_AUTO_CNTNT:
- pFly = new SwFlyAtCntFrm( this, pFrm );
- break;
-
- case FLY_IN_CNTNT:
- pFly = new SwFlyInCntFrm( this, pFrm );
- break;
- default:
- // handle cases:
- // - FLY_PAGE
- // - RND_STD_HEADER
- // - RND_STD_FOOTER
- // - RND_STD_HEADERL
- // - RND_STD_HEADERR
- // - RND_STD_FOOTERL
- // - RND_STD_FOOTERR
- // - RND_DRAW_OBJECT
-#ifdef DBG_UTIL
- OSL_ENSURE( !this, "Neuer Ankertyp" );
-#endif
- break;
- }
- pFrm->AppendFly( pFly );
- SwPageFrm *pPage = pFly->FindPageFrm();
- if( pPage )
- ::binfilter::RegistFlys( pPage, pFly );
- }
- }
- }
+ return;
}
SwFlyFrm* SwFlyFrmFmt::GetFrm( const Point* pPoint, const sal_Bool bCalcFrm ) const
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
index 48e43c9..0b063c7 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
@@ -109,68 +109,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ if( pColl && NO_NUMBERING != pColl->GetOutlineLevel() && IsDocNodes() )
/*N*/ UpdateOutlineNode( *pNode, NO_NUMBERING, pColl->GetOutlineLevel() );
/*N*/
-/*N*/ //Wenn es noch kein Layout gibt oder in einer versteckten Section
-/*N*/ // stehen, brauchen wir uns um das MakeFrms nicht bemuehen.
-/*N*/ const SwSectionNode* pSectNd;
-/*N*/ if( !GetDoc()->GetRootFrm() ||
-/*N*/ ( 0 != (pSectNd = pNode->FindSectionNode()) &&
-/*N*/ pSectNd->GetSection().IsHiddenFlag() ))
-/*N*/ return pNode;
-/*N*/
-/*N*/ SwNodeIndex aTmp( rWhere );
-/*N*/ do {
-/*N*/ // max. 2 Durchlaeufe:
-/*N*/ // 1. den Nachfolger nehmen
-/*N*/ // 2. den Vorgaenger
-/*N*/
-/*N*/ SwNode *pNd;
-/*N*/ switch( ( pNd = (*this)[aTmp] )->GetNodeType() )
-/*N*/ {
-/*?*/ case ND_TABLENODE:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return pNode;
-/*?*/
-/*?*/ case ND_SECTIONNODE:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return pNode;
-/*N*/
-/*N*/ case ND_TEXTNODE:
-/*N*/ case ND_GRFNODE:
-/*N*/ case ND_OLENODE:
-/*N*/ ((SwCntntNode*)pNd)->MakeFrms( *pNode );
-/*N*/ return pNode;
-/*N*/
-/*N*/ case ND_ENDNODE:
-/*N*/ if( pNd->FindStartNode()->IsSectionNode() &&
-/*N*/ aTmp.GetIndex() < rWhere.GetIndex() )
-/*N*/ {
-/*?*/ if( pNd->FindStartNode()->GetSectionNode()->GetSection().IsHiddenFlag())
-/*?*/ {
-/*?*/ if( !GoPrevSection( &aTmp, TRUE, FALSE ) ||
-/*?*/ aTmp.GetNode().FindTableNode() !=
-/*?*/ pNode->FindTableNode() )
-/*?*/ return pNode; // schade, das wars
-/*?*/ }
-/*?*/ else
-/*?*/ aTmp = *pNd->FindStartNode();
-/*?*/ break;
-/*N*/ }
-/*N*/ else if( pNd->FindStartNode()->IsTableNode() &&
-/*N*/ aTmp.GetIndex() < rWhere.GetIndex() )
-/*N*/ {
-/*N*/ // wir stehen hinter einem TabellenNode
-/*?*/ aTmp = *pNd->FindStartNode();
-/*?*/ break;
-/*N*/ }
-/*N*/ // kein break !!!
-/*N*/ default:
-/*N*/ if( rWhere == aTmp )
-/*N*/ aTmp -= 2;
-/*N*/ else
-/*N*/ return pNode;
-/*N*/ break;
-/*N*/ }
-/*N*/ } while( TRUE );
+/*N*/ return pNode;
/*N*/ }
diff --git a/binfilter/inc/bf_svx/light3d.hxx b/binfilter/inc/bf_svx/light3d.hxx
index 41eac05..be6b182 100644
--- a/binfilter/inc/bf_svx/light3d.hxx
+++ b/binfilter/inc/bf_svx/light3d.hxx
@@ -63,8 +63,6 @@ class E3dLight : public E3dPointObj
public:
TYPEINFO();
- E3dLight(const Vector3D& rPos, const Color& rColor,
- double fLightIntensity = 1.0);
E3dLight();
using SdrAttrObj::operator=;
More information about the Libreoffice-commits
mailing list