summaryrefslogtreecommitdiff
path: root/reportdesign/inc
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 19:49:46 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-26 08:57:59 -0600
commit2196955b00071dce0d89e6dd13c50284d066e1f2 (patch)
treeaba1653fc3b7817db0eb6819d7cf9059538169b9 /reportdesign/inc
parent2efee3c632bb8372685bb9f7b07e99b91668d779 (diff)
Remove visual noise from reportdesign
Change-Id: I2fea3ecefa24cfc0f3cc2a2f4de7c934eba5d6f7 Reviewed-on: https://gerrit.libreoffice.org/8295 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign/inc')
-rw-r--r--reportdesign/inc/ModuleHelper.hxx20
-rw-r--r--reportdesign/inc/PropertyForward.hxx8
-rw-r--r--reportdesign/inc/ReportDefinition.hxx4
-rw-r--r--reportdesign/inc/ReportVisitor.hxx4
-rw-r--r--reportdesign/inc/RptDef.hxx4
-rw-r--r--reportdesign/inc/RptObject.hxx16
-rw-r--r--reportdesign/inc/RptPage.hxx4
-rw-r--r--reportdesign/inc/RptResId.hrc2
-rw-r--r--reportdesign/inc/UndoActions.hxx35
-rw-r--r--reportdesign/inc/UndoEnv.hxx4
-rw-r--r--reportdesign/inc/conditionalexpression.hxx24
-rw-r--r--reportdesign/inc/reportformula.hxx16
12 files changed, 69 insertions, 72 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
index 541d0cbe8bcb..91242cb48f09 100644
--- a/reportdesign/inc/ModuleHelper.hxx
+++ b/reportdesign/inc/ModuleHelper.hxx
@@ -24,13 +24,13 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <tools/resmgr.hxx>
-//.........................................................................
+
namespace rptui
{
-//.........................................................................
- //=========================================================================
+
+
//= OModule
- //=========================================================================
+
class OModuleImpl;
class REPORTDESIGN_DLLPUBLIC OModule
{
@@ -60,9 +60,9 @@ namespace rptui
static void ensureImpl();
};
- //=========================================================================
+
//= OModuleClient
- //=========================================================================
+
/** base class for objects which uses any global module-specific resources
*/
class REPORTDESIGN_DLLPUBLIC OModuleClient
@@ -72,9 +72,9 @@ namespace rptui
inline ~OModuleClient() { OModule::revokeClient(); }
};
- //=========================================================================
+
//= ModuleRes
- //=========================================================================
+
/** specialized ResId, using the resource manager provided by the global module
*/
class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId
@@ -82,9 +82,9 @@ namespace rptui
public:
inline ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
};
-//.........................................................................
+
} // namespace rptui
-//.........................................................................
+
#endif // _RPTUI_MODULE_HELPER_RPT_HXX_
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index 7ca6e8f6a8dc..94c509e950bb 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -28,10 +28,10 @@
#include "RptDef.hxx"
-//........................................................................
+
namespace rptui
{
-//........................................................................
+
typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::beans::XPropertyChangeListener
> OPropertyForward_Base;
@@ -77,9 +77,9 @@ namespace rptui
*/
void startListening();
};
-//........................................................................
+
} // namespace rptui
-//........................................................................
+
#endif // RPTUI_PROPERTYSETFORWARD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 47f2d5a4d7cf..4b2fd947b58c 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -399,9 +399,9 @@ namespace reportdesign
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2 > getUIConfigurationManager2( ) throw (::com::sun::star::uno::RuntimeException);
};
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
#endif // REPORTDESIGN_API_REPORTDEFINITION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx
index c48b41aa8429..4383116c0e74 100644
--- a/reportdesign/inc/ReportVisitor.hxx
+++ b/reportdesign/inc/ReportVisitor.hxx
@@ -55,9 +55,9 @@ namespace reportdesign
void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReportDefinition);
void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup);
};
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
#endif // INCLUDED_REPORT_VISTITOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 860e9025c40a..b258625343ee 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -102,7 +102,7 @@ typedef std::map<OUString, TPropertyConverter> TPropertyNamePair;
REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId);
REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport);
-// -----------------------------------------------------------------------------
+
template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName)
{
T nReturn = T();
@@ -110,7 +110,7 @@ template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference
xProp->getPropertyValue(_sPropertyName) >>= nReturn;
return nReturn;
}
-// -----------------------------------------------------------------------------
+
template<typename T> void setStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName,const T& _aValue)
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY);
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 98fa37e79a8c..48cf539ffc08 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -130,9 +130,9 @@ public:
static SdrObject* createObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
static sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
};
-//============================================================================
+
// OCustomShape
-//============================================================================
+
class REPORTDESIGN_DLLPUBLIC OCustomShape: public SdrObjCustomShape , public OObjectBase
{
friend class OReportPage;
@@ -173,9 +173,9 @@ private:
virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape );
};
-//============================================================================
+
// OOle2Obj
-//============================================================================
+
class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase
{
friend class OReportPage;
@@ -224,9 +224,9 @@ public:
void initializeChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel);
};
-//============================================================================
+
// OUnoObject
-//============================================================================
+
class REPORTDESIGN_DLLPUBLIC OUnoObject: public SdrUnoObj , public OObjectBase
{
friend class OReportPage;
@@ -280,9 +280,9 @@ private:
void impl_initializeModel_nothrow();
};
-//============================================================================
+
} // rptui
-//============================================================================
+
#endif // _REPORT_RPTUIOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index f43de616eb7b..2d7ec6e6f064 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -26,9 +26,9 @@
namespace rptui
{
-//============================================================================
+
// OReportPage
-//============================================================================
+
class OReportModel;
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index 11f4c69366f1..4272840368e8 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -219,7 +219,7 @@
#define RID_STR_VERTICALALIGN (RID_STRING_START + 160)
#define RID_STR_PARAADJUST (RID_STRING_START + 161)
-// -----------------------------------------------------------------------
+
#define RID_IMG_TREENODE_COLLAPSED ( RID_IMAGE_START + 1 )
#define RID_IMG_TREENODE_EXPANDED ( RID_IMAGE_START + 2 )
#define REPORT_TREE_ICON ( RID_IMAGE_START + 5 )
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 34c4155396b6..3b92fec6d0fa 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -105,9 +105,9 @@ namespace rptui
static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
};
- //==================================================================================================================
+
//= UndoContext
- //==================================================================================================================
+
class UndoContext
{
public:
@@ -126,9 +126,9 @@ namespace rptui
SfxUndoManager& m_rUndoManager;
};
- //==================================================================================================================
+
//= UndoSuppressor
- //==================================================================================================================
+
class UndoSuppressor
{
public:
@@ -147,9 +147,9 @@ namespace rptui
SfxUndoManager& m_rUndoManager;
};
- //==================================================================================================================
+
//= OCommentUndoAction
- //==================================================================================================================
+
class REPORTDESIGN_DLLPUBLIC OCommentUndoAction : public SdrUndoAction
{
protected:
@@ -166,9 +166,9 @@ namespace rptui
virtual void Undo();
virtual void Redo();
};
- //==================================================================
+
// OUndoContainerAction
- //==================================================================
+
class REPORTDESIGN_DLLPUBLIC OUndoContainerAction: public OCommentUndoAction
{
OUndoContainerAction(OUndoContainerAction&);
@@ -200,9 +200,9 @@ namespace rptui
virtual void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
};
- //==================================================================
+
// OUndoReportSectionAction
- //==================================================================
+
class REPORTDESIGN_DLLPUBLIC OUndoReportSectionAction : public OUndoContainerAction
{
OReportHelper m_aReportHelper;
@@ -222,9 +222,8 @@ namespace rptui
virtual void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
};
- //==================================================================
+
// OUndoGroupSectionAction
- //==================================================================
class REPORTDESIGN_DLLPUBLIC OUndoGroupSectionAction : public OUndoContainerAction
{
OGroupHelper m_aGroupHelper;
@@ -244,9 +243,7 @@ namespace rptui
virtual void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
};
- ///==================================================================
- /// ORptUndoPropertyAction
- ///==================================================================
+ // ORptUndoPropertyAction
class REPORTDESIGN_DLLPUBLIC ORptUndoPropertyAction: public OCommentUndoAction
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xObj;
@@ -271,9 +268,9 @@ namespace rptui
virtual OUString GetComment() const;
};
- //==================================================================
+
// OUndoPropertyReportSectionAction
- //==================================================================
+
class REPORTDESIGN_DLLPUBLIC OUndoPropertyReportSectionAction : public ORptUndoPropertyAction
{
OReportHelper m_aReportHelper;
@@ -290,9 +287,9 @@ namespace rptui
);
};
- //==================================================================
+
// OUndoPropertyGroupSectionAction
- //==================================================================
+
class REPORTDESIGN_DLLPUBLIC OUndoPropertyGroupSectionAction : public ORptUndoPropertyAction
{
OGroupHelper m_aGroupHelper;
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index 2923b919585e..b5cd02352b12 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -32,7 +32,7 @@ namespace rptui
{
class OXUndoEnvironmentImpl;
- //========================================================================
+
class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment
: public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener
, ::com::sun::star::container::XContainerListener
@@ -140,6 +140,6 @@ namespace rptui
};
}
-#endif //
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx
index bc7c89ea4900..765ba84846d1 100644
--- a/reportdesign/inc/conditionalexpression.hxx
+++ b/reportdesign/inc/conditionalexpression.hxx
@@ -27,14 +27,14 @@
#include <map>
-//........................................................................
+
namespace rptui
{
-//........................................................................
- // =============================================================================
+
+
// = ConditionalExpression
- // =============================================================================
+
class REPORTDESIGN_DLLPUBLIC ConditionalExpression
{
private:
@@ -63,18 +63,18 @@ namespace rptui
bool matchExpression( const OUString& _rExpression, const OUString& _rFieldDataSource, OUString& _out_rLHS, OUString& _out_rRHS ) const;
};
- //========================================================================
+
//= ConditionType
- //========================================================================
+
enum ConditionType
{
eFieldValueComparison = 0,
eExpression = 1
};
- //========================================================================
+
//= ComparisonOperation
- //========================================================================
+
enum ComparisonOperation
{
eBetween = 0,
@@ -90,9 +90,9 @@ namespace rptui
typedef ::boost::shared_ptr< ConditionalExpression > PConditionalExpression;
typedef ::std::map< ComparisonOperation, PConditionalExpression > ConditionalExpressions;
- // =============================================================================
+
// = ConditionalExpressionFactory
- // =============================================================================
+
class REPORTDESIGN_DLLPUBLIC ConditionalExpressionFactory
{
public:
@@ -104,9 +104,9 @@ namespace rptui
ConditionalExpressionFactory( const ConditionalExpressionFactory& ); // never implemented
ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ); // never implemented
};
-//........................................................................
+
} // namespace rptui
-//........................................................................
+
#endif // CONDITIONALEXPRESSION_HXX
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 12f9eae4695c..44dfed532018 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -26,14 +26,14 @@
#include <osl/diagnose.h>
-//........................................................................
+
namespace rptui
{
-//........................................................................
- //====================================================================
+
+
//= ReportFormula
- //====================================================================
+
class REPORTDESIGN_DLLPUBLIC ReportFormula
{
public:
@@ -103,23 +103,23 @@ namespace rptui
void impl_construct( const OUString& _rFormula );
};
- //--------------------------------------------------------------------
+
inline OUString ReportFormula::getFieldName() const
{
OSL_PRECOND( getType() == Field, "ReportFormula::getFieldName: not bound to a field!" );
return getUndecoratedContent();
}
- //--------------------------------------------------------------------
+
inline OUString ReportFormula::getExpression() const
{
OSL_PRECOND( getType() == Expression, "ReportFormula::getExpression: not bound to an expression!" );
return getUndecoratedContent();
}
-//........................................................................
+
} // namespace rptui
-//........................................................................
+
#endif // REPORTFORMULA_HXX