loplugin:constparams in sd
Change-Id: I833c6da99d5ccb8f6a8b5c905bee73b75fde0a89 Reviewed-on: https://gerrit.libreoffice.org/40700 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
parent
eba883c8a2
commit
dafae0fe31
@ -1578,7 +1578,7 @@ bool PieChart::performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLab
|
|||||||
* First off the routine try to place the label inside the related pie slice,
|
* First off the routine try to place the label inside the related pie slice,
|
||||||
* if this is not possible the label is placed outside.
|
* if this is not possible the label is placed outside.
|
||||||
*/
|
*/
|
||||||
void PieChart::performLabelBestFit(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo)
|
void PieChart::performLabelBestFit(ShapeParam& rShapeParam, PieLabelInfo const & rPieLabelInfo)
|
||||||
{
|
{
|
||||||
if( m_bUseRings )
|
if( m_bUseRings )
|
||||||
return;
|
return;
|
||||||
|
@ -107,7 +107,7 @@ struct PieLabelInfo;
|
|||||||
, const css::awt::Size& rPageSize );
|
, const css::awt::Size& rPageSize );
|
||||||
|
|
||||||
bool performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLabelInfo const & rPieLabelInfo);
|
bool performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLabelInfo const & rPieLabelInfo);
|
||||||
void performLabelBestFit(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo);
|
void performLabelBestFit(ShapeParam& rShapeParam, PieLabelInfo const & rPieLabelInfo);
|
||||||
|
|
||||||
private: //member
|
private: //member
|
||||||
std::unique_ptr<PiePositionHelper>
|
std::unique_ptr<PiePositionHelper>
|
||||||
|
@ -103,6 +103,8 @@ bool ConstParams::VisitFunctionDecl(const FunctionDecl * functionDecl)
|
|||||||
if (functionDecl->getTemplatedKind() != FunctionDecl::TK_NonTemplate) {
|
if (functionDecl->getTemplatedKind() != FunctionDecl::TK_NonTemplate) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
if (functionDecl->isDeleted())
|
||||||
|
return true;
|
||||||
if (isa<CXXMethodDecl>(functionDecl)
|
if (isa<CXXMethodDecl>(functionDecl)
|
||||||
&& dyn_cast<CXXMethodDecl>(functionDecl)->getParent()->getDescribedClassTemplate() != nullptr ) {
|
&& dyn_cast<CXXMethodDecl>(functionDecl)->getParent()->getDescribedClassTemplate() != nullptr ) {
|
||||||
return true;
|
return true;
|
||||||
@ -409,7 +411,7 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVar
|
|||||||
} else if (isa<CXXDependentScopeMemberExpr>(parent)) {
|
} else if (isa<CXXDependentScopeMemberExpr>(parent)) {
|
||||||
return false;
|
return false;
|
||||||
} else if (isa<MaterializeTemporaryExpr>(parent)) {
|
} else if (isa<MaterializeTemporaryExpr>(parent)) {
|
||||||
return true;
|
return checkIfCanBeConst(parent, parmVarDecl);
|
||||||
} else if (auto conditionalExpr = dyn_cast<ConditionalOperator>(parent)) {
|
} else if (auto conditionalExpr = dyn_cast<ConditionalOperator>(parent)) {
|
||||||
if (conditionalExpr->getCond() == stmt)
|
if (conditionalExpr->getCond() == stmt)
|
||||||
return true;
|
return true;
|
||||||
@ -442,6 +444,8 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVar
|
|||||||
return checkIfCanBeConst(parent, parmVarDecl);
|
return checkIfCanBeConst(parent, parmVarDecl);
|
||||||
} else if (isa<CaseStmt>(parent)) {
|
} else if (isa<CaseStmt>(parent)) {
|
||||||
return true;
|
return true;
|
||||||
|
} else if (isa<CXXPseudoDestructorExpr>(parent)) {
|
||||||
|
return false;
|
||||||
} else {
|
} else {
|
||||||
parent->dump();
|
parent->dump();
|
||||||
parmVarDecl->dump();
|
parmVarDecl->dump();
|
||||||
|
@ -46,10 +46,10 @@ sal_uInt32 getAnnotationId(const css::uno::Reference <css::office::XAnnotation>&
|
|||||||
const SdPage* getAnnotationPage(const css::uno::Reference<css::office::XAnnotation>& xAnnotation);
|
const SdPage* getAnnotationPage(const css::uno::Reference<css::office::XAnnotation>& xAnnotation);
|
||||||
|
|
||||||
void LOKCommentNotify(CommentNotificationType nType, const SfxViewShell* pViewShell,
|
void LOKCommentNotify(CommentNotificationType nType, const SfxViewShell* pViewShell,
|
||||||
css::uno::Reference<css::office::XAnnotation>& rxAnnotation);
|
css::uno::Reference<css::office::XAnnotation> const & rxAnnotation);
|
||||||
|
|
||||||
void LOKCommentNotifyAll(CommentNotificationType nType,
|
void LOKCommentNotifyAll(CommentNotificationType nType,
|
||||||
css::uno::Reference<css::office::XAnnotation>& rxAnnotation);
|
css::uno::Reference<css::office::XAnnotation> const & rxAnnotation);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -232,7 +232,7 @@ public:
|
|||||||
CustomAnimationTextGroup( const css::uno::Reference< css::drawing::XShape >& rTarget, sal_Int32 nGroupId );
|
CustomAnimationTextGroup( const css::uno::Reference< css::drawing::XShape >& rTarget, sal_Int32 nGroupId );
|
||||||
|
|
||||||
void reset();
|
void reset();
|
||||||
void addEffect( CustomAnimationEffectPtr& pEffect );
|
void addEffect( CustomAnimationEffectPtr const & pEffect );
|
||||||
|
|
||||||
const EffectSequence& getEffects() const { return maEffects; }
|
const EffectSequence& getEffects() const { return maEffects; }
|
||||||
|
|
||||||
|
@ -63,12 +63,12 @@ public:
|
|||||||
static bool GetDimPrevious( SvxShape* pShape );
|
static bool GetDimPrevious( SvxShape* pShape );
|
||||||
static void SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos );
|
static void SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos );
|
||||||
static sal_Int32 GetPresentationOrder( SvxShape* pShape );
|
static sal_Int32 GetPresentationOrder( SvxShape* pShape );
|
||||||
static void UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInfo );
|
static void UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo const * pInfo );
|
||||||
static OUString GetSoundFile( SvxShape* pShape );
|
static OUString GetSoundFile( SvxShape* pShape );
|
||||||
static bool GetSoundOn( SvxShape* pShape );
|
static bool GetSoundOn( SvxShape* pShape );
|
||||||
|
|
||||||
static void SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj );
|
static void SetAnimationPath( SvxShape* pShape, SdrPathObj const * pPathObj );
|
||||||
static void CreateAnimatedGroup(SdrObjGroup& rGroupObj, SdPage& rPage);
|
static void CreateAnimatedGroup(SdrObjGroup const & rGroupObj, SdPage& rPage);
|
||||||
static void DocumentLoaded(SdDrawDocument & rDoc);
|
static void DocumentLoaded(SdDrawDocument & rDoc);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -265,7 +265,7 @@ private:
|
|||||||
This specifies at which object the iterator points initially.
|
This specifies at which object the iterator points initially.
|
||||||
*/
|
*/
|
||||||
static sal_Int32 GetPageIndex (
|
static sal_Int32 GetPageIndex (
|
||||||
SdDrawDocument* pDocument,
|
SdDrawDocument const * pDocument,
|
||||||
const std::shared_ptr<ViewShell>& rpViewShell,
|
const std::shared_ptr<ViewShell>& rpViewShell,
|
||||||
PageKind ePageKind,
|
PageKind ePageKind,
|
||||||
EditMode eEditMode,
|
EditMode eEditMode,
|
||||||
|
@ -70,7 +70,7 @@ private:
|
|||||||
OUString maVariantLabel;
|
OUString maVariantLabel;
|
||||||
|
|
||||||
static bool importTransitionsFile( TransitionPresetList& rList,
|
static bool importTransitionsFile( TransitionPresetList& rList,
|
||||||
css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceFactory,
|
css::uno::Reference< css::lang::XMultiServiceFactory > const & xServiceFactory,
|
||||||
const OUString& aFilename );
|
const OUString& aFilename );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ typedef std::list< AfterEffectNode > AfterEffectNodeList;
|
|||||||
|
|
||||||
/** inserts the animation node in the given AfterEffectNode at the correct position
|
/** inserts the animation node in the given AfterEffectNode at the correct position
|
||||||
in the timing hierarchy of its master */
|
in the timing hierarchy of its master */
|
||||||
SD_DLLPUBLIC void stl_process_after_effect_node_func(AfterEffectNode& rNode);
|
SD_DLLPUBLIC void stl_process_after_effect_node_func(AfterEffectNode const & rNode);
|
||||||
|
|
||||||
} // namespace sd;
|
} // namespace sd;
|
||||||
|
|
||||||
|
@ -177,8 +177,8 @@ private:
|
|||||||
::std::unique_ptr<ImpMasterPageListWatcher> mpMasterPageListWatcher;
|
::std::unique_ptr<ImpMasterPageListWatcher> mpMasterPageListWatcher;
|
||||||
|
|
||||||
SAL_DLLPRIVATE void UpdatePageObjectsInNotes(sal_uInt16 nStartPos);
|
SAL_DLLPRIVATE void UpdatePageObjectsInNotes(sal_uInt16 nStartPos);
|
||||||
SAL_DLLPRIVATE void UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_Int32 nIncrement);
|
SAL_DLLPRIVATE void UpdatePageRelativeURLs(SdPage const * pPage, sal_uInt16 nPos, sal_Int32 nIncrement);
|
||||||
SAL_DLLPRIVATE void FillOnlineSpellingList(SdPage* pPage);
|
SAL_DLLPRIVATE void FillOnlineSpellingList(SdPage const * pPage);
|
||||||
SAL_DLLPRIVATE void SpellObject(SdrTextObj* pObj);
|
SAL_DLLPRIVATE void SpellObject(SdrTextObj* pObj);
|
||||||
|
|
||||||
DECL_DLLPRIVATE_LINK(WorkStartupHdl, Timer *, void);
|
DECL_DLLPRIVATE_LINK(WorkStartupHdl, Timer *, void);
|
||||||
@ -236,7 +236,7 @@ public:
|
|||||||
If a reference document is given, the sizes and border settings of that document are used
|
If a reference document is given, the sizes and border settings of that document are used
|
||||||
for newly created slides.
|
for newly created slides.
|
||||||
*/
|
*/
|
||||||
void CreateFirstPages( SdDrawDocument* pRefDocument = nullptr );
|
void CreateFirstPages( SdDrawDocument const * pRefDocument = nullptr );
|
||||||
bool CreateMissingNotesAndHandoutPages();
|
bool CreateMissingNotesAndHandoutPages();
|
||||||
|
|
||||||
SAL_DLLPRIVATE void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) override;
|
SAL_DLLPRIVATE void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) override;
|
||||||
@ -258,7 +258,7 @@ public:
|
|||||||
std::vector<OUString> &rExchangeList, bool bLink,
|
std::vector<OUString> &rExchangeList, bool bLink,
|
||||||
bool bReplace, sal_uInt16 nPgPos,
|
bool bReplace, sal_uInt16 nPgPos,
|
||||||
::sd::DrawDocShell* pBookmarkDocSh,
|
::sd::DrawDocShell* pBookmarkDocSh,
|
||||||
Point* pObjPos);
|
Point const * pObjPos);
|
||||||
|
|
||||||
SAL_DLLPRIVATE bool IsStartWithPresentation() const { return mbStartWithPresentation;}
|
SAL_DLLPRIVATE bool IsStartWithPresentation() const { return mbStartWithPresentation;}
|
||||||
SAL_DLLPRIVATE void SetStartWithPresentation( bool bStartWithPresentation );
|
SAL_DLLPRIVATE void SetStartWithPresentation( bool bStartWithPresentation );
|
||||||
@ -332,7 +332,7 @@ public:
|
|||||||
SAL_DLLPRIVATE bool InsertBookmarkAsObject(const std::vector<OUString> &rBookmarkList,
|
SAL_DLLPRIVATE bool InsertBookmarkAsObject(const std::vector<OUString> &rBookmarkList,
|
||||||
const std::vector<OUString> &rExchangeList,
|
const std::vector<OUString> &rExchangeList,
|
||||||
::sd::DrawDocShell* pBookmarkDocSh,
|
::sd::DrawDocShell* pBookmarkDocSh,
|
||||||
Point* pObjPos, bool bCalcObjCount);
|
Point const * pObjPos, bool bCalcObjCount);
|
||||||
|
|
||||||
void CloseBookmarkDoc();
|
void CloseBookmarkDoc();
|
||||||
|
|
||||||
@ -371,7 +371,7 @@ public:
|
|||||||
|
|
||||||
sal_uInt16 GetActiveSdPageCount() const;
|
sal_uInt16 GetActiveSdPageCount() const;
|
||||||
|
|
||||||
SAL_DLLPRIVATE sal_uInt16 GetMasterPageUserCount(SdrPage* pMaster) const;
|
SAL_DLLPRIVATE sal_uInt16 GetMasterPageUserCount(SdrPage const * pMaster) const;
|
||||||
|
|
||||||
SAL_DLLPRIVATE const sd::PresentationSettings& getPresentationSettings() const { return maPresentationSettings; }
|
SAL_DLLPRIVATE const sd::PresentationSettings& getPresentationSettings() const { return maPresentationSettings; }
|
||||||
SAL_DLLPRIVATE sd::PresentationSettings& getPresentationSettings() { return maPresentationSettings; }
|
SAL_DLLPRIVATE sd::PresentationSettings& getPresentationSettings() { return maPresentationSettings; }
|
||||||
@ -408,7 +408,7 @@ public:
|
|||||||
SAL_DLLPRIVATE void StopOnlineSpelling();
|
SAL_DLLPRIVATE void StopOnlineSpelling();
|
||||||
SAL_DLLPRIVATE void StartOnlineSpelling(bool bForceSpelling=true);
|
SAL_DLLPRIVATE void StartOnlineSpelling(bool bForceSpelling=true);
|
||||||
|
|
||||||
SAL_DLLPRIVATE void ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner* pOutl);
|
SAL_DLLPRIVATE void ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner const * pOutl);
|
||||||
|
|
||||||
SAL_DLLPRIVATE void InsertObject(SdrObject* pObj);
|
SAL_DLLPRIVATE void InsertObject(SdrObject* pObj);
|
||||||
SAL_DLLPRIVATE void RemoveObject(SdrObject* pObj);
|
SAL_DLLPRIVATE void RemoveObject(SdrObject* pObj);
|
||||||
@ -441,7 +441,7 @@ public:
|
|||||||
|
|
||||||
static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
|
static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
|
||||||
|
|
||||||
SAL_DLLPRIVATE static SdIMapInfo* GetIMapInfo( SdrObject* pObject );
|
SAL_DLLPRIVATE static SdIMapInfo* GetIMapInfo( SdrObject const * pObject );
|
||||||
SAL_DLLPRIVATE static IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint );
|
SAL_DLLPRIVATE static IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint );
|
||||||
|
|
||||||
SAL_DLLPRIVATE CharClass* GetCharClass() const { return mpCharClass; }
|
SAL_DLLPRIVATE CharClass* GetCharClass() const { return mpCharClass; }
|
||||||
@ -653,7 +653,7 @@ private:
|
|||||||
page.
|
page.
|
||||||
*/
|
*/
|
||||||
SAL_DLLPRIVATE void SetupNewPage (
|
SAL_DLLPRIVATE void SetupNewPage (
|
||||||
SdPage* pPreviousPage,
|
SdPage const * pPreviousPage,
|
||||||
SdPage* pPage,
|
SdPage* pPage,
|
||||||
const OUString& sPageName,
|
const OUString& sPageName,
|
||||||
sal_uInt16 nInsertionPoint,
|
sal_uInt16 nInsertionPoint,
|
||||||
|
@ -24,9 +24,9 @@
|
|||||||
|
|
||||||
class SdDrawDocument;
|
class SdDrawDocument;
|
||||||
|
|
||||||
void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName );
|
void NotifyDocumentEvent( SdDrawDocument const * pDocument, const OUString& rEventName );
|
||||||
|
|
||||||
void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const css::uno::Reference< css::uno::XInterface >& xSource );
|
void NotifyDocumentEvent( SdDrawDocument const * pDocument, const OUString& rEventName, const css::uno::Reference< css::uno::XInterface >& xSource );
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -138,7 +138,7 @@ protected:
|
|||||||
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
|
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SfxFrame* ExecuteNewDocument( SfxRequest& rReq );
|
SfxFrame* ExecuteNewDocument( SfxRequest const & rReq );
|
||||||
|
|
||||||
static SfxFrame* CreateEmptyDocument( const css::uno::Reference< css::frame::XFrame >& i_rFrame );
|
static SfxFrame* CreateEmptyDocument( const css::uno::Reference< css::frame::XFrame >& i_rFrame );
|
||||||
static SfxFrame* CreateFromTemplate( const OUString& rTemplatePath, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
|
static SfxFrame* CreateFromTemplate( const OUString& rTemplatePath, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
|
||||||
@ -151,7 +151,7 @@ private:
|
|||||||
This typically is the unmodified request from a execute()
|
This typically is the unmodified request from a execute()
|
||||||
function from where this function is called.
|
function from where this function is called.
|
||||||
*/
|
*/
|
||||||
static bool OutlineToImpress(SfxRequest& rRequest);
|
static bool OutlineToImpress(SfxRequest const & rRequest);
|
||||||
|
|
||||||
/** Add an eventlistener as soon as possible in sd, allows to use
|
/** Add an eventlistener as soon as possible in sd, allows to use
|
||||||
remote devices to start the slideshow elegantly, and respecting
|
remote devices to start the slideshow elegantly, and respecting
|
||||||
|
@ -301,7 +301,7 @@ public:
|
|||||||
|
|
||||||
@throws css::uno::RuntimeException
|
@throws css::uno::RuntimeException
|
||||||
*/
|
*/
|
||||||
void setAnimationNode( css::uno::Reference< css::animations::XAnimationNode >& xNode );
|
void setAnimationNode( css::uno::Reference< css::animations::XAnimationNode > const & xNode );
|
||||||
|
|
||||||
/// @return a helper class to manipulate effects inside the main sequence
|
/// @return a helper class to manipulate effects inside the main sequence
|
||||||
std::shared_ptr< sd::MainSequence > const & getMainSequence();
|
std::shared_ptr< sd::MainSequence > const & getMainSequence();
|
||||||
@ -338,10 +338,10 @@ public:
|
|||||||
bool bEdit ) override;
|
bool bEdit ) override;
|
||||||
|
|
||||||
/** callback from the sd::View when a new paragraph for one object on this page is created */
|
/** callback from the sd::View when a new paragraph for one object on this page is created */
|
||||||
void onParagraphInserted( ::Outliner* pOutliner, Paragraph* pPara, SdrObject* pObj );
|
void onParagraphInserted( ::Outliner* pOutliner, Paragraph const * pPara, SdrObject* pObj );
|
||||||
|
|
||||||
/** callback from the sd::View when a paragraph from one object on this page is removed */
|
/** callback from the sd::View when a paragraph from one object on this page is removed */
|
||||||
void onParagraphRemoving( ::Outliner* pOutliner, Paragraph* pPara, SdrObject* pObj );
|
void onParagraphRemoving( ::Outliner* pOutliner, Paragraph const * pPara, SdrObject* pObj );
|
||||||
|
|
||||||
/** callback from the sd::View when an object just left text edit mode */
|
/** callback from the sd::View when an object just left text edit mode */
|
||||||
void onEndTextEdit( SdrObject* pObj );
|
void onEndTextEdit( SdrObject* pObj );
|
||||||
|
@ -79,9 +79,9 @@ public:
|
|||||||
void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
|
void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
|
||||||
void CopyGraphicSheets(SdStyleSheetPool& rSourcePool);
|
void CopyGraphicSheets(SdStyleSheetPool& rSourcePool);
|
||||||
void CopyCellSheets(SdStyleSheetPool& rSourcePool);
|
void CopyCellSheets(SdStyleSheetPool& rSourcePool);
|
||||||
void CopyTableStyles(SdStyleSheetPool& rSourcePool);
|
void CopyTableStyles(SdStyleSheetPool const & rSourcePool);
|
||||||
void CopyCellSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets);
|
void CopyCellSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets);
|
||||||
void RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix);
|
void RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets, OUString const &rRenameSuffix);
|
||||||
|
|
||||||
void CreatePseudosIfNecessary();
|
void CreatePseudosIfNecessary();
|
||||||
void UpdateStdNames();
|
void UpdateStdNames();
|
||||||
@ -90,7 +90,7 @@ public:
|
|||||||
|
|
||||||
SdDrawDocument* GetDoc() const { return mpDoc; }
|
SdDrawDocument* GetDoc() const { return mpDoc; }
|
||||||
|
|
||||||
static SdStyleSheetVector CreateChildList( SdStyleSheet* pSheet );
|
static SdStyleSheetVector CreateChildList( SdStyleSheet const * pSheet );
|
||||||
|
|
||||||
static void setDefaultOutlineNumberFormatBulletAndIndent(sal_uInt16 i, SvxNumberFormat &rNumberFormat);
|
static void setDefaultOutlineNumberFormatBulletAndIndent(sal_uInt16 i, SvxNumberFormat &rNumberFormat);
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ public:
|
|||||||
//Broadcast that a SdStyleSheet has changed, taking into account outline sublevels
|
//Broadcast that a SdStyleSheet has changed, taking into account outline sublevels
|
||||||
//which need to be explicitly broadcast as changing if their parent style was
|
//which need to be explicitly broadcast as changing if their parent style was
|
||||||
//the one that changed
|
//the one that changed
|
||||||
static void BroadcastSdStyleSheetChange(SfxStyleSheetBase* pStyleSheet, PresentationObjects ePO,
|
static void BroadcastSdStyleSheetChange(SfxStyleSheetBase const * pStyleSheet, PresentationObjects ePO,
|
||||||
SfxStyleSheetBasePool* pSSPool);
|
SfxStyleSheetBasePool* pSSPool);
|
||||||
|
|
||||||
// XInterface
|
// XInterface
|
||||||
|
@ -46,7 +46,7 @@ public:
|
|||||||
void SAL_CALL dispose();
|
void SAL_CALL dispose();
|
||||||
|
|
||||||
OutlinerParaObject* CreateText();
|
OutlinerParaObject* CreateText();
|
||||||
void SetText( OutlinerParaObject& rText );
|
void SetText( OutlinerParaObject const & rText );
|
||||||
OUString GetText();
|
OUString GetText();
|
||||||
|
|
||||||
static TextApiObject* getImplementation( const css::uno::Reference< css::text::XText >& );
|
static TextApiObject* getImplementation( const css::uno::Reference< css::text::XText >& );
|
||||||
|
@ -165,7 +165,7 @@ public:
|
|||||||
void testSmartArt1();
|
void testSmartArt1();
|
||||||
void testTdf109223();
|
void testTdf109223();
|
||||||
|
|
||||||
bool checkPattern(sd::DrawDocShellRef& rDocRef, int nShapeNumber, std::vector<sal_uInt8>& rExpected);
|
bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber, std::vector<sal_uInt8>& rExpected);
|
||||||
void testPatternImport();
|
void testPatternImport();
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE(SdImportTest);
|
CPPUNIT_TEST_SUITE(SdImportTest);
|
||||||
@ -1856,7 +1856,7 @@ bool checkPatternValues(std::vector<sal_uInt8>& rExpected, Bitmap& rBitmap)
|
|||||||
|
|
||||||
} // end anonymous namespace
|
} // end anonymous namespace
|
||||||
|
|
||||||
bool SdImportTest::checkPattern(sd::DrawDocShellRef& rDocRef, int nShapeNumber, std::vector<sal_uInt8>& rExpected)
|
bool SdImportTest::checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber, std::vector<sal_uInt8>& rExpected)
|
||||||
{
|
{
|
||||||
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(nShapeNumber, 0, rDocRef));
|
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(nShapeNumber, 0, rDocRef));
|
||||||
CPPUNIT_ASSERT_MESSAGE("Not a shape", xShape.is());
|
CPPUNIT_ASSERT_MESSAGE("Not a shape", xShape.is());
|
||||||
|
@ -1929,7 +1929,7 @@ bool stl_CustomAnimationEffect_search_node_predict::operator()( const CustomAnim
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// @throws Exception
|
/// @throws Exception
|
||||||
static bool implFindNextContainer( Reference< XTimeContainer >& xParent, Reference< XTimeContainer >& xCurrent, Reference< XTimeContainer >& xNext )
|
static bool implFindNextContainer( Reference< XTimeContainer > const & xParent, Reference< XTimeContainer > const & xCurrent, Reference< XTimeContainer >& xNext )
|
||||||
{
|
{
|
||||||
Reference< XEnumerationAccess > xEnumerationAccess( xParent, UNO_QUERY_THROW );
|
Reference< XEnumerationAccess > xEnumerationAccess( xParent, UNO_QUERY_THROW );
|
||||||
Reference< XEnumeration > xEnumeration( xEnumerationAccess->createEnumeration() );
|
Reference< XEnumeration > xEnumeration( xEnumerationAccess->createEnumeration() );
|
||||||
@ -1948,7 +1948,7 @@ static bool implFindNextContainer( Reference< XTimeContainer >& xParent, Referen
|
|||||||
return xNext.is();
|
return xNext.is();
|
||||||
}
|
}
|
||||||
|
|
||||||
void stl_process_after_effect_node_func(AfterEffectNode& rNode)
|
void stl_process_after_effect_node_func(AfterEffectNode const & rNode)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -2238,7 +2238,7 @@ void CustomAnimationTextGroup::reset()
|
|||||||
maEffects.clear();
|
maEffects.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect )
|
void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr const & pEffect )
|
||||||
{
|
{
|
||||||
maEffects.push_back( pEffect );
|
maEffects.push_back( pEffect );
|
||||||
|
|
||||||
|
@ -390,7 +390,7 @@ const deprecated_AnimationEffect_conversion_table[] =
|
|||||||
{ AnimationEffect_NONE, nullptr, nullptr }
|
{ AnimationEffect_NONE, nullptr, nullptr }
|
||||||
};
|
};
|
||||||
|
|
||||||
EffectSequence::iterator ImplFindEffect( MainSequencePtr& pMainSequence, const Reference< XShape >& rShape, sal_Int16 nSubItem )
|
EffectSequence::iterator ImplFindEffect( MainSequencePtr const & pMainSequence, const Reference< XShape >& rShape, sal_Int16 nSubItem )
|
||||||
{
|
{
|
||||||
EffectSequence::iterator aIter;
|
EffectSequence::iterator aIter;
|
||||||
|
|
||||||
@ -404,7 +404,7 @@ EffectSequence::iterator ImplFindEffect( MainSequencePtr& pMainSequence, const R
|
|||||||
return aIter;
|
return aIter;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool implIsInsideGroup( SdrObject* pObj )
|
static bool implIsInsideGroup( SdrObject const * pObj )
|
||||||
{
|
{
|
||||||
return pObj && pObj->GetObjList() && pObj->GetObjList()->GetUpList();
|
return pObj && pObj->GetObjList() && pObj->GetObjList()->GetUpList();
|
||||||
}
|
}
|
||||||
@ -1203,7 +1203,7 @@ sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape )
|
|||||||
return nFound;
|
return nFound;
|
||||||
}
|
}
|
||||||
|
|
||||||
void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInfo )
|
void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo const * pInfo )
|
||||||
{
|
{
|
||||||
if( pInfo )
|
if( pInfo )
|
||||||
{
|
{
|
||||||
@ -1277,7 +1277,7 @@ bool EffectMigration::GetSoundOn( SvxShape* pShape )
|
|||||||
return !GetSoundFile( pShape ).isEmpty();
|
return !GetSoundFile( pShape ).isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj )
|
void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj const * pPathObj )
|
||||||
{
|
{
|
||||||
if( pShape && pPathObj )
|
if( pShape && pPathObj )
|
||||||
{
|
{
|
||||||
@ -1298,7 +1298,7 @@ void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj )
|
|||||||
}
|
}
|
||||||
|
|
||||||
// #i42894# helper which creates the needed XAnimate for changing visibility and all the (currently) needed embeddings
|
// #i42894# helper which creates the needed XAnimate for changing visibility and all the (currently) needed embeddings
|
||||||
void createVisibilityOnOffNode(Reference< XTimeContainer >& rxParentContainer, SdrObject& rCandidate, bool bVisible, bool bOnClick, double fDuration)
|
void createVisibilityOnOffNode(Reference< XTimeContainer > const & rxParentContainer, SdrObject& rCandidate, bool bVisible, bool bOnClick, double fDuration)
|
||||||
{
|
{
|
||||||
Reference< XMultiServiceFactory > xMsf(::comphelper::getProcessServiceFactory());
|
Reference< XMultiServiceFactory > xMsf(::comphelper::getProcessServiceFactory());
|
||||||
|
|
||||||
@ -1356,7 +1356,7 @@ void createVisibilityOnOffNode(Reference< XTimeContainer >& rxParentContainer, S
|
|||||||
// fallback will create the needed SMIL animation stuff. Unfortunately the members of the group
|
// fallback will create the needed SMIL animation stuff. Unfortunately the members of the group
|
||||||
// have to be moved directly to the page, else the (explained to be generic, thus I expected this to
|
// have to be moved directly to the page, else the (explained to be generic, thus I expected this to
|
||||||
// work) animations will not work in slideshow
|
// work) animations will not work in slideshow
|
||||||
void EffectMigration::CreateAnimatedGroup(SdrObjGroup& rGroupObj, SdPage& rPage)
|
void EffectMigration::CreateAnimatedGroup(SdrObjGroup const & rGroupObj, SdPage& rPage)
|
||||||
{
|
{
|
||||||
// aw080 will give a vector immediately
|
// aw080 will give a vector immediately
|
||||||
SdrObjListIter aIter(rGroupObj);
|
SdrObjListIter aIter(rGroupObj);
|
||||||
|
@ -87,7 +87,7 @@ TransitionPreset::TransitionPreset( const css::uno::Reference< css::animations::
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
|
bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
|
||||||
Reference< XMultiServiceFactory >& xServiceFactory,
|
Reference< XMultiServiceFactory > const & xServiceFactory,
|
||||||
const OUString& aURL )
|
const OUString& aURL )
|
||||||
{
|
{
|
||||||
SAL_INFO("sd.transitions", "Importing " << aURL);
|
SAL_INFO("sd.transitions", "Importing " << aURL);
|
||||||
|
@ -412,7 +412,7 @@ const SdPage* getAnnotationPage(const Reference<XAnnotation>& xAnnotation)
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
std::string lcl_LOKGetCommentPayload(CommentNotificationType nType, Reference<XAnnotation>& rxAnnotation)
|
std::string lcl_LOKGetCommentPayload(CommentNotificationType nType, Reference<XAnnotation> const & rxAnnotation)
|
||||||
{
|
{
|
||||||
boost::property_tree::ptree aAnnotation;
|
boost::property_tree::ptree aAnnotation;
|
||||||
aAnnotation.put("action", (nType == CommentNotificationType::Add ? "Add" :
|
aAnnotation.put("action", (nType == CommentNotificationType::Add ? "Add" :
|
||||||
@ -439,7 +439,7 @@ std::string lcl_LOKGetCommentPayload(CommentNotificationType nType, Reference<XA
|
|||||||
}
|
}
|
||||||
} // anonymous ns
|
} // anonymous ns
|
||||||
|
|
||||||
void LOKCommentNotify(CommentNotificationType nType, const SfxViewShell* pViewShell, Reference<XAnnotation>& rxAnnotation)
|
void LOKCommentNotify(CommentNotificationType nType, const SfxViewShell* pViewShell, Reference<XAnnotation> const & rxAnnotation)
|
||||||
{
|
{
|
||||||
// callbacks only if tiled annotations are explicitly turned off by LOK client
|
// callbacks only if tiled annotations are explicitly turned off by LOK client
|
||||||
if (!comphelper::LibreOfficeKit::isActive() || comphelper::LibreOfficeKit::isTiledAnnotations())
|
if (!comphelper::LibreOfficeKit::isActive() || comphelper::LibreOfficeKit::isTiledAnnotations())
|
||||||
@ -449,7 +449,7 @@ void LOKCommentNotify(CommentNotificationType nType, const SfxViewShell* pViewSh
|
|||||||
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_COMMENT, aPayload.c_str());
|
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_COMMENT, aPayload.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
void LOKCommentNotifyAll(CommentNotificationType nType, Reference<XAnnotation>& rxAnnotation)
|
void LOKCommentNotifyAll(CommentNotificationType nType, Reference<XAnnotation> const & rxAnnotation)
|
||||||
{
|
{
|
||||||
// callbacks only if tiled annotations are explicitly turned off by LOK client
|
// callbacks only if tiled annotations are explicitly turned off by LOK client
|
||||||
if (!comphelper::LibreOfficeKit::isActive() || comphelper::LibreOfficeKit::isTiledAnnotations())
|
if (!comphelper::LibreOfficeKit::isActive() || comphelper::LibreOfficeKit::isTiledAnnotations())
|
||||||
|
@ -322,7 +322,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(const OUString& rOldName, const OUSt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_Int32 nIncrement)
|
void SdDrawDocument::UpdatePageRelativeURLs(SdPage const * pPage, sal_uInt16 nPos, sal_Int32 nIncrement)
|
||||||
{
|
{
|
||||||
bool bNotes = (pPage->GetPageKind() == PageKind::Notes);
|
bool bNotes = (pPage->GetPageKind() == PageKind::Notes);
|
||||||
|
|
||||||
@ -515,7 +515,7 @@ void SdDrawDocument::SetSelected(SdPage* pPage, bool bSelect)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If no pages exist yet, create them now
|
// If no pages exist yet, create them now
|
||||||
void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
|
void SdDrawDocument::CreateFirstPages( SdDrawDocument const * pRefDocument /* = 0 */ )
|
||||||
{
|
{
|
||||||
// If no page exists yet in the model, (File -> New), insert a page
|
// If no page exists yet in the model, (File -> New), insert a page
|
||||||
sal_uInt16 nPageCount = GetPageCount();
|
sal_uInt16 nPageCount = GetPageCount();
|
||||||
@ -1011,7 +1011,7 @@ SdAnimationInfo* SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool bCrea
|
|||||||
return pRet;
|
return pRet;
|
||||||
}
|
}
|
||||||
|
|
||||||
SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject )
|
SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject const * pObject )
|
||||||
{
|
{
|
||||||
DBG_ASSERT(pObject, "Without an object there is no IMapInfo");
|
DBG_ASSERT(pObject, "Without an object there is no IMapInfo");
|
||||||
|
|
||||||
@ -1466,7 +1466,7 @@ sal_uInt16 SdDrawDocument::InsertPageSet (
|
|||||||
}
|
}
|
||||||
|
|
||||||
void SdDrawDocument::SetupNewPage (
|
void SdDrawDocument::SetupNewPage (
|
||||||
SdPage* pPreviousPage,
|
SdPage const * pPreviousPage,
|
||||||
SdPage* pPage,
|
SdPage* pPage,
|
||||||
const OUString& sPageName,
|
const OUString& sPageName,
|
||||||
sal_uInt16 nInsertionPoint,
|
sal_uInt16 nInsertionPoint,
|
||||||
|
@ -74,12 +74,12 @@ class InsertBookmarkAsPage_FindDuplicateLayouts
|
|||||||
public:
|
public:
|
||||||
explicit InsertBookmarkAsPage_FindDuplicateLayouts( std::vector<OUString> &rLayoutsToTransfer )
|
explicit InsertBookmarkAsPage_FindDuplicateLayouts( std::vector<OUString> &rLayoutsToTransfer )
|
||||||
: mrLayoutsToTransfer(rLayoutsToTransfer) {}
|
: mrLayoutsToTransfer(rLayoutsToTransfer) {}
|
||||||
void operator()( SdDrawDocument&, SdPage*, bool, SdDrawDocument* );
|
void operator()( SdDrawDocument&, SdPage const *, bool, SdDrawDocument* );
|
||||||
private:
|
private:
|
||||||
std::vector<OUString> &mrLayoutsToTransfer;
|
std::vector<OUString> &mrLayoutsToTransfer;
|
||||||
};
|
};
|
||||||
|
|
||||||
void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage, bool bRenameDuplicates, SdDrawDocument* pBookmarkDoc )
|
void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage const * pBMMPage, bool bRenameDuplicates, SdDrawDocument* pBookmarkDoc )
|
||||||
{
|
{
|
||||||
// now check for duplicate masterpage and layout names
|
// now check for duplicate masterpage and layout names
|
||||||
|
|
||||||
@ -284,7 +284,7 @@ void SdDrawDocument::InsertBookmark(
|
|||||||
bool bReplace, // Replace current default and notes pages?
|
bool bReplace, // Replace current default and notes pages?
|
||||||
sal_uInt16 nInsertPos, // Insertion position of pages
|
sal_uInt16 nInsertPos, // Insertion position of pages
|
||||||
::sd::DrawDocShell* pBookmarkDocSh, // If set, this is the source document
|
::sd::DrawDocShell* pBookmarkDocSh, // If set, this is the source document
|
||||||
Point* pObjPos) // Insertion position of objects
|
Point const * pObjPos) // Insertion position of objects
|
||||||
{
|
{
|
||||||
bool bOK = true;
|
bool bOK = true;
|
||||||
bool bInsertPages = false;
|
bool bInsertPages = false;
|
||||||
@ -977,7 +977,7 @@ bool SdDrawDocument::InsertBookmarkAsObject(
|
|||||||
const std::vector<OUString> &rBookmarkList,
|
const std::vector<OUString> &rBookmarkList,
|
||||||
const std::vector<OUString> &rExchangeList, // List of names to use
|
const std::vector<OUString> &rExchangeList, // List of names to use
|
||||||
::sd::DrawDocShell* pBookmarkDocSh,
|
::sd::DrawDocShell* pBookmarkDocSh,
|
||||||
Point* pObjPos,
|
Point const * pObjPos,
|
||||||
bool bCalcObjCount)
|
bool bCalcObjCount)
|
||||||
{
|
{
|
||||||
bool bOK = true;
|
bool bOK = true;
|
||||||
|
@ -693,7 +693,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Number of pages that reference a master page
|
// Number of pages that reference a master page
|
||||||
sal_uInt16 SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const
|
sal_uInt16 SdDrawDocument::GetMasterPageUserCount(SdrPage const * pMaster) const
|
||||||
{
|
{
|
||||||
sal_uInt16 nResult = 0;
|
sal_uInt16 nResult = 0;
|
||||||
sal_uInt16 nPage;
|
sal_uInt16 nPage;
|
||||||
@ -774,7 +774,7 @@ void SdDrawDocument::StartOnlineSpelling(bool bForceSpelling)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Fill OnlineSpelling list
|
// Fill OnlineSpelling list
|
||||||
void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage)
|
void SdDrawDocument::FillOnlineSpellingList(SdPage const * pPage)
|
||||||
{
|
{
|
||||||
SdrObjListIter aIter(*pPage, SdrIterMode::Flat);
|
SdrObjListIter aIter(*pPage, SdrIterMode::Flat);
|
||||||
|
|
||||||
@ -957,7 +957,7 @@ IMPL_LINK(SdDrawDocument, OnlineSpellEventHdl, EditStatus&, rEditStat, void)
|
|||||||
// Callback for ExecuteSpellPopup()
|
// Callback for ExecuteSpellPopup()
|
||||||
|
|
||||||
// removed link and replaced with Imp method
|
// removed link and replaced with Imp method
|
||||||
void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner* pOutl)
|
void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner const * pOutl)
|
||||||
{
|
{
|
||||||
delete mpOnlineSearchItem;
|
delete mpOnlineSearchItem;
|
||||||
mpOnlineSearchItem = nullptr;
|
mpOnlineSearchItem = nullptr;
|
||||||
|
@ -146,7 +146,7 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage)
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
void clearChildNodes(css::uno::Reference<css::animations::XAnimationNode>& rAnimationNode)
|
void clearChildNodes(css::uno::Reference<css::animations::XAnimationNode> const & rAnimationNode)
|
||||||
{
|
{
|
||||||
css::uno::Reference<css::container::XEnumerationAccess > xEnumerationAccess(rAnimationNode, UNO_QUERY);
|
css::uno::Reference<css::container::XEnumerationAccess > xEnumerationAccess(rAnimationNode, UNO_QUERY);
|
||||||
if (!xEnumerationAccess.is())
|
if (!xEnumerationAccess.is())
|
||||||
@ -190,7 +190,7 @@ SdPage::~SdPage()
|
|||||||
|
|
||||||
struct OrdNumSorter
|
struct OrdNumSorter
|
||||||
{
|
{
|
||||||
bool operator()( SdrObject* p1, SdrObject* p2 )
|
bool operator()( SdrObject const * p1, SdrObject const * p2 )
|
||||||
{
|
{
|
||||||
return p1->GetOrdNum() < p2->GetOrdNum();
|
return p1->GetOrdNum() < p2->GetOrdNum();
|
||||||
}
|
}
|
||||||
@ -1340,7 +1340,7 @@ rtl::OUString enumtoString(AutoLayout aut)
|
|||||||
return retstr;
|
return retstr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CalcAutoLayoutRectangles( SdPage& rPage,::tools::Rectangle* rRectangle ,const rtl::OUString& sLayoutType )
|
static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* rRectangle ,const rtl::OUString& sLayoutType )
|
||||||
{
|
{
|
||||||
::tools::Rectangle aTitleRect;
|
::tools::Rectangle aTitleRect;
|
||||||
::tools::Rectangle aLayoutRect;
|
::tools::Rectangle aLayoutRect;
|
||||||
|
@ -60,7 +60,7 @@ Reference< XAnimationNode > const & SdPage::getAnimationNode()
|
|||||||
return mxAnimationNode;
|
return mxAnimationNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdPage::setAnimationNode( Reference< XAnimationNode >& xNode )
|
void SdPage::setAnimationNode( Reference< XAnimationNode > const & xNode )
|
||||||
{
|
{
|
||||||
mxAnimationNode = xNode;
|
mxAnimationNode = xNode;
|
||||||
if( mpMainSequence.get() )
|
if( mpMainSequence.get() )
|
||||||
@ -97,7 +97,7 @@ FadeEffect SdPage::GetFadeEffect() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** callback from the sd::View when a new paragraph for one object on this page is created */
|
/** callback from the sd::View when a new paragraph for one object on this page is created */
|
||||||
void SdPage::onParagraphInserted( ::Outliner* pOutliner, Paragraph* pPara, SdrObject* pObj )
|
void SdPage::onParagraphInserted( ::Outliner* pOutliner, Paragraph const * pPara, SdrObject* pObj )
|
||||||
{
|
{
|
||||||
if( mxAnimationNode.is() )
|
if( mxAnimationNode.is() )
|
||||||
{
|
{
|
||||||
@ -112,7 +112,7 @@ void SdPage::onParagraphInserted( ::Outliner* pOutliner, Paragraph* pPara, SdrOb
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** callback from the sd::View when a paragraph from one object on this page is removed */
|
/** callback from the sd::View when a paragraph from one object on this page is removed */
|
||||||
void SdPage::onParagraphRemoving( ::Outliner* pOutliner, Paragraph* pPara, SdrObject* pObj )
|
void SdPage::onParagraphRemoving( ::Outliner* pOutliner, Paragraph const * pPara, SdrObject* pObj )
|
||||||
{
|
{
|
||||||
if( mxAnimationNode.is() )
|
if( mxAnimationNode.is() )
|
||||||
{
|
{
|
||||||
|
@ -79,7 +79,7 @@ using namespace ::com::sun::star::container;
|
|||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
|
||||||
OUString lcl_findRenamedStyleName(std::vector< std::pair< OUString, OUString > > &rRenamedList, OUString& aOriginalName )
|
OUString lcl_findRenamedStyleName(std::vector< std::pair< OUString, OUString > > &rRenamedList, OUString const & aOriginalName )
|
||||||
{
|
{
|
||||||
std::vector< std::pair< OUString, OUString > >::iterator aIter;
|
std::vector< std::pair< OUString, OUString > >::iterator aIter;
|
||||||
for( aIter = rRenamedList.begin(); aIter != rRenamedList.end(); ++aIter )
|
for( aIter = rRenamedList.begin(); aIter != rRenamedList.end(); ++aIter )
|
||||||
@ -529,7 +529,7 @@ void SdStyleSheetPool::CopyCellSheets(SdStyleSheetPool& rSourcePool)
|
|||||||
CopySheets( rSourcePool, SD_STYLE_FAMILY_CELL );
|
CopySheets( rSourcePool, SD_STYLE_FAMILY_CELL );
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool& rSourcePool)
|
void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool const & rSourcePool)
|
||||||
{
|
{
|
||||||
Reference< XIndexAccess > xSource( rSourcePool.mxTableFamily, UNO_QUERY );
|
Reference< XIndexAccess > xSource( rSourcePool.mxTableFamily, UNO_QUERY );
|
||||||
Reference< XNameContainer > xTarget( mxTableFamily, UNO_QUERY );
|
Reference< XNameContainer > xTarget( mxTableFamily, UNO_QUERY );
|
||||||
@ -591,7 +591,7 @@ void SdStyleSheetPool::CopyCellSheets(SdStyleSheetPool& rSourcePool, SdStyleShee
|
|||||||
CopySheets( rSourcePool, SD_STYLE_FAMILY_CELL, rCreatedSheets );
|
CopySheets( rSourcePool, SD_STYLE_FAMILY_CELL, rCreatedSheets );
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdStyleSheetPool::RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix)
|
void SdStyleSheetPool::RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets, OUString const &rRenameSuffix)
|
||||||
{
|
{
|
||||||
CopySheets( rSourcePool, SD_STYLE_FAMILY_GRAPHICS, rCreatedSheets, rRenameSuffix );
|
CopySheets( rSourcePool, SD_STYLE_FAMILY_GRAPHICS, rCreatedSheets, rRenameSuffix );
|
||||||
}
|
}
|
||||||
@ -1397,7 +1397,7 @@ void SAL_CALL SdStyleSheetPool::removeEventListener( const Reference< XEventList
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet )
|
SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet const * pSheet )
|
||||||
{
|
{
|
||||||
SdStyleSheetVector aResult;
|
SdStyleSheetVector aResult;
|
||||||
|
|
||||||
|
@ -1309,10 +1309,10 @@ const SfxItemPropertySimpleEntry* SdStyleSheet::getPropertyMapEntry( const OUStr
|
|||||||
//Broadcast that a SdStyleSheet has changed, taking into account outline sublevels
|
//Broadcast that a SdStyleSheet has changed, taking into account outline sublevels
|
||||||
//which need to be explicitly broadcast as changing if their parent style was
|
//which need to be explicitly broadcast as changing if their parent style was
|
||||||
//the one that changed
|
//the one that changed
|
||||||
void SdStyleSheet::BroadcastSdStyleSheetChange(SfxStyleSheetBase* pStyleSheet,
|
void SdStyleSheet::BroadcastSdStyleSheetChange(SfxStyleSheetBase const * pStyleSheet,
|
||||||
PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool)
|
PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool)
|
||||||
{
|
{
|
||||||
SdStyleSheet* pRealSheet = static_cast<SdStyleSheet*>(pStyleSheet)->GetRealStyleSheet();
|
SdStyleSheet* pRealSheet = static_cast<SdStyleSheet const *>(pStyleSheet)->GetRealStyleSheet();
|
||||||
pRealSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
|
pRealSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
|
||||||
|
|
||||||
if( (ePO >= PO_OUTLINE_1) && (ePO <= PO_OUTLINE_8) )
|
if( (ePO >= PO_OUTLINE_1) && (ePO <= PO_OUTLINE_8) )
|
||||||
|
@ -102,7 +102,7 @@ public:
|
|||||||
explicit TextAPIEditSource(SdDrawDocument* pDoc);
|
explicit TextAPIEditSource(SdDrawDocument* pDoc);
|
||||||
|
|
||||||
void Dispose();
|
void Dispose();
|
||||||
void SetText( OutlinerParaObject& rText );
|
void SetText( OutlinerParaObject const & rText );
|
||||||
OutlinerParaObject* CreateText();
|
OutlinerParaObject* CreateText();
|
||||||
OUString GetText();
|
OUString GetText();
|
||||||
SdDrawDocument* GetDoc() { return m_xImpl->mpDoc; }
|
SdDrawDocument* GetDoc() { return m_xImpl->mpDoc; }
|
||||||
@ -160,7 +160,7 @@ OutlinerParaObject* TextApiObject::CreateText()
|
|||||||
return mpSource->CreateText();
|
return mpSource->CreateText();
|
||||||
}
|
}
|
||||||
|
|
||||||
void TextApiObject::SetText( OutlinerParaObject& rText )
|
void TextApiObject::SetText( OutlinerParaObject const & rText )
|
||||||
{
|
{
|
||||||
SdrModel* pModel = mpSource->GetDoc();
|
SdrModel* pModel = mpSource->GetDoc();
|
||||||
if( pModel && pModel->IsUndoEnabled() )
|
if( pModel && pModel->IsUndoEnabled() )
|
||||||
@ -237,7 +237,7 @@ SvxTextForwarder* TextAPIEditSource::GetTextForwarder()
|
|||||||
return m_xImpl->mpTextForwarder;
|
return m_xImpl->mpTextForwarder;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TextAPIEditSource::SetText( OutlinerParaObject& rText )
|
void TextAPIEditSource::SetText( OutlinerParaObject const & rText )
|
||||||
{
|
{
|
||||||
if (m_xImpl->mpDoc)
|
if (m_xImpl->mpDoc)
|
||||||
{
|
{
|
||||||
|
@ -72,9 +72,9 @@ using ::com::sun::star::beans::XPropertySet;
|
|||||||
|
|
||||||
//============================ PPTWriter ==================================
|
//============================ PPTWriter ==================================
|
||||||
|
|
||||||
PPTWriter::PPTWriter( tools::SvRef<SotStorage>& rSvStorage,
|
PPTWriter::PPTWriter( tools::SvRef<SotStorage> const & rSvStorage,
|
||||||
css::uno::Reference< css::frame::XModel > & rXModel,
|
css::uno::Reference< css::frame::XModel > const & rXModel,
|
||||||
css::uno::Reference< css::task::XStatusIndicator > & rXStatInd,
|
css::uno::Reference< css::task::XStatusIndicator > const & rXStatInd,
|
||||||
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) :
|
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) :
|
||||||
PPTWriterBase ( rXModel, rXStatInd ),
|
PPTWriterBase ( rXModel, rXStatInd ),
|
||||||
mnCnvrtFlags ( nCnvrtFlags ),
|
mnCnvrtFlags ( nCnvrtFlags ),
|
||||||
@ -553,7 +553,7 @@ void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, css::uno::Reference< css::beans::XPropertySet >& rXPagePropSet )
|
void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, css::uno::Reference< css::beans::XPropertySet > const & rXPagePropSet )
|
||||||
{
|
{
|
||||||
if ( rXPagePropSet.is() )
|
if ( rXPagePropSet.is() )
|
||||||
{
|
{
|
||||||
@ -577,7 +577,7 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, css::uno::Refere
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PPTWriter::ImplCreateHeaderFooters( css::uno::Reference< css::beans::XPropertySet >& rXPagePropSet )
|
void PPTWriter::ImplCreateHeaderFooters( css::uno::Reference< css::beans::XPropertySet > const & rXPagePropSet )
|
||||||
{
|
{
|
||||||
if ( rXPagePropSet.is() )
|
if ( rXPagePropSet.is() )
|
||||||
{
|
{
|
||||||
@ -1426,9 +1426,9 @@ bool PPTWriter::ImplWriteAtomEnding()
|
|||||||
// - exported function -
|
// - exported function -
|
||||||
|
|
||||||
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< css::beans::PropertyValue >& rMediaData,
|
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< css::beans::PropertyValue >& rMediaData,
|
||||||
tools::SvRef<SotStorage>& rSvStorage,
|
tools::SvRef<SotStorage> const & rSvStorage,
|
||||||
css::uno::Reference< css::frame::XModel > & rXModel,
|
css::uno::Reference< css::frame::XModel > const & rXModel,
|
||||||
css::uno::Reference< css::task::XStatusIndicator > & rXStatInd,
|
css::uno::Reference< css::task::XStatusIndicator > const & rXStatInd,
|
||||||
SvMemoryStream* pVBA,
|
SvMemoryStream* pVBA,
|
||||||
sal_uInt32 nCnvrtFlags )
|
sal_uInt32 nCnvrtFlags )
|
||||||
{
|
{
|
||||||
|
@ -137,8 +137,8 @@ struct TextRuleEntry
|
|||||||
class TextObjBinary : public TextObj
|
class TextObjBinary : public TextObj
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
TextObjBinary( css::uno::Reference< css::text::XSimpleText > &
|
TextObjBinary( css::uno::Reference< css::text::XSimpleText > const & rXText,
|
||||||
rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv ) : TextObj( rXText, nInstance, rFontCollection, rBuProv ) {}
|
int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv ) : TextObj( rXText, nInstance, rFontCollection, rBuProv ) {}
|
||||||
void Write( SvStream* pStrm );
|
void Write( SvStream* pStrm );
|
||||||
void WriteTextSpecInfo( SvStream* pStrm );
|
void WriteTextSpecInfo( SvStream* pStrm );
|
||||||
};
|
};
|
||||||
@ -204,8 +204,8 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
|
|||||||
bool ImplCreateDocumentSummaryInformation();
|
bool ImplCreateDocumentSummaryInformation();
|
||||||
bool ImplCreateCurrentUserStream();
|
bool ImplCreateCurrentUserStream();
|
||||||
static void ImplCreateHeaderFooterStrings( SvStream& rOut,
|
static void ImplCreateHeaderFooterStrings( SvStream& rOut,
|
||||||
css::uno::Reference< css::beans::XPropertySet >& rXPagePropSet );
|
css::uno::Reference< css::beans::XPropertySet > const & rXPagePropSet );
|
||||||
void ImplCreateHeaderFooters( css::uno::Reference< css::beans::XPropertySet >& rXPagePropSet );
|
void ImplCreateHeaderFooters( css::uno::Reference< css::beans::XPropertySet > const & rXPagePropSet );
|
||||||
virtual bool ImplCreateDocument() override;
|
virtual bool ImplCreateDocument() override;
|
||||||
void ImplCreateHyperBlob( SvMemoryStream& rStream );
|
void ImplCreateHyperBlob( SvMemoryStream& rStream );
|
||||||
sal_uInt32 ImplInsertBookmarkURL( const OUString& rBookmark, const sal_uInt32 nType,
|
sal_uInt32 ImplInsertBookmarkURL( const OUString& rBookmark, const sal_uInt32 nType,
|
||||||
@ -239,7 +239,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
|
|||||||
bool bMaster,
|
bool bMaster,
|
||||||
int nPageNumber = 0 );
|
int nPageNumber = 0 );
|
||||||
bool ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 );
|
bool ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 );
|
||||||
void ImplCreateTable( css::uno::Reference< css::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,
|
void ImplCreateTable( css::uno::Reference< css::drawing::XShape > const & rXShape, EscherSolverContainer& aSolverContainer,
|
||||||
EscherPropertyContainer& aPropOpt );
|
EscherPropertyContainer& aPropOpt );
|
||||||
|
|
||||||
bool ImplCloseDocument(); // we write the font, hyper and sound list
|
bool ImplCloseDocument(); // we write the font, hyper and sound list
|
||||||
@ -250,9 +250,9 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
|
|||||||
virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, css::uno::Reference< css::beans::XPropertySet > const & aXBackgroundPropSet ) override;
|
virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, css::uno::Reference< css::beans::XPropertySet > const & aXBackgroundPropSet ) override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PPTWriter( tools::SvRef<SotStorage>& rSvStorage,
|
PPTWriter( tools::SvRef<SotStorage> const & rSvStorage,
|
||||||
css::uno::Reference< css::frame::XModel > & rModel,
|
css::uno::Reference< css::frame::XModel > const & rModel,
|
||||||
css::uno::Reference< css::task::XStatusIndicator > & rStatInd,
|
css::uno::Reference< css::task::XStatusIndicator > const & rStatInd,
|
||||||
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags );
|
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags );
|
||||||
|
|
||||||
virtual ~PPTWriter() override;
|
virtual ~PPTWriter() override;
|
||||||
|
@ -99,7 +99,7 @@ protected:
|
|||||||
|
|
||||||
static void WriteAnimateTo( const ::sax_fastparser::FSHelperPtr& pFS, const css::uno::Any& rValue, const OUString& rAttributeName );
|
static void WriteAnimateTo( const ::sax_fastparser::FSHelperPtr& pFS, const css::uno::Any& rValue, const OUString& rAttributeName );
|
||||||
static void WriteAnimateValues( const ::sax_fastparser::FSHelperPtr& pFS, const css::uno::Reference< css::animations::XAnimate >& rXAnimate );
|
static void WriteAnimateValues( const ::sax_fastparser::FSHelperPtr& pFS, const css::uno::Reference< css::animations::XAnimate >& rXAnimate );
|
||||||
static void WriteAnimationCondition( const ::sax_fastparser::FSHelperPtr& pFS, css::uno::Any& rAny, bool bWriteEvent, bool bMainSeqChild );
|
static void WriteAnimationCondition( const ::sax_fastparser::FSHelperPtr& pFS, css::uno::Any const & rAny, bool bWriteEvent, bool bMainSeqChild );
|
||||||
static void WriteAnimationCondition( const ::sax_fastparser::FSHelperPtr& pFS, const char* pDelay, const char* pEvent, double fDelay, bool bHasFDelay );
|
static void WriteAnimationCondition( const ::sax_fastparser::FSHelperPtr& pFS, const char* pDelay, const char* pEvent, double fDelay, bool bHasFDelay );
|
||||||
void WriteAnimations( const ::sax_fastparser::FSHelperPtr& pFS );
|
void WriteAnimations( const ::sax_fastparser::FSHelperPtr& pFS );
|
||||||
static void WriteAnimationAttributeName( const ::sax_fastparser::FSHelperPtr& pFS, const OUString& rAttributeName );
|
static void WriteAnimationAttributeName( const ::sax_fastparser::FSHelperPtr& pFS, const OUString& rAttributeName );
|
||||||
|
@ -2961,7 +2961,7 @@ bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 n
|
|||||||
sal_Int32 GetCellRight( sal_Int32 nColumn,
|
sal_Int32 GetCellRight( sal_Int32 nColumn,
|
||||||
::tools::Rectangle& rect,
|
::tools::Rectangle& rect,
|
||||||
std::vector< std::pair< sal_Int32, sal_Int32 > >& aColumns,
|
std::vector< std::pair< sal_Int32, sal_Int32 > >& aColumns,
|
||||||
uno::Reference< table::XMergeableCell >& xCell )
|
uno::Reference< table::XMergeableCell > const & xCell )
|
||||||
{
|
{
|
||||||
sal_Int32 nRight = aColumns[ nColumn ].first + aColumns[ nColumn ].second;
|
sal_Int32 nRight = aColumns[ nColumn ].first + aColumns[ nColumn ].second;
|
||||||
for ( sal_Int32 nColumnSpan = 1; nColumnSpan < xCell->getColumnSpan(); nColumnSpan++ )
|
for ( sal_Int32 nColumnSpan = 1; nColumnSpan < xCell->getColumnSpan(); nColumnSpan++ )
|
||||||
@ -2978,7 +2978,7 @@ sal_Int32 GetCellRight( sal_Int32 nColumn,
|
|||||||
sal_Int32 GetCellBottom( sal_Int32 nRow,
|
sal_Int32 GetCellBottom( sal_Int32 nRow,
|
||||||
::tools::Rectangle& rect,
|
::tools::Rectangle& rect,
|
||||||
std::vector< std::pair< sal_Int32, sal_Int32 > >& aRows,
|
std::vector< std::pair< sal_Int32, sal_Int32 > >& aRows,
|
||||||
uno::Reference< table::XMergeableCell >& xCell )
|
uno::Reference< table::XMergeableCell > const & xCell )
|
||||||
{
|
{
|
||||||
sal_Int32 nBottom = aRows[nRow].first + aRows[nRow].second;
|
sal_Int32 nBottom = aRows[nRow].first + aRows[nRow].second;
|
||||||
for ( sal_Int32 nRowSpan = 1; nRowSpan < xCell->getRowSpan(); nRowSpan++ )
|
for ( sal_Int32 nRowSpan = 1; nRowSpan < xCell->getRowSpan(); nRowSpan++ )
|
||||||
@ -3020,7 +3020,7 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,
|
void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape > const & rXShape, EscherSolverContainer& aSolverContainer,
|
||||||
EscherPropertyContainer& aPropOpt )
|
EscherPropertyContainer& aPropOpt )
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -203,7 +203,7 @@ void PptEscherEx::CloseContainer()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sal_uInt32 PptEscherEx::EnterGroup( ::tools::Rectangle* pBoundRect, SvMemoryStream* pClientData )
|
sal_uInt32 PptEscherEx::EnterGroup( ::tools::Rectangle const * pBoundRect, SvMemoryStream* pClientData )
|
||||||
{
|
{
|
||||||
sal_uInt32 nShapeId = 0;
|
sal_uInt32 nShapeId = 0;
|
||||||
/* SJ: #Issue 26747#
|
/* SJ: #Issue 26747#
|
||||||
|
@ -54,7 +54,7 @@ class PptEscherEx : public EscherEx
|
|||||||
void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 ) override;
|
void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 ) override;
|
||||||
void CloseContainer() override;
|
void CloseContainer() override;
|
||||||
|
|
||||||
sal_uInt32 EnterGroup( ::tools::Rectangle* pBoundRect, SvMemoryStream* pClientData );
|
sal_uInt32 EnterGroup( ::tools::Rectangle const * pBoundRect, SvMemoryStream* pClientData );
|
||||||
|
|
||||||
sal_uInt32 DrawingGroupContainerSize();
|
sal_uInt32 DrawingGroupContainerSize();
|
||||||
void WriteDrawingGroupContainer( SvStream& rSt );
|
void WriteDrawingGroupContainer( SvStream& rSt );
|
||||||
|
@ -30,7 +30,7 @@ struct GroupEntry
|
|||||||
sal_uInt32 mnCount;
|
sal_uInt32 mnCount;
|
||||||
css::uno::Reference< css::container::XIndexAccess > mXIndexAccess;
|
css::uno::Reference< css::container::XIndexAccess > mXIndexAccess;
|
||||||
|
|
||||||
explicit GroupEntry( css::uno::Reference< css::container::XIndexAccess > & rIndex )
|
explicit GroupEntry( css::uno::Reference< css::container::XIndexAccess > const & rIndex )
|
||||||
{
|
{
|
||||||
mXIndexAccess = rIndex;
|
mXIndexAccess = rIndex;
|
||||||
mnCount =mXIndexAccess->getCount();
|
mnCount =mXIndexAccess->getCount();
|
||||||
@ -62,7 +62,7 @@ class GroupTable
|
|||||||
sal_uInt32 GetGroupsClosed();
|
sal_uInt32 GetGroupsClosed();
|
||||||
void ResetGroupTable( sal_uInt32 nCount );
|
void ResetGroupTable( sal_uInt32 nCount );
|
||||||
void ClearGroupTable();
|
void ClearGroupTable();
|
||||||
bool EnterGroup( css::uno::Reference< css::container::XIndexAccess > & rIndex );
|
bool EnterGroup( css::uno::Reference< css::container::XIndexAccess > const & rIndex );
|
||||||
bool GetNextGroupEntry();
|
bool GetNextGroupEntry();
|
||||||
GroupTable();
|
GroupTable();
|
||||||
~GroupTable();
|
~GroupTable();
|
||||||
|
@ -1027,7 +1027,7 @@ void PowerPointExport::WriteAnimationCondition( const FSHelperPtr& pFS, const ch
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PowerPointExport::WriteAnimationCondition( const FSHelperPtr& pFS, Any& rAny, bool bWriteEvent, bool bMainSeqChild )
|
void PowerPointExport::WriteAnimationCondition( const FSHelperPtr& pFS, Any const & rAny, bool bWriteEvent, bool bMainSeqChild )
|
||||||
{
|
{
|
||||||
bool bHasFDelay = false;
|
bool bHasFDelay = false;
|
||||||
double fDelay = 0;
|
double fDelay = 0;
|
||||||
|
@ -32,7 +32,7 @@ GroupTable::~GroupTable()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GroupTable::EnterGroup( css::uno::Reference< css::container::XIndexAccess >& rXIndexAccessRef )
|
bool GroupTable::EnterGroup( css::uno::Reference< css::container::XIndexAccess > const & rXIndexAccessRef )
|
||||||
{
|
{
|
||||||
bool bRet = false;
|
bool bRet = false;
|
||||||
if ( rXIndexAccessRef.is() )
|
if ( rXIndexAccessRef.is() )
|
||||||
|
@ -677,7 +677,7 @@ ParagraphObj::ParagraphObj(const css::uno::Reference< css::beans::XPropertySet >
|
|||||||
ImplGetParagraphValues( pProv, false );
|
ImplGetParagraphValues( pProv, false );
|
||||||
}
|
}
|
||||||
|
|
||||||
ParagraphObj::ParagraphObj(css::uno::Reference< css::text::XTextContent > & rXTextContent,
|
ParagraphObj::ParagraphObj(css::uno::Reference< css::text::XTextContent > const & rXTextContent,
|
||||||
ParaFlags aParaFlags, FontCollection& rFontCollection, PPTExBulletProvider& rProv )
|
ParaFlags aParaFlags, FontCollection& rFontCollection, PPTExBulletProvider& rProv )
|
||||||
: PropStateValue()
|
: PropStateValue()
|
||||||
, SOParagraph()
|
, SOParagraph()
|
||||||
@ -1298,7 +1298,7 @@ ImplTextObj::~ImplTextObj()
|
|||||||
delete *it;
|
delete *it;
|
||||||
}
|
}
|
||||||
|
|
||||||
TextObj::TextObj( css::uno::Reference< css::text::XSimpleText > & rXTextRef,
|
TextObj::TextObj( css::uno::Reference< css::text::XSimpleText > const & rXTextRef,
|
||||||
int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rProv ):
|
int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rProv ):
|
||||||
mpImplTextObj(new ImplTextObj(nInstance))
|
mpImplTextObj(new ImplTextObj(nInstance))
|
||||||
{
|
{
|
||||||
|
@ -215,7 +215,7 @@ class ParagraphObj : public PropStateValue, public SOParagraph
|
|||||||
bool mbParagraphPunctation;
|
bool mbParagraphPunctation;
|
||||||
sal_uInt16 mnBiDi;
|
sal_uInt16 mnBiDi;
|
||||||
|
|
||||||
ParagraphObj( css::uno::Reference< css::text::XTextContent > & rXTextContentRef,
|
ParagraphObj( css::uno::Reference< css::text::XTextContent > const & rXTextContentRef,
|
||||||
ParaFlags, FontCollection& rFontCollection,
|
ParaFlags, FontCollection& rFontCollection,
|
||||||
PPTExBulletProvider& rBuProv );
|
PPTExBulletProvider& rBuProv );
|
||||||
ParagraphObj( const ParagraphObj& rParargraphObj );
|
ParagraphObj( const ParagraphObj& rParargraphObj );
|
||||||
@ -246,7 +246,7 @@ class TextObj
|
|||||||
void ImplCalculateTextPositions();
|
void ImplCalculateTextPositions();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TextObj( css::uno::Reference< css::text::XSimpleText > &
|
TextObj( css::uno::Reference< css::text::XSimpleText > const &
|
||||||
rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv );
|
rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv );
|
||||||
|
|
||||||
ParagraphObj* GetParagraph(int idx);
|
ParagraphObj* GetParagraph(int idx);
|
||||||
|
@ -64,8 +64,8 @@ void SdHtmlAttrPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools:
|
|||||||
rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_VLINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
|
rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_VLINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdHtmlAttrPreview::SetColors(Color& aBack, Color& aText, Color& aLink,
|
void SdHtmlAttrPreview::SetColors(Color const & aBack, Color const & aText, Color const & aLink,
|
||||||
Color& aVLink, Color& aALink)
|
Color const & aVLink, Color const & aALink)
|
||||||
{
|
{
|
||||||
m_aBackColor = aBack;
|
m_aBackColor = aBack;
|
||||||
m_aTextColor = aText;
|
m_aTextColor = aText;
|
||||||
|
@ -36,8 +36,8 @@ public:
|
|||||||
|
|
||||||
virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override;
|
virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override;
|
||||||
|
|
||||||
void SetColors( Color& aBack, Color& aText, Color& aLink,
|
void SetColors( Color const & aBack, Color const & aText, Color const & aLink,
|
||||||
Color& aVLink, Color& aALink );
|
Color const & aVLink, Color const & aALink );
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // INCLUDED_SD_SOURCE_FILTER_HTML_HTMLATTR_HXX
|
#endif // INCLUDED_SD_SOURCE_FILTER_HTML_HTMLATTR_HXX
|
||||||
|
@ -1031,7 +1031,7 @@ bool HtmlExport::CreateImagesForPresPages( bool bThumbnail)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// get SdrTextObject with layout text of this page
|
// get SdrTextObject with layout text of this page
|
||||||
SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage)
|
SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage const * pPage)
|
||||||
{
|
{
|
||||||
const size_t nObjectCount = pPage->GetObjCount();
|
const size_t nObjectCount = pPage->GetObjCount();
|
||||||
SdrTextObj* pResult = nullptr;
|
SdrTextObj* pResult = nullptr;
|
||||||
@ -1206,7 +1206,7 @@ OUString HtmlExport::CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// creates a outliner text for a page
|
// creates a outliner text for a page
|
||||||
OUString HtmlExport::CreateTextForPage(SdrOutliner* pOutliner, SdPage* pPage,
|
OUString HtmlExport::CreateTextForPage(SdrOutliner* pOutliner, SdPage const * pPage,
|
||||||
bool bHeadLine, const Color& rBackgroundColor)
|
bool bHeadLine, const Color& rBackgroundColor)
|
||||||
{
|
{
|
||||||
OUStringBuffer aStr;
|
OUStringBuffer aStr;
|
||||||
@ -1264,7 +1264,7 @@ OUString HtmlExport::CreateTextForPage(SdrOutliner* pOutliner, SdPage* pPage,
|
|||||||
return aStr.makeStringAndClear();
|
return aStr.makeStringAndClear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void HtmlExport::WriteTable(OUStringBuffer& aStr, SdrTableObj* pTableObject, SdrOutliner* pOutliner, const Color& rBackgroundColor)
|
void HtmlExport::WriteTable(OUStringBuffer& aStr, SdrTableObj const * pTableObject, SdrOutliner* pOutliner, const Color& rBackgroundColor)
|
||||||
{
|
{
|
||||||
CellPos aStart, aEnd;
|
CellPos aStart, aEnd;
|
||||||
|
|
||||||
@ -1292,7 +1292,7 @@ void HtmlExport::WriteTable(OUStringBuffer& aStr, SdrTableObj* pTableObject, Sdr
|
|||||||
aStr.append("</table>\r\n");
|
aStr.append("</table>\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
void HtmlExport::WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup* pObjectGroup, SdrOutliner* pOutliner,
|
void HtmlExport::WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup const * pObjectGroup, SdrOutliner* pOutliner,
|
||||||
const Color& rBackgroundColor, bool bHeadLine)
|
const Color& rBackgroundColor, bool bHeadLine)
|
||||||
{
|
{
|
||||||
SdrObjListIter aGroupIterator(*pObjectGroup->GetSubList(), SdrIterMode::DeepNoGroups);
|
SdrObjListIter aGroupIterator(*pObjectGroup->GetSubList(), SdrIterMode::DeepNoGroups);
|
||||||
@ -1316,7 +1316,7 @@ void HtmlExport::WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup* pObjectGrou
|
|||||||
}
|
}
|
||||||
|
|
||||||
void HtmlExport::WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner* pOutliner,
|
void HtmlExport::WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner* pOutliner,
|
||||||
OutlinerParaObject* pOutlinerParagraphObject,
|
OutlinerParaObject const * pOutlinerParagraphObject,
|
||||||
const Color& rBackgroundColor, bool bHeadLine)
|
const Color& rBackgroundColor, bool bHeadLine)
|
||||||
{
|
{
|
||||||
if (pOutlinerParagraphObject == nullptr)
|
if (pOutlinerParagraphObject == nullptr)
|
||||||
@ -1405,7 +1405,7 @@ OUString HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// converts a paragraph of the outliner to html
|
// converts a paragraph of the outliner to html
|
||||||
OUString HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nPara, const Color& rBackgroundColor )
|
OUString HtmlExport::ParagraphToHTMLString( SdrOutliner const * pOutliner, sal_Int32 nPara, const Color& rBackgroundColor )
|
||||||
{
|
{
|
||||||
OUStringBuffer aStr;
|
OUStringBuffer aStr;
|
||||||
|
|
||||||
@ -1450,7 +1450,7 @@ OUString HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nP
|
|||||||
// Depending on the attributes of the specified set and the specified
|
// Depending on the attributes of the specified set and the specified
|
||||||
// HtmlState, it creates the needed html tags in order to get the
|
// HtmlState, it creates the needed html tags in order to get the
|
||||||
// attributes
|
// attributes
|
||||||
OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor )
|
OUString HtmlExport::TextAttribToHTMLString( SfxItemSet const * pSet, HtmlState* pState, const Color& rBackgroundColor )
|
||||||
{
|
{
|
||||||
OUStringBuffer aStr;
|
OUStringBuffer aStr;
|
||||||
|
|
||||||
@ -3052,7 +3052,7 @@ bool HtmlExport::CopyFile( const OUString& rSourceFile, const OUString& rDestFil
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool HtmlExport::checkFileExists( Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess, OUString const & aFileName )
|
bool HtmlExport::checkFileExists( Reference< css::ucb::XSimpleFileAccess3 > const & xFileAccess, OUString const & aFileName )
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -143,7 +143,7 @@ class HtmlExport final
|
|||||||
|
|
||||||
std::unique_ptr< ButtonSet > mpButtonSet;
|
std::unique_ptr< ButtonSet > mpButtonSet;
|
||||||
|
|
||||||
static SdrTextObj* GetLayoutTextObject(SdrPage* pPage);
|
static SdrTextObj* GetLayoutTextObject(SdrPage const * pPage);
|
||||||
|
|
||||||
void SetDocColors( SdPage* pPage = nullptr );
|
void SetDocColors( SdPage* pPage = nullptr );
|
||||||
|
|
||||||
@ -164,7 +164,7 @@ class HtmlExport final
|
|||||||
bool CreateImageNumberFile();
|
bool CreateImageNumberFile();
|
||||||
|
|
||||||
bool checkForExistingFiles();
|
bool checkForExistingFiles();
|
||||||
bool checkFileExists( css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess, OUString const & aFileName );
|
bool checkFileExists( css::uno::Reference< css::ucb::XSimpleFileAccess3 > const & xFileAccess, OUString const & aFileName );
|
||||||
|
|
||||||
OUString const & getDocumentTitle();
|
OUString const & getDocumentTitle();
|
||||||
bool SavePresentation();
|
bool SavePresentation();
|
||||||
@ -175,11 +175,11 @@ class HtmlExport final
|
|||||||
OUString CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const;
|
OUString CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const;
|
||||||
OUString CreateBodyTag() const;
|
OUString CreateBodyTag() const;
|
||||||
|
|
||||||
OUString ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nPara, const Color& rBackgroundColor );
|
OUString ParagraphToHTMLString( SdrOutliner const * pOutliner, sal_Int32 nPara, const Color& rBackgroundColor );
|
||||||
OUString TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor );
|
OUString TextAttribToHTMLString( SfxItemSet const * pSet, HtmlState* pState, const Color& rBackgroundColor );
|
||||||
|
|
||||||
OUString CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor );
|
OUString CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor );
|
||||||
OUString CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor );
|
OUString CreateTextForPage( SdrOutliner* pOutliner, SdPage const * pPage, bool bHeadLine, const Color& rBackgroundColor );
|
||||||
OUString CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor );
|
OUString CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor );
|
||||||
|
|
||||||
static OUString CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX,
|
static OUString CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX,
|
||||||
@ -213,13 +213,13 @@ class HtmlExport final
|
|||||||
static OUString GetButtonName( int nButton );
|
static OUString GetButtonName( int nButton );
|
||||||
|
|
||||||
void WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner* pOutliner,
|
void WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner* pOutliner,
|
||||||
OutlinerParaObject* pOutlinerParagraphObject,
|
OutlinerParaObject const * pOutlinerParagraphObject,
|
||||||
const Color& rBackgroundColor, bool bHeadLine);
|
const Color& rBackgroundColor, bool bHeadLine);
|
||||||
|
|
||||||
void WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup* pObjectGroup,
|
void WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup const * pObjectGroup,
|
||||||
SdrOutliner* pOutliner, const Color& rBackgroundColor, bool bHeadLine);
|
SdrOutliner* pOutliner, const Color& rBackgroundColor, bool bHeadLine);
|
||||||
|
|
||||||
void WriteTable(OUStringBuffer& aStr, sdr::table::SdrTableObj* pTableObject,
|
void WriteTable(OUStringBuffer& aStr, sdr::table::SdrTableObj const * pTableObject,
|
||||||
SdrOutliner* pOutliner, const Color& rBackgroundColor);
|
SdrOutliner* pOutliner, const Color& rBackgroundColor);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -868,7 +868,7 @@ bool AnimationImporter::convertAnimationValue( oox::ppt::MS_AttributeNames eAttr
|
|||||||
return bRet;
|
return bRet;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const AnimationNode& rNode, const PropertySet& rSet )
|
void AnimationImporter::fillNode( Reference< XAnimationNode > const & xNode, const AnimationNode& rNode, const PropertySet& rSet )
|
||||||
{
|
{
|
||||||
bool bAfterEffect = false;
|
bool bAfterEffect = false;
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ private:
|
|||||||
void importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames );
|
void importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames );
|
||||||
void importTargetElementContainer( const Atom* pAtom, css::uno::Any& rTarget, sal_Int16& nSubType );
|
void importTargetElementContainer( const Atom* pAtom, css::uno::Any& rTarget, sal_Int16& nSubType );
|
||||||
|
|
||||||
static void fillNode( css::uno::Reference< css::animations::XAnimationNode >& xTiming, const AnimationNode& rNode, const PropertySet& rSet );
|
static void fillNode( css::uno::Reference< css::animations::XAnimationNode > const & xTiming, const AnimationNode& rNode, const PropertySet& rSet );
|
||||||
static css::uno::Reference< css::animations::XAnimationNode > createNode( const Atom* pAtom, const AnimationNode& rNode );
|
static css::uno::Reference< css::animations::XAnimationNode > createNode( const Atom* pAtom, const AnimationNode& rNode );
|
||||||
|
|
||||||
bool convertAnimationNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, const css::uno::Reference< css::animations::XAnimationNode >& xParent );
|
bool convertAnimationNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, const css::uno::Reference< css::animations::XAnimationNode >& xParent );
|
||||||
|
@ -50,7 +50,7 @@ public:
|
|||||||
void transformStyles( SfxStyleFamily eFam );
|
void transformStyles( SfxStyleFamily eFam );
|
||||||
void transformStyle( SfxStyleSheetBase& rSheet );
|
void transformStyle( SfxStyleSheetBase& rSheet );
|
||||||
|
|
||||||
void transformShapes( SdrObjList& rShapes );
|
void transformShapes( SdrObjList const & rShapes );
|
||||||
void transformShape( SdrObject& rObj );
|
void transformShape( SdrObject& rObj );
|
||||||
|
|
||||||
void transformTextShape( SdrTextObj& rTextShape );
|
void transformTextShape( SdrTextObj& rTextShape );
|
||||||
@ -152,7 +152,7 @@ void SdTransformOOo2xDocument::transformStyle( SfxStyleSheetBase& rSheet )
|
|||||||
removeAlienAttributes( rSet );
|
removeAlienAttributes( rSet );
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdTransformOOo2xDocument::transformShapes( SdrObjList& rShapes )
|
void SdTransformOOo2xDocument::transformShapes( SdrObjList const & rShapes )
|
||||||
{
|
{
|
||||||
const size_t nShapeCount = rShapes.GetObjCount();
|
const size_t nShapeCount = rShapes.GetObjCount();
|
||||||
for( size_t nShape = 0; nShape < nShapeCount; ++nShape )
|
for( size_t nShape = 0; nShape < nShapeCount; ++nShape )
|
||||||
|
@ -171,7 +171,7 @@ ErrCode ReadThroughComponent(
|
|||||||
const Reference<io::XInputStream>& xInputStream,
|
const Reference<io::XInputStream>& xInputStream,
|
||||||
const Reference<XComponent>& xModelComponent,
|
const Reference<XComponent>& xModelComponent,
|
||||||
const OUString& rStreamName,
|
const OUString& rStreamName,
|
||||||
Reference<uno::XComponentContext> & rxContext,
|
Reference<uno::XComponentContext> const & rxContext,
|
||||||
const sal_Char* pFilterName,
|
const sal_Char* pFilterName,
|
||||||
const Sequence<Any>& rFilterArguments,
|
const Sequence<Any>& rFilterArguments,
|
||||||
const OUString& rName,
|
const OUString& rName,
|
||||||
@ -297,7 +297,7 @@ ErrCode ReadThroughComponent(
|
|||||||
const Reference<XComponent>& xModelComponent,
|
const Reference<XComponent>& xModelComponent,
|
||||||
const sal_Char* pStreamName,
|
const sal_Char* pStreamName,
|
||||||
const sal_Char* pCompatibilityStreamName,
|
const sal_Char* pCompatibilityStreamName,
|
||||||
Reference<uno::XComponentContext> & rxContext,
|
Reference<uno::XComponentContext> const & rxContext,
|
||||||
const sal_Char* pFilterName,
|
const sal_Char* pFilterName,
|
||||||
const Sequence<Any>& rFilterArguments,
|
const Sequence<Any>& rFilterArguments,
|
||||||
const OUString& rName,
|
const OUString& rName,
|
||||||
|
@ -990,7 +990,7 @@ public:
|
|||||||
void update( STLPropertySet* pSet );
|
void update( STLPropertySet* pSet );
|
||||||
DECL_LINK( implSelectHdl, ListBox&, void );
|
DECL_LINK( implSelectHdl, ListBox&, void );
|
||||||
DECL_LINK( implClickHdl, Button*, void );
|
DECL_LINK( implClickHdl, Button*, void );
|
||||||
void implHdl(Control*);
|
void implHdl(Control const *);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateControlStates();
|
void updateControlStates();
|
||||||
@ -1282,7 +1282,7 @@ IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, ListBox&, rListBox, void
|
|||||||
implHdl(&rListBox);
|
implHdl(&rListBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CustomAnimationEffectTabPage::implHdl(Control* pControl )
|
void CustomAnimationEffectTabPage::implHdl(Control const * pControl )
|
||||||
{
|
{
|
||||||
if( pControl == mpLBTextAnim )
|
if( pControl == mpLBTextAnim )
|
||||||
{
|
{
|
||||||
@ -1558,7 +1558,7 @@ public:
|
|||||||
DECL_LINK( implControlHdl, ListBox&, void );
|
DECL_LINK( implControlHdl, ListBox&, void );
|
||||||
DECL_LINK( implClickHdl, Button*, void );
|
DECL_LINK( implClickHdl, Button*, void );
|
||||||
DECL_LINK( DurationModifiedHdl, Edit&, void );
|
DECL_LINK( DurationModifiedHdl, Edit&, void );
|
||||||
void implHdl(Control*);
|
void implHdl(Control const *);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const STLPropertySet* mpSet;
|
const STLPropertySet* mpSet;
|
||||||
@ -1786,7 +1786,7 @@ IMPL_LINK_NOARG(CustomAnimationDurationTabPage, DurationModifiedHdl, Edit&, void
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CustomAnimationDurationTabPage::implHdl( Control* pControl )
|
void CustomAnimationDurationTabPage::implHdl( Control const * pControl )
|
||||||
{
|
{
|
||||||
if( pControl == mpLBTrigger )
|
if( pControl == mpLBTrigger )
|
||||||
{
|
{
|
||||||
|
@ -1246,7 +1246,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet()
|
|||||||
return pSet;
|
return pSet;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLPropertySet* pOldSet )
|
void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, STLPropertySet const * pOldSet )
|
||||||
{
|
{
|
||||||
// change selected effect
|
// change selected effect
|
||||||
bool bChanged = false;
|
bool bChanged = false;
|
||||||
@ -1895,7 +1895,7 @@ void CustomAnimationPane::onRemove()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CustomAnimationPane::remove( CustomAnimationEffectPtr& pEffect )
|
void CustomAnimationPane::remove( CustomAnimationEffectPtr const & pEffect )
|
||||||
{
|
{
|
||||||
if( pEffect->getEffectSequence() )
|
if( pEffect->getEffectSequence() )
|
||||||
{
|
{
|
||||||
@ -2257,7 +2257,7 @@ IMPL_LINK( CustomAnimationPane, implControlListBoxHdl, ListBox&, rListBox, void
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// this link is called when one of the controls is modified
|
/// this link is called when one of the controls is modified
|
||||||
void CustomAnimationPane::implControlHdl(Control* pControl )
|
void CustomAnimationPane::implControlHdl(Control const * pControl )
|
||||||
{
|
{
|
||||||
if( pControl == mpPBAddEffect )
|
if( pControl == mpPBAddEffect )
|
||||||
onAdd();
|
onAdd();
|
||||||
|
@ -79,7 +79,7 @@ public:
|
|||||||
|
|
||||||
// methods
|
// methods
|
||||||
void preview( const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode );
|
void preview( const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode );
|
||||||
void remove( CustomAnimationEffectPtr& pEffect );
|
void remove( CustomAnimationEffectPtr const & pEffect );
|
||||||
|
|
||||||
// Control
|
// Control
|
||||||
virtual void StateChanged( StateChangedType nStateChange ) override;
|
virtual void StateChanged( StateChangedType nStateChange ) override;
|
||||||
@ -110,7 +110,7 @@ private:
|
|||||||
void onPreview( bool bForcePreview );
|
void onPreview( bool bForcePreview );
|
||||||
|
|
||||||
STLPropertySet* createSelectionSet();
|
STLPropertySet* createSelectionSet();
|
||||||
void changeSelection( STLPropertySet* pResultSet, STLPropertySet* pOldSet );
|
void changeSelection( STLPropertySet const * pResultSet, STLPropertySet const * pOldSet );
|
||||||
|
|
||||||
static css::uno::Any getProperty1Value( sal_Int32 nType, const CustomAnimationEffectPtr& pEffect );
|
static css::uno::Any getProperty1Value( sal_Int32 nType, const CustomAnimationEffectPtr& pEffect );
|
||||||
bool setProperty1Value( sal_Int32 nType, const CustomAnimationEffectPtr& pEffect, const css::uno::Any& rValue );
|
bool setProperty1Value( sal_Int32 nType, const CustomAnimationEffectPtr& pEffect, const css::uno::Any& rValue );
|
||||||
@ -129,7 +129,7 @@ private:
|
|||||||
DECL_LINK( DelayLoseFocusHdl, Control&, void );
|
DECL_LINK( DelayLoseFocusHdl, Control&, void );
|
||||||
DECL_LINK( UpdateAnimationLB, ListBox&, void );
|
DECL_LINK( UpdateAnimationLB, ListBox&, void );
|
||||||
DECL_LINK( AnimationSelectHdl, ListBox&, void );
|
DECL_LINK( AnimationSelectHdl, ListBox&, void );
|
||||||
void implControlHdl(Control*);
|
void implControlHdl(Control const *);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ViewShellBase& mrBase;
|
ViewShellBase& mrBase;
|
||||||
|
@ -231,7 +231,7 @@ void lcl_ApplyToPages(
|
|||||||
|
|
||||||
void lcl_CreateUndoForPages(
|
void lcl_CreateUndoForPages(
|
||||||
const ::sd::slidesorter::SharedPageSelection& rpPages,
|
const ::sd::slidesorter::SharedPageSelection& rpPages,
|
||||||
::sd::ViewShellBase& rBase )
|
::sd::ViewShellBase const & rBase )
|
||||||
{
|
{
|
||||||
::sd::DrawDocShell* pDocSh = rBase.GetDocShell();
|
::sd::DrawDocShell* pDocSh = rBase.GetDocShell();
|
||||||
if (!pDocSh)
|
if (!pDocSh)
|
||||||
|
@ -119,7 +119,7 @@ SfxItemPool* GetAnnotationPool()
|
|||||||
return s_pAnnotationPool;
|
return s_pAnnotationPool;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SfxBindings* getBindings( ViewShellBase& rBase )
|
static SfxBindings* getBindings( ViewShellBase const & rBase )
|
||||||
{
|
{
|
||||||
if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() )
|
if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() )
|
||||||
return &rBase.GetMainViewShell()->GetViewFrame()->GetBindings();
|
return &rBase.GetMainViewShell()->GetViewFrame()->GetBindings();
|
||||||
@ -127,7 +127,7 @@ static SfxBindings* getBindings( ViewShellBase& rBase )
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SfxDispatcher* getDispatcher( ViewShellBase& rBase )
|
static SfxDispatcher* getDispatcher( ViewShellBase const & rBase )
|
||||||
{
|
{
|
||||||
if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() )
|
if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() )
|
||||||
return rBase.GetMainViewShell()->GetViewFrame()->GetDispatcher();
|
return rBase.GetMainViewShell()->GetViewFrame()->GetDispatcher();
|
||||||
@ -300,7 +300,7 @@ void AnnotationManagerImpl::ShowAnnotations( bool bShow )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq )
|
void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest const & rReq )
|
||||||
{
|
{
|
||||||
switch( rReq.GetSlot() )
|
switch( rReq.GetSlot() )
|
||||||
{
|
{
|
||||||
@ -328,7 +328,7 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& rReq)
|
void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest const & rReq)
|
||||||
{
|
{
|
||||||
if (!comphelper::LibreOfficeKit::isActive() || comphelper::LibreOfficeKit::isTiledAnnotations())
|
if (!comphelper::LibreOfficeKit::isActive() || comphelper::LibreOfficeKit::isTiledAnnotations())
|
||||||
ShowAnnotations(true);
|
ShowAnnotations(true);
|
||||||
@ -347,7 +347,7 @@ void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& rReq)
|
|||||||
InsertAnnotation(sText);
|
InsertAnnotation(sText);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq)
|
void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest const & rReq)
|
||||||
{
|
{
|
||||||
ShowAnnotations( true );
|
ShowAnnotations( true );
|
||||||
|
|
||||||
@ -395,7 +395,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq)
|
|||||||
UpdateTags();
|
UpdateTags();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnnotationManagerImpl::ExecuteEditAnnotation(SfxRequest& rReq)
|
void AnnotationManagerImpl::ExecuteEditAnnotation(SfxRequest const & rReq)
|
||||||
{
|
{
|
||||||
const SfxItemSet* pArgs = rReq.GetArgs();
|
const SfxItemSet* pArgs = rReq.GetArgs();
|
||||||
Reference< XAnnotation > xAnnotation;
|
Reference< XAnnotation > xAnnotation;
|
||||||
@ -527,7 +527,7 @@ void AnnotationManagerImpl::InsertAnnotation(const OUString& rText)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
|
void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq )
|
||||||
{
|
{
|
||||||
Reference< XAnnotation > xAnnotation;
|
Reference< XAnnotation > xAnnotation;
|
||||||
const SfxItemSet* pArgs = rReq.GetArgs();
|
const SfxItemSet* pArgs = rReq.GetArgs();
|
||||||
@ -846,13 +846,13 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
|
|||||||
while( true );
|
while( true );
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnnotationManagerImpl::onTagSelected( AnnotationTag& rTag )
|
void AnnotationManagerImpl::onTagSelected( AnnotationTag const & rTag )
|
||||||
{
|
{
|
||||||
mxSelectedAnnotation = rTag.GetAnnotation();
|
mxSelectedAnnotation = rTag.GetAnnotation();
|
||||||
invalidateSlots();
|
invalidateSlots();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag )
|
void AnnotationManagerImpl::onTagDeselected( AnnotationTag const & rTag )
|
||||||
{
|
{
|
||||||
if( rTag.GetAnnotation() == mxSelectedAnnotation )
|
if( rTag.GetAnnotation() == mxSelectedAnnotation )
|
||||||
{
|
{
|
||||||
@ -1258,7 +1258,7 @@ Color AnnotationManagerImpl::GetColorDark(sal_uInt16 aAuthorIndex)
|
|||||||
return Color(COL_WHITE);
|
return Color(COL_WHITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForward )
|
SdPage* AnnotationManagerImpl::GetNextPage( SdPage const * pPage, bool bForward )
|
||||||
{
|
{
|
||||||
if( pPage == nullptr )
|
if( pPage == nullptr )
|
||||||
{
|
{
|
||||||
@ -1333,7 +1333,7 @@ AnnotationManager::~AnnotationManager()
|
|||||||
mxImpl->dispose();
|
mxImpl->dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnnotationManager::ExecuteAnnotation(SfxRequest& rRequest)
|
void AnnotationManager::ExecuteAnnotation(SfxRequest const & rRequest)
|
||||||
{
|
{
|
||||||
mxImpl->ExecuteAnnotation( rRequest );
|
mxImpl->ExecuteAnnotation( rRequest );
|
||||||
}
|
}
|
||||||
|
@ -61,13 +61,13 @@ public:
|
|||||||
virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) override;
|
virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) override;
|
||||||
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
|
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
|
||||||
|
|
||||||
void ExecuteAnnotation (SfxRequest& rRequest);
|
void ExecuteAnnotation (SfxRequest const & rRequest);
|
||||||
void GetAnnotationState (SfxItemSet& rItemSet);
|
void GetAnnotationState (SfxItemSet& rItemSet);
|
||||||
|
|
||||||
void ExecuteInsertAnnotation(SfxRequest& rReq);
|
void ExecuteInsertAnnotation(SfxRequest const & rReq);
|
||||||
void ExecuteDeleteAnnotation(SfxRequest& rReq);
|
void ExecuteDeleteAnnotation(SfxRequest const & rReq);
|
||||||
void ExecuteEditAnnotation(SfxRequest& rReq);
|
void ExecuteEditAnnotation(SfxRequest const & rReq);
|
||||||
void ExecuteReplyToAnnotation(SfxRequest& rReq);
|
void ExecuteReplyToAnnotation(SfxRequest const & rReq);
|
||||||
|
|
||||||
void SelectNextAnnotation(bool bForeward);
|
void SelectNextAnnotation(bool bForeward);
|
||||||
|
|
||||||
@ -86,8 +86,8 @@ public:
|
|||||||
static Color GetColor(sal_uInt16 aAuthorIndex);
|
static Color GetColor(sal_uInt16 aAuthorIndex);
|
||||||
|
|
||||||
// callbacks
|
// callbacks
|
||||||
void onTagSelected( AnnotationTag& rTag );
|
void onTagSelected( AnnotationTag const & rTag );
|
||||||
void onTagDeselected( AnnotationTag& rTag );
|
void onTagDeselected( AnnotationTag const & rTag );
|
||||||
|
|
||||||
void onSelectionChanged();
|
void onSelectionChanged();
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ public:
|
|||||||
void CreateTags();
|
void CreateTags();
|
||||||
void DisposeTags();
|
void DisposeTags();
|
||||||
|
|
||||||
SdPage* GetNextPage( SdPage* pPage, bool bForeward );
|
SdPage* GetNextPage( SdPage const * pPage, bool bForeward );
|
||||||
|
|
||||||
SdPage* GetCurrentPage();
|
SdPage* GetCurrentPage();
|
||||||
|
|
||||||
|
@ -244,7 +244,7 @@ bool AnnotationHdl::isMarkable() const
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const Reference< XAnnotation >& xAnnotation, Color& rColor, int nIndex, const vcl::Font& rFont )
|
AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const Reference< XAnnotation >& xAnnotation, Color const & rColor, int nIndex, const vcl::Font& rFont )
|
||||||
: SmartTag( rView )
|
: SmartTag( rView )
|
||||||
, mrManager( rManager )
|
, mrManager( rManager )
|
||||||
, mxAnnotation( xAnnotation )
|
, mxAnnotation( xAnnotation )
|
||||||
|
@ -34,7 +34,7 @@ class AnnotationWindow;
|
|||||||
class AnnotationTag : public SmartTag
|
class AnnotationTag : public SmartTag
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const css::uno::Reference< css::office::XAnnotation >& xAnnotation, Color& rColor, int nIndex, const vcl::Font& rFont );
|
AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const css::uno::Reference< css::office::XAnnotation >& xAnnotation, Color const & rColor, int nIndex, const vcl::Font& rFont );
|
||||||
virtual ~AnnotationTag() override;
|
virtual ~AnnotationTag() override;
|
||||||
|
|
||||||
/// @return true if the SmartTag handled the event.
|
/// @return true if the SmartTag handled the event.
|
||||||
|
@ -99,7 +99,7 @@ using namespace ::com::sun::star::text;
|
|||||||
|
|
||||||
namespace sd {
|
namespace sd {
|
||||||
|
|
||||||
Color ColorFromAlphaColor(sal_uInt8 aTransparency, Color &aFront, Color &aBack )
|
Color ColorFromAlphaColor(sal_uInt8 aTransparency, Color const &aFront, Color const &aBack )
|
||||||
{
|
{
|
||||||
return Color((sal_uInt8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)),
|
return Color((sal_uInt8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)),
|
||||||
(sal_uInt8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)),
|
(sal_uInt8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)),
|
||||||
|
@ -279,7 +279,7 @@ SdOptionsLayoutItem::SdOptionsLayoutItem()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
SdOptionsLayoutItem::SdOptionsLayoutItem( SdOptions* pOpts, ::sd::FrameView* pView )
|
SdOptionsLayoutItem::SdOptionsLayoutItem( SdOptions const * pOpts, ::sd::FrameView const * pView )
|
||||||
: SfxPoolItem ( ATTR_OPTIONS_LAYOUT )
|
: SfxPoolItem ( ATTR_OPTIONS_LAYOUT )
|
||||||
, maOptionsLayout ( false, false )
|
, maOptionsLayout ( false, false )
|
||||||
{
|
{
|
||||||
@ -646,7 +646,7 @@ SdOptionsMiscItem::SdOptionsMiscItem()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
SdOptionsMiscItem::SdOptionsMiscItem( SdOptions* pOpts, ::sd::FrameView* pView )
|
SdOptionsMiscItem::SdOptionsMiscItem( SdOptions const * pOpts, ::sd::FrameView const * pView )
|
||||||
: SfxPoolItem ( ATTR_OPTIONS_MISC )
|
: SfxPoolItem ( ATTR_OPTIONS_MISC )
|
||||||
, maOptionsMisc ( false, false )
|
, maOptionsMisc ( false, false )
|
||||||
{
|
{
|
||||||
@ -857,7 +857,7 @@ SdOptionsSnapItem::SdOptionsSnapItem()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
SdOptionsSnapItem::SdOptionsSnapItem( SdOptions* pOpts, ::sd::FrameView* pView )
|
SdOptionsSnapItem::SdOptionsSnapItem( SdOptions const * pOpts, ::sd::FrameView const * pView )
|
||||||
: SfxPoolItem ( ATTR_OPTIONS_SNAP )
|
: SfxPoolItem ( ATTR_OPTIONS_SNAP )
|
||||||
, maOptionsSnap ( false, false )
|
, maOptionsSnap ( false, false )
|
||||||
{
|
{
|
||||||
@ -1097,7 +1097,7 @@ bool SdOptionsGrid::WriteData( Any* pValues ) const
|
|||||||
|*
|
|*
|
||||||
\************************************************************************/
|
\************************************************************************/
|
||||||
|
|
||||||
SdOptionsGridItem::SdOptionsGridItem( SdOptions* pOpts ) :
|
SdOptionsGridItem::SdOptionsGridItem( SdOptions const * pOpts ) :
|
||||||
SvxGridItem( SID_ATTR_GRID_OPTIONS )
|
SvxGridItem( SID_ATTR_GRID_OPTIONS )
|
||||||
{
|
{
|
||||||
SetSynchronize( pOpts->IsSynchronize() );
|
SetSynchronize( pOpts->IsSynchronize() );
|
||||||
@ -1314,7 +1314,7 @@ SdOptionsPrintItem::SdOptionsPrintItem()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
SdOptionsPrintItem::SdOptionsPrintItem( SdOptions* pOpts )
|
SdOptionsPrintItem::SdOptionsPrintItem( SdOptions const * pOpts )
|
||||||
: SfxPoolItem ( ATTR_OPTIONS_PRINT )
|
: SfxPoolItem ( ATTR_OPTIONS_PRINT )
|
||||||
, maOptionsPrint ( false, false )
|
, maOptionsPrint ( false, false )
|
||||||
{
|
{
|
||||||
|
@ -77,7 +77,7 @@ public:
|
|||||||
OutlineToImpressFinalizer (
|
OutlineToImpressFinalizer (
|
||||||
::sd::ViewShellBase& rBase,
|
::sd::ViewShellBase& rBase,
|
||||||
SdDrawDocument& rDocument,
|
SdDrawDocument& rDocument,
|
||||||
SvLockBytes& rBytes);
|
SvLockBytes const & rBytes);
|
||||||
void operator() (bool bEventSeen);
|
void operator() (bool bEventSeen);
|
||||||
private:
|
private:
|
||||||
::sd::ViewShellBase& mrBase;
|
::sd::ViewShellBase& mrBase;
|
||||||
@ -248,7 +248,7 @@ void SdModule::Execute(SfxRequest& rReq)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SdModule::OutlineToImpress(SfxRequest& rRequest)
|
bool SdModule::OutlineToImpress(SfxRequest const & rRequest)
|
||||||
{
|
{
|
||||||
const SfxItemSet* pSet = rRequest.GetArgs();
|
const SfxItemSet* pSet = rRequest.GetArgs();
|
||||||
|
|
||||||
@ -450,7 +450,7 @@ SfxFrame* SdModule::CreateFromTemplate( const OUString& rTemplatePath, const Ref
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
|
SfxFrame* SdModule::ExecuteNewDocument( SfxRequest const & rReq )
|
||||||
{
|
{
|
||||||
SfxFrame* pFrame = nullptr;
|
SfxFrame* pFrame = nullptr;
|
||||||
if ( SvtModuleOptions().IsImpress() )
|
if ( SvtModuleOptions().IsImpress() )
|
||||||
@ -532,7 +532,7 @@ namespace {
|
|||||||
OutlineToImpressFinalizer::OutlineToImpressFinalizer (
|
OutlineToImpressFinalizer::OutlineToImpressFinalizer (
|
||||||
::sd::ViewShellBase& rBase,
|
::sd::ViewShellBase& rBase,
|
||||||
SdDrawDocument& rDocument,
|
SdDrawDocument& rDocument,
|
||||||
SvLockBytes& rBytes)
|
SvLockBytes const & rBytes)
|
||||||
: mrBase(rBase),
|
: mrBase(rBase),
|
||||||
mrDocument(rDocument),
|
mrDocument(rDocument),
|
||||||
mpStream()
|
mpStream()
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
|
|
||||||
/** retrieves the page that is currently painted. This will only be the master page
|
/** retrieves the page that is currently painted. This will only be the master page
|
||||||
if the current drawn view only shows the master page*/
|
if the current drawn view only shows the master page*/
|
||||||
static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, bool& bMasterView )
|
static SdPage* GetCurrentPage( sd::ViewShell const * pViewSh, EditFieldInfo const * pInfo, bool& bMasterView )
|
||||||
{
|
{
|
||||||
if( !pInfo )
|
if( !pInfo )
|
||||||
return nullptr;
|
return nullptr;
|
||||||
@ -91,7 +91,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo
|
|||||||
// first try to check if we are inside the outline view
|
// first try to check if we are inside the outline view
|
||||||
sd::OutlineView* pSdView = nullptr;
|
sd::OutlineView* pSdView = nullptr;
|
||||||
if( dynamic_cast<const sd::OutlineViewShell* >(pViewSh) != nullptr )
|
if( dynamic_cast<const sd::OutlineViewShell* >(pViewSh) != nullptr )
|
||||||
pSdView = static_cast<sd::OutlineView*> (static_cast<sd::OutlineViewShell*>(pViewSh)->GetView());
|
pSdView = static_cast<sd::OutlineView*> (static_cast<sd::OutlineViewShell const *>(pViewSh)->GetView());
|
||||||
|
|
||||||
if (pSdView != nullptr && (pOutliner == &pSdView->GetOutliner()))
|
if (pSdView != nullptr && (pOutliner == &pSdView->GetOutliner()))
|
||||||
{
|
{
|
||||||
|
@ -59,7 +59,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void );
|
DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void );
|
||||||
DECL_LINK( SelectValueSetHdl, ValueSet*, void );
|
DECL_LINK( SelectValueSetHdl, ValueSet*, void );
|
||||||
void SelectHdl(void*);
|
void SelectHdl(void const *);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DisplayModeController& mrController;
|
DisplayModeController& mrController;
|
||||||
@ -199,7 +199,7 @@ IMPL_LINK( DisplayModeToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl
|
|||||||
SelectHdl(pControl);
|
SelectHdl(pControl);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DisplayModeToolbarMenu::SelectHdl(void * pControl)
|
void DisplayModeToolbarMenu::SelectHdl(void const * pControl)
|
||||||
{
|
{
|
||||||
if ( IsInPopupMode() )
|
if ( IsInPopupMode() )
|
||||||
EndPopupMode();
|
EndPopupMode();
|
||||||
|
@ -70,7 +70,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void );
|
DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void );
|
||||||
DECL_LINK( SelectValueSetHdl, ValueSet*, void );
|
DECL_LINK( SelectValueSetHdl, ValueSet*, void );
|
||||||
void SelectHdl(void*);
|
void SelectHdl(void const *);
|
||||||
private:
|
private:
|
||||||
SlideLayoutController& mrController;
|
SlideLayoutController& mrController;
|
||||||
bool mbInsertPage;
|
bool mbInsertPage;
|
||||||
@ -272,7 +272,7 @@ IMPL_LINK( LayoutToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, voi
|
|||||||
SelectHdl(pControl);
|
SelectHdl(pControl);
|
||||||
}
|
}
|
||||||
|
|
||||||
void LayoutToolbarMenu::SelectHdl(void* pControl)
|
void LayoutToolbarMenu::SelectHdl(void const * pControl)
|
||||||
{
|
{
|
||||||
if ( IsInPopupMode() )
|
if ( IsInPopupMode() )
|
||||||
EndPopupMode();
|
EndPopupMode();
|
||||||
|
@ -30,7 +30,7 @@ namespace sd {
|
|||||||
|
|
||||||
SFX_IMPL_CHILDWINDOWCONTEXT(NavigatorChildWindow, SID_NAVIGATOR)
|
SFX_IMPL_CHILDWINDOWCONTEXT(NavigatorChildWindow, SID_NAVIGATOR)
|
||||||
|
|
||||||
void RequestNavigatorUpdate (SfxBindings* pBindings)
|
void RequestNavigatorUpdate (SfxBindings const * pBindings)
|
||||||
{
|
{
|
||||||
if (pBindings != nullptr
|
if (pBindings != nullptr
|
||||||
&& pBindings->GetDispatcher() != nullptr)
|
&& pBindings->GetDispatcher() != nullptr)
|
||||||
|
@ -112,7 +112,7 @@ TemplateEntryCompare::TemplateEntryCompare():
|
|||||||
::comphelper::getProcessComponentContext(),
|
::comphelper::getProcessComponentContext(),
|
||||||
Application::GetSettings().GetLanguageTag().getLocale())) {}
|
Application::GetSettings().GetLanguageTag().getLocale())) {}
|
||||||
|
|
||||||
bool TemplateEntryCompare::operator()(TemplateEntry* pA, TemplateEntry* pB) const
|
bool TemplateEntryCompare::operator()(TemplateEntry const * pA, TemplateEntry const * pB) const
|
||||||
{
|
{
|
||||||
return 0 > mpStringSorter->compare(pA->msTitle, pB->msTitle);
|
return 0 > mpStringSorter->compare(pA->msTitle, pB->msTitle);
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ SdDisplay::~SdDisplay()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx )
|
void SdDisplay::SetBitmapEx( BitmapEx const * pBmpEx )
|
||||||
{
|
{
|
||||||
if( pBmpEx )
|
if( pBmpEx )
|
||||||
{
|
{
|
||||||
|
@ -126,7 +126,7 @@ IMPL_LINK( SdCustomShowDlg, SelectListBoxHdl, ListBox&, rListBox, void )
|
|||||||
SelectHdl(&rListBox);
|
SelectHdl(&rListBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdCustomShowDlg::SelectHdl(void *p)
|
void SdCustomShowDlg::SelectHdl(void const *p)
|
||||||
{
|
{
|
||||||
// new CustomShow
|
// new CustomShow
|
||||||
if( p == m_pBtnNew )
|
if( p == m_pBtnNew )
|
||||||
@ -399,7 +399,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonEditHdl, Edit&, rEdit, void )
|
|||||||
ClickButtonHdl2(&rEdit);
|
ClickButtonHdl2(&rEdit);
|
||||||
}
|
}
|
||||||
// ButtonHdl()
|
// ButtonHdl()
|
||||||
void SdDefineCustomShowDlg::ClickButtonHdl2(void* p)
|
void SdDefineCustomShowDlg::ClickButtonHdl2(void const * p)
|
||||||
{
|
{
|
||||||
if( p == m_pBtnAdd )
|
if( p == m_pBtnAdd )
|
||||||
{
|
{
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
/**
|
/**
|
||||||
* Constructor of tab dialog: appends pages to the dialog
|
* Constructor of tab dialog: appends pages to the dialog
|
||||||
*/
|
*/
|
||||||
SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage ) :
|
SdPageDlg::SdPageDlg( SfxObjectShell const * pDocSh, vcl::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage ) :
|
||||||
SfxTabDialog ( pParent
|
SfxTabDialog ( pParent
|
||||||
,"DrawPageDialog"
|
,"DrawPageDialog"
|
||||||
,"modules/sdraw/ui/drawpagedialog.ui"
|
,"modules/sdraw/ui/drawpagedialog.ui"
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
SdSnapLineDlg::SdSnapLineDlg(
|
SdSnapLineDlg::SdSnapLineDlg(
|
||||||
vcl::Window* pWindow,
|
vcl::Window* pWindow,
|
||||||
const SfxItemSet& rInAttrs,
|
const SfxItemSet& rInAttrs,
|
||||||
::sd::View* pView)
|
::sd::View const * pView)
|
||||||
: ModalDialog(pWindow, "SnapObjectDialog", "modules/sdraw/ui/dlgsnap.ui")
|
: ModalDialog(pWindow, "SnapObjectDialog", "modules/sdraw/ui/dlgsnap.ui")
|
||||||
, eUIUnit(pView->GetDoc().GetUIUnit())
|
, eUIUnit(pView->GetDoc().GetUIUnit())
|
||||||
, aUIScale(pView->GetDoc().GetUIScale())
|
, aUIScale(pView->GetDoc().GetUIScale())
|
||||||
|
@ -71,7 +71,7 @@ private:
|
|||||||
::tools::Rectangle maOutRect;
|
::tools::Rectangle maOutRect;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void Paint(vcl::RenderContext& rRenderContext, SdrTextObj* pObj, bool bVisible, bool bDotted = false);
|
void Paint(vcl::RenderContext& rRenderContext, SdrTextObj const * pObj, bool bVisible, bool bDotted = false);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit PresLayoutPreview(vcl::Window* pParent);
|
explicit PresLayoutPreview(vcl::Window* pParent);
|
||||||
@ -80,7 +80,7 @@ public:
|
|||||||
virtual Size GetOptimalSize() const override;
|
virtual Size GetOptimalSize() const override;
|
||||||
|
|
||||||
void init(SdPage* pMaster);
|
void init(SdPage* pMaster);
|
||||||
void update(HeaderFooterSettings& rSettings);
|
void update(HeaderFooterSettings const & rSettings);
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -706,13 +706,13 @@ void PresLayoutPreview::init( SdPage *pMaster )
|
|||||||
maPageSize = pMaster->GetSize();
|
maPageSize = pMaster->GetSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
void PresLayoutPreview::update( HeaderFooterSettings& rSettings )
|
void PresLayoutPreview::update( HeaderFooterSettings const & rSettings )
|
||||||
{
|
{
|
||||||
maSettings = rSettings;
|
maSettings = rSettings;
|
||||||
Invalidate();
|
Invalidate();
|
||||||
}
|
}
|
||||||
|
|
||||||
void PresLayoutPreview::Paint(vcl::RenderContext& rRenderContext, SdrTextObj* pObj, bool bVisible, bool bDotted /* = false*/ )
|
void PresLayoutPreview::Paint(vcl::RenderContext& rRenderContext, SdrTextObj const * pObj, bool bVisible, bool bDotted /* = false*/ )
|
||||||
{
|
{
|
||||||
// get object transformation
|
// get object transformation
|
||||||
basegfx::B2DHomMatrix aObjectTransform;
|
basegfx::B2DHomMatrix aObjectTransform;
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
/**
|
/**
|
||||||
* Constructor of Tab dialog: appends pages to the dialog
|
* Constructor of Tab dialog: appends pages to the dialog
|
||||||
*/
|
*/
|
||||||
SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
|
SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell const * pDocSh,
|
||||||
vcl::Window* pParent,
|
vcl::Window* pParent,
|
||||||
bool bBackground,
|
bool bBackground,
|
||||||
SfxStyleSheetBase& rStyleBase,
|
SfxStyleSheetBase& rStyleBase,
|
||||||
|
@ -1302,7 +1302,7 @@ SvTreeListEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation)
|
|||||||
return pEntry;
|
return pEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SdPageObjsTLB::IsDropAllowed (SvTreeListEntry* pEntry)
|
bool SdPageObjsTLB::IsDropAllowed (SvTreeListEntry const * pEntry)
|
||||||
{
|
{
|
||||||
if (pEntry == nullptr)
|
if (pEntry == nullptr)
|
||||||
return false;
|
return false;
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent,
|
SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent,
|
||||||
const SfxObjectShell* pDocShell,
|
const SfxObjectShell* pDocShell,
|
||||||
SfxStyleSheetBase& rStyleBase,
|
SfxStyleSheetBase& rStyleBase,
|
||||||
SdrModel* pModel,
|
SdrModel const * pModel,
|
||||||
SdrView* pView )
|
SdrView* pView )
|
||||||
: SfxStyleDialog(pParent, "TemplateDialog",
|
: SfxStyleDialog(pParent, "TemplateDialog",
|
||||||
"modules/simpress/ui/templatedialog.ui",
|
"modules/simpress/ui/templatedialog.ui",
|
||||||
|
@ -75,7 +75,7 @@ using namespace com::sun::star::lang;
|
|||||||
* Constructor of the Tab dialog: appends the pages to the dialog
|
* Constructor of the Tab dialog: appends the pages to the dialog
|
||||||
*/
|
*/
|
||||||
SdActionDlg::SdActionDlg (
|
SdActionDlg::SdActionDlg (
|
||||||
vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView )
|
vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView )
|
||||||
: SfxSingleTabDialog(pParent, *pAttr, "InteractionDialog",
|
: SfxSingleTabDialog(pParent, *pAttr, "InteractionDialog",
|
||||||
"modules/simpress/ui/interactiondialog.ui")
|
"modules/simpress/ui/interactiondialog.ui")
|
||||||
, rOutAttrs(*pAttr)
|
, rOutAttrs(*pAttr)
|
||||||
|
@ -129,7 +129,7 @@ void SdVectorizeDlg::InitPreviewBmp()
|
|||||||
m_pBmpWin->SetGraphic( aPreviewBmp );
|
m_pBmpWin->SetGraphic( aPreviewBmp );
|
||||||
}
|
}
|
||||||
|
|
||||||
Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale )
|
Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap const & rBmp, Fraction& rScale )
|
||||||
{
|
{
|
||||||
Bitmap aNew( rBmp );
|
Bitmap aNew( rBmp );
|
||||||
const Size aSizePix( aNew.GetSizePixel() );
|
const Size aSizePix( aNew.GetSizePixel() );
|
||||||
@ -148,7 +148,7 @@ Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale )
|
|||||||
return aNew;
|
return aNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
|
void SdVectorizeDlg::Calculate( Bitmap const & rBmp, GDIMetaFile& rMtf )
|
||||||
{
|
{
|
||||||
mpDocSh->SetWaitCursor( true );
|
mpDocSh->SetWaitCursor( true );
|
||||||
m_pPrgs->SetValue( 0 );
|
m_pPrgs->SetValue( 0 );
|
||||||
@ -220,7 +220,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
|
|||||||
mpDocSh->SetWaitCursor( false );
|
mpDocSh->SetWaitCursor( false );
|
||||||
}
|
}
|
||||||
|
|
||||||
void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
|
void SdVectorizeDlg::AddTile( BitmapReadAccess const * pRAcc, GDIMetaFile& rMtf,
|
||||||
long nPosX, long nPosY, long nWidth, long nHeight )
|
long nPosX, long nPosY, long nWidth, long nHeight )
|
||||||
{
|
{
|
||||||
sal_uLong nSumR = 0UL, nSumG = 0UL, nSumB = 0UL;
|
sal_uLong nSumR = 0UL, nSumG = 0UL, nSumB = 0UL;
|
||||||
|
@ -157,7 +157,7 @@ void DrawDocShell::Connect(ViewShell* pViewSh)
|
|||||||
mpViewShell = pViewSh;
|
mpViewShell = pViewSh;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawDocShell::Disconnect(ViewShell* pViewSh)
|
void DrawDocShell::Disconnect(ViewShell const * pViewSh)
|
||||||
{
|
{
|
||||||
if (mpViewShell == pViewSh)
|
if (mpViewShell == pViewSh)
|
||||||
{
|
{
|
||||||
|
@ -44,7 +44,7 @@ namespace sd { namespace framework {
|
|||||||
|
|
||||||
//===== CenterViewFocusModule ====================================================
|
//===== CenterViewFocusModule ====================================================
|
||||||
|
|
||||||
CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxController)
|
CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController> const & rxController)
|
||||||
: CenterViewFocusModuleInterfaceBase(MutexOwner::maMutex),
|
: CenterViewFocusModuleInterfaceBase(MutexOwner::maMutex),
|
||||||
mbValid(false),
|
mbValid(false),
|
||||||
mxConfigurationController(),
|
mxConfigurationController(),
|
||||||
|
@ -50,7 +50,7 @@ class CenterViewFocusModule
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit CenterViewFocusModule (
|
explicit CenterViewFocusModule (
|
||||||
css::uno::Reference<css::frame::XController>& rxController);
|
css::uno::Reference<css::frame::XController> const & rxController);
|
||||||
virtual ~CenterViewFocusModule() override;
|
virtual ~CenterViewFocusModule() override;
|
||||||
|
|
||||||
virtual void SAL_CALL disposing() override;
|
virtual void SAL_CALL disposing() override;
|
||||||
|
@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno;
|
|||||||
|
|
||||||
namespace sd { namespace framework {
|
namespace sd { namespace framework {
|
||||||
|
|
||||||
void DrawModule::Initialize (Reference<frame::XController>& rxController)
|
void DrawModule::Initialize (Reference<frame::XController> const & rxController)
|
||||||
{
|
{
|
||||||
new sd::framework::CenterViewFocusModule(rxController);
|
new sd::framework::CenterViewFocusModule(rxController);
|
||||||
new sd::framework::SlideSorterModule(
|
new sd::framework::SlideSorterModule(
|
||||||
|
@ -32,7 +32,7 @@ using namespace ::com::sun::star::uno;
|
|||||||
|
|
||||||
namespace sd { namespace framework {
|
namespace sd { namespace framework {
|
||||||
|
|
||||||
void ImpressModule::Initialize (Reference<frame::XController>& rxController)
|
void ImpressModule::Initialize (Reference<frame::XController> const & rxController)
|
||||||
{
|
{
|
||||||
new CenterViewFocusModule(rxController);
|
new CenterViewFocusModule(rxController);
|
||||||
new ViewTabBarModule(
|
new ViewTabBarModule(
|
||||||
|
@ -27,7 +27,7 @@ using namespace ::com::sun::star::uno;
|
|||||||
|
|
||||||
namespace sd { namespace framework {
|
namespace sd { namespace framework {
|
||||||
|
|
||||||
void PresentationModule::Initialize (Reference<frame::XController>& rxController)
|
void PresentationModule::Initialize (Reference<frame::XController> const & rxController)
|
||||||
{
|
{
|
||||||
new sd::framework::CenterViewFocusModule(rxController);
|
new sd::framework::CenterViewFocusModule(rxController);
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ namespace sd { namespace framework {
|
|||||||
|
|
||||||
//===== CenterViewFocusModule ====================================================
|
//===== CenterViewFocusModule ====================================================
|
||||||
|
|
||||||
ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController)
|
ShellStackGuard::ShellStackGuard (Reference<frame::XController> const & rxController)
|
||||||
: ShellStackGuardInterfaceBase(m_aMutex),
|
: ShellStackGuardInterfaceBase(m_aMutex),
|
||||||
mxConfigurationController(),
|
mxConfigurationController(),
|
||||||
mpBase(nullptr),
|
mpBase(nullptr),
|
||||||
|
@ -60,7 +60,7 @@ class ShellStackGuard
|
|||||||
public ShellStackGuardInterfaceBase
|
public ShellStackGuardInterfaceBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit ShellStackGuard (css::uno::Reference<css::frame::XController>& rxController);
|
explicit ShellStackGuard (css::uno::Reference<css::frame::XController> const & rxController);
|
||||||
virtual ~ShellStackGuard() override;
|
virtual ~ShellStackGuard() override;
|
||||||
|
|
||||||
virtual void SAL_CALL disposing() override;
|
virtual void SAL_CALL disposing() override;
|
||||||
|
@ -549,7 +549,7 @@ void asyncUpdateEditMode(FrameworkHelper* const pHelper, const EditMode eEMode)
|
|||||||
|
|
||||||
void FrameworkHelper::HandleModeChangeSlot (
|
void FrameworkHelper::HandleModeChangeSlot (
|
||||||
sal_uLong nSlotId,
|
sal_uLong nSlotId,
|
||||||
SfxRequest& rRequest)
|
SfxRequest const & rRequest)
|
||||||
{
|
{
|
||||||
if ( ! mxConfigurationController.is())
|
if ( ! mxConfigurationController.is())
|
||||||
return;
|
return;
|
||||||
|
@ -148,7 +148,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
|
void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq )
|
||||||
{
|
{
|
||||||
const SfxItemSet *pArgs = rReq.GetArgs();
|
const SfxItemSet *pArgs = rReq.GetArgs();
|
||||||
const SfxPoolItem* pItem = nullptr;
|
const SfxPoolItem* pItem = nullptr;
|
||||||
@ -291,7 +291,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFrame* pViewFrame )
|
void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell const * pViewShell, SfxViewFrame* pViewFrame )
|
||||||
{
|
{
|
||||||
if( SfxItemState::DEFAULT == rSet.GetItemState( SID_CHARMAP ) ||
|
if( SfxItemState::DEFAULT == rSet.GetItemState( SID_CHARMAP ) ||
|
||||||
SfxItemState::DEFAULT == rSet.GetItemState( FN_INSERT_SOFT_HYPHEN ) ||
|
SfxItemState::DEFAULT == rSet.GetItemState( FN_INSERT_SOFT_HYPHEN ) ||
|
||||||
@ -319,7 +319,7 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFra
|
|||||||
rSet.DisableItem(SID_INSERT_ZWSP);
|
rSet.DisableItem(SID_INSERT_ZWSP);
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !bTextEdit && (dynamic_cast<OutlineViewShell*>( pViewShell ) == nullptr) )
|
if( !bTextEdit && (dynamic_cast<OutlineViewShell const *>( pViewShell ) == nullptr) )
|
||||||
rSet.DisableItem(SID_CHARMAP);
|
rSet.DisableItem(SID_CHARMAP);
|
||||||
|
|
||||||
if(!bTextEdit || !bCtlEnabled )
|
if(!bTextEdit || !bCtlEnabled )
|
||||||
|
@ -235,7 +235,7 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
|
|||||||
return p3DObj;
|
return p3DObj;
|
||||||
}
|
}
|
||||||
|
|
||||||
void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dScene *pScene)
|
void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject const * p3DObj, E3dScene *pScene)
|
||||||
{
|
{
|
||||||
Camera3D aCamera = pScene->GetCamera ();
|
Camera3D aCamera = pScene->GetCamera ();
|
||||||
|
|
||||||
|
@ -499,7 +499,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
|
|||||||
/**
|
/**
|
||||||
* set line starts and ends for the object to be created
|
* set line starts and ends for the object to be created
|
||||||
*/
|
*/
|
||||||
::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel* pDoc)
|
::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel const * pDoc)
|
||||||
{
|
{
|
||||||
::basegfx::B2DPolyPolygon aRetval;
|
::basegfx::B2DPolyPolygon aRetval;
|
||||||
XLineEndListRef pLineEndList = pDoc->GetLineEndList();
|
XLineEndListRef pLineEndList = pDoc->GetLineEndList();
|
||||||
@ -523,7 +523,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
|
|||||||
return aRetval;
|
return aRetval;
|
||||||
}
|
}
|
||||||
|
|
||||||
void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
|
void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject const * pObj)
|
||||||
{
|
{
|
||||||
if ( (pObj->GetObjIdentifier() == OBJ_EDGE &&
|
if ( (pObj->GetObjIdentifier() == OBJ_EDGE &&
|
||||||
nSlotId != SID_TOOL_CONNECTOR &&
|
nSlotId != SID_TOOL_CONNECTOR &&
|
||||||
|
@ -263,7 +263,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* static */ void FuFormatPaintBrush::GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet )
|
/* static */ void FuFormatPaintBrush::GetMenuState( DrawViewShell const & rDrawViewShell, SfxItemSet &rSet )
|
||||||
{
|
{
|
||||||
const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList();
|
const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList();
|
||||||
|
|
||||||
|
@ -1357,7 +1357,7 @@ bool FuText::cancel()
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Is rCell covered by the rFirst - rLast selection?
|
/// Is rCell covered by the rFirst - rLast selection?
|
||||||
static bool IsInSelection(const sdr::table::CellPos& rFirst, const sdr::table::CellPos& rLast, sdr::table::CellPos& rCell)
|
static bool IsInSelection(const sdr::table::CellPos& rFirst, const sdr::table::CellPos& rLast, sdr::table::CellPos const & rCell)
|
||||||
{
|
{
|
||||||
if (rCell.mnCol < rFirst.mnCol)
|
if (rCell.mnCol < rFirst.mnCol)
|
||||||
return false;
|
return false;
|
||||||
|
@ -126,7 +126,7 @@ public:
|
|||||||
void GetState(SfxItemSet&);
|
void GetState(SfxItemSet&);
|
||||||
|
|
||||||
void Connect(sd::ViewShell* pViewSh);
|
void Connect(sd::ViewShell* pViewSh);
|
||||||
void Disconnect(sd::ViewShell* pViewSh);
|
void Disconnect(sd::ViewShell const * pViewSh);
|
||||||
void UpdateTablePointers();
|
void UpdateTablePointers();
|
||||||
|
|
||||||
bool GotoBookmark(const OUString& rBookmark);
|
bool GotoBookmark(const OUString& rBookmark);
|
||||||
|
@ -119,7 +119,7 @@ public:
|
|||||||
|
|
||||||
virtual void Resize() override;
|
virtual void Resize() override;
|
||||||
|
|
||||||
void ShowMousePosInfo(const ::tools::Rectangle& rRect, ::sd::Window* pWin);
|
void ShowMousePosInfo(const ::tools::Rectangle& rRect, ::sd::Window const * pWin);
|
||||||
|
|
||||||
virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive);
|
virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive);
|
||||||
|
|
||||||
@ -182,7 +182,7 @@ public:
|
|||||||
void ExecNavigatorWin(SfxRequest& rReq);
|
void ExecNavigatorWin(SfxRequest& rReq);
|
||||||
void GetNavigatorWinState(SfxItemSet& rSet);
|
void GetNavigatorWinState(SfxItemSet& rSet);
|
||||||
|
|
||||||
void ExecutePropPanelAttr (SfxRequest& rReq);
|
void ExecutePropPanelAttr (SfxRequest const & rReq);
|
||||||
void GetStatePropPanelAttr(SfxItemSet& rSet);
|
void GetStatePropPanelAttr(SfxItemSet& rSet);
|
||||||
|
|
||||||
void ExecEffectWin(SfxRequest& rReq);
|
void ExecEffectWin(SfxRequest& rReq);
|
||||||
@ -190,19 +190,19 @@ public:
|
|||||||
void Update3DWindow();
|
void Update3DWindow();
|
||||||
void AssignFrom3DWindow();
|
void AssignFrom3DWindow();
|
||||||
|
|
||||||
void ExecGallery(SfxRequest& rReq);
|
void ExecGallery(SfxRequest const & rReq);
|
||||||
|
|
||||||
void ExecBmpMask( SfxRequest& rReq );
|
void ExecBmpMask( SfxRequest const & rReq );
|
||||||
void GetBmpMaskState( SfxItemSet& rSet );
|
void GetBmpMaskState( SfxItemSet& rSet );
|
||||||
|
|
||||||
void ExecIMap( SfxRequest& rReq );
|
void ExecIMap( SfxRequest const & rReq );
|
||||||
void GetIMapState( SfxItemSet& rSet );
|
void GetIMapState( SfxItemSet& rSet );
|
||||||
|
|
||||||
void FuTemporary(SfxRequest& rReq);
|
void FuTemporary(SfxRequest& rReq);
|
||||||
void FuPermanent(SfxRequest& rReq);
|
void FuPermanent(SfxRequest& rReq);
|
||||||
void FuSupport(SfxRequest& rReq);
|
void FuSupport(SfxRequest& rReq);
|
||||||
void FuDeleteSelectedObjects();
|
void FuDeleteSelectedObjects();
|
||||||
void FuSupportRotate(SfxRequest& rReq);
|
void FuSupportRotate(SfxRequest const & rReq);
|
||||||
void FuTable(SfxRequest& rReq);
|
void FuTable(SfxRequest& rReq);
|
||||||
|
|
||||||
void AttrExec (SfxRequest& rReq);
|
void AttrExec (SfxRequest& rReq);
|
||||||
@ -222,7 +222,7 @@ public:
|
|||||||
|
|
||||||
SD_DLLPUBLIC void ExecChar(SfxRequest& rReq);
|
SD_DLLPUBLIC void ExecChar(SfxRequest& rReq);
|
||||||
|
|
||||||
void ExecuteAnnotation (SfxRequest& rRequest);
|
void ExecuteAnnotation (SfxRequest const & rRequest);
|
||||||
void GetAnnotationState (SfxItemSet& rItemSet);
|
void GetAnnotationState (SfxItemSet& rItemSet);
|
||||||
|
|
||||||
void StartRulerDrag (const Ruler& rRuler, const MouseEvent& rMEvt);
|
void StartRulerDrag (const Ruler& rRuler, const MouseEvent& rMEvt);
|
||||||
@ -398,7 +398,7 @@ protected:
|
|||||||
virtual void UpdateVRuler() override;
|
virtual void UpdateVRuler() override;
|
||||||
virtual void SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY) override;
|
virtual void SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY) override;
|
||||||
|
|
||||||
void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower,
|
void SetupPage( Size const &rSize, long nLeft, long nRight, long nUpper, long nLower,
|
||||||
bool bSize, bool bMargin, bool bScaleAll );
|
bool bSize, bool bMargin, bool bScaleAll );
|
||||||
|
|
||||||
void GetMenuStateSel(SfxItemSet& rSet);
|
void GetMenuStateSel(SfxItemSet& rSet);
|
||||||
|
@ -169,7 +169,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
void MultiplexEvent(
|
void MultiplexEvent(
|
||||||
EventMultiplexerEventId eEventId,
|
EventMultiplexerEventId eEventId,
|
||||||
void* pUserData);
|
void const * pUserData);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
class Implementation;
|
class Implementation;
|
||||||
|
@ -43,7 +43,7 @@ public:
|
|||||||
void Connect();
|
void Connect();
|
||||||
void Disconnect();
|
void Disconnect();
|
||||||
|
|
||||||
void Update(SdOptions* pOptions);
|
void Update(SdOptions const * pOptions);
|
||||||
|
|
||||||
void SetStandardHelpLines(const SdrHelpLineList& rHelpLines)
|
void SetStandardHelpLines(const SdrHelpLineList& rHelpLines)
|
||||||
{ maStandardHelpLines = rHelpLines; }
|
{ maStandardHelpLines = rHelpLines; }
|
||||||
|
@ -47,7 +47,7 @@ public:
|
|||||||
void Execute( SfxRequest& rReq );
|
void Execute( SfxRequest& rReq );
|
||||||
|
|
||||||
void GetFilterState( SfxItemSet& rSet );
|
void GetFilterState( SfxItemSet& rSet );
|
||||||
void ExecuteFilter( SfxRequest& rReq );
|
void ExecuteFilter( SfxRequest const & rReq );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
::sd::View* mpView;
|
::sd::View* mpView;
|
||||||
|
@ -45,7 +45,7 @@ public:
|
|||||||
virtual ~MediaObjectBar() override;
|
virtual ~MediaObjectBar() override;
|
||||||
|
|
||||||
void GetState( SfxItemSet& rSet );
|
void GetState( SfxItemSet& rSet );
|
||||||
void Execute( SfxRequest& rReq );
|
void Execute( SfxRequest const & rReq );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
::sd::View* mpView;
|
::sd::View* mpView;
|
||||||
|
@ -72,8 +72,8 @@ public:
|
|||||||
void DisconnectFromApplication();
|
void DisconnectFromApplication();
|
||||||
|
|
||||||
|
|
||||||
static SdrTextObj* GetTitleTextObject(SdrPage* pPage);
|
static SdrTextObj* GetTitleTextObject(SdrPage const * pPage);
|
||||||
static SdrTextObj* GetOutlineTextObject(SdrPage* pPage);
|
static SdrTextObj* GetOutlineTextObject(SdrPage const * pPage);
|
||||||
|
|
||||||
static SdrTextObj* CreateTitleTextObject(SdPage* pPage);
|
static SdrTextObj* CreateTitleTextObject(SdPage* pPage);
|
||||||
static SdrTextObj* CreateOutlineTextObject(SdPage* pPage);
|
static SdrTextObj* CreateOutlineTextObject(SdPage* pPage);
|
||||||
@ -81,19 +81,19 @@ public:
|
|||||||
virtual void AddWindowToPaintView(OutputDevice* pWin, vcl::Window* pWindow) override;
|
virtual void AddWindowToPaintView(OutputDevice* pWin, vcl::Window* pWindow) override;
|
||||||
virtual void DeleteWindowFromPaintView(OutputDevice* pWin) override;
|
virtual void DeleteWindowFromPaintView(OutputDevice* pWin) override;
|
||||||
|
|
||||||
OutlinerView* GetViewByWindow(vcl::Window* pWin) const;
|
OutlinerView* GetViewByWindow(vcl::Window const * pWin) const;
|
||||||
SdrOutliner& GetOutliner() { return mrOutliner; }
|
SdrOutliner& GetOutliner() { return mrOutliner; }
|
||||||
|
|
||||||
Paragraph* GetPrevTitle(const Paragraph* pPara);
|
Paragraph* GetPrevTitle(const Paragraph* pPara);
|
||||||
Paragraph* GetNextTitle(const Paragraph* pPara);
|
Paragraph* GetNextTitle(const Paragraph* pPara);
|
||||||
SdPage* GetActualPage();
|
SdPage* GetActualPage();
|
||||||
SdPage* GetPageForParagraph( Paragraph* pPara );
|
SdPage* GetPageForParagraph( Paragraph* pPara );
|
||||||
Paragraph* GetParagraphForPage( ::Outliner& rOutl, SdPage* pPage );
|
Paragraph* GetParagraphForPage( ::Outliner const & rOutl, SdPage const * pPage );
|
||||||
|
|
||||||
/** selects the paragraph for the given page at the outliner view*/
|
/** selects the paragraph for the given page at the outliner view*/
|
||||||
void SetActualPage( SdPage* pActual );
|
void SetActualPage( SdPage const * pActual );
|
||||||
|
|
||||||
void Paint (const ::tools::Rectangle& rRect, ::sd::Window* pWin);
|
void Paint (const ::tools::Rectangle& rRect, ::sd::Window const * pWin);
|
||||||
|
|
||||||
// Callbacks for LINKs
|
// Callbacks for LINKs
|
||||||
DECL_LINK( ParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, void );
|
DECL_LINK( ParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, void );
|
||||||
|
@ -145,7 +145,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
void SetCurrentPage (SdPage* pPage);
|
void SetCurrentPage (SdPage* pPage);
|
||||||
|
|
||||||
void UpdateTitleObject( SdPage* pPage, Paragraph* pPara );
|
void UpdateTitleObject( SdPage* pPage, Paragraph const * pPara );
|
||||||
void UpdateOutlineObject( SdPage* pPage, Paragraph* pPara );
|
void UpdateOutlineObject( SdPage* pPage, Paragraph* pPara );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -80,7 +80,7 @@ namespace sd
|
|||||||
SD_DLLPUBLIC static void restoreDiscoverable();
|
SD_DLLPUBLIC static void restoreDiscoverable();
|
||||||
|
|
||||||
// For the communicator
|
// For the communicator
|
||||||
static void removeCommunicator( Communicator* pCommunicator );
|
static void removeCommunicator( Communicator const * pCommunicator );
|
||||||
private:
|
private:
|
||||||
RemoteServer();
|
RemoteServer();
|
||||||
virtual ~RemoteServer() override;
|
virtual ~RemoteServer() override;
|
||||||
|
@ -61,7 +61,7 @@ class TemplateEntryCompare
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
TemplateEntryCompare();
|
TemplateEntryCompare();
|
||||||
bool operator()(TemplateEntry* pA, TemplateEntry* pB) const;
|
bool operator()(TemplateEntry const * pA, TemplateEntry const * pB) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::shared_ptr<comphelper::string::NaturalStringSorter> mpStringSorter;
|
std::shared_ptr<comphelper::string::NaturalStringSorter> mpStringSorter;
|
||||||
|
@ -91,7 +91,7 @@ public:
|
|||||||
void SelectAll();
|
void SelectAll();
|
||||||
void DoCut();
|
void DoCut();
|
||||||
void DoCopy();
|
void DoCopy();
|
||||||
void DoPaste(vcl::Window* pWindow=nullptr);
|
void DoPaste(vcl::Window const * pWindow=nullptr);
|
||||||
virtual void DoConnect(SdrOle2Obj* pOleObj) override;
|
virtual void DoConnect(SdrOle2Obj* pOleObj) override;
|
||||||
virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false);
|
virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false);
|
||||||
void StartDrag( const Point& rStartPos, vcl::Window* pWindow );
|
void StartDrag( const Point& rStartPos, vcl::Window* pWindow );
|
||||||
@ -141,10 +141,10 @@ public:
|
|||||||
*/
|
*/
|
||||||
bool InsertMetaFile( TransferableDataHelper& rDataHelper,
|
bool InsertMetaFile( TransferableDataHelper& rDataHelper,
|
||||||
const Point& rInsertPos,
|
const Point& rInsertPos,
|
||||||
ImageMap* pImageMap, bool bOptimize );
|
ImageMap const * pImageMap, bool bOptimize );
|
||||||
SdrGrafObj* InsertGraphic( const Graphic& rGraphic,
|
SdrGrafObj* InsertGraphic( const Graphic& rGraphic,
|
||||||
sal_Int8& rAction, const Point& rPos,
|
sal_Int8& rAction, const Point& rPos,
|
||||||
SdrObject* pSelectedObj, ImageMap* pImageMap );
|
SdrObject* pSelectedObj, ImageMap const * pImageMap );
|
||||||
void InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction,
|
void InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction,
|
||||||
const Point& rPos, const Size& rSize,
|
const Point& rPos, const Size& rSize,
|
||||||
bool const bLink );
|
bool const bLink );
|
||||||
@ -226,7 +226,7 @@ public:
|
|||||||
|
|
||||||
SdrObject* GetEmptyPresentationObject( PresObjKind eKind );
|
SdrObject* GetEmptyPresentationObject( PresObjKind eKind );
|
||||||
SdPage* GetPage();
|
SdPage* GetPage();
|
||||||
SdrObject* GetSelectedSingleObject(SdPage* pPage);
|
SdrObject* GetSelectedSingleObject(SdPage const * pPage);
|
||||||
void SetAuthor(const OUString& rAuthor) { m_sAuthor = rAuthor; }
|
void SetAuthor(const OUString& rAuthor) { m_sAuthor = rAuthor; }
|
||||||
const OUString& GetAuthor() { return m_sAuthor; }
|
const OUString& GetAuthor() { return m_sAuthor; }
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ protected:
|
|||||||
*/
|
*/
|
||||||
void AssignMasterPage (
|
void AssignMasterPage (
|
||||||
const SdTransferable& rTransferable,
|
const SdTransferable& rTransferable,
|
||||||
SdPage* pMasterPage);
|
SdPage const * pMasterPage);
|
||||||
|
|
||||||
/** Return an index of a page after which the pages of the transferable
|
/** Return an index of a page after which the pages of the transferable
|
||||||
are to be inserted into the target document.
|
are to be inserted into the target document.
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user