strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging m68

Browse source
This commit is contained in:
Christian Lippka 2010-01-04 17:04:05 +01:00
commit cdd4e82b28
7 changed files with 62 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
svx/inc/svx/numitem.hxx
View file

@ -186,6 +186,7 @@ public:
// <--
SvxNumberFormat(const SvxNumberFormat& rFormat);
SvxNumberFormat(SvStream &rStream);
virtual ~SvxNumberFormat();
SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter);

4
svx/source/customshapes/EnhancedCustomShapeEngine.cxx
View file

@ -56,6 +56,7 @@
#include "unopolyhelper.hxx"
#include <uno/mapping.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <com/sun/star/document/XActionLockable.hpp>
// ---------------------------
// - EnhancedCustomShapeEngine -
@ -360,7 +361,8 @@ com::sun::star::awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds
{
com::sun::star::awt::Rectangle aTextRect;
SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
if ( pSdrObjCustomShape && pSdrObjCustomShape->GetModel() && !pSdrObjCustomShape->GetModel()->isLocked() )
::com::sun::star::uno::Reference< ::com::sun::star::document::XActionLockable > xLockable( mxShape, ::com::sun::star::uno::UNO_QUERY );
if ( pSdrObjCustomShape && pSdrObjCustomShape->GetModel() && xLockable.is() && !xLockable->isActionLocked() )
{
if ( pSdrObjCustomShape )
{

10
svx/source/items/numitem.cxx
View file

@ -1177,6 +1177,16 @@ SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, USHORT _nWhich ) :
{
}
SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, USHORT n) const
{
return SfxPoolItem::Create(s, n );
}
SvStream& SvxNumBulletItem::Store(SvStream & s, USHORT v ) const
{
return SfxPoolItem::Store( s, v );
}
/* -----------------27.10.98 10:41-------------------
*
* --------------------------------------------------*/

34
svx/source/outliner/outlvw.cxx
View file

@ -357,6 +357,18 @@ BOOL __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
aDDStartPosRef=pEditView->GetWindow()->PixelToLogic( aDDStartPosPix,pOwner->GetRefMapMode());
return TRUE;
}
// special case for outliner view in impress, check if double click hits the page icon for toggle
if( (nPara == EE_PARA_NOT_FOUND) && (pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEVIEW) && (eTarget == MouseText) && (rMEvt.GetClicks() == 2) )
{
ESelection aSel( pEditView->GetSelection() );
nPara = aSel.nStartPara;
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
if( (pPara && pOwner->pParaList->HasChilds(pPara)) && pPara->HasFlag(PARAFLAG_ISPAGE) )
{
ImpToggleExpand( pPara );
}
}
return pEditView->MouseButtonDown( rMEvt );
}
@ -1644,14 +1656,14 @@ USHORT OutlinerView::GetSelectedScriptType() const
return pEditView->GetSelectedScriptType();
}
String OutlinerView::GetSurroundingText() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetSurroundingText();
}
Selection OutlinerView::GetSurroundingTextSelection() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetSurroundingTextSelection();
}
String OutlinerView::GetSurroundingText() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetSurroundingText();
}
Selection OutlinerView::GetSurroundingTextSelection() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetSurroundingTextSelection();
}

22
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
View file

@ -71,7 +71,7 @@ namespace sdr
const GeoStat& rGeoStat(GetCustomShapeObj().GetGeoStat());
// only correct when rotation and/or shear is used
if(rGeoStat.nShearWink || rGeoStat.nDrehWink || !basegfx::fTools::equalZero(fExtraTextRotation))
if(rGeoStat.nShearWink || rGeoStat.nDrehWink )
{
// text range needs to be corrected by
// aObjectRange.getCenter() - aRotObjectRange.getCenter() since it's
@ -95,11 +95,6 @@ namespace sdr
aRotMatrix.rotate((36000 - rGeoStat.nDrehWink) * F_PI18000);
}
if(!basegfx::fTools::equalZero(fExtraTextRotation))
{
aRotMatrix.rotate((360.0 - fExtraTextRotation) * F_PI180);
}
aRotMatrix.translate(aObjectRange.getMinimum().getX(), aObjectRange.getMinimum().getY());
aRotObjectRange.transform(aRotMatrix);
@ -188,6 +183,16 @@ namespace sdr
aTextRange.getMinY() - aObjectRange.getMinimum().getY());
}
if(!basegfx::fTools::equalZero(fExtraTextRotation))
{
basegfx::B2DVector aTranslation(
( aTextRange.getWidth() / 2 ) + ( aTextRange.getMinX() - aObjectRange.getMinimum().getX() ),
( aTextRange.getHeight() / 2 ) + ( aTextRange.getMinY() - aObjectRange.getMinimum().getY() ) );
aTextBoxMatrix.translate( -aTranslation.getX(), -aTranslation.getY() );
aTextBoxMatrix.rotate((360.0 - fExtraTextRotation) * F_PI180);
aTextBoxMatrix.translate( aTranslation.getX(), aTranslation.getY() );
}
if(rGeoStat.nShearWink)
{
aTextBoxMatrix.shearX(tan((36000 - rGeoStat.nShearWink) * F_PI18000));
@ -198,11 +203,6 @@ namespace sdr
aTextBoxMatrix.rotate((36000 - rGeoStat.nDrehWink) * F_PI18000);
}
if(!basegfx::fTools::equalZero(fExtraTextRotation))
{
aTextBoxMatrix.rotate((360.0 - fExtraTextRotation) * F_PI180);
}
// give text it's target position
aTextBoxMatrix.translate(aObjectRange.getMinimum().getX(), aObjectRange.getMinimum().getY());
}

4
svx/source/svdraw/svdfmtf.cxx
View file

@ -710,8 +710,8 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
if (!aFnt.IsTransparent())
{
SfxItemSet aAttr(*pFillAttr->GetPool(),XATTR_FILL_FIRST,XATTR_FILL_LAST);
pFillAttr->Put(XFillStyleItem(XFILL_SOLID));
pFillAttr->Put(XFillColorItem(String(), aFnt.GetFillColor()));
aAttr.Put(XFillStyleItem(XFILL_SOLID));
aAttr.Put(XFillColorItem(String(), aFnt.GetFillColor()));
pText->SetMergedItemSet(aAttr);
}
sal_uInt32 nWink = aFnt.GetOrientation();

13
xmloff/source/draw/ximpshap.cxx
View file

@ -2994,7 +2994,18 @@ void SdXMLPluginShapeContext::EndElement()
else
{
// in case we have a media object
xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ), uno::makeAny( maHref ) );
OUString sTempRef;
// check for package URL
if( GetImport().IsPackageURL( maHref ) )
{
sTempRef = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
}
sTempRef += maHref;
xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ), uno::makeAny( sTempRef ) );
for( sal_Int32 nParam = 0; nParam < maParams.getLength(); ++nParam )
{