summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/inc/reportformula.hxx2
-rw-r--r--reportdesign/qa/complex/ReportDesignerTest.java8
-rw-r--r--reportdesign/source/core/sdr/RptPage.cxx1
-rw-r--r--reportdesign/source/core/sdr/UndoEnv.cxx2
-rw-r--r--reportdesign/source/ui/inc/DateTime.hxx1
-rw-r--r--reportdesign/source/ui/inc/FixedTextColor.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportControllerObserver.hxx8
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx2
-rw-r--r--reportdesign/source/ui/inspection/ReportComponentHandler.cxx1
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx2
10 files changed, 3 insertions, 26 deletions
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 8d26195f2010..1ff7c091dfe6 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -89,7 +89,7 @@ namespace rptui
If the formula denotes an expression, then the <em>undecorated content</em> is the expression
itself.
*/
- const ::rtl::OUString& getUndecoratedContent() const;// { return m_sUndecoratedContent; }
+ const ::rtl::OUString& getUndecoratedContent() const;
/// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression
inline ::rtl::OUString getFieldName() const;
diff --git a/reportdesign/qa/complex/ReportDesignerTest.java b/reportdesign/qa/complex/ReportDesignerTest.java
index aeb57169d533..f34414efac8d 100644
--- a/reportdesign/qa/complex/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/ReportDesignerTest.java
@@ -206,12 +206,10 @@ public class ReportDesignerTest extends ComplexTestCase {
private static XMultiServiceFactory m_xXMultiServiceFactory = null;
private void startOffice()
{
- // int tempTime = param.getInt("SingleTimeOut");
param.put("TimeOut", new Integer(300000));
System.out.println("TimeOut: " + param.getInt("TimeOut"));
System.out.println("ThreadTimeOut: " + param.getInt("ThreadTimeOut"));
- // OfficeProvider aProvider = null;
m_aProvider = new OfficeProvider();
m_xXMultiServiceFactory = (XMultiServiceFactory) m_aProvider.getManager(param);
param.put("ServiceFactory", m_xXMultiServiceFactory);
@@ -253,18 +251,12 @@ public class ReportDesignerTest extends ComplexTestCase {
m_sUPDMinor = System.getProperty("UPDMINOR");
m_sCWS_WORK_STAMP = System.getProperty("CWS_WORK_STAMP");
- // createDBEntry();
log.println("Current CWS: " + m_sCWS_WORK_STAMP);
log.println("Current MWS: " + m_sUPDMinor);
- // System.exit(1);
-
sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser);
log.println("sAppExecutionCommand='" + sAppExecutionCommand + "'");
- // an other way to replace strings
- // sAppExecutionCommand = utils.replaceAll13(sAppExecutionCommand, "${USERNAME}", sUser);
-
checkIfOfficeExists(sAppExecutionCommand);
param.put("AppExecutionCommand", new String(sAppExecutionCommand));
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index 5ed073d3fff6..676e9b240073 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -171,7 +171,6 @@ void OReportPage::removeTempObject(SdrObject *_pToRemoveObj)
SdrObject* pObject = RemoveObject(i);
(void)pObject;
break;
- // delete pObject;
}
}
}
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index ae3a1447df21..9e88d1022ff7 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -538,7 +538,6 @@ void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxCon
// be notified of any changes in the container elements
Reference< XContainer > xSimpleContainer( _rxContainer, UNO_QUERY );
- // OSL_ENSURE( xSimpleContainer.is(), "OXUndoEnvironment::switchListening: how are we expected to be notified of changes in the container?" );
if ( xSimpleContainer.is() )
{
if ( _bStartListening )
@@ -583,7 +582,6 @@ void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObjec
}
catch( const Exception& )
{
- //OSL_ENSURE( sal_False, "OXUndoEnvironment::switchListening: caught an exception!" );
}
}
diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx
index c73f366ea619..4d6f9a233a55 100644
--- a/reportdesign/source/ui/inc/DateTime.hxx
+++ b/reportdesign/source/ui/inc/DateTime.hxx
@@ -49,7 +49,6 @@ class OReportController;
\************************************************************************/
class ODateTimeDialog : public ModalDialog
{
- // FixedLine m_aFLDate;
CheckBox m_aDate;
FixedText m_aFTDateFormat;
ListBox m_aDateListBox;
diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx
index 7a9916e5a499..9120aa433537 100644
--- a/reportdesign/source/ui/inc/FixedTextColor.hxx
+++ b/reportdesign/source/ui/inc/FixedTextColor.hxx
@@ -54,8 +54,6 @@ namespace rptui
void setPropertyTextColor(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey);
- // sal_Int32 getTextColor();
-
public:
FixedTextColor(const OReportController & _aObserver);
virtual ~FixedTextColor();
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 8c3d827110ba..9beba004407b 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -49,12 +49,11 @@ namespace rptui
class OXReportControllerObserverImpl;
//========================================================================
- class /* REPORTDESIGN_DLLPUBLIC */ OXReportControllerObserver
+ class OXReportControllerObserver
: public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener
, ::com::sun::star::container::XContainerListener
, ::com::sun::star::util::XModifyListener
>
- /*,public SfxListener*/
{
const ::std::auto_ptr<OXReportControllerObserverImpl> m_pImpl;
@@ -69,7 +68,6 @@ namespace rptui
public:
OXReportControllerObserver(const OReportController& _rController);
-// protected:
// XPropertyChangeListener
virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException);
@@ -91,9 +89,6 @@ namespace rptui
void AddSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection);
void RemoveSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection );
- // SfxListener
- // virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
/**
Create an object ob OUndoEnvLock locks the undo possibility
As long as in the OUndoEnvLock scope, no undo is possible for manipulated object.
@@ -117,7 +112,6 @@ namespace rptui
void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(());
void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(());
- // void ModeChanged(); // will be called from 'Notify'
DECL_LINK(SettingsChanged, VclWindowEvent* );
private:
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index dfa2f6ec7cdf..61b2b51e76e5 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -252,7 +252,6 @@ namespace rptui
/** returns the report section window for the given xsection
@param _xSection the section
*/
- // ::boost::shared_ptr<OSectionWindow> getReportSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const;
/** checks if the keycode is known by the child windows
@@ -328,7 +327,6 @@ namespace rptui
OSectionView* getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt);
void MovAction(const Point& rPnt,const OSectionView* _pSection,bool _bMove /*= true */, bool _bControlKeySet);
- // void MovAction2(const Point& rPnt,const OSectionView* _pSection);
sal_uInt32 getMarkedObjectCount() const;
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index d42be56e7656..afd709b0e77a 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -47,7 +47,6 @@ namespace rptui
{
//........................................................................
using namespace ::com::sun::star;
-// using namespace comphelper;
ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentContext > const & context)
:ReportComponentHandler_Base(m_aMutex)
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index f2a09d924a64..bf34f824f175 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -115,7 +115,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
}
m_pFunc.reset(new DlgEdFuncSelect( this ));
- m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( /* m_pParent->getViewsWindow()->getView()->getReportView()->getController().getORB() */ ) );
+ m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor() );
}
//------------------------------------------------------------------------------
OReportSection::~OReportSection()
generated by cgit (git 2.34.1) at 2025-02-06 21:58:23 +0000