summaryrefslogtreecommitdiff
path: root/reportdesign/inc
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-03-12 17:29:25 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-03-12 17:29:25 +0000
commit2a8efd9fb0f07780534b1fe864d88d3aabbc23a1 (patch)
treee36079d09823eb445f27f3fb752a537efbff63d4 /reportdesign/inc
parent587da420e46fcd54e98a3ead6c16e009ec1fde59 (diff)
CWS-TOOLING: integrate CWS newbaselineunxlngi
2009-02-06 09:05:24 +0100 oj r267441 : move dll.h into the first line 2009-02-05 12:03:43 +0100 oj r267414 : remove inlines 2009-02-05 12:03:12 +0100 oj r267413 : remove inlines 2009-02-05 08:11:58 +0100 oj r267407 : remove dll.pmk 2009-02-05 07:44:34 +0100 oj r267403 : remove dll.pmk 2009-02-02 17:20:34 +0100 vg r267279 : rebased to m41 2009-02-02 12:35:08 +0100 oj r267259 : #i98651# include dll.pmk 2009-01-30 16:03:30 +0100 releng r267208 : #i98603# get rid of warnings 2009-01-29 15:05:55 +0100 releng r267146 : #i98603# revert changes 2009-01-29 15:00:24 +0100 releng r267143 : #i98603# get rid of warnings 2009-01-29 13:02:26 +0100 releng r267119 : #i10000# added missing dependency 2008-12-24 15:49:02 +0100 releng r265797 : #158998# fixes for the new unxlngi baseline
Diffstat (limited to 'reportdesign/inc')
-rw-r--r--reportdesign/inc/ModuleHelper.hxx9
-rw-r--r--reportdesign/inc/PropertyForward.hxx3
-rw-r--r--reportdesign/inc/ReportDefinition.hxx3
-rw-r--r--reportdesign/inc/ReportVisitor.hxx3
-rw-r--r--reportdesign/inc/RptDef.hxx3
-rw-r--r--reportdesign/inc/RptModel.hxx4
-rw-r--r--reportdesign/inc/RptObject.hxx3
-rw-r--r--reportdesign/inc/RptPage.hxx2
-rw-r--r--reportdesign/inc/UndoActions.hxx3
-rw-r--r--reportdesign/inc/reportformula.hxx11
10 files changed, 28 insertions, 16 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
index a9ce2cefec55..813287c0a373 100644
--- a/reportdesign/inc/ModuleHelper.hxx
+++ b/reportdesign/inc/ModuleHelper.hxx
@@ -31,9 +31,10 @@
#ifndef _RPTUI_MODULE_HELPER_RPT_HXX_
#define _RPTUI_MODULE_HELPER_RPT_HXX_
+#include "dllapi.h"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <tools/resmgr.hxx>
-#include "dllapi.h"
+
//.........................................................................
namespace rptui
{
@@ -79,8 +80,8 @@ namespace rptui
class REPORTDESIGN_DLLPUBLIC OModuleClient
{
public:
- OModuleClient() { OModule::registerClient(); }
- ~OModuleClient() { OModule::revokeClient(); }
+ inline OModuleClient() { OModule::registerClient(); }
+ inline ~OModuleClient() { OModule::revokeClient(); }
};
//=========================================================================
@@ -91,7 +92,7 @@ namespace rptui
class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId
{
public:
- ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
+ inline ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
};
//.........................................................................
} // namespace rptui
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index 9f31bf441f1d..1adb261663a3 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -30,13 +30,14 @@
#ifndef RPTUI_PROPERTYSETFORWARD_HXX
#define RPTUI_PROPERTYSETFORWARD_HXX
+#include "dllapi.h"
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <cppuhelper/compbase1.hxx>
#include "cppuhelper/basemutex.hxx"
#include "RptDef.hxx"
-#include "dllapi.h"
+
//........................................................................
namespace rptui
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 6df3170c4519..68b6a1c41771 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -31,6 +31,7 @@
#ifndef REPORTDESIGN_API_REPORTDEFINITION_HXX
#define REPORTDESIGN_API_REPORTDEFINITION_HXX
+#include "dllapi.h"
#include <com/sun/star/report/XReportDefinition.hpp>
#include <cppuhelper/compbase11.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -49,7 +50,7 @@
#include <com/sun/star/frame/XModule.hpp>
#include "ReportHelperDefines.hxx"
#include <boost/shared_ptr.hpp>
-#include "dllapi.h"
+
namespace rptui
{
diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx
index cb9949752f86..36b8e08819e3 100644
--- a/reportdesign/inc/ReportVisitor.hxx
+++ b/reportdesign/inc/ReportVisitor.hxx
@@ -30,8 +30,9 @@
#ifndef INCLUDED_REPORT_VISTITOR_HXX
#define INCLUDED_REPORT_VISTITOR_HXX
-#include <com/sun/star/report/XReportDefinition.hpp>
#include "dllapi.h"
+#include <com/sun/star/report/XReportDefinition.hpp>
+
namespace reportdesign
{
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 69224d35e9fb..e86b3134cab8 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -31,12 +31,13 @@
#ifndef _REPORT_RPTUIDEF_HXX
#define _REPORT_RPTUIDEF_HXX
+#include "dllapi.h"
#include <tools/solar.h>
#include <svx/svdobj.hxx>
#include <comphelper/stl_types.hxx>
#include <comphelper/uno3.hxx>
#include <svx/fmglob.hxx>
-#include "dllapi.h"
+
FORWARD_DECLARE_INTERFACE(report,XReportComponent)
FORWARD_DECLARE_INTERFACE(report,XReportDefinition)
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index ebc92b5ae79f..70f1860f7333 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -29,9 +29,11 @@
************************************************************************/
#ifndef REPORT_RPTMODEL_HXX
#define REPORT_RPTMODEL_HXX
+
+#include "dllapi.h"
#include <svx/svdmodel.hxx>
#include <com/sun/star/report/XReportDefinition.hpp>
-#include "dllapi.h"
+
class Window;
namespace dbaui
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 331b012b4824..50e0afa4afb3 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -30,6 +30,7 @@
#ifndef _REPORT_RPTUIOBJ_HXX
#define _REPORT_RPTUIOBJ_HXX
+#include "dllapi.h"
#include <svx/svdoole2.hxx>
#include <svx/svdouno.hxx>
@@ -44,7 +45,7 @@
#include <svx/svdoashp.hxx>
#include <comphelper/stl_types.hxx>
#include <comphelper/implementationreference.hxx>
-#include "dllapi.h"
+
namespace rptui
{
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index 03d679b7d491..66a726bcda37 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -30,10 +30,10 @@
#ifndef _REPORT_RPTUIPAGE_HXX
#define _REPORT_RPTUIPAGE_HXX
+#include "dllapi.h"
#include "svx/svdpage.hxx"
#include <com/sun/star/report/XReportComponent.hpp>
#include <com/sun/star/report/XSection.hpp>
-#include "dllapi.h"
namespace rptui
{
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 3ec771c90844..0408cb2379d7 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -30,6 +30,7 @@
#ifndef RPTUI_UNDOACTIONS_HXX
#define RPTUI_UNDOACTIONS_HXX
+#include "dllapi.h"
#include <svx/svdundo.hxx>
#include <tools/string.hxx>
/** === begin UNO includes === **/
@@ -52,7 +53,7 @@
#include <svtools/lstner.hxx>
#include <svx/svdouno.hxx>
#include "RptModel.hxx"
-#include "dllapi.h"
+
#include <functional>
#include <memory>
#include <boost/shared_ptr.hpp>
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 4d553ceb9371..f4e217acc450 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -72,16 +72,19 @@ namespace rptui
/// constructs a ReportFormula by BindType
ReportFormula( const BindType _eType, const ::rtl::OUString& _rFieldOrExpression );
+ ~ReportFormula();
+
+ ReportFormula& operator=(class ReportFormula const &);
/// returns whether the object denotes a valid formula
- bool isValid() const { return getType() != Invalid; }
+ bool isValid() const;
/// returns the type of the binding represented by the formula
- BindType getType() const { return m_eType; }
+ inline BindType getType() const { return m_eType; }
/// returns the complete formula represented by the object
const ::rtl::OUString&
- getCompleteFormula() const { return m_sCompleteFormula; }
+ getCompleteFormula() const;
/** gets the <em>undecorated formula</em> content
@@ -91,7 +94,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;// { return m_sUndecoratedContent; }
/// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression
inline ::rtl::OUString getFieldName() const;