diff options
152 files changed, 575 insertions, 578 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index 541d0cbe8bcb..91242cb48f09 100644 --- a/reportdesign/inc/ModuleHelper.hxx +++ b/reportdesign/inc/ModuleHelper.hxx @@ -24,13 +24,13 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/resmgr.hxx> -//......................................................................... + namespace rptui { -//......................................................................... - //========================================================================= + + //= OModule - //========================================================================= + class OModuleImpl; class REPORTDESIGN_DLLPUBLIC OModule { @@ -60,9 +60,9 @@ namespace rptui static void ensureImpl(); }; - //========================================================================= + //= OModuleClient - //========================================================================= + /** base class for objects which uses any global module-specific resources */ class REPORTDESIGN_DLLPUBLIC OModuleClient @@ -72,9 +72,9 @@ namespace rptui inline ~OModuleClient() { OModule::revokeClient(); } }; - //========================================================================= + //= ModuleRes - //========================================================================= + /** specialized ResId, using the resource manager provided by the global module */ class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId @@ -82,9 +82,9 @@ namespace rptui public: inline ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } }; -//......................................................................... + } // namespace rptui -//......................................................................... + #endif // _RPTUI_MODULE_HELPER_RPT_HXX_ diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index 7ca6e8f6a8dc..94c509e950bb 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -28,10 +28,10 @@ #include "RptDef.hxx" -//........................................................................ + namespace rptui { -//........................................................................ + typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::beans::XPropertyChangeListener > OPropertyForward_Base; @@ -77,9 +77,9 @@ namespace rptui */ void startListening(); }; -//........................................................................ + } // namespace rptui -//........................................................................ + #endif // RPTUI_PROPERTYSETFORWARD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index 47f2d5a4d7cf..4b2fd947b58c 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -399,9 +399,9 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2 > getUIConfigurationManager2( ) throw (::com::sun::star::uno::RuntimeException); }; -// ============================================================================= + } // namespace reportdesign -// ============================================================================= + #endif // REPORTDESIGN_API_REPORTDEFINITION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx index c48b41aa8429..4383116c0e74 100644 --- a/reportdesign/inc/ReportVisitor.hxx +++ b/reportdesign/inc/ReportVisitor.hxx @@ -55,9 +55,9 @@ namespace reportdesign void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReportDefinition); void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup); }; -// ============================================================================= + } // namespace reportdesign -// ============================================================================= + #endif // INCLUDED_REPORT_VISTITOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 860e9025c40a..b258625343ee 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -102,7 +102,7 @@ typedef std::map<OUString, TPropertyConverter> TPropertyNamePair; REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId); REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport); -// ----------------------------------------------------------------------------- + template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName) { T nReturn = T(); @@ -110,7 +110,7 @@ template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference xProp->getPropertyValue(_sPropertyName) >>= nReturn; return nReturn; } -// ----------------------------------------------------------------------------- + template<typename T> void setStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName,const T& _aValue) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY); diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 98fa37e79a8c..48cf539ffc08 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -130,9 +130,9 @@ public: static SdrObject* createObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); static sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); }; -//============================================================================ + // OCustomShape -//============================================================================ + class REPORTDESIGN_DLLPUBLIC OCustomShape: public SdrObjCustomShape , public OObjectBase { friend class OReportPage; @@ -173,9 +173,9 @@ private: virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ); }; -//============================================================================ + // OOle2Obj -//============================================================================ + class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase { friend class OReportPage; @@ -224,9 +224,9 @@ public: void initializeChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel); }; -//============================================================================ + // OUnoObject -//============================================================================ + class REPORTDESIGN_DLLPUBLIC OUnoObject: public SdrUnoObj , public OObjectBase { friend class OReportPage; @@ -280,9 +280,9 @@ private: void impl_initializeModel_nothrow(); }; -//============================================================================ + } // rptui -//============================================================================ + #endif // _REPORT_RPTUIOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index f43de616eb7b..2d7ec6e6f064 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -26,9 +26,9 @@ namespace rptui { -//============================================================================ + // OReportPage -//============================================================================ + class OReportModel; diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 11f4c69366f1..4272840368e8 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -219,7 +219,7 @@ #define RID_STR_VERTICALALIGN (RID_STRING_START + 160) #define RID_STR_PARAADJUST (RID_STRING_START + 161) -// ----------------------------------------------------------------------- + #define RID_IMG_TREENODE_COLLAPSED ( RID_IMAGE_START + 1 ) #define RID_IMG_TREENODE_EXPANDED ( RID_IMAGE_START + 2 ) #define REPORT_TREE_ICON ( RID_IMAGE_START + 5 ) diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 34c4155396b6..3b92fec6d0fa 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -105,9 +105,9 @@ namespace rptui static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); }; - //================================================================================================================== + //= UndoContext - //================================================================================================================== + class UndoContext { public: @@ -126,9 +126,9 @@ namespace rptui SfxUndoManager& m_rUndoManager; }; - //================================================================================================================== + //= UndoSuppressor - //================================================================================================================== + class UndoSuppressor { public: @@ -147,9 +147,9 @@ namespace rptui SfxUndoManager& m_rUndoManager; }; - //================================================================================================================== + //= OCommentUndoAction - //================================================================================================================== + class REPORTDESIGN_DLLPUBLIC OCommentUndoAction : public SdrUndoAction { protected: @@ -166,9 +166,9 @@ namespace rptui virtual void Undo(); virtual void Redo(); }; - //================================================================== + // OUndoContainerAction - //================================================================== + class REPORTDESIGN_DLLPUBLIC OUndoContainerAction: public OCommentUndoAction { OUndoContainerAction(OUndoContainerAction&); @@ -200,9 +200,9 @@ namespace rptui virtual void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); }; - //================================================================== + // OUndoReportSectionAction - //================================================================== + class REPORTDESIGN_DLLPUBLIC OUndoReportSectionAction : public OUndoContainerAction { OReportHelper m_aReportHelper; @@ -222,9 +222,8 @@ namespace rptui virtual void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); }; - //================================================================== + // OUndoGroupSectionAction - //================================================================== class REPORTDESIGN_DLLPUBLIC OUndoGroupSectionAction : public OUndoContainerAction { OGroupHelper m_aGroupHelper; @@ -244,9 +243,7 @@ namespace rptui virtual void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); }; - ///================================================================== - /// ORptUndoPropertyAction - ///================================================================== + // ORptUndoPropertyAction class REPORTDESIGN_DLLPUBLIC ORptUndoPropertyAction: public OCommentUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xObj; @@ -271,9 +268,9 @@ namespace rptui virtual OUString GetComment() const; }; - //================================================================== + // OUndoPropertyReportSectionAction - //================================================================== + class REPORTDESIGN_DLLPUBLIC OUndoPropertyReportSectionAction : public ORptUndoPropertyAction { OReportHelper m_aReportHelper; @@ -290,9 +287,9 @@ namespace rptui ); }; - //================================================================== + // OUndoPropertyGroupSectionAction - //================================================================== + class REPORTDESIGN_DLLPUBLIC OUndoPropertyGroupSectionAction : public ORptUndoPropertyAction { OGroupHelper m_aGroupHelper; diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index 2923b919585e..b5cd02352b12 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -32,7 +32,7 @@ namespace rptui { class OXUndoEnvironmentImpl; - //======================================================================== + class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener @@ -140,6 +140,6 @@ namespace rptui }; } -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index bc7c89ea4900..765ba84846d1 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -27,14 +27,14 @@ #include <map> -//........................................................................ + namespace rptui { -//........................................................................ - // ============================================================================= + + // = ConditionalExpression - // ============================================================================= + class REPORTDESIGN_DLLPUBLIC ConditionalExpression { private: @@ -63,18 +63,18 @@ namespace rptui bool matchExpression( const OUString& _rExpression, const OUString& _rFieldDataSource, OUString& _out_rLHS, OUString& _out_rRHS ) const; }; - //======================================================================== + //= ConditionType - //======================================================================== + enum ConditionType { eFieldValueComparison = 0, eExpression = 1 }; - //======================================================================== + //= ComparisonOperation - //======================================================================== + enum ComparisonOperation { eBetween = 0, @@ -90,9 +90,9 @@ namespace rptui typedef ::boost::shared_ptr< ConditionalExpression > PConditionalExpression; typedef ::std::map< ComparisonOperation, PConditionalExpression > ConditionalExpressions; - // ============================================================================= + // = ConditionalExpressionFactory - // ============================================================================= + class REPORTDESIGN_DLLPUBLIC ConditionalExpressionFactory { public: @@ -104,9 +104,9 @@ namespace rptui ConditionalExpressionFactory( const ConditionalExpressionFactory& ); // never implemented ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ); // never implemented }; -//........................................................................ + } // namespace rptui -//........................................................................ + #endif // CONDITIONALEXPRESSION_HXX diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 12f9eae4695c..44dfed532018 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -26,14 +26,14 @@ #include <osl/diagnose.h> -//........................................................................ + namespace rptui { -//........................................................................ - //==================================================================== + + //= ReportFormula - //==================================================================== + class REPORTDESIGN_DLLPUBLIC ReportFormula { public: @@ -103,23 +103,23 @@ namespace rptui void impl_construct( const OUString& _rFormula ); }; - //-------------------------------------------------------------------- + inline OUString ReportFormula::getFieldName() const { OSL_PRECOND( getType() == Field, "ReportFormula::getFieldName: not bound to a field!" ); return getUndecoratedContent(); } - //-------------------------------------------------------------------- + inline OUString ReportFormula::getExpression() const { OSL_PRECOND( getType() == Expression, "ReportFormula::getExpression: not bound to an expression!" ); return getUndecoratedContent(); } -//........................................................................ + } // namespace rptui -//........................................................................ + #endif // REPORTFORMULA_HXX diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java index 7d44e0c30925..83d44e04d301 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 989b5238f5a2..2cb001b2529a 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 3858fcb514e9..abf9bf6caff5 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 e504b648605f..8a4492a6ece0 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 a62ffe38e894..0b9336b84dc3 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 978acbf98110..fa7fd01b5820 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 b8eb5d2d797c..169dea2d8c04 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 7344d3a61268..0a1f7ce6554f 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 d878789c398c..f63cb748ce9b 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 84c383a3db6f..a6ff378b195e 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 6671ed539ac1..ad504ab95014 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 0d284bb9f35d..fd6d4b65a4e3 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 1bdb2a7af138..9af66dae8fb5 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 8d627d62f482..2c4f160f426c 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 f3efc5567540..145a0f917072 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 c95b0e4068eb..664c3dd2ded2 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 718f2b4cc66a..23933b78e219 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 91e2490917e4..9fb8d630675d 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 04b125803804..376cb7322d83 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 b13d12b58c47..e3c0c4fca94a 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 47c783228a13..34ab62f8f5cb 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 8b57b1a9bcc2..d45efe7252c0 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 d7d1079f2b62..043da9529f48 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 5ad240ce7bc6..bff6cb6a454b 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 ab44b825c6e2..766526f7d1ff 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 c9210ba61d3a..c52cd9fd46be 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 d679a26321ce..668e6d3ce173 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 654ec2b81b74..99610d856995 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 80422e3c9200..1ac93ca206c0 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 cf4cd2311be9..c5a3912a60bd 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 f5ac039e8591..131089c9de98 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 a05b58fbb0dc..a6ad2a2e9295 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 17d896fa0d9b..29a3d24e7270 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 8600ddd12641..e9f778384a2c 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 bb806638e89c..ba3a9989b565 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 6c061ba0eca1..0c6617d19895 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 2b1ba67c7be3..58c80ab0e3ac 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 daf58bf1eebf..ec5082a1ca6b 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 ac676eb9dbb4..bb12906a9734 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 8eba54be8f5d..a4ad094f7bbb 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 bcb94ed259c6..2c4420882be4 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 c98528025aac..5ae79b172d52 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 8973577c1fd3..efb934ec8c24 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 877991ec9042..d858e78133f8 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 082a7e8361e9..600503464048 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 710ffc2383e2..bd47d4ce79d3 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 abdce954d017..74a941f84bb6 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 2366abcb82da..c4c1f2da6604 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 40915d4482fe..21bc384237bc 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 5c8a61d17c14..b38adab73211 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 696a5ac48c3e..2064ae91729d 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 1d98a4d92eff..cf67fe3fa4b4 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 d919131cfcc1..fa0197104795 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 9a079697307b..83dc17196eeb 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 04e8ae4b1ab0..e078057bcede 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 93e0c79f81ba..5dfc814998a5 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 6298d3d70396..9de28ca501c5 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 1319b241be6a..30348efc00a6 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 869d9d02b7b6..2f8c6ed99dc8 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 d3fbac9953ed..c294366c1279 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 57de9de5dfb1..5fcf715acb0a 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 3d26a62b2530..0a91ca7f71c7 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 605815ac3aba..46d67e0c5f24 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 e4992fb80145..27b06bcb8d9a 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 ffcf432f1de9..3a039794360f 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 ccf980bc4c81..81f1b68408b8 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 1ceda231e425..0c0d43f09d11 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 b425aad9ad90..8c6f598ad28a 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 656513146ae7..00868d55124d 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 f0dd87458536..53cbcfcefaf4 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 d7e44d48efad..4d32359faed8 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 4bb437681ff9..cb9b6dcb2def 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 14e15c50b7ed..bc9a4dd8bd4e 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 e711043132c7..456544487905 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 2a04a82fc5d2..38ca2496a0fe 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 8c7dabb6fd76..d16d802ea782 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 11fff9b74fd4..6b756580dbad 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 c1dcb3891412..274a7675ccb4 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 321baefd8089..e7a62ee0430c 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 { return sal::static_int_cast< ComparisonOperation >( m_aOperationList.GetSelectEntryPos() ); } -// ============================================================================= + } // namespace rptui -// ============================================================================= + #endif // RPTUI_CONDITION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 42ecde726f94..7e66030c1b4c 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -44,9 +44,9 @@ namespace rptui using namespace ::com::sun::star; using namespace ::comphelper; -//======================================================================== + // class ODateTimeDialog -//======================================================================== + ODateTimeDialog::ODateTimeDialog( Window* _pParent ,const uno::Reference< report::XSection >& _xHoldAlive ,OReportController* _pController) @@ -225,8 +225,8 @@ sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const } return nFormatKey; } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 33a3a50c2147..75ddb03fc616 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -32,15 +32,15 @@ #include "AddField.hxx" #include "helpids.hrc" -//============================================================================ + namespace rptui { using namespace formula; using namespace ::com::sun::star; -// -------------------------------------------------------------------------- + // Initialisierung / gemeinsame Funktionen fuer Dialog -// -------------------------------------------------------------------------- + FormulaDialog::FormulaDialog(Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory @@ -96,9 +96,9 @@ FormulaDialog::~FormulaDialog() StoreFormEditData( m_pFormulaData ); } -// -------------------------------------------------------------------------- + // Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- + bool FormulaDialog::calculateValue( const OUString& rStrExp, OUString& rStrResult ) { rStrResult = rStrExp; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 34fd85035dbe..b88801542b6b 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -165,9 +165,9 @@ public: DECL_LINK( DelayedDelete, void* ); }; -//======================================================================== + // class OFieldExpressionControl -//======================================================================== + OFieldExpressionControl::OFieldExpressionControl( OGroupsSortingDialog* _pParent,const ResId& _rResId ) :EditBrowseBox( _pParent, _rResId,EBBF_NONE, WB_TABSTOP | BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL | @@ -190,7 +190,7 @@ OFieldExpressionControl::~OFieldExpressionControl() acquire(); uno::Reference< report::XGroups > xGroups = m_pParent->getGroups(); xGroups->removeContainerListener(this); - ////////////////////////////////////////////////////////////////////// + // delete events from queue if( m_nPasteEvent ) Application::RemoveUserEvent( m_nPasteEvent ); @@ -367,7 +367,7 @@ void OFieldExpressionControl::lateInit() pControls[i]->SetLoseFocusHdl(LINK(m_pParent, OGroupsSortingDialog, OnControlFocusLost)); } - ////////////////////////////////////////////////////////////////////// + // set browse mode BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL); @@ -808,7 +808,7 @@ void OFieldExpressionControl::cut() void OFieldExpressionControl::copy() { - ////////////////////////////////////////////////////////////////////// + // set to the right row and save it m_pParent->SaveData( m_nDataPos ); @@ -858,7 +858,7 @@ void OFieldExpressionControl::InsertRows( long nRow ) { sal_Int32 nSize = 0; - ////////////////////////////////////////////////////////////////////// + // get rows from clipboard TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent())); if(aTransferData.HasFormat(OGroupExchange::getReportGroupId())) @@ -913,9 +913,9 @@ void OFieldExpressionControl::InsertRows( long nRow ) } -//======================================================================== + // class OGroupsSortingDialog -//======================================================================== + OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent ,sal_Bool _bReadOnly ,OReportController* _pController) @@ -1436,8 +1436,8 @@ ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType) SAL_THROW (( co return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SC)); } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 47e53714929f..d579318d98c3 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -896,9 +896,9 @@ ONavigatorImpl::~ONavigatorImpl() const long STD_WIN_SIZE_X = 210; const long STD_WIN_SIZE_Y = 280; const long LISTBOX_BORDER = 2; -//======================================================================== + // class ONavigator -//======================================================================== + ONavigator::ONavigator( Window* _pParent ,OReportController& _rController) : FloatingWindow( _pParent, ModuleRes(RID_NAVIGATOR) ) @@ -926,7 +926,7 @@ void ONavigator::Resize() Size aSize( GetOutputSizePixel() ); - ////////////////////////////////////////////////////////////////////// + // Groesse der form::ListBox anpassen Point aLBPos( LISTBOX_BORDER, LISTBOX_BORDER ); @@ -944,8 +944,8 @@ void ONavigator::GetFocus() if ( m_pImpl->m_pNavigatorTree.get() ) m_pImpl->m_pNavigatorTree->GrabFocus(); } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index c5aa2e5a958c..d1d17c1d835b 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -38,9 +38,9 @@ namespace rptui using namespace ::com::sun::star; using namespace ::comphelper; -//======================================================================== + // class OPageNumberDialog -//======================================================================== + OPageNumberDialog::OPageNumberDialog( Window* _pParent ,const uno::Reference< report::XReportDefinition >& _xHoldAlive ,OReportController* _pController) @@ -118,8 +118,8 @@ short OPageNumberDialog::Execute() } return nRet; } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 1f5045cde515..eac3bc1bf80b 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -71,8 +71,8 @@ ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr, const if ( !aCJKOptions.IsDoubleLinesEnabled() ) RemoveTabPage("asianlayout"); } -// ============================================================================= + } // namespace rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index ba882ec9e7a2..d66bf173c323 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -40,10 +40,10 @@ namespace rptui { -//================================================================== + class OAddFieldWindow; class OAddFieldWindowListBox; -//======================================================================== + class OAddFieldWindow :public FloatingWindow , public ::cppu::BaseMutex , public ::comphelper::OPropertyChangeListener @@ -122,9 +122,9 @@ private: virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); }; -//============================================================================== + } // rptui -//============================================================================== + #endif // RPTUI_ADDFIELDWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx index eec5bd7f71b8..ab55bc3e0f20 100644 --- a/reportdesign/source/ui/inc/ColorChanger.hxx +++ b/reportdesign/source/ui/inc/ColorChanger.hxx @@ -21,9 +21,9 @@ namespace rptui { - //===================================================================== + //= ColorChanger - //===================================================================== + class ColorChanger { protected: diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx index 4a3a64e10291..5ecc99e26b8b 100644 --- a/reportdesign/source/ui/inc/ColumnInfo.hxx +++ b/reportdesign/source/ui/inc/ColumnInfo.hxx @@ -40,9 +40,9 @@ namespace rptui { } }; -// ============================================================================= + } // namespace rptui -// ============================================================================= + #endif // RPTUI_COLUMNINFO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 57cf2145b718..72b7d2ae34fc 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -34,19 +34,19 @@ #include <vector> -// ............................................................................. + namespace rptui { -// ............................................................................. + #define MAX_CONDITIONS (size_t)3 class OReportController; class Condition; - //========================================================================= + //= IConditionalFormatAction - //========================================================================= + class SAL_NO_VTABLE IConditionalFormatAction { public: @@ -174,9 +174,9 @@ namespace rptui void impl_ensureConditionVisible( size_t _nCondIndex ); }; -// ............................................................................. + } // namespace rptui -// ............................................................................. + #endif // RPTUI_CONDFORMAT_HXX diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index f24d1f58e024..97cc5689447a 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -35,10 +35,10 @@ #include <memory> -//........................................................................ + namespace rptui { -//........................................................................ + class OPropertyInfoService; @@ -116,9 +116,9 @@ namespace rptui ::std::auto_ptr< OPropertyInfoService > m_pInfoService; SAL_WNODEPRECATED_DECLARATIONS_POP }; -//........................................................................ + } // namespace rptui -//........................................................................ + #endif // RPT_DATAPROVIDERHANDLER_HXX diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 99fadcea7621..e87127737a02 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -86,9 +86,9 @@ public: virtual ~ODateTimeDialog(); virtual short Execute(); }; -// ============================================================================= + } // namespace rptui -// ============================================================================= + #endif // RPTUI_DATETIME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index e108a0e9968e..df8d625656e2 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -27,14 +27,14 @@ #include <memory> -//........................................................................ + namespace rptui { -//........................................................................ + class OPropertyInfoService; - //==================================================================== + //= DefaultComponentInspectorModel - //==================================================================== + typedef ::cppu::WeakAggImplHelper3 < ::com::sun::star::inspection::XObjectInspectorModel , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::lang::XInitialization @@ -93,9 +93,9 @@ namespace rptui void createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); }; -//........................................................................ + } // namespace rptui -//........................................................................ + #endif // RPT_DEFAULTINSPECTION_HXX diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index dc01dbbb5eaf..9b5f0db7e639 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -53,8 +53,8 @@ namespace rptui class PropBrw; class OAddFieldWindow; class ONavigator; - //================================================================== - //================================================================== + + class ODesignView : public dbaui::ODataView, public SfxBroadcaster, public IMarkedSection { private: @@ -273,9 +273,9 @@ namespace rptui */ sal_uInt16 getZoomFactor(SvxZoomType _eType) const; }; -//================================================================== + } //rptui -//================================================================== + #endif // RPTUI_DESIGNVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index ae3a93965c10..f653ef62fd5b 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -30,13 +30,13 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -//============================================================================ + namespace rptui { -//============================================================================ + class OAddFieldWindow; -//============================================================================ + class FormulaDialog : public formula::FormulaModalDialog, public formula::IControlReferenceHandler { @@ -96,9 +96,9 @@ protected: void HighlightFunctionParas(const OUString& aFormula); }; -// ============================================================================= + } // rptui -// ============================================================================= + #endif // RPTUI_FORMULA_HXX diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 2aba9c75a890..76cff6e44e52 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -30,10 +30,10 @@ namespace rptui { -//============================================================================ + class FunctionCategory; class FunctionDescription; -//============================================================================ + class FunctionManager : public formula::IFunctionManager { typedef std::map< OUString, ::boost::shared_ptr< FunctionDescription > > TFunctionsMap; @@ -53,7 +53,7 @@ public: ::boost::shared_ptr< FunctionDescription > get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const; }; -//============================================================================ + class FunctionDescription : public formula::IFunctionDescription { ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FunctionArgument > m_aParameter; @@ -77,7 +77,7 @@ public: virtual OUString getParameterDescription(sal_uInt32 _nPos) const ; virtual bool isParameterOptional(sal_uInt32 _nPos) const ; }; -//============================================================================ + class FunctionCategory : public formula::IFunctionCategory { mutable ::std::vector< ::boost::shared_ptr< FunctionDescription > > m_aFunctions; @@ -95,9 +95,9 @@ public: virtual const formula::IFunctionManager* getFunctionManager() const; virtual OUString getName() const; }; -// ============================================================================= + } // rptui -// ============================================================================= + #endif //RPTUI_FUNCTIONHELPER_HXX diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index 6be178128d20..e04932f34fb9 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -37,10 +37,10 @@ #include <comphelper/listenernotification.hxx> #include "metadata.hxx" -//........................................................................ + namespace rptui { -//........................................................................ + struct DefaultFunction { @@ -308,9 +308,9 @@ namespace rptui mutable bool m_bNewFunction; bool m_bIn; }; -//........................................................................ + } // namespace rptui -//........................................................................ + #endif // RPT_GeometryHandler_HXX diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 53b7d50e4569..fb9b915f4730 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -182,9 +182,9 @@ public: virtual ImageList getImageList(vcl::ImageListType) SAL_THROW ((com::sun::star::lang::IllegalArgumentException )); }; -// ============================================================================= + } // namespace rptui -// ============================================================================= + #endif // RPTUI_GROUPS_SORTING_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx index 6f0eaf90bfa5..c99a70cf6311 100644 --- a/reportdesign/source/ui/inc/Navigator.hxx +++ b/reportdesign/source/ui/inc/Navigator.hxx @@ -41,9 +41,9 @@ namespace rptui virtual void Resize(); virtual void GetFocus(); }; -// ============================================================================= + } // namespace rptui -// ============================================================================= + #endif // INCLUDED_RPTUI_NAVIGATOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index 4dc7bd1c345d..f21681443b22 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -62,9 +62,9 @@ public: virtual ~OPageNumberDialog(); virtual short Execute(); }; -// ============================================================================= + } // namespace rptui -// ============================================================================= + #endif // RPTUI_PAGENUMBER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index 97532abd31ef..3fec43185518 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -29,10 +29,10 @@ #include <memory> -//........................................................................ + namespace rptui { -//........................................................................ + class OPropertyInfoService; @@ -102,9 +102,9 @@ namespace rptui ::std::auto_ptr< OPropertyInfoService > m_pInfoService; SAL_WNODEPRECATED_DECLARATIONS_POP }; -//........................................................................ + } // namespace rptui -//........................................................................ + #endif // RPT_REPORTCOMPONENTHANDLER_HXX diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index d53959c600b3..194083ecdd73 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -39,7 +39,7 @@ namespace rptui class OReportController; class OXReportControllerObserverImpl; - //======================================================================== + class OXReportControllerObserver : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener diff --git a/reportdesign/source/ui/inc/ReportRuler.hxx b/reportdesign/source/ui/inc/ReportRuler.hxx index cb7b8b3eedee..756892834868 100644 --- a/reportdesign/source/ui/inc/ReportRuler.hxx +++ b/reportdesign/source/ui/inc/ReportRuler.hxx @@ -49,9 +49,9 @@ namespace rptui */ void SetGridVisible(sal_Bool _bVisible); }; -//============================================================================== + } // rptui -//============================================================================== + #endif // RPTUI_RULER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index 072973d2f1ff..0a3b50ce48fc 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -162,9 +162,9 @@ namespace rptui */ bool isUiActive() const; }; -//================================================================== + } //rptui -//================================================================== + #endif // REPORT_REPORTSECTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 93c7e87f3173..2dd5e67ac08c 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -223,9 +223,9 @@ namespace rptui */ sal_uInt16 getZoomFactor(SvxZoomType _eType) const; }; -//================================================================== + } //rptui -//================================================================== + #endif // RPTUI_REPORT_WINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx index 9c8d7426ff0c..5c6a3b101835 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -27,9 +27,9 @@ namespace rptui class OReportWindow; class OReportSection; -//============================================================================ + // OSectionView -//============================================================================ + class OSectionView : public SdrView { diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index 0b262fa18e77..0a5db31d8a66 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -123,9 +123,9 @@ namespace rptui void scrollChildren(long _nThumbPosX); }; -//============================================================================== + } // rptui -//============================================================================== + #endif // RPTUI_SECTIONWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index d868f25453ac..b62c0f042cd1 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -45,7 +45,7 @@ namespace rptui class OSectionView; - // ----------------------------------------------------------------------------- + struct RectangleLess : public ::std::binary_function< Rectangle, Rectangle, bool> { enum CompareMode { POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL }; @@ -341,9 +341,9 @@ namespace rptui */ void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; }; -//============================================================================== + } // rptui -//============================================================================== + #endif // RPTUI_VIEWSWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx index 52b7f8d8372f..c3ba51c00174 100644 --- a/reportdesign/source/ui/inc/dlgedclip.hxx +++ b/reportdesign/source/ui/inc/dlgedclip.hxx @@ -25,9 +25,9 @@ namespace rptui { -//============================================================================ + // OReportExchange -//============================================================================ + /** \class OReportExchange * \brief defines a clipboard fromat for copying selection elements. * \ingroup reportdesign_source_ui_report diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx index 4530c63d485d..bf2ca09c3457 100644 --- a/reportdesign/source/ui/inc/dlgedfac.hxx +++ b/reportdesign/source/ui/inc/dlgedfac.hxx @@ -25,9 +25,9 @@ namespace rptui { -//============================================================================ + // DlgEdFactory -//============================================================================ + class DlgEdFactory { public: diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index b55bbb1f42ea..276b459a00fe 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -32,9 +32,9 @@ namespace rptui class OReportSection; class OSectionView; -//============================================================================ + // DlgEdFunc -//============================================================================ + class DlgEdFunc /* : public LinkHdl */ { @@ -116,9 +116,9 @@ protected: }; -//============================================================================ + // DlgEdFuncInsert -//============================================================================ + class DlgEdFuncInsert : public DlgEdFunc { @@ -131,9 +131,9 @@ public: virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); }; -//============================================================================ + // DlgEdFuncSelect -//============================================================================ + class DlgEdFuncSelect : public DlgEdFunc { diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index eea89eda1a6f..f3eb887aeea1 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -39,9 +39,9 @@ public: ORptPageDialog(Window* pParent, const SfxItemSet* pAttr, const OString &rDialog); }; -// ============================================================================= + } // namespace rptui -// ============================================================================= + #endif // RPTUI_DLGPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 50f8222a3939..65a9942d479d 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -24,16 +24,16 @@ #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/inspection/XPropertyHandler.hpp> -//............................................................................ + namespace rptui { -//............................................................................ + struct OPropertyInfoImpl; - //======================================================================== + //= OPropertyInfoService - //======================================================================== + class OPropertyInfoService :public OModuleClient { @@ -66,9 +66,9 @@ namespace rptui static const OPropertyInfoImpl* getPropertyInfo(sal_Int32 _nId); }; - //======================================================================== + //= HelpIdUrl - //======================================================================== + /// small helper to translate help ids into help urls class HelpIdUrl { @@ -76,9 +76,9 @@ namespace rptui static OUString getHelpURL( const OString& _sHelpId ); }; - //======================================================================== + //= UI flags (for all browseable properties) - //======================================================================== + #define PROP_FLAG_NONE 0x00000001 // no special flag #define PROP_FLAG_ENUM 0x00000002 // the property is some kind of enum property, i.e. its @@ -92,10 +92,10 @@ namespace rptui // option #define PROP_FLAG_DATA_PROPERTY 0x00000020 // the property is to appear on the "Data" page - //======================================================================== + //= property ids (for all browseable properties) //= The ID is used for the view order in the property browser. - //======================================================================== + #define PROPERTY_ID_FORCENEWPAGE 1 #define PROPERTY_ID_NEWROWORCOL 2 @@ -144,9 +144,9 @@ namespace rptui #define PROPERTY_ID_VERTICALALIGN 42 -//............................................................................ + } // namespace rptui -//............................................................................ + #endif // RPTUI_METADATA_HXX_ diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index 54fb3981d26c..25b94d968afb 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -37,9 +37,9 @@ namespace rptui class OSectionView; class ODesignView; class OObjectBase; -//============================================================================ + // PropBrw -//============================================================================ + class PropBrw : public DockingWindow , public SfxListener, public SfxBroadcaster { @@ -103,9 +103,9 @@ public: private: using Window::Update; }; -//============================================================================== + } // rptui -//============================================================================== + #endif // _REPORT_PROPBRW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index da962468ad7a..29ce4a533c1d 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -79,9 +79,9 @@ namespace rptui virtual void SAL_CALL updateImage( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException); }; -//.......................................................................... + } // rptui -//.......................................................................... + #endif //RPTUI_TOOLBOXCONTROLLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index ca9807bbabb5..0694eab48ecc 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -51,10 +51,10 @@ #include "helpids.hrc" #include "RptResId.hrc" #include "PropertyForward.hxx" -//........................................................................ + namespace rptui { -//........................................................................ + using namespace ::com::sun::star; DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext > const & context) @@ -536,8 +536,8 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua _rClearBeforeDialog.clear(); return ( xDialog->execute() != 0 ); } -//........................................................................ + } // namespace rptui -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index c4156bac2bc6..ab15cba3b522 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -30,7 +30,7 @@ #include "metadata.hxx" #include <tools/urlobj.hxx> -//........................................................................ + namespace rptui { OUString HelpIdUrl::getHelpURL( const OString& sHelpId ) @@ -47,9 +47,9 @@ namespace rptui using namespace com::sun::star; using com::sun::star::inspection::PropertyCategoryDescriptor; - //==================================================================== + //= DefaultComponentInspectorModel - //==================================================================== + DefaultComponentInspectorModel::DefaultComponentInspectorModel( const Reference< XComponentContext >& _rxContext) :m_xContext( _rxContext ) @@ -251,8 +251,8 @@ namespace rptui return m_xComponent->getPropertyOrderIndex(_rPropertyName); } -//........................................................................ + } // namespace rptui -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 3ac307067e5e..7fa47d3290d2 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -112,10 +112,10 @@ #define USER_DEF_FUNCTION 3 #define UNDEF_DATA 4 -//........................................................................ + namespace rptui { -//........................................................................ + using namespace ::com::sun::star; namespace{ @@ -2211,8 +2211,8 @@ void SAL_CALL GeometryHandler::propertyChange(const beans::PropertyChangeEvent& resetOwnProperties(aGuard,sOldFunctionName,sOldScope,nOldDataFieldType); } } -//........................................................................ + } // namespace rptui -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index fde28ac58e7f..5a2e52183b26 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -33,10 +33,10 @@ #include <tools/fldunit.hxx> #include "metadata.hxx" -//........................................................................ + namespace rptui { -//........................................................................ + using namespace ::com::sun::star; ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentContext > const & context) @@ -209,8 +209,8 @@ void SAL_CALL ReportComponentHandler::actuatingPropertyChanged(const OUString & return m_xFormComponentHandler->suspend(Suspend); } -//........................................................................ + } // namespace rptui -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index b20c8a9300d6..0992ffe4197e 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -27,17 +27,17 @@ #include <functional> #include <algorithm> -//............................................................................ + namespace rptui { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star; - //======================================================================== + //= OPropertyInfoImpl - //======================================================================== + struct OPropertyInfoImpl { OUString sName; @@ -75,9 +75,9 @@ namespace rptui } }; - //======================================================================== + //= OPropertyInfoService - //======================================================================== + #define DEF_INFO( ident, uinameres, helpid, flags ) \ OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \ OUString( ModuleRes( RID_STR_##uinameres ) ), HID_RPT_PROP_##helpid, flags ) @@ -303,8 +303,8 @@ namespace rptui } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 3e4f4d2384a1..33b42d92fd6a 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -22,10 +22,10 @@ #include "uistrings.hrc" -//===================================================================== + namespace rptui { -//===================================================================== + OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry) : Window(_pParent) ,m_sColorEntry(_sColorEntry) @@ -85,8 +85,8 @@ void OColorListener::setMarked(sal_Bool _bMark) Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE); } } -// ======================================================================= + } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index f82c130cfebb..a4adffc10b40 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -20,10 +20,10 @@ #include "FunctionHelper.hxx" -// ============================================================================= + namespace rptui { -// ============================================================================= + using namespace ::com::sun::star; FunctionManager::FunctionManager(const uno::Reference< report::meta::XFunctionManager>& _xMgr) @@ -237,8 +237,8 @@ bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const return false; } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 034d26fccac1..e8ba532fb7fe 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -394,9 +394,9 @@ void OGroupUndo::Redo() } } -//============================================================================ + } // rptui -//============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index 39a4b049514e..67964880152a 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -34,8 +34,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/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 494031867491..0d876981ebfa 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -223,8 +223,8 @@ void SAL_CALL OStatusbarController::dispose() throw (::com::sun::star::uno::Runt svt::StatusbarController::dispose(); } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index f6fe3bd77845..e64f85191fed 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -335,9 +335,9 @@ throw (uno::RuntimeException) return xWindow; } -//.......................................................................... + } // rptui -//.......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 9b66b82bb5bc..d651c9127ee4 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -83,9 +83,9 @@ public: } }; -//================================================================== + // class ODesignView -//================================================================== + ODesignView::ODesignView( Window* pParent, const Reference< XComponentContext >& _rxOrb, @@ -712,8 +712,8 @@ sal_uInt16 ODesignView::getZoomFactor(SvxZoomType _eType) const { return m_aScrollWindow.getZoomFactor(_eType); } -//============================================================================ + } // rptui -//============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 1da0cebecd25..daf41a8e56a1 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -28,10 +28,10 @@ #define CORNER_SPACE 5 -//===================================================================== + namespace rptui { -//===================================================================== + OEndMarker::OEndMarker(Window* _pParent ,const OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) { @@ -92,8 +92,8 @@ void OEndMarker::MouseButtonDown( const MouseEvent& rMEvt ) return; static_cast<OSectionWindow*>(GetParent())->showProperties(); } -// ======================================================================= + } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index a683f8c668ab..7c9e8be2716a 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3294,7 +3294,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) { getDesignView()->unmarkAllObjects(NULL); - ////////////////////////////////////////////////////////////////////// + // Anhand des FormatKeys wird festgestellt, welches Feld benoetigt wird ::boost::shared_ptr<OSectionWindow> pSectionWindow[2]; pSectionWindow[0] = getDesignView()->getMarkedSection(); diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx index 518f24ce9e72..4a3531f570dd 100644 --- a/reportdesign/source/ui/report/ReportRuler.cxx +++ b/reportdesign/source/ui/report/ReportRuler.cxx @@ -46,8 +46,8 @@ void OReportRuler::SetGridVisible(sal_Bool _bVisible) m_pSection->SetGridVisible( _bVisible ); } -//============================================================================== + } // rptui -//============================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 2339e9faed01..0b44813c2cd0 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -61,10 +61,10 @@ #include <unotools/confignode.hxx> #include <framework/imageproducer.hxx> -// ============================================================================= + namespace rptui { -// ============================================================================= + using namespace ::com::sun::star; @@ -858,8 +858,8 @@ bool OReportSection::isUiActive() const return m_pFunc->isUiActive(); } -// ============================================================================= + } -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 08d500985730..e429c28e8551 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -52,9 +52,9 @@ namespace rptui { using namespace ::com::sun::star; using namespace ::comphelper; -//================================================================== + // class OReportWindow -//================================================================== + OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) : Window(_pParent,WB_DIALOGCONTROL) @@ -439,8 +439,8 @@ void OReportWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) static sal_Int32 nIn = INVALIDATE_TRANSPARENT; Invalidate(nIn); } -//================================================================== + } //rptui -//================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 48e6c7d7cf13..33dbb8b6f8a9 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -398,8 +398,8 @@ sal_uInt16 OScrollWindowHelper::getZoomFactor(SvxZoomType _eType) const { return m_aReportWindow.getZoomFactor(_eType); } -//============================================================================== + } // rptui -//============================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index 564c4072ef12..526ed9688ce1 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -253,8 +253,8 @@ short OSectionView::GetLayerIdOfMarkedObjects() const return nRet; } -//============================================================================ + } // rptui -//============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index d0c752ab14fe..47ec56b4da20 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -387,8 +387,8 @@ void OSectionWindow::scrollChildren(long _nX) lcl_setOrigin(m_aSplitter,_nX, 0); lcl_scroll(m_aSplitter,aDiff); } -//============================================================================== + } // rptui -//============================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index deec17b758ed..cf258775159f 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -36,10 +36,10 @@ #define CORNER_SPACE 5 -//===================================================================== + namespace rptui { -//===================================================================== + Image* OStartMarker::s_pDefCollapsed = NULL; Image* OStartMarker::s_pDefExpanded = NULL; @@ -292,8 +292,8 @@ void OStartMarker::zoom(const Fraction& _aZoom) Invalidate(); } -// ======================================================================= + } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 3e57fb04bc9b..161726bd4f34 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1741,8 +1741,8 @@ void OViewsWindow::fillControlModelSelection(::std::vector< uno::Reference< uno: (*aIter)->getReportSection().fillControlModelSelection(_rSelection); } } -//============================================================================== + } // rptui -//============================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index 6a5752f91645..a48c2c0c529d 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -27,9 +27,9 @@ namespace rptui using namespace comphelper; using namespace ::com::sun::star; -//============================================================================ + // OReportExchange -//============================================================================ + OReportExchange::OReportExchange(const TSectionElements& _rCopyElements ) : m_aCopyElements(_rCopyElements) @@ -93,8 +93,8 @@ OReportExchange::TSectionElements OReportExchange::extractCopies(const Transfera return TSectionElements(); } -//============================================================================ + } // rptui -//============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 7badb0e8ec16..163c3aef5136 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -393,9 +393,9 @@ void DlgEdFunc::activateOle(SdrObject* _pObj) if ( _pObj ) { const sal_uInt16 nSdrObjKind = _pObj->GetObjIdentifier(); - // + // OLE: activate - // + if (nSdrObjKind == OBJ_OLE2) { bool bIsInplaceOle = false; diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index c9591ae16477..9bb9fc6d62b6 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -85,9 +85,9 @@ namespace } } -//============================================================================ + // PropBrw -//============================================================================ + diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index 993f8f64703a..2c08c8923969 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -93,7 +93,7 @@ String RID_STR_PROPTITLE_GROUP { Text [ en-US ] = "Group"; }; -// ----------------------------------------------------------------------- + Image RID_IMG_TREENODE_COLLAPSED { |