[Libreoffice-commits] core.git: sd/qa sd/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Nov 29 09:12:55 UTC 2017
sd/qa/unit/filters-test.cxx | 2 +-
sd/qa/unit/misc-tests.cxx | 2 +-
sd/qa/unit/sdmodeltestbase.hxx | 2 +-
sd/source/core/drawdoc3.cxx | 4 ++--
sd/source/filter/cgm/sdcgmfilter.cxx | 2 +-
sd/source/filter/ppt/pptin.cxx | 2 +-
sd/source/filter/xml/sdxmlwrp.cxx | 2 +-
sd/source/ui/animations/motionpathtag.cxx | 2 +-
sd/source/ui/annotations/annotationtag.cxx | 2 +-
sd/source/ui/app/sdmod1.cxx | 2 +-
sd/source/ui/dlg/sdtreelb.cxx | 2 +-
sd/source/ui/inc/DrawDocShell.hxx | 6 +++---
sd/source/ui/inc/GraphicDocShell.hxx | 4 ++--
sd/source/ui/inc/smarttag.hxx | 4 ++--
sd/source/ui/view/sdview3.cxx | 2 +-
sd/source/ui/view/viewoverlaymanager.cxx | 2 +-
16 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 084ba859b42c2b6ef6d812f3cc432b87e4385e7c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Nov 28 17:08:25 2017 +0200
loplugin:countusersofdefaultparams in sd
Change-Id: I6eb55d450d02615526e78fb69337c66c840ef8a3
Reviewed-on: https://gerrit.libreoffice.org/45463
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index 5e2a7a05eeac..e9ddadfd8806 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -69,7 +69,7 @@ bool SdFiltersTest::load(const OUString &rFilter, const OUString &rURL,
rUserData, OUString() ));
const_cast<SfxFilter*>(pFilter.get())->SetVersion(nFilterVersion);
- ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false);
+ ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false, DocumentType::Impress);
SfxMedium* pSrcMed = new SfxMedium(rURL, StreamMode::STD_READ);
pSrcMed->SetFilter(pFilter);
bool bLoaded = xDocShRef->DoLoad(pSrcMed);
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 78cf97a95361..bdd7a3f7ac8f 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -267,7 +267,7 @@ void SdMiscTest::testTdf99396TextEdit()
void SdMiscTest::testFillGradient()
{
- ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false);
+ ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false, DocumentType::Impress);
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier = getDoc( xDocShRef );
uno::Reference<drawing::XDrawPages> xDrawPages = xDrawPagesSupplier->getDrawPages();
// Insert a new page.
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 49aa48e2a552..cacd3d676f49 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -140,7 +140,7 @@ protected:
pFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
std::shared_ptr<const SfxFilter> pFilt(pFilter);
- ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false);
+ ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false, DocumentType::Impress);
SfxMedium* pSrcMed = new SfxMedium(rURL, StreamMode::STD_READ, pFilt, pParams);
if ( !xDocShRef->DoLoad(pSrcMed) || !xDocShRef.is() )
{
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index cceadbf80654..dfb48c863ffe 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -226,10 +226,10 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium* pMedium)
// If that wasn't the case, we could load the model directly.
if ( bCreateGraphicShell )
// Draw
- mxBookmarkDocShRef = new ::sd::GraphicDocShell(SfxObjectCreateMode::STANDARD, true);
+ mxBookmarkDocShRef = new ::sd::GraphicDocShell(SfxObjectCreateMode::STANDARD, true, DocumentType::Draw);
else
// Impress
- mxBookmarkDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::STANDARD, true);
+ mxBookmarkDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::STANDARD, true, DocumentType::Impress);
bOK = mxBookmarkDocShRef->DoLoad(pMedium);
if( bOK )
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 9989b3f2a891..e2cbdb930f6f 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -128,7 +128,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCGM(SvStream &rStream)
{
SdDLL::Init();
- ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false);
+ ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false, DocumentType::Impress);
CGMPointer aPointer;
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 6d1af99445f7..87928bb4655f 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2781,7 +2781,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportPPT(SvStream &rStream)
xDocStream->SetVersion(xStorage->GetVersion());
xDocStream->SetCryptMaskKey(xStorage->GetKey());
- ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false);
+ ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false, DocumentType::Impress);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
bool bRet = ImportPPT(pDoc, *xDocStream, *xStorage, aSrcMed);
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 6f5de5bad28a..85ee835876f9 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -1013,7 +1013,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODP(SvStream &rStream)
{
SdDLL::Init();
- sd::DrawDocShellRef xDocSh(new sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false));
+ sd::DrawDocShellRef xDocSh(new sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false, DocumentType::Impress));
xDocSh->DoInitNew();
uno::Reference<frame::XModel> xModel(xDocSh->GetModel());
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index ea8b5dc326c8..c4e7a8c30191 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -255,7 +255,7 @@ private:
};
SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj )
-: SmartHdl( xTag, pPathObj->GetCurrentBoundRect().TopLeft() )
+: SmartHdl( xTag, pPathObj->GetCurrentBoundRect().TopLeft(), SdrHdlKind::SmartTag )
, mpPathObj( pPathObj )
{
}
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index e7e5c1a2cba3..5a85e257bc1b 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -166,7 +166,7 @@ private:
};
AnnotationHdl::AnnotationHdl( const SmartTagReference& xTag, const Reference< XAnnotation >& xAnnotation, const Point& rPnt )
-: SmartHdl( xTag, rPnt )
+: SmartHdl( xTag, rPnt, SdrHdlKind::SmartTag )
, mxAnnotation( xAnnotation )
, mxTag( dynamic_cast< AnnotationTag* >( xTag.get() ) )
{
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 3c760b367353..715ea305341a 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -261,7 +261,7 @@ bool SdModule::OutlineToImpress(SfxRequest const & rRequest)
SfxObjectShellLock xDocShell;
::sd::DrawDocShell* pDocSh;
xDocShell = pDocSh = new ::sd::DrawDocShell(
- SfxObjectCreateMode::STANDARD, false);
+ SfxObjectCreateMode::STANDARD, false, DocumentType::Impress);
pDocSh->DoInitNew();
SdDrawDocument* pDoc = pDocSh->GetDoc();
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 7667c66db132..33329a3ea808 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -824,7 +824,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
if( pMed )
{
// in this mode the document is also owned and controlled by this instance
- mxBookmarkDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::STANDARD, true);
+ mxBookmarkDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::STANDARD, true, DocumentType::Impress);
if (mxBookmarkDocShRef->DoLoad(pMed))
mpBookmarkDoc = mxBookmarkDocShRef->GetDoc();
else
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 4f942f2cd62a..61b491565170 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -61,18 +61,18 @@ public:
DrawDocShell (
SfxObjectCreateMode eMode,
bool bSdDataObj,
- DocumentType=DocumentType::Impress);
+ DocumentType);
DrawDocShell (
SfxModelFlags nModelCreationFlags,
bool bSdDataObj,
- DocumentType=DocumentType::Impress);
+ DocumentType);
DrawDocShell (
SdDrawDocument* pDoc,
SfxObjectCreateMode eMode,
bool bSdDataObj,
- DocumentType=DocumentType::Impress);
+ DocumentType);
virtual ~DrawDocShell() override;
void UpdateRefDevice();
diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx
index a51d95ef5eee..51130fafa563 100644
--- a/sd/source/ui/inc/GraphicDocShell.hxx
+++ b/sd/source/ui/inc/GraphicDocShell.hxx
@@ -48,12 +48,12 @@ public:
GraphicDocShell (
SfxObjectCreateMode eMode,
bool bSdDataObj,
- DocumentType=DocumentType::Draw);
+ DocumentType);
GraphicDocShell (
SfxModelFlags nModelCreationFlags,
bool bSdDataObj,
- DocumentType=DocumentType::Draw);
+ DocumentType);
virtual ~GraphicDocShell() override;
};
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index fee032514086..47006f8b75b0 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/sd/source/ui/inc/smarttag.hxx
@@ -164,8 +164,8 @@ private:
class SmartHdl : public SdrHdl
{
public:
- SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind=SdrHdlKind::SmartTag );
- SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind=SdrHdlKind::SmartTag );
+ SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind );
+ SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind );
const SmartTagReference& getTag() const { return mxTag; }
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 24e22a0f0dc5..3545a22bb155 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -682,7 +682,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::DRAWING, xStm ) )
{
- DrawDocShellRef xShell = new DrawDocShell(SfxObjectCreateMode::INTERNAL, false);
+ DrawDocShellRef xShell = new DrawDocShell(SfxObjectCreateMode::INTERNAL, false, DocumentType::Impress);
xShell->DoInitNew();
SdDrawDocument* pModel = xShell->GetDoc();
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index f4070ca933b5..e48d2392979a 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -158,7 +158,7 @@ private:
};
ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSID, const Image& rImage, const Image& rImageMO*/, const Point& rPnt )
-: SmartHdl( xTag, rPnt )
+: SmartHdl( xTag, rPnt, SdrHdlKind::SmartTag )
, mxTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) )
, mnHighlightId( -1 )
, maImageSize( 42, 42 )
More information about the Libreoffice-commits
mailing list