mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS impress193

Browse Source
This commit is contained in:
Jens-Heiner Rechtien
2010-07-21 15:47:51 +02:00
parent 4e8910c5cd e757c3c766
commit 3d7da49196
7 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sfx2/source/view/frame2.cxx
View File

@@ -280,10 +280,7 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewI
aLoadArgs = aArgs.getPropertyValues();
// load the doc into that frame
::rtl::OUString sLoaderURL( rDoc.GetModel()->getURL() );
if ( sLoaderURL.getLength() == 0 )
sLoaderURL = rDoc.GetFactory().GetFactoryURL();
::rtl::OUString sLoaderURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) );
Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW );
xLoader->loadComponentFromURL(
sLoaderURL,

3
svx/inc/svx/sdrmasterpagedescriptor.hxx
View File

@@ -35,6 +35,7 @@
// predeclarations
class SdrObject;
class SfxItemSet;
class SdrPageProperties;
namespace sdr
{
@@ -89,6 +90,8 @@ namespace sdr
// operators
sal_Bool operator==(const MasterPageDescriptor& rCandidate) const;
sal_Bool operator!=(const MasterPageDescriptor& rCandidate) const;
const SdrPageProperties* getCorrectSdrPageProperties() const;
};
} // end of namespace sdr

1
svx/inc/svx/svdpage.hxx
View File

@@ -448,6 +448,7 @@ private:
public:
SdrPageProperties& getSdrPageProperties() { return *mpSdrPageProperties; }
const SdrPageProperties& getSdrPageProperties() const { return *mpSdrPageProperties; }
const SdrPageProperties* getCorrectSdrPageProperties() const;
protected:
// new MasterPageDescriptorVector

18
svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
View File

@@ -62,23 +62,7 @@ namespace sdr
{
drawinglayer::primitive2d::Primitive2DSequence xRetval;
drawinglayer::attribute::SdrFillAttribute aFill;
const SdrPage* pCorrectPage = &GetMasterPageDescriptor().GetOwnerPage();
const SdrPageProperties* pCorrectProperties = &pCorrectPage->getSdrPageProperties();
if(XFILL_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
{
pCorrectPage = &GetMasterPageDescriptor().GetUsedPage();
pCorrectProperties = &pCorrectPage->getSdrPageProperties();
}
if(pCorrectPage->IsMasterPage() && !pCorrectProperties->GetStyleSheet())
{
// #i110846# Suppress SdrPage FillStyle for MasterPages without StyleSheets,
// else the PoolDefault (XFILL_COLOR and Blue8) will be used. Normally, all
// MasterPages should have a StyleSheet excactly for this reason, but historically
// e.g. the Notes MasterPage has no StyleSheet set (and there maybe others).
pCorrectProperties = 0;
}
const SdrPageProperties* pCorrectProperties = GetMasterPageDescriptor().getCorrectSdrPageProperties();
if(pCorrectProperties)
{

23
svx/source/svdraw/sdrmasterpagedescriptor.cxx
View File

@@ -113,6 +113,29 @@ namespace sdr
|| &maUsedPage != &rCandidate.maUsedPage
|| maVisibleLayers != rCandidate.maVisibleLayers);
}
const SdrPageProperties* MasterPageDescriptor::getCorrectSdrPageProperties() const
{
const SdrPage* pCorrectPage = &GetOwnerPage();
const SdrPageProperties* pCorrectProperties = &pCorrectPage->getSdrPageProperties();
if(XFILL_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
{
pCorrectPage = &GetUsedPage();
pCorrectProperties = &pCorrectPage->getSdrPageProperties();
}
if(pCorrectPage->IsMasterPage() && !pCorrectProperties->GetStyleSheet())
{
// #i110846# Suppress SdrPage FillStyle for MasterPages without StyleSheets,
// else the PoolDefault (XFILL_COLOR and Blue8) will be used. Normally, all
// MasterPages should have a StyleSheet excactly for this reason, but historically
// e.g. the Notes MasterPage has no StyleSheet set (and there maybe others).
pCorrectProperties = 0;
}
return pCorrectProperties;
}
} // end of namespace sdr
//////////////////////////////////////////////////////////////////////////////

12
svx/source/svdraw/svdpage.cxx
View File

@@ -1979,6 +1979,18 @@ void SdrPage::ReplaceCommentByIndex(sal_uInt32 nIndex, const sdr::Comment& rNew)
}
}
const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const
{
if(mpMasterPageDescriptor)
{
return mpMasterPageDescriptor->getCorrectSdrPageProperties();
}
else
{
return &getSdrPageProperties();
}
}
//////////////////////////////////////////////////////////////////////////////
// use new redirector instead of pPaintProc

14
svx/source/unodraw/UnoGraphicExporter.cxx
View File

@@ -634,10 +634,16 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
{
if( rSettings.mbExportOnlyBackground )
{
pTempBackgroundShape = new SdrRectObj(Rectangle(Point(0,0), pPage->GetSize()));
pTempBackgroundShape->SetMergedItemSet(pPage->getSdrPageProperties().GetItemSet());
pTempBackgroundShape->SetMergedItem(XLineStyleItem(XLINE_NONE));
aShapes.push_back(pTempBackgroundShape);
const SdrPageProperties* pCorrectProperties = pPage->getCorrectSdrPageProperties();
if(pCorrectProperties)
{
pTempBackgroundShape = new SdrRectObj(Rectangle(Point(0,0), pPage->GetSize()));
pTempBackgroundShape->SetMergedItemSet(pCorrectProperties->GetItemSet());
pTempBackgroundShape->SetMergedItem(XLineStyleItem(XLINE_NONE));
pTempBackgroundShape->NbcSetStyleSheet(pCorrectProperties->GetStyleSheet(), true);
aShapes.push_back(pTempBackgroundShape);
}
}
else
{