diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:36:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 07:34:29 -0600 |
| commit | 15246c959ae5ab4e124859a4d8981676f9eb657f (patch) | |
| tree | 87813888699be2b850201725c45564c8c6423262 /extensions | |
| parent | 710178094dfb21b0864335b1fa1a3401e4d82959 (diff) | |
Remove visual noise from extensions
Change-Id: I0397d0d0e5343b7ed192a790664b068ac6955bd3
Reviewed-on: https://gerrit.libreoffice.org/8259
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions')
259 files changed, 2143 insertions, 2149 deletions
diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc index 413319dc22c0..a203b4126165 100644 --- a/extensions/inc/extensio.hrc +++ b/extensions/inc/extensio.hrc @@ -21,7 +21,7 @@ #include <svl/solar.hrc> -// ----------------------------------------------------------------------- + // - resource id ranges #define RID_ABP_START ( RID_MORE_EXTENSIONS_START + 0 ) diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 0006168c34b8..4e9d69c36604 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -28,10 +28,10 @@ #include <vcl/msgbox.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -//......................................................................... + namespace abp { -//......................................................................... + using namespace ::svt; using namespace ::utl; @@ -41,9 +41,9 @@ namespace abp OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); return pFilter; } - //===================================================================== + //= FinalPage - //===================================================================== + FinalPage::FinalPage( OAddessBookSourcePilot* _pParent ) :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_FINAL)) @@ -207,8 +207,8 @@ namespace abp implCheckName(); return 0L; } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index 49e8a5ae7d05..a65af43b5c72 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -27,14 +27,14 @@ #include <svx/databaselocationinput.hxx> #include <vcl/edit.hxx> -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= FinalPage - //===================================================================== + class FinalPage : public AddressBookSourcePage { protected: @@ -76,9 +76,9 @@ namespace abp void setFields(); }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_ABPFINALPAGE_HXX diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc index 94f95ab17c4f..402590a80737 100644 --- a/extensions/source/abpilot/abpresid.hrc +++ b/extensions/source/abpilot/abpresid.hrc @@ -23,7 +23,7 @@ #include "abpilot.hrc" #include "extensio.hrc" -//======================================================================== + // basics #define RID_DIALOG_START RID_ABP_START @@ -34,7 +34,7 @@ #define RID_QUERYBOX_START RID_ABP_START #define RID_BITMAP_START RID_ABP_START -//======================================================================== + // dialogs #define RID_DLG_ADDRESSBOOKSOURCEPILOT ( RID_DIALOG_START + 0 ) @@ -42,7 +42,7 @@ #define RID_DIALOG_END RID_DLG_ADDRESSBOOKSOURCEPILOT -//======================================================================== + // tab pages #define RID_PAGE_SELECTABTYPE ( RID_PAGE_START + 0 ) @@ -54,7 +54,7 @@ #define RID_PAGE_END RID_PAGE_FINAL -//======================================================================== + // strings #define RID_STR_DEFAULT_NAME ( RID_STRING_START + 0 ) @@ -67,7 +67,7 @@ #define RID_STRING_END RID_STR_NOFIELDSASSIGNED -//======================================================================== + // error boxes #define RID_ERR_NEEDTYPESELECTION ( RID_ERRORBOX_START + 0 ) @@ -75,7 +75,7 @@ #define RID_ERRORBOX_END RID_ERR_NEEDTYPESELECTION -//======================================================================== + // query boxes #define RID_QRY_NOTABLES ( RID_QUERYBOX_START + 0 ) @@ -85,7 +85,7 @@ #define RID_QUERYBOX_END RID_QRY_NO_EVO_GW -//======================================================================== + // untyped resources #define RID_RSC_NOTUSEDYET ( RID_UNTYPED_START + 0 ) @@ -93,7 +93,7 @@ #define RID_UNTYPED_END RID_RSC_NOTUSEDYET -//======================================================================== + // bitmaps #define BMP_HEADERIMAGE ( RID_BITMAP_START + 0 ) @@ -101,8 +101,8 @@ #define RID_BITMAP_END BMP_HEADERIMAGE -//======================================================================== -//======================================================================== + + //= range checks #if RID_DIALOG_END > RID_ABP_END @@ -127,15 +127,15 @@ #error "please adjust the resource id ranges!!" #endif -//======================================================================== + // local resource ids -//........................................................................ + #define FL_SEPARATOR 1 #define FL_TYPE 2 #define FL_NAME 3 -//........................................................................ + #define FT_TYPE_HINTS 1 #define FT_ADMINEXPLANATION 3 #define FT_NAME_EXPL 4 @@ -147,7 +147,7 @@ #define FT_DUPLICATENAME 10 #define FT_LOCATION 11 -//........................................................................ + #define RB_MORK 1 #define RB_THUNDERBIRD 2 #define RB_EVOLUTION 3 @@ -160,34 +160,34 @@ #define RB_EVOLUTION_GROUPWISE 10 #define RB_EVOLUTION_LDAP 11 -//........................................................................ + #define ET_DATASOURCENAME 1 -//........................................................................ + #define PB_INVOKE_ADMIN_DIALOG 1 #define PB_INVOKE_FIELDS_DIALOG 2 #define PB_BROWSE 3 -//........................................................................ + #define LB_TABLELIST 1 -//........................................................................ + #define CB_REGISTER_DS 1 -//........................................................................ + #define CBB_LOCATION 1 -//........................................................................ + #define STR_SELECT_ABTYPE 1 #define STR_INVOKE_ADMIN_DIALOG 2 #define STR_TABLE_SELECTION 3 #define STR_MANUAL_FIELD_MAPPING 4 #define STR_FINAL_CONFIRM 5 -//======================================================================== + // some defines -//........................................................................ + #define WINDOW_SIZE_X 240 #define WINDOW_SIZE_Y 185 @@ -201,7 +201,7 @@ #define BORDER_X 12 -//........................................................................ + #endif // EXTENSIONS_ABPRESID_HRC diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx index 1cb4abf6fd78..5a69cf56cef1 100644 --- a/extensions/source/abpilot/abptypes.hxx +++ b/extensions/source/abpilot/abptypes.hxx @@ -27,18 +27,18 @@ #include <rtl/ustring.hxx> -//......................................................................... + namespace abp { -//......................................................................... + typedef std::set<OUString> StringBag; typedef std::map<OUString, OUString> MapString2String; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_ABPTYPES_HXX diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx index 27b41acce69a..a6245db2a178 100644 --- a/extensions/source/abpilot/abspage.cxx +++ b/extensions/source/abpilot/abspage.cxx @@ -20,17 +20,17 @@ #include "abspage.hxx" #include "abspilot.hxx" -//......................................................................... + namespace abp { -//......................................................................... + using namespace ::svt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - //===================================================================== + //= AddressBookSourcePage - //===================================================================== + AddressBookSourcePage::AddressBookSourcePage( OAddessBookSourcePilot* _pParent, const ResId& _rId ) :AddressBookSourcePage_Base(_pParent, _rId) { @@ -73,8 +73,8 @@ namespace abp return getDialog()->getORB(); } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx index d8369c31e899..fcbf77948848 100644 --- a/extensions/source/abpilot/abspage.hxx +++ b/extensions/source/abpilot/abspage.hxx @@ -26,17 +26,17 @@ #include "componentmodule.hxx" #include <vcl/fixed.hxx> -//......................................................................... + namespace abp { -//......................................................................... + class OAddessBookSourcePilot; struct AddressSettings; - //===================================================================== + //= AddressBookSourcePage - //===================================================================== + typedef ::svt::OWizardPage AddressBookSourcePage_Base; /// the base class for all tab pages in the address book source wizard class AddressBookSourcePage : public AddressBookSourcePage_Base @@ -57,9 +57,9 @@ namespace abp virtual void DeactivatePage(); }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_ABSPAGE_HXX diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 46893fcf131e..765890abc8ac 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -34,10 +34,10 @@ #include "fieldmappingpage.hxx" #include "fieldmappingimpl.hxx" -//......................................................................... + namespace abp { -//......................................................................... + #define STATE_SELECT_ABTYPE 0 #define STATE_INVOKE_ADMIN_DIALOG 1 @@ -54,9 +54,9 @@ namespace abp using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - //===================================================================== + //= OAddessBookSourcePilot - //===================================================================== + OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const Reference< XComponentContext >& _rxORB) :OAddessBookSourcePilot_Base( _pParent, ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ), @@ -270,7 +270,7 @@ namespace abp break; } - // ........................................................ + // now that we connected to the data source, check whether we need the "table selection" page const StringBag& aTables = m_aNewDataSource.getTableNames(); @@ -490,8 +490,8 @@ namespace abp impl_updateRoadmap( _eType ); } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 26a4135637c6..082c46113895 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -25,14 +25,14 @@ #include <vcl/fixed.hxx> #include "datasourcehandling.hxx" -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= OAddessBookSourcePilot - //===================================================================== + typedef ::svt::RoadmapWizard OAddessBookSourcePilot_Base; class OAddessBookSourcePilot : public OAddessBookSourcePilot_Base { @@ -134,9 +134,9 @@ namespace abp void impl_updateRoadmap( AddressSourceType _eType ); }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABSPILOT_HXX diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src index 310616c4dd83..f898724155a8 100644 --- a/extensions/source/abpilot/abspilot.src +++ b/extensions/source/abpilot/abspilot.src @@ -19,7 +19,7 @@ #include "abpresid.hrc" -//........................................................................ + ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT { Text [ en-US ] = "Address Book Data Source Wizard" ; @@ -58,7 +58,7 @@ ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT }; }; -//........................................................................ + TabPage RID_PAGE_SELECTABTYPE { HelpID = "extensions:TabPage:RID_PAGE_SELECTABTYPE"; @@ -150,7 +150,7 @@ TabPage RID_PAGE_SELECTABTYPE }; }; -//........................................................................ + TabPage RID_PAGE_ADMININVOKATION { HelpID = "extensions:TabPage:RID_PAGE_ADMININVOKATION"; @@ -186,7 +186,7 @@ TabPage RID_PAGE_ADMININVOKATION }; }; -//........................................................................ + TabPage RID_PAGE_TABLESELECTION_AB { HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION_AB"; @@ -215,7 +215,7 @@ TabPage RID_PAGE_TABLESELECTION_AB }; }; -//........................................................................ + TabPage RID_PAGE_FIELDMAPPING { HelpID = "extensions:TabPage:RID_PAGE_FIELDMAPPING"; @@ -248,7 +248,7 @@ TabPage RID_PAGE_FIELDMAPPING }; }; -//........................................................................ + TabPage RID_PAGE_FINAL { HelpID = "extensions:TabPage:RID_PAGE_FINAL"; @@ -334,7 +334,7 @@ TabPage RID_PAGE_FINAL }; }; -//........................................................................ + ErrorBox RID_ERR_NEEDTYPESELECTION { Buttons = WB_OK; @@ -342,7 +342,7 @@ ErrorBox RID_ERR_NEEDTYPESELECTION Message [ en-US ] = "Please select a type of address book."; }; -//........................................................................ + QueryBox RID_QRY_NOTABLES { Buttons = WB_YES_NO; @@ -351,7 +351,7 @@ QueryBox RID_QRY_NOTABLES Message [ en-US ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?"; }; -//........................................................................ + QueryBox RID_QRY_NO_EVO_GW { Buttons = WB_YES_NO; @@ -360,7 +360,7 @@ QueryBox RID_QRY_NO_EVO_GW Message [ en-US ] = "You don't seem to have any GroupWise account configured in Evolution.\nDo you want to set it up as an address data source, anyway?"; }; -//........................................................................ + String RID_STR_DEFAULT_NAME { Text [ en-US ] = "Addresses"; @@ -391,7 +391,7 @@ String RID_STR_NOFIELDSASSIGNED Text [ en-US ] = "There are no fields assigned at this time.\nYou can either assign fields now or do so later by first choosing:\n\"File - Template - Address Book Source...\""; }; -//........................................................................ + Bitmap BMP_HEADERIMAGE { file = "addresspilot.bmp"; diff --git a/extensions/source/abpilot/addresssettings.hxx b/extensions/source/abpilot/addresssettings.hxx index 53cb58efad91..d719751e4c67 100644 --- a/extensions/source/abpilot/addresssettings.hxx +++ b/extensions/source/abpilot/addresssettings.hxx @@ -23,14 +23,14 @@ #include <rtl/ustring.hxx> #include "abptypes.hxx" -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= AddressSourceType - //===================================================================== + enum AddressSourceType { AST_MORK, @@ -49,9 +49,9 @@ namespace abp AST_INVALID }; - //===================================================================== + //= AddressSettings - //===================================================================== + struct AddressSettings { AddressSourceType eType; @@ -63,9 +63,9 @@ namespace abp bool bRegisterDataSource; }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_ADDRESSSETTINGS_HXX diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 143b567d0128..6ad36a948437 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -30,10 +30,10 @@ #include <vcl/waitobj.hxx> -//......................................................................... + namespace abp { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -42,9 +42,9 @@ namespace abp using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::sdbc; - //===================================================================== + //= OAdminDialogInvokation - //===================================================================== + OAdminDialogInvokation::OAdminDialogInvokation(const Reference< XComponentContext >& _rxContext , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xDataSource @@ -119,8 +119,8 @@ namespace abp return sal_False; } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx index 543554626322..a237eb365f88 100644 --- a/extensions/source/abpilot/admininvokationpage.cxx +++ b/extensions/source/abpilot/admininvokationpage.cxx @@ -22,14 +22,14 @@ #include "admininvokationimpl.hxx" #include "comphelper/processfactory.hxx" -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= AdminDialogInvokationPage - //===================================================================== + AdminDialogInvokationPage::AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent ) :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_ADMININVOKATION)) ,m_aExplanation (this, ModuleRes(FT_ADMINEXPLANATION)) @@ -99,8 +99,8 @@ namespace abp return 0L; } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx index 1fa1599d4a26..77d75df34180 100644 --- a/extensions/source/abpilot/admininvokationpage.hxx +++ b/extensions/source/abpilot/admininvokationpage.hxx @@ -22,14 +22,14 @@ #include "abspage.hxx" -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= AdminDialogInvokationPage - //===================================================================== + class AdminDialogInvokationPage : public AddressBookSourcePage { protected: @@ -57,9 +57,9 @@ namespace abp void implUpdateErrorMessage(); }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_ADMINDIALOG_INVOKATION_PAGE_HXX diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 7945bd293778..5c5cfe964788 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -46,10 +46,10 @@ #include <unotools/sharedunocomponent.hxx> #include <vcl/stdtext.hxx> -//......................................................................... + namespace abp { -//......................................................................... + using namespace ::utl; using namespace ::comphelper; @@ -63,10 +63,10 @@ namespace abp using namespace ::com::sun::star::container; using namespace ::com::sun::star::frame; - //===================================================================== + struct PackageAccessControl { }; - //===================================================================== + static Reference< XDatabaseContext > lcl_getDataSourceContext( const Reference< XComponentContext >& _rxContext ) SAL_THROW (( Exception )) { @@ -80,21 +80,21 @@ namespace abp const Reference< XComponentContext >& _rxContext, const OUString& _rName, Reference< XPropertySet >& /* [out] */ _rxNewDataSource ) SAL_THROW (( ::com::sun::star::uno::Exception )) { - //............................................................. + // get the data source context Reference< XDatabaseContext > xContext = lcl_getDataSourceContext( _rxContext ); DBG_ASSERT( !xContext->hasByName( _rName ), "lcl_implCreateAndInsert: name already used!" ); (void)_rName; - //............................................................. + // create a new data source Reference< XPropertySet > xNewDataSource; if (xContext.is()) xNewDataSource = Reference< XPropertySet >( xContext->createInstance(), UNO_QUERY ); DBG_ASSERT( xNewDataSource.is(), "lcl_implCreateAndInsert: could not create a new data source!" ); - //............................................................. + // insert the data source into the context DBG_ASSERT( xContext.is(), "lcl_implCreateAndInsert: missing an interface on the context (XNamingService)!" ); if (xContext.is()) @@ -117,7 +117,7 @@ namespace abp Reference< XPropertySet > xNewDataSource; lcl_implCreateAndInsert( _rxORB, _rName, xNewDataSource ); - //............................................................. + // set the URL property if (xNewDataSource.is()) { @@ -157,9 +157,9 @@ namespace abp } } - //===================================================================== + //= ODataSourceContextImpl - //===================================================================== + struct ODataSourceContextImpl { Reference< XComponentContext > xORB; @@ -174,9 +174,9 @@ namespace abp } }; - //===================================================================== + //= ODataSourceContext - //===================================================================== + ODataSourceContext::ODataSourceContext(const Reference< XComponentContext >& _rxORB) :m_pImpl( new ODataSourceContextImpl( _rxORB ) ) @@ -298,9 +298,9 @@ namespace abp return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" ); } - //===================================================================== + //= ODataSourceImpl - //===================================================================== + struct ODataSourceImpl { public: @@ -332,9 +332,9 @@ namespace abp { } - //===================================================================== + //= ODataSource - //===================================================================== + ODataSource::ODataSource( const ODataSource& _rSource ) :m_pImpl( NULL ) @@ -512,7 +512,7 @@ namespace abp // nothing to do return sal_True; - // ................................................................ + // create the interaction handler (needed for authentication and error handling) Reference< XInteractionHandler > xInteractions; try @@ -525,7 +525,7 @@ namespace abp { } - // ................................................................ + // failure to create the interaction handler is a serious issue ... if (!xInteractions.is()) { @@ -535,7 +535,7 @@ namespace abp return sal_False; } - // ................................................................ + // open the connection Any aError; Reference< XConnection > xConnection; @@ -554,7 +554,7 @@ namespace abp OSL_FAIL( "ODataSource::connect: caught a generic exception!" ); } - // ................................................................ + // handle errors if ( aError.hasValue() && _pMessageParent ) { @@ -587,7 +587,7 @@ namespace abp if ( !xConnection.is() ) return sal_False; - // ................................................................ + // success m_pImpl->xConnection.reset( xConnection ); m_pImpl->aTables.clear(); @@ -621,8 +621,8 @@ namespace abp return m_pImpl ? m_pImpl->xDataSource : Reference< XPropertySet >(); } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index d77a626fbecc..c3f56c56f7a4 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -25,7 +25,7 @@ #include "abptypes.hxx" -//======================================================================== + namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; @@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star { class Window; -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= ODataSourceContext - //===================================================================== + struct ODataSourceContextImpl; class ODataSource; /// a non-UNO wrapper for the data source context @@ -97,9 +97,9 @@ namespace abp ODataSource createNewDBase( const OUString& _rName ) SAL_THROW (( )); }; - //===================================================================== + //= ODataSource - //===================================================================== + struct ODataSourceImpl; struct PackageAccessControl; /** a non-UNO wrapper for a data source @@ -114,9 +114,9 @@ namespace abp ODataSourceImpl* m_pImpl; public: - // ---------------------------------------------------------------- + // - ctor/dtor/assignment - // ---------------------------------------------------------------- + /// constructs an object which is initially invalid ODataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB @@ -131,11 +131,11 @@ namespace abp /// assignment ODataSource& operator=( const ODataSource& _rSource ); - // ---------------------------------------------------------------- + /// checks whether or not the object represents a valid data source sal_Bool isValid() const SAL_THROW (( )); - // ---------------------------------------------------------------- + /// removes the data source represented by the object from the data source context void remove() SAL_THROW (( )); // TODO: put this into the context class @@ -148,9 +148,9 @@ namespace abp sal_Bool rename( const OUString& _rName ) SAL_THROW (( )); // TODO: put this into the context class - // ---------------------------------------------------------------- + // - connection handling - // ---------------------------------------------------------------- + /** connects to the data source represented by this object @param _pMessageParent the window to use as parent for any error messages. If this is <NULL/>, no messages are displayed @@ -171,7 +171,7 @@ namespace abp /// register the data source under the given name in the configuration void registerDataSource( const OUString& _sRegisteredDataSourceName ) SAL_THROW (( )); - // ---------------------------------------------------------------- + /** retrieves the tables names from the connection <p>to be called when <method>isConnection</method> returns <TRUE/> only</p> */ @@ -185,7 +185,7 @@ namespace abp ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const SAL_THROW (( )); - // ---------------------------------------------------------------- + /** set a new data source. <p>Available to selected clients only</p> */ @@ -199,9 +199,9 @@ namespace abp ODataSource( ); // never implemented }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_DATASOURCEHANDLING_HXX diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 0291d7380948..0104374b2a05 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -34,10 +34,10 @@ #include <unotools/confignode.hxx> #include "sal/macros.h" -//......................................................................... + namespace abp { -//......................................................................... + using namespace ::utl; using namespace ::com::sun::star::uno; @@ -63,10 +63,10 @@ namespace abp return s_sAddressBookNodeName; } - //..................................................................... + namespace fieldmapping { - //..................................................................... + sal_Bool invokeDialog( const Reference< XComponentContext >& _rxORB, class Window* _pParent, @@ -81,7 +81,7 @@ namespace abp try { - // ........................................................ + // create an instance of the dialog service Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent ); OUString sTitle(ModuleRes(RID_STR_FIELDDIALOGTITLE).toString()); @@ -287,14 +287,14 @@ namespace abp aAddressBookSettings.commit(); } - //..................................................................... + } // namespace fieldmapping - //..................................................................... - //..................................................................... + + namespace addressconfig { - //..................................................................... + void writeTemplateAddressSource( const Reference< XComponentContext >& _rxContext, @@ -332,12 +332,12 @@ namespace abp aAddressBookSettings.commit(); } - //..................................................................... + } // namespace addressconfig - //..................................................................... -//......................................................................... + + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx index 1793a99a17b8..a08b455818cf 100644 --- a/extensions/source/abpilot/fieldmappingimpl.hxx +++ b/extensions/source/abpilot/fieldmappingimpl.hxx @@ -38,17 +38,17 @@ namespace com { namespace sun { namespace star { } } } class Window; -//......................................................................... + namespace abp { -//......................................................................... - //..................................................................... + + namespace fieldmapping { - //..................................................................... - //----------------------------------------------------------------- + + /** invokes the field mapping dialog @param _rxORB service factory to use for creating UNO services @@ -66,7 +66,7 @@ namespace abp AddressSettings& _rSettings ) SAL_THROW ( ( ) ); - //----------------------------------------------------------------- + /** creates a default field mapping for usage with the address book SDBC driver <p>The column names as used by the SDBC driver for address books is stored in the configuration, and this function creates a mapping which uses this configuration information.</p> @@ -76,7 +76,7 @@ namespace abp MapString2String& /* [out] */ _rFieldAssignment ) SAL_THROW ( ( ) ); - //----------------------------------------------------------------- + /** writes a field mapping for the template document address source */ void writeTemplateAddressFieldMapping( @@ -84,16 +84,16 @@ namespace abp const MapString2String& _rFieldAssignment ) SAL_THROW ( ( ) ); - //..................................................................... + } // namespace fieldmapping - //..................................................................... - //..................................................................... + + namespace addressconfig { - //..................................................................... - //----------------------------------------------------------------- + + /** writes the data source / table name given into the configuration, to where the template documents expect it. */ @@ -109,13 +109,13 @@ namespace abp const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) SAL_THROW ( ( ) ); - //..................................................................... + } // namespace addressconfig - //..................................................................... -//......................................................................... + + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_FIELDMAPPINGIMPL_HXX diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index ec2b6507e99f..5ebdc9d4bfd9 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -23,14 +23,14 @@ #include "abspilot.hxx" #include <comphelper/processfactory.hxx> -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= FieldMappingPage - //===================================================================== + FieldMappingPage::FieldMappingPage( OAddessBookSourcePilot* _pParent ) :AddressBookSourcePage( _pParent, ModuleRes( RID_PAGE_FIELDMAPPING ) ) @@ -103,8 +103,8 @@ namespace abp return 0L; } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx index b19bbcbd35c3..9509831f3fb3 100644 --- a/extensions/source/abpilot/fieldmappingpage.hxx +++ b/extensions/source/abpilot/fieldmappingpage.hxx @@ -22,14 +22,14 @@ #include "abspage.hxx" -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= FieldMappingPage - //===================================================================== + class FieldMappingPage : public AddressBookSourcePage { protected: @@ -54,9 +54,9 @@ namespace abp void implUpdateHint(); }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_FIELDMAPPINGPAGE_HXX diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 1dcf8b8f19ab..655b90182a8b 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -23,14 +23,14 @@ #include "abspilot.hxx" #include <tools/debug.hxx> -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= TableSelectionPage - //===================================================================== + TableSelectionPage::TableSelectionPage( OAddessBookSourcePilot* _pParent ) :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION_AB)) @@ -117,8 +117,8 @@ namespace abp && ( 0 < m_aTableList.GetSelectEntryCount() ); } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx index 5ac78b874c4c..99be33cca9aa 100644 --- a/extensions/source/abpilot/tableselectionpage.hxx +++ b/extensions/source/abpilot/tableselectionpage.hxx @@ -23,14 +23,14 @@ #include "abspage.hxx" #include <vcl/lstbox.hxx> -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= TableSelectionPage - //===================================================================== + class TableSelectionPage : public AddressBookSourcePage { protected: @@ -57,9 +57,9 @@ namespace abp DECL_LINK( OnTableDoubleClicked, void* ); }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_TABLESELECTIONPAGE_HXX diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index e194d35a4089..b5d0c86aa000 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -25,18 +25,12 @@ #include <com/sun/star/sdbc/DriverManager.hpp> #include <comphelper/processfactory.hxx> -//......................................................................... namespace abp { -//......................................................................... - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; - //===================================================================== - //= TypeSelectionPage - //===================================================================== - + // TypeSelectionPage TypeSelectionPage::TypeSelectionPage( OAddessBookSourcePilot* _pParent ) :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_SELECTABTYPE)) ,m_aHint (this, ModuleRes(FT_TYPE_HINTS)) @@ -272,8 +266,8 @@ namespace abp return 0L; } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index 74bc99a759ef..2290d03058f0 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -24,14 +24,14 @@ #include "addresssettings.hxx" #include <vcl/edit.hxx> -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= TypeSelectionPage - //===================================================================== + class TypeSelectionPage : public AddressBookSourcePage { protected: @@ -90,9 +90,9 @@ namespace abp void selectType( AddressSourceType _eType ); }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index df088ba54aab..a69131a648e1 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -30,10 +30,10 @@ extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno() } #define PROPERTY_ID_DATASOURCENAME 3 -//......................................................................... + namespace abp { -//......................................................................... + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -41,9 +41,9 @@ namespace abp using namespace ::com::sun::star::beans; using namespace ::com::sun::star::ui::dialogs; - //===================================================================== + //= OABSPilotUno - //===================================================================== + OABSPilotUno::OABSPilotUno(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog(_rxORB) @@ -194,8 +194,8 @@ namespace abp } } -//......................................................................... + } // namespace abp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index 81ff0bf108d7..dac7d5ecb4d1 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.hxx @@ -26,14 +26,14 @@ #include <com/sun/star/task/XJob.hpp> #include <cppuhelper/implbase1.hxx> -//......................................................................... + namespace abp { -//......................................................................... - //===================================================================== + + //= OABSPilotUno - //===================================================================== + class OABSPilotUno; typedef ::svt::OGenericUnoDialog OABSPilotUno_DBase; typedef ::cppu::ImplHelper1< ::com::sun::star::task::XJob > OABSPilotUno_JBase; @@ -88,9 +88,9 @@ namespace abp virtual void executedDialog(sal_Int16 _nExecutionResult); }; -//......................................................................... + } // namespace abp -//......................................................................... + #endif // EXTENSIONS_ABP_UNODIALOG_HXX diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx index d184d49d65e4..a59108e41491 100644 --- a/extensions/source/activex/SOActionsApproval.cxx +++ b/extensions/source/activex/SOActionsApproval.cxx @@ -25,8 +25,8 @@ #include "SOActionsApproval.h" #include <sal/macros.h> -///////////////////////////////////////////////////////////////////////////// -// + + STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) { diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h index 422a66b7dd01..ca99b45c9578 100644 --- a/extensions/source/activex/SOActionsApproval.h +++ b/extensions/source/activex/SOActionsApproval.h @@ -35,7 +35,7 @@ #include "so_activex.h" -///////////////////////////////////////////////////////////////////////////// + // SOActionsApproval class SOActionsApproval : diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index ee80ba44e009..5df0c1111736 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -37,7 +37,7 @@ #define STAROFFICE_WINDOWCLASS "SOParentWindow" -///////////////////////////////////////////////////////////////////////////// + void OutputError_Impl( HWND hw, HRESULT ErrorCode ) { @@ -140,7 +140,7 @@ HRESULT GetPropertiesFromIDisp( IDispatch* pdispObject, return S_OK; } -///////////////////////////////////////////////////////////////////////////// + // CSOActiveX CSOActiveX::CSOActiveX() diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h index 7e37c8a5b7e8..97ec5a2cd12f 100644 --- a/extensions/source/activex/SOActiveX.h +++ b/extensions/source/activex/SOActiveX.h @@ -53,7 +53,7 @@ enum SOVersion { OO_UNKNOWN }; -///////////////////////////////////////////////////////////////////////////// + // CSOActiveX class ATL_NO_VTABLE CSOActiveX : public CComObjectRootEx<CComSingleThreadModel>, diff --git a/extensions/source/activex/SOComWindowPeer.cxx b/extensions/source/activex/SOComWindowPeer.cxx index 298e32014e66..86d15046c723 100644 --- a/extensions/source/activex/SOComWindowPeer.cxx +++ b/extensions/source/activex/SOComWindowPeer.cxx @@ -24,8 +24,8 @@ #include "SOComWindowPeer.h" #include <sal/macros.h> -///////////////////////////////////////////////////////////////////////////// -// + + STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) { diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h index 9eb4d6aca9a1..b038378bb5e1 100644 --- a/extensions/source/activex/SOComWindowPeer.h +++ b/extensions/source/activex/SOComWindowPeer.h @@ -35,7 +35,7 @@ #include "so_activex.h" -///////////////////////////////////////////////////////////////////////////// + // SOComWindowPeer class SOComWindowPeer : diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx index 4663d3f78ccc..ef151481c98a 100644 --- a/extensions/source/activex/SODispatchInterceptor.cxx +++ b/extensions/source/activex/SODispatchInterceptor.cxx @@ -27,8 +27,8 @@ #include "com_uno_helper.h" #include <sal/macros.h> -///////////////////////////////////////////////////////////////////////////// -// + + STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid) { diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h index f731f4058166..528eb3dba404 100644 --- a/extensions/source/activex/SODispatchInterceptor.h +++ b/extensions/source/activex/SODispatchInterceptor.h @@ -37,7 +37,7 @@ class CSOActiveX; -///////////////////////////////////////////////////////////////////////////// + // SODispatchInterceptor class SODispatchInterceptor : diff --git a/extensions/source/activex/resource.h b/extensions/source/activex/resource.h index 1e898c6194c6..b7a77a5c91a9 100644 --- a/extensions/source/activex/resource.h +++ b/extensions/source/activex/resource.h @@ -20,7 +20,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by so_activex.rc -// + #define IDS_PROJNAME 100 #define IDB_SOACTIVEX 101 #define IDR_SOACTIVEX 102 @@ -33,7 +33,7 @@ // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index 4fbf3580bceb..850ebab0d4f9 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -71,7 +71,7 @@ extern "C" { WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD); } -///////////////////////////////////////////////////////////////////////////// + // DLL Entry Point extern "C" @@ -87,7 +87,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) return TRUE; // ok } -///////////////////////////////////////////////////////////////////////////// + // Used to determine whether the DLL can be unloaded by OLE STDAPI DllCanUnloadNow(void) @@ -95,7 +95,7 @@ STDAPI DllCanUnloadNow(void) return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; } -///////////////////////////////////////////////////////////////////////////// + // Returns a class factory to create an object of the requested type STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) @@ -103,7 +103,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - Adds entries to the system registry // for now database component and chart are always installed @@ -349,7 +349,7 @@ STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit, co } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - Removes entries from the system registry HRESULT DeleteKeyTree( HKEY hkey, const char* pPath, REGSAM nKeyAccess ) { @@ -469,7 +469,7 @@ STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServerDoc - Adds entries to the system registry #define SUPPORTED_MSEXT_NUM 7 @@ -572,7 +572,7 @@ STDAPI DllRegisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServerDoc - Removes entries from the system registry STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) @@ -654,7 +654,7 @@ STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) return hr; } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - regsvr32 entry point STDAPI DllRegisterServer( void ) @@ -687,7 +687,7 @@ STDAPI DllRegisterServer( void ) return aResult; } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - regsvr32 entry point STDAPI DllUnregisterServer( void ) diff --git a/extensions/source/activex/so_activex.idl b/extensions/source/activex/so_activex.idl index 926a3ff1fdaa..c6a2d8f210aa 100644 --- a/extensions/source/activex/so_activex.idl +++ b/extensions/source/activex/so_activex.idl @@ -17,7 +17,7 @@ */ // so_activex.idl : IDL source for so_activex.dll -// + // This file will be processed by the MIDL tool to // produce the type library (so_activex.tlb) and marshalling code. diff --git a/extensions/source/activex/so_activex.rc b/extensions/source/activex/so_activex.rc index c1dca6dbe61d..3891fa965d13 100644 --- a/extensions/source/activex/so_activex.rc +++ b/extensions/source/activex/so_activex.rc @@ -17,23 +17,23 @@ */ //Microsoft Developer Studio generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include <winresrc.h> #define LB_ADDSTRING (WM_USER+1) #define CB_ADDSTRING (WM_USER+3) #define IDC_STATIC (-1) -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // Russian resources //#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) @@ -42,27 +42,27 @@ //#pragma code_page(1251) //#endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // Bitmap -// + //IDB_SOACTIVEX BITMAP DISCARDABLE "soacti.bmp" -///////////////////////////////////////////////////////////////////////////// -// + + // REGISTRY -// + IDR_SOACTIVEX REGISTRY DISCARDABLE "SOActiveX.rgs" IDR_SOCOMWINDOWPEER REGISTRY DISCARDABLE "SOComWindowPeer.rgs" IDR_SODISPATCHINTERCEPTOR REGISTRY DISCARDABLE "SODispatchInterceptor.rgs" //#endif // Russian resources -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// + + // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) @@ -72,10 +72,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -96,10 +96,10 @@ END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -107,18 +107,18 @@ BEGIN END #endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// + 1 TYPELIB SO_ACTIVEX_TLB -///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 616680e9bc43..06b62eeb8006 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -34,10 +34,10 @@ class BibDataManager; -//......................................................................... + namespace bib { -//......................................................................... + class BibGridwin; class BibBeamer @@ -78,9 +78,9 @@ namespace bib virtual void GetFocus(); }; -//......................................................................... + } // namespace bib -//......................................................................... + #endif diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index fb17abdcf3a0..fc1fb965d106 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -27,7 +27,7 @@ struct Mapping; typedef boost::ptr_vector<Mapping> MappingArray; -//----------------------------------------------------------------------------- + #define COLUMN_COUNT 31 #define IDENTIFIER_POS 0 #define AUTHORITYTYPE_POS 1 @@ -60,13 +60,13 @@ typedef boost::ptr_vector<Mapping> MappingArray; #define CUSTOM3_POS 28 #define CUSTOM4_POS 29 #define CUSTOM5_POS 30 -//----------------------------------------------------------------------------- + struct StringPair { OUString sRealColumnName; OUString sLogicalColumnName; }; -//----------------------------------------------------------------------------- + struct Mapping { OUString sTableName; @@ -77,14 +77,14 @@ struct Mapping Mapping() : nCommandType(0){} }; -//----------------------------------------------------------------------------- + struct BibDBDescriptor { OUString sDataSource; OUString sTableOrQuery; sal_Int32 nCommandType; }; -//----------------------------------------------------------------------------- + class BibConfig : public utl::ConfigItem { diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx index daa100db103b..3ba9dbdd083f 100644 --- a/extensions/source/bibliography/bibresid.hxx +++ b/extensions/source/bibliography/bibresid.hxx @@ -22,7 +22,7 @@ #include <tools/resid.hxx> -//=================================================================== + class BibResId : public ResId { diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 82cf14141c66..9ecf8807b84d 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -42,10 +42,10 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; -//......................................................................... + namespace bib { -//......................................................................... + BibView::BibView( Window* _pParent, BibDataManager* _pManager, WinBits _nStyle ) @@ -199,8 +199,8 @@ namespace bib return m_pGeneralPage? m_pGeneralPage->HandleShortCutKey( rKeyEvent ) : sal_False; } -//......................................................................... + } // namespace bib -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index cc3d0332e9e4..80f0949abfad 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -29,12 +29,12 @@ class BibDataManager; namespace com{ namespace sun{ namespace star{ namespace awt{ class XFocusListener;}}}} -//......................................................................... + namespace bib { -//......................................................................... - // ----------------------------------------------------------------------- + + class BibView : public BibWindow, public FormControlContainer { private: @@ -69,9 +69,9 @@ namespace bib virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled }; -//......................................................................... + } // namespace bib -//......................................................................... + #endif diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index d3484b089389..9d649caffa2c 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -36,7 +36,7 @@ class Window; -//----------------------------------------------------------------------------- + namespace bib { class BibView; diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx index e388f9124aa0..7081523beff9 100644 --- a/extensions/source/bibliography/formcontrolcontainer.cxx +++ b/extensions/source/bibliography/formcontrolcontainer.cxx @@ -23,19 +23,19 @@ #include <algorithm> #include <functional> -//......................................................................... + namespace bib { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::form; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::awt; - //===================================================================== + //= FormControlContainer - //===================================================================== + FormControlContainer::FormControlContainer( ) :OLoadListener( m_aMutex ) @@ -142,8 +142,8 @@ namespace bib implSetDesignMode( sal_False ); } -//......................................................................... + } // namespace bib -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx index 3ba21c885e0b..c7737c3f5cf2 100644 --- a/extensions/source/bibliography/formcontrolcontainer.hxx +++ b/extensions/source/bibliography/formcontrolcontainer.hxx @@ -24,14 +24,14 @@ #include "loadlisteneradapter.hxx" #include <com/sun/star/awt/XControlContainer.hpp> -//......................................................................... + namespace bib { -//......................................................................... - //===================================================================== + + //= FormControlContainer - //===================================================================== + class FormControlContainer :public ::comphelper::OBaseMutex ,public ::bib::OLoadListener @@ -66,9 +66,9 @@ namespace bib }; -//......................................................................... + } // namespace bib -//......................................................................... + #endif // EXTENSIONS_BIB_FORMCONTROLCONTAINER_HXX diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx index aadfac336f4e..e74c24ebaa76 100644 --- a/extensions/source/bibliography/loadlisteneradapter.cxx +++ b/extensions/source/bibliography/loadlisteneradapter.cxx @@ -21,18 +21,18 @@ #include <osl/diagnose.h> #include <rtl/ref.hxx> -//......................................................................... + namespace bib { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::form; - //===================================================================== + //= OComponentListener - //===================================================================== + OComponentListener::~OComponentListener() { @@ -69,9 +69,9 @@ namespace bib } } - //===================================================================== + //= OComponentAdapterBase - //===================================================================== + OComponentAdapterBase::OComponentAdapterBase( const Reference< XComponent >& _rxComp, sal_Bool _bAutoRelease ) :m_xComponent( _rxComp ) @@ -144,9 +144,9 @@ namespace bib m_xComponent = NULL; } - //===================================================================== + //= OLoadListenerAdapter - //===================================================================== + OLoadListenerAdapter::OLoadListenerAdapter( const Reference< XLoadable >& _rxLoadable, sal_Bool _bAutoRelease ) :OComponentAdapterBase( Reference< XComponent >( _rxLoadable, UNO_QUERY ), _bAutoRelease ) @@ -223,8 +223,8 @@ namespace bib getLoadListener( )->_reloaded( _rEvent ); } -//......................................................................... + } // namespace bib -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx index 799c9681c2d8..2735f59b3981 100644 --- a/extensions/source/bibliography/loadlisteneradapter.hxx +++ b/extensions/source/bibliography/loadlisteneradapter.hxx @@ -25,16 +25,16 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/form/XLoadable.hpp> -//......................................................................... + namespace bib { -//......................................................................... + class OComponentAdapterBase; - //===================================================================== + //= OComponentListener - //===================================================================== + class OComponentListener { friend class OComponentAdapterBase; @@ -58,9 +58,9 @@ namespace bib void setAdapter( OComponentAdapterBase* _pAdapter ); }; - //===================================================================== + //= OComponentAdapterBase - //===================================================================== + class OComponentAdapterBase { friend class OComponentListener; @@ -114,9 +114,9 @@ namespace bib virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception); }; - //===================================================================== + //= OLoadListener - //===================================================================== + class OLoadListener : public OComponentListener { friend class OLoadListenerAdapter; @@ -132,9 +132,9 @@ namespace bib virtual void _reloaded( const ::com::sun::star::lang::EventObject& aEvent ) = 0; }; - //===================================================================== + //= OLoadListenerAdapter - //===================================================================== + typedef ::cppu::WeakImplHelper1< ::com::sun::star::form::XLoadListener > OLoadListenerAdapter_Base; class OLoadListenerAdapter :public OLoadListenerAdapter_Base @@ -169,9 +169,9 @@ namespace bib virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } // namespace bib -//......................................................................... + #endif // EXTENSIONS_BIB_LOADLISTENERADAPTER_HXX diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx index d8a27496090c..bef165037838 100644 --- a/extensions/source/config/ldap/componentdef.cxx +++ b/extensions/source/config/ldap/componentdef.cxx @@ -23,7 +23,7 @@ using namespace extensions::config::ldap ; -//============================================================================== + static uno::Reference<uno::XInterface> SAL_CALL createLdapUserProfileBe( const uno::Reference<uno::XComponentContext>& aContext) { diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index efec23a405b6..a991d0692781 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.hxx @@ -42,10 +42,10 @@ namespace extensions { namespace config { namespace ldap { namespace uno = css::uno ; namespace lang = css::lang ; namespace ldap = css::ldap ; -//------------------------------------------------------------------------------ + struct LdapUserProfile; -//------------------------------------------------------------------------------ + /** Struct containing the information on LDAP connection */ struct LdapDefinition { @@ -129,7 +129,7 @@ private: LdapDefinition mLdapDefinition; } ; -//------------------------------------------------------------------------------ + }} } #endif // EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILE_HXX_ diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 25e5d5c4711a..4d53c39c8572 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -33,7 +33,7 @@ #include <cppuhelper/supportsservice.hxx> #include <osl/security.hxx> -//============================================================================== + namespace extensions { namespace config { namespace ldap { LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContext>& xContext) diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index 1219744ed518..456bbf83b9a8 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx @@ -145,7 +145,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase LdapData data_; } ; -//------------------------------------------------------------------------------ + }}} #endif // EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILE_HXX_ diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index c620a1a95c16..1bb6bd0e8571 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -39,10 +39,10 @@ #include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <svl/filenotation.hxx> -//......................................................................... + namespace dbp { -//......................................................................... + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -54,9 +54,9 @@ namespace dbp using namespace ::com::sun::star::task; using namespace ::comphelper; - //===================================================================== + //= OTableSelectionPage - //===================================================================== + OTableSelectionPage::OTableSelectionPage(OControlWizard* _pParent) :OControlWizardPage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION)) @@ -384,9 +384,9 @@ namespace dbp } } - //===================================================================== + //= OMaybeListSelectionPage - //===================================================================== + OMaybeListSelectionPage::OMaybeListSelectionPage( OControlWizard* _pParent, const ResId& _rId ) :OControlWizardPage(_pParent, _rId) @@ -451,9 +451,9 @@ namespace dbp m_pNo->GrabFocus(); } - //===================================================================== + //= ODBFieldPage - //===================================================================== + ODBFieldPage::ODBFieldPage( OControlWizard* _pParent ) :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_OPTION_DBFIELD)) @@ -491,8 +491,8 @@ namespace dbp return sal_True; } -//......................................................................... + } // namespace dbp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index ad201deb7a48..ff61894cba3a 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -25,14 +25,14 @@ #include <vcl/lstbox.hxx> #include <com/sun/star/sdb/XDatabaseContext.hpp> -//......................................................................... + namespace dbp { -//......................................................................... - //===================================================================== + + //= OTableSelectionPage - //===================================================================== + class OTableSelectionPage : public OControlWizardPage { protected: @@ -71,9 +71,9 @@ namespace dbp virtual bool canAdvance() const; }; - //===================================================================== + //= OMaybeListSelectionPage - //===================================================================== + class OMaybeListSelectionPage : public OControlWizardPage { protected: @@ -102,9 +102,9 @@ namespace dbp void implCommit(OUString& _rSelection); }; - //===================================================================== + //= ODBFieldPage - //===================================================================== + class ODBFieldPage : public OMaybeListSelectionPage { protected: @@ -129,9 +129,9 @@ namespace dbp virtual OUString& getDBFieldSetting() = 0; }; -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_COMMONPAGESDBP_HXX_ diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 68eb40f83366..900b0e55a669 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -45,10 +45,10 @@ #include <com/sun/star/sdbc/DataType.hpp> #include <tools/urlobj.hxx> -//......................................................................... + namespace dbp { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -67,9 +67,9 @@ namespace dbp using namespace ::comphelper; using namespace ::dbtools; - //===================================================================== + //= OAccessRegulator - //===================================================================== + struct OAccessRegulator { friend class OControlWizardPage; @@ -78,9 +78,9 @@ namespace dbp OAccessRegulator() { } }; - //===================================================================== + //= OControlWizardPage - //===================================================================== + OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const ResId& _rResId ) :OControlWizardPage_Base( _pParent, _rResId ) @@ -268,9 +268,9 @@ namespace dbp OControlWizardPage_Base::initializePage(); } - //===================================================================== + //= OControlWizard - //===================================================================== + OControlWizard::OControlWizard( Window* _pParent, const ResId& _rId, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) @@ -733,8 +733,8 @@ namespace dbp // if we got fields, the data source is valid ... } -//......................................................................... + } // namespace dbp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 5109454fd026..cce215def790 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -36,22 +36,22 @@ #include "wizardcontext.hxx" class ResId; -//......................................................................... + namespace dbp { -//......................................................................... - //===================================================================== + + //= OControlWizardSettings - //===================================================================== + struct OControlWizardSettings { OUString sControlLabel; }; - //===================================================================== + //= OControlWizardPage - //===================================================================== + class OControlWizard; typedef ::svt::OWizardPage OControlWizardPage_Base; class OControlWizardPage : public OControlWizardPage_Base @@ -98,9 +98,9 @@ namespace dbp }; struct OAccessRegulator; - //===================================================================== + //= OControlWizard - //===================================================================== + typedef ::svt::OWizardMachine OControlWizard_Base; class OControlWizard : public OControlWizard_Base { @@ -165,9 +165,9 @@ namespace dbp virtual void ActivatePage(); }; -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_CONTROLWIZARD_HXX diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index 994c3a3743fa..eccf57b20bc3 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -23,7 +23,7 @@ #include "dbpilots.hrc" #include "extensio.hrc" -//======================================================================== + // basics #define RID_DIALOG_START RID_DBP_START @@ -31,7 +31,7 @@ #define RID_STRING_START RID_DBP_START #define RID_ERRORBOX_START RID_DBP_START -//======================================================================== + // strings #define RID_STR_GROUPWIZ_DBFIELD (RID_STRING_START + 1 ) @@ -48,7 +48,7 @@ // please adjust RID_STRING_END (below) when adding new strings #define RID_STRING_END RID_STR_TIMEPOSTFIX -//======================================================================== + // dialogs #define RID_DLG_GROUPBOXWIZARD ( RID_DIALOG_START + 1 ) @@ -58,7 +58,7 @@ // please adjust RID_DIALOG_END (below) when adding new dialogs #define RID_DIALOG_END RID_DLG_GRIDWIZARD -//======================================================================== + // tab pages #define RID_PAGE_TABLESELECTION ( RID_PAGE_START + 1 ) @@ -76,7 +76,7 @@ // please adjust RID_PAGE_END (below) when adding new tab pages #define RID_PAGE_END RID_PAGE_GW_FIELDSELECTION -//======================================================================== + // ErrorBox #define RID_ERR_INVALID_FORM_CONNECTION ( RID_ERRORBOX_START + 1 ) @@ -85,8 +85,8 @@ #define RID_ERRORBOX_END RID_ERR_INVALID_FORM_CONNECTION -//======================================================================== -//======================================================================== + + //= range checks #if RID_STRING_END > RID_DBP_END @@ -102,10 +102,10 @@ #error "please adjust the resource id ranges!!" #endif -//======================================================================== + // local ids -//........................................................................ + // FixedLine #define FL_DATA 1 @@ -116,7 +116,7 @@ #define FL_FRAME 6 #define FL_FORMSETINGS 7 -//........................................................................ + // FixedText #define FT_DATASOURCE 1 @@ -147,7 +147,7 @@ #define FT_FORMCONTENTTYPELABEL 26 #define FT_FORMCONTENTTYPE 27 -//........................................................................ + // ListBox #define LB_DATASOURCE 1 @@ -160,7 +160,7 @@ #define LB_EXISTING_FIELDS 7 #define LB_SELECTED_FIELDS 8 -//........................................................................ + // Edit #define ET_RADIOLABELS 1 @@ -168,7 +168,7 @@ #define ET_NAMEIT 3 #define ET_DISPLAYEDFIELD 4 -//........................................................................ + // PushButton #define PB_MOVETORIGHT 1 @@ -179,7 +179,7 @@ #define PB_ALLFIELDSLEFT 6 #define PB_FORMDATASOURCE 7 -//........................................................................ + // RadioButton #define RB_DEFSELECTION_YES 1 @@ -187,19 +187,19 @@ #define RB_STOREINFIELD_YES 3 #define RB_STOREINFIELD_NO 4 -//........................................................................ + // ComboBox #define CMB_VALUELISTFIELD 1 #define CMB_TABLEFIELD 2 -//........................................................................ + // String #define STR_FIELDINFO_LISTBOX 1 #define STR_FIELDINFO_COMBOBOX 2 -//........................................................................ + // Image #define IMG_TABLE 1 diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx index b19f6fc8916a..a6ce9fdae1b0 100644 --- a/extensions/source/dbpilots/dbptools.cxx +++ b/extensions/source/dbpilots/dbptools.cxx @@ -20,10 +20,10 @@ #include "dbptools.hxx" #include <tools/debug.hxx> -//......................................................................... + namespace dbp { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; @@ -54,8 +54,8 @@ namespace dbp } } -//......................................................................... + } // namespace dbp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx index b79bf5709499..2ab984699f06 100644 --- a/extensions/source/dbpilots/dbptools.hxx +++ b/extensions/source/dbpilots/dbptools.hxx @@ -22,18 +22,18 @@ #include <com/sun/star/container/XNameAccess.hpp> -//......................................................................... + namespace dbp { -//......................................................................... + void disambiguateName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, OUString& _rElementsName); -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_DBPTOOLS_HXX_ diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx index 407116975b41..cd41db446e7a 100644 --- a/extensions/source/dbpilots/dbptypes.hxx +++ b/extensions/source/dbpilots/dbptypes.hxx @@ -26,18 +26,18 @@ #include <set> #include <vector> -//......................................................................... + namespace dbp { -//......................................................................... + typedef std::vector<OUString> StringArray; typedef std::set<OUString> StringBag; typedef std::map<sal_uInt32, OUString> MapInt2String; -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_DBPTYPES_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index dbddd51b2e28..af38f74f0de7 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -34,10 +34,10 @@ #define GW_STATE_DATASOURCE_SELECTION 0 #define GW_STATE_FIELDSELECTION 1 -//......................................................................... + namespace dbp { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -48,9 +48,9 @@ namespace dbp using namespace ::com::sun::star::awt; using namespace ::svt; - //===================================================================== + //= OGridWizard - //===================================================================== + OGridWizard::OGridWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) @@ -290,9 +290,9 @@ namespace dbp return sal_True; } - //===================================================================== + //= OGridFieldsSelection - //===================================================================== + OGridFieldsSelection::OGridFieldsSelection( OGridWizard* _pParent ) :OGridPage(_pParent, ModuleRes(RID_PAGE_GW_FIELDSELECTION)) @@ -470,8 +470,8 @@ namespace dbp return 0; } -//......................................................................... + } // namespace dbp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index 1cb62c58c0e9..9d8044b4d5f4 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -23,22 +23,22 @@ #include "controlwizard.hxx" #include "commonpagesdbp.hxx" -//......................................................................... + namespace dbp { -//......................................................................... - //===================================================================== + + //= OGridSettings - //===================================================================== + struct OGridSettings : public OControlWizardSettings { ::com::sun::star::uno::Sequence< OUString > aSelectedFields; }; - //===================================================================== + //= OGridWizard - //===================================================================== + class OGridWizard : public OControlWizard { protected: @@ -68,9 +68,9 @@ namespace dbp void implApplySettings(); }; - //===================================================================== + //= OGridPage - //===================================================================== + class OGridPage : public OControlWizardPage { public: @@ -80,9 +80,9 @@ namespace dbp OGridSettings& getSettings() { return static_cast<OGridWizard*>(getDialog())->getSettings(); } }; - //===================================================================== + //= OGridFieldsSelection - //===================================================================== + class OGridFieldsSelection : public OGridPage { protected: @@ -120,9 +120,9 @@ namespace dbp ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > implGetColumns(sal_Bool _bShowError = sal_True); }; -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_GRIDWIZARD_HXX_ diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 7c142f81525b..acca9657a6a3 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -32,10 +32,10 @@ #define GBW_STATE_DBFIELD 3 #define GBW_STATE_FINALIZE 4 -//......................................................................... + namespace dbp { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -43,9 +43,9 @@ namespace dbp using namespace ::com::sun::star::form; using namespace ::svt; - //===================================================================== + //= OGroupBoxWizard - //===================================================================== + OGroupBoxWizard::OGroupBoxWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) @@ -181,9 +181,9 @@ namespace dbp return OControlWizard::onFinish(); } - //===================================================================== + //= ORadioSelectionPage - //===================================================================== + ORadioSelectionPage::ORadioSelectionPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_GROUPRADIOSELECTION)) @@ -338,9 +338,9 @@ namespace dbp } } - //===================================================================== + //= ODefaultFieldSelectionPage - //===================================================================== + ODefaultFieldSelectionPage::ODefaultFieldSelectionPage( OControlWizard* _pParent ) :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_DEFAULTFIELDSELECTION)) @@ -389,9 +389,9 @@ namespace dbp return sal_True; } - //===================================================================== + //= OOptionValuesPage - //===================================================================== + OOptionValuesPage::OOptionValuesPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONVALUES)) @@ -483,9 +483,9 @@ namespace dbp return sal_True; } - //===================================================================== + //= OOptionDBFieldPage - //===================================================================== + OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) @@ -499,9 +499,9 @@ namespace dbp return getSettings().sDBField; } - //===================================================================== + //= OFinalizeGBWPage - //===================================================================== + OFinalizeGBWPage::OFinalizeGBWPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONS_FINAL)) @@ -546,8 +546,8 @@ namespace dbp return sal_True; } -//......................................................................... + } // namespace dbp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index 17626c5aa5d2..c38e712a0056 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -23,14 +23,14 @@ #include "controlwizard.hxx" #include "commonpagesdbp.hxx" -//......................................................................... + namespace dbp { -//......................................................................... - //===================================================================== + + //= OOptionGroupSettings - //===================================================================== + struct OOptionGroupSettings : public OControlWizardSettings { StringArray aLabels; @@ -40,9 +40,9 @@ namespace dbp OUString sName; }; - //===================================================================== + //= OGroupBoxWizard - //===================================================================== + class OGroupBoxWizard : public OControlWizard { protected: @@ -73,9 +73,9 @@ namespace dbp void createRadios(); }; - //===================================================================== + //= OGBWPage - //===================================================================== + class OGBWPage : public OControlWizardPage { public: @@ -85,9 +85,9 @@ namespace dbp OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); } }; - //===================================================================== + //= ORadioSelectionPage - //===================================================================== + class ORadioSelectionPage : public OGBWPage { protected: @@ -118,9 +118,9 @@ namespace dbp void implCheckMoveButtons(); }; - //===================================================================== + //= ODefaultFieldSelectionPage - //===================================================================== + class ODefaultFieldSelectionPage : public OMaybeListSelectionPage { protected: @@ -141,9 +141,9 @@ namespace dbp OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); } }; - //===================================================================== + //= OOptionValuesPage - //===================================================================== + class OOptionValuesPage : public OGBWPage { protected: @@ -174,9 +174,9 @@ namespace dbp DECL_LINK( OnOptionSelected, ListBox* ); }; - //===================================================================== + //= OOptionDBFieldPage - //===================================================================== + class OOptionDBFieldPage : public ODBFieldPage { public: @@ -189,9 +189,9 @@ namespace dbp virtual OUString& getDBFieldSetting(); }; - //===================================================================== + //= OFinalizeGBWPage - //===================================================================== + class OFinalizeGBWPage : public OGBWPage { protected: @@ -213,9 +213,9 @@ namespace dbp virtual bool canAdvance() const; }; -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_GROUPBOXWIZ_HXX_ diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index d132c7651cfb..5cf9b66f1fce 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -30,10 +30,10 @@ #include "dbpilots.hrc" #include <comphelper/extract.hxx> -//......................................................................... + namespace dbp { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -45,9 +45,9 @@ namespace dbp using namespace ::svt; using namespace ::dbtools; - //===================================================================== + //= OListComboWizard - //===================================================================== + OListComboWizard::OListComboWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) @@ -219,9 +219,9 @@ namespace dbp return sal_True; } - //===================================================================== + //= OLCPage - //===================================================================== + Reference< XNameAccess > OLCPage::getTables(sal_Bool _bNeedIt) { @@ -270,9 +270,9 @@ namespace dbp return aColumnNames; } - //===================================================================== + //= OContentTableSelection - //===================================================================== + OContentTableSelection::OContentTableSelection( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_TABLE)) @@ -357,9 +357,9 @@ namespace dbp return sal_True; } - //===================================================================== + //= OContentFieldSelection - //===================================================================== + OContentFieldSelection::OContentFieldSelection( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_FIELD)) @@ -431,9 +431,9 @@ namespace dbp return sal_True; } - //===================================================================== + //= OLinkFieldsPage - //===================================================================== + OLinkFieldsPage::OLinkFieldsPage( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_FIELDLINK)) @@ -510,9 +510,9 @@ namespace dbp return sal_True; } - //===================================================================== + //= OComboDBFieldPage - //===================================================================== + OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) @@ -540,8 +540,8 @@ namespace dbp return false; } -//......................................................................... + } // namespace dbp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index f807bea73d36..0b594b6c79f2 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -23,10 +23,10 @@ #include "controlwizard.hxx" #include "commonpagesdbp.hxx" -//......................................................................... + namespace dbp { -//......................................................................... + #define LCW_STATE_DATASOURCE_SELECTION 0 #define LCW_STATE_TABLESELECTION 1 @@ -34,9 +34,9 @@ namespace dbp #define LCW_STATE_FIELDLINK 3 #define LCW_STATE_COMBODBFIELD 4 - //===================================================================== + //= OListComboSettings - //===================================================================== + struct OListComboSettings : public OControlWizardSettings { OUString sListContentTable; @@ -45,9 +45,9 @@ namespace dbp OUString sLinkedListField; }; - //===================================================================== + //= OListComboWizard - //===================================================================== + class OListComboWizard : public OControlWizard { protected: @@ -82,9 +82,9 @@ namespace dbp void implApplySettings(); }; - //===================================================================== + //= OLCPage - //===================================================================== + class OLCPage : public OControlWizardPage { public: @@ -101,9 +101,9 @@ namespace dbp getTableFields(sal_Bool _bNeedIt); }; - //===================================================================== + //= OContentTableSelection - //===================================================================== + class OContentTableSelection : public OLCPage { protected: @@ -128,9 +128,9 @@ namespace dbp DECL_LINK( OnTableSelected, ListBox* ); }; - //===================================================================== + //= OContentFieldSelection - //===================================================================== + class OContentFieldSelection : public OLCPage { protected: @@ -158,9 +158,9 @@ namespace dbp virtual bool canAdvance() const; }; - //===================================================================== + //= OLinkFieldsPage - //===================================================================== + class OLinkFieldsPage : public OLCPage { protected: @@ -190,9 +190,9 @@ namespace dbp DECL_LINK(OnSelectionModified, void*); }; - //===================================================================== + //= OComboDBFieldPage - //===================================================================== + class OComboDBFieldPage : public ODBFieldPage { public: @@ -211,9 +211,9 @@ namespace dbp virtual OUString& getDBFieldSetting(); }; -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_LISTCOMBOWIZARD_HXX_ diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index 91e929351b17..aad8888f7e71 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -31,10 +31,10 @@ #include "groupboxwiz.hxx" #include "dbptools.hxx" -//......................................................................... + namespace dbp { -//......................................................................... + #define BUTTON_HEIGHT 300 #define HEIGHT 450 @@ -50,9 +50,9 @@ namespace dbp using namespace ::com::sun::star::text; using namespace ::com::sun::star::view; - //===================================================================== + //= OOptionGroupLayouter - //===================================================================== + OOptionGroupLayouter::OOptionGroupLayouter(const Reference< XComponentContext >& _rxContext) :mxContext(_rxContext) @@ -196,8 +196,8 @@ namespace dbp _rxShapeProps->setPropertyValue(s_sAnchorPropertyName, makeAny(TextContentAnchorType_AT_PAGE)); } -//......................................................................... + } // namespace dbp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx index 0a0c8707a888..54c2113ab3b3 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.hxx +++ b/extensions/source/dbpilots/optiongrouplayouter.hxx @@ -27,16 +27,16 @@ #include <com/sun/star/frame/XModel.hpp> #include "dbptypes.hxx" -//......................................................................... + namespace dbp { -//......................................................................... + struct OControlWizardContext; struct OOptionGroupSettings; - //===================================================================== + //= OOptionGroupLayouter - //===================================================================== + class OOptionGroupLayouter { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > @@ -59,9 +59,9 @@ namespace dbp ); }; -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_OPTIONGROUPLAYOUTER_HXX_ diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index 3596c50578a0..7e3d8fbcbb34 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -28,14 +28,14 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -//......................................................................... + namespace dbp { -//......................................................................... - //===================================================================== + + //= IServiceInfo - //===================================================================== + /** interface for the SERVICEINFO template parameter of the OUnoAutoPilot class */ struct IServiceInfo @@ -46,9 +46,9 @@ namespace dbp getServiceNames() const; }; - //===================================================================== + //= OUnoAutoPilot - //===================================================================== + typedef ::svt::OGenericUnoDialog OUnoAutoPilot_Base; template <class TYPE, class SERVICEINFO> class OUnoAutoPilot @@ -91,9 +91,9 @@ namespace dbp #include "unoautopilot.inl" -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_UNOAUTOPILOT_HXX_ diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index d42bfacf1480..a602fe3fc577 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -19,16 +19,16 @@ // no include protection // this file is included from unoautopilot.hxx directly -//===================================================================== + //= OUnoAutoPilot -//===================================================================== + template <class TYPE, class SERVICEINFO> OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) :OUnoAutoPilot_Base(_rxORB) { } -//--------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { @@ -36,42 +36,42 @@ template <class TYPE, class SERVICEINFO> return aId.getImplementationId(); } -//--------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) { return *(new OUnoAutoPilot<TYPE, SERVICEINFO>( comphelper::getComponentContext(_rxFactory) )); } -//--------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> ::rtl::OUString SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return getImplementationName_Static(); } -//--------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> ::rtl::OUString OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationName_Static() throw(::com::sun::star::uno::RuntimeException) { return SERVICEINFO().getImplementationName(); } -//--------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> ::comphelper::StringSequence SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -//--------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> ::comphelper::StringSequence OUnoAutoPilot<TYPE, SERVICEINFO>::getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException) { return SERVICEINFO().getServiceNames(); } -//--------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) { @@ -79,14 +79,14 @@ template <class TYPE, class SERVICEINFO> return xInfo; } -//--------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> ::cppu::IPropertyArrayHelper& OUnoAutoPilot<TYPE, SERVICEINFO>::getInfoHelper() { return *const_cast<OUnoAutoPilot*>(this)->getArrayHelper(); } -//-------------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> ::cppu::IPropertyArrayHelper* OUnoAutoPilot<TYPE, SERVICEINFO>::createArrayHelper( ) const { @@ -95,14 +95,14 @@ template <class TYPE, class SERVICEINFO> return new ::cppu::OPropertyArrayHelper(aProps); } -//-------------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent) { return new TYPE(_pParent, m_xObjectModel, m_aContext); } -//-------------------------------------------------------------------------- + template <class TYPE, class SERVICEINFO> void OUnoAutoPilot<TYPE, SERVICEINFO>::implInitialize(const com::sun::star::uno::Any& _rValue) { diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx index 6f23877f4468..ec4ea9f3202c 100644 --- a/extensions/source/dbpilots/wizardcontext.hxx +++ b/extensions/source/dbpilots/wizardcontext.hxx @@ -33,14 +33,14 @@ #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/frame/XModel.hpp> -//......................................................................... + namespace dbp { -//......................................................................... - //===================================================================== + + //= OControlWizardContext - //===================================================================== + struct OControlWizardContext { // the global data source context @@ -80,9 +80,9 @@ namespace dbp sal_Bool bEmbedded; }; -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_ diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index 12e706d78cf6..e52eb28b6d87 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -46,16 +46,16 @@ extern "C" void SAL_CALL createRegistryInfo_OGridWizard() > aAutoRegistration; } -//......................................................................... + namespace dbp { -//......................................................................... + using namespace ::com::sun::star::uno; - //===================================================================== + //= OGroupBoxSI - //===================================================================== + OUString OGroupBoxSI::getImplementationName() const { @@ -70,9 +70,9 @@ namespace dbp return aReturn; } - //===================================================================== + //= OListComboSI - //===================================================================== + OUString OListComboSI::getImplementationName() const { @@ -87,9 +87,9 @@ namespace dbp return aReturn; } - //===================================================================== + //= OGridSI - //===================================================================== + OUString OGridSI::getImplementationName() const { @@ -104,8 +104,8 @@ namespace dbp return aReturn; } -//......................................................................... + } // namespace dbp -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx index e952fbae61a6..fbcc9a785c24 100644 --- a/extensions/source/dbpilots/wizardservices.hxx +++ b/extensions/source/dbpilots/wizardservices.hxx @@ -23,14 +23,14 @@ #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> -//......................................................................... + namespace dbp { -//......................................................................... - //===================================================================== + + //= OGroupBoxSI - //===================================================================== + /// service info for the group box wizard struct OGroupBoxSI { @@ -40,9 +40,9 @@ namespace dbp getServiceNames() const; }; - //===================================================================== + //= OListComboSI - //===================================================================== + /// service info for the list/combo box wizard struct OListComboSI { @@ -52,9 +52,9 @@ namespace dbp getServiceNames() const; }; - //===================================================================== + //= OGridSI - //===================================================================== + /// service info for the grid wizard struct OGridSI { @@ -64,9 +64,9 @@ namespace dbp getServiceNames() const; }; -//......................................................................... + } // namespace dbp -//......................................................................... + #endif // _EXTENSIONS_DBW_WIZARDSERVICES_HXX_ diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index 57c29dc34b58..2b8afdbd6652 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -28,10 +28,10 @@ ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() -//......................................................................... + namespace COMPMOD_NAMESPACE { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -39,9 +39,9 @@ namespace COMPMOD_NAMESPACE using namespace ::comphelper; using namespace ::cppu; - //========================================================================= + //= OModuleImpl - //========================================================================= + /** implementation for <type>OModule</type>. not threadsafe, has to be guarded by it's owner */ class OModuleImpl @@ -93,9 +93,9 @@ namespace COMPMOD_NAMESPACE return m_pResources; } - //========================================================================= + //= OModule - //========================================================================= + ::osl::Mutex OModule::s_aMutex; sal_Int32 OModule::s_nClients = 0; OModuleImpl* OModule::s_pImpl = NULL; @@ -276,8 +276,8 @@ namespace COMPMOD_NAMESPACE } -//......................................................................... + } // namespace COMPMOD_NAMESPACE -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index b34a84fcf87a..2f2e5ad0ad5b 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -39,10 +39,10 @@ class ResMgr; -//......................................................................... + namespace COMPMOD_NAMESPACE { -//......................................................................... + typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( @@ -53,9 +53,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService rtl_ModuleCount* ); - //========================================================================= + //= OModule - //========================================================================= + class OModuleImpl; class OModule { @@ -140,9 +140,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService static void ensureImpl(); }; - //========================================================================= + //= OModuleResourceClient - //========================================================================= + /** base class for objects which uses any global module-specific resources */ class OModuleResourceClient @@ -152,9 +152,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService ~OModuleResourceClient() { OModule::revokeClient(); } }; - //========================================================================= + //= ModuleRes - //========================================================================= + /** specialized ResId, using the resource manager provided by the global module */ class ModuleRes : public ::ResId @@ -163,9 +163,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } }; - //========================================================================== + //= OMultiInstanceAutoRegistration - //========================================================================== + template <class TYPE> class OMultiInstanceAutoRegistration { @@ -205,9 +205,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService OModule::revokeComponent(TYPE::getImplementationName_Static()); } - //========================================================================== + //= OOneInstanceAutoRegistration - //========================================================================== + template <class TYPE> class OOneInstanceAutoRegistration { @@ -247,9 +247,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService OModule::revokeComponent(TYPE::getImplementationName_Static()); } -//......................................................................... + } // namespace COMPMOD_NAMESPACE -//......................................................................... + #endif // _EXTENSIONS_COMPONENT_MODULE_HXX_ diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index e9341e51956c..cd88ed1055fe 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -36,10 +36,10 @@ #include <stdio.h> -//........................................................................ + namespace logging { -//........................................................................ + using ::com::sun::star::logging::XConsoleHandler; using ::com::sun::star::lang::XServiceInfo; @@ -60,9 +60,9 @@ namespace logging namespace LogLevel = ::com::sun::star::logging::LogLevel; - //==================================================================== + //= ConsoleHandler - declaration - //==================================================================== + typedef ::cppu::WeakComponentImplHelper3 < XConsoleHandler , XServiceInfo @@ -116,9 +116,9 @@ namespace logging void leaveMethod( MethodGuard::Access ); }; - //==================================================================== + //= ConsoleHandler - implementation - //==================================================================== + ConsoleHandler::ConsoleHandler( const Reference< XComponentContext >& _rxContext ) :ConsoleHandler_Base( m_aMutex ) @@ -312,8 +312,8 @@ namespace logging static OAutoRegistration< ConsoleHandler > aAutoRegistration; } -//........................................................................ + } // namespace logging -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index 928fb71d8d7e..4b4f05eda1ec 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -43,10 +43,10 @@ #include <memory> -//........................................................................ + namespace logging { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::logging::LogRecord; @@ -67,9 +67,9 @@ namespace logging using ::com::sun::star::util::XStringSubstitution; using ::com::sun::star::beans::NamedValue; - //==================================================================== + //= FileHandler - declaration - //==================================================================== + typedef ::cppu::WeakComponentImplHelper3 < XLogHandler , XServiceInfo , XInitialization @@ -144,9 +144,9 @@ namespace logging void impl_doStringsubstitution_nothrow( OUString& _inout_rURL ); }; - //==================================================================== + //= FileHandler - implementation - //==================================================================== + FileHandler::FileHandler( const Reference< XComponentContext >& _rxContext ) :FileHandler_Base( m_aMutex ) @@ -414,8 +414,8 @@ namespace logging static OAutoRegistration< FileHandler > aAutoRegistration; } -//........................................................................ + } // namespace logging -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/log_module.cxx b/extensions/source/logging/log_module.cxx index a63076e7b12e..fac6e53214f6 100644 --- a/extensions/source/logging/log_module.cxx +++ b/extensions/source/logging/log_module.cxx @@ -20,10 +20,10 @@ #include "log_module.hxx" #include <rtl/instance.hxx> -//........................................................................ + namespace logging { -//........................................................................ + struct LogModuleCreator { @@ -44,8 +44,8 @@ namespace logging return theLogModuleInstance::get().m_aLogModule; } -//........................................................................ + } // namespace logging -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/log_module.hxx b/extensions/source/logging/log_module.hxx index 9ddcfaf63f89..6981a90edc89 100644 --- a/extensions/source/logging/log_module.hxx +++ b/extensions/source/logging/log_module.hxx @@ -22,10 +22,10 @@ #include <comphelper/componentmodule.hxx> -//........................................................................ + namespace logging { -//........................................................................ + class LogModule : public ::comphelper::OModule { @@ -77,9 +77,9 @@ namespace logging } }; -//........................................................................ + } // namespace logging -//........................................................................ + #endif // EXTENSIONS_LOG_MODULE_HXX diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx index 35eb937f0e0c..74231ba6622a 100644 --- a/extensions/source/logging/log_services.cxx +++ b/extensions/source/logging/log_services.cxx @@ -19,10 +19,10 @@ #include "log_module.hxx" -//........................................................................ + namespace logging { -//........................................................................ + extern void createRegistryInfo_LoggerPool(); @@ -41,9 +41,9 @@ namespace logging createRegistryInfo_CsvFormatter(); } -//........................................................................ + } // namespace logging -//........................................................................ + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL log_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index dac25367497d..2c9b462c2464 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -42,10 +42,10 @@ #include <vector> #include <sal/macros.h> -//........................................................................ + namespace logging { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::logging::XLogger; @@ -305,8 +305,8 @@ namespace logging } } -//........................................................................ + } // namespace logging -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/loggerconfig.hxx b/extensions/source/logging/loggerconfig.hxx index 5b7c9085db64..f43c995a5c98 100644 --- a/extensions/source/logging/loggerconfig.hxx +++ b/extensions/source/logging/loggerconfig.hxx @@ -23,10 +23,10 @@ #include <com/sun/star/logging/XLogger.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -//........................................................................ + namespace logging { -//........................................................................ + /** initializes the given logger from the configuration @@ -44,9 +44,9 @@ namespace logging const ::com::sun::star::uno::Reference< ::com::sun::star::logging::XLogger >& _rxLogger ); -//........................................................................ + } // namespace logging -//........................................................................ + #endif // EXTENSIONS_LOGGERCONFIG_HXX diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index eac7d59eda18..2547f87468ee 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -28,10 +28,10 @@ #include <tools/diagnose_ex.h> #include <rtl/tencinfo.h> -//........................................................................ + namespace logging { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; @@ -46,9 +46,9 @@ namespace logging namespace LogLevel = ::com::sun::star::logging::LogLevel; - //==================================================================== + //= LogHandlerHelper - //==================================================================== + LogHandlerHelper::LogHandlerHelper( const Reference< XComponentContext >& _rxContext, ::osl::Mutex& _rMutex, ::cppu::OBroadcastHelper& _rBHelper ) :m_eEncoding( RTL_TEXTENCODING_UTF8 ) @@ -182,8 +182,8 @@ namespace logging return false; } -//........................................................................ + } // namespace logging -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx index d2d2a4936b7e..422b777bd003 100644 --- a/extensions/source/logging/loghandler.hxx +++ b/extensions/source/logging/loghandler.hxx @@ -28,14 +28,14 @@ #include <cppuhelper/interfacecontainer.hxx> #include <rtl/string.hxx> -//........................................................................ + namespace logging { -//........................................................................ - //==================================================================== + + //= - //==================================================================== + class LogHandlerHelper { private: @@ -137,9 +137,9 @@ namespace logging void initFromSettings( const ::comphelper::NamedValueCollection& _rSettings ); }; -//........................................................................ + } // namespace logging -//........................................................................ + #endif // LOGHANDLER_HXX diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx index b7ee720452e9..a8ebc64dbb17 100644 --- a/extensions/source/logging/logrecord.cxx +++ b/extensions/source/logging/logrecord.cxx @@ -24,17 +24,17 @@ #include <osl/thread.hxx> #include <osl/diagnose.h> -//........................................................................ + namespace logging { -//........................................................................ + using ::com::sun::star::logging::LogRecord; using ::com::sun::star::util::DateTime; - //==================================================================== + //= helper - //==================================================================== + namespace { @@ -83,8 +83,8 @@ namespace logging ); } -//........................................................................ + } // namespace logging -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx index 772969371077..20389a085bf6 100644 --- a/extensions/source/logging/logrecord.hxx +++ b/extensions/source/logging/logrecord.hxx @@ -24,14 +24,14 @@ #include <osl/interlck.h> -//........................................................................ + namespace logging { -//........................................................................ - //==================================================================== + + //= helper - //==================================================================== + ::com::sun::star::logging::LogRecord createLogRecord( const OUString& _rLoggerName, const OUString& _rClassName, @@ -51,9 +51,9 @@ namespace logging return createLogRecord( _rLoggerName, OUString(), OUString(), _rMessage, _nLogLevel, _nEventNumber ); } -//........................................................................ + } // namespace logging -//........................................................................ + #endif // LOGRECORD_HXX diff --git a/extensions/source/logging/methodguard.hxx b/extensions/source/logging/methodguard.hxx index aa5a9474bfbe..ce2d29cf707f 100644 --- a/extensions/source/logging/methodguard.hxx +++ b/extensions/source/logging/methodguard.hxx @@ -20,14 +20,14 @@ #ifndef EXTENSIONS_METHODGUARD_HXX #define EXTENSIONS_METHODGUARD_HXX -//........................................................................ + namespace logging { -//........................................................................ - //==================================================================== + + //= ComponentMethodGuard - //==================================================================== + template < class COMPONENT > class ComponentMethodGuard { @@ -54,9 +54,9 @@ namespace logging } }; -//........................................................................ + } // namespace logging -//........................................................................ + #endif // EXTENSIONS_METHODGUARD_HXX diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx index f3420f7cd0e6..be33e2a4183c 100644 --- a/extensions/source/logging/plaintextformatter.cxx +++ b/extensions/source/logging/plaintextformatter.cxx @@ -33,10 +33,10 @@ #include <osl/thread.h> -//........................................................................ + namespace logging { -//........................................................................ + using ::com::sun::star::logging::XLogFormatter; using ::com::sun::star::uno::XComponentContext; @@ -47,9 +47,9 @@ namespace logging using ::com::sun::star::logging::LogRecord; using ::com::sun::star::uno::XInterface; - //==================================================================== + //= PlainTextFormatter - declaration - //==================================================================== + typedef ::cppu::WeakImplHelper2 < XLogFormatter , XServiceInfo > PlainTextFormatter_Base; @@ -76,9 +76,9 @@ namespace logging static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); }; - //==================================================================== + //= PlainTextFormatter - implementation - //==================================================================== + PlainTextFormatter::PlainTextFormatter() { @@ -194,8 +194,8 @@ namespace logging static OAutoRegistration< PlainTextFormatter > aAutoRegistration; } -//........................................................................ + } // namespace logging -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m b/extensions/source/macosx/spotlight/OOoContentDataParser.m index 07368aebc15e..d394115a3010 100644 --- a/extensions/source/macosx/spotlight/OOoContentDataParser.m +++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m @@ -29,24 +29,24 @@ shouldReadCharacters = NO; textContent = nil; runningTextContent = nil; - + return self; } - + return nil; } - (void)parseXML:(NSData*)data intoDictionary:(NSMutableDictionary*)dict { mdiValues = dict; - + //NSLog(@"data: %@ %d", data, [data length]); - + //init parser settings shouldReadCharacters = NO; - + NSXMLParser *parser = [[NSXMLParser alloc] initWithData:data]; - + // Once again... // class 'OOoContentDataParser' does not implement the 'NSXMLParserDelegate' protocol // So instead of this: @@ -56,9 +56,9 @@ [parser setShouldResolveExternalEntities:NO]; [parser parse]; - + [parser release]; - + //NSLog(@"finished"); } @@ -77,11 +77,11 @@ } else { return; } - + //NSLog(@"start element %@", elementName); } -- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName +- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName { (void) parser; // unused (void) elementName; // unused @@ -95,7 +95,7 @@ [textContent appendString:@" "]; } //NSLog(@"end"); - + [textContent appendString:[NSString stringWithString:runningTextContent]]; [runningTextContent release]; } @@ -109,20 +109,20 @@ return; } //NSLog(string); - + [runningTextContent appendString:string]; - + //NSLog(@"read: %@", string); - + } - (void)parser:(NSXMLParser *)parser parseErrorOccurred:(NSError *)parseError { //NSLog(@"parsing finished with error"); - NSLog(@"An error occurred parsing the document. (Error %li, Description: %@, Line: %li, Column: %li)", (long) [parseError code], + NSLog(@"An error occurred parsing the document. (Error %li, Description: %@, Line: %li, Column: %li)", (long) [parseError code], [[parser parserError] localizedDescription], (long) [parser lineNumber], (long) [parser columnNumber]); - + if (runningTextContent != nil) { [runningTextContent release]; } diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m b/extensions/source/macosx/spotlight/OOoMetaDataParser.m index 34e3652b34f6..4d2b95d72fff 100644 --- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m +++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m @@ -30,7 +30,7 @@ static NSDictionary *metaXML2MDIKeys; + (void)initialize { static BOOL isInitialized = NO; - + if (isInitialized == NO) { //set up the meta elements with only one value NSMutableSet *temp = [NSMutableSet new]; @@ -39,7 +39,7 @@ static NSDictionary *metaXML2MDIKeys; [temp addObject:@"dc:description"]; [temp addObject:@"meta:user-defined"]; singleValueXMLElements = [[NSSet setWithSet:temp] retain]; - + //set up the meta elements that can have more than one value [temp removeAllObjects]; [temp addObject:@"dc:subject"]; @@ -48,7 +48,7 @@ static NSDictionary *metaXML2MDIKeys; [temp addObject:@"dc:creator"]; multiValueXMLElements = [[NSSet setWithSet:temp] retain]; [temp release]; - + //set up the map to store the values with the correct MDI keys NSMutableDictionary *tempDict = [NSMutableDictionary new]; [tempDict setObject:(NSString*)kMDItemTitle forKey:@"dc:title"]; @@ -63,7 +63,7 @@ static NSDictionary *metaXML2MDIKeys; [tempDict setObject:@"org_openoffice_opendocument_custominfo4" forKey:@"Info 4"]; metaXML2MDIKeys = [[NSDictionary dictionaryWithDictionary:tempDict] retain]; [tempDict release]; - + isInitialized = YES; } } @@ -73,35 +73,35 @@ static NSDictionary *metaXML2MDIKeys; if ((self = [super init]) != nil) { shouldReadCharacters = NO; textCurrentElement = nil; - + return self; } - + return nil; } - (void)parseXML:(NSData*)data intoDictionary:(NSMutableDictionary*)dict { metaValues = dict; - + //NSLog(@"data: %@ %d", data, [data length]); - + //init parser settings shouldReadCharacters = NO; - + NSXMLParser *parser = [[NSXMLParser alloc] initWithData:data]; - + // class 'OOoMetaDataParser' does not implement the 'NSXMLParserDelegate' protocol // So instead of this: // [parser setDelegate:self]; // do this: objc_msgSend(parser, @selector(setDelegate:), self); - + [parser setShouldResolveExternalEntities:NO]; [parser parse]; - + [parser release]; - + //NSLog(@"finished parsing meta"); } @@ -121,7 +121,7 @@ static NSDictionary *metaXML2MDIKeys; shouldReadCharacters = NO; return; } - + if (shouldReadCharacters == YES) { textCurrentElement = [NSMutableString new]; isCustom = [elementName isEqualToString:@"meta:user-defined"]; @@ -134,7 +134,7 @@ static NSDictionary *metaXML2MDIKeys; //NSLog(@"start element %@", elementName); } -- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName +- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName { (void) parser; // unused (void) namespaceURI; // unused @@ -148,11 +148,11 @@ static NSDictionary *metaXML2MDIKeys; mdiName = (NSString*)[metaXML2MDIKeys objectForKey:elementName]; } //NSLog(@"mdiName: %@", mdiName); - + if (mdiName == nil) { return; } - + if ([singleValueXMLElements containsObject:elementName] == YES) { [metaValues setObject:textCurrentElement forKey:mdiName]; } else { @@ -175,7 +175,7 @@ static NSDictionary *metaXML2MDIKeys; [customAttribute release]; } } - + //cleanup part 2 shouldReadCharacters = NO; isCustom = NO; @@ -188,18 +188,18 @@ static NSDictionary *metaXML2MDIKeys; if (shouldReadCharacters == NO) { return; } - - // this delegate method might be called several times for a single element, + + // this delegate method might be called several times for a single element, // so we have to collect the received data [textCurrentElement appendString:string]; - + //NSLog(@"chars read: %@", string); } - (void)parser:(NSXMLParser *)parser parseErrorOccurred:(NSError *)parseError { //NSLog(@"parsing finished with error"); - NSLog(@"Error %li, Description: %@, Line: %li, Column: %li", (long) [parseError code], + NSLog(@"Error %li, Description: %@, Line: %li, Column: %li", (long) [parseError code], [[parser parserError] localizedDescription], (long) [parser lineNumber], (long) [parser columnNumber]); } diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m index dd599fbb6b01..dde2c473437b 100644 --- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m +++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m @@ -366,10 +366,10 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name) [temp setObject:@"OpenDocument Drawing Template" forKey:@"org.oasis.opendocument.graphics-template"]; [temp setObject:@"OpenOffice.org 1.0 Database" forKey:@"org.openoffice.database"]; [temp setObject:@"OpenDocument Chart" forKey:@"org.oasis.opendocument.chart"]; - + uti2kind = [[NSDictionary dictionaryWithDictionary:temp] retain]; [temp release]; - + isInitialized = YES; } } @@ -379,21 +379,21 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name) { //NSLog(contentTypeUTI); //NSLog(pathToFile); - + NSString *itemKind = [uti2kind objectForKey:contentTypeUTI]; if (itemKind != nil) { [attributes setObject:itemKind forKey:(NSString*)kMDItemKind]; } - + //first check to see if this is a valid zipped file that contains a file "meta.xml" NSFileHandle *unzipFile = [self openZipFileAtPath:pathToFile]; - // + if (unzipFile == nil) { //NSLog(@"zip file not open"); return YES; } - + //first get the metadata NSData *metaData = [self metaDataFileFromZip:unzipFile]; if (metaData == nil) { @@ -402,7 +402,7 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name) } [metaData retain]; - + OOoMetaDataParser *parser = [OOoMetaDataParser new]; if (parser != nil) { //parse and extract the data @@ -411,16 +411,16 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name) [metaData release]; [parser release]; - + //and now get the content NSData *contentData = [self contentDataFileFromZip:unzipFile]; if (contentData == nil) { [unzipFile closeFile]; return YES; } - + [contentData retain]; - + OOoContentDataParser *parser2 = [OOoContentDataParser new]; if (parser2 != nil) { //parse and extract the data @@ -431,7 +431,7 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name) [parser2 release]; [unzipFile closeFile]; - + return YES; } @@ -439,12 +439,12 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name) - (NSFileHandle*)openZipFileAtPath:(NSString*)pathToFile { NSFileHandle* unzipFile = nil; - + if ([pathToFile length] != 0) { unzipFile = [NSFileHandle fileHandleForReadingAtPath: pathToFile]; } - + if (unzipFile == nil) { //NSLog(@"Cannot open %s",zipfilename); @@ -455,13 +455,13 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name) { [unzipFile closeFile]; return nil; - } + } //NSLog(@"%s opened",zipfilename); - + return unzipFile; } -/* metaDataFileFromZip extracts the file meta.xml from the zip file and returns it as an NSData* structure +/* metaDataFileFromZip extracts the file meta.xml from the zip file and returns it as an NSData* structure or nil if the metadata is not present */ - (NSData*) metaDataFileFromZip:(NSFileHandle*)unzipFile { @@ -470,7 +470,7 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name) return getUncompressedData(unzipFile, @"meta.xml"); } -/* contentDataFileFromZip extracts the file content.xml from the zip file and returns it as an NSData* structure +/* contentDataFileFromZip extracts the file content.xml from the zip file and returns it as an NSData* structure or nil if the metadata is not present */ - (NSData*) contentDataFileFromZip:(NSFileHandle*)unzipFile { diff --git a/extensions/source/ole/jscriptclasses.cxx b/extensions/source/ole/jscriptclasses.cxx index 58fadbea3ca5..b323996404e0 100644 --- a/extensions/source/ole/jscriptclasses.cxx +++ b/extensions/source/ole/jscriptclasses.cxx @@ -19,9 +19,9 @@ #include "jscriptclasses.hxx" -//======================================================================== + // JScriptValue -//======================================================================== + JScriptValue::JScriptValue(): m_bOutParam(0), m_bInOutParam(0) { } @@ -207,9 +207,9 @@ STDMETHODIMP JScriptValue::GetValue( BSTR* type, VARIANT *value) return hr; } -//########################################################################################## + // JScriptOutValue -//########################################################################################## + JScriptOutParam::JScriptOutParam() { @@ -285,7 +285,7 @@ STDMETHODIMP JScriptOutParam::Invoke( DISPID dispIdMember, else ret= E_POINTER; break; - case 1: // + case 1: if( wFlags & DISPATCH_PROPERTYGET && pVarResult) { if( FAILED( VariantCopy( pVarResult, &m_varValue))) diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx index d1813555442e..2c07ebf970e4 100644 --- a/extensions/source/ole/oledll.cxx +++ b/extensions/source/ole/oledll.cxx @@ -36,7 +36,7 @@ CComModule _Module; BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() -///////////////////////////////////////////////////////////////////////////// + // DLL Entry Point extern "C" diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 5aa6df9c3c01..ab615a2ec5dc 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -132,7 +132,7 @@ public: protected: - // ---------------------------------------------------------------------------- + virtual Any invokeWithDispIdUnoTlb(const OUString& sFunctionName, const Sequence< Any >& Params, Sequence<sal_Int16 >& OutParamIndex, @@ -222,7 +222,7 @@ protected: // asking for the property "_environment". If it has the value "JScript" // (case insensitive) then the IDispatch is considered a JScript object. sal_Bool isJScriptObject(); - // ------------------------------------------------------------------------------- + // If UNO interfaces are implemented in JScript objects, VB or C++ COM objects // and those are passed as parameter to a UNO interface function, then diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 546d7965616c..12923dc02d39 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -272,7 +272,7 @@ bool convertSelfToCom( T& unoInterface, VARIANT * pVar) // some services or types for which the local factory is used. The exceptions // are: all structs. // Param anyObject - contains the object ( interface, struct) for what we need an invocation object. -// + template<class T> Reference< XSingleServiceFactory > UnoConversionUtilities<T>::getInvocationFactory(const Any& anyObject) { diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm index 304e716b685e..64e6d879c650 100644 --- a/extensions/source/plugin/aqua/sysplug.mm +++ b/extensions/source/plugin/aqua/sysplug.mm @@ -289,7 +289,7 @@ struct FakeEventRecord : public EventRecord @end -//-------------------------------------------------------------------------------------------------- + MacPluginComm::MacPluginComm( const rtl::OUString& i_rMimetype, const rtl::OUString& i_rBundle, NSView* i_pParent ) : PluginComm( OUStringToOString( i_rBundle, RTL_TEXTENCODING_UTF8 ) ), m_xBundle( NULL ), @@ -344,7 +344,7 @@ MacPluginComm::MacPluginComm( const rtl::OUString& i_rMimetype, const rtl::OUStr execute(); } -//-------------------------------------------------------------------------------------------------- + MacPluginComm::~MacPluginComm() { if( m_hPlugLib ) @@ -362,7 +362,7 @@ MacPluginComm::~MacPluginComm() CFRelease( m_xBundle ); } -//-------------------------------------------------------------------------------------------------- + sal_Bool MacPluginComm::retrieveFunction( const char* i_pName, void** o_ppFunc ) const { if( ! m_hPlugLib || ! o_ppFunc ) @@ -403,7 +403,7 @@ IMPL_LINK_NOARG(MacPluginComm, NullTimerHdl) return 0; } -//-------------------------------------------------------------------------------------------------- + long MacPluginComm::doIt() { @@ -588,7 +588,7 @@ long MacPluginComm::doIt() return nRet; } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_Destroy( XPlugin_Impl* i_pImpl, NPSavedData** save ) { // remove from NullEvent timer @@ -618,7 +618,7 @@ NPError MacPluginComm::NPP_Destroy( NPP instance, NPSavedData** save ) return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason ) { DBG_ASSERT( m_aNPPfuncs.destroystream, "### NPP_DestroyStream(): null pointer in NPP functions table!" ); @@ -629,7 +629,7 @@ NPError MacPluginComm::NPP_DestroyStream( NPP instance, NPStream* stream, NPErro return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData *saved ) { @@ -659,7 +659,7 @@ NPError MacPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mo return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype ) { @@ -673,7 +673,7 @@ NPError MacPluginComm::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* s return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + void MacPluginComm::NPP_Print( NPP instance, NPPrint* platformPrint ) { DBG_ASSERT( m_aNPPfuncs.print, "### NPP_Print(): null pointer in NPP functions table!" ); @@ -683,7 +683,7 @@ void MacPluginComm::NPP_Print( NPP instance, NPPrint* platformPrint ) execute(); } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_SetWindow( NPP instance, NPWindow* window ) { DBG_ASSERT( m_aNPPfuncs.setwindow, "### NPP_SetWindow(): null pointer in NPP functions table!" ); @@ -693,7 +693,7 @@ NPError MacPluginComm::NPP_SetWindow( NPP instance, NPWindow* window ) return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_HandleEvent( NPP instance, void* event ) { DBG_ASSERT( m_aNPPfuncs.event, "### NPP_HandleEvent(): null pointer in NPP functions table!" ); @@ -703,7 +703,7 @@ NPError MacPluginComm::NPP_HandleEvent( NPP instance, void* event ) return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + void MacPluginComm::NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname ) { DBG_ASSERT( m_aNPPfuncs.asfile, "### NPP_StreamAsFile(): null pointer in NPP functions table!" ); @@ -714,7 +714,7 @@ void MacPluginComm::NPP_StreamAsFile( NPP instance, NPStream* stream, const char execute(); } -//-------------------------------------------------------------------------------------------------- + void MacPluginComm::NPP_URLNotify( NPP instance, const char* url, NPReason reason, void* notifyData ) { DBG_ASSERT( m_aNPPfuncs.urlnotify, "### NPP_URLNotify(): null pointer in NPP functions table!" ); @@ -726,7 +726,7 @@ void MacPluginComm::NPP_URLNotify( NPP instance, const char* url, NPReason reaso execute(); } -//-------------------------------------------------------------------------------------------------- + int32_t MacPluginComm::NPP_Write( NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer ) { DBG_ASSERT( m_aNPPfuncs.write, "### NPP_Write(): null pointer in NPP functions table!" ); @@ -739,7 +739,7 @@ int32_t MacPluginComm::NPP_Write( NPP instance, NPStream* stream, int32_t offset return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + int32_t MacPluginComm::NPP_WriteReady( NPP instance, NPStream* stream ) { DBG_ASSERT( m_aNPPfuncs.writeready, "### NPP_WriteReady(): null pointer in NPP functions table!" ); @@ -749,7 +749,7 @@ int32_t MacPluginComm::NPP_WriteReady( NPP instance, NPStream* stream ) return execute(); } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_GetValue( NPP instance, NPPVariable variable, void *ret_value ) { DBG_ASSERT( m_aNPPfuncs.getvalue, "### NPP_GetValue(): null pointer in NPP functions table!" ); @@ -760,7 +760,7 @@ NPError MacPluginComm::NPP_GetValue( NPP instance, NPPVariable variable, void *r return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_SetValue( NPP instance, NPNVariable variable, void *set_value ) { DBG_ASSERT( m_aNPPfuncs.setvalue, "### NPP_SetValue(): null pointer in NPP functions table!" ); @@ -771,27 +771,27 @@ NPError MacPluginComm::NPP_SetValue( NPP instance, NPNVariable variable, void *s return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + void * MacPluginComm::NPP_GetJavaClass() { OSL_FAIL( "no java class available!" ); return 0; } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_Initialize() { return NPERR_NO_ERROR; } -//-------------------------------------------------------------------------------------------------- + void MacPluginComm::NPP_Shutdown() { m_eCall = eNPP_Shutdown; execute(); } -//-------------------------------------------------------------------------------------------------- + NPError MacPluginComm::NPP_SetWindow( XPlugin_Impl* i_pImpl ) { // update window NPWindow from view diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index f0c55cfdefff..b5039b1096dd 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -97,7 +97,7 @@ const Sequence< OUString >& PluginManager::getAdditionalSearchPaths() return aPaths; } -//================================================================================================== + Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) throw( Exception ) { Reference< XInterface > xService = *new XPluginManager_Impl( comphelper::getComponentContext(rSMgr) ); diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx index ddc92b955701..48920c79a9e2 100644 --- a/extensions/source/plugin/base/multiplx.cxx +++ b/extensions/source/plugin/base/multiplx.cxx @@ -29,9 +29,9 @@ #include <osl/diagnose.h> #include <plugin/multiplx.hxx> -// --------------------------------------------------------------------- + // class MRCListenerMultiplexerHelper -// --------------------------------------------------------------------- + MRCListenerMultiplexerHelper::MRCListenerMultiplexerHelper ( const Reference< ::com::sun::star::awt::XWindow > & rControl diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx index 56085ed6beb4..9fe78215d295 100644 --- a/extensions/source/plugin/base/plctrl.cxx +++ b/extensions/source/plugin/base/plctrl.cxx @@ -63,7 +63,7 @@ MRCListenerMultiplexerHelper* PluginControl_Impl::getMultiplexer() _pMultiplexer = new MRCListenerMultiplexerHelper( this, _xPeerWindow ); return _pMultiplexer; } -//================================================================================================== + void PluginControl_Impl::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw( RuntimeException, std::exception ) diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index a42ffce99c12..f773577c5f5f 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::uno; -//================================================================================================== + Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< ::com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ) { Reference< XInterface > xService = *new PluginModel(); diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx index f93300f34e34..c4ee3723b60c 100644 --- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx @@ -69,7 +69,7 @@ CFURLRef createURLFromPath( const OUString& i_rPath ); OUString CFURLtoOSLURL( CFURLRef i_xURL ); } -//================================================================================================== + class MacPluginComm : public PluginComm, public ::vcl::SolarThreadExecutor diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx index 67f5764e0ad0..8af8873db882 100644 --- a/extensions/source/plugin/inc/plugin/plctrl.hxx +++ b/extensions/source/plugin/inc/plugin/plctrl.hxx @@ -65,7 +65,7 @@ class SystemChildWindow; -//================================================================================================== + class PluginControl_Impl : public ::cppu::WeakAggImplHelper4< ::com::sun::star::awt::XControl, ::com::sun::star::awt::XWindow, diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx index 0c08e569902b..509c77e3a3f5 100644 --- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx @@ -56,7 +56,7 @@ #include <plugin/plcom.hxx> #include <vcl/threadex.hxx> -//================================================================================================== + class PluginComm_Impl : public PluginComm, public ::vcl::SolarThreadExecutor diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 88e36aea290c..28a4f0be52f2 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -25,18 +25,18 @@ ::pcr::OAutoRegistration< ::pcr::MasterDetailLinkDialog > aAutoRegistration; } -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; - //==================================================================== + //= MasterDetailLinkDialog - //==================================================================== + MasterDetailLinkDialog::MasterDetailLinkDialog(const Reference< XComponentContext >& _rxContext ) :OGenericUnoDialog( _rxContext ) @@ -143,8 +143,8 @@ namespace pcr MasterDetailLinkDialog_DBase::implInitialize(_rValue); } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 9f9e7b7935f8..917f31853487 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -20,18 +20,18 @@ #define PROPCTRLR_MASTERDETAILLINKDIALOG_HXX #include <svtools/genericunodialog.hxx> #include "modulepcr.hxx" -//........................................................................ + namespace pcr { -//........................................................................ + class MasterDetailLinkDialog; typedef ::svt::OGenericUnoDialog MasterDetailLinkDialog_DBase; typedef ::comphelper::OPropertyArrayUsageHelper< MasterDetailLinkDialog > MasterDetailLinkDialog_PBase; - //======================================================================== + //= MasterDetailLinkDialog - //======================================================================== + class MasterDetailLinkDialog : public MasterDetailLinkDialog_DBase ,public MasterDetailLinkDialog_PBase ,public PcrClient @@ -70,9 +70,9 @@ namespace pcr OUString m_sMasterLabel; }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // PROPCTRLR_MASTERDETAILLINKDIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index c9958d24f1ce..dacf0c54dc55 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -32,10 +32,10 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -//............................................................................ + namespace pcr { -//............................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; @@ -51,9 +51,9 @@ namespace pcr namespace PropertyLineElement = ::com::sun::star::inspection::PropertyLineElement; - //================================================================== + //= OBrowserLine - //================================================================== + DBG_NAME(OBrowserLine) @@ -513,8 +513,8 @@ namespace pcr } return 0; } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 32c34627fe7a..1c8b6e4d265f 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -29,14 +29,14 @@ namespace com { namespace sun { namespace star { namespace inspection { namespac const sal_Int16 CompleteLine = 0x4000; } } } } } -//............................................................................ + namespace pcr { -//............................................................................ + class OBrowserLine; - //======================================================================== + class IButtonClickListener { public: @@ -46,7 +46,7 @@ namespace pcr ~IButtonClickListener() {} }; - //======================================================================== + class OBrowserLine { private: @@ -126,9 +126,9 @@ namespace pcr void impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ); }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_BROWSERLINE_HXX_ diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index b0a3c0181402..8a05357f69f0 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -34,10 +34,10 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -//............................................................................ + namespace pcr { -//............................................................................ + #define FRAME_OFFSET 4 // TODO: find out what this is really for ... and check if it does make sense in the new @@ -57,9 +57,9 @@ namespace pcr namespace PropertyControlType = ::com::sun::star::inspection::PropertyControlType; - //================================================================== + //= ControlEvent - //================================================================== + enum ControlEventType { FOCUS_GAINED, @@ -79,9 +79,9 @@ namespace pcr } }; - //================================================================== + //= SharedNotifier - //================================================================== + class SharedNotifier { private: @@ -125,9 +125,9 @@ namespace pcr return s_pNotifier; } - //================================================================== + //= PropertyControlContext_Impl - //================================================================== + /** implementation for of <type scope="com::sun::star::inspection">XPropertyControlContext</type> which forwards all events to a non-UNO version of this interface */ @@ -343,9 +343,9 @@ namespace pcr } } - //================================================================== + //= OBrowserListBox - //================================================================== + DBG_NAME(OBrowserListBox) OBrowserListBox::OBrowserListBox( Window* pParent, WinBits nWinStyle) @@ -1036,7 +1036,7 @@ namespace pcr namespace { - //.............................................................. + void lcl_implDisposeControl_nothrow( const Reference< XPropertyControl >& _rxControl ) { if ( !_rxControl.is() ) @@ -1291,9 +1291,9 @@ namespace pcr return Control::Notify( _rNEvt ); } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 6b1da47ba8a9..120d4adf4fa7 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -37,10 +37,10 @@ #include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> -//............................................................................ + namespace pcr { -//............................................................................ + class IPropertyLineListener; class IPropertyControlObserver; @@ -48,9 +48,9 @@ namespace pcr class InspectorHelpWindow; class PropertyControlContext_Impl; - //======================================================================== + //= administrative structures for OBrowserListBox - //======================================================================== + typedef ::boost::shared_ptr< OBrowserLine > BrowserLinePointer; struct ListBoxLine { @@ -68,9 +68,9 @@ namespace pcr }; typedef ::std::vector< ListBoxLine > ListBoxLines; - //======================================================================== + //= IControlContext - //======================================================================== + /** non-UNO version of XPropertyControlContext */ class SAL_NO_VTABLE IControlContext @@ -84,9 +84,9 @@ namespace pcr ~IControlContext() {} }; - //======================================================================== + //= OBrowserListBox - //======================================================================== + class OBrowserListBox :public Control ,public IButtonClickListener ,public IControlContext @@ -219,9 +219,9 @@ namespace pcr using Window::Activate; }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_BROWSERLISTBOX_HXX_ diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index f30b4af85b45..c7b93688046d 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -19,19 +19,19 @@ #include "browserpage.hxx" -//............................................................................ + namespace pcr { -//............................................................................ + #define LAYOUT_BORDER_LEFT 3 #define LAYOUT_BORDER_TOP 3 #define LAYOUT_BORDER_RIGHT 3 #define LAYOUT_BORDER_BOTTOM 3 - //================================================================== + // class OBrowserPage - //================================================================== + OBrowserPage::OBrowserPage(Window* pParent,WinBits nWinStyle) :TabPage(pParent,nWinStyle) @@ -88,9 +88,9 @@ namespace pcr return m_aListBox.GetMinimumHeight() + LAYOUT_BORDER_TOP + LAYOUT_BORDER_BOTTOM; } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index 8c17e8eaafa0..d8001a229dd5 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -23,14 +23,14 @@ #include <vcl/tabpage.hxx> #include "browserlistbox.hxx" -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + //= OBrowserPage - //======================================================================== + class OBrowserPage : public TabPage { private: @@ -51,9 +51,9 @@ namespace pcr const OBrowserListBox& getListBox() const; }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_BROWSERPAGE_HXX_ diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 070092c478fb..3a8c732d13d9 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -23,18 +23,18 @@ #include <tools/debug.hxx> #include <boost/scoped_ptr.hpp> -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - //======================================================================== + //= class OPropertyBrowserView - //======================================================================== + DBG_NAME(OPropertyBrowserView) OPropertyBrowserView::OPropertyBrowserView(Window* _pParent, WinBits nBits) @@ -125,8 +125,8 @@ namespace pcr return ::com::sun::star::awt::Size( aSize.Width(), aSize.Height() ); } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 4d5b482e2d1b..ba6ab521774f 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -25,16 +25,16 @@ #include <tools/resid.hxx> #include <com/sun/star/awt/Size.hpp> -//............................................................................ + namespace pcr { -//............................................................................ + class OPropertyEditor; - //======================================================================== + //= - //======================================================================== + class OPropertyBrowserView : public Window { OPropertyEditor* m_pPropBox; @@ -67,9 +67,9 @@ namespace pcr }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_BROWSERVIEW_HXX_ diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index 925a4442d8d1..15482afa8b33 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -31,10 +31,10 @@ extern "C" void SAL_CALL createRegistryInfo_ButtonNavigationHandler() ::pcr::ButtonNavigationHandler::registerImplementation(); } -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -43,9 +43,9 @@ namespace pcr using namespace ::com::sun::star::frame; using namespace ::com::sun::star::inspection; - //==================================================================== + //= ButtonNavigationHandler - //==================================================================== + DBG_NAME( ButtonNavigationHandler ) ButtonNavigationHandler::ButtonNavigationHandler( const Reference< XComponentContext >& _rxContext ) @@ -274,8 +274,8 @@ namespace pcr return aReturn; } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index c96cc6359c75..7f10f78e6c95 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx @@ -22,14 +22,14 @@ #include "propertyhandler.hxx" -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= ButtonNavigationHandler - //==================================================================== + class ButtonNavigationHandler; typedef HandlerComponentBase< ButtonNavigationHandler > ButtonNavigationHandler_Base; /** a property handler for any virtual string properties @@ -71,9 +71,9 @@ namespace pcr SAL_CALL doDescribeSupportedProperties() const; }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_BUTTONNAVIGATIONHANDLER_HXX diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index bb73ccd5dc24..1eba11412570 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -33,10 +33,10 @@ extern "C" void SAL_CALL createRegistryInfo_CellBindingPropertyHandler() ::pcr::CellBindingPropertyHandler::registerImplementation(); } -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; @@ -48,9 +48,9 @@ namespace pcr using namespace ::com::sun::star::form::binding; using namespace ::comphelper; - //==================================================================== + //= CellBindingPropertyHandler - //==================================================================== + DBG_NAME( CellBindingPropertyHandler ) CellBindingPropertyHandler::CellBindingPropertyHandler( const Reference< XComponentContext >& _rxContext ) @@ -487,8 +487,8 @@ namespace pcr return Sequence< Property >( &(*aProperties.begin()), aProperties.size() ); } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index 92285ba3e90d..6467250d62e9 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -27,16 +27,16 @@ #include <memory> -//........................................................................ + namespace pcr { -//........................................................................ + class CellBindingHelper; class IPropertyEnumRepresentation; - //==================================================================== + //= CellBindingPropertyHandler - //==================================================================== + class CellBindingPropertyHandler; typedef HandlerComponentBase< CellBindingPropertyHandler > CellBindingPropertyHandler_Base; class CellBindingPropertyHandler : public CellBindingPropertyHandler_Base @@ -91,9 +91,9 @@ namespace pcr void impl_updateDependentProperty_nothrow( PropertyId _nPropId, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) const; }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHANDLER_HXX diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index 07a0ccb9865a..5af2c6e2a6ed 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -40,10 +40,10 @@ #include <functional> #include <algorithm> -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -59,7 +59,7 @@ namespace pcr namespace { - //.................................................................... + struct StringCompare : public ::std::unary_function< OUString, bool > { private: @@ -75,9 +75,9 @@ namespace pcr }; } - //======================================================================== + //= CellBindingHelper - //======================================================================== + CellBindingHelper::CellBindingHelper( const Reference< XPropertySet >& _rxControlModel, const Reference< XModel >& _rxContextDocument ) :m_xControlModel( _rxControlModel ) @@ -549,8 +549,8 @@ namespace pcr xSink->setListEntrySource( _rxSource ); } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx index 69aff206c3bd..532438dc9844 100644 --- a/extensions/source/propctrlr/cellbindinghelper.hxx +++ b/extensions/source/propctrlr/cellbindinghelper.hxx @@ -30,14 +30,14 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + //= CellBindingHelper - //======================================================================== + /** encapsulates functionality related to binding a form control to a spreadsheet cell */ class CellBindingHelper @@ -273,9 +273,9 @@ namespace pcr ) const SAL_THROW(()); }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // EXTENSIONS_PROPCTRLR_CELLBINDINGHELPER_HXX diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 218348fb8862..b0134e05139e 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -24,10 +24,10 @@ #include <vcl/combobox.hxx> #include <toolkit/helper/vclunohelper.hxx> -//............................................................................ + namespace pcr { -//............................................................................ + using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; @@ -36,9 +36,9 @@ namespace pcr using ::com::sun::star::uno::Exception; using ::com::sun::star::inspection::XPropertyControl; - //================================================================== + //= ControlHelper - //================================================================== + ControlHelper::ControlHelper( Window* _pControlWindow, sal_Int16 _nControlType, XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ) :m_pControlWindow( _pControlWindow ) @@ -188,8 +188,8 @@ namespace pcr return 0; } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index fe1405a604ec..1196d1d7bfb5 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -28,15 +28,15 @@ #include <vcl/window.hxx> class NotifyEvent; -//............................................................................ + namespace pcr { -//............................................................................ + class ControlHelper; - //======================================================================== + //= ControlWindow - //======================================================================== + template< class WINDOW > class ControlWindow : public WINDOW { @@ -61,9 +61,9 @@ namespace pcr inline virtual bool PreNotify( NotifyEvent& rNEvt ); }; - //======================================================================== + //= IModifyListener - //======================================================================== + class SAL_NO_VTABLE IModifyListener { public: @@ -73,9 +73,9 @@ namespace pcr ~IModifyListener() {} }; - //======================================================================== + //= ControlHelper - //======================================================================== + /** A helper class for implementing the <type scope="com::sun::star::inspection">XPropertyControl</type> or one of its derived interfaces. @@ -163,9 +163,9 @@ namespace pcr void impl_activateNextControl_nothrow() const; }; - //======================================================================== + //= CommonBehaviourControl - //======================================================================== + /** implements a base class for <type scope="com::sun::star::inspection">XPropertyControl</type> implementations, which delegates the generic functionality of this interface to a <type>ControlHelper</type> member. @@ -219,17 +219,17 @@ namespace pcr inline void impl_checkDisposed_throw(); }; - //======================================================================== + //= ControlWindow - implementation - //======================================================================== - //------------------------------------------------------------------------ + + template< class WINDOW > inline void ControlWindow< WINDOW >::setControlHelper( ControlHelper& _rControlHelper ) { m_pHelper = &_rControlHelper; } - //------------------------------------------------------------------------ + template< class WINDOW > inline bool ControlWindow< WINDOW >::PreNotify( NotifyEvent& rNEvt ) { @@ -238,10 +238,10 @@ namespace pcr return WindowType::PreNotify( rNEvt ); } - //======================================================================== + //= CommonBehaviourControl - implementation - //======================================================================== - //------------------------------------------------------------------------ + + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::CommonBehaviourControl ( sal_Int16 _nControlType, Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers ) :ComponentBaseClass( m_aMutex ) @@ -258,63 +258,63 @@ namespace pcr m_aImplControl.autoSizeWindow(); } - //-------------------------------------------------------------------- + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline ::sal_Int16 SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlType() throw (::com::sun::star::uno::RuntimeException) { return m_aImplControl.getControlType(); } - //-------------------------------------------------------------------- + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlContext() throw (::com::sun::star::uno::RuntimeException) { return m_aImplControl.getControlContext(); } - //-------------------------------------------------------------------- + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline void SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::setControlContext( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext >& _controlcontext ) throw (::com::sun::star::uno::RuntimeException) { m_aImplControl.setControlContext( _controlcontext ); } - //-------------------------------------------------------------------- + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlWindow() throw (::com::sun::star::uno::RuntimeException) { return m_aImplControl.getControlWindow(); } - //-------------------------------------------------------------------- + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline ::sal_Bool SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::isModified( ) throw (::com::sun::star::uno::RuntimeException) { return m_aImplControl.isModified(); } - //-------------------------------------------------------------------- + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline void SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::notifyModifiedValue( ) throw (::com::sun::star::uno::RuntimeException) { m_aImplControl.notifyModifiedValue(); } - //-------------------------------------------------------------------- + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline void SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::disposing() { m_aImplControl.dispose(); } - //-------------------------------------------------------------------- + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline void CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::modified() { m_aImplControl.setModified(); } - //-------------------------------------------------------------------- + template< class CONTROL_INTERFACE, class CONTROL_WINDOW > inline void CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::impl_checkDisposed_throw() { @@ -322,9 +322,9 @@ namespace pcr throw ::com::sun::star::lang::DisposedException( OUString(), *this ); } -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_COMMONCONTROL_HXX_ diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 8b5d88624fdb..4c610e8407c3 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -27,10 +27,10 @@ #include <algorithm> -//........................................................................ + namespace pcr { -//........................................................................ + using ::com::sun::star::uno::Exception; using ::com::sun::star::lang::DisposedException; @@ -45,9 +45,9 @@ namespace pcr namespace PropertyLineElement = ::com::sun::star::inspection::PropertyLineElement; - //==================================================================== + //= helper - //==================================================================== + namespace { struct HandlerLess : public ::std::binary_function < Reference< XPropertyHandler > @@ -61,19 +61,19 @@ namespace pcr } }; - //================================================================ + typedef ::std::set< OUString > StringBag; typedef ::std::map< sal_Int16, StringBag > MapIntToStringBag; } - //==================================================================== + //= callbacks for CachedInspectorUI - //==================================================================== + typedef void (ComposedPropertyUIUpdate::*FNotifySingleUIChange)(); - //==================================================================== + //= CachedInspectorUI - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::inspection::XObjectInspectorUI > CachedInspectorUI_Base; struct CachedInspectorUI : public CachedInspectorUI_Base @@ -380,9 +380,9 @@ namespace pcr m_rMaster.getDelegatorUI()->setHelpSectionText( _HelpText ); } - //==================================================================== + //= HandlerMap - //==================================================================== + typedef ::std::map < Reference< XPropertyHandler > , ::rtl::Reference< CachedInspectorUI > , HandlerLess @@ -392,9 +392,9 @@ namespace pcr ImplMapHandlerToUI aHandlers; }; - //==================================================================== + //= ComposedPropertyUIUpdate - //==================================================================== + ComposedPropertyUIUpdate::ComposedPropertyUIUpdate( const Reference< XObjectInspectorUI >& _rxDelegatorUI, IPropertyExistenceCheck* _pPropertyCheck ) @@ -426,9 +426,9 @@ namespace pcr namespace { - //============================================================ + //= StringBagCollector - //============================================================ + /** an STL-compatible structure which collects strings from a CachedInspectorUI instances */ struct StringBagCollector : public ::std::unary_function< ImplMapHandlerToUI::value_type, void > @@ -452,9 +452,9 @@ namespace pcr } }; - //============================================================ + //= StringBagClearer - //============================================================ + /** an STL-compatible structure which cleans a certain string bag in a CachedInspectorUI instances */ struct StringBagClearer : public ::std::unary_function< ImplMapHandlerToUI::value_type, void > @@ -476,16 +476,16 @@ namespace pcr } }; - //============================================================ + //= FPropertyUISetter - //============================================================ + /** a typedef for a ->XObjectInspectorUI member function taking a string */ typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUISetter )( const OUString& ); - //============================================================ + //= PropertyUIOperator - //============================================================ + /** an STL-compatible struct which calls a certain member method (taking a string) at a given ->XObjectInspectorUI instance */ @@ -513,9 +513,9 @@ namespace pcr } }; - //============================================================ + //= IStringKeyBooleanUIUpdate - //============================================================ + /** an interface which encapsulates access to a single aspect of the ->XObjectInspectorUI, where this aspect is given by a string key, and has a boolean value. */ @@ -527,9 +527,9 @@ namespace pcr virtual ~IStringKeyBooleanUIUpdate() { } }; - //============================================================ + //= FPropertyUIFlagSetter - //============================================================ + /** an implementation of the ->IStringKeyBooleanUIUpdate interface which, for a fixed ->XObjectInspectorUI instance and a fixed UI element (->PropertyLineElement), updates this element for a given property with a given boolean flag @@ -551,22 +551,22 @@ namespace pcr virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const; }; - //............................................................ + void EnablePropertyUIElement::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const { m_xUIUpdate->enablePropertyUIElements( _rKey, m_nElement, _bFlag ); } - //============================================================ + //= FPropertyUIFlagSetter - //============================================================ + /** a ->XObjectInspectorUI method taking a string and a boolean */ typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUIFlagSetter )( const OUString&, sal_Bool ); - //============================================================ + //= DefaultStringKeyBooleanUIUpdate - //============================================================ + /** an implementaiton of the ->IStringKeyBooleanUIUpdate interface which calls am arbitrary ->XObjectInspectorUI method taking a string and a boolean flag */ @@ -582,22 +582,22 @@ namespace pcr virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const; }; - //............................................................ + DefaultStringKeyBooleanUIUpdate::DefaultStringKeyBooleanUIUpdate( const Reference< XObjectInspectorUI >& _rxUIUpdate, FPropertyUIFlagSetter _pSetter ) :m_xUIUpdate( _rxUIUpdate ) ,m_pSetter( _pSetter ) { } - //............................................................ + void DefaultStringKeyBooleanUIUpdate::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const { ((m_xUIUpdate.get())->*m_pSetter)( _rKey, _bFlag ); } - //============================================================ + //= BooleanUIAspectUpdate - //============================================================ + /** an STL-compatible structure which applies a ->IStringKeyBooleanUIUpdate::updateUIForKey operation with a fixed boolean value, for a given string value */ @@ -625,9 +625,9 @@ namespace pcr } }; - //============================================================ + //= BooleanUIAspectUpdate - //============================================================ + /** an STL-compatible structure subtracting a given string from a fixed ->StringBag */ struct StringBagComplement : public ::std::unary_function< OUString, void > @@ -649,9 +649,9 @@ namespace pcr } }; - //============================================================ + //= BooleanUIAspectUpdate - //============================================================ + void lcl_fireUIStateFlag( const IStringKeyBooleanUIUpdate& _rUIUpdate, const ImplMapHandlerToUI& _rHandlerUIs, @@ -839,8 +839,8 @@ namespace pcr return false; } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index 04899f15598b..5b19013b0829 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -28,14 +28,14 @@ #include <set> #include <memory> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= some helper types - //==================================================================== + struct MapHandlerToUI; @@ -50,9 +50,9 @@ namespace pcr ~IPropertyExistenceCheck() {} }; - //==================================================================== + //= ComposedPropertyUIUpdate - //==================================================================== + /** helper class composing requests to a ->XObjectInspectorUI interface, coming from multiple sources @@ -197,9 +197,9 @@ namespace pcr ComposedPropertyUIUpdate& operator=( const ComposedPropertyUIUpdate& ); // never implemented }; - //==================================================================== + //= ComposedUIAutoFireGuard - //==================================================================== + class ComposedUIAutoFireGuard { private: @@ -216,9 +216,9 @@ namespace pcr } }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index cddf465f5713..210ef9c807f9 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -29,18 +29,18 @@ extern "C" void SAL_CALL createRegistryInfo_OControlFontDialog() ::pcr::OAutoRegistration< ::pcr::OControlFontDialog > aAutoRegistration; } -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; - //==================================================================== + //= OControlFontDialog - //==================================================================== + OControlFontDialog::OControlFontDialog(const Reference< XComponentContext >& _rxContext ) :OGenericUnoDialog( _rxContext ) @@ -175,8 +175,8 @@ namespace pcr } } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index 241c6c037bdf..66b2ed7df847 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -26,14 +26,14 @@ class SfxItemSet; class SfxItemPool; class SfxPoolItem; -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= OControlFontDialog - //==================================================================== + class OControlFontDialog; typedef ::svt::OGenericUnoDialog OControlFontDialog_DBase; typedef ::comphelper::OPropertyArrayUsageHelper< OControlFontDialog > OControlFontDialog_PBase; @@ -87,9 +87,9 @@ namespace pcr virtual void executedDialog(sal_Int16 _nExecutionResult); }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // _EXTENSIONS_PROPCTRLR_CONTROLFONTDIALOG_HXX_ diff --git a/extensions/source/propctrlr/controltype.hxx b/extensions/source/propctrlr/controltype.hxx index d7c40ced32c4..fc6cf3a59a37 100644 --- a/extensions/source/propctrlr/controltype.hxx +++ b/extensions/source/propctrlr/controltype.hxx @@ -21,14 +21,14 @@ #include <sal/types.h> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= control types, analogous to FormComponentType - //==================================================================== + namespace ControlType { static const sal_Int16 FIXEDLINE = (sal_Int16)100; @@ -38,9 +38,9 @@ namespace pcr // need only those which are not already covered as FormComponentType } -//........................................................................ + } // namespacepcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_CONTROLTYPE_HXX diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 97879ce55591..728a14e6ac80 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -37,10 +37,10 @@ extern "C" void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel() ::pcr::OAutoRegistration< ::pcr::DefaultFormComponentInspectorModel > aAutoRegistration; } -//........................................................................ + namespace pcr { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -55,9 +55,9 @@ namespace pcr using ::com::sun::star::ucb::AlreadyInitializedException; using ::com::sun::star::lang::IllegalArgumentException; - //==================================================================== + //= DefaultFormComponentInspectorModel - //==================================================================== + DefaultFormComponentInspectorModel::DefaultFormComponentInspectorModel( bool _bUseFormFormComponentHandlers ) :ImplInspectorModel() @@ -245,8 +245,8 @@ namespace pcr m_bConstructed = true; } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index 10b3e47cb61e..e567aa5fd088 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -23,15 +23,15 @@ #include <memory> -//........................................................................ + namespace pcr { -//........................................................................ + class OPropertyInfoService; - //==================================================================== + //= DefaultFormComponentInspectorModel - //==================================================================== + class DefaultFormComponentInspectorModel : public ImplInspectorModel { private: @@ -74,9 +74,9 @@ namespace pcr void createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTFORMINSPECTION_HXX diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 2c5356fb7c24..de0f7a07ebc2 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -36,10 +36,10 @@ extern "C" void SAL_CALL createRegistryInfo_DefaultHelpProvider() ::pcr::OAutoRegistration< ::pcr::DefaultHelpProvider > aAutoRegistration; } -//........................................................................ + namespace pcr { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; @@ -57,9 +57,9 @@ namespace pcr using ::com::sun::star::awt::XWindow; using ::com::sun::star::awt::XVclWindowPeer; - //==================================================================== + //= DefaultHelpProvider - //==================================================================== + DefaultHelpProvider::DefaultHelpProvider() :m_bConstructed( false ) @@ -186,8 +186,8 @@ namespace pcr sHelpText = pControlWindow->GetHelpText(); return sHelpText; } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index 644b830cc7d4..5f8980471082 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -29,14 +29,14 @@ class Window; -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= DefaultHelpProvider - //==================================================================== + typedef ::cppu::WeakImplHelper2 < ::com::sun::star::inspection::XPropertyControlObserver , ::com::sun::star::lang::XInitialization > DefaultHelpProvider_Base; @@ -75,9 +75,9 @@ namespace pcr OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_DEFAULTHELPPROVIDER_HXX diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index f5f83d73cfec..c976063322dd 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -34,10 +34,10 @@ extern "C" void SAL_CALL createRegistryInfo_EditPropertyHandler() ::pcr::EditPropertyHandler::registerImplementation(); } -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -46,9 +46,9 @@ namespace pcr using namespace ::com::sun::star::frame; using namespace ::com::sun::star::inspection; - //==================================================================== + //= EditPropertyHandler - //==================================================================== + DBG_NAME( EditPropertyHandler ) EditPropertyHandler::EditPropertyHandler( const Reference< XComponentContext >& _rxContext ) @@ -305,8 +305,8 @@ namespace pcr } } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index e1aa0046c9f1..1c1a13019c83 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -22,14 +22,14 @@ #include "propertyhandler.hxx" -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= EditPropertyHandler - //==================================================================== + class EditPropertyHandler; typedef HandlerComponentBase< EditPropertyHandler > EditPropertyHandler_Base; /** a property handler for any virtual string properties @@ -63,9 +63,9 @@ namespace pcr bool implHaveTextTypeProperty() const; }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_EDITPROPERTYHANDLER_HXX diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index aaef4080ccb1..17d3cfdcb729 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -36,10 +36,10 @@ #include <algorithm> #include <o3tl/compat_functional.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -50,9 +50,9 @@ namespace pcr using namespace ::com::sun::star::lang; using namespace ::com::sun::star::form; - //==================================================================== + //= file-local helpers - //==================================================================== + namespace { @@ -67,9 +67,9 @@ namespace pcr } } - //==================================================================== + //= EFormsHelper - //==================================================================== + EFormsHelper::EFormsHelper( ::osl::Mutex& _rMutex, const Reference< XPropertySet >& _rxControlModel, const Reference< frame::XModel >& _rxContextDocument ) :m_xControlModel( _rxControlModel ) @@ -576,7 +576,7 @@ namespace pcr namespace { - //................................................................ + struct PropertyBagInserter : public ::std::unary_function< Property, void > { private: @@ -591,7 +591,7 @@ namespace pcr } }; - //................................................................ + Reference< XPropertySetInfo > collectPropertiesGetInfo( const Reference< XPropertySet >& _rxProps, PropertyBag& _rBag ) { Reference< XPropertySetInfo > xInfo; @@ -773,8 +773,8 @@ namespace pcr } } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index f77be57da1d0..22f787e8caff 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.hxx @@ -36,17 +36,17 @@ #include <set> #include <map> -//........................................................................ + namespace pcr { -//........................................................................ + typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::std::less< OUString > > MapStringToPropertySet; - //==================================================================== + //= EFormsHelper - //==================================================================== + class EFormsHelper { protected: @@ -251,9 +251,9 @@ namespace pcr EFormsHelper& operator=( const EFormsHelper& ); // never implemented }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_EFORMSHELPER_HXX diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 4d797629c040..e663657c09d8 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -38,10 +38,10 @@ extern "C" void SAL_CALL createRegistryInfo_EFormsPropertyHandler() ::pcr::EFormsPropertyHandler::registerImplementation(); } -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -53,9 +53,9 @@ namespace pcr using namespace ::com::sun::star::form::binding; using namespace ::com::sun::star::inspection; - //==================================================================== + //= EFormsPropertyHandler - //==================================================================== + DBG_NAME( EFormsPropertyHandler ) EFormsPropertyHandler::EFormsPropertyHandler( const Reference< XComponentContext >& _rxContext ) @@ -214,7 +214,7 @@ namespace pcr // This is because we "simulate" the Model property by remembering the // value ourself. Other instances might, however, not know this value, // but prefer to retrieve it somewhere else - e.g. from the EFormsHelper - // + // The really correct solution would be if *all* property handlers // obtain a "current property value" for *all* properties from a central // instance. Then, handler A could ask it for the value of property @@ -598,8 +598,8 @@ namespace pcr } } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index ba76e7d29e3b..4f994e87e01b 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -24,15 +24,15 @@ #include <memory> -//........................................................................ + namespace pcr { -//........................................................................ + class EFormsHelper; - //==================================================================== + //= EFormsPropertyHandler - //==================================================================== + class EFormsPropertyHandler; typedef HandlerComponentBase< EFormsPropertyHandler > EFormsPropertyHandler_Base; class EFormsPropertyHandler : public EFormsPropertyHandler_Base @@ -89,9 +89,9 @@ namespace pcr OUString getModelNamePropertyValue() const; }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_EFORMSPROPERTYHANDLER_HXX diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index 2d8d373af540..7cf5635a0660 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.hxx @@ -26,14 +26,14 @@ #include <vector> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= IPropertyEnumRepresentation - //==================================================================== + class SAL_NO_VTABLE IPropertyEnumRepresentation : public ::rtl::IReference { public: @@ -58,9 +58,9 @@ namespace pcr virtual ~IPropertyEnumRepresentation() { }; }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index 81a57c889ba9..a4396bcae57f 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -32,14 +32,14 @@ #include <cppuhelper/compbase2.hxx> #include <comphelper/listenernotification.hxx> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= EventDescription - //==================================================================== + typedef sal_Int32 EventId; struct EventDescription { @@ -68,9 +68,9 @@ namespace pcr typedef ::boost::unordered_map< OUString, EventDescription, OUStringHash > EventMap; - //==================================================================== + //= EventHandler - //==================================================================== + typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::inspection::XPropertyHandler , ::com::sun::star::lang::XServiceInfo > EventHandler_Base; @@ -247,9 +247,9 @@ namespace pcr EventHandler& operator=( const EventHandler& ); // never implemented }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 014510fc7fcd..5d7750d6ea9c 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -57,17 +57,17 @@ #include <svx/flagsdef.hxx> #include <vcl/settings.hxx> -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - //======================================================================== + //= OFontPropertyExtractor - //======================================================================== + class OFontPropertyExtractor { protected: @@ -167,9 +167,9 @@ namespace pcr _rSet.InvalidateItem(_nItemId); } - //======================================================================== + //= ControlCharacterDialog - //======================================================================== + ControlCharacterDialog::ControlCharacterDialog(Window* _pParent, const SfxItemSet& _rCoreSet) : SfxTabDialog(_pParent, "ControlFontDialog", @@ -305,7 +305,7 @@ namespace pcr try { - // -------------------------- + // font name SfxItemState eState = _rSet.GetItemState(CFID_FONT); @@ -320,7 +320,7 @@ namespace pcr lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_CHARSET , makeAny((sal_Int16)rFontItem.GetCharSet())); } - // -------------------------- + // font height eState = _rSet.GetItemState(CFID_HEIGHT); @@ -334,7 +334,7 @@ namespace pcr } - // -------------------------- + // font weight eState = _rSet.GetItemState(CFID_WEIGHT); @@ -347,7 +347,7 @@ namespace pcr lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_WEIGHT,makeAny(nWeight)); } - // -------------------------- + // font slant eState = _rSet.GetItemState(CFID_POSTURE); @@ -360,7 +360,7 @@ namespace pcr lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_SLANT, makeAny((sal_Int16)eSlant)); } - // -------------------------- + // font underline eState = _rSet.GetItemState(CFID_UNDERLINE); @@ -382,7 +382,7 @@ namespace pcr lcl_pushBackPropertyValue( _out_properties, PROPERTY_TEXTLINECOLOR, aUnoColor ); } - // -------------------------- + // font strikeout eState = _rSet.GetItemState(CFID_STRIKEOUT); @@ -396,7 +396,7 @@ namespace pcr } - // -------------------------- + // font wordline mode eState = _rSet.GetItemState(CFID_WORDLINEMODE); @@ -409,7 +409,7 @@ namespace pcr } - // -------------------------- + // text color eState = _rSet.GetItemState(CFID_CHARCOLOR); @@ -427,7 +427,7 @@ namespace pcr lcl_pushBackPropertyValue( _out_properties, PROPERTY_TEXTCOLOR, aUnoColor ); } - // -------------------------- + // font relief eState = _rSet.GetItemState(CFID_RELIEF); @@ -439,7 +439,7 @@ namespace pcr lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_RELIEF, makeAny((sal_Int16)rReliefItem.GetValue()) ); } - // -------------------------- + // font emphasis mark eState = _rSet.GetItemState(CFID_EMPHASIS); @@ -590,8 +590,8 @@ namespace pcr } } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index 485c573192ed..7017e02c3bf3 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.hxx @@ -24,14 +24,14 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/NamedValue.hpp> -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + //= ControlCharacterDialog - //======================================================================== + class ControlCharacterDialog : public SfxTabDialog { public: @@ -66,9 +66,9 @@ namespace pcr private: sal_uInt16 m_nCharsId; }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_FONTDIALOG_HXX_ diff --git a/extensions/source/propctrlr/fontitemids.hxx b/extensions/source/propctrlr/fontitemids.hxx index 668ec891d479..0aff871f19f2 100644 --- a/extensions/source/propctrlr/fontitemids.hxx +++ b/extensions/source/propctrlr/fontitemids.hxx @@ -46,13 +46,13 @@ #define CFID_FIRST_ITEM_ID CFID_FONT #define CFID_LAST_ITEM_ID CFID_FONTLIST -//........................................................................ + namespace pcr { -//........................................................................ -//........................................................................ + + } // namespace pcr -//........................................................................ + #endif // _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_ diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index d03a7946af90..12a5d4afec70 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -25,10 +25,10 @@ #include "modulepcr.hxx" #include "formstrings.hxx" -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::form; @@ -127,8 +127,8 @@ namespace pcr return nControlType; } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx index 2df90d5ab6bd..7378c4273c09 100644 --- a/extensions/source/propctrlr/formbrowsertools.hxx +++ b/extensions/source/propctrlr/formbrowsertools.hxx @@ -27,15 +27,15 @@ #include <functional> #include <set> -//............................................................................ + namespace pcr { -//............................................................................ + OUString GetUIHeadlineName(sal_Int16 _nClassId, const ::com::sun::star::uno::Any& _rUnoObject); sal_Int16 classifyComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); - //======================================================================== + struct FindPropertyByHandle : public ::std::unary_function< ::com::sun::star::beans::Property, bool > { private: @@ -49,7 +49,7 @@ namespace pcr } }; - //======================================================================== + struct FindPropertyByName : public ::std::unary_function< ::com::sun::star::beans::Property, bool > { private: @@ -63,7 +63,7 @@ namespace pcr } }; - //======================================================================== + struct PropertyLessByName :public ::std::binary_function < ::com::sun::star::beans::Property, ::com::sun::star::beans::Property, @@ -76,7 +76,7 @@ namespace pcr } }; - //======================================================================== + struct TypeLessByName :public ::std::binary_function < ::com::sun::star::uno::Type, ::com::sun::star::uno::Type, @@ -89,12 +89,12 @@ namespace pcr } }; - //======================================================================== + typedef ::std::set< ::com::sun::star::beans::Property, PropertyLessByName > PropertyBag; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_FORMSCTRLR_FORMBROWSERTOOLS_HXX_ diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 1e8bd1127bdb..66c145181d14 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -108,10 +108,10 @@ extern "C" void SAL_CALL createRegistryInfo_FormComponentPropertyHandler() ::pcr::FormComponentPropertyHandler::registerImplementation(); } -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star; using namespace uno; @@ -132,9 +132,9 @@ namespace pcr namespace WritingMode2 = ::com::sun::star::text::WritingMode2; - //==================================================================== + //= FormComponentPropertyHandler - //==================================================================== + DBG_NAME( FormComponentPropertyHandler ) #define PROPERTY_ID_ROWSET 1 @@ -173,7 +173,7 @@ namespace pcr return aSupported; } - //============================================ + // TODO: -> export from toolkit struct LanguageDependentProp { @@ -647,7 +647,7 @@ namespace pcr switch ( nPropId ) { - ////////////////////////////////////////////////////////////// + case PROPERTY_ID_SHOW_POSITION: case PROPERTY_ID_SHOW_NAVIGATION: case PROPERTY_ID_SHOW_RECORDACTIONS: @@ -667,7 +667,7 @@ namespace pcr } break; - ////////////////////////////////////////////////////////////// + case PROPERTY_ID_DATASOURCE: { OSL_ENSURE( _rControlValueType.getTypeClass() == TypeClass_STRING, @@ -684,7 +684,7 @@ namespace pcr } break; - ////////////////////////////////////////////////////////////// + case PROPERTY_ID_CONTROLLABEL: { OUString sControlValue; @@ -709,7 +709,7 @@ namespace pcr } break; - ////////////////////////////////////////////////////////////// + case PROPERTY_ID_DATEMIN: case PROPERTY_ID_DATEMAX: case PROPERTY_ID_DEFAULT_DATE: @@ -973,7 +973,7 @@ namespace pcr PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); Property aProperty( impl_getPropertyFromId_throw( nPropId ) ); - ////////////////////////////////////////////////////////////////////// + // for the MultiLine property, we have different UI translations depending on the control // type if ( nPropId == PROPERTY_ID_MULTILINE ) @@ -993,7 +993,7 @@ namespace pcr throw UnknownPropertyException(); } - ////////////////////////////////////////////////////////////////////// + LineDescriptor aDescriptor; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); @@ -1004,7 +1004,7 @@ namespace pcr sal_Bool bReadOnly = sal_False; aDescriptor.Control.clear(); - ////////////////////////////////////////////////////////////////////// + bool bNeedDefaultStringIfVoidAllowed = false; @@ -1239,11 +1239,11 @@ namespace pcr break; } - ////////////////////////////////////////////////////////////////////// + if ( eType == TypeClass_SEQUENCE ) nControlType = PropertyControlType::StringListField; - ////////////////////////////////////////////////////////////////////// + // boolean values if ( eType == TypeClass_BOOLEAN ) { @@ -1261,7 +1261,7 @@ namespace pcr bNeedDefaultStringIfVoidAllowed = true; } - ////////////////////////////////////////////////////////////////////// + // enum properties sal_uInt32 nPropertyUIFlags = m_pInfoService->getPropertyUIFlags( nPropId ); bool bIsEnumProperty = ( nPropertyUIFlags & PROP_FLAG_ENUM ) != 0; @@ -1307,7 +1307,7 @@ namespace pcr } } - ////////////////////////////////////////////////////////////////////// + switch( nPropId ) { case PROPERTY_ID_REPEAT_DELAY: @@ -1353,7 +1353,7 @@ namespace pcr } break; - ////////////////////////////////////////////////////////////////////// + // DataSource case PROPERTY_ID_DATASOURCE: { @@ -2029,7 +2029,7 @@ namespace pcr { try { - ////////////////////////////////////////////////////////////////// + // component class m_eComponentClass = eUnknown; @@ -2048,7 +2048,7 @@ namespace pcr m_eComponentClass = eFormControl; } - ////////////////////////////////////////////////////////////////// + // (database) sub form? Reference< XForm > xAsForm( m_xComponent, UNO_QUERY ); if ( xAsForm.is() ) @@ -2057,13 +2057,13 @@ namespace pcr m_bComponentIsSubForm = xFormsParent.is(); } - ////////////////////////////////////////////////////////////////// + // ClassId Reference< XChild > xCompAsChild( m_xComponent, UNO_QUERY ); if ( xCompAsChild.is() ) m_xObjectParent = xCompAsChild->getParent(); - ////////////////////////////////////////////////////////////////// + // ClassId impl_classifyControlModel_throw(); } @@ -2448,14 +2448,14 @@ namespace pcr { WaitCursor aWaitCursor( impl_getDefaultDialogParent_nothrow() ); - //////////////////////////////////////////////////////////// + // Setzen der UI-Daten _out_rProperty.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_COMMAND ); _out_rProperty.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_COMMAND ) ); _out_rProperty.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); - //////////////////////////////////////////////////////////// + sal_Int32 nCommandType = CommandType::COMMAND; impl_getPropertyValue_throw( PROPERTY_COMMANDTYPE ) >>= nCommandType; @@ -2558,7 +2558,7 @@ namespace pcr { OSL_PRECOND( m_xComponent.is(), "FormComponentPropertyHandler::impl_describeListSourceUI_throw: no component!" ); - //////////////////////////////////////////////////////////// + // Auslesen des ListSourceTypes Any aListSourceType( m_xComponent->getPropertyValue( PROPERTY_LISTSOURCETYPE ) ); @@ -2568,7 +2568,7 @@ namespace pcr _out_rDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_LISTSOURCE ); _out_rDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_LISTSOURCE ) ); - //////////////////////////////////////////////////////////// + // Enums setzen switch( nListSourceType ) { @@ -3017,13 +3017,13 @@ namespace pcr //- FormSQLCommandUI - implementation - //.................................................................... + FormSQLCommandUI::FormSQLCommandUI( const Reference< XPropertySet >& _rxForm ) :SQLCommandPropertyUI( _rxForm ) { } - //.................................................................... + OUString FormSQLCommandUI::getSQLCommand() const { OUString sCommand; @@ -3031,7 +3031,7 @@ namespace pcr return sCommand; } - //.................................................................... + sal_Bool FormSQLCommandUI::getEscapeProcessing() const { sal_Bool bEscapeProcessing( sal_False ); @@ -3039,19 +3039,19 @@ namespace pcr return bEscapeProcessing; } - //.................................................................... + void FormSQLCommandUI::setSQLCommand( const OUString& _rCommand ) const { m_xObject->setPropertyValue( PROPERTY_COMMAND, makeAny( _rCommand ) ); } - //.................................................................... + void FormSQLCommandUI::setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const { m_xObject->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( _bEscapeProcessing ) ); } - //.................................................................... + OUString* FormSQLCommandUI::getPropertiesToDisable() { static OUString s_aCommandProps[] = { @@ -3086,14 +3086,14 @@ namespace pcr //- ValueListCommandUI - implementation - //.................................................................... + ValueListCommandUI::ValueListCommandUI( const Reference< XPropertySet >& _rxListOrCombo ) :SQLCommandPropertyUI( _rxListOrCombo ) ,m_bPropertyValueIsList( false ) { } - //.................................................................... + OUString ValueListCommandUI::getSQLCommand() const { OUString sValue; @@ -3117,7 +3117,7 @@ namespace pcr return sValue; } - //.................................................................... + sal_Bool ValueListCommandUI::getEscapeProcessing() const { enum ListSourceType eType( ListSourceType_SQL ); @@ -3127,7 +3127,7 @@ namespace pcr return ( eType == ListSourceType_SQL ); } - //.................................................................... + void ValueListCommandUI::setSQLCommand( const OUString& _rCommand ) const { Any aValue; @@ -3138,14 +3138,14 @@ namespace pcr m_xObject->setPropertyValue( PROPERTY_LISTSOURCE, aValue ); } - //.................................................................... + void ValueListCommandUI::setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const { m_xObject->setPropertyValue( PROPERTY_LISTSOURCETYPE, makeAny( _bEscapeProcessing ? ListSourceType_SQL : ListSourceType_SQLPASSTHROUGH ) ); } - //.................................................................... + OUString* ValueListCommandUI::getPropertiesToDisable() { static OUString s_aListSourceProps[] = { @@ -3310,8 +3310,8 @@ namespace pcr return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 359bf68ee5d1..abadfcccf15a 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -37,14 +37,14 @@ #include <set> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= ComponentClassification - //==================================================================== + enum ComponentClassification { eFormControl, @@ -52,9 +52,9 @@ namespace pcr eUnknown }; - //==================================================================== + //= FormComponentPropertyHandler - //==================================================================== + class FormComponentPropertyHandler; typedef HandlerComponentBase< FormComponentPropertyHandler > FormComponentPropertyHandler_Base; typedef ::comphelper::OPropertyArrayUsageHelper<FormComponentPropertyHandler> FormComponentPropertyHandler_PROP; @@ -443,9 +443,9 @@ namespace pcr using ::comphelper::OPropertyContainer::removePropertyChangeListener; }; - //==================================================================== + //= WaitCursor - //==================================================================== + /** wrapper around a ->WaitObject which can cope with a NULL window */ class WaitCursor @@ -461,9 +461,9 @@ namespace pcr } }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_FORMCOMPONENTHANDLER_HXX diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 8862f1ce1d09..d83de3d7f20b 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -37,10 +37,10 @@ extern "C" void SAL_CALL createRegistryInfo_FormController() ::pcr::OAutoRegistration< ::pcr::DialogController > aDialogControllerRegistration; } -//........................................................................ + namespace pcr { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::TypeClass_INTERFACE; @@ -69,9 +69,9 @@ namespace pcr namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; - //==================================================================== + //= FormController - //==================================================================== + FormController::FormController( const Reference< XComponentContext >& _rxContext, ServiceDescriptor _aServiceDescriptor, bool _bUseFormFormComponentHandlers ) @@ -252,9 +252,9 @@ namespace pcr } } - //==================================================================== + //= DialogController - //==================================================================== + OUString DialogController::getImplementationName_static( ) throw(RuntimeException) { @@ -278,8 +278,8 @@ namespace pcr return *(new FormController( _rxContext, aService, false ) ); } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 3ab296bbd030..e9194744038a 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -25,14 +25,14 @@ #include <comphelper/proparrhlp.hxx> #include <comphelper/uno3.hxx> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= ServiceDescriptor - //==================================================================== + struct ServiceDescriptor { OUString @@ -41,9 +41,9 @@ namespace pcr ( *GetSupportedServiceNames )( void ); }; - //==================================================================== + //= FormController - //==================================================================== + class FormController; typedef ::cppu::OPropertySetHelper FormController_PropertyBase1; typedef ::comphelper::OPropertyArrayUsageHelper< FormController > FormController_PropertyBase2; @@ -102,9 +102,9 @@ namespace pcr using FormController_PropertyBase1::getFastPropertyValue; }; - //==================================================================== + //= DialogController - //==================================================================== + /** Legacy implementation of com.sun.star.awt.PropertyBrowserController */ class DialogController @@ -121,9 +121,9 @@ namespace pcr DialogController( const DialogController& ); // never implemented DialogController& operator=( const DialogController& ); // never implemented }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_FORMCONTROLLER_HXX diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index a92452ca6df4..1cac106932bd 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -43,10 +43,10 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -//........................................................................ + namespace pcr { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -98,9 +98,9 @@ namespace pcr #define ANCHOR_TO_SHEET 0 #define ANCHOR_TO_CELL 1 - //==================================================================== + //= BroadcastHelperBase - //==================================================================== + class BroadcastHelperBase { protected: @@ -116,9 +116,9 @@ namespace pcr ::cppu::OBroadcastHelper maBHelper; }; - //==================================================================== + //= ShapeGeometryChangeNotifier - declaration - //==================================================================== + /** helper class to work around the ...unfortunate implementation of property change broadcasts in the XShape implementation, which broadcasts way too generous and unspecified */ @@ -200,9 +200,9 @@ namespace pcr Reference< XShape > m_xShape; }; - //==================================================================== + //= FormGeometryHandler - declaration - //==================================================================== + class FormGeometryHandler; typedef HandlerComponentBase< FormGeometryHandler > FormGeometryHandler_Base; /** a property handler for any virtual string properties @@ -250,9 +250,9 @@ namespace pcr ::rtl::Reference< ShapeGeometryChangeNotifier > m_xChangeNotifier; }; - //==================================================================== + //= FormGeometryHandler - implementation - //==================================================================== + DBG_NAME( FormGeometryHandler ) FormGeometryHandler::FormGeometryHandler( const Reference< XComponentContext >& _rxContext ) @@ -704,9 +704,9 @@ namespace pcr } } - //==================================================================== + //= ShapeGeometryChangeNotifier - implementation - //==================================================================== + namespace { struct EventTranslation @@ -805,9 +805,9 @@ namespace pcr getBroadcastHelper().bDisposed = true; } -//........................................................................ + } // namespace pcr -//........................................................................ + extern "C" void SAL_CALL createRegistryInfo_FormGeometryHandler() { diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 9fd09141ae72..470847a14afd 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -43,10 +43,10 @@ #include <com/sun/star/sdb/SQLContext.hpp> -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -57,9 +57,9 @@ namespace pcr using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; - //======================================================================== + //= FieldLinkRow - //======================================================================== + class FieldLinkRow : public Window { private: @@ -143,9 +143,9 @@ namespace pcr return 0L; } - //======================================================================== + //= FormLinkDialog - //======================================================================== + FormLinkDialog::FormLinkDialog( Window* _pParent, const Reference< XPropertySet >& _rxDetailForm, const Reference< XPropertySet >& _rxMasterForm, const Reference< XComponentContext >& _rxContext, @@ -654,8 +654,8 @@ namespace pcr initializeSuggest(); return 0L; } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index abf7b86bb93b..08c461f776c4 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -32,15 +32,15 @@ #include <memory> -//............................................................................ + namespace pcr { -//............................................................................ + class FieldLinkRow; - //======================================================================== + //= FormLinkDialog - //======================================================================== + class FormLinkDialog : public ModalDialog { private: @@ -134,9 +134,9 @@ namespace pcr ) const; }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index e161bf6fbbea..10e9774d4f55 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -28,16 +28,16 @@ #include <algorithm> #include <functional> -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; - //======================================================================== + //= OPropertyInfoImpl - //======================================================================== + struct OPropertyInfoImpl { OUString sName; @@ -78,9 +78,9 @@ namespace pcr } }; - //======================================================================== + //= OPropertyInfoService - //======================================================================== + #define DEF_INFO( ident, uinameres, pos, helpid, flags ) \ OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \ PcrRes( RID_STR_##uinameres ).toString(), pos, HID_PROP_##helpid, flags ) @@ -575,9 +575,9 @@ namespace pcr return NULL; } - //==================================================================== + //= DefaultEnumRepresentation - //==================================================================== + DBG_NAME( DefaultEnumRepresentation ) DefaultEnumRepresentation::DefaultEnumRepresentation( const IPropertyInfoService& _rInfo, const Type& _rType, sal_Int32 _nPropertyId ) @@ -685,8 +685,8 @@ namespace pcr return m_refCount; } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index d290a8c93250..95e55117d90e 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -24,16 +24,16 @@ #include "modulepcr.hxx" #include "enumrepresentation.hxx" -//............................................................................ + namespace pcr { -//............................................................................ + struct OPropertyInfoImpl; - //======================================================================== + //= OPropertyInfoService - //======================================================================== + class OPropertyInfoService :public IPropertyInfoService ,public PcrClient @@ -62,9 +62,9 @@ namespace pcr static const OPropertyInfoImpl* getPropertyInfo(sal_Int32 _nId); }; - //======================================================================== + //= DefaultEnumRepresentation - //======================================================================== + /** an implementation of the IPropertyEnumRepresentation To be used with properties which, in formmetadata.cxx, are declared as ENUM. @@ -106,9 +106,9 @@ namespace pcr DefaultEnumRepresentation& operator=( const DefaultEnumRepresentation& ); // never implemented }; - //======================================================================== + //= UI flags (for all browseable properties) - //======================================================================== + #define PROP_FLAG_NONE 0x00000000 // no special flag #define PROP_FLAG_FORM_VISIBLE 0x00000001 // the property is visible when inspecting a form object @@ -124,9 +124,9 @@ namespace pcr // UI, unless experimental properties are enabled by a configuraiton // option - //======================================================================== + //= property ids (for all browseable properties) - //======================================================================== + #define PROPERTY_ID_NAME 1 #define PROPERTY_ID_LABEL 2 @@ -334,9 +334,9 @@ namespace pcr #define PROPERTY_ID_SCROLL_TOP 205 #define PROPERTY_ID_SCROLL_LEFT 206 -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_ diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index 1ab74b7cadac..e5260bf9746e 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/extensions/source/propctrlr/formresid.hrc @@ -22,7 +22,7 @@ #include "propresid.hrc" -// ----------------------------------------------------------------------- + // - Strings #define RID_STR_FORMS ( RID_FORMBROWSER_START + 1 ) @@ -269,12 +269,12 @@ #define RID_STR_SCROLL_LEFT ( RID_FORMBROWSER_START + 259 ) -// ----------------------------------------------------------------------- + // - message strings #define RID_STR_CONFIRM_DELETE_DATA_TYPE ( RID_FORMBROWSER_START + 500 ) -// ----------------------------------------------------------------------- + // - dialogs #define RID_DLG_SELECTLABELCONTROL ( RID_PROPCONTROLLER_START + 0 ) @@ -283,12 +283,12 @@ #define RID_DLG_SELECTION ( RID_PROPCONTROLLER_START + 3 ) #define RID_DLG_NEW_DATA_TYPE ( RID_PROPCONTROLLER_START + 4 ) -// ----------------------------------------------------------------------- + // - ImageLists #define RID_IL_FORMEXPLORER ( RID_PROPCONTROLLER_START + 0 ) -// ----------------------------------------------------------------------- + // - untyped resources #define RID_RSC_ENUM_SCROLLBARS ( RID_PROPCONTROLLER_START + 0 ) @@ -325,9 +325,9 @@ #define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 ) #define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 32 ) -// ----------------------------------------------------------------------- + // - ImageList - local ids -// ----------------------------------------------------------------------- + // HACK HACK HACK // as long as we have no real property browser, but this outsourcing only, // we do not duplicate images. Instead we do some hard coding for the image ids diff --git a/extensions/source/propctrlr/formstrings.hxx b/extensions/source/propctrlr/formstrings.hxx index d0b85ebf58fc..cdac126ef2df 100644 --- a/extensions/source/propctrlr/formstrings.hxx +++ b/extensions/source/propctrlr/formstrings.hxx @@ -20,10 +20,10 @@ #ifndef _EXTENSIONS_FORMSCTRLR_FORMSTRINGS_HXX_ #define _EXTENSIONS_FORMSCTRLR_FORMSTRINGS_HXX_ -//............................................................................ + namespace pcr { -//............................................................................ + #define PROPERTY_DEFAULTCONTROL "DefaultControl" #define PROPERTY_INTROSPECTEDOBJECT "IntrospectedObject" @@ -291,9 +291,9 @@ namespace pcr #define SERVICE_ADDRESS_CONVERSION "com.sun.star.table.CellAddressConversion" #define SERVICE_RANGEADDRESS_CONVERSION "com.sun.star.table.CellRangeAddressConversion" -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_FORMSCTRLR_FORMSTRINGS_HXX_ diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 9bfebc103214..0f54786f84bb 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -33,10 +33,10 @@ #include <map> -//........................................................................ + namespace pcr { -//........................................................................ + struct TypeLess : ::std::binary_function< ::com::sun::star::uno::Type, ::com::sun::star::uno::Type, bool > { @@ -47,9 +47,9 @@ namespace pcr }; class IPropertyEnumRepresentation; - //==================================================================== + //= GenericPropertyHandler - //==================================================================== + typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::inspection::XPropertyHandler , ::com::sun::star::lang::XServiceInfo > GenericPropertyHandler_Base; @@ -141,9 +141,9 @@ namespace pcr GenericPropertyHandler& operator=( const GenericPropertyHandler& ); // never implemented }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 6362a6227567..c154d0195a94 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -41,10 +41,10 @@ #include <algorithm> -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -54,9 +54,9 @@ namespace pcr using namespace ::com::sun::star::script; using namespace ::com::sun::star::inspection; - //==================================================================== + //= PropertyHandlerHelper - //==================================================================== + void PropertyHandlerHelper::describePropertyLine( const Property& _rProperty, LineDescriptor& /* [out] */ _out_rDescriptor, const Reference< XPropertyControlFactory >& _rxControlFactory ) @@ -291,8 +291,8 @@ namespace pcr return pInspectorWindow; } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 30182fa1ea9e..473470864422 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -36,14 +36,14 @@ namespace com { namespace sun { namespace star { struct LineDescriptor; } } } } -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= PropertyHandlerHelper - //==================================================================== + class PropertyHandlerHelper { public: @@ -201,9 +201,9 @@ namespace pcr PropertyHandlerHelper& operator=( const PropertyHandlerHelper& ); // never implemented }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index 4e7f6a7cfb5f..1ea7bbf26c87 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -20,12 +20,12 @@ #include "modulepcr.hxx" #include "propresid.hrc" -//........................................................................ + namespace pcr { - //==================================================================== + //= InspectorHelpWindow - //==================================================================== + InspectorHelpWindow::InspectorHelpWindow( Window* _pParent ) :Window( _pParent, WB_DIALOGCONTROL ) @@ -127,8 +127,8 @@ namespace pcr m_aHelpText.SetPosSizePixel( aTextArea.TopLeft(), aTextArea.GetSize() ); } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx index 0bb2eaee3152..22a1151da544 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.hxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx @@ -22,14 +22,14 @@ #include <vcl/fixed.hxx> #include <svtools/svmedit.hxx> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= InspectorHelpWindow - //==================================================================== + class InspectorHelpWindow : public Window { private: @@ -59,9 +59,9 @@ namespace pcr long impl_getSpaceAboveTextWindow(); }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // HELPWINDOW_HXX diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index e768d7d2da4f..4fd00b207435 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -25,10 +25,10 @@ #include <comphelper/propertycontainerhelper.hxx> #include <cppuhelper/supportsservice.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + #define MODEL_PROPERTY_ID_HAS_HELP_SECTION 2000 #define MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES 2001 @@ -49,9 +49,9 @@ namespace pcr namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; - //==================================================================== + //= InspectorModelProperties - //==================================================================== + /** helper class for implementing the property set related functionality of an ImplInspectorModel */ @@ -87,9 +87,9 @@ namespace pcr void constructWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); }; - //==================================================================== + //= InspectorModelProperties - //==================================================================== + InspectorModelProperties::InspectorModelProperties( ::osl::Mutex& _rMutex ) :m_rMutex( _rMutex ) @@ -154,9 +154,9 @@ namespace pcr return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } - //==================================================================== + //= ImplInspectorModel - //==================================================================== + ImplInspectorModel::ImplInspectorModel() :ImplInspectorModel_PBase( GetBroadcastHelper() ) ,m_pProperties( new InspectorModelProperties( m_aMutex ) ) @@ -245,8 +245,8 @@ namespace pcr m_pProperties->constructWithHelpSection( _nMinHelpTextLines, _nMaxHelpTextLines ); } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index d49b50808bfb..36aceb18a6cc 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.hxx @@ -33,15 +33,15 @@ #include <memory> -//........................................................................ + namespace pcr { -//........................................................................ + class InspectorModelProperties; - //==================================================================== + //= ImplInspectorModel - //==================================================================== + typedef ::cppu::WeakImplHelper3 < ::com::sun::star::inspection::XObjectInspectorModel , ::com::sun::star::lang::XInitialization , ::com::sun::star::lang::XServiceInfo @@ -89,9 +89,9 @@ namespace pcr using ImplInspectorModel_PBase::getFastPropertyValue; }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // INSPECTORMODELBASE_HXX diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index 074ce565f444..f71255741248 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -22,14 +22,14 @@ #include <vcl/image.hxx> #include <com/sun/star/inspection/LineDescriptor.hpp> -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + //= OLineDescriptor - //======================================================================== + struct OLineDescriptor : public ::com::sun::star::inspection::LineDescriptor { OUString sName; // the name of the property @@ -52,9 +52,9 @@ namespace pcr } }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_LINEDESCRIPTOR_HXX_ diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 1087354427dd..cbc73ed04e63 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -25,17 +25,17 @@ #include "formstrings.hxx" #include <vcl/msgbox.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - //==================================================================== + //= ListSelectionDialog - //==================================================================== + ListSelectionDialog::ListSelectionDialog( Window* _pParent, const Reference< XPropertySet >& _rxListBox, const OUString& _rPropertyName, const OUString& _rPropertyUIName ) @@ -149,8 +149,8 @@ namespace pcr m_aEntries.SelectEntryPos( *pSelection ); } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index c62473b7ec61..4479e11403e2 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.hxx @@ -27,14 +27,14 @@ #include <com/sun/star/beans/XPropertySet.hpp> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= ListSelectionDialog - //==================================================================== + class ListSelectionDialog : public ModalDialog { private: @@ -69,9 +69,9 @@ namespace pcr void collectSelection( ::com::sun::star::uno::Sequence< sal_Int16 >& /* [out] */ _rSelection ); }; -//........................................................................ + } // namespacepcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HXX diff --git a/extensions/source/propctrlr/modulepcr.cxx b/extensions/source/propctrlr/modulepcr.cxx index d1e5e4a10603..515d8460e2e8 100644 --- a/extensions/source/propctrlr/modulepcr.cxx +++ b/extensions/source/propctrlr/modulepcr.cxx @@ -22,15 +22,15 @@ #include <rtl/instance.hxx> #include <osl/getglobalmutex.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + IMPLEMENT_MODULE( PcrModule, "pcr" ) -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/modulepcr.hxx b/extensions/source/propctrlr/modulepcr.hxx index 0cb1be2c76d8..128df7794139 100644 --- a/extensions/source/propctrlr/modulepcr.hxx +++ b/extensions/source/propctrlr/modulepcr.hxx @@ -22,16 +22,16 @@ #include <unotools/componentresmodule.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + DEFINE_MODULE( PcrModule, PcrClient, PcrRes ) -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index cd267d5e9f8b..28c95cbb4036 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -23,14 +23,14 @@ #include "modulepcr.hxx" #include "formresid.hrc" -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= NewDataTypeDialog - //==================================================================== + NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) :ModalDialog( _pParent, PcrRes( RID_DLG_NEW_DATA_TYPE ) ) @@ -84,8 +84,8 @@ namespace pcr return 0L; } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index 511110810563..3d895ca9edef 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -28,14 +28,14 @@ #include <set> #include <vector> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= NewDataTypeDialog - //==================================================================== + class NewDataTypeDialog : public ModalDialog { private: @@ -56,9 +56,9 @@ namespace pcr DECL_LINK( OnNameModified, void* ); }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 9d979d818b33..55f3a2f697a4 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -29,10 +29,10 @@ #include <comphelper/broadcasthelper.hxx> #include <comphelper/uno3.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + using ::com::sun::star::inspection::XObjectInspectorModel; using ::com::sun::star::lang::XInitialization; @@ -50,9 +50,9 @@ namespace pcr using ::com::sun::star::beans::XPropertySetInfo; using ::com::sun::star::uno::makeAny; - //==================================================================== + //= ObjectInspectorModel - //==================================================================== + class ObjectInspectorModel : public ImplInspectorModel { private: @@ -90,9 +90,9 @@ namespace pcr void impl_verifyArgument_throw( bool _bCondition, sal_Int16 _nArgumentPosition ); }; - //==================================================================== + //= ObjectInspectorModel - //==================================================================== + ObjectInspectorModel::ObjectInspectorModel() :ImplInspectorModel() { @@ -217,9 +217,9 @@ namespace pcr throw IllegalArgumentException( OUString(), *this, _nArgumentPosition ); } -//........................................................................ + } // namespace pcr -//........................................................................ + extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel() diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index e1c427b257d5..9292a029a4e8 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -25,16 +25,16 @@ #include <rtl/ustrbuf.hxx> #include <tools/urlobj.hxx> -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::util; - //======================================================================== + //= HelpIdUrl - //======================================================================== + OString HelpIdUrl::getHelpId( const OUString& _rHelpURL ) { @@ -56,8 +56,8 @@ namespace pcr aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index cee7cfec43ee..1d3f6d78806f 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -30,26 +30,26 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/listenernotification.hxx> -//............................................................................ + namespace pcr { -//............................................................................ + #define OWN_PROPERTY_ID_INTROSPECTEDOBJECT 0x0010 #define OWN_PROPERTY_ID_CURRENTPAGE 0x0011 #define OWN_PROPERTY_ID_CONTROLCONTEXT 0x0012 #define OWN_PROPERTY_ID_TABBINGMODEL 0x0013 - //======================================================================== + //= types - //======================================================================== + typedef ::comphelper::OSimpleListenerContainer < ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::beans::PropertyChangeEvent > PropertyChangeListeners; - //======================================================================== + //= helper - //======================================================================== + // small helper to make the "swap" call on an STL container a single-line call, which // in it's canonic form "aFoo.swap( Container() )" doesn't compile with GCC template< class CONTAINER > @@ -59,9 +59,9 @@ namespace pcr _rContainer.swap( aEmpty ); } - //======================================================================== + //= HelpIdUrl - //======================================================================== + /// small helper to translate help ids into help urls class HelpIdUrl { @@ -70,9 +70,9 @@ namespace pcr static OUString getHelpURL( const OString& ); }; - //==================================================================== + //= StlSyntaxSequence - //==================================================================== + template< class ELEMENT > class StlSyntaxSequence : public ::com::sun::star::uno::Sequence< ELEMENT > { @@ -111,9 +111,9 @@ namespace pcr } }; - //======================================================================== + //= UNO helpers - //======================================================================== + #define DECLARE_XCOMPONENT() \ virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ @@ -133,9 +133,9 @@ namespace pcr baseclass::WeakComponentImplHelperBase::removeEventListener( _Listener ); \ } \ -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_PCRCOMMON_HXX_ diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx index cb2a560de9b8..e8ed62bb45eb 100644 --- a/extensions/source/propctrlr/pcrcommontypes.hxx +++ b/extensions/source/propctrlr/pcrcommontypes.hxx @@ -25,17 +25,17 @@ #include <boost/unordered_map.hpp> -//........................................................................ + namespace pcr { -//........................................................................ + typedef ::boost::unordered_map< OUString, ::com::sun::star::beans::Property, OUStringHash > PropertyMap; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX diff --git a/extensions/source/propctrlr/pcrstrings.hxx b/extensions/source/propctrlr/pcrstrings.hxx index 1bb9728d1dcd..8ca438207818 100644 --- a/extensions/source/propctrlr/pcrstrings.hxx +++ b/extensions/source/propctrlr/pcrstrings.hxx @@ -20,17 +20,17 @@ #ifndef _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_ #define _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_ -//............................................................................ + namespace pcr { -//............................................................................ + // properties #define PROPERTY_TABBINGMODEL "TabbingModel" -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_ diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 8f9a0c1133ea..2e3d4d234b0e 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -32,18 +32,18 @@ extern "C" void SAL_CALL createRegistryInfo_OTabOrderDialog() ::pcr::OAutoRegistration< ::pcr::OTabOrderDialog > aAutoRegistration; } -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; - //==================================================================== + //= OTabOrderDialog - //==================================================================== + OTabOrderDialog::OTabOrderDialog( const Reference< XComponentContext >& _rxContext ) :OGenericUnoDialog( _rxContext ) @@ -163,8 +163,8 @@ namespace pcr -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index b294ee8f85d7..ac3c12442d07 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -24,14 +24,14 @@ #include <com/sun/star/awt/XTabControllerModel.hpp> #include <com/sun/star/awt/XControlContainer.hpp> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= OTabOrderDialog - //==================================================================== + class OTabOrderDialog; typedef ::svt::OGenericUnoDialog OTabOrderDialog_DBase; typedef ::comphelper::OPropertyArrayUsageHelper< OTabOrderDialog > OTabOrderDialog_PBase; @@ -81,9 +81,9 @@ namespace pcr virtual Dialog* createDialog(Window* _pParent); }; -//........................................................................ + } // namespacepcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_PCRUNODIALOGS_HXX diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 87c8ec59067c..d7525c75eede 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -59,10 +59,10 @@ extern "C" void SAL_CALL createRegistryInfo_OPropertyBrowserController() ::pcr::OAutoRegistration< ::pcr::OPropertyBrowserController > aAutoRegistration; } -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -78,9 +78,9 @@ namespace pcr using namespace ::com::sun::star::ucb; using namespace ::comphelper; - //======================================================================== + //= OPropertyBrowserController - //======================================================================== + DBG_NAME(OPropertyBrowserController) OPropertyBrowserController::OPropertyBrowserController( const Reference< XComponentContext >& _rxContext ) @@ -979,7 +979,7 @@ namespace pcr { try { - ////////////////////////////////////////////////////////////////////// + // obtain the properties of the object ::std::vector< Property > aProperties; @@ -1142,7 +1142,7 @@ namespace pcr _rDescriptor.assignFrom( handler->second->describePropertyLine( _rProperty.Name, this ) ); - ////////////////////////////////////////////////////////////////////// + _rDescriptor.xPropertyHandler = handler->second; _rDescriptor.sName = _rProperty.Name; @@ -1394,12 +1394,12 @@ namespace pcr // do we have a dedicated handler for this property, which we can delegate some tasks to? PropertyHandlerRef handler = impl_getHandlerForProperty_throw( rName ); - ////////////////////////////////////////////////////////////////////// + // set the value ( only if it's not a placeholder ) if ( !bIsPlaceHolderValue ) handler->setPropertyValue( rName, _rValue ); - ////////////////////////////////////////////////////////////////////// + // re-retrieve the value Any aNormalizedValue = handler->getPropertyValue( rName ); @@ -1745,9 +1745,9 @@ namespace pcr } } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 4a06d5e59fff..d097aebb36d4 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -62,10 +62,10 @@ class Window; -//............................................................................ + namespace pcr { -//............................................................................ + class OPropertyEditor; struct OLineDescriptor; @@ -76,9 +76,9 @@ namespace pcr #endif DBG_NAMEEX( OPropertyBrowserController ) - //======================================================================== + //= OPropertyBrowserController - //======================================================================== + // #95343#------------------------------------------------------------------------------------ typedef ::cppu::WeakImplHelper7 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::awt::XFocusListener @@ -405,9 +405,9 @@ namespace pcr void createWithModel( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel >& _rxModel ); }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_PROPCONTROLLER_HXX_ diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx index 59fca585ab62..eedca3da8020 100644 --- a/extensions/source/propctrlr/propcontrolobserver.hxx +++ b/extensions/source/propctrlr/propcontrolobserver.hxx @@ -21,14 +21,14 @@ #include <com/sun/star/inspection/XPropertyControl.hpp> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= IPropertyControlObserver - //==================================================================== + /** non-UNO version of the XPropertyControlObserver */ class IPropertyControlObserver @@ -41,9 +41,9 @@ namespace pcr ~IPropertyControlObserver() {} }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // PROPCONTROLOBSERVER_HXX diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index 2d194e36b1d0..898057875304 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -28,19 +28,19 @@ #include <algorithm> #include <map> -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::inspection; - //==================================================================== + //= helper - //==================================================================== + namespace { @@ -72,9 +72,9 @@ namespace pcr } } - //==================================================================== + //= PropertyComposer - //==================================================================== + // TODO: there are various places where we determine the first handler in our array which // supports a given property id. This is, at the moment, done with searching all handlers, @@ -498,8 +498,8 @@ namespace pcr return impl_isSupportedProperty_nothrow( _rName ); } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index 3565d8104cdc..31c3a5e43ac6 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -36,14 +36,14 @@ #include <vector> #include <set> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= PropertyComposer - //==================================================================== + typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::inspection::XPropertyHandler , ::com::sun::star::beans::XPropertyChangeListener > PropertyComposer_Base; @@ -142,9 +142,9 @@ namespace pcr }; }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx index d14ae8adf171..6f90086f9695 100644 --- a/extensions/source/propctrlr/propertycontrolextender.cxx +++ b/extensions/source/propctrlr/propertycontrolextender.cxx @@ -24,10 +24,10 @@ #include <tools/diagnose_ex.h> -//........................................................................ + namespace pcr { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -48,18 +48,18 @@ namespace pcr namespace KeyFunction = ::com::sun::star::awt::KeyFunction; - //==================================================================== + //= PropertyControlExtender_Data - //==================================================================== + struct PropertyControlExtender_Data { Reference< XPropertyControl > xControl; Reference< XWindow > xControlWindow; }; - //==================================================================== + //= PropertyControlExtender - //==================================================================== + PropertyControlExtender::PropertyControlExtender( const Reference< XPropertyControl >& _rxObservedControl ) :m_pData( new PropertyControlExtender_Data ) @@ -126,8 +126,8 @@ namespace pcr } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx index f55c8b89353c..b9db12ddd778 100644 --- a/extensions/source/propctrlr/propertycontrolextender.hxx +++ b/extensions/source/propctrlr/propertycontrolextender.hxx @@ -27,14 +27,14 @@ #include <memory> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= PropertyControlExtender - //==================================================================== + struct PropertyControlExtender_Data; typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XKeyListener > PropertyControlExtender_Base; @@ -58,9 +58,9 @@ namespace pcr ::std::auto_ptr< PropertyControlExtender_Data > m_pData; }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 850a5db29398..43ad1b702dcd 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -23,10 +23,10 @@ #include <tools/debug.hxx> -//............................................................................ + namespace pcr { -//............................................................................ + #define LAYOUT_BORDER_LEFT 3 #define LAYOUT_BORDER_TOP 3 @@ -37,9 +37,9 @@ namespace pcr using ::com::sun::star::inspection::XPropertyControl; using ::com::sun::star::uno::Reference; - //================================================================== + // class OPropertyEditor - //================================================================== + DBG_NAME(OPropertyEditor) OPropertyEditor::OPropertyEditor( Window* pParent, WinBits nWinStyle) @@ -521,9 +521,9 @@ namespace pcr return 1L; } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 79f0e67a240e..c7d99a20ff41 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -27,10 +27,10 @@ #include <boost/mem_fn.hpp> #include <map> -//............................................................................ + namespace pcr { -//............................................................................ + class IPropertyLineListener; class IPropertyControlObserver; @@ -38,9 +38,9 @@ namespace pcr struct OLineDescriptor; class OBrowserListBox; - //======================================================================== + //= OPropertyEditor - //======================================================================== + class OPropertyEditor : public Control { private: @@ -143,9 +143,9 @@ namespace pcr DECL_LINK(OnPageActivate, void *); }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_PROPERTYEDITOR_HXX_ diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 32d34e5d2e98..221d8c4428b7 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -53,16 +53,16 @@ namespace com { namespace sun { namespace star { } } } class Window; -//........................................................................ + namespace pcr { -//........................................................................ + typedef sal_Int32 PropertyId; - //==================================================================== + //= PropertyHandler - //==================================================================== + class OPropertyInfoService; typedef ::cppu::WeakComponentImplHelper1 < ::com::sun::star::inspection::XPropertyHandler > PropertyHandler_Base; @@ -146,7 +146,7 @@ namespace pcr */ PropertyId impl_getPropertyId_throw( const OUString& _rPropertyName ) const; - //------------------------------------------------------------------------------- + // helper for implementing doDescribeSupportedProperties /** adds a description for the given string property to the given property vector Most probably to be called from within getSupportedProperties @@ -213,7 +213,7 @@ namespace pcr sal_Int16 _nAttribs = 0 ) const; - //------------------------------------------------------------------------------- + // helper for accessing and maintaining meta data about our supported properties /** retrieves a property given by handle @@ -292,7 +292,7 @@ namespace pcr PropertyHandler& operator=( const PropertyHandler& ); // never implemented }; - //-------------------------------------------------------------------- + inline void PropertyHandler::addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< OUString* >( NULL ) ), _nAttribs ); @@ -334,9 +334,9 @@ namespace pcr return pProp ? pProp->Name : OUString(); } - //==================================================================== + //= PropertyHandlerComponent - //==================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo > PropertyHandlerComponent_Base; /** PropertyHandler implementation which additionally supports XServiceInfo @@ -358,9 +358,9 @@ namespace pcr virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; }; - //==================================================================== + //= HandlerComponentBase - //==================================================================== + /** a PropertyHandlerComponent implementation which routes XServiceInfo::getImplementationName and XServiceInfo::getSupportedServiceNames to static versions of those methods, which are part of the derived class. @@ -404,21 +404,21 @@ namespace pcr static void registerImplementation(); }; - //-------------------------------------------------------------------- + template < class HANDLER > OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return HANDLER::getImplementationName_static(); } - //-------------------------------------------------------------------- + template < class HANDLER > ::com::sun::star::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return HANDLER::getSupportedServiceNames_static(); } - //-------------------------------------------------------------------- + template < class HANDLER > void HandlerComponentBase< HANDLER >::registerImplementation() { @@ -429,16 +429,16 @@ namespace pcr ); } - //-------------------------------------------------------------------- + template < class HANDLER > ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL HandlerComponentBase< HANDLER >::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) { return *( new HANDLER( _rxContext ) ); } -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 2bbf5b76ff3b..601a7a767a09 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -25,14 +25,14 @@ #include <rtl/string.hxx> #include <vector> -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + //= IPropertyInfoService - //======================================================================== + class SAL_NO_VTABLE IPropertyInfoService { public: @@ -49,9 +49,9 @@ namespace pcr virtual ~IPropertyInfoService() { } }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_PROPERTYINFO_HXX_ diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx index e40690f9c40b..28dba6314688 100644 --- a/extensions/source/propctrlr/propeventtranslation.cxx +++ b/extensions/source/propctrlr/propeventtranslation.cxx @@ -22,10 +22,10 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/NullPointerException.hpp> -//........................................................................ + namespace pcr { -//........................................................................ + using ::com::sun::star::beans::PropertyChangeEvent; using ::com::sun::star::uno::RuntimeException; @@ -36,9 +36,9 @@ namespace pcr using ::com::sun::star::lang::DisposedException; using ::com::sun::star::lang::NullPointerException; - //==================================================================== + //= PropertyEventTranslation - //==================================================================== + PropertyEventTranslation::PropertyEventTranslation( const Reference< XPropertyChangeListener >& _rxDelegator, const Reference< XInterface >& _rxTranslatedEventSource ) @@ -84,8 +84,8 @@ namespace pcr m_xTranslatedEventSource.clear(); } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx index b2dbad8ae896..e7b86c29ab84 100644 --- a/extensions/source/propctrlr/propeventtranslation.hxx +++ b/extensions/source/propctrlr/propeventtranslation.hxx @@ -23,14 +23,14 @@ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <cppuhelper/implbase1.hxx> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= PropertyEventTranslation - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener > PropertyEventTranslation_Base; @@ -66,9 +66,9 @@ namespace pcr PropertyEventTranslation& operator=( const PropertyEventTranslation& ); // never implemented }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx index 1315548da4ab..592c9408cec9 100644 --- a/extensions/source/propctrlr/proplinelistener.hxx +++ b/extensions/source/propctrlr/proplinelistener.hxx @@ -22,12 +22,12 @@ #include <rtl/ustring.hxx> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + class IPropertyLineListener { public: @@ -38,9 +38,9 @@ namespace pcr ~IPropertyLineListener() {} }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_PROPLINELISTENER_HXX_ diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc index 6df40f18ad41..fd378c763774 100644 --- a/extensions/source/propctrlr/propresid.hrc +++ b/extensions/source/propctrlr/propresid.hrc @@ -26,9 +26,9 @@ // arbitrary at the moment #define RID_FORMBROWSER_START RID_PROPCONTROLLER_START + 2000 -// ----------------------------------------------------------------------- + // - Strings -// ----------------------------------------------------------------------- + #define RID_STR_STANDARD ( RID_PROPCONTROLLER_START + 0 ) #define RID_STR_PROPPAGE_DEFAULT ( RID_PROPCONTROLLER_START + 1 ) diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx index 0278b036481c..c0fb41346510 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.cxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx @@ -26,10 +26,10 @@ #include <osl/diagnose.h> #include <tools/diagnose_ex.h> -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -76,9 +76,9 @@ namespace pcr } } - //======================================================================== + //= PushButtonNavigation - //======================================================================== + PushButtonNavigation::PushButtonNavigation( const Reference< XPropertySet >& _rxControlModel ) :m_xControlModel( _rxControlModel ) @@ -291,8 +291,8 @@ namespace pcr return !sTargetURL.isEmpty(); } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx index 17dd60cb931a..c1a1dacff5fe 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.hxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.hxx @@ -23,14 +23,14 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyState.hpp> -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + //= PushButtonNavigation - //======================================================================== + class PushButtonNavigation { protected: @@ -93,9 +93,9 @@ namespace pcr sal_Int32 implGetCurrentButtonType() const SAL_THROW(( ::com::sun::star::uno::Exception )); }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // EXTENSIONS_PROPCTRLR_PUSHBUTTONNAVIGATION_HXX diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index d85e626a99fd..bf6950794cf3 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -31,10 +31,10 @@ #include <comphelper/types.hxx> #include "svtools/treelistentry.hxx" -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; @@ -43,9 +43,9 @@ namespace pcr using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; - //======================================================================== + // OSelectLabelDialog - //======================================================================== + DBG_NAME(OSelectLabelDialog) OSelectLabelDialog::OSelectLabelDialog( Window* pParent, Reference< XPropertySet > _xControlModel ) @@ -298,8 +298,8 @@ namespace pcr return 0L; } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 83053a94adb4..ccf52286b1d5 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -28,14 +28,14 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "modulepcr.hxx" -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + // OSelectLabelDialog - //======================================================================== + class OSelectLabelDialog :public ModalDialog ,public PcrClient @@ -71,9 +71,9 @@ namespace pcr DECL_LINK(OnNoAssignmentClicked, Button*); }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_SELECTLABELDIALOG_HXX_ diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 787e60c4a8c2..963c43775eda 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -44,10 +44,10 @@ #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -//........................................................................ + namespace pcr { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::lang::XMultiComponentFactory; @@ -86,17 +86,17 @@ namespace pcr namespace FrameSearchFlag = ::com::sun::star::frame::FrameSearchFlag; namespace CommandType = ::com::sun::star::sdb::CommandType; - //==================================================================== + //= ISQLCommandAdapter - //==================================================================== + ISQLCommandAdapter::~ISQLCommandAdapter() { } - //==================================================================== + //= SQLCommandDesigner - //==================================================================== + SQLCommandDesigner::SQLCommandDesigner( const Reference< XComponentContext >& _rxContext, const ::rtl::Reference< ISQLCommandAdapter >& _rxPropertyAdapter, @@ -371,8 +371,8 @@ namespace pcr return bAllow; } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index 3d48761a6c80..97cc770c7afe 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -32,15 +32,15 @@ #include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + class ISQLCommandAdapter; - //==================================================================== + //= SQLCommandDesigner - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener > SQLCommandDesigner_Base; /** encapsulates the code for calling and managing a query design frame, used @@ -184,9 +184,9 @@ namespace pcr SQLCommandDesigner& operator=( const SQLCommandDesigner& ); // never implemented }; - //==================================================================== + //= ISQLCommandAdapter - //==================================================================== + /** an adapter to forward changed SQL command property values to a component */ class ISQLCommandAdapter : public ::rtl::IReference @@ -205,9 +205,9 @@ namespace pcr virtual ~ISQLCommandAdapter(); }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 5a33afdfb6a7..7d7d38a2d97e 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -30,12 +30,12 @@ #include <rtl/math.hxx> #include <sfx2/objsh.hxx> -//================================================================== + // ugly dependencies for the OColorControl #include <svx/svxids.hrc> #include <svx/drawitem.hxx> #include <svx/xtable.hxx> -//================================================================== + #include <vcl/floatwin.hxx> #include <svtools/svmedit.hxx> #include <svtools/colorcfg.hxx> @@ -45,16 +45,16 @@ #include <vcl/button.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -//================================================================== + #include <limits> #include <boost/bind.hpp> #include <boost/scoped_ptr.hpp> -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -64,9 +64,9 @@ namespace pcr using namespace ::com::sun::star::beans; using namespace ::com::sun::star::inspection; - //================================================================== + //= OTimeControl - //================================================================== + OTimeControl::OTimeControl( Window* pParent, WinBits nWinStyle ) :OTimeControl_Base( PropertyControlType::TimeField, pParent, nWinStyle ) @@ -109,9 +109,9 @@ namespace pcr return ::getCppuType( static_cast< util::Time* >( NULL ) ); } - //================================================================== + //= ODateControl - //================================================================== + ODateControl::ODateControl( Window* pParent, WinBits nWinStyle ) :ODateControl_Base( PropertyControlType::DateField, pParent, nWinStyle | WB_DROPDOWN ) @@ -163,9 +163,9 @@ namespace pcr return ::getCppuType( static_cast< util::Date* >( NULL ) ); } - //================================================================== + //= OEditControl - //================================================================== + OEditControl::OEditControl(Window* _pParent, sal_Bool _bPW, WinBits _nWinStyle) :OEditControl_Base( _bPW ? PropertyControlType::CharacterField : PropertyControlType::TextField, _pParent, _nWinStyle ) @@ -249,9 +249,9 @@ namespace pcr return n; } - //================================================================== + // class ODateTimeControl - //================================================================== + ODateTimeControl::ODateTimeControl( Window* _pParent, WinBits _nWinStyle) :ODateTimeControl_Base( PropertyControlType::DateTimeField, _pParent, _nWinStyle ) @@ -322,9 +322,9 @@ namespace pcr return ::getCppuType( static_cast< util::DateTime* >( NULL ) ); } - //======================================================================== + //= HyperlinkInput - //======================================================================== + HyperlinkInput::HyperlinkInput( Window* _pParent, WinBits _nWinStyle ) :Edit( _pParent, _nWinStyle ) @@ -407,9 +407,9 @@ namespace pcr impl_checkEndClick( rTEvt.GetMouseEvent() ); } - //======================================================================== + //= OHyperlinkControl - //======================================================================== + OHyperlinkControl::OHyperlinkControl( Window* _pParent, WinBits _nWinStyle ) :OHyperlinkControl_Base( PropertyControlType::HyperlinkField, _pParent, _nWinStyle ) @@ -473,9 +473,9 @@ namespace pcr return 0; } - //================================================================== + //= ONumericControl - //================================================================== + ONumericControl::ONumericControl( Window* _pParent, WinBits _nWinStyle ) :ONumericControl_Base( PropertyControlType::NumericField, _pParent, _nWinStyle ) @@ -643,9 +643,9 @@ namespace pcr return ::getCppuType( static_cast< double* >( NULL ) ); } - //================================================================== + //= OColorControl - //================================================================== + #define LB_DEFAULT_COUNT 20 OUString MakeHexStr(sal_uInt32 nVal, sal_Int32 nLength) @@ -794,9 +794,9 @@ namespace pcr m_aImplControl.notifyModifiedValue(); } - //================================================================== + //= OListboxControl - //================================================================== + OListboxControl::OListboxControl( Window* pParent, WinBits nWinStyle) :OListboxControl_Base( PropertyControlType::ListBox, pParent, nWinStyle ) @@ -886,9 +886,9 @@ namespace pcr m_aImplControl.notifyModifiedValue(); } - //================================================================== + //= OComboboxControl - //================================================================== + OComboboxControl::OComboboxControl( Window* pParent, WinBits nWinStyle) :OComboboxControl_Base( PropertyControlType::ComboBox, pParent, nWinStyle ) @@ -955,9 +955,9 @@ namespace pcr return 0L; } - //================================================================== + //= OMultilineFloatingEdit - //================================================================== + class OMultilineFloatingEdit : public FloatingWindow { private: @@ -1018,9 +1018,9 @@ namespace pcr return nResult; } - //================================================================== + //= DropDownEditControl_Base - //================================================================== + DropDownEditControl::DropDownEditControl( Window* _pParent, WinBits _nStyle ) :DropDownEditControl_Base( _pParent, _nStyle ) @@ -1155,7 +1155,7 @@ namespace pcr namespace { - //.............................................................. + StlSyntaxSequence< OUString > lcl_convertMultiLineToList( const OUString& _rCompsedTextWithLineBreaks ) { sal_Int32 nLines = comphelper::string::getTokenCount(_rCompsedTextWithLineBreaks, '\n'); @@ -1180,7 +1180,7 @@ namespace pcr return sMultiLineText; } - //.............................................................. + OUString lcl_convertListToDisplayText( const StlSyntaxSequence< OUString >& _rStrings ) { OUStringBuffer aComposed; @@ -1351,9 +1351,9 @@ namespace pcr return GetText(); } - //================================================================== + //= OMultilineEditControl - //================================================================== + OMultilineEditControl::OMultilineEditControl( Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ) :OMultilineEditControl_Base( _eMode == eMultiLineText ? PropertyControlType::MultiLineTextField : PropertyControlType::StringListField @@ -1416,8 +1416,8 @@ namespace pcr return ::getCppuType( static_cast< Sequence< OUString >* >( NULL ) ); } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 4a11ee56b599..1f0862f93703 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -39,14 +39,14 @@ class PushButton; class MultiLineEdit; -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + //= ListLikeControlWithModifyHandler - //======================================================================== + /** Very small helper class which adds a SetModifyHdl to a ListBox-derived class, thus giving this class the same API (as far as the CommonBehaviourControl is concerned) as all other windows. @@ -69,7 +69,7 @@ namespace pcr bool PreNotify( NotifyEvent& _rNEvt ); }; - //------------------------------------------------------------------------ + template< class LISTBOX_WINDOW > bool ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::PreNotify( NotifyEvent& _rNEvt ) { @@ -93,9 +93,9 @@ namespace pcr return ListBoxType::PreNotify( _rNEvt ); } - //======================================================================== + //= OTimeControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< TimeField > > OTimeControl_Base; class OTimeControl : public OTimeControl_Base { @@ -108,9 +108,9 @@ namespace pcr virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception); }; - //======================================================================== + //= ODateControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< CalendarField > > ODateControl_Base; class ODateControl : public ODateControl_Base { @@ -123,9 +123,9 @@ namespace pcr virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception); }; - //======================================================================== + //= OEditControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< Edit > > OEditControl_Base; class OEditControl : public OEditControl_Base { @@ -144,9 +144,9 @@ namespace pcr virtual void modified(); }; - //======================================================================== + //= ODateTimeControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< FormattedField > > ODateTimeControl_Base; class ODateTimeControl : public ODateTimeControl_Base { @@ -159,9 +159,9 @@ namespace pcr virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception); }; - //======================================================================== + //= HyperlinkInput - //======================================================================== + class HyperlinkInput : public Edit { private: @@ -188,9 +188,9 @@ namespace pcr bool impl_textHitTest( const Point& _rWindowPos ); }; - //======================================================================== + //= OHyperlinkControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XHyperlinkControl, ControlWindow< HyperlinkInput > > OHyperlinkControl_Base; class OHyperlinkControl : public OHyperlinkControl_Base { @@ -217,9 +217,9 @@ namespace pcr DECL_LINK( OnHyperlinkClicked, void* ); }; - //======================================================================== + //= CustomConvertibleNumericField - //======================================================================== + class CustomConvertibleNumericField : public ControlWindow< MetricField > { typedef ControlWindow< MetricField > BaseClass; @@ -233,9 +233,9 @@ namespace pcr sal_Int64 GetLastValue() const { return mnLastValue; } }; - //======================================================================== + //= ONumericControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XNumericControl, CustomConvertibleNumericField > ONumericControl_Base; class ONumericControl : public ONumericControl_Base { @@ -277,9 +277,9 @@ namespace pcr double impl_fieldValueToApiValue_nothrow( sal_Int64 _nFieldValue ) const; }; - //======================================================================== + //= OColorControl - //======================================================================== + typedef CommonBehaviourControl < ::com::sun::star::inspection::XStringListControl , ListLikeControlWithModifyHandler< ColorListBox > > OColorControl_Base; @@ -306,9 +306,9 @@ namespace pcr virtual void modified(); }; - //======================================================================== + //= OListboxControl - //======================================================================== + typedef CommonBehaviourControl < ::com::sun::star::inspection::XStringListControl , ListLikeControlWithModifyHandler< ListBox > > OListboxControl_Base; @@ -332,9 +332,9 @@ namespace pcr virtual void modified(); }; - //======================================================================== + //= OComboboxControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XStringListControl, ControlWindow< ComboBox > > OComboboxControl_Base; class OComboboxControl : public OComboboxControl_Base { @@ -356,17 +356,17 @@ namespace pcr DECL_LINK( OnEntrySelected, void* ); }; - //======================================================================== + //= DropDownEditControl - //======================================================================== + enum MultiLineOperationMode { eStringList, eMultiLineText }; - //======================================================================== + //= DropDownEditControl - //======================================================================== + class OMultilineFloatingEdit; typedef ControlWindow< Edit > DropDownEditControl_Base; /** an Edit field which can be used as ControlWindow, and has a drop-down button @@ -412,9 +412,9 @@ namespace pcr sal_Bool ShowDropDown( sal_Bool bShow ); }; - //======================================================================== + //= OMultilineEditControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, DropDownEditControl > OMultilineEditControl_Base; class OMultilineEditControl : public OMultilineEditControl_Base { @@ -427,9 +427,9 @@ namespace pcr virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception); }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_STANDARDCONTROL_HXX_ diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 75d21d9a954e..c41d2893b081 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -36,10 +36,10 @@ extern "C" void SAL_CALL createRegistryInfo_SubmissionPropertyHandler() ::pcr::SubmissionPropertyHandler::registerImplementation(); } -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::comphelper; using namespace ::com::sun::star; @@ -52,9 +52,9 @@ namespace pcr using namespace ::com::sun::star::container; using namespace ::com::sun::star::inspection; - //==================================================================== + //= SubmissionHelper - //==================================================================== + SubmissionHelper::SubmissionHelper( ::osl::Mutex& _rMutex, const Reference< XPropertySet >& _rxIntrospectee, const Reference< frame::XModel >& _rxContextDocument ) :EFormsHelper( _rMutex, _rxIntrospectee, _rxContextDocument ) @@ -83,9 +83,9 @@ namespace pcr return false; } - //==================================================================== + //= SubmissionPropertyHandler - //==================================================================== + DBG_NAME( SubmissionPropertyHandler ) SubmissionPropertyHandler::SubmissionPropertyHandler( const Reference< XComponentContext >& _rxContext ) @@ -430,8 +430,8 @@ namespace pcr firePropertyChange( PROPERTY_XFORMS_BUTTONTYPE, PROPERTY_ID_XFORMS_BUTTONTYPE, _rEvent.OldValue, _rEvent.NewValue ); } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index a20766466534..e3ae2d67e441 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -31,14 +31,14 @@ namespace comphelper class OPropertyChangeMultiplexer; } -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= SubmissionHelper - //==================================================================== + class SubmissionHelper : public EFormsHelper { public: @@ -59,9 +59,9 @@ namespace pcr ) SAL_THROW(()); }; - //==================================================================== + //= SubmissionPropertyHandler - //==================================================================== + class SubmissionPropertyHandler; typedef HandlerComponentBase< SubmissionPropertyHandler > EditPropertyHandler_Base; /** a property handler for any virtual string properties @@ -107,9 +107,9 @@ namespace pcr virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_SUBMISSIONHANDLER_HXX diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 4df386c5432c..9e3d08e12cc1 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -31,10 +31,10 @@ #include <svtools/treelistentry.hxx> #include <vcl/builder.hxx> -//............................................................................ + namespace pcr { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -43,9 +43,9 @@ namespace pcr using namespace ::com::sun::star::beans; using namespace ::com::sun::star::datatransfer; - //======================================================================== + //= OSimpleTabModel - //======================================================================== + class OSimpleTabModel : public ::cppu::WeakImplHelper1< XTabControllerModel> { Sequence< Reference< XControlModel > > m_aModels; @@ -67,9 +67,9 @@ namespace pcr virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException, std::exception ){}; }; - //======================================================================== + //= TabOrderDialog - //======================================================================== + DBG_NAME(TabOrderDialog) TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel, @@ -288,9 +288,9 @@ namespace pcr return 0; } - //======================================================================== + //= TabOrderListBox - //======================================================================== + DBG_NAME(TabOrderListBox); TabOrderListBox::TabOrderListBox( Window* pParent, WinBits nBits ) @@ -336,7 +336,7 @@ namespace pcr { ((TabOrderDialog*)GetParentDialog())->SetModified(); - ////////////////////////////////////////////////////////////////////// + // move entries if( nRelPos < 0 ) { @@ -402,8 +402,8 @@ namespace pcr } } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 75f2d392eb37..2a75e8eb7972 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -35,14 +35,14 @@ #include <comphelper/uno3.hxx> -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + //= TabOrderListBox - //======================================================================== + class TabOrderListBox : public SvTreeListBox { public: @@ -59,9 +59,9 @@ namespace pcr }; - //======================================================================== + //= TabOrderDialog - //======================================================================== + class TabOrderDialog : public ModalDialog { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > @@ -106,9 +106,9 @@ namespace pcr void SetModified(); }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx index 2c66b83e52b3..5b9d3169a586 100644 --- a/extensions/source/propctrlr/unourl.cxx +++ b/extensions/source/propctrlr/unourl.cxx @@ -22,18 +22,18 @@ #include <com/sun/star/util/XURLTransformer.hpp> #include <comphelper/processfactory.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; - //==================================================================== + //= UnoURL - //==================================================================== + UnoURL::UnoURL( const OUString& _rCompleteURL, const Reference< XMultiServiceFactory >& _rxORB ) { m_aURL.Complete = _rCompleteURL; @@ -56,8 +56,8 @@ namespace pcr } } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index 474924776963..fa85362b2685 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.hxx @@ -23,14 +23,14 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/URL.hpp> -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= UnoURL - //==================================================================== + class UnoURL { private: @@ -49,9 +49,9 @@ namespace pcr UnoURL(); // never implemented }; -//........................................................................ + } // namespacepcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_UNOURL_HXX diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index fdbd98a97cca..ffcd96d28aa7 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -29,10 +29,10 @@ #include "modulepcr.hxx" #include "propresid.hrc" -//............................................................................ + namespace pcr { -//............................................................................ + using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Type; @@ -41,9 +41,9 @@ namespace pcr namespace PropertyControlType = ::com::sun::star::inspection::PropertyControlType; - //================================================================== + // NumberFormatSampleField - //================================================================== + bool NumberFormatSampleField::PreNotify( NotifyEvent& rNEvt ) { @@ -83,9 +83,9 @@ namespace pcr } } - //================================================================== + // OFormatSampleControl - //================================================================== + OFormatSampleControl::OFormatSampleControl( Window* pParent, WinBits nWinStyle ) :OFormatSampleControl_Base( PropertyControlType::Unknown, pParent, nWinStyle ) @@ -165,9 +165,9 @@ namespace pcr return ::getCppuType( static_cast< sal_Int32* >( NULL ) ); } - //================================================================== + // class OFormattedNumericControl - //================================================================== + DBG_NAME(OFormattedNumericControl); OFormattedNumericControl::OFormattedNumericControl( Window* pParent, WinBits nWinStyle ) @@ -261,9 +261,9 @@ namespace pcr } } - //======================================================================== + //= OFileUrlControl - //======================================================================== + OFileUrlControl::OFileUrlControl( Window* pParent, WinBits nWinStyle ) :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, nWinStyle | WB_DROPDOWN ) @@ -307,9 +307,9 @@ namespace pcr return ::getCppuType( static_cast< OUString* >( NULL ) ); } - //======================================================================== + //= OTimeDurationControl - //======================================================================== + OTimeDurationControl::OTimeDurationControl( ::Window* pParent, WinBits nWinStyle ) :ONumericControl( pParent, nWinStyle ) @@ -350,8 +350,8 @@ namespace pcr return 0L; } -//............................................................................ + } // namespace pcr -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 8701c7d134d3..da2503640add 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -27,14 +27,14 @@ class SvNumberFormatsSupplierObj; -//............................................................................ + namespace pcr { -//............................................................................ - //======================================================================== + + //= NumberFormatSampleField - //======================================================================== + class NumberFormatSampleField : public ControlWindow< FormattedField > { private: @@ -52,9 +52,9 @@ namespace pcr virtual bool PreNotify( NotifyEvent& rNEvt ); }; - //======================================================================== + //= OFormatSampleControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, NumberFormatSampleField > OFormatSampleControl_Base; class OFormatSampleControl : public OFormatSampleControl_Base { @@ -83,18 +83,18 @@ namespace pcr static double getPreviewValue( const SvNumberformat& i_rEntry ); }; - //======================================================================== + //= FormatDescription - //======================================================================== + struct FormatDescription { SvNumberFormatsSupplierObj* pSupplier; sal_Int32 nKey; }; - //======================================================================== + //= OFormattedNumericControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< FormattedField > > OFormattedNumericControl_Base; class OFormattedNumericControl : public OFormattedNumericControl_Base { @@ -121,9 +121,9 @@ namespace pcr ~OFormattedNumericControl(); }; - //======================================================================== + //= OFileUrlControl - //======================================================================== + typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< ::svt::FileURLBox > > OFileUrlControl_Base; class OFileUrlControl : public OFileUrlControl_Base { @@ -139,9 +139,9 @@ namespace pcr ~OFileUrlControl(); }; - //======================================================================== + //= OTimeDurationControl - //======================================================================== + class OTimeDurationControl : public ONumericControl { public: @@ -155,9 +155,9 @@ namespace pcr DECL_LINK( OnCustomConvert, MetricField* ); }; -//............................................................................ + } // namespace pcr -//............................................................................ + #endif // _EXTENSIONS_PROPCTRLR_USERCONTROL_HXX_ diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx index 30073ac652c2..b6274c32894d 100644 --- a/extensions/source/propctrlr/xsddatatypes.cxx +++ b/extensions/source/propctrlr/xsddatatypes.cxx @@ -25,18 +25,18 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <tools/debug.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xsd; using namespace ::com::sun::star::beans; - //==================================================================== + //= helper - //==================================================================== + template< typename INTERFACE, typename ARGUMENT > void setSave( INTERFACE* pObject, void ( SAL_CALL INTERFACE::*pSetter )( ARGUMENT ), ARGUMENT _rArg ) @@ -82,9 +82,9 @@ namespace pcr return aReturn; } - //==================================================================== + //= XSDDataType - //==================================================================== + XSDDataType::XSDDataType( const Reference< XDataType >& _rxDataType ) :m_xDataType( _rxDataType ) @@ -232,8 +232,8 @@ namespace pcr } } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index dfa5cebb52f8..425ccf564724 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -32,14 +32,14 @@ namespace com { namespace sun { namespace star { } } } } -//........................................................................ + namespace pcr { -//........................................................................ - //==================================================================== + + //= XSDDataType - //==================================================================== + class XSDDataType : public ::rtl::IReference { private: @@ -95,9 +95,9 @@ namespace pcr XSDDataType& operator=( const XSDDataType& ); // never implemented }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index ceffc2127fb3..b5ffd5707a5c 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -30,10 +30,10 @@ #include <unotools/syslocale.hxx> #include <tools/diagnose_ex.h> -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -45,9 +45,9 @@ namespace pcr namespace NumberFormat = ::com::sun::star::util::NumberFormat; - //==================================================================== + //= XSDValidationHelper - //==================================================================== + XSDValidationHelper::XSDValidationHelper( ::osl::Mutex& _rMutex, const Reference< XPropertySet >& _rxIntrospectee, const Reference< frame::XModel >& _rxContextDocument ) :EFormsHelper( _rMutex, _rxIntrospectee, _rxContextDocument ) @@ -394,8 +394,8 @@ namespace pcr return sReturn; } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx index c4d96868357b..4bbf1ae4e746 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.hxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx @@ -27,15 +27,15 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <rtl/ref.hxx> -//........................................................................ + namespace pcr { -//........................................................................ + class XSDDataType; - //==================================================================== + //= XSDValidationHelper - //==================================================================== + class XSDValidationHelper : public EFormsHelper { private: @@ -132,9 +132,9 @@ namespace pcr ) const SAL_THROW(()); }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONHELPER_HXX diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index f54356c088d1..1aba285dcab8 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -52,10 +52,10 @@ extern "C" void SAL_CALL createRegistryInfo_XSDValidationPropertyHandler() ::pcr::XSDValidationPropertyHandler::registerImplementation(); } -//........................................................................ + namespace pcr { -//........................................................................ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -68,9 +68,9 @@ namespace pcr using ::com::sun::star::beans::PropertyAttribute::MAYBEVOID; - //==================================================================== + //= XSDValidationPropertyHandler - //==================================================================== + DBG_NAME( XSDValidationPropertyHandler ) XSDValidationPropertyHandler::XSDValidationPropertyHandler( const Reference< XComponentContext >& _rxContext ) @@ -675,8 +675,8 @@ namespace pcr } } -//........................................................................ + } // namespace pcr -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index 7c34512b486b..9c0926370d4e 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -24,15 +24,15 @@ #include <memory> -//........................................................................ + namespace pcr { -//........................................................................ + class XSDValidationHelper; - //==================================================================== + //= XSDValidationPropertyHandler - //==================================================================== + class XSDValidationPropertyHandler; typedef HandlerComponentBase< XSDValidationPropertyHandler > XSDValidationPropertyHandler_Base; class XSDValidationPropertyHandler : public XSDValidationPropertyHandler_Base @@ -84,9 +84,9 @@ namespace pcr void implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); }; -//........................................................................ + } // namespace pcr -//........................................................................ + #endif // EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONPROPERTYHANDLER_HXX diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index 4489916e6b51..6b6942161245 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -25,9 +25,9 @@ #include <sane/sane.h> #include <scanner.hxx> -// --------------------- + // - BitmapTransporter - -// --------------------- + class BitmapTransporter : public OWeakObject, css::awt::XBitmap { @@ -55,9 +55,9 @@ public: SvMemoryStream& getStream() { return m_aStream; } }; -// -------- + // - Sane - -// -------- + class Sane { diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index b4bf54b78ea9..4a86c0fc58a7 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -532,7 +532,7 @@ UpdateCheckThread::run() if( ! hasInternetConnection() || ! runCheck( bExtensionsChecked ) ) { // the extension update check should be independent from the office update check - // + osl_getSystemTime( &systime ); if ( nExtCheckTime.Seconds + offset < systime.Seconds ) bExtensionsChecked = false; diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx index d62f89e50664..842066a1f7c9 100644 --- a/extensions/source/update/check/updatecheckconfig.hxx +++ b/extensions/source/update/check/updatecheckconfig.hxx @@ -198,7 +198,7 @@ private: const ::rtl::Reference< UpdateCheckConfigListener > m_rListener; }; -//------------------------------------------------------------------------------ + template <typename T> diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp index 49a45826c38f..a981e7b43eeb 100644 --- a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp +++ b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp @@ -37,7 +37,7 @@ OBJECT_ENTRY(CLSID_Basic, CBasic) OBJECT_ENTRY(CLSID_Foo, CFoo) END_OBJECT_MAP() -///////////////////////////////////////////////////////////////////////////// + // DLL Entry Point extern "C" @@ -53,7 +53,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) return TRUE; // ok } -///////////////////////////////////////////////////////////////////////////// + // Used to determine whether the DLL can be unloaded by OLE STDAPI DllCanUnloadNow(void) @@ -61,7 +61,7 @@ STDAPI DllCanUnloadNow(void) return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; } -///////////////////////////////////////////////////////////////////////////// + // Returns a class factory to create an object of the requested type STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) @@ -69,7 +69,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -78,7 +78,7 @@ STDAPI DllRegisterServer(void) return _Module.RegisterServer(TRUE); } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - Removes entries from the system registry STDAPI DllUnregisterServer(void) diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.idl b/extensions/test/ole/AxTestComponents/AxTestComponents.idl index f2c93105a822..550eb0c5a46b 100644 --- a/extensions/test/ole/AxTestComponents/AxTestComponents.idl +++ b/extensions/test/ole/AxTestComponents/AxTestComponents.idl @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ // AxTestComponents.idl : IDL source for AxTestComponents.dll -// + // This file will be processed by the MIDL tool to // produce the type library (AxTestComponents.tlb) and marshalling code. diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.rc b/extensions/test/ole/AxTestComponents/AxTestComponents.rc index e9e4171c8e2a..da5d58f6575c 100644 --- a/extensions/test/ole/AxTestComponents/AxTestComponents.rc +++ b/extensions/test/ole/AxTestComponents/AxTestComponents.rc @@ -17,20 +17,20 @@ */ //Microsoft Developer Studio generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include "winres.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -39,18 +39,18 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // REGISTRY -// + IDR_BASIC REGISTRY DISCARDABLE "Basic.rgs" IDR_FOO REGISTRY DISCARDABLE "Basic.rgs" #endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// + + // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) @@ -60,10 +60,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -86,10 +86,10 @@ END #ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// + + // Version -// + VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,1 @@ -128,10 +128,10 @@ END #endif // !_MAC -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -139,17 +139,17 @@ BEGIN END #endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// + 1 TYPELIB "AxTestComponents.tlb" -///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED diff --git a/extensions/test/ole/AxTestComponents/Basic.cpp b/extensions/test/ole/AxTestComponents/Basic.cpp index 35986d27086f..d35469e3f611 100644 --- a/extensions/test/ole/AxTestComponents/Basic.cpp +++ b/extensions/test/ole/AxTestComponents/Basic.cpp @@ -21,7 +21,7 @@ #include "Basic.h" -///////////////////////////////////////////////////////////////////////////// + // CBasic CBasic::CBasic(): m_cPrpByte(0),m_nPrpShort(0),m_lPrpLong(0),m_fPrpFloat(0), m_dPrpDouble(0),m_PrpArray(0), m_safearray(NULL), m_bool(VARIANT_FALSE), diff --git a/extensions/test/ole/AxTestComponents/Basic.h b/extensions/test/ole/AxTestComponents/Basic.h index 9015ac3de0b5..13268cadb616 100644 --- a/extensions/test/ole/AxTestComponents/Basic.h +++ b/extensions/test/ole/AxTestComponents/Basic.h @@ -24,7 +24,7 @@ #include "resource.h" #import "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids -///////////////////////////////////////////////////////////////////////////// + // CBasic class ATL_NO_VTABLE CBasic : public CComObjectRootEx<CComSingleThreadModel>, diff --git a/extensions/test/ole/AxTestComponents/Foo.cpp b/extensions/test/ole/AxTestComponents/Foo.cpp index a9283dd2b88b..a5064278b8ff 100644 --- a/extensions/test/ole/AxTestComponents/Foo.cpp +++ b/extensions/test/ole/AxTestComponents/Foo.cpp @@ -21,7 +21,7 @@ #include "Foo.h" -///////////////////////////////////////////////////////////////////////////// + // CBasic CFoo::CFoo() { diff --git a/extensions/test/ole/AxTestComponents/Foo.h b/extensions/test/ole/AxTestComponents/Foo.h index 70c93dd819c7..2142b5248532 100644 --- a/extensions/test/ole/AxTestComponents/Foo.h +++ b/extensions/test/ole/AxTestComponents/Foo.h @@ -24,7 +24,7 @@ #include "resource.h" #import "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids -///////////////////////////////////////////////////////////////////////////// + // CBasic class ATL_NO_VTABLE CFoo : public CComObjectRootEx<CComSingleThreadModel>, diff --git a/extensions/test/ole/AxTestComponents/resource.h b/extensions/test/ole/AxTestComponents/resource.h index 49c06e9ddc2f..e741826b54bd 100644 --- a/extensions/test/ole/AxTestComponents/resource.h +++ b/extensions/test/ole/AxTestComponents/resource.h @@ -19,13 +19,13 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by AxTestComponents.rc -// + #define IDS_PROJNAME 100 #define IDR_BASIC 101 //#define IDR_FOO 501 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp index 86c20c0a8610..5509cd99aa67 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp @@ -38,7 +38,7 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_EvtListener, CEvtListener) END_OBJECT_MAP() -///////////////////////////////////////////////////////////////////////////// + // DLL Entry Point extern "C" @@ -54,7 +54,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) return TRUE; // ok } -///////////////////////////////////////////////////////////////////////////// + // Used to determine whether the DLL can be unloaded by OLE STDAPI DllCanUnloadNow(void) @@ -62,7 +62,7 @@ STDAPI DllCanUnloadNow(void) return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; } -///////////////////////////////////////////////////////////////////////////// + // Returns a class factory to create an object of the requested type STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) @@ -70,7 +70,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -79,7 +79,7 @@ STDAPI DllRegisterServer(void) return _Module.RegisterServer(TRUE); } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - Removes entries from the system registry STDAPI DllUnregisterServer(void) diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl b/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl index 846f168db3ec..7786222a63c8 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl @@ -17,7 +17,7 @@ */ // EventListener.idl : IDL source for EventListener.dll -// + // This file will be processed by the MIDL tool to // produce the type library (EventListener.tlb) and marshalling code. diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc b/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc index 7c97bb33835b..418ce2686961 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc @@ -17,20 +17,20 @@ */ // Microsoft Developer Studio generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include "winres.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // Deutsch (Deutschland) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -40,10 +40,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #endif //_WIN32 #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -66,10 +66,10 @@ END #ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// + + // Version -// + VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,1 @@ -108,10 +108,10 @@ END #endif // !_MAC -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -119,10 +119,10 @@ BEGIN END #endif // Deutsch (Deutschland) resources -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// + + // Englisch (USA) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) @@ -131,24 +131,24 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // REGISTRY -// + IDR_EVTLISTENER REGISTRY DISCARDABLE "EvtListener.rgs" #endif // Englisch (USA) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// + 1 TYPELIB "EventListener.tlb" -///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED diff --git a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp index c230a0c508d2..ca5c0bbc8d03 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp +++ b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp @@ -21,7 +21,7 @@ #include "EventListener.h" #include "EvtListener.h" -///////////////////////////////////////////////////////////////////////////// + // CEvtListener STDMETHODIMP CEvtListener::disposing( IDispatch* source) diff --git a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h index 272770816cfb..249a71653464 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h +++ b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h @@ -23,7 +23,7 @@ #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + // CEvtListener class ATL_NO_VTABLE CEvtListener : public CComObjectRootEx<CComSingleThreadModel>, diff --git a/extensions/test/ole/EventListenerSample/EventListener/resource.h b/extensions/test/ole/EventListenerSample/EventListener/resource.h index ee46ea07c12a..783a14507631 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/resource.h +++ b/extensions/test/ole/EventListenerSample/EventListener/resource.h @@ -19,12 +19,12 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by EventListener.rc -// + #define IDS_PROJNAME 100 #define IDR_EVTLISTENER 101 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 diff --git a/extensions/test/ole/JScriptNewStyle.htm b/extensions/test/ole/JScriptNewStyle.htm index 8568df37bf29..28b928630f07 100644 --- a/extensions/test/ole/JScriptNewStyle.htm +++ b/extensions/test/ole/JScriptNewStyle.htm @@ -25,11 +25,11 @@ <script language="JScript"> function callOleTest( id) -{ +{ var factory= new ActiveXObject("com.sun.star.ServiceManager"); var oletest= factory.createInstance("oletest.OleTest"); // alert(oletest); - + var arr= new Array( 1, 2, 3, 4, 0); var arrDouble= new Array( 1.2345, 12.345, 123,45, 1234.5, 12345); var arrBool= new Array( 1, 0, 2, 0, 3); @@ -43,7 +43,7 @@ function callOleTest( id) // ob.value= "A JScript object"; // var arrObject= new Array( ob, ob, ob); - + var arrout1= new Array(); var arrout2= new Array(); var arrout3= new Array(); @@ -64,9 +64,9 @@ function callOleTest( id) switch( id) { // Array in-params - case 1: + case 1: value.Set("[]byte", arr) - ret= oletest.methodByte( value); + ret= oletest.methodByte( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() + "<br>"); document.writeln( "Returns a Sequence< BYTE > <br>" + sfarray.toArray()) ; break; @@ -78,69 +78,69 @@ function callOleTest( id) document.writeln( "Param: " + arrDouble.toString() +"<br>"); document.writeln( "Returns a Sequence< double > <br>" + sfarray.toArray()) ; break; - case 3: + case 3: value.Set("[]boolean", arrBool) - ret= oletest.methodBool( value); + ret= oletest.methodBool( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arrBool.toString() +"<br>"); document.writeln( "Returns a Sequence< BOOL > <br>" + sfarray.toArray()) ; break; - case 4: + case 4: value.Set("[]short", arr) - ret= oletest.methodShort( value); + ret= oletest.methodShort( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< SHORT > <br>" + sfarray.toArray()) ; break; - case 5: + case 5: value.Set("[]unsigned short", arr) ret= oletest.methodUShort( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< unsigned SHORT > <br>" + sfarray.toArray()) ; break; - case 6: + case 6: value.Set("[]long", arr) - ret= oletest.methodLong( value); + ret= oletest.methodLong( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< LONG > <br>" + sfarray.toArray()) ; break; - case 7: + case 7: value.Set("[]unsigned long", arr) ret= oletest.methodULong( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< unsigned LONG > <br>" + sfarray.toArray()) ; break; - case 8: + case 8: value.Set("[]char", arrChar) - ret= oletest.methodChar( value); + ret= oletest.methodChar( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arrChar.toString() +"<br>"); document.writeln( "Returns a Sequence< wchar_t > <br>" + sfarray.toArray()) ; break; - case 9: + case 9: value.Set("[]string", arrString) - ret= oletest.methodString( value); - sfarray= new VBArray( ret); + ret= oletest.methodString( value); + sfarray= new VBArray( ret); document.writeln( "Param: " + arrString.toString() +"<br>"); document.writeln( "Returns a Sequence< UString > <br>" + sfarray.toArray()) ; break; - case 10: + case 10: value.Set("[]any", arrAny) ret= oletest.methodAny( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arrAny.toString() +"<br>"); document.writeln( "Returns a Sequence< UsrAny > <br>" + sfarray.toArray() ) ; break; - - case 11: + + case 11: var allArray= new Array(); for(var i= 0; i <3; i++) { var value1= oletest._GetValueObject(); value1.Set("[]long", arr); - allArray[i]= value1; + allArray[i]= value1; } value.Set("[][]long", allArray); @@ -150,7 +150,7 @@ function callOleTest( id) document.writeln( "Param: " + arrSeq.toString() +"<br>"); document.writeln("Returns a Sequence< Sequence < long >> <br>") ; var arr1= new Array(); - arr1= sfarray.toArray(); + arr1= sfarray.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -160,7 +160,7 @@ function callOleTest( id) } break; - case 12: + case 12: var array1= new Array(); for(var i= 0; i <3; i++) { @@ -171,18 +171,18 @@ function callOleTest( id) value2.Set("[]long", arr); array2[j]= value2; } - + var value1= oletest._GetValueObject(); - value1.Set("[][]long", array2) - array1[i]= value1; + value1.Set("[][]long", array2) + array1[i]= value1; } var valueAll= oletest._GetValueObject(); valueAll.Set("[][][]long",array1); - ret= oletest.methodSequence2( valueAll); + ret= oletest.methodSequence2( valueAll); document.writeln( "Param: " + arrSeq2.toString() +"<br>"); sfarray1= new VBArray( ret); - arr1= sfarray1.toArray(); + arr1= sfarray1.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -195,12 +195,12 @@ function callOleTest( id) document.write( i+ " "); document.writeln(j + ": "+ arr3.toString() + "<br>" ); } - + } break; case 13: - + var ar= new Array(); for( i=0; i< 3; i++) { @@ -235,105 +235,105 @@ function callOleTest( id) // Properties: setting and getting values - case 200: + case 200: value.Set("[]byte", arr) oletest.AttrByte = value; - ret= oletest.AttrByte; + ret= oletest.AttrByte; sfarray= new VBArray( ret); document.writeln("Setting AttrByte: " + arr.toString() + "<p>"); document.writeln("Getting AttrByte: " + sfarray.toArray()); break; - case 201: + case 201: value.Set("[]double", arrDouble) - oletest.AttrDouble= value; - ret= oletest.AttrDouble; + oletest.AttrDouble= value; + ret= oletest.AttrDouble; sfarray= new VBArray( ret); document.writeln("Setting AttrDouble: " + arrDouble.toString() + "<p>"); document.writeln("Getting AttrDouble: " + sfarray.toArray()); break; - case 202: + case 202: value.Set("[]boolean", arrBool) oletest.AttrBool= value; - ret= oletest.AttrBool; + ret= oletest.AttrBool; sfarray= new VBArray( ret); document.writeln("Setting AttrBool: " + arrBool.toString() + "<p>"); document.writeln("Getting AttrBool: " + sfarray.toArray()); break; - case 203: + case 203: value.Set("[]short", arr) - oletest.AttrShort= value; - ret= oletest.AttrShort; + oletest.AttrShort= value; + ret= oletest.AttrShort; sfarray= new VBArray( ret); document.writeln("Setting AttrShort: " + arr.toString() + "<p>"); document.writeln("Getting AttrShort: " + sfarray.toArray()); break; - case 204: + case 204: value.Set("[]unsigned short", arr) - oletest.AttrUShort= value; - ret= oletest.AttrUShort; + oletest.AttrUShort= value; + ret= oletest.AttrUShort; sfarray= new VBArray( ret); document.writeln("Setting AttrUShort: " + arr.toString() + "<p>"); document.writeln("Getting AttrUShort: " + sfarray.toArray()); break; - case 205: + case 205: value.Set("[]long", arr) - oletest.AttrLong= value; - ret= oletest.AttrLong; + oletest.AttrLong= value; + ret= oletest.AttrLong; sfarray= new VBArray( ret); document.writeln("Setting AttrLong: " + arr.toString() + "<p>"); document.writeln("Getting AttrLong: " + sfarray.toArray()); break; - case 206: + case 206: value.Set("[]unsigned long", arr) - oletest.AttrULong= value; - ret= oletest.AttrULong; + oletest.AttrULong= value; + ret= oletest.AttrULong; sfarray= new VBArray( ret); document.writeln("Setting AttrULong: " + arr.toString() + "<p>"); document.writeln("Getting AttrULong: " + sfarray.toArray()); break; - case 207: + case 207: value.Set("[]char", arrChar) - oletest.AttrChar= value; - ret= oletest.AttrChar; + oletest.AttrChar= value; + ret= oletest.AttrChar; sfarray= new VBArray( ret); document.writeln("Setting AttrChar: " + arrChar.toString() + "<p>"); document.writeln("Getting AttrChar: " + sfarray.toArray()); break; - case 208: + case 208: value.Set("[]string", arrString) - oletest.AttrString= value; - ret= oletest.AttrString; + oletest.AttrString= value; + ret= oletest.AttrString; sfarray= new VBArray( ret); document.writeln("Setting AttrString: " + arrString.toString() + "<p>"); document.writeln("Getting AttrString: " + sfarray.toArray()); break; - case 209: + case 209: value.Set("[]any", arrAny) - oletest.AttrAny= value; - ret= oletest.AttrAny; + oletest.AttrAny= value; + ret= oletest.AttrAny; sfarray= new VBArray( ret); document.writeln("Setting AttrAny: " + arrAny.toString() + "<p>"); document.writeln("Getting AttrAny: " + sfarray.toArray()); break; - case 210: + case 210: var allArray= new Array(); for(var i= 0; i <3; i++) { var value1= oletest._GetValueObject(); value1.Set("[]long", arr); - allArray[i]= value1; + allArray[i]= value1; } value.Set("[][]long", allArray); - oletest.AttrSequence= value; - ret= oletest.AttrSequence; + oletest.AttrSequence= value; + ret= oletest.AttrSequence; sfarray= new VBArray( ret); document.writeln( "Param: " + arrSeq.toString() +"<br>"); document.writeln("Returns a Sequence< Sequence < long >> <br>") ; var arr1= new Array(); - arr1= sfarray.toArray(); + arr1= sfarray.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -343,7 +343,7 @@ function callOleTest( id) } break; - case 211: + case 211: var array1= new Array(); for(var i= 0; i <3; i++) { @@ -354,18 +354,18 @@ function callOleTest( id) value2.Set("[]long", arr); array2[j]= value2; } - + var value1= oletest._GetValueObject(); - value1.Set("[][]long", array2) - array1[i]= value1; + value1.Set("[][]long", array2) + array1[i]= value1; } var valueAll= oletest._GetValueObject(); valueAll.Set("[][][]long",array1); - oletest.AttrSequence2= valueAll; - ret= oletest.AttrSequence2; + oletest.AttrSequence2= valueAll; + ret= oletest.AttrSequence2; sfarray1= new VBArray( ret); - arr1= sfarray1.toArray(); + arr1= sfarray1.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -378,7 +378,7 @@ function callOleTest( id) document.write( i+ " "); document.writeln(j + ": "+ arr3.toString() + "<br>" ); } - + } break; @@ -393,7 +393,7 @@ function callOleTest( id) ar[i]= valueObject; } value.Set("[]com.sun.star.uno.XInterface", ar); - + oletest.AttrXInterface= value; ret= oletest.AttrXInterface; sfarray= new VBArray( ret); @@ -414,29 +414,29 @@ function callOleTest( id) break; // Out-parameter ------------------------------------------------------------ - case (2000): - + case (2000): + oletest.testout_methodByte( outValue ); alert("byte: " + outValue.Get() ); break; - case (2001): + case (2001): oletest.testout_methodDouble( outValue ); alert( "double: " + outValue.Get() ); break; case (2002): oletest.testout_methodBool( outValue ); alert( "boolean: " + outValue.Get() ); break; - case (2003): + case (2003): oletest.testout_methodShort( outValue ); alert( "short: " + outValue.Get() ); break; case (2004): oletest.testout_methodUShort( outValue ); alert( "unsigned short: " + outValue.Get() ); break; - case (2005): + case (2005): oletest.testout_methodLong( outValue ); alert( "long: " + outValue.Get() ); break; - case (2006): + case (2006): oletest.testout_methodULong( outValue ); alert( "unsigned long: " + outValue.Get() ); break; - case (2007): + case (2007): oletest.testout_methodChar( outValue ); alert( "char: " + outValue.Get() ); break; case (2008): @@ -452,7 +452,7 @@ function callOleTest( id) document.writeln("use the browser's back arrow to go to the previous page <p>"); document.writeln( arr.toString()); break; - case (2011): + case (2011): oletest.testout_methodSequence2( outValue ); var sfarray= new VBArray( outValue.Get()); arr= sfarray.toArray(); @@ -481,11 +481,11 @@ function callOleTest( id) // INOUT - Parameter ------------------------------------------------------------------------------- // The in value has to be placed on index 0 of the passed in array - case (500): + case (500): inoutValue.InitInOutParam("byte", 100); oletest.testinout_methodByte( inoutValue ); alert("byte: " + inoutValue.Get() ); break; - case (501): + case (501): inoutValue.InitInOutParam("double", 3.14); oletest.testinout_methodDouble( inoutValue ); alert( "double: " + inoutValue.Get() ); break; @@ -493,7 +493,7 @@ function callOleTest( id) inoutValue.InitInOutParam("boolean", false); oletest.testinout_methodBool( inoutValue ); alert( "boolean: " + inoutValue.Get() ); break; - case (503): + case (503): inoutValue.InitInOutParam( "short", 200); oletest.testinout_methodShort( inoutValue ); alert( "short: " + inoutValue.Get() ); break; @@ -501,15 +501,15 @@ function callOleTest( id) inoutValue.InitInOutParam("unsigned short", 300); oletest.testinout_methodUShort( inoutValue ); alert( "unsigned short: " + inoutValue.Get() ); break; - case (505): + case (505): inoutValue.InitInOutParam("long", 400); oletest.testinout_methodLong( inoutValue ); alert( "long: " + inoutValue.Get() ); break; - case (506): + case (506): inoutValue.InitInOutParam( "unsigned long", 500); oletest.testinout_methodULong( inoutValue ); alert( "unsigned long: " + inoutValue.Get() ); break; - case (507): + case (507): inoutValue.InitInOutParam( "char", "A"); oletest.testinout_methodChar( inoutValue ); alert( "char: " + inoutValue.Get() ); break; @@ -531,7 +531,7 @@ function callOleTest( id) document.writeln("use the browser's back arrow to go to the previous page <p>"); document.writeln( arr.toString()); break; - case (511): + case (511): inoutValue.InitInOutParam( "[][]long", arrSeq); oletest.testinout_methodSequence2( inoutValue ); var sfarray= new VBArray( inoutValue.Get()); @@ -552,11 +552,11 @@ function callOleTest( id) oletest.testinout_methodXInterface( inoutValue); document.write("Out value: " + inoutValue.Get().value ); break; - - - + + + // Test ANY // Methods case 1000: @@ -564,7 +564,7 @@ function callOleTest( id) ret= oletest.methodAnyTest1( i); document.writeln( "in: " + i + " ret: " + ret); break; - case 1001: + case 1001: i= 3.14; ret= oletest.methodAnyTest1( i); document.writeln( "in: " + i + " ret: " + ret); @@ -595,7 +595,7 @@ function callOleTest( id) ret= oletest.AttrAny2; document.writeln( "set: " + i + " get: " + ret); break; - case 1011: + case 1011: i= 3.14; oletest.AttrAny2= i; ret= oletest.AttrAny2; @@ -650,7 +650,7 @@ function funcOut( out) <script language="VBScript"> sub callBasic(id) - + Dim factory Set factory= GetObject("", "com.sun.star.ServiceManager") @@ -672,7 +672,7 @@ sub callBasic(id) arrDim2Int(i,j) = i*2 + j Next Next - + Dim arrDim3Int(1,1,1) For i= 0 To 1 For j= 0 To 1 @@ -685,7 +685,7 @@ sub callBasic(id) set outValue= factory.Bridge_GetValueObject() outValue.InitOutParam - set value= factory.Bridge_GetValueObject() + set value= factory.Bridge_GetValueObject() select case id case 0 value.Set "[]byte", arrInt @@ -763,47 +763,47 @@ sub callBasic(id) a= 100 document.write "param: " & CStr( a) & "<br>" oletest.testinout_methodByte a - document.write a + document.write a case 101 a= 1.11 document.write "param: " & CStr( a) & "<br>" oletest.testinout_methodDouble a - document.write a + document.write a case 102 a= 5 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodBool a - document.write a + document.write a case 103 a= -10 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodShort a - document.write a + document.write a case 104 a= 128 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodUShort a - document.write a + document.write a case 105 a= 65556 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodLong a - document.write a + document.write a case 106 a= 65556 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodULong a - document.write a + document.write a case 107 a= "ein test string" document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodString a - document.write a + document.write a case 108 a= "W" document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodChar a - document.write a + document.write a case 109 a= "Ein String im Any" document.write "param: "& CStr( a) & "<br>" @@ -811,69 +811,69 @@ sub callBasic(id) document.write a // Attributes ----------------------------------------------------------------- case 200 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrByte= arrInt b= oletest.AttrByte call printArrayEx( "<br> get: ", "<br>", b) case 201 - document.write "set: " - printArray arrDouble + document.write "set: " + printArray arrDouble oletest.AttrDouble= arrDouble b= oletest.AttrDouble call printArrayEx( "<br> get: ", "<br>", b) case 202 - document.write "set: " - printArray arrBool : + document.write "set: " + printArray arrBool : oletest.AttrBool= arrBool b= oletest.AttrBool call printArrayEx( "<br> get: ", "<br>", b) case 203 - document.write "set: " - printArray arrInt2 : + document.write "set: " + printArray arrInt2 : oletest.AttrShort= arrInt2 b= oletest.AttrShort call printArrayEx( "<br> get: ", "<br>", b) case 204 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrUShort= arrInt b= oletest.AttrUShort call printArrayEx( "<br> get: ", "<br>", b) case 205 - document.write "set: " + document.write "set: " printArray arrInt2 oletest.AttrLong= arrInt2 b= oletest.AttrLong call printArrayEx( "<br> get: ", "<br>", b) case 206 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrULong= arrInt b= oletest.AttrULong call printArrayEx( "<br> get: ", "<br>", b) case 207 - document.write "set: " - printArray arrString + document.write "set: " + printArray arrString oletest.AttrString= arrString b= oletest.AttrString call printArrayEx( "<br> get: ", "<br>", b) case 208 - document.write "set: " + document.write "set: " printArray arrChar oletest.AttrChar= arrChar b= oletest.AttrChar call printArrayEx( "<br> get: ", "<br>", b) case 209 - document.write "set: " + document.write "set: " printArray arrAny oletest.AttrAny= arrAny b= oletest.AttrAny call printArrayEx( "<br> get: ", "<br>", b) case 210 - document.write "set: <br>" - printArray2 arrDim2Int : + document.write "set: <br>" + printArray2 arrDim2Int : oletest.AttrSequence= arrDim2Int ret= oletest.AttrSequence document.write "get: " @@ -884,11 +884,11 @@ sub callBasic(id) next next -// out params +// out params case 300 oletest.testout_methodByte( outValue ) alert("byte: " & outValue.Get() ) - + end select end sub @@ -904,7 +904,7 @@ end sub sub printArray2( arr) elements1= UBound( arr, 1) - LBound( arr, 1) +1 elements2= UBound( arr, 2) - LBound( arr, 2) +1 - + For i=0 To elements1 -1 document.write( "array " & CStr( i) & ": " ) For j=0 To elements2 -1 @@ -979,7 +979,7 @@ In Out Parameter <br> <button onclick='callOleTest( 512)'>XInterface </Button> <p> -Tests Array/Sequence conversion with Attributes. All params are of type Sequence and +Tests Array/Sequence conversion with Attributes. All params are of type Sequence and the element type of the Sequence is written on the buttons. <br> <button onclick='callOleTest( 200)'>byte </Button> <button onclick='callOleTest( 201)'>double</Button> @@ -1017,7 +1017,7 @@ Test of Any parameter in a property. Any contains:<br> <h2> Visual Basic Tests </h2> Test array /Sequence conversion and return value<br> Template: <b> Sequence < type > method( Sequence< type > ) </b> -<p> +<p> <button onclick='callBasic(0)'>byte</button> @@ -1028,8 +1028,8 @@ Template: <b> Sequence < type > method( Sequence< type > ) </b> <button onclick='callBasic(4)'>u short</button> <button onclick='callBasic(5)'>long</button> <button onclick='callBasic(6)'>u long</button> -<button onclick='callBasic(7)'>string</button> -<button onclick='callBasic(8)'>char</button> +<button onclick='callBasic(7)'>string</button> +<button onclick='callBasic(8)'>char</button> <button onclick='callBasic(9)'>any</button> <br> <button onclick='callBasic(10)'>Seq < int ></button> --> @@ -1046,13 +1046,13 @@ Template: <b> void method( Sequence < type > ) </b> <br> <button onclick='callBasic(104)'>u short</button> <button onclick='callBasic(105)'>long</button> <button onclick='callBasic(106)'>u long</button> -<button onclick='callBasic(107)'>string</button> -<button onclick='callBasic(108)'>char</button> +<button onclick='callBasic(107)'>string</button> +<button onclick='callBasic(108)'>char</button> <button onclick='callBasic(109)'>any</button> <br> --> <p> <!-- -Tests Array/Sequence conversion with <b>Attributes</b>. All params are of type Sequence and +Tests Array/Sequence conversion with <b>Attributes</b>. All params are of type Sequence and the element type of the Sequence is written on the buttons. <br> <button onclick='callBasic( 200)'>byte </Button> <button onclick='callBasic( 201)'>double</Button> diff --git a/extensions/test/ole/MfcControl/MfcControl.cpp b/extensions/test/ole/MfcControl/MfcControl.cpp index 1be1633c5eb8..74f10830e927 100644 --- a/extensions/test/ole/MfcControl/MfcControl.cpp +++ b/extensions/test/ole/MfcControl/MfcControl.cpp @@ -36,7 +36,7 @@ const WORD _wVerMajor = 1; const WORD _wVerMinor = 0; -//////////////////////////////////////////////////////////////////////////// + // CMfcControlApp::InitInstance - DLL initialization BOOL CMfcControlApp::InitInstance() @@ -52,7 +52,7 @@ BOOL CMfcControlApp::InitInstance() } -//////////////////////////////////////////////////////////////////////////// + // CMfcControlApp::ExitInstance - DLL termination int CMfcControlApp::ExitInstance() @@ -63,7 +63,7 @@ int CMfcControlApp::ExitInstance() } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -80,7 +80,7 @@ STDAPI DllRegisterServer(void) } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - Removes entries from the system registry STDAPI DllUnregisterServer(void) diff --git a/extensions/test/ole/MfcControl/MfcControl.h b/extensions/test/ole/MfcControl/MfcControl.h index 118431219144..64edc9ae7063 100644 --- a/extensions/test/ole/MfcControl/MfcControl.h +++ b/extensions/test/ole/MfcControl/MfcControl.h @@ -31,7 +31,7 @@ #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + // CMfcControlApp : See MfcControl.cpp for implementation. class CMfcControlApp : public COleControlModule diff --git a/extensions/test/ole/MfcControl/MfcControl.rc b/extensions/test/ole/MfcControl/MfcControl.rc index dadf101f12c3..49831c2313c7 100644 --- a/extensions/test/ole/MfcControl/MfcControl.rc +++ b/extensions/test/ole/MfcControl/MfcControl.rc @@ -17,24 +17,24 @@ */ //Microsoft Visual C++ generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include "afxres.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -53,14 +53,14 @@ BEGIN "\0" END -///////////////////////////////////////////////////////////////////////////// + #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Version -// + VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,1 @@ -97,17 +97,17 @@ BEGIN END END -///////////////////////////////////////////////////////////////////////////// -// + + // Bitmap -// + //IDB_MFCCONTROL BITMAP DISCARDABLE "MfcControlCtl.bmp" -///////////////////////////////////////////////////////////////////////////// -// + + // Dialog -// + IDD_PROPPAGE_MFCCONTROL DIALOG DISCARDABLE 0, 0, 250, 62 @@ -119,10 +119,10 @@ BEGIN END -///////////////////////////////////////////////////////////////////////////// -// + + // DESIGNINFO -// + #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO DISCARDABLE @@ -137,10 +137,10 @@ BEGIN END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -152,12 +152,12 @@ END #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// + 1 TYPELIB "MfcControl.tlb" -///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.cpp b/extensions/test/ole/MfcControl/MfcControlCtl.cpp index 201a27204e76..402c0ccbf81e 100644 --- a/extensions/test/ole/MfcControl/MfcControlCtl.cpp +++ b/extensions/test/ole/MfcControl/MfcControlCtl.cpp @@ -34,7 +34,7 @@ static char THIS_FILE[] = __FILE__; IMPLEMENT_DYNCREATE(CMfcControlCtrl, COleControl) -///////////////////////////////////////////////////////////////////////////// + // Message map BEGIN_MESSAGE_MAP(CMfcControlCtrl, COleControl) @@ -46,7 +46,7 @@ BEGIN_MESSAGE_MAP(CMfcControlCtrl, COleControl) END_MESSAGE_MAP() -///////////////////////////////////////////////////////////////////////////// + // Dispatch map BEGIN_DISPATCH_MAP(CMfcControlCtrl, COleControl) @@ -69,7 +69,7 @@ BEGIN_DISPATCH_MAP(CMfcControlCtrl, COleControl) END_DISPATCH_MAP() -///////////////////////////////////////////////////////////////////////////// + // Event map BEGIN_EVENT_MAP(CMfcControlCtrl, COleControl) @@ -80,7 +80,7 @@ BEGIN_EVENT_MAP(CMfcControlCtrl, COleControl) END_EVENT_MAP() -///////////////////////////////////////////////////////////////////////////// + // Property pages // TODO: Add more property pages as needed. Remember to increase the count! @@ -89,20 +89,20 @@ BEGIN_PROPPAGEIDS(CMfcControlCtrl, 1) END_PROPPAGEIDS(CMfcControlCtrl) -///////////////////////////////////////////////////////////////////////////// + // Initialize class factory and guid IMPLEMENT_OLECREATE_EX(CMfcControlCtrl, "MFCCONTROL.MfcControlCtrl.1", 0xac221fb6, 0xa0d8, 0x11d4, 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4) -///////////////////////////////////////////////////////////////////////////// + // Type library ID and version IMPLEMENT_OLETYPELIB(CMfcControlCtrl, _tlid, _wVerMajor, _wVerMinor) -///////////////////////////////////////////////////////////////////////////// + // Interface IDs const IID BASED_CODE IID_DMfcControl = @@ -111,7 +111,7 @@ const IID BASED_CODE IID_DMfcControlEvents = { 0xac221fb5, 0xa0d8, 0x11d4, { 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4 } }; -///////////////////////////////////////////////////////////////////////////// + // Control type information static const DWORD BASED_CODE _dwMfcControlOleMisc = @@ -124,7 +124,7 @@ static const DWORD BASED_CODE _dwMfcControlOleMisc = IMPLEMENT_OLECTLTYPE(CMfcControlCtrl, IDS_MFCCONTROL, _dwMfcControlOleMisc) -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::CMfcControlCtrlFactory::UpdateRegistry - // Adds or removes system registry entries for CMfcControlCtrl @@ -153,7 +153,7 @@ BOOL CMfcControlCtrl::CMfcControlCtrlFactory::UpdateRegistry(BOOL bRegister) } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::CMfcControlCtrl - Constructor CMfcControlCtrl::CMfcControlCtrl() @@ -164,7 +164,7 @@ CMfcControlCtrl::CMfcControlCtrl() } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::~CMfcControlCtrl - Destructor CMfcControlCtrl::~CMfcControlCtrl() @@ -173,7 +173,7 @@ CMfcControlCtrl::~CMfcControlCtrl() } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::OnDraw - Drawing function void CMfcControlCtrl::OnDraw( @@ -185,7 +185,7 @@ void CMfcControlCtrl::OnDraw( } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::DoPropExchange - Persistence support void CMfcControlCtrl::DoPropExchange(CPropExchange* pPX) @@ -198,7 +198,7 @@ void CMfcControlCtrl::DoPropExchange(CPropExchange* pPX) } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::OnResetState - Reset control to default state void CMfcControlCtrl::OnResetState() @@ -209,7 +209,7 @@ void CMfcControlCtrl::OnResetState() } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl message handlers diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.h b/extensions/test/ole/MfcControl/MfcControlCtl.h index fb95d210f8e3..865085467ece 100644 --- a/extensions/test/ole/MfcControl/MfcControlCtl.h +++ b/extensions/test/ole/MfcControl/MfcControlCtl.h @@ -25,7 +25,7 @@ // MfcControlCtl.h : Declaration of the CMfcControlCtrl ActiveX Control class. -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl : See MfcControlCtl.cpp for implementation. class CMfcControlCtrl : public COleControl diff --git a/extensions/test/ole/MfcControl/MfcControlPpg.cpp b/extensions/test/ole/MfcControl/MfcControlPpg.cpp index 3e004fbd5d58..3671223633c3 100644 --- a/extensions/test/ole/MfcControl/MfcControlPpg.cpp +++ b/extensions/test/ole/MfcControl/MfcControlPpg.cpp @@ -32,7 +32,7 @@ static char THIS_FILE[] = __FILE__; IMPLEMENT_DYNCREATE(CMfcControlPropPage, COlePropertyPage) -///////////////////////////////////////////////////////////////////////////// + // Message map BEGIN_MESSAGE_MAP(CMfcControlPropPage, COlePropertyPage) @@ -43,14 +43,14 @@ BEGIN_MESSAGE_MAP(CMfcControlPropPage, COlePropertyPage) END_MESSAGE_MAP() -///////////////////////////////////////////////////////////////////////////// + // Initialize class factory and guid IMPLEMENT_OLECREATE_EX(CMfcControlPropPage, "MFCCONTROL.MfcControlPropPage.1", 0xac221fb7, 0xa0d8, 0x11d4, 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4) -///////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage::CMfcControlPropPageFactory::UpdateRegistry - // Adds or removes system registry entries for CMfcControlPropPage @@ -64,7 +64,7 @@ BOOL CMfcControlPropPage::CMfcControlPropPageFactory::UpdateRegistry(BOOL bRegis } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage::CMfcControlPropPage - Constructor CMfcControlPropPage::CMfcControlPropPage() : @@ -77,7 +77,7 @@ CMfcControlPropPage::CMfcControlPropPage() : } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage::DoDataExchange - Moves data between page and properties void CMfcControlPropPage::DoDataExchange(CDataExchange* pDX) @@ -90,7 +90,7 @@ void CMfcControlPropPage::DoDataExchange(CDataExchange* pDX) } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage message handlers /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/MfcControlPpg.h b/extensions/test/ole/MfcControl/MfcControlPpg.h index 821152a1ff38..cb7cd7164499 100644 --- a/extensions/test/ole/MfcControl/MfcControlPpg.h +++ b/extensions/test/ole/MfcControl/MfcControlPpg.h @@ -25,7 +25,7 @@ // MfcControlPpg.h : Declaration of the CMfcControlPropPage property page class. -//////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage : See MfcControlPpg.cpp.cpp for implementation. class CMfcControlPropPage : public COlePropertyPage diff --git a/extensions/test/ole/MfcControl/Resource.h b/extensions/test/ole/MfcControl/Resource.h index e36b50165e8d..598d26ba3d39 100644 --- a/extensions/test/ole/MfcControl/Resource.h +++ b/extensions/test/ole/MfcControl/Resource.h @@ -19,7 +19,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by MfcControl.rc -// + #define IDS_MFCCONTROL 1 #define IDS_MFCCONTROL_PPG 2 diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index b37b2fa50480..3d0066279e06 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -642,9 +642,9 @@ bool doSimpleTest(const Reference<XInvocation> & inv) Any inrefDecimal, outrefDecimal; Reference<XInterface> xIntFoo(getComObject(L"AxTestComponents.Foo")); - //################################################################################### + // in and out parameter - //################################################################################### + sal_Bool aBool = sal_True; inBool.setValue(&aBool, getCppuBooleanType()); inv->invoke(OUString(L"inBool"), Sequence< Any > ( &inBool, 1), seqIndices, seqOut); @@ -754,9 +754,9 @@ bool doSimpleTest(const Reference<XInvocation> & inv) || inCY != outCY || inDate != outDate || inDecimal != outDecimal || inSCode != outSCode) return false; - //################################################################################### + // in/out parameter - //################################################################################### + outBool = Any(); seqIndices.realloc( 0); seqOut.realloc(0); @@ -841,9 +841,9 @@ bool doSimpleTest(const Reference<XInvocation> & inv) || inDate != outDate || inDecimal != outDecimal || inSCode != outSCode) return false; - //################################################################################### + // in byref parameters - //################################################################################### + inrefLong <<= (sal_Int32) 1234; inv->invoke(OUString(L"inrefLong"), Sequence<Any>( & inrefLong, 1), seqIndices, seqOut); @@ -872,9 +872,9 @@ bool doSimpleTest(const Reference<XInvocation> & inv) return false; - //################################################################################### + // mixed parameter - //################################################################################### + // mixed1 seqIndices.realloc( 0); seqOut.realloc(0); @@ -919,9 +919,9 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv) arAnyStrTmp[2]<<= arStr[2]; Sequence<Any> seq_1( arAnyStrTmp, 3); inArAny <<= seq_1; - //################################################################################### + // in, out Sequences - //################################################################################### + //Test sequence containing Anys of Strings inv->invoke(OUString(L"inArray"), Sequence< Any > ( & inArAny, 1), seqIndices, seqOut); seqIndices.realloc(0); @@ -1009,9 +1009,9 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv) || ! equalSequences(inArString, outArString) || ! equalSequences(inArObject, outArObject)) return false; - //################################################################################### + // in/out Sequences - //################################################################################### + seqIndices.realloc(0); seqOut.realloc(0); inv->invoke(OUString(L"inoutArray"), Sequence< Any >( & inArString, 1), seqIndices, seqOut); @@ -1107,10 +1107,10 @@ HRESULT doTest() -// -// //################################################################################### + + // // in multi Sequences -// //################################################################################### + // // inMulDimArrayLong sal_Int32 arLongi[]={1,2,3}; sal_Int32 arLongi2[]={4,5,6,7}; @@ -1127,7 +1127,7 @@ HRESULT doTest() seqAny<<= seq2i; // dimension length 3,5 inv->invoke( OUString(L"inMulDimArrayLong"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut); -// + //inMulDimArrayVariant inv->invoke( OUString(L"inMulDimArrayVariant"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut); @@ -1189,15 +1189,15 @@ HRESULT doTest() - //################################################################################### - //################################################################################### - //################################################################################### + + + // Tests with a MFC ActiveX control, ( pure dispinterface) - //################################################################################### - //################################################################################### + + // in parameter MFC ActiveX - //################################################################################### + // unsigned char is not supported by MFC // aAny <<= ( sal_Int8) 127; // invMfc->invoke( OUString(L"inByte"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); @@ -1206,7 +1206,7 @@ HRESULT doTest() aAny <<= static_cast<sal_Int16>(-1); aAny= invMfc->invoke( OUString(L"inShort"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); -// + aAny <<= ( sal_Int32) 1234567; aAny=invMfc->invoke( OUString(L"inLong"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); sal_Int32 retLong= *(sal_Int32*)aAny.getValue(); @@ -1232,11 +1232,11 @@ HRESULT doTest() inv5->setValue( OUString(L"prpString"), anyVal4); aAny <<= inv5; aAny=invMfc->invoke( OUString(L"inObject"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); -// -// //################################################################################### + + // // out parameter MFC ActiveX -// //################################################################################### -// + + // // outShort aAny= invMfc->invoke( OUString(L"outShort"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); anyOut<<= seqOut[0]; @@ -1286,9 +1286,9 @@ HRESULT doTest() MessageBox( NULL, buff, _T("clientTest"), MB_OK); - //################################################################################### + // Sequence parameter MFC ActiveX - //################################################################################### + // Sequences are not directly supported. diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx index 11b61de1c54a..c4846440bac3 100644 --- a/extensions/test/ole/OleClient/funcs.cxx +++ b/extensions/test/ole/OleClient/funcs.cxx @@ -46,7 +46,7 @@ template< class T > bool equalSequences(const Sequence<T>& seqIn, const Sequence<Any> & returned); -Reference< XMultiServiceFactory > objectFactory;// +Reference< XMultiServiceFactory > objectFactory; Reference<XMultiServiceFactory> getMultiServiceFactory() diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index 4e2da554917f..adfe3b6fb1a1 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -262,32 +262,32 @@ HRESULT doTest() // preparing out parameter; char byteOut; - CComVariant varOutByte; //### + CComVariant varOutByte; varOutByte.vt= VT_BYREF | VT_UI1; V_I1REF(&varOutByte)= &byteOut; short shortOut; - CComVariant varOutShort; //### + CComVariant varOutShort; varOutShort.vt= VT_BYREF | VT_I2; V_I2REF( &varOutShort)= &shortOut; long longOut; - CComVariant varOutLong; //### + CComVariant varOutLong; varOutLong.vt= VT_BYREF | VT_I4; V_I4REF( &varOutLong)= &longOut; double doubleOut; - CComVariant varOutDouble; //### + CComVariant varOutDouble; varOutDouble.vt= VT_BYREF | VT_R8; V_R8REF( &varOutDouble)= &doubleOut; BSTR bstrOut= NULL; - CComVariant varOutString; //### + CComVariant varOutString; varOutString.vt= VT_BYREF | VT_BSTR; V_BSTRREF(&varOutString)= &bstrOut; CComVariant variantOut; - CComVariant varOutAny; //### + CComVariant varOutAny; varOutAny.vt= VT_BYREF | VT_VARIANT; V_VARIANTREF(&varOutAny)= &variantOut; CComPtr<IDispatch> dispOut; - CComVariant varOutXInterface; //### + CComVariant varOutXInterface; varOutXInterface.vt= VT_BYREF |VT_DISPATCH; V_DISPATCHREF(&varOutXInterface)= &dispOut.p; diff --git a/extensions/test/ole/OleConverterVar1/smartarray.h b/extensions/test/ole/OleConverterVar1/smartarray.h index f50189241ec1..741958d32e54 100644 --- a/extensions/test/ole/OleConverterVar1/smartarray.h +++ b/extensions/test/ole/OleConverterVar1/smartarray.h @@ -162,17 +162,17 @@ public: // rgsabound[0].lLbound= 0; // m_array= SafeArrayCreateVector( VT_UNKNOWN, 0, count); // SafeArrayLock( m_array); -// + // IUnknown* *pData; // if( m_array && (SUCCEEDED( SafeArrayAccessData( m_array, (void**)&pData)) ) ) // { -// + // for( int i=0; i< count; i++) // { // CComVariant varSource( parParams[i]); // switch (destVartype) // { -// + // case VT_UNKNOWN: // { // pData[i]= parParams[i]; diff --git a/extensions/test/ole/OleTest.htm b/extensions/test/ole/OleTest.htm index a4a42fed2845..acca9fda0a6c 100644 --- a/extensions/test/ole/OleTest.htm +++ b/extensions/test/ole/OleTest.htm @@ -32,12 +32,12 @@ function XEventListener_Impl() //XEventListener this.disposing= XEventListener_disposing; - + this.bdisposingCalled= false; this.bQuiet= true; this.resetDisposing= XEventListener_resetDisposing; this.disposingCalled= XEventListener_disposingCalled; -} +} function XEventListener_disposing( source) { @@ -56,13 +56,13 @@ function XEventListener_disposingCalled() return this.bdisposingCalled; } -//-------------------------------------------------------------------------------------------- + function callOleTest( id) -{ +{ var factory= new ActiveXObject("com.sun.star.ServiceManager"); var oletest= factory.createInstance("oletest.OleTest"); // alert(oletest); - + var arr= new Array( 1, 2, 3, 4, 0); var arrDouble= new Array( 1.2345, 12.345, 123,45, 1234.5, 12345); var arrBool= new Array( 1, 0, 2, 0, 3); @@ -72,7 +72,7 @@ function callOleTest( id) var arrSeq= new Array( arr, arr, arr); var arrSeq2= new Array( arrSeq, arrSeq, arrSeq) - + var arrout1= new Array(); var arrout2= new Array(); var arrout3= new Array(); @@ -87,7 +87,7 @@ function callOleTest( id) switch( id) { // Array in-params - case 1: ret= oletest.methodByte( arr); + case 1: ret= oletest.methodByte( arr); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() + "<br>"); document.writeln( "Returns a Sequence< BYTE > <br>" + sfarray.toArray()) ; break; @@ -97,12 +97,12 @@ function callOleTest( id) document.writeln( "Param: " + arrDouble.toString() +"<br>"); document.writeln( "Returns a Sequence< double > <br>" + sfarray.toArray()) ; break; - case 3: ret= oletest.methodBool( arrBool); + case 3: ret= oletest.methodBool( arrBool); sfarray= new VBArray( ret); document.writeln( "Param: " + arrBool.toString() +"<br>"); document.writeln( "Returns a Sequence< BOOL > <br>" + sfarray.toArray()) ; break; - case 4: ret= oletest.methodShort( arr); + case 4: ret= oletest.methodShort( arr); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< SHORT > <br>" + sfarray.toArray()) ; break; @@ -112,7 +112,7 @@ function callOleTest( id) document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< unsigned SHORT > <br>" + sfarray.toArray()) ; break; - case 6: ret= oletest.methodLong( arr); + case 6: ret= oletest.methodLong( arr); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< LONG > <br>" + sfarray.toArray()) ; break; @@ -122,13 +122,13 @@ function callOleTest( id) document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< unsigned LONG > <br>" + sfarray.toArray()) ; break; - case 8: ret= oletest.methodChar( arrChar); + case 8: ret= oletest.methodChar( arrChar); sfarray= new VBArray( ret); document.writeln( "Param: " + arrChar.toString() +"<br>"); document.writeln( "Returns a Sequence< wchar_t > <br>" + sfarray.toArray()) ; break; - case 9: ret= oletest.methodString( arrString); - sfarray= new VBArray( ret); + case 9: ret= oletest.methodString( arrString); + sfarray= new VBArray( ret); document.writeln( "Param: " + arrString.toString() +"<br>"); document.writeln( "Returns a Sequence< UString > <br>" + sfarray.toArray()) ; break; @@ -136,13 +136,13 @@ function callOleTest( id) sfarray= new VBArray( ret); document.writeln( "Param: " + arrAny.toString() +"<br>"); document.writeln( "Returns a Sequence< UsrAny > <br>" + sfarray.toArray() ) ; break; - + case 11: ret= oletest.methodSequence( arrSeq); sfarray= new VBArray( ret); document.writeln( "Param: " + arrSeq.toString() +"<br>"); document.writeln("Returns a Sequence< Sequence < long >> <br>") ; var arr1= new Array(); - arr1= sfarray.toArray(); + arr1= sfarray.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -152,10 +152,10 @@ function callOleTest( id) } break; - case 12: ret= oletest.methodSequence2( arrSeq2); + case 12: ret= oletest.methodSequence2( arrSeq2); document.writeln( "Param: " + arrSeq2.toString() +"<br>"); sfarray1= new VBArray( ret); - arr1= sfarray1.toArray(); + arr1= sfarray1.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -168,7 +168,7 @@ function callOleTest( id) document.write( i+ " "); document.writeln(j + ": "+ arr3.toString() + "<br>" ); } - + } break; @@ -203,12 +203,12 @@ function callOleTest( id) document.writeln( "Param: " + arrDouble.toString() +"<br>"); document.writeln( "Returns a Sequence< float> <br>" + sfarray.toArray()) ; break; - case 15: + case 15: ret= oletest.methodXEventListeners( arEventListener); sfarray= new VBArray(ret); _ret= sfarray.toArray(); for ( key in _ret) - { + { if( ! _ret[key].disposingCalled()) alert("Error! oletest.methodXEventListeners") } @@ -233,95 +233,95 @@ function callOleTest( id) // Properties: setting and getting values case 200: oletest.AttrByte = arr; - ret= oletest.AttrByte; + ret= oletest.AttrByte; document.writeln("Setting AttrByte: " + arr.toString() + "<p>"); document.writeln("Getting AttrByte: " + arr.toString()); break; - case 201: oletest.AttrDouble= arrDouble; - ret= oletest.AttrDouble; + case 201: oletest.AttrDouble= arrDouble; + ret= oletest.AttrDouble; document.writeln("Setting AttrDouble: " + arrDouble.toString() + "<p>"); document.writeln("Getting AttrDouble: " + arrDouble.toString()); break; case 202: oletest.AttrBool= arrBool; - ret= oletest.AttrBool; + ret= oletest.AttrBool; document.writeln("Setting AttrBool: " + arrBool.toString() + "<p>"); document.writeln("Getting AttrBool: " + arrBool.toString()); break; - case 203: oletest.AttrShort= arr; - ret= oletest.AttrShort; + case 203: oletest.AttrShort= arr; + ret= oletest.AttrShort; document.writeln("Setting AttrShort: " + arr.toString() + "<p>"); document.writeln("Getting AttrShort: " + arr.toString()); break; - case 204: oletest.AttrUShort= arr; - ret= oletest.AttrUShort; + case 204: oletest.AttrUShort= arr; + ret= oletest.AttrUShort; document.writeln("Setting AttrUShort: " + arr.toString() + "<p>"); document.writeln("Getting AttrUShort: " + arr.toString()); break; - case 205: oletest.AttrLong= arr; - ret= oletest.AttrLong; + case 205: oletest.AttrLong= arr; + ret= oletest.AttrLong; document.writeln("Setting AttrLong: " + arr.toString() + "<p>"); document.writeln("Getting AttrLong: " + arr.toString()); break; - case 206: oletest.AttrULong= arr; - ret= oletest.AttrULong; + case 206: oletest.AttrULong= arr; + ret= oletest.AttrULong; document.writeln("Setting AttrULong: " + arr.toString() + "<p>"); document.writeln("Getting AttrULong: " + arr.toString()); break; - case 207: oletest.AttrChar= arrChar; - ret= oletest.AttrChar; + case 207: oletest.AttrChar= arrChar; + ret= oletest.AttrChar; document.writeln("Setting AttrChar: " + arrChar.toString() + "<p>"); document.writeln("Getting AttrChar: " + arrChar.toString()); break; - case 208: oletest.AttrString= arrString; - ret= oletest.AttrString; + case 208: oletest.AttrString= arrString; + ret= oletest.AttrString; document.writeln("Setting AttrString: " + arrString.toString() + "<p>"); document.writeln("Getting AttrString: " + arrString.toString()); break; - case 209: oletest.AttrAny= arrAny; - ret= oletest.AttrAny; + case 209: oletest.AttrAny= arrAny; + ret= oletest.AttrAny; document.writeln("Setting AttrAny: " + arrAny.toString() + "<p>"); document.writeln("Getting AttrAny: " + arrAny.toString()); break; - case 210: oletest.AttrSequence= arrSeq; - ret= oletest.AttrSequence; + case 210: oletest.AttrSequence= arrSeq; + ret= oletest.AttrSequence; document.writeln("Setting AttrSequence: " + arrSeq.toString() + "<p>"); document.writeln("Getting AttrSequence: " + arrSeq.toString()); break; - case 211: oletest.AttrSequence2= arrSeq2; - ret= oletest.AttrSequence2; + case 211: oletest.AttrSequence2= arrSeq2; + ret= oletest.AttrSequence2; document.writeln("Setting AttrSequence2: " + arrSeq2.toString() + "<p>"); document.writeln("Getting AttrSequence2: " + arrSeq2.toString()); break; - case 212: oletest.AttrFloat= arrDouble; - ret= oletest.AttrFloat; + case 212: oletest.AttrFloat= arrDouble; + ret= oletest.AttrFloat; document.writeln("Setting AttrFloat: " + arrDouble.toString() + "<p>"); document.writeln("Getting AttrFloat: " + arrDouble.toString()); break; // Out-parameter ------------------------------------------------------------ - case (2000): + case (2000): oletest.testout_methodByte( arrout1 ); alert("byte: " + arrout1[0] ); break; - case (2001): + case (2001): oletest.testout_methodDouble( arrout1 ); alert( "double: " + arrout1[0] ); break; case (2002): oletest.testout_methodBool( arrout1 ); alert( "boolean: " + arrout1[0] ); break; - case (2003): + case (2003): oletest.testout_methodShort( arrout1 ); alert( "short: " + arrout1[0] ); break; case (2004): oletest.testout_methodUShort( arrout1 ); alert( "unsigned short: " + arrout1[0] ); break; - case (2005): + case (2005): oletest.testout_methodLong( arrout1 ); alert( "long: " + arrout1[0] ); break; - case (2006): + case (2006): oletest.testout_methodULong( arrout1 ); alert( "unsigned long: " + arrout1[0] ); break; - case (2007): + case (2007): oletest.testout_methodChar( arrout1 ); alert( "char: " + arrout1[0] ); break; case (2008): @@ -337,7 +337,7 @@ function callOleTest( id) document.writeln("use the browser's back arrow to go to the previous page <p>"); document.writeln( arr.toString()); break; - case (2011): + case (2011): oletest.testout_methodSequence2( arrout1 ); var sfarray= new VBArray( arrout1[0]); arr= sfarray.toArray(); @@ -364,10 +364,10 @@ function callOleTest( id) var outVal= arrout1[0]; alert( outVal.AttrAny2); document.writeln( "string: " + arrout1[0].AttrAny2); break; - case (2016): + case (2016): oletest.testout_methodFloat( arrout1 ); alert( "float: " + arrout1[0] ); break; - case (2017): + case (2017): var in1= 3.14; var in2= 1111; var in3= -2222; @@ -380,11 +380,11 @@ function callOleTest( id) // INOUT - Parameter ------------------------------------------------------------------------------- // The in value has to be placed on index 0 of the passed in array - case (500): + case (500): arrout1[0]= 100; oletest.testinout_methodByte( arrout1 ); alert("byte: " + arrout1[0] ); break; - case (501): + case (501): arrout1[0]= 3.14; oletest.testinout_methodDouble( arrout1 ); alert( "double: " + arrout1[0] ); break; @@ -392,7 +392,7 @@ function callOleTest( id) arrout1[0]= false; oletest.testinout_methodBool( arrout1 ); alert( "boolean: " + arrout1[0] ); break; - case (503): + case (503): arrout1[0]= 200; oletest.testinout_methodShort( arrout1 ); alert( "short: " + arrout1[0] ); break; @@ -400,15 +400,15 @@ function callOleTest( id) arrout1[0]= 300; oletest.testinout_methodUShort( arrout1 ); alert( "unsigned short: " + arrout1[0] ); break; - case (505): + case (505): arrout1[0]= 400; oletest.testinout_methodLong( arrout1 ); alert( "long: " + arrout1[0] ); break; - case (506): + case (506): arrout1[0]= 500; oletest.testinout_methodULong( arrout1 ); alert( "unsigned long: " + arrout1[0] ); break; - case (507): + case (507): arrout1[0]= "A"; oletest.testinout_methodChar( arrout1 ); alert( "char: " + arrout1[0] ); break; @@ -430,7 +430,7 @@ function callOleTest( id) document.writeln("use the browser's back arrow to go to the previous page <p>"); document.writeln( arr.toString()); break; - case (511): + case (511): arrout1[0]= arrSeq; oletest.testinout_methodSequence2( arrout1 ); var sfarray= new VBArray( arrout1[0]); @@ -468,13 +468,13 @@ function callOleTest( id) // document.write("Out value: " + inoutValue.Get().value ); // break; - case (513): + case (513): arrout1[0]= 3.14; oletest.testinout_methodFloat( arrout1 ); alert( "float: " + arrout1[0] ); break; - + // Test ANY // Methods case 1000: @@ -482,7 +482,7 @@ function callOleTest( id) ret= oletest.methodAnyTest1( i); document.writeln( "in: " + i + " ret: " + ret); break; - case 1001: + case 1001: i= 3.14; ret= oletest.methodAnyTest1( i); document.writeln( "in: " + i + " ret: " + ret); @@ -513,7 +513,7 @@ function callOleTest( id) ret= oletest.AttrAny2; document.writeln( "set: " + i + " get: " + ret); break; - case 1011: + case 1011: i= 3.14; oletest.AttrAny2= i; ret= oletest.AttrAny2; @@ -539,7 +539,7 @@ function callOleTest( id) ret= oletest.AttrAny2; document.writeln( "set: " + obj + " get: " + ret); break; - + // Structs ---------------------------------------------- case 1020: var struct= oletest._GetStruct("com.sun.star.beans.Property"); @@ -588,7 +588,7 @@ function funcOut( out) <script language="VBScript"> sub callBasic(id) - + Dim factory Set factory= GetObject("", "com.sun.star.ServiceManager") @@ -610,7 +610,7 @@ sub callBasic(id) arrDim2Int(i,j) = i*2 + j Next Next - + Dim arrDim3Int(1,1,1) For i= 0 To 1 For j= 0 To 1 @@ -620,9 +620,9 @@ sub callBasic(id) Next Next - + select case id - case 0 + case 0 document.writeln "param: " printArray arrInt ret= oletest.methodByte(arrInt) @@ -697,7 +697,7 @@ sub callBasic(id) // Out Parameter case 150 dim rOut - oletest.testout_methodByte rOut + oletest.testout_methodByte rOut MsgBox rOut // void testout_methodFloat( [out] float rOut); // void testout_methodDouble( [out] double rOut); @@ -713,47 +713,47 @@ sub callBasic(id) a= 100 document.write "param: " & CStr( a) & "<br>" oletest.testinout_methodByte a - document.write a + document.write a case 101 a= 1.11 document.write "param: " & CStr( a) & "<br>" oletest.testinout_methodDouble a - document.write a + document.write a case 102 a= 5 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodBool a - document.write a + document.write a case 103 a= -10 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodShort a - document.write a + document.write a case 104 a= 128 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodUShort a - document.write a + document.write a case 105 a= 65556 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodLong a - document.write a + document.write a case 106 a= 65556 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodULong a - document.write a + document.write a case 107 a= "ein test string" document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodString a - document.write a + document.write a case 108 a= "W" document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodChar a - document.write a + document.write a case 109 a= "Ein String im Any" document.write "param: "& CStr( a) & "<br>" @@ -767,69 +767,69 @@ sub callBasic(id) document.write a // Attributes ----------------------------------------------------------------- case 200 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrByte= arrInt b= oletest.AttrByte call printArrayEx( "<br> get: ", "<br>", b) case 201 - document.write "set: " - printArray arrDouble + document.write "set: " + printArray arrDouble oletest.AttrDouble= arrDouble b= oletest.AttrDouble call printArrayEx( "<br> get: ", "<br>", b) case 202 - document.write "set: " - printArray arrBool : + document.write "set: " + printArray arrBool : oletest.AttrBool= arrBool b= oletest.AttrBool call printArrayEx( "<br> get: ", "<br>", b) case 203 - document.write "set: " - printArray arrInt2 : + document.write "set: " + printArray arrInt2 : oletest.AttrShort= arrInt2 b= oletest.AttrShort call printArrayEx( "<br> get: ", "<br>", b) case 204 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrUShort= arrInt b= oletest.AttrUShort call printArrayEx( "<br> get: ", "<br>", b) case 205 - document.write "set: " + document.write "set: " printArray arrInt2 oletest.AttrLong= arrInt2 b= oletest.AttrLong call printArrayEx( "<br> get: ", "<br>", b) case 206 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrULong= arrInt b= oletest.AttrULong call printArrayEx( "<br> get: ", "<br>", b) case 207 - document.write "set: " - printArray arrString + document.write "set: " + printArray arrString oletest.AttrString= arrString b= oletest.AttrString call printArrayEx( "<br> get: ", "<br>", b) case 208 - document.write "set: " + document.write "set: " printArray arrChar oletest.AttrChar= arrChar b= oletest.AttrChar call printArrayEx( "<br> get: ", "<br>", b) case 209 - document.write "set: " + document.write "set: " printArray arrAny oletest.AttrAny= arrAny b= oletest.AttrAny call printArrayEx( "<br> get: ", "<br>", b) case 210 - document.write "set: <br>" - printArray2 arrDim2Int : + document.write "set: <br>" + printArray2 arrDim2Int : oletest.AttrSequence= arrDim2Int ret= oletest.AttrSequence document.write "get: " @@ -844,11 +844,11 @@ sub callBasic(id) dim aByte aByte= 100 call oletest.testinout_methodByte( aByte) - MsgBox aByte + MsgBox aByte case 400 - + set struct= oletest.Bridge_GetStruct("com.sun.star.beans.Property") struct.Attributes= 1 struct.Handle= 2 @@ -886,7 +886,7 @@ end sub sub printArray2( arr) elements1= UBound( arr, 1) - LBound( arr, 1) +1 elements2= UBound( arr, 2) - LBound( arr, 2) +1 - + For i=0 To elements1 -1 document.write( "array " & CStr( i) & ": " ) For j=0 To elements2 -1 @@ -969,7 +969,7 @@ In Out Parameter <br> <button onclick='callOleTest( 512)'>XInterface </Button> <p> -Tests Array/Sequence conversion with Attributes. All params are of type Sequence and +Tests Array/Sequence conversion with Attributes. All params are of type Sequence and the element type of the Sequence is written on the buttons. <br> <button onclick='callOleTest( 200)'>byte </Button> <button onclick='callOleTest( 212)'>float</Button> @@ -1022,8 +1022,8 @@ Template: <b> Sequence < type > method( Sequence< type > ) </b> <br> <button onclick='callBasic(4)'>u short</button> <button onclick='callBasic(5)'>long</button> <button onclick='callBasic(6)'>u long</button> -<button onclick='callBasic(7)'>string</button> -<button onclick='callBasic(8)'>char</button> +<button onclick='callBasic(7)'>string</button> +<button onclick='callBasic(8)'>char</button> <button onclick='callBasic(9)'>any</button> <br> <button onclick='callBasic(10)'>Seq < int ></button> <br> @@ -1037,8 +1037,8 @@ Template: <b> void method(type ) </b> <br> <button onclick='callBasic(104)'>u short</button> <button onclick='callBasic(105)'>long</button> <button onclick='callBasic(106)'>u long</button> -<button onclick='callBasic(107)'>string</button> -<button onclick='callBasic(108)'>char</button> +<button onclick='callBasic(107)'>string</button> +<button onclick='callBasic(108)'>char</button> <button onclick='callBasic(109)'>any</button> <br> Simple out parameter<br> @@ -1047,14 +1047,14 @@ Simple out parameter<br> <button onclick='callBasic(152)'>boolean</button> <button onclick='callBasic(153)'>short</button> <button onclick='callBasic(155)'>long</button> -<button onclick='callBasic(157)'>string</button> -<button onclick='callBasic(158)'>char</button> +<button onclick='callBasic(157)'>string</button> +<button onclick='callBasic(158)'>char</button> <button onclick='callBasic(159)'>any</button> <br> //--> <br> -Tests Array/Sequence conversion with <b>Attributes</b>. All params are of type Sequence and +Tests Array/Sequence conversion with <b>Attributes</b>. All params are of type Sequence and the element type of the Sequence is written on the buttons. <br> <button onclick='callBasic( 200)'>byte </Button> <button onclick='callBasic( 201)'>double</Button> diff --git a/extensions/test/ole/ScriptTest.html b/extensions/test/ole/ScriptTest.html index 71e11145766a..7cf188f4550d 100644 --- a/extensions/test/ole/ScriptTest.html +++ b/extensions/test/ole/ScriptTest.html @@ -324,7 +324,7 @@ for(i in _ret) } } Log.print( bOk, "methodXInterface"); -//====================================================================================== + document.writeln("<br>"); var inVal, outVal, retVal; outVal = new Array(); diff --git a/extensions/test/ole/callUnoToJava.htm b/extensions/test/ole/callUnoToJava.htm index 481835e9897d..df07e56ec378 100644 --- a/extensions/test/ole/callUnoToJava.htm +++ b/extensions/test/ole/callUnoToJava.htm @@ -40,9 +40,9 @@ function callOleTest( id) // return value is the parameter object oletest.testInterface( new XCallback_Impl, 2); break; - //################################################## + // OUT parameter - //################################################## + case 3: // Test out parameter of type interface oletest.testInterface( new XCallback_Impl, 3); break; @@ -88,9 +88,9 @@ function callOleTest( id) case 31: // outValuesAll oletest.testInterface( new XCallback_Impl, 31); break; - //################################################## + // IN/OUT parameter - //################################################## + case 100: // inoutInterface oletest.testInterface( new XCallback_Impl, 100); @@ -141,9 +141,9 @@ function callOleTest( id) // Call a COM object that has not been passed as parameter to a UNO component and // hence no type information are available in the COM wrapper // case 300: - //################################################## + // Attributes - //################################################## + case 400: oletest.testInterface( new XCallback_Impl, 400); break; @@ -168,7 +168,7 @@ function XCallback_Impl() this.returnInterface= XCallback_Impl_returnInterface; // ################################################# // OUT parameter - //################################################### + this.outInterface= XCallback_Impl_outInterface; this.outStruct= XCallback_Impl_outStruct; this.outEnum= XCallback_Impl_outEnum; @@ -186,7 +186,7 @@ function XCallback_Impl() this.outValuesAll= XCallback_Impl_outValuesAll; // ################################################# // IN/ OUT parameter - //################################################### + this.inoutInterface= XCallback_Impl_inoutInterface; this.inoutStruct= XCallback_Impl_inoutStruct; this.inoutEnum= XCallback_Impl_inoutEnum; @@ -203,12 +203,12 @@ function XCallback_Impl() this.inoutValuesAll= XCallback_Impl_inoutValuesAll; // ################################################# // IN parameter - //################################################## + this.inValues= XCallback_Impl_inValues; // ################################################# // Attributes - //################################################## + this.simple= new XSimple_Impl(); @@ -382,8 +382,8 @@ function XCallback_Impl_inoutLong(val) alert( "JScript in long: " + val[0]); val[0]= 100000; } -function XCallback_Impl_inoutValuesAll(aXSimple, aStruct, aEnum, aSeq, - aAny, aBool, aChar, aString, aFloat, aDouble, +function XCallback_Impl_inoutValuesAll(aXSimple, aStruct, aEnum, aSeq, + aAny, aBool, aChar, aString, aFloat, aDouble, aByte, aShort, aLong ) { this.inoutInterface( aXSimple); @@ -407,9 +407,9 @@ function XCallback_Impl_inValues( aChar, aLong, aString) } -//################################################################ + // class MultiInterface implements XSimple, XSimple2, XSimple3 -//################################################################ + function MultiInterface() { this._environment= "JScript"; @@ -420,7 +420,7 @@ function MultiInterface() this.func2= MultiInterface_func2; this.func3= MultiInterface_func3; // XSimple2 - this.getName2= MultiInterface_getName2; + this.getName2= MultiInterface_getName2; // XSimple3 this.getName3= MultiInterface_getName3; } @@ -462,7 +462,7 @@ function MultiInterface_func3( message) //XCallback_Impl_outValuesAll( xSimple, aSimpleStruct, aSimpleEnum, seqAny, aAny, aBool, // aChar, aString, aFloat, aDouble, aByte, aShort, aLong, aUShort, aULong) //{ -// +// //} @@ -472,7 +472,7 @@ function XSimple_Impl() { //XSimple this.func= XSimple_Impl_func; -} +} function XSimple_Impl_func( message) { alert( "XSimple called." + message); @@ -498,7 +498,7 @@ verify the correct conversion of the return value( IDispatch JScript object) to <button onclick='callOleTest( 2)'>go</Button> <br> <h1> out parameter </h1> -The a JScript object of class XCallback_Impl is passed to the UNO OleTest Control as parameter. +The a JScript object of class XCallback_Impl is passed to the UNO OleTest Control as parameter. According to the buttons the OleTest object calls a function on XCallback_Impl that has appropriate type as out parameter.<br> <button onclick='callOleTest( 3)'>interface</Button> diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index d70440582ec8..150d3ff417b4 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -1826,7 +1826,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac arAny[11] <<= _short; sal_Int32 _long= -1; arAny[12] <<= _long; -// + Sequence<Any> params( arAny, 13); xInv->invoke( OUString( L"inoutValuesAll"), params, seqIndices, seqOutParams); diff --git a/extensions/test/ole/cpptest/cpptest.cxx b/extensions/test/ole/cpptest/cpptest.cxx index 6c6556cda8e9..451c357f8a9e 100644 --- a/extensions/test/ole/cpptest/cpptest.cxx +++ b/extensions/test/ole/cpptest/cpptest.cxx @@ -18,7 +18,7 @@ */ // cpptest.cpp : Defines the entry point for the console application. -// + #ifdef _MSC_VER #pragma once diff --git a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h index 4a9eda2a51ad..cb20f6e9f7fe 100644 --- a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h +++ b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h @@ -19,7 +19,7 @@ // stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, but // are changed infrequently -// + #if !defined(AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_) #define AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_ diff --git a/extensions/test/ole/unoTocomCalls/Test/Test.cpp b/extensions/test/ole/unoTocomCalls/Test/Test.cpp index da4414f84157..afed02a31d10 100644 --- a/extensions/test/ole/unoTocomCalls/Test/Test.cpp +++ b/extensions/test/ole/unoTocomCalls/Test/Test.cpp @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ // Test.cpp : Defines the entry point for the console application. -// + #include "stdafx.h" #include "../XCallback_Impl/XCallback_Impl.h" @@ -82,9 +82,9 @@ HRESULT doTest() CComQIPtr<IDispatch> paramDisp(spUnk); - //###################################################################### + // out parameters - //###################################################################### + CComVariant param1( paramDisp); CComVariant param2(1); @@ -145,9 +145,9 @@ HRESULT doTest() // param2= 32; // hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); - //###################################################################### + // in / out parameters - //###################################################################### + // XCallback::inoutInterface param2= 100; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); @@ -190,9 +190,9 @@ HRESULT doTest() // XCallback::inoutValuesAll param2=120; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); - //###################################################################### + // in parameters - //###################################################################### + // XCallback::inValues param2= 200; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); @@ -203,11 +203,11 @@ HRESULT doTest() //XCallback::inSeqXEventListener param2= 202; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); - //###################################################################### + // The UNO test component OleTest calls on XCallback_Impl.Callback directly // that is the COM object has not been past a parameter but rather OleTest // creates the COM object itself - //###################################################################### + // XCallback::outValuesAll // does not work currently param2= 300; @@ -222,9 +222,9 @@ HRESULT doTest() // XCallback::inValues param2= 303; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); - //###################################################################### + // Test a COM object which implements several interfaces. - //###################################################################### + CComQIPtr<IDispatch> dispSimple; hr= dispSimple.CoCreateInstance(L"XCallback_Impl.Simple"); diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp index a9bb76674d72..bb8a4e4f7ead 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp @@ -21,7 +21,7 @@ #include "XCallback_Impl.h" #include "Callback.h" -///////////////////////////////////////////////////////////////////////////// + // CCallback diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h index a0eeca974b82..f200129ed883 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h @@ -23,7 +23,7 @@ #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + // CCallback class ATL_NO_VTABLE CCallback : public CComObjectRootEx<CComSingleThreadModel>, @@ -105,7 +105,7 @@ public: /* [out] */ short __RPC_FAR *aShort, /* [out] */ long __RPC_FAR *aLong); // ); -// + // STDMETHOD(outValuesAll)( // /*[out]*/ IDispatch** ppdisp, // /*[out]*/ IUnknown** ppSimpleStruct, diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp index b88fd6b7683d..5b7183cdb332 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp @@ -21,7 +21,7 @@ #include "XCallback_Impl.h" #include "Simple.h" -///////////////////////////////////////////////////////////////////////////// + // CSimple diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h index 758c2aee28a0..e617ca6d763c 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h @@ -23,7 +23,7 @@ #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + // CSimple class ATL_NO_VTABLE CSimple : public CComObjectRootEx<CComSingleThreadModel>, diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp index 671141d82771..2d44a5937e3d 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp @@ -40,7 +40,7 @@ OBJECT_ENTRY(CLSID_Callback, CCallback) OBJECT_ENTRY(CLSID_Simple, CSimple) END_OBJECT_MAP() -///////////////////////////////////////////////////////////////////////////// + // DLL Entry Point extern "C" @@ -56,7 +56,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) return TRUE; // ok } -///////////////////////////////////////////////////////////////////////////// + // Used to determine whether the DLL can be unloaded by OLE STDAPI DllCanUnloadNow(void) @@ -64,7 +64,7 @@ STDAPI DllCanUnloadNow(void) return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; } -///////////////////////////////////////////////////////////////////////////// + // Returns a class factory to create an object of the requested type STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) @@ -72,7 +72,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -81,7 +81,7 @@ STDAPI DllRegisterServer(void) return _Module.RegisterServer(TRUE); } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - Removes entries from the system registry STDAPI DllUnregisterServer(void) diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl index bb1e6844f333..cee998864bd9 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ // XCallback_Impl.idl : IDL source for XCallback_Impl.dll -// + // This file will be processed by the MIDL tool to // produce the type library (XCallback_Impl.tlb) and marshalling code. diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc index 007ca92ffcd7..f544b17cab43 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc @@ -19,16 +19,16 @@ #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include "winres.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -37,18 +37,18 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // REGISTRY -// + IDR_CALLBACK REGISTRY DISCARDABLE "Callback.rgs" IDR_SIMPLE REGISTRY DISCARDABLE "Simple.rgs" #endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// + + // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) @@ -58,10 +58,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -84,10 +84,10 @@ END #ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// + + // Version -// + VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,1 @@ -126,10 +126,10 @@ END #endif // !_MAC -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -137,18 +137,18 @@ BEGIN END #endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// + 1 TYPELIB "XCallback_Impl.tlb" -///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h index ccd95cad3ce3..2864478cdc40 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h @@ -19,14 +19,14 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by XCallback_Impl.rc -// + #define IDS_PROJNAME 100 #define IDR_CALLBACK 101 #define IDR_SIMPLE 102 #define IDR_SIMPLESTRUCT 103 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index b38f318ad1d9..bf798527fcdf 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -22,9 +22,9 @@ // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. // Example : testcomponent com.sun.star.io.Pipe stm -// + // Therefor the testcode must exist in teststm and the testservice must be named test.com.sun.star.io.Pipe -// + #include <stdio.h> #include <smart/com/sun/star/registry/XImplementationRegistration.hxx> diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx index 247374caaf8e..7e674909e271 100644 --- a/extensions/workben/testframecontrol.cxx +++ b/extensions/workben/testframecontrol.cxx @@ -34,7 +34,7 @@ using namespace usr; -//================================================================================================== + class Listener_Impl : public UsrObject , public XMouseListener @@ -185,7 +185,7 @@ void Listener_Impl::windowPaint( const PaintEvent& evt ) void Listener_Impl::disposing( const EventObject& evt ) {} -//================================================================================================== + class FrameControlApplication : public Application { @@ -239,7 +239,7 @@ void FrameControlApplication::init() - // ... + XInterfaceRef xInst = xMgr->createInstance( L"stardiv.one.frame.FrameControl" ); if (xInst->queryInterface( XControl::getSmartUik(), _xControl )) |