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/source/abpilot | |
| 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/source/abpilot')
25 files changed, 215 insertions, 221 deletions
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 |