[Libreoffice-commits] core.git: reportdesign/inc reportdesign/qa reportdesign/source
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 06:58:28 PST 2014
reportdesign/inc/ModuleHelper.hxx | 20 ++--
reportdesign/inc/PropertyForward.hxx | 8 -
reportdesign/inc/ReportDefinition.hxx | 4
reportdesign/inc/ReportVisitor.hxx | 4
reportdesign/inc/RptDef.hxx | 4
reportdesign/inc/RptObject.hxx | 16 +--
reportdesign/inc/RptPage.hxx | 4
reportdesign/inc/RptResId.hrc | 2
reportdesign/inc/UndoActions.hxx | 35 +++----
reportdesign/inc/UndoEnv.hxx | 4
reportdesign/inc/conditionalexpression.hxx | 24 ++---
reportdesign/inc/reportformula.hxx | 16 +--
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java | 18 +--
reportdesign/source/core/api/FixedLine.cxx | 8 -
reportdesign/source/core/api/FixedText.cxx | 8 -
reportdesign/source/core/api/FormatCondition.cxx | 8 -
reportdesign/source/core/api/FormattedField.cxx | 8 -
reportdesign/source/core/api/Function.cxx | 8 -
reportdesign/source/core/api/Functions.cxx | 12 +-
reportdesign/source/core/api/Group.cxx | 12 +-
reportdesign/source/core/api/Groups.cxx | 12 +-
reportdesign/source/core/api/ImageControl.cxx | 8 -
reportdesign/source/core/api/ReportComponent.cxx | 8 -
reportdesign/source/core/api/ReportDefinition.cxx | 4
reportdesign/source/core/api/ReportEngineJFree.cxx | 10 +-
reportdesign/source/core/api/ReportVisitor.cxx | 4
reportdesign/source/core/api/Section.cxx | 12 +-
reportdesign/source/core/api/Shape.cxx | 8 -
reportdesign/source/core/api/Tools.cxx | 8 -
reportdesign/source/core/api/services.cxx | 4
reportdesign/source/core/inc/Functions.hxx | 4
reportdesign/source/core/inc/Group.hxx | 10 +-
reportdesign/source/core/inc/Groups.hxx | 4
reportdesign/source/core/inc/ReportEngineJFree.hxx | 2
reportdesign/source/core/inc/ReportUndoFactory.hxx | 4
reportdesign/source/core/inc/RptObjectListener.hxx | 4
reportdesign/source/core/inc/Section.hxx | 4
reportdesign/source/core/inc/Tools.hxx | 4
reportdesign/source/core/inc/conditionupdater.hxx | 12 +-
reportdesign/source/core/inc/core_resource.hrc | 4
reportdesign/source/core/inc/core_resource.hxx | 10 +-
reportdesign/source/core/misc/conditionalexpression.cxx | 14 +-
reportdesign/source/core/misc/conditionupdater.cxx | 12 +-
reportdesign/source/core/misc/reportformula.cxx | 12 +-
reportdesign/source/core/resource/core_resource.cxx | 10 +-
reportdesign/source/core/sdr/ModuleHelper.cxx | 16 +--
reportdesign/source/core/sdr/PropertyForward.cxx | 8 -
reportdesign/source/core/sdr/ReportUndoFactory.cxx | 14 +-
reportdesign/source/core/sdr/RptModel.cxx | 4
reportdesign/source/core/sdr/RptObject.cxx | 52 +++++------
reportdesign/source/core/sdr/RptObjectListener.cxx | 8 -
reportdesign/source/core/sdr/RptPage.cxx | 4
reportdesign/source/core/sdr/UndoActions.cxx | 4
reportdesign/source/core/sdr/UndoEnv.cxx | 4
reportdesign/source/core/sdr/formatnormalizer.cxx | 12 +-
reportdesign/source/core/sdr/formatnormalizer.hxx | 12 +-
reportdesign/source/filter/xml/dbloader2.hxx | 2
reportdesign/source/filter/xml/xmlAutoStyle.hxx | 4
reportdesign/source/filter/xml/xmlCell.hxx | 4
reportdesign/source/filter/xml/xmlColumn.hxx | 4
reportdesign/source/filter/xml/xmlComponent.hxx | 4
reportdesign/source/filter/xml/xmlCondPrtExpr.hxx | 4
reportdesign/source/filter/xml/xmlControlProperty.hxx | 4
reportdesign/source/filter/xml/xmlEnums.hxx | 4
reportdesign/source/filter/xml/xmlExport.hxx | 8 -
reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx | 4
reportdesign/source/filter/xml/xmlFixedContent.hxx | 4
reportdesign/source/filter/xml/xmlFormatCondition.hxx | 4
reportdesign/source/filter/xml/xmlFormattedField.hxx | 4
reportdesign/source/filter/xml/xmlFunction.hxx | 4
reportdesign/source/filter/xml/xmlGroup.hxx | 4
reportdesign/source/filter/xml/xmlHelper.hxx | 4
reportdesign/source/filter/xml/xmlImage.hxx | 4
reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx | 4
reportdesign/source/filter/xml/xmlMasterFields.hxx | 4
reportdesign/source/filter/xml/xmlPropertyHandler.hxx | 4
reportdesign/source/filter/xml/xmlReport.hxx | 4
reportdesign/source/filter/xml/xmlReportElement.hxx | 4
reportdesign/source/filter/xml/xmlReportElementBase.hxx | 4
reportdesign/source/filter/xml/xmlSection.hxx | 4
reportdesign/source/filter/xml/xmlStyleImport.hxx | 4
reportdesign/source/filter/xml/xmlSubDocument.hxx | 4
reportdesign/source/filter/xml/xmlTable.hxx | 4
reportdesign/source/filter/xml/xmlfilter.hxx | 8 -
reportdesign/source/inc/stringconstants.hrc | 8 -
reportdesign/source/inc/xmlstrings.hrc | 4
reportdesign/source/ui/dlg/AddField.cxx | 12 +-
reportdesign/source/ui/dlg/CondFormat.cxx | 16 +--
reportdesign/source/ui/dlg/CondFormat.src | 2
reportdesign/source/ui/dlg/Condition.cxx | 12 +-
reportdesign/source/ui/dlg/Condition.hxx | 12 +-
reportdesign/source/ui/dlg/DateTime.cxx | 8 -
reportdesign/source/ui/dlg/Formula.cxx | 10 +-
reportdesign/source/ui/dlg/GroupsSorting.cxx | 20 ++--
reportdesign/source/ui/dlg/Navigator.cxx | 10 +-
reportdesign/source/ui/dlg/PageNumber.cxx | 8 -
reportdesign/source/ui/dlg/dlgpage.cxx | 4
reportdesign/source/ui/inc/AddField.hxx | 8 -
reportdesign/source/ui/inc/ColorChanger.hxx | 4
reportdesign/source/ui/inc/ColumnInfo.hxx | 4
reportdesign/source/ui/inc/CondFormat.hxx | 12 +-
reportdesign/source/ui/inc/DataProviderHandler.hxx | 8 -
reportdesign/source/ui/inc/DateTime.hxx | 4
reportdesign/source/ui/inc/DefaultInspection.hxx | 12 +-
reportdesign/source/ui/inc/DesignView.hxx | 8 -
reportdesign/source/ui/inc/Formula.hxx | 10 +-
reportdesign/source/ui/inc/FunctionHelper.hxx | 12 +-
reportdesign/source/ui/inc/GeometryHandler.hxx | 8 -
reportdesign/source/ui/inc/GroupsSorting.hxx | 4
reportdesign/source/ui/inc/Navigator.hxx | 4
reportdesign/source/ui/inc/PageNumber.hxx | 4
reportdesign/source/ui/inc/ReportComponentHandler.hxx | 8 -
reportdesign/source/ui/inc/ReportControllerObserver.hxx | 2
reportdesign/source/ui/inc/ReportRuler.hxx | 4
reportdesign/source/ui/inc/ReportSection.hxx | 4
reportdesign/source/ui/inc/ReportWindow.hxx | 4
reportdesign/source/ui/inc/SectionView.hxx | 4
reportdesign/source/ui/inc/SectionWindow.hxx | 4
reportdesign/source/ui/inc/ViewsWindow.hxx | 6 -
reportdesign/source/ui/inc/dlgedclip.hxx | 4
reportdesign/source/ui/inc/dlgedfac.hxx | 4
reportdesign/source/ui/inc/dlgedfunc.hxx | 12 +-
reportdesign/source/ui/inc/dlgpage.hxx | 4
reportdesign/source/ui/inc/metadata.hxx | 24 ++---
reportdesign/source/ui/inc/propbrw.hxx | 8 -
reportdesign/source/ui/inc/toolboxcontroller.hxx | 4
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 8 -
reportdesign/source/ui/inspection/DefaultInspection.cxx | 10 +-
reportdesign/source/ui/inspection/GeometryHandler.cxx | 8 -
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 8 -
reportdesign/source/ui/inspection/metadata.cxx | 16 +--
reportdesign/source/ui/misc/ColorListener.cxx | 8 -
reportdesign/source/ui/misc/FunctionHelper.cxx | 8 -
reportdesign/source/ui/misc/RptUndo.cxx | 4
reportdesign/source/ui/misc/rptuiservices.cxx | 4
reportdesign/source/ui/misc/statusbarcontroller.cxx | 4
reportdesign/source/ui/misc/toolboxcontroller.cxx | 4
reportdesign/source/ui/report/DesignView.cxx | 8 -
reportdesign/source/ui/report/EndMarker.cxx | 8 -
reportdesign/source/ui/report/ReportController.cxx | 2
reportdesign/source/ui/report/ReportRuler.cxx | 4
reportdesign/source/ui/report/ReportSection.cxx | 8 -
reportdesign/source/ui/report/ReportWindow.cxx | 8 -
reportdesign/source/ui/report/ScrollHelper.cxx | 4
reportdesign/source/ui/report/SectionView.cxx | 4
reportdesign/source/ui/report/SectionWindow.cxx | 4
reportdesign/source/ui/report/StartMarker.cxx | 8 -
reportdesign/source/ui/report/ViewsWindow.cxx | 4
reportdesign/source/ui/report/dlgedclip.cxx | 8 -
reportdesign/source/ui/report/dlgedfunc.cxx | 4
reportdesign/source/ui/report/propbrw.cxx | 4
reportdesign/source/ui/report/report.src | 2
152 files changed, 575 insertions(+), 578 deletions(-)
New commits:
commit 2196955b00071dce0d89e6dd13c50284d066e1f2
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 19:49:46 2014 +0100
Remove visual noise from reportdesign
Change-Id: I2fea3ecefa24cfc0f3cc2a2f4de7c934eba5d6f7
Reviewed-on: https://gerrit.libreoffice.org/8295
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
index 541d0cb..91242cb 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 7ca6e8f..94c509e 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 47f2d5a..4b2fd94 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 c48b41a..4383116 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 860e902..b258625 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 98fa37e..48cf539 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 f43de61..2d7ec6e 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 11f4c69..4272840 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 34c4155..3b92fec 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 2923b91..b5cd023 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 bc7c89e..765ba84 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 12f9eae..44dfed5 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
diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
index 7d44e0c..83d44e0 100644
--- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
@@ -141,7 +141,7 @@ public class ReportDesignerTest
{
System.out.println("before");
// String tempdir = System.getProperty("java.io.tmpdir");
- //
+
int dummy = 0;
// m_xXMultiServiceFactory = getMSF();
}
@@ -167,7 +167,7 @@ public class ReportDesignerTest
// sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 7);
// }
// }
-//
+
// System.out.println(sOfficePath);
// File sOffice = new File(sOfficePath);
// if (! sOffice.exists())
@@ -223,13 +223,13 @@ public class ReportDesignerTest
// 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);
// }
-//
+
// private void stopOffice()
// {
// if (m_aProvider != null)
@@ -266,7 +266,7 @@ public class ReportDesignerTest
// sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser);
// System.out.println("sAppExecutionCommand='" + sAppExecutionCommand + "'");
-//
+
// checkIfOfficeExists(sAppExecutionCommand);
// param.put("AppExecutionCommand", new String(sAppExecutionCommand));
@@ -278,7 +278,7 @@ public class ReportDesignerTest
// String sCurrentDirectory = System.getProperty("user.dir");
// System.out.println("Current Dir: " + sCurrentDirectory);
-//
+
String sWriterDocument = TestDocument.getUrl("RPTWriterTests.odb");
startTestForFile(sWriterDocument, WRITER);
@@ -289,12 +289,12 @@ public class ReportDesignerTest
// stopOffice();
// throw new AssureException(e.getMessage());
// }
-//
+
// ------------------------------ Office shutdown ------------------------------
// stopOffice();
}
-// -----------------------------------------------------------------------------
+
private void startTestForFile(String _sDocument, int _nType)
{
FileURL aFileURL = new FileURL(_sDocument);
@@ -364,7 +364,7 @@ public class ReportDesignerTest
return getFileFormat(_nType);
}
-// -----------------------------------------------------------------------------
+
private void createDBEntry(int _nType)
{
// try to connect the database
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index 989b523..2cb001b 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -32,10 +32,10 @@
#define MIN_WIDTH 80
#define MIN_HEIGHT 20
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
uno::Sequence< OUString > lcl_getLineOptionals()
@@ -567,8 +567,8 @@ void SAL_CALL OFixedLine::setPrintRepeatedValues( ::sal_Bool /*_printrepeatedval
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 3858fcb..abf9bf6 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -30,10 +30,10 @@
#include "FormatCondition.hxx"
#include <com/sun/star/text/ParagraphVertAlign.hpp>
#include "ReportHelperImpl.hxx"
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
uno::Sequence< OUString > lcl_getFixedTextOptionals()
@@ -324,8 +324,8 @@ OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException)
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index e504b64..8a4492a 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -27,10 +27,10 @@
#include "Tools.hxx"
#include <com/sun/star/text/ParagraphVertAlign.hpp>
#include "ReportHelperImpl.hxx"
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
@@ -148,8 +148,8 @@ void SAL_CALL OFormatCondition::setFormula( const OUString& _formula ) throw (un
// XReportControlFormat
REPORTCONTROLFORMAT_IMPL(OFormatCondition,m_aFormatProperties)
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index a62ffe3..0b9336b 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -31,10 +31,10 @@
#include "FormatCondition.hxx"
#include <com/sun/star/text/ParagraphVertAlign.hpp>
#include "ReportHelperImpl.hxx"
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
@@ -366,8 +366,8 @@ OUString SAL_CALL OFormattedField::getShapeType( ) throw (uno::RuntimeException
return OUString("com.sun.star.drawing.ControlShape");
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index 978acbf..fa7fd01 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -24,10 +24,10 @@
#include <comphelper/property.hxx>
#include <cppuhelper/supportsservice.hxx>
#include "Tools.hxx"
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
@@ -203,8 +203,8 @@ void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Par
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index b8eb5d2..169dea2 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -24,10 +24,10 @@
#include <comphelper/property.hxx>
#include <boost/mem_fn.hpp>
#include <algorithm>
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xParent,const uno::Reference< uno::XComponentContext >& context)
@@ -39,7 +39,7 @@ OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xPar
}
// TODO: VirtualFunctionFinder: This is virtual function!
-//
+
OFunctions::~OFunctions()
{
}
@@ -50,7 +50,7 @@ void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException)
}
// TODO: VirtualFunctionFinder: This is virtual function!
-//
+
void SAL_CALL OFunctions::disposing()
{
::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&com::sun::star::report::XFunction::dispose));
@@ -186,8 +186,8 @@ void OFunctions::checkIndex(sal_Int32 _nIndex)
if ( _nIndex < 0 || static_cast<sal_Int32>(m_aFunctions.size()) <= _nIndex )
throw lang::IndexOutOfBoundsException();
}
-// =============================================================================
+
}
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 7344d3a6..0a1f7ce 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -30,10 +30,10 @@
#include <cppuhelper/supportsservice.hxx>
#include "Functions.hxx"
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
@@ -52,7 +52,7 @@ OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent
}
// TODO: VirtualFunctionFinder: This is virtual function!
-//
+
OGroup::~OGroup()
{
}
@@ -105,7 +105,7 @@ void SAL_CALL OGroup::dispose() throw(uno::RuntimeException)
}
// TODO: VirtualFunctionFinder: This is virtual function!
-//
+
void SAL_CALL OGroup::disposing()
{
m_xHeader.clear();
@@ -330,8 +330,8 @@ uno::Reference< report::XFunctions > SAL_CALL OGroup::getFunctions() throw (uno:
{
return m_xFunctions;
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx
index d878789..f63cb74 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -23,10 +23,10 @@
#include "core_resource.hrc"
#include <boost/mem_fn.hpp>
#include <algorithm>
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,const uno::Reference< uno::XComponentContext >& context)
@@ -38,7 +38,7 @@ OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,con
}
// TODO: VirtualFunctionFinder: This is virtual function!
-//
+
OGroups::~OGroups()
{
}
@@ -61,7 +61,7 @@ void SAL_CALL OGroups::dispose() throw(uno::RuntimeException)
}
// TODO: VirtualFunctionFinder: This is virtual function!
-//
+
void SAL_CALL OGroups::disposing()
{
::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&com::sun::star::report::XGroup::dispose));
@@ -199,8 +199,8 @@ void OGroups::checkIndex(sal_Int32 _nIndex)
if ( _nIndex < 0 || static_cast<sal_Int32>(m_aGroups.size()) <= _nIndex )
throw lang::IndexOutOfBoundsException();
}
-// =============================================================================
+
}
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index 84c383a..a6ff378 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -31,10 +31,10 @@
#include <com/sun/star/awt/ImageScaleMode.hpp>
#include <com/sun/star/text/ParagraphVertAlign.hpp>
#include "ReportHelperImpl.hxx"
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
uno::Sequence< OUString > lcl_getImageOptionals()
@@ -483,8 +483,8 @@ void SAL_CALL OImageControl::setPreserveIRI( ::sal_Bool _preserveiri ) throw (un
{
set(PROPERTY_PRESERVEIRI,_preserveiri,m_bPreserveIRI);
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 6671ed5..ad504ab 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -37,10 +37,10 @@
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
@@ -132,9 +132,9 @@ OReportComponentProperties::~OReportComponentProperties()
m_xProxy.clear();
}
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 0d284bb..fd6d4b6 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -334,7 +334,7 @@ OStyle::OStyle()
registerPropertyNoMember(SC_UNO_PAGE_FTRSHADOW, ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBOR, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBDIS, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
- //
+
registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent);
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFFILT, ++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty);
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFLOC, ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
@@ -357,7 +357,7 @@ OStyle::OStyle()
registerPropertyNoMember(SC_UNO_PAGE_HDRSHADOW, ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBOR, ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBDIS, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
- //
+
registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height, ::getCppuType((const sal_Int32*)0) );
registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,nBound, ::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_LEFTBORDER, ++i,nBound, ::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 1bdb2a7..9af66da 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -53,10 +53,10 @@
#include <connectivity/CommonTools.hxx>
#include <rtl/ustrbuf.hxx>
#include <sfx2/docfilt.hxx>
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
@@ -70,7 +70,7 @@ OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentCon
}
// TODO: VirtualFunctionFinder: This is virtual function!
-//
+
OReportEngineJFree::~OReportEngineJFree()
{
}
@@ -400,8 +400,8 @@ void SAL_CALL OReportEngineJFree::setMaxRows( ::sal_Int32 _MaxRows ) throw (uno:
{
set(PROPERTY_MAXROWS,_MaxRows,m_nMaxRows);
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx
index 8d627d6..2c4f160 100644
--- a/reportdesign/source/core/api/ReportVisitor.cxx
+++ b/reportdesign/source/core/api/ReportVisitor.cxx
@@ -80,8 +80,8 @@ void OReportVisitor::start(const uno::Reference< report::XGroup>& _xGroup)
if ( _xGroup->getFooterOn() )
m_pTraverseReport->traverseGroupFooter(_xGroup->getFooter());
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index f3efc55..145a0f9 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -37,10 +37,10 @@
#include "RptObject.hxx"
#include "ReportDrawPage.hxx"
#include <comphelper/property.hxx>
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
@@ -129,7 +129,7 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef
}
// TODO: VirtualFunctionFinder: This is virtual function!
-//
+
OSection::~OSection()
{
}
@@ -165,7 +165,7 @@ void SAL_CALL OSection::dispose() throw(uno::RuntimeException)
}
// TODO: VirtualFunctionFinder: This is virtual function!
-//
+
void SAL_CALL OSection::disposing()
{
lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) );
@@ -709,8 +709,8 @@ void OSection::notifyElementRemoved(const uno::Reference< drawing::XShape >& xSh
m_aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent);
}
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index c95b0e4..664c3dd 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -35,10 +35,10 @@
#include "RptObject.hxx"
#include "FormatCondition.hxx"
#include "ReportHelperImpl.hxx"
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
using namespace comphelper;
uno::Sequence< OUString > lcl_getShapeOptionals()
@@ -508,8 +508,8 @@ void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence< beans::Proper
-// =============================================================================
+
}// namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx
index 718f2b4..23933b7 100644
--- a/reportdesign/source/core/api/Tools.cxx
+++ b/reportdesign/source/core/api/Tools.cxx
@@ -21,10 +21,10 @@
#include "core_resource.hxx"
#include <comphelper/property.hxx>
-// =============================================================================
+
namespace reportdesign
{
-// =============================================================================
+
using namespace com::sun::star;
uno::Reference< report::XSection> lcl_getSection(const uno::Reference< uno::XInterface>& _xReportComponent)
@@ -62,8 +62,8 @@ uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XRe
}
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx
index 91e2490..9fb8d63 100644
--- a/reportdesign/source/core/api/services.cxx
+++ b/reportdesign/source/core/api/services.cxx
@@ -37,8 +37,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-//***************************************************************************************
-//
+
+
// registry functions
namespace
{
diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx
index 04b12580..376cb73 100644
--- a/reportdesign/source/core/inc/Functions.hxx
+++ b/reportdesign/source/core/inc/Functions.hxx
@@ -48,13 +48,13 @@ namespace reportdesign
void checkIndex(sal_Int32 _nIndex);
protected:
// TODO: VirtualFunctionFinder: This is virtual function!
- //
+
virtual ~OFunctions();
/** this function is called upon disposing the component
*/
// TODO: VirtualFunctionFinder: This is virtual function!
- //
+
virtual void SAL_CALL disposing();
public:
explicit OFunctions( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xParent
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index b13d12b..e3c0c4f 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -75,13 +75,13 @@ namespace reportdesign
,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member);
protected:
// TODO: VirtualFunctionFinder: This is virtual function!
- //
+
virtual ~OGroup();
/** this function is called upon disposing the component
*/
// TODO: VirtualFunctionFinder: This is virtual function!
- //
+
virtual void SAL_CALL disposing();
public:
OGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups >& _xParent
@@ -149,9 +149,9 @@ namespace reportdesign
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext(){ return m_xContext; }
};
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
-#endif //
+
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx
index 47c7832..34ab62f 100644
--- a/reportdesign/source/core/inc/Groups.hxx
+++ b/reportdesign/source/core/inc/Groups.hxx
@@ -47,13 +47,13 @@ namespace reportdesign
void checkIndex(sal_Int32 _nIndex);
protected:
// TODO: VirtualFunctionFinder: This is virtual function!
- //
+
virtual ~OGroups();
/** this function is called upon disposing the component
*/
// TODO: VirtualFunctionFinder: This is virtual function!
- //
+
virtual void SAL_CALL disposing();
public:
OGroups( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 8b57b1a..d45efe7 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -75,7 +75,7 @@ namespace reportdesign
protected:
// TODO: VirtualFunctionFinder: This is virtual function!
- //
+
virtual ~OReportEngineJFree();
public:
typedef ::comphelper::ImplementationReference< OReportEngineJFree ,::com::sun::star::report::XReportEngine,::com::sun::star::uno::XWeak > TReportEngine;
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index d7d1079..043da95 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -69,9 +69,9 @@ namespace rptui
virtual SdrUndoAction* CreateUndoPageChangeMasterPage(SdrPage& rChangedPage);
};
-//==============================================================================
+
} // rptui
-//==============================================================================
+
#endif // REPORT_UNDOFACTORY_HXX_INCLUDED
diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx
index 5ad240c..bff6cb6 100644
--- a/reportdesign/source/core/inc/RptObjectListener.hxx
+++ b/reportdesign/source/core/inc/RptObjectListener.hxx
@@ -28,9 +28,9 @@ namespace rptui
{
class OObjectBase;
-//============================================================================
+
// OObjectListener
-//============================================================================
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener > TPropertyChangeListenerHelper;
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index ab44b82..766526f 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -103,13 +103,13 @@ namespace reportdesign
void init();
protected:
// TODO: VirtualFunctionFinder: This is virtual function!
- //
+
virtual ~OSection();
/** this function is called upon disposing the component
*/
// TODO: VirtualFunctionFinder: This is virtual function!
- //
+
virtual void SAL_CALL disposing();
public:
typedef ::comphelper::ImplementationReference< OSection ,::com::sun::star::report::XSection,::com::sun::star::uno::XWeak > TSection;
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index c9210ba..c52cd9f 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -166,9 +166,9 @@ namespace reportdesign
return _pShape->m_aProps.aComponent.m_xParent;
}
};
-// =============================================================================
+
} // namespace reportdesign
-// =============================================================================
+
#endif // REPORTDESIGN_TOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx
index d679a26..668e6d3 100644
--- a/reportdesign/source/core/inc/conditionupdater.hxx
+++ b/reportdesign/source/core/inc/conditionupdater.hxx
@@ -27,14 +27,14 @@
#include <boost/noncopyable.hpp>
-//........................................................................
+
namespace rptui
{
-//........................................................................
- //====================================================================
+
+
//= ConditionUpdater
- //====================================================================
+
class ConditionUpdater : public ::boost::noncopyable
{
public:
@@ -58,9 +58,9 @@ namespace rptui
ConditionalExpressions m_aConditionalExpressions;
};
-//........................................................................
+
} // namespace rptui
-//........................................................................
+
#endif // CONDITIONUPDATER_HXX
diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc
index 654ec2b..99610d8 100644
--- a/reportdesign/source/core/inc/core_resource.hrc
+++ b/reportdesign/source/core/inc/core_resource.hrc
@@ -22,10 +22,10 @@
#include <svl/solar.hrc>
-//------------------------------------------------------------------------------
+
#define RID_CORE_STRINGS_START RID_RPT_START
-//------------------------------------------------------------------------------
+
//- String-IDs
#define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 )
#define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 )
diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx
index 80422e3c9..1ac93ca 100644
--- a/reportdesign/source/core/inc/core_resource.hxx
+++ b/reportdesign/source/core/inc/core_resource.hxx
@@ -24,16 +24,16 @@
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
class SimpleResMgr;
-//.........................................................................
+
namespace reportdesign
{
#define RPT_RESSTRING(id,_rM) ResourceManager::loadString(id,_rM)
- //==================================================================
+
//= ResourceManager
//= handling resources within the DBA-Core library
- //==================================================================
+
class ResourceManager
{
static SimpleResMgr* m_pImpl;
@@ -62,9 +62,9 @@ namespace reportdesign
static OUString loadString(sal_uInt16 _nResId,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >& _rM);
};
-//.........................................................................
+
}
-//.........................................................................
+
#endif // REPORTDESIGN_CORE_RESOURCE_HXX_
diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx
index cf4cd23..c5a3912 100644
--- a/reportdesign/source/core/misc/conditionalexpression.cxx
+++ b/reportdesign/source/core/misc/conditionalexpression.cxx
@@ -18,12 +18,12 @@
*/
#include "conditionalexpression.hxx"
-//........................................................................
+
namespace rptui
{
- // =============================================================================
+
// = ConditionalExpression
- // =============================================================================
+
ConditionalExpression::ConditionalExpression( const sal_Char* _pAsciiPattern )
:m_sPattern( OUString::createFromAscii( _pAsciiPattern ) )
@@ -162,9 +162,9 @@ namespace rptui
return true;
}
- // =============================================================================
+
// = ConditionalExpressionFactory
- // =============================================================================
+
size_t ConditionalExpressionFactory::getKnownConditionalExpressions( ConditionalExpressions& _out_rCondExp )
{
@@ -182,8 +182,8 @@ namespace rptui
return _out_rCondExp.size();
}
-//........................................................................
+
} // namespace rptui
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx
index f5ac039..131089c 100644
--- a/reportdesign/source/core/misc/conditionupdater.cxx
+++ b/reportdesign/source/core/misc/conditionupdater.cxx
@@ -23,10 +23,10 @@
#include <tools/diagnose_ex.h>
-//........................................................................
+
namespace rptui
{
-//........................................................................
+
using ::com::sun::star::beans::PropertyChangeEvent;
using ::com::sun::star::uno::Reference;
@@ -36,9 +36,9 @@ namespace rptui
using ::com::sun::star::uno::UNO_QUERY_THROW;
using ::com::sun::star::uno::Exception;
- //====================================================================
+
//= ConditionUpdater
- //====================================================================
+
ConditionUpdater::ConditionUpdater()
{
@@ -117,8 +117,8 @@ namespace rptui
}
}
-//........................................................................
+
} // namespace rptui
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx
index a05b58f..a6ad2a2 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -21,10 +21,10 @@
#include <rtl/ustrbuf.hxx>
-//........................................................................
+
namespace rptui
{
-//........................................................................
+
using ::com::sun::star::uno::Any;
@@ -49,9 +49,9 @@ namespace rptui
}
}
- //====================================================================
+
//= ReportFormula
- //====================================================================
+
ReportFormula::ReportFormula( const OUString& _rFormula )
:m_eType( Invalid )
@@ -164,8 +164,8 @@ namespace rptui
return aBuffer.makeStringAndClear();
}
-//........................................................................
+
} // namespace rptui
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index 17d896f..29a3d24 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -31,13 +31,13 @@
#include <svl/solar.hrc>
#include "ModuleHelper.hxx"
-//.........................................................................
+
namespace reportdesign
{
using namespace ::com::sun::star;
- //==================================================================
+
//= ResourceManager
- //==================================================================
+
SimpleResMgr* ResourceManager::m_pImpl = NULL;
@@ -70,8 +70,8 @@ namespace reportdesign
return sReturn;
}
-//.........................................................................
+
}
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
index 8600ddd..e9f7783 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -31,14 +31,14 @@
::osl::MutexGuard aGuard(theOModuleMutex::get()); \
ensureImpl()
-//.........................................................................
+
namespace rptui
{
-//.........................................................................
+
using namespace ::com::sun::star;
-//=========================================================================
+
//= OModuleImpl
-//=========================================================================
+
/** implementation for <type>OModule</type>. not threadsafe, has to be guarded by it's owner
*/
class OModuleImpl
@@ -80,9 +80,9 @@ ResMgr* OModuleImpl::getResManager()
return m_pResources;
}
-//=========================================================================
+
//= OModule
-//=========================================================================
+
namespace
{
@@ -125,8 +125,8 @@ void OModule::ensureImpl()
s_pImpl = new OModuleImpl();
}
-//.........................................................................
+
} // namespace dbaui
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index bb80663..ba3a998 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -26,10 +26,10 @@
#include "corestrings.hrc"
#include <o3tl/compat_functional.hxx>
-//........................................................................
+
namespace rptui
{
-//........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -188,8 +188,8 @@ void OPropertyMediator::startListening()
m_xDest->addPropertyChangeListener(OUString(), this);
}
-//........................................................................
+
} // namespace dbaccess
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 6c061ba..0c6617d 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -24,7 +24,7 @@
namespace rptui
{
using namespace ::com::sun::star;
-// -----------------------------------------------------------------------------
+
SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCommentId)
{
OObjectBase* pObj = dynamic_cast<OObjectBase*>(&rObject);
@@ -40,16 +40,16 @@ SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCo
pUndo = new OUndoReportSectionAction(*rObject.GetModel(),_eAction,OReportHelper::getMemberFunction(xSection),xSection->getReportDefinition(),xReportComponent,_nCommentId);
return pUndo;
}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
OReportUndoFactory::OReportUndoFactory() : m_pUndoFactory(new SdrUndoFactory)
{
}
-// -----------------------------------------------------------------------------
+
OReportUndoFactory::~OReportUndoFactory()
{
}
-///////////////////////////////////////////////////////////////////////
+
// shapes
SdrUndoAction* OReportUndoFactory::CreateUndoMoveObject( SdrObject& rObject )
{
@@ -163,8 +163,8 @@ SdrUndoAction* OReportUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChan
return m_pUndoFactory->CreateUndoPageChangeMasterPage(rChangedPage);
}
-//==================================================================
+
} //rptui
-//==================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 2b1ba67..58c80ab 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -195,8 +195,8 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const OUString& aSer
}
return xRet;
}
-//==================================================================
+
} //rptui
-//==================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index daf58bf..ec5082a 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -109,7 +109,7 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo
}
return 0;
}
-// -----------------------------------------------------------------------------
+
SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportComponent>& _xComponent)
{
SdrObject* pNewObj = NULL;
@@ -173,7 +173,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
return pNewObj;
}
-// -----------------------------------------------------------------------------
+
namespace
{
class ParaAdjust : public AnyConverter
@@ -230,7 +230,7 @@ namespace
}
};
}
-// -----------------------------------------------------------------------------
+
const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
{
switch(_nObjectId)
@@ -308,7 +308,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
static TPropertyNamePair s_aEmptyNameMap;
return s_aEmptyNameMap;
}
-// -----------------------------------------------------------------------------
+
OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComponent)
:m_bIsListening(sal_False)
@@ -329,7 +329,7 @@ OObjectBase::~OObjectBase()
EndListening();
m_xReportComponent.clear();
}
-// -----------------------------------------------------------------------------
+
uno::Reference< report::XSection> OObjectBase::getSection() const
{
uno::Reference< report::XSection> xSection;
@@ -338,12 +338,12 @@ uno::Reference< report::XSection> OObjectBase::getSection() const
xSection = pPage->getSection();
return xSection;
}
-// -----------------------------------------------------------------------------
+
uno::Reference< report::XReportComponent> OObjectBase::getReportComponent() const
{
return m_xReportComponent;
}
-// -----------------------------------------------------------------------------
+
uno::Reference< beans::XPropertySet> OObjectBase::getAwtComponent()
{
return uno::Reference< beans::XPropertySet>();
@@ -489,7 +489,7 @@ OCustomShape::OCustomShape(const OUString& _sComponentName)
OCustomShape::~OCustomShape()
{
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 OCustomShape::GetObjIdentifier() const
{
return sal_uInt16(OBJ_CUSTOMSHAPE);
@@ -580,7 +580,7 @@ void OCustomShape::SetObjectItemHelper(const SfxPoolItem& rItem)
//getSectionWindow()->getView()->AdjustMarkHdl();
}
-// -----------------------------------------------------------------------------
+
uno::Reference< beans::XPropertySet> OCustomShape::getAwtComponent()
{
return uno::Reference< beans::XPropertySet>(m_xReportComponent,uno::UNO_QUERY);
@@ -638,7 +638,7 @@ OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xCompon
OUnoObject::~OUnoObject()
{
}
-// -----------------------------------------------------------------------------
+
void OUnoObject::impl_initializeModel_nothrow()
{
try
@@ -657,7 +657,7 @@ void OUnoObject::impl_initializeModel_nothrow()
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
void OUnoObject::impl_setReportComponent_nothrow()
{
if ( m_xReportComponent.is() )
@@ -673,7 +673,7 @@ void OUnoObject::impl_setReportComponent_nothrow()
impl_initializeModel_nothrow();
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 OUnoObject::GetObjIdentifier() const
{
return sal_uInt16(m_nObjectType);
@@ -837,7 +837,7 @@ OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
return aDefaultName;
}
-// -----------------------------------------------------------------------------
+
void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException)
{
OObjectBase::_propertyChange(evt);
@@ -893,7 +893,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw
}
}
}
-// -----------------------------------------------------------------------------
+
void OUnoObject::CreateMediator(sal_Bool _bReverse)
{
if ( !m_xMediator.is() )
@@ -906,13 +906,13 @@ void OUnoObject::CreateMediator(sal_Bool _bReverse)
OObjectBase::StartListening();
}
}
-// -----------------------------------------------------------------------------
+
uno::Reference< beans::XPropertySet> OUnoObject::getAwtComponent()
{
return Reference<XPropertySet>(GetUnoControlModel(),uno::UNO_QUERY);
}
-// -----------------------------------------------------------------------------
+
uno::Reference< uno::XInterface > OUnoObject::getUnoShape()
{
return OObjectBase::getUnoShapeOf( *this );
@@ -969,7 +969,7 @@ OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType)
OOle2Obj::~OOle2Obj()
{
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 OOle2Obj::GetObjIdentifier() const
{
return m_nType;
@@ -1105,7 +1105,7 @@ uno::Reference< beans::XPropertySet> OOle2Obj::getAwtComponent()
return uno::Reference< beans::XPropertySet>(m_xReportComponent,uno::UNO_QUERY);
}
-// -----------------------------------------------------------------------------
+
uno::Reference< uno::XInterface > OOle2Obj::getUnoShape()
{
uno::Reference< uno::XInterface> xShape = OObjectBase::getUnoShapeOf( *this );
@@ -1125,7 +1125,7 @@ void OOle2Obj::impl_setUnoShape( const uno::Reference< uno::XInterface >& rxUnoS
m_xReportComponent.clear();
}
-// -----------------------------------------------------------------------------
+
uno::Reference< chart2::data::XDatabaseDataProvider > lcl_getDataProvider(const uno::Reference < embed::XEmbeddedObject >& _xObj)
{
uno::Reference< chart2::data::XDatabaseDataProvider > xSource;
@@ -1161,13 +1161,13 @@ OOle2Obj& OOle2Obj::operator=(const OOle2Obj& rObj)
return *this;
}
-// -----------------------------------------------------------------------------
+
// Clone() soll eine komplette Kopie des Objektes erzeugen.
OOle2Obj* OOle2Obj::Clone() const
{
return CloneHelper< OOle2Obj >();
}
-// -----------------------------------------------------------------------------
+
void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XModel>& _xModel)
{
try
@@ -1189,7 +1189,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XMod
{
}
}
-// -----------------------------------------------------------------------------
+
void OOle2Obj::initializeOle()
{
if ( m_bOnlyOnce )
@@ -1209,7 +1209,7 @@ void OOle2Obj::initializeOle()
}
}
}
-// -----------------------------------------------------------------------------
+
void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel)
{
uno::Reference < embed::XEmbeddedObject > xObj = GetObjRef();
@@ -1242,7 +1242,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel)
xChartModel->unlockControllers();
}
}
-// -----------------------------------------------------------------------------
+
uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XReportDefinition>& _xReport)
{
uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies();
@@ -1261,8 +1261,8 @@ uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XRepor
return xReturn;
}
-//============================================================================
+
} // rptui
-//============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx
index ac676eb..bb12906 100644
--- a/reportdesign/source/core/sdr/RptObjectListener.cxx
+++ b/reportdesign/source/core/sdr/RptObjectListener.cxx
@@ -22,9 +22,9 @@
namespace rptui
{
-//============================================================================
+
// OObjectListener
-//============================================================================
+
OObjectListener::OObjectListener(OObjectBase* _pObject)
@@ -55,9 +55,9 @@ void SAL_CALL OObjectListener::propertyChange( const ::com::sun::star::beans::P
-//============================================================================
+
// DlgEdHint
-//============================================================================
+
TYPEINIT1( DlgEdHint, SfxHint );
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index 8eba54b..a4ad094 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -206,8 +206,8 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInse
if ( pObjectBase )
pObjectBase->releaseUnoShape();
}
-//============================================================================
+
} // rptui
-//============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index bcb94ed..2c442088 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -424,8 +424,8 @@ Reference< XPropertySet> OUndoPropertyReportSectionAction::getObject()
{
return m_pMemberFunction(&m_aReportHelper).get();
}
-//============================================================================
+
} // rptui
-//============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index c985280..5ae79b1 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -653,8 +653,8 @@ sal_Bool OXUndoEnvironment::IsUndoMode() const
{
return m_pImpl->m_bIsUndo;
}
-//============================================================================
+
} // rptui
-//============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index 8973577..efb934e 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -30,10 +30,10 @@
#include <connectivity/dbtools.hxx>
#include <tools/diagnose_ex.h>
-//........................................................................
+
namespace rptui
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::report::XReportDefinition;
@@ -51,9 +51,9 @@ namespace rptui
using ::com::sun::star::util::XNumberFormatTypes;
using ::com::sun::star::uno::makeAny;
- //====================================================================
+
//= FormatNormalizer
- //====================================================================
+
FormatNormalizer::FormatNormalizer( const OReportModel& _rModel )
:m_rModel( _rModel )
@@ -255,8 +255,8 @@ namespace rptui
}
}
-//........................................................................
+
} // namespace rptui
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx
index 877991e..d858e78 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.hxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.hxx
@@ -28,15 +28,15 @@
#include <vector>
-//........................................................................
+
namespace rptui
{
-//........................................................................
+
class OReportModel;
- //====================================================================
+
//= FormatNormalizer
- //====================================================================
+
class FormatNormalizer : public ::boost::noncopyable
{
public:
@@ -77,9 +77,9 @@ namespace rptui
void impl_adjustFormatToDataFieldType_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormattedField >& _rxFormatted );
};
-//........................................................................
+
} // namespace rptui
-//........................................................................
+
#endif // REPORTDESIGN_FORMATNORMALIZER_HXX
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index 082a7e8..6005034 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -60,7 +60,7 @@
#include <comphelper/storagehelper.hxx>
#include <vcl/msgbox.hxx>
-// -------------------------------------------------------------------------
+
namespace rptxml
{
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
index 710ffc2..bd47d4c 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
@@ -46,9 +46,9 @@ namespace rptxml
OXMLAutoStylePoolP(ORptExport& rXMLExport);
virtual ~OXMLAutoStylePoolP();
};
-// -----------------------------------------------------------------------------
+
} // rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLAUTOSTYLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx
index abdce95..74a941f 100644
--- a/reportdesign/source/filter/xml/xmlCell.hxx
+++ b/reportdesign/source/filter/xml/xmlCell.hxx
@@ -59,9 +59,9 @@ namespace rptxml
void setComponent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent);
void setContainsShape(bool _bContainsShapes);
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLCELL_HXX
diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx
index 2366abc..c4c1f2d 100644
--- a/reportdesign/source/filter/xml/xmlColumn.hxx
+++ b/reportdesign/source/filter/xml/xmlColumn.hxx
@@ -49,9 +49,9 @@ namespace rptxml
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLCOLUMN_HXX
diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx
index 40915d4..21bc384 100644
--- a/reportdesign/source/filter/xml/xmlComponent.hxx
+++ b/reportdesign/source/filter/xml/xmlComponent.hxx
@@ -45,9 +45,9 @@ namespace rptxml
);
virtual ~OXMLComponent();
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLCOMPONENT_HXX
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
index 5c8a61d..b38adab 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
@@ -43,9 +43,9 @@ namespace rptxml
// current element. The default is to ignore them.
virtual void Characters( const OUString& rChars );
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLCONDPRTEXPR_HXX
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index 696a5ac..2064ae9 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -71,9 +71,9 @@ namespace rptxml
static ::com::sun::star::util::Time implGetTime(double _nValue);
static ::com::sun::star::util::Date implGetDate(double _nValue);
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLCONTROLPROPERTY_HXX
diff --git a/reportdesign/source/filter/xml/xmlEnums.hxx b/reportdesign/source/filter/xml/xmlEnums.hxx
index 1d98a4d..cf67fe3 100644
--- a/reportdesign/source/filter/xml/xmlEnums.hxx
+++ b/reportdesign/source/filter/xml/xmlEnums.hxx
@@ -166,9 +166,9 @@ namespace rptxml
,XML_TOK_FORMULA
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLENUMS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index d919131..fa01971 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -57,9 +57,9 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::report;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::xml::sax;
-// -------------
+
// - ORptExport -
-// -------------
+
#define PROGRESS_BAR_STEP 20
class ORptExport : public SvXMLExport
@@ -262,9 +262,9 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext);
};
-// -----------------------------------------------------------------------------
+
} // rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLEXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
index 9a07969..83dc171 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
@@ -91,9 +91,9 @@ private:
bool m_bExportChar;
bool m_bCountColumnHeader;
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index 04e8ae4..e078057 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -57,9 +57,9 @@ namespace rptxml
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLFIXEDCONTENT_HXX
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
index 93e0c79..5dfc814 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
@@ -42,9 +42,9 @@ namespace rptxml
virtual ~OXMLFormatCondition();
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLFORMATTEDFIELD_HXX
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx
index 6298d3d..9de28ca 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.hxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx
@@ -40,9 +40,9 @@ namespace rptxml
,bool _bPageCount);
virtual ~OXMLFormattedField();
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLFORMATTEDFIELD_HXX
diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx
index 1319b24..30348ef 100644
--- a/reportdesign/source/filter/xml/xmlFunction.hxx
+++ b/reportdesign/source/filter/xml/xmlFunction.hxx
@@ -52,9 +52,9 @@ namespace rptxml
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLFunction_HXX
diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx
index 869d9d0..2f8c6ed 100644
--- a/reportdesign/source/filter/xml/xmlGroup.hxx
+++ b/reportdesign/source/filter/xml/xmlGroup.hxx
@@ -51,9 +51,9 @@ namespace rptxml
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLGROUP_HXX
diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx
index d3fbac9..c294366 100644
--- a/reportdesign/source/filter/xml/xmlHelper.hxx
+++ b/reportdesign/source/filter/xml/xmlHelper.hxx
@@ -76,9 +76,9 @@ namespace rptxml
static SvXMLTokenMap* GetSubDocumentElemTokenMap();
};
-// -----------------------------------------------------------------------------
+
} // rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx
index 57de9de..5fcf715 100644
--- a/reportdesign/source/filter/xml/xmlImage.hxx
+++ b/reportdesign/source/filter/xml/xmlImage.hxx
@@ -38,9 +38,9 @@ namespace rptxml
,OXMLTable* _pContainer);
virtual ~OXMLImage();
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLIMAGE_HXX
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index 3d26a62..0a91ca7 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -93,9 +93,9 @@ private:
::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap;
SAL_WNODEPRECATED_DECLARATIONS_POP
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_IMPORTDOCUMENTHANDLER_HXX_INCLUDED
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx
index 605815a..46d67e0 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.hxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx
@@ -42,9 +42,9 @@ namespace rptxml
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLMasterFields_HXX
diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
index e4992fb..27b06bc 100644
--- a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
@@ -34,9 +34,9 @@ namespace rptxml
OXMLRptPropHdlFactory();
virtual ~OXMLRptPropHdlFactory();
};
-// -----------------------------------------------------------------------------
+
}// rptxml
-// -----------------------------------------------------------------------------
+
#endif //RPT_XMLPROPHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx
index ffcf432..3a03979 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -55,9 +55,9 @@ namespace rptxml
*/
void impl_initRuntimeDefaults() const;
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLREPORT_HXX
diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx
index ccf980b..81f1b68 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.hxx
@@ -43,9 +43,9 @@ namespace rptxml
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLREPORTELEMENT_HXX
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index 1ceda23..0c0d43f 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -64,9 +64,9 @@ namespace rptxml
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLREPORTELEMENTBASE_HXX
diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx
index b425aad..8c6f598 100644
--- a/reportdesign/source/filter/xml/xmlSection.hxx
+++ b/reportdesign/source/filter/xml/xmlSection.hxx
@@ -49,9 +49,9 @@ namespace rptxml
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLSECTION_HXX
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index 6565131..00868d5 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -148,9 +148,9 @@ namespace rptxml
sal_Int32 GetIndex(const sal_Int16 nContextID);
};
-// -----------------------------------------------------------------------------
+
} // rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLSTYLEIMPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx
index f0dd874..53cbcfc 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.hxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx
@@ -56,9 +56,9 @@ namespace rptxml
virtual void EndElement();
virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair);
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLSubDocument_HXX
diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx
index d7e44d4..4d32359 100644
--- a/reportdesign/source/filter/xml/xmlTable.hxx
+++ b/reportdesign/source/filter/xml/xmlTable.hxx
@@ -84,9 +84,9 @@ namespace rptxml
inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; }
};
-// -----------------------------------------------------------------------------
+
} // namespace rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLTABLE_HXX
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 4bb4376..cb9b6dc 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -62,9 +62,9 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::report;
using namespace ::com::sun::star::xml::sax;
-// -------------
+
// - ORptFilter -
-// -------------
+
class ORptFilter : public SvXMLImport
{
public:
@@ -231,9 +231,9 @@ public:
create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext);
};
-// -----------------------------------------------------------------------------
+
} // rptxml
-// -----------------------------------------------------------------------------
+
#endif // RPT_XMLFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc
index 14e15c5..bc9a4dd 100644
--- a/reportdesign/source/inc/stringconstants.hrc
+++ b/reportdesign/source/inc/stringconstants.hrc
@@ -24,9 +24,9 @@
#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!"
#endif
-//============================================================
+
//= service names
-//============================================================
+
#define SERVICE_FIXEDTEXT "com.sun.star.report.FixedText"
#define SERVICE_FORMATTEDFIELD "com.sun.star.report.FormattedField"
@@ -39,9 +39,9 @@
#define SERVICE_SECTION "com.sun.star.report.Section"
#define SERVICE_GROUP "com.sun.star.report.Group"
#define SERVICE_OLEOBJECT "com.sun.star.report.OleObject"
-//============================================================
+
//= property names
-//============================================================
+
#define PROPERTY_VISIBLE "Visible"
#define PROPERTY_NAME "Name"
diff --git a/reportdesign/source/inc/xmlstrings.hrc b/reportdesign/source/inc/xmlstrings.hrc
index e711043..4565444 100644
--- a/reportdesign/source/inc/xmlstrings.hrc
+++ b/reportdesign/source/inc/xmlstrings.hrc
@@ -25,9 +25,9 @@
#include "stringconstants.hrc"
#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-//============================================================
+
//= XML
-//============================================================
+
#define SERVICE_SETTINGSIMPORTER "com.sun.star.comp.Report.XMLOasisSettingsImporter"
#define SERVICE_STYLESIMPORTER "com.sun.star.comp.Report.XMLOasisStylesImporter"
#define SERVICE_CONTENTIMPORTER "com.sun.star.comp.Report.XMLOasisContentImporter"
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 2a04a82..38ca249 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -98,9 +98,9 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDe
}
return aArgs;
}
-//==================================================================
+
// class OAddFieldWindowListBox
-//==================================================================
+
OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent )
:SvTreeListBox( _pParent, WB_TABSTOP|WB_BORDER|WB_SORT )
@@ -142,9 +142,9 @@ void OAddFieldWindowListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_r
EndSelection();
pDataContainer->StartDrag( this, DND_ACTION_COPYMOVE | DND_ACTION_LINK );
}
-//========================================================================
+
// class OAddFieldWindow
-//========================================================================
+
OAddFieldWindow::OAddFieldWindow(Window* pParent
,const uno::Reference< beans::XPropertySet >& _xRowSet
@@ -545,8 +545,8 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ )
return 0L;
}
-// =============================================================================
+
} // namespace rptui
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 8c7dabb..d16d802 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -45,10 +45,10 @@
#include <algorithm>
#include "UndoActions.hxx"
-// .............................................................................
+
namespace rptui
{
-// .............................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY_THROW;
@@ -61,9 +61,9 @@ namespace rptui
using namespace ::com::sun::star::report;
- //========================================================================
+
// UpdateLocker
- //========================================================================
+
class UpdateLocker
{
Window& m_rWindow;
@@ -80,9 +80,9 @@ namespace rptui
}
};
- //========================================================================
+
// class ConditionalFormattingDialog
- //========================================================================
+
ConditionalFormattingDialog::ConditionalFormattingDialog(
Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController )
:ModalDialog( _pParent, ModuleRes(RID_CONDFORMAT) )
@@ -602,8 +602,8 @@ namespace rptui
impl_scrollTo( _nCondIndex - MAX_CONDITIONS + 1 );
}
-// .............................................................................
+
} // rptui
-// .............................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src
index 11fff9b..6b75658 100644
--- a/reportdesign/source/ui/dlg/CondFormat.src
+++ b/reportdesign/source/ui/dlg/CondFormat.src
@@ -260,7 +260,7 @@ String STR_TRANSPARENT
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }
-//-------------------------------------------------------------------------
+
ImageList IMG_CONDFORMAT_DLG_SC
{
MASKCOLOR;
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index c1dcb38..274a767 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -106,9 +106,9 @@ IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ )
}
return 0L;
}
-//========================================================================
+
// class SvxColorWindow_Impl --------------------------------------------------
-//========================================================================
+
#ifndef WB_NO_DIRECTSELECT
#define WB_NO_DIRECTSELECT ((WinBits)0x04000000)
#endif
@@ -222,9 +222,9 @@ IMPL_LINK_NOARG(OColorPopup, SelectHdl)
return 0;
}
-// =============================================================================
+
// = Condition
-// =============================================================================
+
Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController )
:Control(_pParent, ModuleRes(WIN_CONDITION))
@@ -716,8 +716,8 @@ bool Condition::isEmpty() const
return m_aCondLHS.GetText().isEmpty();
}
-// =============================================================================
+
} // rptui
-// =============================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index 321baef..e7a62ee 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -58,9 +58,9 @@ namespace rptui
virtual void Resize();
};
- //========================================================================
+
//= Condition
- //========================================================================
+
class Condition :public Control
,public dbaui::OToolBoxHelper
{
@@ -166,21 +166,21 @@ namespace rptui
DECL_LINK( OnOperationSelected, ListBox* );
};
- // -------------------------------------------------------------------------
+
inline ConditionType Condition::impl_getCurrentConditionType() const
{
return sal::static_int_cast< ConditionType >( m_aConditionType.GetSelectEntryPos() );
}
- // -------------------------------------------------------------------------
+
inline ComparisonOperation Condition::impl_getCurrentComparisonOperation() const
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list