summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-24 09:57:41 +0200
committerNoel Grandin <noel@peralex.com>2015-03-24 10:31:18 +0200
commit1c34766698b03d14376ae7759ab1ad69f56786f9 (patch)
treeca3942863f811cdf344e14dbf74639ff50b957b6
parent4d4022fef2c499e1151ee66a79377e77e5093cae (diff)
loplugin:constantfunction: reportdesign
Change-Id: Ic94359c544034b9e6f09bd02a377d906a5b820e6
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx1
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx3
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx4
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx18
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx5
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx2
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx4
7 files changed, 1 insertions, 36 deletions
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index ae4ef3987530..7a7d5c699f68 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -318,7 +318,6 @@ namespace rptui
DECL_LINK( OnClipboardChanged, void* );
DECL_LINK( OnExecuteReport, void* );
DECL_LINK( OnOpenHelpAgent, void* );
- short saveModified();
// all the features which should be handled by this class
virtual void describeSupportedFeatures() SAL_OVERRIDE;
// state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot.
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 60bdc486d32c..a416b74a94bd 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -68,9 +68,6 @@ namespace rptui
OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView);
virtual ~OReportWindow();
- /** late ctor
- */
- void initialize();
// Window overrides
virtual void Resize() SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index ac6926178764..8acd960804d1 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -159,10 +159,6 @@ namespace rptui
void resize(const OSectionWindow& _rSectionWindow);
- /** late ctor
- */
- void initialize();
-
inline OReportWindow* getView() const { return m_pParent; }
/** removes the section at the given position.
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 38ae9273987e..549fa2f33c36 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1608,17 +1608,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
case SID_EDITDOC:
if(isEditable())
{ // the state should be changed to not editable
- switch (saveModified())
- {
- case RET_CANCEL:
- // don't change anything here so return
- return;
- case RET_NO:
- setModified(sal_False); // and we are not modified yet
- break;
- default:
- break;
- }
+ setModified(sal_False); // and we are not modified yet
}
setEditable(!isEditable());
InvalidateAll();
@@ -1655,12 +1645,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
InvalidateFeature(_nId,Reference< XStatusListener >(),bForceBroadcast);
}
-short OReportController::saveModified()
-{
- return RET_NO;
-}
-
-
void OReportController::impl_initialize( )
{
OReportController_BASE::impl_initialize();
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 3ace86ee9e66..74148f6700f3 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -89,11 +89,6 @@ OReportWindow::~OReportWindow()
m_pReportListener->dispose();
}
-void OReportWindow::initialize()
-{
- m_aViewsWindow.initialize();
-}
-
void OReportWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
{
m_aViewsWindow.SetInsertObj( eObj,_sShapeType);
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 934255557688..d5cf903a4bac 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -91,8 +91,6 @@ void OScrollWindowHelper::initialize()
{
uno::Reference<report::XReportDefinition> xReportDefinition = m_pParent->getController().getReportDefinition();
m_pReportDefintionMultiPlexer = addStyleListener(xReportDefinition,this);
-
- m_aReportWindow.initialize();
}
void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight)
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index d4ebe2165ff7..30d690c799da 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -189,10 +189,6 @@ OViewsWindow::~OViewsWindow()
m_aSections.clear();
}
-void OViewsWindow::initialize()
-{
-}
-
void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet)
{
const uno::Reference< report::XSection> xSection = _rSectionWindow.getReportSection().getSection();