diff options
Diffstat (limited to 'dbaccess/source/ui')
465 files changed, 8189 insertions, 8189 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 68d5aac5fa33..ab511cb54efa 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -426,8 +426,8 @@ void SAL_CALL OApplicationController::disposing() ::comphelper::NamedValueCollection aArgs( m_xModel->getArgs() ); if ( true == aArgs.getOrDefault( "PickListEntry", true ) ) { - ::rtl::OUString aFilter; - INetURLObject aURL( m_xModel->getURL() ); + ::rtl::OUString aFilter; + INetURLObject aURL( m_xModel->getURL() ); const SfxFilter* pFilter = getStandardDatabaseFilter(); if ( pFilter ) aFilter = pFilter->GetFilterName(); @@ -1449,7 +1449,7 @@ void OApplicationController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:Save", ID_BROWSER_SAVEDOC, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( ".uno:SaveAs", ID_BROWSER_SAVEASDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:SendMail", SID_MAIL_SENDDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( ".uno:SendMail", SID_MAIL_SENDDOC, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( ".uno:DBSendReportAsMail",SID_DB_APP_SENDREPORTASMAIL, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( ".uno:DBSendReportToWriter",SID_DB_APP_SENDREPORTTOWRITER, @@ -1461,7 +1461,7 @@ void OApplicationController::describeSupportedFeatures() SID_FORM_CREATE_REPWIZ_PRE_SEL, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:DBNewReport", SID_APP_NEW_REPORT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:DBNewReport", SID_APP_NEW_REPORT, CommandGroup::INSERT ); implDescribeSupportedFeature( ".uno:DBNewReportAutoPilot", ID_DOCUMENT_CREATE_REPWIZ, CommandGroup::INSERT ); implDescribeSupportedFeature( ".uno:DBNewReportAutoPilotWithPreSelection", @@ -1478,7 +1478,7 @@ void OApplicationController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:DBNewViewSQL", SID_DB_NEW_VIEW_SQL, CommandGroup::INSERT ); implDescribeSupportedFeature( ".uno:DBDelete", SID_DB_APP_DELETE, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:Delete", SID_DB_APP_DELETE, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:Delete", SID_DB_APP_DELETE, CommandGroup::EDIT ); implDescribeSupportedFeature( ".uno:DBRename", SID_DB_APP_RENAME, CommandGroup::EDIT ); implDescribeSupportedFeature( ".uno:DBEdit", SID_DB_APP_EDIT, CommandGroup::EDIT ); implDescribeSupportedFeature( ".uno:DBEditSqlView", SID_DB_APP_EDIT_SQL_VIEW, CommandGroup::EDIT ); @@ -1539,18 +1539,18 @@ void OApplicationController::describeSupportedFeatures() // this one should not appear under Tools->Customize->Keyboard implDescribeSupportedFeature( ".uno:DBNewReportWithPreSelection", SID_APP_NEW_REPORT_PRE_SEL,CommandGroup::INTERNAL ); - implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBDBAdmin", SID_DB_APP_DBADMIN, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBDBAdmin", SID_DB_APP_DBADMIN, CommandGroup::INTERNAL); // status info - implDescribeSupportedFeature( ".uno:DBStatusType", SID_DB_APP_STATUS_TYPE, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBStatusDBName", SID_DB_APP_STATUS_DBNAME, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBStatusUserName", SID_DB_APP_STATUS_USERNAME, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBStatusHostName", SID_DB_APP_STATUS_HOSTNAME, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusType", SID_DB_APP_STATUS_TYPE, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusDBName", SID_DB_APP_STATUS_DBNAME, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusUserName", SID_DB_APP_STATUS_USERNAME, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusHostName", SID_DB_APP_STATUS_HOSTNAME, CommandGroup::INTERNAL); } // ----------------------------------------------------------------------------- -OApplicationView* OApplicationController::getContainer() const +OApplicationView* OApplicationController::getContainer() const { return static_cast< OApplicationView* >( getView() ); } @@ -1667,7 +1667,7 @@ void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rE default: break; } - // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName); + // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName); } catch( Exception& ) { @@ -2167,7 +2167,7 @@ void OApplicationController::renameEntry() { ::rtl::OUString sName = aDialog->getName(); ::rtl::OUString sCatalog = aDialog->getCatalog(); - ::rtl::OUString sSchema = aDialog->getSchema(); + ::rtl::OUString sSchema = aDialog->getSchema(); sNewName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sName, sal_False, ::dbtools::eInDataManipulation ); } @@ -2533,18 +2533,18 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) m_nAsyncDrop = 0; m_aAsyncDrop.aDroppedData.clear(); - m_aAsyncDrop.nType = pView->getElementType(); - m_aAsyncDrop.nAction = _rEvt.mnAction; - m_aAsyncDrop.bError = sal_False; - m_aAsyncDrop.bHtml = sal_False; - m_aAsyncDrop.aUrl = ::rtl::OUString(); + m_aAsyncDrop.nType = pView->getElementType(); + m_aAsyncDrop.nAction = _rEvt.mnAction; + m_aAsyncDrop.bError = sal_False; + m_aAsyncDrop.bHtml = sal_False; + m_aAsyncDrop.aUrl = ::rtl::OUString(); // loop through the available formats and see what we can do ... // first we have to check if it is our own format, if not we have to copy the stream :-( if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(aDroppedData.GetDataFlavorExVector()) ) { - m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); + m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); // asyncron because we some dialogs and we aren't allowed to show them while in D&D m_nAsyncDrop = Application::PostUserEvent(LINK(this, OApplicationController, OnAsyncDrop)); @@ -2850,7 +2850,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer { ElementType eType = E_NONE; const NamedValue* pIter = aCurrentSelection.getConstArray(); - const NamedValue* pEnd = pIter + aCurrentSelection.getLength(); + const NamedValue* pEnd = pIter + aCurrentSelection.getLength(); for(;pIter != pEnd;++pIter) { if ( pIter->Name.equalsAscii("Type") ) @@ -3012,7 +3012,7 @@ void OApplicationController::impl_migrateScripts_nothrow() } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index fd484c686616..a56989731b44 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ namespace dbaui , ::com::sun::star::sdb::application::XDatabaseDocumentUI , ::com::sun::star::ui::XContextMenuInterception , ::com::sun::star::view::XSelectionSupplier - > OApplicationController_Base; + > OApplicationController_Base; class SelectionNotifier; @@ -103,14 +103,14 @@ namespace dbaui private: - OTableCopyHelper::DropDescriptor m_aAsyncDrop; + OTableCopyHelper::DropDescriptor m_aAsyncDrop; SharedConnection m_xDataSourceConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - OModuleClient m_aModuleClient; - TransferableDataHelper m_aSystemClipboard; // content of the clipboard + OModuleClient m_aModuleClient; + TransferableDataHelper m_aSystemClipboard; // content of the clipboard ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > @@ -120,21 +120,21 @@ namespace dbaui ::cppu::OInterfaceContainerHelper m_aContextMenuInterceptors; - TContainerVector m_aCurrentContainers; // the containers where we are listener on + TContainerVector m_aCurrentContainers; // the containers where we are listener on ::rtl::Reference< SubComponentManager > m_pSubComponentManager; - ::dbaccess::ODsnTypeCollection + ::dbaccess::ODsnTypeCollection m_aTypeCollection; OTableCopyHelper m_aTableCopyHelper; TransferableClipboardListener* - m_pClipbordNotifier; // notifier for changes in the clipboard - ULONG m_nAsyncDrop; + m_pClipbordNotifier; // notifier for changes in the clipboard + ULONG m_nAsyncDrop; OAsyncronousLink m_aControllerConnectedEvent; OAsyncronousLink m_aSelectContainerEvent; - PreviewMode m_ePreviewMode; // the mode of the preview - ElementType m_eCurrentType; - sal_Bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date - sal_Bool m_bSuspended; // is true when the controller was already suspended + PreviewMode m_ePreviewMode; // the mode of the preview + ElementType m_eCurrentType; + sal_Bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date + sal_Bool m_bSuspended; // is true when the controller was already suspended ::std::auto_ptr< SelectionNotifier > m_pSelectionNotifier; @@ -143,7 +143,7 @@ namespace dbaui private: - OApplicationView* getContainer() const; + OApplicationView* getContainer() const; /** returns the database name @@ -159,17 +159,17 @@ namespace dbaui ::rtl::OUString getStrippedDatabaseName() const; /** return the element type for given container - @param _xContainer The container where the element type has to be found - @return the element type coressponding to the given container + @param _xContainer The container where the element type has to be found + @return the element type coressponding to the given container */ ElementType getElementType(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer) const; /** opens a new frame with either the table or the query or report or form or view - @param _sName + @param _sName The name of the object to open - @param _eType + @param _eType Defines the type to open - @param _eOpenMode + @param _eOpenMode denotes the mode in which to open the object @param _nInstigatorCommand denotes the command which instigated the action. Might be 0. @@ -193,9 +193,9 @@ namespace dbaui ); /** opens a new frame for creation or auto pilot - @param _eType + @param _eType Defines the type to open - @param i_rAdditionalArguments + @param i_rAdditionalArguments Additional arguments to pass when creating the component */ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > @@ -215,7 +215,7 @@ namespace dbaui void newElementWithPilot( ElementType _eType ); /** converts the query to a view - @param _sName + @param _sName The name of the query. */ void convertToView(const ::rtl::OUString& _sName); @@ -236,19 +236,19 @@ namespace dbaui void renameEntry(); /** deletes queries, forms, or reports - @param _eType + @param _eType the type of the objects - @param _rList + @param _rList The names of the elements to delete - @param _bConfirm + @param _bConfirm determines whether the user must confirm the deletion */ - void deleteObjects( ElementType _eType, + void deleteObjects( ElementType _eType, const ::std::vector< ::rtl::OUString>& _rList, bool _bConfirm ); /** deletes tables. - @param _rList + @param _rList The list of tables. */ void deleteTables(const ::std::vector< ::rtl::OUString>& _rList); @@ -260,9 +260,9 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getElements(ElementType _eType); /** returns the document access for the specific type - @param _eType + @param _eType the type - @return ::std::auto_ptr<OLinkedDocumentsAccess> + @return ::std::auto_ptr<OLinkedDocumentsAccess> */ ::std::auto_ptr<OLinkedDocumentsAccess> getDocumentsAccess(ElementType _eType); @@ -270,19 +270,19 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer> getQueryDefintions() const; /** pastes a special format from the system clipboard to the currently selected object types - @param _nFormatId + @param _nFormatId The format to be copied. */ void pasteFormat(sal_uInt32 _nFormatId); /** pastes a query, form or report into the data source - @param _eType + @param _eType The type of the object to paste. - @param _rPasteData + @param _rPasteData The data descriptor. - @param _sParentFolder + @param _sParentFolder The name of the parent folder if it exists. - @param _bMove + @param _bMove if <TRUE/> the name of the content must be inserted without any change, otherwise not. @return <TRUE/> if the paste opertions was successfull, otherwise <FALSE/>. @@ -296,21 +296,21 @@ namespace dbaui sal_Bool isTableFormat() const; /** fills the vector with all supported formats - @param _eType + @param _eType The type for which we need the formats - @param _rFormatIds + @param _rFormatIds The vector to be filled up. */ void getSupportedFormats(ElementType _eType,::std::vector<SotFormatStringId>& _rFormatIds) const; /** adds a listener to the current name access. - @param _xCollection + @param _xCollection The collection where we want to listen on. */ void addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xCollection); /** opens a uno dialog withthe currently selected data source as initialize argument - @param _sServiceName + @param _sServiceName The serivce name of the dialog to be executed. */ void openDialog(const ::rtl::OUString& _sServiceName); @@ -344,35 +344,35 @@ namespace dbaui ); /** Inserts a new object into the hierachy given be the type. - @param _eType + @param _eType Where to insert the new item. - @param _sParentFolder + @param _sParentFolder The name of the parent folder if it exists. - @param _xContent + @param _xContent The content to insert. - @param _bMove + @param _bMove if <TRUE/> the name of the content must be inserted without any change, otherwise not. @return <TRUE/> if the insert opertions was successfull, otherwise <FALSE/>. */ - sal_Bool insertHierachyElement( ElementType _eType + sal_Bool insertHierachyElement( ElementType _eType ,const String& _sParentFolder ,sal_Bool _bCollection = sal_True ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>() ,sal_Bool _bMove = sal_False); /** checks if delete command or rename comamnd is allowed - @param _eType + @param _eType The element type. - @param _bDelete + @param _bDelete If <TRUE> then the delete command should be checked. @return <TRUE> if the command is allowed */ sal_Bool isRenameDeleteAllowed(ElementType _eType,sal_Bool _bDelete) const; /** all selected entries will be opened, or edited, or converted to a view - @param _nId + @param _nId The slot which should be executed. - @param _eOpenMode + @param _eOpenMode Defines the mode of opening. @see ElementOpenMode */ void doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMode); @@ -413,12 +413,12 @@ namespace dbaui /** forces usage of a connection which we do not own <p>To be used from within XInitialization::initialize only.</p> */ - void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); + void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); // OGenericUnoController virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager ); @@ -531,9 +531,9 @@ namespace dbaui // IControlActionListener overridables virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const; - virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); - virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); - virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); + virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); + virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); // IContextMenuProvider (base of IApplicationController) virtual PopupMenu* getContextMenu( Control& _rControl ) const; @@ -555,11 +555,11 @@ namespace dbaui /** disconnects from our XConnection, and cleans up this connection */ - virtual void disconnect(); + virtual void disconnect(); // late construction - virtual sal_Bool Construct(Window* pParent); - virtual void describeSupportedFeatures(); + virtual sal_Bool Construct(Window* pParent); + virtual void describeSupportedFeatures(); protected: // XEventListener @@ -570,7 +570,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBAUI_APPCONTROLLER_HXX diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index b89f72956344..a5d3f331283f 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -512,7 +512,7 @@ TransferableHelper* OApplicationController::copyObject() ::rtl::OUString sName = getContainer()->getQualifiedName( NULL ); if ( sName.getLength() ) { - ::rtl::OUString sDataSource = getDatabaseName(); + ::rtl::OUString sDataSource = getDatabaseName(); if ( eType == E_TABLE ) { @@ -564,22 +564,22 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc { sal_Int32 nCommandType = CommandType::TABLE; if ( _rPasteData.has(daCommandType) ) - _rPasteData[daCommandType] >>= nCommandType; + _rPasteData[daCommandType] >>= nCommandType; if ( CommandType::QUERY == nCommandType || CommandType::COMMAND == nCommandType ) { // read all nescessary data - ::rtl::OUString sCommand; + ::rtl::OUString sCommand; sal_Bool bEscapeProcessing = sal_True; _rPasteData[daCommand] >>= sCommand; if ( _rPasteData.has(daEscapeProcessing) ) - _rPasteData[daEscapeProcessing] >>= bEscapeProcessing; + _rPasteData[daEscapeProcessing] >>= bEscapeProcessing; // plausibility check sal_Bool bValidDescriptor = sal_False; - ::rtl::OUString sDataSourceName = _rPasteData.getDataSource(); + ::rtl::OUString sDataSourceName = _rPasteData.getDataSource(); if (CommandType::QUERY == nCommandType) bValidDescriptor = sDataSourceName.getLength() && sCommand.getLength(); else if (CommandType::COMMAND == nCommandType) @@ -629,7 +629,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc bSuccess = true; } } - catch(SQLException&) { throw; } // caught and handled by the outer catch + catch(SQLException&) { throw; } // caught and handled by the outer catch catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -665,7 +665,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc has a /table/ with that name) */ if ( bNeedAskForName ) { - OSaveAsDlg aAskForName( getView(), + OSaveAsDlg aAskForName( getView(), CommandType::QUERY, getORB(), getConnection(), @@ -710,7 +710,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc Sequence< ::rtl::OUString> aSeq = xSrcNameAccess->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for( ; pIter != pEnd ; ++pIter) { Reference<XPropertySet> xSrcProp(xSrcNameAccess->getByName(*pIter),UNO_QUERY); @@ -811,7 +811,7 @@ IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) return 0L; } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 906607406e3a..f84b2293fa73 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -164,7 +164,7 @@ void OApplicationController::convertToView(const ::rtl::OUString& _sName) { ::rtl::OUString sName = aDlg.getName(); ::rtl::OUString sCatalog = aDlg.getCatalog(); - ::rtl::OUString sSchema = aDlg.getSchema(); + ::rtl::OUString sSchema = aDlg.getSchema(); ::rtl::OUString sNewName( ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, sal_False, ::dbtools::eInTableDefinitions ) ); Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject); @@ -794,7 +794,7 @@ void OApplicationController::doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMod // special handling for mail, if more than one document is selected attach them all if ( _eOpenMode == E_OPEN_FOR_MAIL ) { - + ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentIter = aCompoments.begin(); ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentEnd = aCompoments.end(); ::rtl::OUString aDocTypeString; @@ -839,7 +839,7 @@ ElementType OApplicationController::getElementType(const Reference< XContainer > } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index d89c495e5106..12f75c8db281 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index cb4a79970fca..663f69c02a98 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,15 +58,15 @@ namespace dbaui class OPreviewWindow : public Window { - GraphicObject m_aGraphicObj; - Rectangle m_aPreviewRect; + GraphicObject m_aGraphicObj; + Rectangle m_aPreviewRect; /** gets the graphic cnter rect - @param rGraphic + @param rGraphic the graphic - @param rResultRect + @param rResultRect the resulting rectangle - + @return <TRUE/> when successfull */ @@ -88,17 +88,17 @@ namespace dbaui //================================================================== class OAppDetailPageHelper : public Window { - DBTreeListBox* m_pLists[ELEMENT_COUNT]; - OAppBorderWindow& m_rBorderWin; - FixedLine m_aFL; - ToolBox m_aTBPreview; - Window m_aBorder; - OPreviewWindow m_aPreview; + DBTreeListBox* m_pLists[ELEMENT_COUNT]; + OAppBorderWindow& m_rBorderWin; + FixedLine m_aFL; + ToolBox m_aTBPreview; + Window m_aBorder; + OPreviewWindow m_aPreview; ::svtools::ODocumentInfoPreview m_aDocumentInfo; - Window* m_pTablePreview; + Window* m_pTablePreview; ::std::auto_ptr<PopupMenu> m_aMenu; - PreviewMode m_ePreviewMode; + PreviewMode m_ePreviewMode; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference < ::com::sun::star::io::XPersist > @@ -110,9 +110,9 @@ namespace dbaui int getVisibleControlIndex() const; /** sorts the entries in the tree list box. - @param _nPos + @param _nPos Which list should be sorted. - @param _eSortMode + @param _eSortMode How should be sorted. */ void sort(int _nPos,SvSortMode _eSortMode ); @@ -122,15 +122,15 @@ namespace dbaui void getElementIcons( ElementType _eType, USHORT& _rImageId, USHORT& _rHighContrastImageId ); /** fills the names in the listbox - @param _xContainer + @param _xContainer This can either be the queries, forms or report names. - @param _eType + @param _eType the type of elements which are being filled @param _nImageId the resource id of the image to use for non-container entries @param _nHighContrastImageId the resource id of the high contrast image to use for non-container entries - @param _pParent + @param _pParent The parent of the entries to be inserted. */ void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer, @@ -140,17 +140,17 @@ namespace dbaui SvLBoxEntry* _pParent ); /** sets the detail page - @param _pWindow + @param _pWindow The control which should be visible. */ void setDetailPage(Window* _pWindow); /** sets all HandleCallbacks - @param _pTreeView + @param _pTreeView The newly created DBTreeListBox - @param _rImage + @param _rImage the resource id of the default icon - @param _rImageHC + @param _rImageHC the resource id of the default icon (HC version) @return The new tree. @@ -158,24 +158,24 @@ namespace dbaui DBTreeListBox* createTree( DBTreeListBox* _pTreeView, const Image& _rImage, const Image& _rImageHC ); /** creates the tree and sets all HandleCallbacks - @param _nHelpId + @param _nHelpId The help id of the control - @param _nCollapsedBitmap + @param _nCollapsedBitmap The image to use for tree entries. - @param _rImageHC + @param _rImageHC The image to use in high contrast mode. @return The new tree. */ DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC ); - DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); - DECL_LINK( OnEntrySelChange, void* ); + DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); + DECL_LINK( OnEntrySelChange, void* ); - DECL_LINK( OnCutEntry, void* ); - DECL_LINK( OnCopyEntry, void* ); - DECL_LINK( OnPasteEntry, void* ); - DECL_LINK( OnDeleteEntry, void* ); + DECL_LINK( OnCutEntry, void* ); + DECL_LINK( OnCopyEntry, void* ); + DECL_LINK( OnPasteEntry, void* ); + DECL_LINK( OnDeleteEntry, void* ); DECL_LINK(PreviewChangeHdl, void*); // click a TB slot @@ -200,27 +200,27 @@ namespace dbaui void paste(); /** creates the tables page - @param _xConnection + @param _xConnection The connection to get the table names */ void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** creates the page for the specific type. - @param _eType + @param _eType The type which should be created. E_TABLE isn't allowed. - @param _xContainer + @param _xContainer The container of the elements to be inserted. */ void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer); /** returns the current visible tree list box */ - inline DBTreeListBox* getCurrentView() const - { + inline DBTreeListBox* getCurrentView() const + { ElementType eType = getElementType(); - return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)] : NULL; + return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)] : NULL; } - + /// select all entries in the visible control void selectAll(); @@ -234,7 +234,7 @@ namespace dbaui void sortUp(); /** returns the element names which are selected - @param _rNames + @param _rNames The list will be filled. */ void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; @@ -260,8 +260,8 @@ namespace dbaui void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); /** return the qualified name. - @param _pEntry - The entry of a table, or query, form, report to get the qualified name. + @param _pEntry + The entry of a table, or query, form, report to get the qualified name. If the entry is <NULL/>, the first selected is chosen. @return the qualified name @@ -300,13 +300,13 @@ namespace dbaui sal_Bool isFilled() const; /** adds a new object to the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the object to be inserted - @param _rObject + @param _rObject The object to add. - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ SvLBoxEntry* elementAdded(ElementType eType @@ -314,13 +314,13 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one - @param _eType + @param _eType The type where the entry shold be appended. - @param _rOldName + @param _rOldName The old name of the object to be replaced - @param _rNewName + @param _rNewName The new name of the object to be replaced - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ void elementReplaced(ElementType eType @@ -328,17 +328,17 @@ namespace dbaui ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the element to be removed. - @param _rxConn + @param _rxConn If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType ,const ::rtl::OUString& _rName ); - + /// returns the preview mode PreviewMode getPreviewMode(); @@ -346,29 +346,29 @@ namespace dbaui sal_Bool isPreviewEnabled(); /** switches to the given preview mode - @param _eMode + @param _eMode the mode to set for the preview - @param _bForce + @param _bForce Force the preview to be resetted */ void switchPreview(PreviewMode _eMode,BOOL _bForce = FALSE); /** shows the Preview of the content when it is enabled. - @param _xContent + @param _xContent The content which must support the "preview" command. */ void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); /** shows the Preview of a table or query - @param _sDataSourceName + @param _sDataSourceName the name of the data source - @param _sName + @param _sName the name of table or query - @param _bTable + @param _bTable <TRUE/> if it is a table, otherwise <FALSE/> - @return void + @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const ::rtl::OUString& _sDataSourceName, const ::rtl::OUString& _sName, sal_Bool _bTable); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 4003c14e854c..60b26dc005d9 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ using namespace ::com::sun::star::beans; using ::com::sun::star::util::URL; using ::com::sun::star::sdb::application::NamedDatabaseObject; -#define SPACEBETWEENENTRIES 4 +#define SPACEBETWEENENTRIES 4 // ----------------------------------------------------------------------------- TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled ) @@ -360,7 +360,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView ,m_aFL(this,WB_VERT) ,m_pDetailView(_pDetailView) { - DBG_CTOR(OTasksWindow,NULL); + DBG_CTOR(OTasksWindow,NULL); SetUniqueId(UID_APP_TASKS_WINDOW); m_aCreation.SetHelpId(HID_APP_CREATION_LIST); m_aCreation.SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl)); @@ -372,7 +372,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView // ----------------------------------------------------------------------------- OTasksWindow::~OTasksWindow() { - DBG_DTOR(OTasksWindow,NULL); + DBG_DTOR(OTasksWindow,NULL); Clear(); } // ----------------------------------------------------------------------- @@ -388,7 +388,7 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { DBG_CHKTHIS(OTasksWindow,NULL); @@ -461,13 +461,13 @@ void OTasksWindow::Resize() ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); Size aFLSize = LogicToPixel( Size( 2, 6 ), MAP_APPFONT ); sal_Int32 n6PPT = aFLSize.Height(); long nHalfOutputWidth = static_cast<long>(nOutputWidth * 0.5); - + m_aCreation.SetPosSizePixel( Point(0, 0), Size(nHalfOutputWidth - n6PPT, nOutputHeight) ); // i77897 make the m_aHelpText a little bit smaller. (-5) sal_Int32 nNewWidth = nOutputWidth - nHalfOutputWidth - aFLSize.Width() - 5; @@ -477,15 +477,15 @@ void OTasksWindow::Resize() m_aDescription.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, 0), Size(nNewWidth, nOutputHeight) ); Size aDesc = m_aDescription.CalcMinimumSize(); m_aHelpText.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, aDesc.Height() ), Size(nNewWidth, nOutputHeight - aDesc.Height() - n6PPT) ); - + m_aFL.SetPosSizePixel( Point(nHalfOutputWidth , 0), Size(aFLSize.Width(), nOutputHeight ) ); } // ----------------------------------------------------------------------------- void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) -{ +{ DBG_CHKTHIS(OTasksWindow,NULL); Clear(); - + try { Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getDetailView()->getBorderWin().getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); @@ -523,7 +523,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) { } - m_aCreation.Show(); + m_aCreation.Show(); m_aCreation.SelectAll(FALSE); m_aHelpText.Show(); m_aDescription.Show(); @@ -542,7 +542,7 @@ void OTasksWindow::Clear() delete reinterpret_cast< TaskEntry* >( pEntry->GetUserData() ); pEntry = m_aCreation.Next(pEntry); } - m_aCreation.Clear(); + m_aCreation.Clear(); } //================================================================== // class OApplicationDetailView @@ -554,7 +554,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe ,m_aContainer(this,0,WB_BORDER | WB_DIALOGCONTROL ) ,m_rBorderWin(_rParent) { - DBG_CTOR(OApplicationDetailView,NULL); + DBG_CTOR(OApplicationDetailView,NULL); SetUniqueId(UID_APP_DETAIL_VIEW); ImplInitSettings( sal_True, sal_True, sal_True ); @@ -572,7 +572,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe m_aContainer.SetUniqueId(UID_APP_CONTAINER_VIEW); m_aContainer.Show(); - const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); + const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); m_aHorzSplitter.SetPosSizePixel( Point(0,50), Size(0,nFrameWidth) ); // now set the components at the base class set(&m_aContainer,&m_aTasks); @@ -589,7 +589,7 @@ OApplicationDetailView::~OApplicationDetailView() setSplitter(NULL); m_pControlHelper = NULL; } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { DBG_CHKTHIS(OApplicationDetailView,NULL); @@ -878,23 +878,23 @@ SvLBoxEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const return m_pControlHelper->getEntry(_aPoint); } // ----------------------------------------------------------------------------- -sal_Bool OApplicationDetailView::isCutAllowed() -{ +sal_Bool OApplicationDetailView::isCutAllowed() +{ DBG_CHKTHIS(OApplicationDetailView,NULL); - return m_pControlHelper->isCutAllowed(); + return m_pControlHelper->isCutAllowed(); } -sal_Bool OApplicationDetailView::isCopyAllowed() -{ +sal_Bool OApplicationDetailView::isCopyAllowed() +{ DBG_CHKTHIS(OApplicationDetailView,NULL); - return m_pControlHelper->isCopyAllowed(); + return m_pControlHelper->isCopyAllowed(); } -sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); } -void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); } -void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); } -void OApplicationDetailView::paste() -{ +sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); } +void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); } +void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); } +void OApplicationDetailView::paste() +{ DBG_CHKTHIS(OApplicationDetailView,NULL); - m_pControlHelper->paste(); + m_pControlHelper->paste(); } // ----------------------------------------------------------------------------- SvLBoxEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) @@ -941,7 +941,7 @@ void OApplicationDetailView::showPreview(const Reference< XContent >& _xContent) m_pControlHelper->showPreview(_xContent); } // ----------------------------------------------------------------------------- -void OApplicationDetailView::showPreview( const ::rtl::OUString& _sDataSourceName, +void OApplicationDetailView::showPreview( const ::rtl::OUString& _sDataSourceName, const ::rtl::OUString& _sName, sal_Bool _bTable) { diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index ef2001ab65fb..eee11b21d8fb 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ namespace dbaui void updateHelpText(); protected: - virtual void PreparePaint( SvLBoxEntry* _pEntry ); + virtual void PreparePaint( SvLBoxEntry* _pEntry ); virtual Rectangle GetFocusRect( SvLBoxEntry* _pEntry, long _nLine ); virtual void ModelHasCleared(); @@ -108,7 +108,7 @@ namespace dbaui TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled = false ); }; - typedef ::std::vector< TaskEntry > TaskEntryList; + typedef ::std::vector< TaskEntry > TaskEntryList; struct TaskPaneData { @@ -120,13 +120,13 @@ namespace dbaui class OTasksWindow : public Window { - OCreationList m_aCreation; - FixedText m_aDescription; - FixedText m_aHelpText; - FixedLine m_aFL; - OApplicationDetailView* m_pDetailView; + OCreationList m_aCreation; + FixedText m_aDescription; + FixedText m_aHelpText; + FixedLine m_aFL; + OApplicationDetailView* m_pDetailView; - DECL_LINK( OnEntrySelectHdl, SvTreeListBox* ); + DECL_LINK( OnEntrySelectHdl, SvTreeListBox* ); void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); @@ -137,7 +137,7 @@ namespace dbaui // window overloads virtual void Resize(); - OApplicationDetailView* getDetailView() const { return m_pDetailView; } + OApplicationDetailView* getDetailView() const { return m_pDetailView; } /// fills the Creation listbox with the necessary strings and images void fillTaskEntryList( const TaskEntryList& _rList ); @@ -154,11 +154,11 @@ namespace dbaui class OApplicationDetailView : public OSplitterView , public IClipboardTest { - Splitter m_aHorzSplitter; - OTitleWindow m_aTasks; - OTitleWindow m_aContainer; - OAppBorderWindow& m_rBorderWin; // my parent - OAppDetailPageHelper* m_pControlHelper; + Splitter m_aHorzSplitter; + OTitleWindow m_aTasks; + OTitleWindow m_aContainer; + OAppBorderWindow& m_rBorderWin; // my parent + OAppDetailPageHelper* m_pControlHelper; ::std::vector< TaskPaneData > m_aTaskPaneData; MnemonicGenerator m_aExternalMnemonics; @@ -171,19 +171,19 @@ namespace dbaui OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode); virtual ~OApplicationDetailView(); // window overloads - // virtual void Resize(); + // virtual void Resize(); virtual void GetFocus(); /** creates the tables page - @param _xConnection + @param _xConnection The connection to get the table names */ void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** creates the page for the specific type. - @param _eType + @param _eType The type which should be created. E_TABLE isn't allowed. - @param _xContainer + @param _xContainer The container of the elements to be inserted. */ void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer); @@ -201,17 +201,17 @@ namespace dbaui inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } inline OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks.getChildWindow() ); } - sal_Bool isCutAllowed() ; - sal_Bool isCopyAllowed() ; - sal_Bool isPasteAllowed(); + sal_Bool isCutAllowed() ; + sal_Bool isCopyAllowed() ; + sal_Bool isPasteAllowed(); virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); } void copy(); void cut(); void paste(); /** return the qualified name. - @param _pEntry - The entry of a table, or query, form, report to get the qualified name. + @param _pEntry + The entry of a table, or query, form, report to get the qualified name. If the entry is <NULL/>, the first selected is chosen. @return the qualified name @@ -252,7 +252,7 @@ namespace dbaui ElementType getElementType() const; /** clears the detail pages. - @param _bTaskAlso + @param _bTaskAlso If <TRUE/> the task window will also be cleared. */ void clearPages(sal_Bool _bTaskAlso = sal_True); @@ -264,7 +264,7 @@ namespace dbaui sal_Int32 getSelectionCount(); /** returns the element names which are selected - @param _rNames + @param _rNames The list will be filled. */ void getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames ) const; @@ -290,13 +290,13 @@ namespace dbaui void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); /** adds a new object to the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the object to be inserted - @param _rObject + @param _rObject The object to add. - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ SvLBoxEntry* elementAdded(ElementType eType @@ -304,13 +304,13 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one - @param _eType + @param _eType The type where the entry shold be appended. - @param _rOldName + @param _rOldName The old name of the object to be replaced - @param _rNewName + @param _rNewName The new name of the object to be replaced - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. @param _xObject The object which was replaced @@ -320,11 +320,11 @@ namespace dbaui ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the element to be removed. - @param _rxConn + @param _rxConn If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType @@ -338,27 +338,27 @@ namespace dbaui /** switches to the given preview mode - @param _eMode + @param _eMode the mode to set for the preview */ void switchPreview(PreviewMode _eMode); /** shows the Preview of the content when it is enabled. - @param _xContent + @param _xContent The content which must support the "preview" command. */ void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); /** shows the Preview of a table or query - @param _sDataSourceName + @param _sDataSourceName the name of the data source - @param _sName + @param _sName the name of table or query - @param _bTable + @param _bTable <TRUE/> if it is a table, otherwise <FALSE/> - @return void + @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const ::rtl::OUString& _sDataSourceName, const ::rtl::OUString& _sName, sal_Bool _bTable); diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 939d174b23e9..8aa7ed471ef6 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ using namespace ::dbaui; // class OApplicationIconControl DBG_NAME(OApplicationIconControl) //================================================================== -OApplicationIconControl::OApplicationIconControl(Window* _pParent) +OApplicationIconControl::OApplicationIconControl(Window* _pParent) : SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/ WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER) ,DropTargetHelper(this) @@ -69,7 +69,7 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent) String( ModuleRes( aCategories[i].nLabelResId ) ), Image( ModuleRes( aCategories[i].nImageResId ) ), Image( ModuleRes( aCategories[i].nImageResIdHC ) ) ); - if ( pEntry ) + if ( pEntry ) pEntry->SetUserData( new ElementType( aCategories[i].eType ) ); } @@ -98,8 +98,8 @@ sal_Int8 OApplicationIconControl::AcceptDrop( const AcceptDropEvent& _rEvt ) sal_Int8 nDropOption = DND_ACTION_NONE; if ( m_pActionListener ) { - - SvxIconChoiceCtrlEntry* pEntry = GetEntry(_rEvt.maPosPixel); + + SvxIconChoiceCtrlEntry* pEntry = GetEntry(_rEvt.maPosPixel); if ( pEntry ) { SetCursor(pEntry); diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index 3bd27a99a56b..be650da5034e 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,23 +36,23 @@ namespace dbaui { class IControlActionListener; //================================================================== - class OApplicationIconControl :public SvtIconChoiceCtrl + class OApplicationIconControl :public SvtIconChoiceCtrl ,public DropTargetHelper { - Point m_aMousePos; - IControlActionListener* m_pActionListener; + Point m_aMousePos; + IControlActionListener* m_pActionListener; public: OApplicationIconControl(Window* _pParent); virtual ~OApplicationIconControl(); - void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } - IControlActionListener* getControlActionListener( ) const { return m_pActionListener; } + void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } + IControlActionListener* getControlActionListener( ) const { return m_pActionListener; } protected: // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); }; } #endif // DBAUI_APPICONCONTROL_HXX diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index e8b0393dec54..5becb111bd9d 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind ,m_rBorderWin( _rBorderWindow ) { DBG_CTOR(OApplicationSwapWindow,NULL); -// SetCompoundControl( TRUE ); +// SetCompoundControl( TRUE ); ImplInitSettings( sal_True, sal_True, sal_True ); @@ -84,7 +84,7 @@ void OApplicationSwapWindow::Resize() Size aOutputSize = GetOutputSize(); - m_aIconControl.SetPosSizePixel( Point(static_cast<long>((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height())); + m_aIconControl.SetPosSizePixel( Point(static_cast<long>((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height())); m_aIconControl.ArrangeIcons(); } // ----------------------------------------------------------------------------- @@ -179,7 +179,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType ) IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl) { ULONG nPos = 0; - SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos ); + SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos ); ElementType eType = E_NONE; if ( pEntry ) { @@ -199,7 +199,7 @@ IMPL_LINK(OApplicationSwapWindow, ChangeToLastSelected, void*, EMPTYARG) void OApplicationSwapWindow::selectContainer(ElementType _eType) { ULONG nCount = m_aIconControl.GetEntryCount(); - SvxIconChoiceCtrlEntry* pEntry = NULL; + SvxIconChoiceCtrlEntry* pEntry = NULL; for (ULONG i=0; i < nCount; ++i) { pEntry = m_aIconControl.GetEntry(i); diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index bc5cd2abb1df..2ef77e73ab7d 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,16 +37,16 @@ namespace dbaui { class OAppBorderWindow; //================================================================== - class OApplicationSwapWindow : public Window, + class OApplicationSwapWindow : public Window, public IClipboardTest { - OApplicationIconControl m_aIconControl; - ElementType m_eLastType; - OAppBorderWindow& m_rBorderWin; + OApplicationIconControl m_aIconControl; + ElementType m_eLastType; + OAppBorderWindow& m_rBorderWin; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* ); + DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* ); DECL_LINK( ChangeToLastSelected, void* ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); @@ -57,17 +57,17 @@ namespace dbaui virtual void Resize(); - inline sal_Bool isCutAllowed() { return sal_False; } - inline sal_Bool isCopyAllowed() { return sal_False; } - inline sal_Bool isPasteAllowed() { return sal_False; } + inline sal_Bool isCutAllowed() { return sal_False; } + inline sal_Bool isCopyAllowed() { return sal_False; } + inline sal_Bool isPasteAllowed() { return sal_False; } virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); } - inline void copy() { } - inline void cut() { } - inline void paste() { } + inline void copy() { } + inline void cut() { } + inline void paste() { } - inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); } - inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); } - inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); } + inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); } + inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); } + inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); } /** automatically creates mnemonics for the icon/texts in our left hand side panel */ @@ -90,7 +90,7 @@ namespace dbaui void clearSelection(); /** changes the container which should be displayed. The select handler will also be called. - @param _eType + @param _eType Which container to show. */ void selectContainer(ElementType _eType); diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index f0166e49d69a..3c5c2362919a 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace dbaui { - + DBG_NAME(OTitleWindow) OTitleWindow::OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift) : Window(_pParent,_nBits | WB_DIALOGCONTROL) @@ -73,30 +73,30 @@ void OTitleWindow::setChildWindow(Window* _pChild) { m_pChild = _pChild; } -#define SPACE_BORDER 1 +#define SPACE_BORDER 1 // ----------------------------------------------------------------------------- void OTitleWindow::Resize() { ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); - + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); + Size aTextSize = LogicToPixel( Size( 6, 3 ), MAP_APPFONT ); sal_Int32 nXOffset = aTextSize.Width(); sal_Int32 nYOffset = aTextSize.Height(); sal_Int32 nHeight = GetTextHeight() + 2*nYOffset; - m_aSpace1.SetPosSizePixel( Point(SPACE_BORDER, SPACE_BORDER ), + m_aSpace1.SetPosSizePixel( Point(SPACE_BORDER, SPACE_BORDER ), Size(nXOffset , nHeight - SPACE_BORDER) ); - m_aSpace2.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, SPACE_BORDER ), + m_aSpace2.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, SPACE_BORDER ), Size(nOutputWidth - nXOffset - 2*SPACE_BORDER, nYOffset) ); - m_aTitle.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, nYOffset + SPACE_BORDER), + m_aTitle.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, nYOffset + SPACE_BORDER), Size(nOutputWidth - nXOffset - 2*SPACE_BORDER, nHeight - nYOffset - SPACE_BORDER) ); if ( m_pChild ) { - m_pChild->SetPosSizePixel( Point(m_bShift ? (nXOffset+SPACE_BORDER) : sal_Int32(SPACE_BORDER), nHeight + nXOffset + SPACE_BORDER), + m_pChild->SetPosSizePixel( Point(m_bShift ? (nXOffset+SPACE_BORDER) : sal_Int32(SPACE_BORDER), nHeight + nXOffset + SPACE_BORDER), Size(nOutputWidth - ( m_bShift ? (2*nXOffset - 2*SPACE_BORDER) : sal_Int32(SPACE_BORDER) ), nOutputHeight - nHeight - 2*nXOffset - 2*SPACE_BORDER) ); } } @@ -145,7 +145,7 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B StyleSettings aStyle = aAllSettings.GetStyleSettings(); aStyle.SetMonoColor(aStyle.GetActiveBorderColor());//GetMenuBorderColor()); aAllSettings.SetStyleSettings(aStyle); - SetSettings(aAllSettings); + SetSettings(aAllSettings); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); if( bFont ) @@ -174,7 +174,7 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B pWindows[i]->SetFont(aFont); pWindows[i]->SetTextColor( aStyle.GetLightColor() ); pWindows[i]->SetBackground( Wallpaper( aStyle.GetShadowColor() ) ); - } + } } // ............................................................. } // namespace dbaui diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 8f230d9d9e1c..306ed964946e 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,44 +34,44 @@ namespace dbaui { class OTitleWindow : public Window { - FixedText m_aSpace1; - FixedText m_aSpace2; - FixedText m_aTitle; - Window* m_pChild; - BOOL m_bShift; + FixedText m_aSpace1; + FixedText m_aSpace2; + FixedText m_aTitle; + Window* m_pChild; + BOOL m_bShift; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); public: OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift = TRUE); virtual ~OTitleWindow(); - + // window overloads virtual void Resize(); virtual void GetFocus(); /** sets the child window which should be displayed below the title. It will be destroyed at the end. - @param _pChild + @param _pChild The child window. */ void setChildWindow(Window* _pChild); /** gets the child window. - + @return The child winodw. */ inline Window* getChildWindow() const { return m_pChild; } /** sets the title text out of the resource - @param _nTitleId + @param _nTitleId The resource id of the title text. */ void setTitle(USHORT _nTitleId); /** Gets the min Width in Pixel which is needed to display the whole - + @return the min width */ diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 17a16c5ea2b4..889d716b5fe2 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,8 +130,8 @@ void OAppBorderWindow::Resize() ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); long nX = 0; Size aFLSize = LogicToPixel( Size( 3, 8 ), MAP_APPFONT ); @@ -197,13 +197,13 @@ OApplicationView* OAppBorderWindow::getView() const } // ----------------------------------------------------------------------------- -OApplicationSwapWindow* OAppBorderWindow::getPanel() const +OApplicationSwapWindow* OAppBorderWindow::getPanel() const { return static_cast< OApplicationSwapWindow* >( m_pPanel->getChildWindow() ); } // ----------------------------------------------------------------------------- -OApplicationDetailView* OAppBorderWindow::getDetailView() const +OApplicationDetailView* OAppBorderWindow::getDetailView() const { return m_pDetailView; } @@ -530,7 +530,7 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent) getDetailView()->showPreview(_xContent); } // ----------------------------------------------------------------------------- -void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName, +void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sName, sal_Bool _bTable) diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index d4fa76c35849..371a58daf393 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ namespace dbaui //================================================================== class OAppBorderWindow : public Window { - OTitleWindow* m_pPanel; - OApplicationDetailView* m_pDetailView; - OApplicationView* m_pView; + OTitleWindow* m_pPanel; + OApplicationDetailView* m_pDetailView; + OApplicationView* m_pView; void ImplInitSettings(); protected: @@ -68,12 +68,12 @@ namespace dbaui virtual ~OAppBorderWindow(); // window overloads - virtual void GetFocus(); + virtual void GetFocus(); virtual void Resize(); - OApplicationView* getView() const; - OApplicationSwapWindow* getPanel() const; - OApplicationDetailView* getDetailView() const; + OApplicationView* getView() const; + OApplicationSwapWindow* getPanel() const; + OApplicationDetailView* getDetailView() const; }; //================================================================== @@ -88,18 +88,18 @@ namespace dbaui NONE }; private: - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + ::com::sun::star::lang::Locale m_aLocale; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xObject; - OAppBorderWindow* m_pWin; + OAppBorderWindow* m_pWin; IApplicationController& m_rAppController; - ChildFocusState m_eChildFocus; + ChildFocusState m_eChildFocus; IClipboardTest* getActiveChild() const; void ImplInitSettings(); protected: - + // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect); @@ -110,7 +110,7 @@ namespace dbaui // Window virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - OApplicationView( Window* pParent + OApplicationView( Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode @@ -128,7 +128,7 @@ namespace dbaui virtual void GetFocus(); inline IApplicationController& getAppController() const { return m_rAppController; } - inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;} + inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;} // IClipboardTest virtual sal_Bool isCutAllowed(); @@ -140,13 +140,13 @@ namespace dbaui virtual void paste(); /// get the left panel - inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); } + inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); } /// get the detail page - inline OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); } + inline OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); } /** return the qualified name. - @param _pEntry - The entry of a table, or query, form, report to get the qualified name. + @param _pEntry + The entry of a table, or query, form, report to get the qualified name. If the entry is <NULL/>, the first selected is chosen. @return the qualified name @@ -193,13 +193,13 @@ namespace dbaui sal_Int32 getSelectionCount(); /** clears the detail page and the selection on the left side. - @param _bTaskAlso + @param _bTaskAlso If <TRUE/> the task window will also be cleared. */ void clearPages(sal_Bool _bTaskAlso = sal_True); /** returns the element names which are selected - @param _rNames + @param _rNames The list will be filled. */ void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; @@ -225,13 +225,13 @@ namespace dbaui void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); /** adds a new object to the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the object to be inserted - @param _rObject + @param _rObject The object to add. - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ SvLBoxEntry* elementAdded(ElementType _eType @@ -239,13 +239,13 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one - @param _eType + @param _eType The type where the entry shold be appended. - @param _rOldName + @param _rOldName The old name of the object to be replaced - @param _rNewName + @param _rNewName The new name of the object to be replaced - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. @param _xObject The object which was replaced @@ -255,11 +255,11 @@ namespace dbaui ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the element to be removed. - @param _rxConn + @param _rxConn If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType @@ -267,7 +267,7 @@ namespace dbaui /** changes the container which should be displayed. The select handler will also be called. - @param _eType + @param _eType Which container to show. */ void selectContainer(ElementType _eType); @@ -279,29 +279,29 @@ namespace dbaui sal_Bool isPreviewEnabled(); /** switches to the given preview mode - @param _eMode + @param _eMode the mode to set for the preview */ void switchPreview(PreviewMode _eMode); /** shows the Preview of the content when it is enabled. - @param _xContent + @param _xContent The content which must support the "preview" command. */ void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); /** shows the Preview of a table or query - @param _sDataSourceName + @param _sDataSourceName the name of the data source - @param _xConnection + @param _xConnection the connection which will be shared - @param _sName + @param _sName the name of table or query - @param _bTable + @param _bTable <TRUE/> if it is a table, otherwise <FALSE/> - @return void + @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const ::rtl::OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sName, sal_Bool _bTable); diff --git a/dbaccess/source/ui/app/IApplicationController.hxx b/dbaccess/source/ui/app/IApplicationController.hxx index 5e7123e4d3ed..2dc4ab87192b 100644 --- a/dbaccess/source/ui/app/IApplicationController.hxx +++ b/dbaccess/source/ui/app/IApplicationController.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ namespace dbaui { public: /** called when an entry in a tree list box has been double-clicked - @param _rTree + @param _rTree The tree list box. @return <TRUE/> if the double click event has been handled by the called, and should not @@ -58,7 +58,7 @@ namespace dbaui virtual bool onEntryDoubleClick( SvTreeListBox& _rTree ) = 0; /** called when a container (category) in the application view has been selected - @param _pTree + @param _pTree The tree list box. @return <TRUE/> if the cotainer could be changed otherwise <FALSE/> @@ -66,7 +66,7 @@ namespace dbaui virtual sal_Bool onContainerSelect(ElementType _eType) = 0; /** called when an entry in a tree view has been selected - @param _pEntry + @param _pEntry the selected entry */ virtual void onSelectionChanged() = 0; diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index 2dec9005f847..ab325968f68a 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include "toolbox.hrc" #endif -#define MN_PROPS 25 +#define MN_PROPS 25 String RID_STR_NEW_FORM diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc index 7412dd85786d..1fc719762a8f 100644 --- a/dbaccess/source/ui/app/dbu_app.hrc +++ b/dbaccess/source/ui/app/dbu_app.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,42 +31,42 @@ #include "dbu_resource.hrc" #endif -#define TBI_SWITCH_PREVIEW RID_DBACCESS_START +#define TBI_SWITCH_PREVIEW RID_DBACCESS_START -#define RID_STR_NEW_FORM RID_STR_APP_START -#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 -#define RID_STR_NEW_REPORT RID_STR_APP_START + 2 -#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3 -#define RID_STR_NEW_TABLE RID_STR_APP_START + 4 -#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5 -#define RID_STR_NEW_VIEW RID_STR_APP_START + 6 -#define RID_STR_NEW_VIEW_AUTO RID_STR_APP_START + 7 -#define RID_STR_NEW_QUERY RID_STR_APP_START + 8 -#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9 -#define STR_QUERY_DELETE_DATASOURCE RID_STR_APP_START + 10 -#define STR_APP_TITLE RID_STR_APP_START + 11 -#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12 -#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13 -#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14 -#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15 -#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16 -#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17 -#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18 -#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19 -#define RID_STR_VIEWS_HELP_TEXT_WIZARD RID_STR_APP_START + 20 -#define STR_DATABASE RID_STR_APP_START + 21 -#define STR_TASKS RID_STR_APP_START + 22 -#define STR_DESCRIPTION RID_STR_APP_START + 23 -#define STR_PREVIEW RID_STR_APP_START + 24 -#define STR_DISABLEPREVIEW RID_STR_APP_START + 25 -#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26 -#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27 -#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28 -#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29 -#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30 +#define RID_STR_NEW_FORM RID_STR_APP_START +#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 +#define RID_STR_NEW_REPORT RID_STR_APP_START + 2 +#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3 +#define RID_STR_NEW_TABLE RID_STR_APP_START + 4 +#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5 +#define RID_STR_NEW_VIEW RID_STR_APP_START + 6 +#define RID_STR_NEW_VIEW_AUTO RID_STR_APP_START + 7 +#define RID_STR_NEW_QUERY RID_STR_APP_START + 8 +#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9 +#define STR_QUERY_DELETE_DATASOURCE RID_STR_APP_START + 10 +#define STR_APP_TITLE RID_STR_APP_START + 11 +#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12 +#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13 +#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14 +#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15 +#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16 +#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17 +#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18 +#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19 +#define RID_STR_VIEWS_HELP_TEXT_WIZARD RID_STR_APP_START + 20 +#define STR_DATABASE RID_STR_APP_START + 21 +#define STR_TASKS RID_STR_APP_START + 22 +#define STR_DESCRIPTION RID_STR_APP_START + 23 +#define STR_PREVIEW RID_STR_APP_START + 24 +#define STR_DISABLEPREVIEW RID_STR_APP_START + 25 +#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26 +#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27 +#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28 +#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29 +#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30 #define RID_STR_EMBEDDED_DATABASE RID_STR_APP_START + 31 -#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32 -#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33 +#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32 +#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 641051f20d49..7193d7098519 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index c66732528471..1a653141ea12 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/AsyncronousLink.cxx b/dbaccess/source/ui/browser/AsyncronousLink.cxx index 7cc0ac71d23b..9e615095a19b 100644 --- a/dbaccess/source/ui/browser/AsyncronousLink.cxx +++ b/dbaccess/source/ui/browser/AsyncronousLink.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/bcommon.src b/dbaccess/source/ui/browser/bcommon.src index 8c79179eda20..41ccc595ff5a 100644 --- a/dbaccess/source/ui/browser/bcommon.src +++ b/dbaccess/source/ui/browser/bcommon.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 66e774b22a53..999a6bca6f66 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,24 +114,24 @@ using namespace ::dbtools; using namespace ::comphelper; using namespace ::svt; -#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ - try \ - { \ - successflag = sal_False; \ - action; \ - successflag = sal_True; \ - } \ - catch(SQLException& e) \ - { \ +#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ + try \ + { \ + successflag = sal_False; \ + action; \ + successflag = sal_True; \ + } \ + catch(SQLException& e) \ + { \ SQLException aError = ::dbtools::prependErrorInfo(e, *this, context); \ - ::com::sun::star::sdb::SQLErrorEvent aEvent; \ - aEvent.Reason <<= aError; \ - errorOccured(aEvent); \ - } \ - catch(Exception&) \ - { \ + ::com::sun::star::sdb::SQLErrorEvent aEvent; \ + aEvent.Reason <<= aError; \ + errorOccured(aEvent); \ + } \ + catch(Exception&) \ + { \ DBG_UNHANDLED_EXCEPTION(); \ - } \ + } \ #define DO_SAFE( action, message ) try { action; } catch(Exception&) { DBG_ERROR(message); } ; @@ -145,12 +145,12 @@ namespace dbaui //================================================================== class OParameterContinuation : public OInteraction< XInteractionSupplyParameters > { - Sequence< PropertyValue > m_aValues; + Sequence< PropertyValue > m_aValues; public: OParameterContinuation() { } - Sequence< PropertyValue > getValues() const { return m_aValues; } + Sequence< PropertyValue > getValues() const { return m_aValues; } // XInteractionSupplyParameters virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException); @@ -172,8 +172,8 @@ class SbaXDataBrowserController::FormControllerImpl ::com::sun::star::frame::XFrameActionListener > { friend class SbaXDataBrowserController; - ::cppu::OInterfaceContainerHelper m_aActivateListeners; - SbaXDataBrowserController* m_pOwner; + ::cppu::OInterfaceContainerHelper m_aActivateListeners; + SbaXDataBrowserController* m_pOwner; public: FormControllerImpl(SbaXDataBrowserController* pOwner); @@ -241,7 +241,7 @@ public: // XTabController, base of XFormController virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > & Model) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > & _Container) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -579,7 +579,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const ::c //= SbaXDataBrowserController //================================================================== //------------------------------------------------------------------ -Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException) +Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getTypes" ); return ::comphelper::concatSequences( @@ -657,7 +657,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun SbaXDataBrowserController::~SbaXDataBrowserController() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::~SbaXDataBrowserController" ); - // deleteView(); + // deleteView(); // release the aggregated form controller if (m_xFormControllerImpl.is()) { @@ -674,7 +674,7 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::startFrameListening" ); SbaXDataBrowserController_Base::startFrameListening( _rxFrame ); - Reference< XFrameActionListener > xAggListener; + Reference< XFrameActionListener > xAggListener; if ( m_xFormControllerImpl.is() ) m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener; @@ -688,7 +688,7 @@ void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::stopFrameListening" ); SbaXDataBrowserController_Base::stopFrameListening( _rxFrame ); - Reference< XFrameActionListener > xAggListener; + Reference< XFrameActionListener > xAggListener; if ( m_xFormControllerImpl.is() ) m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener; @@ -855,7 +855,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent) if (!bSuccess) { - // deleteView(); + // deleteView(); return sal_False; } @@ -900,7 +900,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent) if (m_xLoadable.is()) m_xLoadable->addLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); + Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); if (xFormParameter.is()) xFormParameter->addParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this); @@ -997,7 +997,7 @@ void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun: xBroadcaster->addModifyListener(static_cast<XModifyListener*>(this)); // introduce ourself as dispatch provider for the grid - Reference< XDispatchProviderInterception > xInterception(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< XDispatchProviderInterception > xInterception(getBrowserView()->getGridControl(), UNO_QUERY); if (xInterception.is()) xInterception->registerDispatchProviderInterceptor(static_cast<XDispatchProviderInterceptor*>(this)); @@ -1015,7 +1015,7 @@ void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::s if (xBroadcaster.is()) xBroadcaster->removeModifyListener(static_cast<XModifyListener*>(this)); - Reference< XDispatchProviderInterception > xInterception(_xGridControl, UNO_QUERY); + Reference< XDispatchProviderInterception > xInterception(_xGridControl, UNO_QUERY); if (xInterception.is()) xInterception->releaseDispatchProviderInterceptor(static_cast<XDispatchProviderInterceptor*>(this)); @@ -1108,7 +1108,7 @@ void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang: if (m_xLoadable.is()) m_xLoadable->removeLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY); + Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY); if (xFormParameter.is()) xFormParameter->removeParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this); } @@ -1187,16 +1187,16 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t SolarMutexGuard aGuard; // the IsModified changed to sal_False ? - if ( (evt.PropertyName.equals(PROPERTY_ISMODIFIED)) - && (::comphelper::getBOOL(evt.NewValue) == sal_False) + if ( (evt.PropertyName.equals(PROPERTY_ISMODIFIED)) + && (::comphelper::getBOOL(evt.NewValue) == sal_False) ) - { // -> the current field isn't modified anymore, too + { // -> the current field isn't modified anymore, too setCurrentModified( sal_False ); } // switching to a new record ? - if ( (evt.PropertyName.equals(PROPERTY_ISNEW)) - && (::comphelper::getBOOL(evt.NewValue) == sal_True) + if ( (evt.PropertyName.equals(PROPERTY_ISNEW)) + && (::comphelper::getBOOL(evt.NewValue) == sal_True) ) { if (::comphelper::getINT32(xSource->getPropertyValue(PROPERTY_ROWCOUNT)) == 0) @@ -1205,7 +1205,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t InvalidateAll(); } - + // the filter or the sort criterias have changed ? -> update our parser if (evt.PropertyName.equals(PROPERTY_ACTIVECOMMAND)) { @@ -1216,7 +1216,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t { // if ( m_xParser.is() && m_xParser->getFilter() != ::comphelper::getString(evt.NewValue)) //{ - // DO_SAFE( m_xParser->setFilter(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); + // DO_SAFE( m_xParser->setFilter(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); //} InvalidateFeature(ID_BROWSER_REMOVEFILTER); } @@ -1224,7 +1224,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t { //if ( m_xParser.is() && m_xParser->getHavingClause() != ::comphelper::getString(evt.NewValue)) //{ - // DO_SAFE( m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); + // DO_SAFE( m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); //} InvalidateFeature(ID_BROWSER_REMOVEFILTER); } @@ -1232,7 +1232,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t { //if ( m_xParser.is() && m_xParser->getOrder() != ::comphelper::getString(evt.NewValue)) //{ - // DO_SAFE( m_xParser->setOrder(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new order to my parser !" ); + // DO_SAFE( m_xParser->setOrder(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new order to my parser !" ); //} InvalidateFeature(ID_BROWSER_REMOVEFILTER); } @@ -1332,7 +1332,7 @@ void SbaXDataBrowserController::disposing() if (m_xLoadable.is()) m_xLoadable->removeLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); + Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); if (xFormParameter.is()) xFormParameter->removeParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this); @@ -1361,9 +1361,9 @@ void SbaXDataBrowserController::disposing() { ::comphelper::disposeComponent(m_xRowSet); - m_xRowSet = NULL; - m_xColumnsSupplier = NULL; - m_xLoadable = NULL; + m_xRowSet = NULL; + m_xColumnsSupplier = NULL; + m_xLoadable = NULL; } catch(Exception&) { @@ -1454,7 +1454,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for return sal_True; } - Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters; + Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters; SolarMutexGuard aSolarGuard; // this may be executed in a non-main thread and we want to use vcl ... Window* pParent = Application::GetDefDialogParent(); @@ -1486,7 +1486,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for xHandler->handle(xParamRequest); if (!pParamValues->wasSelected()) - { // canceled + { // canceled setLoadingCancelled(); return sal_False; } @@ -1581,7 +1581,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const } // no chance without valid models if (isValid() && !isValidCursor()) - return aReturn; + return aReturn; switch (nId) { @@ -1638,9 +1638,9 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const break; } // run through - case ID_BROWSER_PASTE: + case ID_BROWSER_PASTE: case ID_BROWSER_CUT: - { + { CellControllerRef xCurrentController = getBrowserView()->getVclControl()->Controller(); if (xCurrentController.Is() && xCurrentController->ISA(EditCellController)) { @@ -1649,8 +1649,8 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const sal_Bool bIsReadOnly = rEdit.IsReadOnly(); switch (nId) { - case ID_BROWSER_CUT: aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen && !bIsReadOnly; break; - case SID_COPY : aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen; break; + case ID_BROWSER_CUT: aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen && !bIsReadOnly; break; + case SID_COPY : aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen; break; case ID_BROWSER_PASTE: aReturn.bEnabled = m_aCurrentFrame.isActive() && !bIsReadOnly; if(aReturn.bEnabled) @@ -1710,7 +1710,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const break; case ID_BROWSER_REDO: - aReturn.bEnabled = sal_False; // simply forget it ;). no redo possible. + aReturn.bEnabled = sal_False; // simply forget it ;). no redo possible. break; case ID_BROWSER_UNDORECORD: @@ -1733,17 +1733,17 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const // check if it is available Reference< XPropertySet > xDataSourceSet(getRowSet(), UNO_QUERY); if (!xDataSourceSet.is()) - break; // no datasource -> no edit mode + break; // no datasource -> no edit mode sal_Int32 nDataSourcePrivileges = ::comphelper::getINT32(xDataSourceSet->getPropertyValue(PROPERTY_PRIVILEGES)); sal_Bool bInsertAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::INSERT) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowInserts"))); sal_Bool bUpdateAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::UPDATE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowUpdates"))); sal_Bool bDeleteAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::DELETE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowDeletes"))); if (!bInsertAllowedAndPossible && !bUpdateAllowedAndPossible && !bDeleteAllowedAndPossible) - break; // no insert/update/delete -> no edit mode + break; // no insert/update/delete -> no edit mode if (!isValidCursor() || !isLoaded()) - break; // no cursor -> no edit mode + break; // no cursor -> no edit mode aReturn.bEnabled = sal_True; @@ -1968,10 +1968,10 @@ void SbaXDataBrowserController::ExecuteSearch() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ExecuteSearch" ); // calculate the control source of the active field - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); DBG_ASSERT(xGrid.is(), "SbaXDataBrowserController::ExecuteSearch : the control should have an ::com::sun::star::form::XGrid interface !"); - Reference< ::com::sun::star::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); + Reference< ::com::sun::star::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); Reference< ::com::sun::star::container::XIndexContainer > xColumns = xGridPeer->getColumns(); DBG_ASSERT(xGridPeer.is() && xColumns.is(), "SbaXDataBrowserController::ExecuteSearch : invalid peer !"); @@ -1983,7 +1983,7 @@ void SbaXDataBrowserController::ExecuteSearch() // the text within the current cell String sInitialText; - Reference< ::com::sun::star::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY); Reference< XInterface > xCurControl(xColControls->getByIndex(nViewCol),UNO_QUERY); ::rtl::OUString aInitialText; if (IsSearchableControl(xCurControl, &aInitialText)) @@ -2051,7 +2051,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property } break; case SID_FM_DELETEROWS: - + if (SaveModified()) { SbaGridControl* pVclGrid = getBrowserView()->getVclControl(); @@ -2126,8 +2126,8 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property switch (nId) { case ID_BROWSER_CUT : rEdit.Cut(); break; - case SID_COPY : rEdit.Copy(); break; - case ID_BROWSER_PASTE : rEdit.Paste(); break; + case SID_COPY : rEdit.Copy(); break; + case ID_BROWSER_PASTE : rEdit.Paste(); break; } if (ID_BROWSER_CUT == nId || ID_BROWSER_PASTE == nId) { @@ -2359,7 +2359,7 @@ sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor) } } - if ( !CommitCurrent() ) // das aktuelle Control committen lassen + if ( !CommitCurrent() ) // das aktuelle Control committen lassen return sal_False; Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); @@ -2398,7 +2398,7 @@ sal_Bool SbaXDataBrowserController::CommitCurrent() return sal_True; Reference< ::com::sun::star::awt::XControl > xActiveControl(getBrowserView()->getGridControl()); - Reference< ::com::sun::star::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY); + Reference< ::com::sun::star::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY); sal_Bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock(); if (xActiveControl.is() && !bControlIsLocked) { @@ -2498,7 +2498,7 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n // get the current column from the grid if (nViewPos == (sal_uInt16)-1) { - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); if (!xGrid.is()) return xEmptyReturn; nViewPos = xGrid->getCurrentColumnPosition(); @@ -2520,10 +2520,10 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n //------------------------------------------------------------------------------ IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, pContext) { - Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); // check all grid columns for their control source - Reference< ::com::sun::star::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY); DBG_ASSERT(xModelColumns.is(), "SbaXDataBrowserController::OnSearchContextRequest : there is a grid control without columns !"); // the case 'no columns' should be indicated with an empty container, I think ... DBG_ASSERT(xModelColumns->getCount() >= xPeerContainer->getCount(), "SbaXDataBrowserController::OnSearchContextRequest : impossible : have more view than model columns !"); @@ -2582,7 +2582,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), aOld); // and move to the field - Reference< ::com::sun::star::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); sal_uInt16 nViewPos; for ( nViewPos = 0; nViewPos < aColumnControls->getCount(); ++nViewPos ) @@ -2597,7 +2597,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn } } - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); xGrid->setCurrentColumnPosition(nViewPos); return 0; @@ -2679,7 +2679,7 @@ void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/) { DBG_UNHANDLED_EXCEPTION(); } - + // -------------------------------- // switch the control to alive mode getBrowserView()->getGridControl()->setDesignMode(sal_False); @@ -2705,7 +2705,7 @@ void SbaXDataBrowserController::initializeParser() const { const Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); if (::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING))) - { // (only if the statement isn't native) + { // (only if the statement isn't native) // (it is allowed to use the PROPERTY_ISPASSTHROUGH : _after_ loading a form it is valid) xFormSet->getPropertyValue(PROPERTY_SINGLESELECTQUERYCOMPOSER) >>= m_xParser; /* @@ -2738,7 +2738,7 @@ void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( Run { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::loaded" ); // not interested in - // we're loading within an separate thread and have a handling for it's "finished event" + // we're loading within an separate thread and have a handling for it's "finished event" } //------------------------------------------------------------------------------ @@ -2850,11 +2850,11 @@ class LoadFormHelper :public ::cppu::WeakImplHelper2< ::com::sun::star::form::XL XRowSetListener> { enum STATE { STARTED, LOADED, POSITIONED, DISPOSED }; - STATE m_eState; + STATE m_eState; - Reference< XRowSet > m_xForm; + Reference< XRowSet > m_xForm; - ::osl::Mutex m_aAccessSafety; + ::osl::Mutex m_aAccessSafety; public: LoadFormHelper(const Reference< XRowSet > & _rxForm); @@ -3017,7 +3017,7 @@ bool LoadFormHelper::WaitUntilReallyLoaded(bool _bOnlyIfLoaded) sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getCurrentColumnPosition" ); - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); sal_Int16 nViewPos = -1; try { @@ -3031,7 +3031,7 @@ sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setCurrentColumnPosition" ); - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); try { if ( -1 != _nPos ) @@ -3078,7 +3078,7 @@ sal_Bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com:: return sal_True; } //.................................................................. -} // namespace dbaui +} // namespace dbaui //.................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 6929a9ee162b..47881727c6dd 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,17 @@ using namespace dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::form; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -namespace +namespace { sal_Bool isGrabVclControlFocusAllowed(const UnoDataBrowserView* _pView) { - sal_Bool bGrabFocus = sal_False; + sal_Bool bGrabFocus = sal_False; SbaGridControl* pVclControl = _pView->getVclControl(); Reference< ::com::sun::star::awt::XControl > xGrid = _pView->getGridControl(); if (pVclControl && xGrid.is()) @@ -81,7 +81,7 @@ namespace DBG_NAME(UnoDataBrowserView) // ------------------------------------------------------------------------- -UnoDataBrowserView::UnoDataBrowserView( Window* pParent, +UnoDataBrowserView::UnoDataBrowserView( Window* pParent, IController& _rController, const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rFactory) :ODataView(pParent,_rController,_rFactory) @@ -121,7 +121,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont // get the VCL-control m_pVclControl = NULL; - getVclControl(); + getVclControl(); DBG_ASSERT(m_pVclControl != NULL, "UnoDataBrowserView::Construct : no real grid control !"); } @@ -139,7 +139,7 @@ UnoDataBrowserView::~UnoDataBrowserView() m_pSplitter = NULL; } setTreeView(NULL); - + if ( m_pStatus ) { delete m_pStatus; @@ -215,17 +215,17 @@ void UnoDataBrowserView::hideStatus() // ------------------------------------------------------------------------- void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) { - Point aSplitPos; - Size aSplitSize; - Point aPlaygroundPos( _rPlayground.TopLeft() ); - Size aPlaygroundSize( _rPlayground.GetSize() ); + Point aSplitPos; + Size aSplitSize; + Point aPlaygroundPos( _rPlayground.TopLeft() ); + Size aPlaygroundSize( _rPlayground.GetSize() ); if (m_pTreeView && m_pTreeView->IsVisible() && m_pSplitter) { // calculate the splitter pos and size - aSplitPos = m_pSplitter->GetPosPixel(); + aSplitPos = m_pSplitter->GetPosPixel(); aSplitPos.Y() = aPlaygroundPos.Y(); - aSplitSize = m_pSplitter->GetOutputSizePixel(); + aSplitSize = m_pSplitter->GetOutputSizePixel(); aSplitSize.Height() = aPlaygroundSize.Height(); if( ( aSplitPos.X() + aSplitSize.Width() ) > ( aPlaygroundSize.Width() )) @@ -235,8 +235,8 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) aSplitPos.X() = aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.2); // the tree pos and size - Point aTreeViewPos( aPlaygroundPos ); - Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); + Point aTreeViewPos( aPlaygroundPos ); + Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); // the status pos and size if (m_pStatus && m_pStatus->IsVisible()) @@ -249,7 +249,7 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) m_pStatus->SetPosSizePixel( aStatusPos, aStatusSize ); aTreeViewSize.Height() -= aStatusSize.Height(); } - + // set the size of treelistbox m_pTreeView->SetPosSizePixel( aTreeViewPos, aTreeViewSize ); @@ -276,8 +276,8 @@ sal_uInt16 UnoDataBrowserView::View2ModelPos(sal_uInt16 nPos) const } // ----------------------------------------------------------------------------- -SbaGridControl* UnoDataBrowserView::getVclControl() const -{ +SbaGridControl* UnoDataBrowserView::getVclControl() const +{ if ( !m_pVclControl ) { OSL_ENSURE(m_xGrid.is(),"Grid not set!"); @@ -296,7 +296,7 @@ SbaGridControl* UnoDataBrowserView::getVclControl() const } } } - return m_pVclControl; + return m_pVclControl; } // ----------------------------------------------------------------------------- void UnoDataBrowserView::GetFocus() diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index c0e3157bfb75..71d7e95a1bfc 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace dbaui class ColorChanger { protected: - OutputDevice* m_pDev; + OutputDevice* m_pDev; public: ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor ) @@ -77,9 +77,9 @@ namespace dbaui DBG_NAME(ODataView) // ------------------------------------------------------------------------- - ODataView::ODataView( Window* pParent, + ODataView::ODataView( Window* pParent, IController& _rController, - const Reference< XMultiServiceFactory >& _rFactory, + const Reference< XMultiServiceFactory >& _rFactory, WinBits nStyle) :Window(pParent,nStyle) ,m_xServiceFactory(_rFactory) @@ -102,7 +102,7 @@ namespace dbaui DBG_DTOR(ODataView,NULL); enableSeparator( sal_False ); - m_rController.release(); + m_rController.release(); } // ------------------------------------------------------------------------- @@ -176,7 +176,7 @@ namespace dbaui { case EVENT_KEYINPUT: { - const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); const KeyCode& aKeyCode = pKeyEvent->GetKeyCode(); if ( m_pAccel.get() && m_pAccel->execute( aKeyCode ) ) // the accelerator consumed the event diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index 21b4fc2d2172..fb834691c963 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ namespace dbaui using namespace ::com::sun::star::datatransfer; using namespace ::svx; - namespace + namespace { template<class T > void lcl_setListener(const Reference<T>& _xComponent, const Reference< XEventListener >& i_rListener, const bool i_bAdd ) { @@ -69,12 +69,12 @@ namespace dbaui i_bAdd ? xCom->addEventListener( i_rListener ) : xCom->removeEventListener( i_rListener ); } } - + // ----------------------------------------------------------------------------- ODataClipboard::ODataClipboard( - const ::rtl::OUString& _rDatasource, - const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const ::rtl::OUString& _rDatasource, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _rCommand, const Reference< XConnection >& _rxConnection, const Reference< XNumberFormatter >& _rxFormatter, const Reference< XMultiServiceFactory >& _rxORB) @@ -93,9 +93,9 @@ namespace dbaui // ----------------------------------------------------------------------------- ODataClipboard::ODataClipboard( - const ::rtl::OUString& _rDatasource, - const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const ::rtl::OUString& _rDatasource, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _rCommand, const Reference< XNumberFormatter >& _rxFormatter, const Reference< XMultiServiceFactory >& _rxORB) :ODataAccessObjectTransferable( _rDatasource, ::rtl::OUString(),_nCommandType, _rCommand) @@ -107,7 +107,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ODataClipboard::ODataClipboard( const Reference< XPropertySet >& i_rAliveForm, + ODataClipboard::ODataClipboard( const Reference< XPropertySet >& i_rAliveForm, const Sequence< Any >& i_rSelectedRows, const sal_Bool i_bBookmarkSelection, const Reference< XMultiServiceFactory >& i_rORB ) @@ -118,7 +118,7 @@ namespace dbaui OSL_PRECOND( i_rORB.is(), "ODataClipboard::ODataClipboard: having no factory is not good ..." ); osl_incrementInterlockedCount( &m_refCount ); - + Reference<XConnection> xConnection; getDescriptor()[ daConnection ] >>= xConnection; lcl_setListener( xConnection, this, true ); @@ -132,8 +132,8 @@ namespace dbaui OSL_ENSURE( xResultSetClone.is(), "ODataClipboard::ODataClipboard: could not clone the form's result set" ); lcl_setListener( xResultSetClone, this, true ); - getDescriptor()[daCursor] <<= xResultSetClone; - getDescriptor()[daSelection] <<= i_rSelectedRows; + getDescriptor()[daCursor] <<= xResultSetClone; + getDescriptor()[daSelection] <<= i_rSelectedRows; getDescriptor()[daBookmarkSelection]<<= i_bBookmarkSelection; addCompatibleSelectionDescription( i_rSelectedRows ); diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index bb4ae9b35b28..2bdcd5b0920f 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,22 +76,22 @@ using namespace dbaui; class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader, XServiceInfo> { private: - ::rtl::OUString m_aURL; - Sequence< PropertyValue> m_aArgs; - Reference< XLoadEventListener > m_xListener; - Reference< XFrame > m_xFrame; - Reference< XMultiServiceFactory > m_xServiceFactory; + ::rtl::OUString m_aURL; + Sequence< PropertyValue> m_aArgs; + Reference< XLoadEventListener > m_xListener; + Reference< XFrame > m_xFrame; + Reference< XMultiServiceFactory > m_xServiceFactory; public: DBContentLoader(const Reference< XMultiServiceFactory >&); ~DBContentLoader(); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + ::rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods - static ::rtl::OUString getImplementationName_Static() throw( ) + static ::rtl::OUString getImplementationName_Static() throw( ) { return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.DBContentLoader"); } @@ -100,7 +100,7 @@ public: SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); // XLoader - virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL, + virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArgs, const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancel(void) throw(); @@ -143,8 +143,8 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult sal_Bool SAL_CALL DBContentLoader::supportsService(const ::rtl::OUString& ServiceName) throw( ) { Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pBegin = aSNL.getConstArray(); - const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); + const ::rtl::OUString * pBegin = aSNL.getConstArray(); + const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); for( ; pBegin != pEnd; ++pBegin) if( *pBegin == ServiceName ) return sal_True; @@ -189,10 +189,10 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: const Sequence< PropertyValue >& rArgs, const Reference< XLoadEventListener > & rListener) throw(::com::sun::star::uno::RuntimeException) { - m_xFrame = rFrame; + m_xFrame = rFrame; m_xListener = rListener; - m_aURL = rURL; - m_aArgs = rArgs; + m_aURL = rURL; + m_aArgs = rArgs; ::comphelper::ComponentContext aContext( m_xServiceFactory ); @@ -311,9 +311,9 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: Sequence< Any > aInitArgs(m_aArgs.getLength()+1); Any* pBegin = aInitArgs.getArray(); - Any* pEnd = pBegin + aInitArgs.getLength(); + Any* pEnd = pBegin + aInitArgs.getLength(); *pBegin <<= aFrame; - const PropertyValue* pIter = m_aArgs.getConstArray(); + const PropertyValue* pIter = m_aArgs.getConstArray(); for(++pBegin;pBegin != pEnd;++pBegin,++pIter) { *pBegin <<= *pIter; diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx index c2975b9d8314..e2a94aa672ef 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.cxx +++ b/dbaccess/source/ui/browser/dbtreemodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx index b0afe70a5fe1..c28e5aa6f475 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.hxx +++ b/dbaccess/source/ui/browser/dbtreemodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ // syntax of the tree userdata // datasource holds the connection // queries holds the nameaccess for the queries -// query holds the query -// tables holds the nameaccess for the tables -// table holds the table +// query holds the query +// tables holds the nameaccess for the tables +// table holds the table -#define CONTAINER_QUERIES ULONG( 0 ) -#define CONTAINER_TABLES ULONG( 1 ) +#define CONTAINER_QUERIES ULONG( 0 ) +#define CONTAINER_TABLES ULONG( 1 ) namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } @@ -59,7 +59,7 @@ namespace dbaui xContainer; /// if the entry denotes a data source, this is the connection for this data source (if already connection) SharedConnection xConnection; - SbaTableQueryBrowser::EntryType eType; + SbaTableQueryBrowser::EntryType eType; String sAccessor; DBTreeListUserData(); diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index b69c67bc4bee..967df21722df 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,8 +47,8 @@ DBG_NAME(DBTreeView) //======================================================================== // class DBTreeView //======================================================================== -DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nBits) - : Window( pParent, nBits ) +DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nBits) + : Window( pParent, nBits ) , m_pTreeListBox(NULL) { DBG_CTOR(DBTreeView,NULL); @@ -62,7 +62,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory > } // ----------------------------------------------------------------------------- - + DBTreeView::~DBTreeView() { DBG_DTOR(DBTreeView,NULL); @@ -85,7 +85,7 @@ void DBTreeView::SetPreExpandHandler(const Link& _rHdl) } // ----------------------------------------------------------------------------- -void DBTreeView::setCopyHandler(const Link& _rHdl) +void DBTreeView::setCopyHandler(const Link& _rHdl) { m_pTreeListBox->setCopyHandler(_rHdl); } @@ -118,7 +118,7 @@ void DBTreeView::GetFocus() // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx index 2cba0dd10b08..7bcddc2ef32c 100644 --- a/dbaccess/source/ui/browser/dbtreeview.hxx +++ b/dbaccess/source/ui/browser/dbtreeview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,12 +45,12 @@ namespace dbaui class DBTreeView : public Window { private: - DBTreeListBox* m_pTreeListBox; + DBTreeListBox* m_pTreeListBox; protected: // window overridables virtual void Resize(); - public: - + public: + DBTreeView( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, WinBits nBits ); @@ -60,16 +60,16 @@ namespace dbaui <p>When calling the link, the parameter is an SvLBoxEntry marking the entry to be expanded. </p> */ - void SetPreExpandHandler(const Link& _rHdl); + void SetPreExpandHandler(const Link& _rHdl); /// gets the currently set NodeExpansionHandler - void setCopyHandler(const Link& _rHdl); + void setCopyHandler(const Link& _rHdl); - void setModel(SvLBoxTreeList* _pTreeModel); - void setSelChangeHdl(const Link& _rHdl); + void setModel(SvLBoxTreeList* _pTreeModel); + void setSelChangeHdl(const Link& _rHdl); - DBTreeListBox& getListBox() const { return *m_pTreeListBox; } + DBTreeListBox& getListBox() const { return *m_pTreeListBox; } virtual void GetFocus(); }; diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 26c7860a474e..5ef1ceabcb20 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace dbaui { // ......................................................................... // ----------------------------------------------------------------------------- -SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvLBoxEntry* _pEntry ) const +SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvLBoxEntry* _pEntry ) const { DBG_ASSERT(isContainer(_pEntry), "SbaTableQueryBrowser::getChildType: invalid entry!"); switch (getEntryType(_pEntry)) @@ -75,10 +75,10 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( SvLBoxEntry* if (!_pEntry) return etUnknown; - SvLBoxEntry* pRootEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry); - SvLBoxEntry* pEntryParent = m_pTreeView->getListBox().GetParent(_pEntry); - SvLBoxEntry* pTables = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_TABLES); - SvLBoxEntry* pQueries = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_QUERIES); + SvLBoxEntry* pRootEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry); + SvLBoxEntry* pEntryParent = m_pTreeView->getListBox().GetParent(_pEntry); + SvLBoxEntry* pTables = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_TABLES); + SvLBoxEntry* pQueries = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_QUERIES); #ifdef DBG_UTIL String sTest; @@ -269,7 +269,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged() } // ----------------------------------------------------------------------------- // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 9497d08f5076..3e0452f6fd16 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,20 +152,20 @@ namespace dbaui m_nAsyncDrop = 0; m_aAsyncDrop.aDroppedData.clear(); - m_aAsyncDrop.nType = E_TABLE; - m_aAsyncDrop.nAction = _rEvt.mnAction; - m_aAsyncDrop.bError = sal_False; - m_aAsyncDrop.bHtml = sal_False; - m_aAsyncDrop.pDroppedAt = NULL; - m_aAsyncDrop.aUrl = ::rtl::OUString(); + m_aAsyncDrop.nType = E_TABLE; + m_aAsyncDrop.nAction = _rEvt.mnAction; + m_aAsyncDrop.bError = sal_False; + m_aAsyncDrop.bHtml = sal_False; + m_aAsyncDrop.pDroppedAt = NULL; + m_aAsyncDrop.aUrl = ::rtl::OUString(); // loop through the available formats and see what we can do ... // first we have to check if it is our own format, if not we have to copy the stream :-( if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(aDroppedData.GetDataFlavorExVector()) ) { - m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); - m_aAsyncDrop.pDroppedAt = pHitEntry; + m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); + m_aAsyncDrop.pDroppedAt = pHitEntry; // asyncron because we some dialogs and we aren't allowed to show them while in D&D m_nAsyncDrop = Application::PostUserEvent(LINK(this, SbaTableQueryBrowser, OnAsyncDrop)); @@ -179,7 +179,7 @@ namespace dbaui && m_aTableCopyHelper.copyTagTable( aDroppedData, m_aAsyncDrop, xDestConnection ) ) { - m_aAsyncDrop.pDroppedAt = pHitEntry; + m_aAsyncDrop.pDroppedAt = pHitEntry; // asyncron because we some dialogs and we aren't allowed to show them while in D&D m_nAsyncDrop = Application::PostUserEvent(LINK(this, SbaTableQueryBrowser, OnAsyncDrop)); @@ -233,8 +233,8 @@ namespace dbaui TransferableHelper* pTransfer = NULL; Reference< XTransferable> aEnsureDelete; EntryType eType = getEntryType(_pEntry); - pTransfer = implCopyObject( _pEntry, eType == etQuery ? CommandType::QUERY : CommandType::TABLE); - aEnsureDelete = pTransfer; + pTransfer = implCopyObject( _pEntry, eType == etQuery ? CommandType::QUERY : CommandType::TABLE); + aEnsureDelete = pTransfer; if (pTransfer) pTransfer->CopyToClipboard(getView()); } @@ -291,7 +291,7 @@ namespace dbaui m_pCurrentlyDisplayed = NULL; } // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 6526592112fc..8ae902785475 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -196,7 +196,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U // create the col Reference< ::com::sun::star::form::XGridColumnFactory > xColFactory(getControlModel(), UNO_QUERY); - Reference< ::com::sun::star::beans::XPropertySet > xNewCol = xColFactory->createColumn(sControlType); + Reference< ::com::sun::star::beans::XPropertySet > xNewCol = xColFactory->createColumn(sControlType); Reference< XPropertySetInfo > xNewColProperties; if (xNewCol.is()) xNewColProperties = xNewCol->getPropertySetInfo(); @@ -214,9 +214,9 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U catch(Exception&) { OSL_ENSURE(sal_False, - ( ByteString("SbaExternalSourceBrowser::dispatch : could not set a column property (") - += ByteString(pControlProps->Name.getStr(), (sal_uInt16)pControlProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US) - += ByteString(")!")).GetBuffer()); + ( ByteString("SbaExternalSourceBrowser::dispatch : could not set a column property (") + += ByteString(pControlProps->Name.getStr(), (sal_uInt16)pControlProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US) + += ByteString(")!")).GetBuffer()); } } } @@ -272,22 +272,22 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaExternalSourceBrows m_bInQueryDispatch = sal_True; - if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AttachToForm"))) + if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AttachToForm"))) // attach a new external form - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AddGridColumn"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AddGridColumn"))) // add a column to the grid - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/ClearView"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/ClearView"))) // clear the grid ) xReturn = (::com::sun::star::frame::XDispatch*)this; - if ( !xReturn.is() - && ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToFirst"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToPrev"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNext"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToLast"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNew"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/undoRecord"))) + if ( !xReturn.is() + && ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToFirst"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToPrev"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNext"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToLast"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNew"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/undoRecord"))) ) ) { @@ -361,8 +361,8 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster) { Any aOldPos; sal_Bool bWasInsertRow = sal_False; - sal_Bool bBeforeFirst = sal_True; - sal_Bool bAfterLast = sal_True; + sal_Bool bBeforeFirst = sal_True; + sal_Bool bAfterLast = sal_True; Reference< XResultSet > xResultSet(xMaster, UNO_QUERY); Reference< XRowLocate > xCursor(xMaster, UNO_QUERY); Reference< XPropertySet > xMasterProps(xMaster, UNO_QUERY); @@ -378,7 +378,7 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster) if (xCursor.is() && xResultSet.is()) { bBeforeFirst = xResultSet->isBeforeFirst(); - bAfterLast = xResultSet->isAfterLast(); + bAfterLast = xResultSet->isAfterLast(); if(!bBeforeFirst && !bAfterLast) aOldPos = xCursor->getBookmark(); } @@ -460,7 +460,7 @@ void SbaExternalSourceBrowser::startListening() { if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is()) { - Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); + Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); xLoadable->addLoadListener((::com::sun::star::form::XLoadListener*)this); } } @@ -470,7 +470,7 @@ void SbaExternalSourceBrowser::stopListening() { if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is()) { - Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); + Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); xLoadable->removeLoadListener((::com::sun::star::form::XLoadListener*)this); } } diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 2a02d3827f56..70fb1adf9071 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1151,7 +1151,7 @@ void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException ) m_aContainerListeners.disposeAndClear(aEvt); // dispose all childs - for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = m_aChildren.begin(); + for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = m_aChildren.begin(); aIter != m_aChildren.end(); ++aIter ) @@ -1520,7 +1520,7 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const :: // ------------------------------------------------------------------------- sal_Int32 SbaXFormAdapter::implGetPos(const ::rtl::OUString& rName) { - ::std::vector< ::rtl::OUString>::iterator aIter = ::std::find_if( m_aChildNames.begin(), + ::std::vector< ::rtl::OUString>::iterator aIter = ::std::find_if( m_aChildNames.begin(), m_aChildNames.end(), ::std::bind2nd(::std::equal_to< rtl::OUString>(),rName)); @@ -1743,7 +1743,7 @@ void SAL_CALL SbaXFormAdapter::propertyChange(const ::com::sun::star::beans::Pro { if (evt.PropertyName.equals(PROPERTY_NAME)) { - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), m_aChildren.end(), ::std::bind2nd(::std::equal_to< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >(),evt.Source)); @@ -1764,7 +1764,7 @@ void SAL_CALL SbaXFormAdapter::disposing(const ::com::sun::star::lang::EventObje if (Source.Source == m_xMainForm) dispose(); - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), m_aChildren.end(), ::std::bind2nd(::std::equal_to< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >(),Source.Source)); if(aIter != m_aChildren.end()) diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 6bac728cad62..c6451a13a55f 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ using namespace ::dbtools; using namespace ::comphelper; // ------------------------------------------------------------------------- -#define ALL_FEATURES -1 +#define ALL_FEATURES -1 #define FIRST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() - 1000 ) #define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() ) @@ -273,7 +273,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/) } if (!m_xDatabaseContext.is()) - { // at least notify the user. Though the whole component does not make any sense without the database context ... + { // at least notify the user. Though the whole component does not make any sense without the database context ... ShowServiceNotAvailableError(getView(), String(SERVICE_SDB_DATABASECONTEXT), sal_True); } return sal_True; @@ -295,12 +295,12 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); - Reference< XWindow > xParent; + Reference< XWindow > xParent; Reference< XFrame > xFrame; PropertyValue aValue; - const Any* pIter = aArguments.getConstArray(); - const Any* pEnd = pIter + aArguments.getLength(); + const Any* pIter = aArguments.getConstArray(); + const Any* pEnd = pIter + aArguments.getLength(); for ( ; pIter != pEnd; ++pIter ) { @@ -503,7 +503,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF sal_uInt16 nFeat = m_aSupportedFeatures[ _rFeature ].nFeatureId; FeatureState aFeatState( GetState( nFeat ) ); - FeatureState& rCachedState = m_aStateCache[nFeat]; // creates if neccessary + FeatureState& rCachedState = m_aStateCache[nFeat]; // creates if neccessary if ( !_bIgnoreCache ) { // check if we really need to notify the listeners : this method may be called much more often than needed, so check @@ -523,8 +523,8 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF aEvent.FeatureURL.Complete = _rFeature; if (m_xUrlTransformer.is()) m_xUrlTransformer->parseStrict(aEvent.FeatureURL); - aEvent.Source = (XDispatch*)this; - aEvent.IsEnabled = aFeatState.bEnabled; + aEvent.Source = (XDispatch*)this; + aEvent.IsEnabled = aFeatState.bEnabled; // collect all states to be notified States aStates; @@ -534,7 +534,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF if ( xListener.is() ) lcl_notifyMultipleStates( *xListener.get(), aEvent, aStates ); else - { // no -> iterate through all listeners responsible for the URL + { // no -> iterate through all listeners responsible for the URL StringBag aFeatureCommands; ::std::for_each( m_aSupportedFeatures.begin(), @@ -692,7 +692,7 @@ void OGenericUnoController::InvalidateAll_Impl() } // ----------------------------------------------------------------------- -Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) +Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { Reference< XDispatch > xReturn; @@ -727,9 +727,9 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const if ( nLen ) { aReturn.realloc( nLen ); - Reference< XDispatch >* pReturn = aReturn.getArray(); - const Reference< XDispatch >* pReturnEnd = aReturn.getArray() + nLen; - const DispatchDescriptor* pDescripts = aDescripts.getConstArray(); + Reference< XDispatch >* pReturn = aReturn.getArray(); + const Reference< XDispatch >* pReturnEnd = aReturn.getArray() + nLen; + const DispatchDescriptor* pDescripts = aDescripts.getConstArray(); for ( ; pReturn != pReturnEnd; ++ pReturn, ++pDescripts ) { @@ -741,7 +741,7 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const } // ----------------------------------------------------------------------- -Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider(void) throw( RuntimeException ) +Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider(void) throw( RuntimeException ) { return m_xSlaveDispatcher; } @@ -753,7 +753,7 @@ void OGenericUnoController::setSlaveDispatchProvider(const Reference< XDispatchP } // ----------------------------------------------------------------------- -Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider(void) throw( RuntimeException ) +Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider(void) throw( RuntimeException ) { return m_xMasterDispatcher; } @@ -810,9 +810,9 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene while ( iterSearch != m_arrStatusListener.end() ) { DispatchTarget& rCurrent = *iterSearch; - if ( (rCurrent.xListener == aListener) - && ( bRemoveForAll - || (rCurrent.aURL.Complete.equals(_rURL.Complete)) + if ( (rCurrent.xListener == aListener) + && ( bRemoveForAll + || (rCurrent.aURL.Complete.equals(_rURL.Complete)) ) ) { @@ -831,7 +831,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find(_rURL.Complete); if (aIter != m_aSupportedFeatures.end()) - { // clear the cache for that feature + { // clear the cache for that feature StateCacheIterator aCachePos = m_aStateCache.find( aIter->second.nFeatureId ); if ( aCachePos != m_aStateCache.end() ) m_aStateCache.erase( aCachePos ); @@ -840,7 +840,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene // now remove the listener from the deque ::osl::MutexGuard aGuard( m_aFeatureMutex ); m_aFeaturesToInvalidate.erase( - ::std::remove_if( m_aFeaturesToInvalidate.begin(), + ::std::remove_if( m_aFeaturesToInvalidate.begin(), m_aFeaturesToInvalidate.end(), ::std::bind2nd(FindFeatureListener(),aListener)) ,m_aFeaturesToInvalidate.end()); @@ -1217,7 +1217,7 @@ namespace Reference< XServiceInfo > xSI( xModel, UNO_QUERY ); if ( !xSI.is() ) - { // try to go up the frame hierarchy + { // try to go up the frame hierarchy Reference< XFrame > xParentFrame; if ( _rxFrame.is() ) @@ -1243,7 +1243,7 @@ namespace static const sal_Char* pTransTable[] = { "com.sun.star.sdb.OfficeDatabaseDocument","sdatabase", "com.sun.star.report.ReportDefinition","sdatabase", - "com.sun.star.text.TextDocument", "swriter", + "com.sun.star.text.TextDocument", "swriter", "com.sun.star.sheet.SpreadsheetDocument", "scalc", "com.sun.star.presentation.PresentationDocument", "simpress", "com.sun.star.drawing.DrawingDocument", "sdraw", @@ -1260,7 +1260,7 @@ namespace for ( sal_Int32 j=0; j<nTableEntries; ++j ) { if ( xSI->supportsService( ::rtl::OUString::createFromAscii( *pDocumentService ) ) ) - { // found a table entry which matches the model's services + { // found a table entry which matches the model's services pReturn = *pHelpModuleName; break; } diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index 747a2d7ac8cf..fc28c1de325f 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" #endif -// #include <sfx2/sfx.hrc> +// #include <sfx2/sfx.hrc> #ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> #endif @@ -83,45 +83,45 @@ String RID_STR_TABLES_CONTAINER Text [ en-US ] = "Tables"; }; -#define MID_EDIT_DATABASE \ - Identifier = ID_TREE_EDIT_DATABASE ; \ - HelpId = HID_BROWSER_EDIT_DATABASE; \ +#define MID_EDIT_DATABASE \ + Identifier = ID_TREE_EDIT_DATABASE ; \ + HelpId = HID_BROWSER_EDIT_DATABASE; \ Text [ en-US ] = "Edit ~Database File..." ;\ -#define MID_ADMINISTRATE \ - Identifier = ID_TREE_ADMINISTRATE ; \ - HelpId = HID_BROWSER_ADMINISTRATE; \ +#define MID_ADMINISTRATE \ + Identifier = ID_TREE_ADMINISTRATE ; \ + HelpId = HID_BROWSER_ADMINISTRATE; \ Text [ en-US ] = "Registered databases ..." ;\ -#define MID_CLOSECONN \ - Identifier = ID_TREE_CLOSE_CONN ; \ - HelpId = HID_BROWSER_CLOSECONN ; \ - Text [ en-US ] = "Disco~nnect" ; \ +#define MID_CLOSECONN \ + Identifier = ID_TREE_CLOSE_CONN ; \ + HelpId = HID_BROWSER_CLOSECONN ; \ + Text [ en-US ] = "Disco~nnect" ; \ Menu MENU_BROWSER_DEFAULTCONTEXT { ItemList = { - MenuItem \ - { \ - MID_EDIT_DATABASE \ - }; \ - MenuItem \ - { \ - MID_CLOSECONN \ - }; \ - MenuItem \ - { \ - Separator = TRUE; \ + MenuItem \ + { \ + MID_EDIT_DATABASE \ + }; \ + MenuItem \ + { \ + MID_CLOSECONN \ + }; \ + MenuItem \ + { \ + Separator = TRUE; \ }; \ - MenuItem { ITEM_EDIT_COPY }; - MenuItem \ - { \ - Separator = TRUE; \ + MenuItem { ITEM_EDIT_COPY }; + MenuItem \ + { \ + Separator = TRUE; \ }; \ - MenuItem \ - { \ - MID_ADMINISTRATE \ + MenuItem \ + { \ + MID_ADMINISTRATE \ }; }; }; diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 1652ed46b094..62353cd5456b 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,11 +33,11 @@ #include <svx/svxids.hrc> -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN -#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO +#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY +#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY +#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK +#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN +#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO #define _ZFORLIST_DECLARE_TABLE @@ -172,9 +172,9 @@ Sequence< ::rtl::OUString> SbaXGridControl::getSupportedServiceNames_Static(void aSupported[2] = ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControl"); return aSupported; } -DBG_NAME(SbaXGridControl ); +DBG_NAME(SbaXGridControl ); //--------------------------------------------------------------------------------------- -SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM) +SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM) : FmXGridControl(_rM) { DBG_CTOR(SbaXGridControl ,NULL); @@ -183,7 +183,7 @@ SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM) //--------------------------------------------------------------------------------------- SbaXGridControl::~SbaXGridControl() { - DBG_DTOR(SbaXGridControl ,NULL); + DBG_DTOR(SbaXGridControl ,NULL); } //--------------------------------------------------------------------------------------- @@ -204,7 +204,7 @@ FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent) catch(Exception&) { } - + } pReturn->Create(pParent, nStyle); @@ -212,7 +212,7 @@ FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent) } //------------------------------------------------------------------------------ -Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType) throw (RuntimeException) +Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType) throw (RuntimeException) { Any aRet = FmXGridControl::queryInterface(_rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface(_rType,(::com::sun::star::frame::XDispatch*)this); @@ -257,10 +257,10 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt // TODO: why the hell this whole class does not use any mutex? -// if (0 == m_nPeerCreationLevel) +// if (0 == m_nPeerCreationLevel) { Reference< ::com::sun::star::frame::XDispatch > xDisp(getPeer(), UNO_QUERY); - for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); + for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); aIter != m_aStatusMultiplexer.end(); ++aIter) { @@ -294,12 +294,12 @@ void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListen if ( getPeer().is() ) { if ( 1 == pMultiplexer->getLength() ) - { // the first external listener for this URL + { // the first external listener for this URL Reference< XDispatch > xDisp( getPeer(), UNO_QUERY ); xDisp->addStatusListener( pMultiplexer, _rURL ); } else - { // already have other listeners for this URL + { // already have other listeners for this URL _rxListener->statusChanged( pMultiplexer->getLastEvent() ); } } @@ -334,7 +334,7 @@ void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException ) EventObject aEvt; aEvt.Source = *this; - for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); + for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); aIter != m_aStatusMultiplexer.end(); ++aIter) { @@ -365,7 +365,7 @@ SbaXGridPeer::SbaXGridPeer(const Reference< XMultiServiceFactory >& _rM) //--------------------------------------------------------------------------------------- SbaXGridPeer::~SbaXGridPeer() { - DBG_DTOR(SbaXGridPeer ,NULL); + DBG_DTOR(SbaXGridPeer ,NULL); } //--------------------------------------------------------------------------------------- @@ -401,7 +401,7 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl, else { ::cppu::OInterfaceContainerHelper * pIter = m_aStatusListeners.getContainer(_rUrl); - + if (pIter) { ::cppu::OInterfaceIteratorHelper aListIter(*pIter); @@ -412,7 +412,7 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl, } //------------------------------------------------------------------------------ -Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException) +Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException) { Any aRet = ::cppu::queryInterface(_rType,(::com::sun::star::frame::XDispatch*)this); if(aRet.hasValue()) @@ -423,10 +423,10 @@ Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeExce //--------------------------------------------------------------------------------------- Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { - if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/BrowserAttribs"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/RowHeight"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnAttribs"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnWidth"))) + if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/BrowserAttribs"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/RowHeight"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnAttribs"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnWidth"))) ) { return (::com::sun::star::frame::XDispatch*)this; @@ -439,7 +439,7 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDis IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ ) { SbaGridControl* pGrid = static_cast< SbaGridControl* >( GetWindow() ); - if ( pGrid ) // if this fails, we were disposing before arriving here + if ( pGrid ) // if this fails, we were disposing before arriving here { if ( Application::GetMainThreadIdentifier() != ::osl::Thread::getCurrentIdentifier() ) { @@ -595,17 +595,17 @@ void SAL_CALL SbaXGridPeer::removeStatusListener(const Reference< ::com::sun::st //--------------------------------------------------------------------------------------- const Sequence< sal_Int8 > & SbaXGridPeer::getUnoTunnelId() { - static Sequence< sal_Int8 > * pSeq = 0; - if( !pSeq ) + static Sequence< sal_Int8 > * pSeq = 0; + if( !pSeq ) { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); - if( !pSeq ) + if( !pSeq ) { static Sequence< sal_Int8 > aSeq( 16 ); - rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0,sal_True ); - pSeq = &aSeq; - } - } + rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0,sal_True ); + pSeq = &aSeq; + } + } return *pSeq; } @@ -626,7 +626,7 @@ sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId { if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast< sal_Int64 >( this ); - + return FmXGridPeer::getSomething(rId); } @@ -675,10 +675,10 @@ void SbaGridHeader::MouseButtonDown( const MouseEvent& _rMEvt ) // the base class will start a column move here, which we don't want to allow // (at the moment. If we store relative positions with the columns, we can allow column moves ....) -// sal_uInt16 nPos(0); -// sal_uInt16 nHitTest = ImplHitTest( _rMEvt.GetPosPixel(), mnMouseOff, nPos ); -// if (!nHitTest & HEAD_HITTEST_DIVIDER) -// return; +// sal_uInt16 nPos(0); +// sal_uInt16 nHitTest = ImplHitTest( _rMEvt.GetPosPixel(), mnMouseOff, nPos ); +// if (!nHitTest & HEAD_HITTEST_DIVIDER) +// return; } FmGridHeader::MouseButtonDown(_rMEvt); @@ -692,7 +692,7 @@ sal_Bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMo if (HEADERBAR_ITEM_NOTFOUND != nId) { Rectangle aColRect = GetItemRect(nId); - aColRect.Left() += nId ? 3 : 0; // the handle col (nId == 0) does not have a left margin for resizing + aColRect.Left() += nId ? 3 : 0; // the handle col (nId == 0) does not have a left margin for resizing aColRect.Right() -= 3; bResizingCol = !aColRect.IsInside(_rMousePos); } @@ -708,7 +708,7 @@ sal_Bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMo static_cast<SbaGridControl*>(GetParent())->StartDrag(_nAction, Point( - _rMousePos.X() + GetPosPixel().X(), // we aren't left-justified with our parent, in contrast to the data window + _rMousePos.X() + GetPosPixel().X(), // we aren't left-justified with our parent, in contrast to the data window _rMousePos.Y() - GetSizePixel().Height() ) ); @@ -740,7 +740,7 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM pShowColsMenu->EnableItem(SID_FM_SHOWALLCOLS, sal_False); } } - + // prepend some new items sal_Bool bColAttrs = (nColId != (sal_uInt16)-1) && (nColId != 0); if ( bColAttrs && !bDBIsReadOnly) @@ -811,7 +811,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM //================================================================== // SbaGridControl //================================================================== -DBG_NAME(SbaGridControl ); +DBG_NAME(SbaGridControl ); //--------------------------------------------------------------------------------------- SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM, Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) @@ -827,9 +827,9 @@ SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM, //--------------------------------------------------------------------------------------- SbaGridControl::~SbaGridControl() { - DBG_DTOR(SbaGridControl ,NULL); + DBG_DTOR(SbaGridControl ,NULL); if (m_nAsyncDropEvent) - Application::RemoveUserEvent(m_nAsyncDropEvent); + Application::RemoveUserEvent(m_nAsyncDropEvent); } //--------------------------------------------------------------------------------------- @@ -864,7 +864,7 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu) rMenu.SetHelpId(ID_BROWSER_ROWHEIGHT, aNewItems.GetHelpId(ID_BROWSER_ROWHEIGHT)); rMenu.InsertSeparator(nPos++); } // if (!IsReadOnlyDB()) - + if ( GetSelectRowCount() > 0 ) { rMenu.InsertItem(ID_BROWSER_COPY, aNewItems.GetItemText(SID_COPY), 0, nPos++); @@ -902,13 +902,13 @@ void SbaGridControl::SetColWidth(sal_uInt16 nColId) Any aWidth = xAffectedCol->getPropertyValue(PROPERTY_WIDTH); sal_Int32 nCurWidth = aWidth.hasValue() ? ::comphelper::getINT32(aWidth) : -1; - DlgSize aDlgColWidth(this, nCurWidth, sal_False); + DlgSize aDlgColWidth(this, nCurWidth, sal_False); if (aDlgColWidth.Execute()) { sal_Int32 nValue = aDlgColWidth.GetValue(); Any aNewWidth; if (-1 == nValue) - { // set to default + { // set to default Reference< XPropertyState > xPropState(xAffectedCol, UNO_QUERY); if (xPropState.is()) { @@ -938,26 +938,26 @@ void SbaGridControl::SetRowHeight() sal_Int32 nValue = aDlgRowHeight.GetValue(); Any aNewHeight; if ((sal_Int16)-1 == nValue) - { // set to default + { // set to default Reference< XPropertyState > xPropState(xCols, UNO_QUERY); if (xPropState.is()) { - try - { - aNewHeight = xPropState->getPropertyDefault(PROPERTY_ROW_HEIGHT); - } + try + { + aNewHeight = xPropState->getPropertyDefault(PROPERTY_ROW_HEIGHT); + } catch(Exception&) { } } } else aNewHeight <<= nValue; - try - { - xCols->setPropertyValue(PROPERTY_ROW_HEIGHT, aNewHeight); - } - catch(Exception&) - { + try + { + xCols->setPropertyValue(PROPERTY_ROW_HEIGHT, aNewHeight); + } + catch(Exception&) + { OSL_ENSURE(0,"setPropertyValue: PROPERTY_ROW_HEIGHT throws a exception"); } } @@ -1058,7 +1058,7 @@ void SbaGridControl::CursorMoved() } //--------------------------------------------------------------------------------------- -void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus /*= sal_True*/ ) +void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus /*= sal_True*/ ) { FmGridControl::ActivateCell(nRow, nCol, bSetCellFocus); if (m_pMasterListener) @@ -1122,7 +1122,7 @@ Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos) { OSL_ENSURE(0,"SbaGridControl::getField Exception occured!"); } - + return xEmptyReturn; } @@ -1194,7 +1194,7 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) long nCorrectRowCount = GetRowCount(); if (GetOptions() & OPT_INSERT) - --nCorrectRowCount; // there is a empty row for inserting records + --nCorrectRowCount; // there is a empty row for inserting records if (bCurrentRowVirtual) --nCorrectRowCount; @@ -1204,20 +1204,20 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) sal_Bool bHitHandle = (nColPos == 0); // check which kind of dragging has to be initiated - if ( bHitHandle // the handle column + if ( bHitHandle // the handle column // AND - && ( GetSelectRowCount() // at least one row is selected + && ( GetSelectRowCount() // at least one row is selected // OR - || ( (nRow >= 0) // a row below the header - && !bCurrentRowVirtual // we aren't appending a new record - && (nRow != GetCurrentPos()) // a row which is not the current one - ) // OR - || ( (0 == GetSelectRowCount()) // no rows selected - && (-1 == nRow) // hit the header + || ( (nRow >= 0) // a row below the header + && !bCurrentRowVirtual // we aren't appending a new record + && (nRow != GetCurrentPos()) // a row which is not the current one + ) // OR + || ( (0 == GetSelectRowCount()) // no rows selected + && (-1 == nRow) // hit the header ) ) ) - { // => start dragging the row + { // => start dragging the row if (GetDataWindow().IsMouseCaptured()) GetDataWindow().ReleaseMouse(); @@ -1231,11 +1231,11 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) bHandled = sal_True; } - else if ( (nRow < 0) // the header - && (!bHitHandle) // non-handle column - && (nViewPos < GetViewColCount()) // valid (existing) column + else if ( (nRow < 0) // the header + && (!bHitHandle) // non-handle column + && (nViewPos < GetViewColCount()) // valid (existing) column ) - { // => start dragging the column + { // => start dragging the column if (GetDataWindow().IsMouseCaptured()) GetDataWindow().ReleaseMouse(); @@ -1244,10 +1244,10 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) bHandled = sal_True; } - else if ( !bHitHandle // non-handle column - && (nRow >= 0) // non-header row + else if ( !bHitHandle // non-handle column + && (nRow >= 0) // non-header row ) - { // => start dragging the field content + { // => start dragging the field content if (GetDataWindow().IsMouseCaptured()) GetDataWindow().ReleaseMouse(); @@ -1300,7 +1300,7 @@ void SbaGridControl::DoColumnDrag(sal_uInt16 nColumnPos) } if (0 == sField.getLength()) return; - + OColumnTransferable* pDataTransfer = new OColumnTransferable(xDataSource, sField, xAffectedField, xActiveConnection, CTF_FIELD_DESCRIPTOR | CTF_COLUMN_DESCRIPTOR); Reference< XTransferable > xEnsureDelete = pDataTransfer; pDataTransfer->StartDrag(this, DND_ACTION_COPY | DND_ACTION_LINK); @@ -1385,10 +1385,10 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos) } /// unary_function Functor object for class ZZ returntype is void - struct SbaGridControlPrec : ::std::unary_function<DataFlavorExVector::value_type,bool> + struct SbaGridControlPrec : ::std::unary_function<DataFlavorExVector::value_type,bool> { - sal_Bool bQueryDrop; - SbaGridControlPrec(sal_Bool _bQueryDrop) + sal_Bool bQueryDrop; + SbaGridControlPrec(sal_Bool _bQueryDrop) : bQueryDrop(_bQueryDrop) { } @@ -1397,13 +1397,13 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos) { switch (_aType.mnSotId) { -// case SOT_FORMAT_RTF: // RTF data descriptions -// case SOT_FORMATSTR_ID_HTML: // HTML data descriptions - case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor - case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor - case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command +// case SOT_FORMAT_RTF: // RTF data descriptions +// case SOT_FORMATSTR_ID_HTML: // HTML data descriptions + case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor + case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor + case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command return true; - } + } return false; } }; @@ -1417,25 +1417,25 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) return nAction; if ( IsDropFormatSupported( FORMAT_STRING ) ) do - { // odd construction, but spares us a lot of (explicit ;) goto's + { // odd construction, but spares us a lot of (explicit ;) goto's if (!GetEmptyRow().Is()) // without an empty row we're not in update mode break; - long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); - sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); + long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); + sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); long nCorrectRowCount = GetRowCount(); if (GetOptions() & OPT_INSERT) - --nCorrectRowCount; // there is a empty row for inserting records + --nCorrectRowCount; // there is a empty row for inserting records if (IsCurrentAppending()) - --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one + --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one if ((nCol == BROWSER_INVALIDID) || (nRow >= nCorrectRowCount) || GetColumnId(nCol) == 0 ) // no valid cell under the mouse cursor break; - + Rectangle aRect = GetCellRect(nRow, nCol, sal_False); if (!aRect.IsInside(rEvt.maPosPixel)) // not dropped within a cell (a cell isn't as wide as the column - the are small spaces) @@ -1467,7 +1467,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) // assume RO break; } - + try { // assume that text can be dropped into a field if the column has a ::com::sun::star::awt::XTextComponent interface @@ -1531,14 +1531,14 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) if ( IsDropFormatSupported( FORMAT_STRING ) ) { - long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); - sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); + long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); + sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); long nCorrectRowCount = GetRowCount(); if (GetOptions() & OPT_INSERT) - --nCorrectRowCount; // there is a empty row for inserting records + --nCorrectRowCount; // there is a empty row for inserting records if (IsCurrentAppending()) - --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one + --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one DBG_ASSERT((nCol != BROWSER_INVALIDID) && (nRow < nCorrectRowCount), "SbaGridControl::Drop : dropped on an invalid position !"); // AcceptDrop should have caught this @@ -1609,9 +1609,9 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) { sal_Bool bCountFinal = sal_False; xDataSource->getPropertyValue(PROPERTY_ISROWCOUNTFINAL) >>= bCountFinal; - if ( !bCountFinal ) + if ( !bCountFinal ) setDataSource(NULL); // deattach from grid control - Reference< XResultSetUpdate > xResultSetUpdate(xDataSource,UNO_QUERY); + Reference< XResultSetUpdate > xResultSetUpdate(xDataSource,UNO_QUERY); ODatabaseImportExport* pImExport = new ORowSetImportExport(this,xResultSetUpdate,m_aDataDescriptor,getServiceManager()); Reference<XEventListener> xHolder = pImExport; Hide(); @@ -1639,11 +1639,11 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) Show(); DBG_UNHANDLED_EXCEPTION(); } - if ( !bCountFinal ) + if ( !bCountFinal ) setDataSource(Reference< XRowSet >(xDataSource,UNO_QUERY)); } - m_aDataDescriptor.clear(); - + m_aDataDescriptor.clear(); + return 0L; } // ------------------------------------------------------------------------- @@ -1657,7 +1657,7 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) } else sRet = FmGridControl::GetAccessibleObjectDescription( eObjType,_nPosition); - return sRet; + return sRet; } // ----------------------------------------------------------------------------- void SbaGridControl::DeleteSelectedRows() diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src index 1362944d5847..6c53941d0be3 100644 --- a/dbaccess/source/ui/browser/sbagrid.src +++ b/dbaccess/source/ui/browser/sbagrid.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx index 65733d7ae563..b637035eafa3 100644 --- a/dbaccess/source/ui/browser/sbamultiplex.cxx +++ b/dbaccess/source/ui/browser/sbamultiplex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ void SAL_CALL SbaXStatusMultiplexer::statusChanged(const ::com::sun::star::frame ::cppu::OInterfaceIteratorHelper aIt( *this ); while ( aIt.hasMoreElements() ) static_cast< ::com::sun::star::frame::XStatusListener* >( aIt.next() )->statusChanged( m_aLastKnownStatus ); -} \ +} \ // LoadListener IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener) diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index f963afecab31..6f7d72824243 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -381,7 +381,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent) { // create controls and set sizes - const long nFrameWidth = getBrowserView()->LogicToPixel( ::Size( 3, 0 ), MAP_APPFONT ).Width(); + const long nFrameWidth = getBrowserView()->LogicToPixel( ::Size( 3, 0 ), MAP_APPFONT ).Width(); m_pSplitter = new Splitter(getBrowserView(),WB_HSCROLL); m_pSplitter->SetPosSizePixel( ::Point(0,0), ::Size(nFrameWidth,0) ); @@ -442,27 +442,27 @@ sal_Bool SbaTableQueryBrowser::InitializeForm(const Reference< ::com::sun::star: { sal_Int32 nPos = 0; // is the filter intially applied ? - aProperties.getArray()[nPos] = PROPERTY_APPLYFILTER; - aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_APPLYFILTER); + aProperties.getArray()[nPos] = PROPERTY_APPLYFILTER; + aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_APPLYFILTER); // the initial filter - aProperties.getArray()[nPos] = PROPERTY_FILTER; - aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_FILTER); + aProperties.getArray()[nPos] = PROPERTY_FILTER; + aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_FILTER); if ( pData->xObjectProperties->getPropertySetInfo()->hasPropertyByName(PROPERTY_HAVING_CLAUSE) ) { aProperties.realloc(aProperties.getLength()+1); aValues.realloc(aValues.getLength()+1); // the initial having clause - aProperties.getArray()[nPos] = PROPERTY_HAVING_CLAUSE; - aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_HAVING_CLAUSE); + aProperties.getArray()[nPos] = PROPERTY_HAVING_CLAUSE; + aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_HAVING_CLAUSE); } // the initial ordering - aProperties.getArray()[nPos] = PROPERTY_ORDER; - aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_ORDER); + aProperties.getArray()[nPos] = PROPERTY_ORDER; + aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_ORDER); - Reference< XMultiPropertySet > xFormMultiSet(_rxForm, UNO_QUERY); + Reference< XMultiPropertySet > xFormMultiSet(_rxForm, UNO_QUERY); xFormMultiSet->setPropertyValues(aProperties, aValues); } } @@ -524,38 +524,38 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun:: Any* pValueIter = aValues.getArray(); if ( m_bPreview ) { - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")); - *pValueIter++ <<= sal_False; - *pStringIter++ = PROPERTY_BORDER; - *pValueIter++ <<= sal_Int16(0); + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")); + *pValueIter++ <<= sal_False; + *pStringIter++ = PROPERTY_BORDER; + *pValueIter++ <<= sal_Int16(0); } - *pStringIter++ = PROPERTY_FONT; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_FONT); - *pStringIter++ = PROPERTY_TEXTEMPHASIS; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTEMPHASIS); - *pStringIter++ = PROPERTY_TEXTRELIEF; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTRELIEF); + *pStringIter++ = PROPERTY_FONT; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_FONT); + *pStringIter++ = PROPERTY_TEXTEMPHASIS; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTEMPHASIS); + *pStringIter++ = PROPERTY_TEXTRELIEF; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTRELIEF); if ( m_bPreview ) { - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar")); - *pValueIter++ <<= sal_False; - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker")); - *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar")); + *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker")); + *pValueIter++ <<= sal_False; } - *pStringIter++ = PROPERTY_ROW_HEIGHT; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_ROW_HEIGHT); + *pStringIter++ = PROPERTY_ROW_HEIGHT; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_ROW_HEIGHT); if ( m_bPreview ) { - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")); - *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")); + *pValueIter++ <<= sal_False; } - *pStringIter++ = PROPERTY_TEXTCOLOR; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTCOLOR); - *pStringIter++ = PROPERTY_TEXTLINECOLOR; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTLINECOLOR); + *pStringIter++ = PROPERTY_TEXTCOLOR; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTCOLOR); + *pStringIter++ = PROPERTY_TEXTLINECOLOR; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTLINECOLOR); - Reference< XMultiPropertySet > xFormMultiSet(xGrid, UNO_QUERY); + Reference< XMultiPropertySet > xFormMultiSet(xGrid, UNO_QUERY); xFormMultiSet->setPropertyValues(aProperties, aValues); } @@ -576,10 +576,10 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun:: // insert the column into the gridcontrol so that we see something :-) ::rtl::OUString aCurrentModelType; Reference<XColumnsSupplier> xSupCols(getRowSet(),UNO_QUERY); - Reference<XNameAccess> xColumns = xSupCols->getColumns(); - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Reference<XNameAccess> xColumns = xSupCols->getColumns(); + Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); ::rtl::OUString sDefaultProperty; Reference< XPropertySet > xColumn; @@ -597,7 +597,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun:: continue; // use the result set column's type to determine the type of grid column to create - sal_Bool bFormattedIsNumeric = sal_True; + sal_Bool bFormattedIsNumeric = sal_True; sal_Int32 nType = ::comphelper::getINT32( xColumn->getPropertyValue( PROPERTY_TYPE ) ); ::std::vector< NamedValue > aInitialValues; @@ -688,7 +688,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun:: aDescription >>= sTemp; if ( !sTemp.getLength() ) xColumn->getPropertyValue( PROPERTY_DESCRIPTION ) >>= sTemp; - + aDescription <<= sTemp; aInitialValues.push_back( NamedValue( PROPERTY_HELPTEXT, aDescription ) ); @@ -773,7 +773,7 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw( // one of the many properties which require us to update the definition ? // a column's width ? else if (evt.PropertyName.equals(PROPERTY_WIDTH)) - { // a column width has changed -> update the model + { // a column width has changed -> update the model // (the update of the view is done elsewhere) Reference<XPropertySet> xProp = getColumnHelper(m_pCurrentlyDisplayed,xSource); if(xProp.is()) @@ -820,8 +820,8 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw( } // a column's format ? - else if ( (evt.PropertyName.equals(PROPERTY_FORMATKEY)) - && (TypeClass_LONG == evt.NewValue.getValueTypeClass()) + else if ( (evt.PropertyName.equals(PROPERTY_FORMATKEY)) + && (TypeClass_LONG == evt.NewValue.getValueTypeClass()) ) { // update the model (means the definition object) @@ -847,15 +847,15 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw( } } - else if ( evt.PropertyName.equals(PROPERTY_FONT) // the font ? - || evt.PropertyName.equals(PROPERTY_TEXTCOLOR) // the text color ? - || evt.PropertyName.equals(PROPERTY_FILTER) // the filter ? - || evt.PropertyName.equals(PROPERTY_HAVING_CLAUSE) // the having clause ? - || evt.PropertyName.equals(PROPERTY_ORDER) // the sort ? - || evt.PropertyName.equals(PROPERTY_APPLYFILTER) // the appliance of the filter ? - || evt.PropertyName.equals(PROPERTY_TEXTLINECOLOR) // the text line color ? - || evt.PropertyName.equals(PROPERTY_TEXTEMPHASIS) // the text emphasis ? - || evt.PropertyName.equals(PROPERTY_TEXTRELIEF) // the text relief ? + else if ( evt.PropertyName.equals(PROPERTY_FONT) // the font ? + || evt.PropertyName.equals(PROPERTY_TEXTCOLOR) // the text color ? + || evt.PropertyName.equals(PROPERTY_FILTER) // the filter ? + || evt.PropertyName.equals(PROPERTY_HAVING_CLAUSE) // the having clause ? + || evt.PropertyName.equals(PROPERTY_ORDER) // the sort ? + || evt.PropertyName.equals(PROPERTY_APPLYFILTER) // the appliance of the filter ? + || evt.PropertyName.equals(PROPERTY_TEXTLINECOLOR) // the text line color ? + || evt.PropertyName.equals(PROPERTY_TEXTEMPHASIS) // the text emphasis ? + || evt.PropertyName.equals(PROPERTY_TEXTRELIEF) // the text relief ? ) { transferChangedControlProperty(evt.PropertyName, evt.NewValue); @@ -955,14 +955,14 @@ void SbaTableQueryBrowser::checkDocumentDataSource() if (!bKnownDocDataSource) { if (NULL != pDataSourceEntry) - { // at least the data source is know + { // at least the data source is know if (NULL != pContainerEntry) bKnownDocDataSource = sal_True; // assume we know it. // TODO: should we expand the object container? This may be too expensive just for checking .... else { if ((NULL == pObjectEntry) && m_aDocumentDataSource.has(daCommandType) && m_aDocumentDataSource.has(daCommand)) - { // maybe we have a command to be displayed ? + { // maybe we have a command to be displayed ? sal_Int32 nCommandType = CommandType::TABLE; m_aDocumentDataSource[daCommandType] >>= nCommandType; @@ -1006,7 +1006,7 @@ namespace if ( aURL.GetProtocol() != INET_PROT_NOT_VALID ) { _rDisplayName = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET); - // _rDisplayName = aURL.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET); + // _rDisplayName = aURL.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET); _rUniqueId = aURL.GetMainURL( INetURLObject::NO_DECODE ); return true; } @@ -1176,7 +1176,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::svx::ODataAccessDescri // ------------------------------------------------------------------------- void SbaTableQueryBrowser::connectExternalDispatches() { - Reference< XDispatchProvider > xProvider( getFrame(), UNO_QUERY ); + Reference< XDispatchProvider > xProvider( getFrame(), UNO_QUERY ); DBG_ASSERT(xProvider.is(), "SbaTableQueryBrowser::connectExternalDispatches: no DispatchProvider !"); if (xProvider.is()) { @@ -1299,7 +1299,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) thr { Reference<XConnection> xCon(_rSource.Source, UNO_QUERY); if ( xCon.is() && m_pTreeView ) - { // our connection is in dispose so we have to find the entry equal with this connection + { // our connection is in dispose so we have to find the entry equal with this connection // and close it what means to collapse the entry // get the top-level representing the removed data source SvLBoxEntry* pDSLoop = m_pTreeView->getListBox().FirstChild(NULL); @@ -1552,7 +1552,7 @@ void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch) if (isValid() && !loadingCancelled()) { // did we load a query? - sal_Bool bTemporary; // needed because we m_bQueryEscapeProcessing is only one bit wide (and we want to pass it by reference) + sal_Bool bTemporary; // needed because we m_bQueryEscapeProcessing is only one bit wide (and we want to pass it by reference) if ( implGetQuerySignature( m_sQueryCommand, bTemporary ) ) m_bQueryEscapeProcessing = bTemporary; } @@ -1618,8 +1618,8 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const SvLBoxEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent( pCurrentEntry ); DBTreeListUserData* pDSData = pDataSourceEntry - ? static_cast< DBTreeListUserData* >( pDataSourceEntry->GetUserData() ) - : NULL; + ? static_cast< DBTreeListUserData* >( pDataSourceEntry->GetUserData() ) + : NULL; if ( nId == ID_TREE_CLOSE_CONN ) { @@ -1738,7 +1738,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const case ID_BROWSER_COLATTRSET: case ID_BROWSER_COLWIDTH: aReturn.bEnabled = getBrowserView() && getBrowserView()->getVclControl() && isValid() && isValidCursor(); - // aReturn.bEnabled &= getDefinition() && !getDefinition()->GetDatabase()->IsReadOnly(); + // aReturn.bEnabled &= getDefinition() && !getDefinition()->GetDatabase()->IsReadOnly(); break; case ID_BROWSER_COPY: @@ -1873,7 +1873,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue MultiSelection* pSelection = (MultiSelection*)pGrid->GetSelection(); Sequence< Any > aSelection; if ( !pGrid->IsAllSelected() ) - { // transfer the selected rows only if not all rows are selected + { // transfer the selected rows only if not all rows are selected // (all rows means the whole table) // i3832 - 03.04.2002 - fs@openoffice.org if (pSelection != NULL) @@ -1914,14 +1914,14 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue xProp->getPropertyValue(PROPERTY_DATASOURCENAME) >>= sDataSourceName; aDescriptor.setDataSource(sDataSourceName); - aDescriptor[daCommand] = xProp->getPropertyValue(PROPERTY_COMMAND); - aDescriptor[daCommandType] = xProp->getPropertyValue(PROPERTY_COMMAND_TYPE); - aDescriptor[daConnection] = xProp->getPropertyValue(PROPERTY_ACTIVE_CONNECTION); - aDescriptor[daCursor] <<= xCursorClone; + aDescriptor[daCommand] = xProp->getPropertyValue(PROPERTY_COMMAND); + aDescriptor[daCommandType] = xProp->getPropertyValue(PROPERTY_COMMAND_TYPE); + aDescriptor[daConnection] = xProp->getPropertyValue(PROPERTY_ACTIVE_CONNECTION); + aDescriptor[daCursor] <<= xCursorClone; if ( aSelection.getLength() ) { - aDescriptor[daSelection] <<= aSelection; - aDescriptor[daBookmarkSelection] <<= sal_False; + aDescriptor[daSelection] <<= aSelection; + aDescriptor[daBookmarkSelection] <<= sal_False; // these are selection indicies // before we change this, all clients have to be adjusted // so that they recognize the new BookmarkSelection property! @@ -2031,8 +2031,8 @@ void SbaTableQueryBrowser::initializeTreeModel() // fill the model with the names of the registered datasources Sequence< ::rtl::OUString > aDatasources = m_xDatabaseContext->getElementNames(); - const ::rtl::OUString* pIter = aDatasources.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aDatasources.getLength(); + const ::rtl::OUString* pIter = aDatasources.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aDatasources.getLength(); for (; pIter != pEnd; ++pIter) implAddDatasource( *pIter, aDBImage, sQueriesName, aQueriesImage, sTablesName, aTablesImage, SharedConnection() ); } @@ -2049,8 +2049,8 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce try { Sequence< ::rtl::OUString > aNames = _xNameAccess->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for (; pIter != pEnd; ++pIter) { if( !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent)) @@ -2181,7 +2181,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent) // 0 indicates that an error occured } else - { // we have to expand the queries or bookmarks + { // we have to expand the queries or bookmarks if (ensureEntryObject(_pParent)) { DBTreeListUserData* pParentData = static_cast< DBTreeListUserData* >( _pParent->GetUserData() ); @@ -2236,7 +2236,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvLBoxEntry* _pEntry ) { DBG_UNHANDLED_EXCEPTION(); } - + bSuccess = pEntryData->xContainer.is(); } else @@ -2297,7 +2297,7 @@ sal_Bool SbaTableQueryBrowser::implLoadAnything(const ::rtl::OUString& _rDataSou Reference<XPropertySet> xProp(getRowSet(),UNO_QUERY); if(xProp.is()) { - Reference< ::com::sun::star::form::XLoadable > xLoadable(xProp,UNO_QUERY); + Reference< ::com::sun::star::form::XLoadable > xLoadable(xProp,UNO_QUERY); try { // the values allowing the RowSet to re-execute @@ -2403,7 +2403,7 @@ sal_Bool SbaTableQueryBrowser::implSelect(const ::rtl::OUString& _rDataSourceNam else if (!pCommandType) { if ( m_pCurrentlyDisplayed ) - { // tell the old entry (if any) it has been deselected + { // tell the old entry (if any) it has been deselected selectPath(m_pCurrentlyDisplayed, sal_False); m_pCurrentlyDisplayed = NULL; } @@ -2469,7 +2469,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) sal_Int32 nOldType = 0; xRowSetProps->getPropertyValue(PROPERTY_COMMAND_TYPE) >>= nOldType; Reference<XConnection> xOldConnection(xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY); - + // the name of the table or query SvLBoxString* pString = (SvLBoxString*)_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING); OSL_ENSURE(pString,"There must be a string item!"); @@ -2489,16 +2489,16 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) } ::rtl::OUString aName = sNameBuffer.makeStringAndClear(); - sal_Int32 nCommandType = ( etTableContainer == pContainerData->eType) - ? CommandType::TABLE - : CommandType::QUERY; + sal_Int32 nCommandType = ( etTableContainer == pContainerData->eType) + ? CommandType::TABLE + : CommandType::QUERY; // check if need to rebuild the rowset sal_Bool bRebuild = ( xOldConnection != pConData->xConnection ) || ( nOldType != nCommandType ) || ( aName != aOldName ); - Reference< ::com::sun::star::form::XLoadable > xLoadable = getLoadable(); + Reference< ::com::sun::star::form::XLoadable > xLoadable = getLoadable(); bRebuild |= !xLoadable->isLoaded(); bool bSuccess = true; if ( bRebuild ) @@ -2612,7 +2612,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) String sDataSourceName( getDataSourceAcessor( pConnection ) ); bSuccess = implLoadAnything( sDataSourceName, aName, nCommandType, sal_True, pConData->xConnection ); if ( !bSuccess ) - { // clean up + { // clean up criticalFail(); } } @@ -2652,18 +2652,18 @@ SvLBoxEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNameAc SvLBoxEntry* pDSLoop = rListBox.FirstChild(NULL); while (pDSLoop) { - pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_QUERIES); + pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_QUERIES); DBTreeListUserData* pQueriesData = static_cast<DBTreeListUserData*>(pContainer->GetUserData()); if ( pQueriesData && pQueriesData->xContainer == _rxNameAccess ) break; - pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_TABLES); + pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_TABLES); DBTreeListUserData* pTablesData = static_cast<DBTreeListUserData*>(pContainer->GetUserData()); if ( pTablesData && pTablesData->xContainer == _rxNameAccess ) break; - pDSLoop = rListBox.NextSibling(pDSLoop); - pContainer = NULL; + pDSLoop = rListBox.NextSibling(pDSLoop); + pContainer = NULL; } return pContainer; } @@ -2677,7 +2677,7 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEve // first search for a definition container where we can insert this element SvLBoxEntry* pEntry = getEntryFromContainer(xNames); - if(pEntry) // found one + if(pEntry) // found one { // insert the new entry into the tree DBTreeListUserData* pContainerData = static_cast<DBTreeListUserData*>(pEntry->GetUserData()); @@ -2709,9 +2709,9 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEve sal_Bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const String& _sName,SvLBoxEntry* _pContainer) { return m_pCurrentlyDisplayed - && getEntryType(m_pCurrentlyDisplayed) == getChildType(_pContainer) - && m_pTreeView->getListBox().GetParent(m_pCurrentlyDisplayed) == _pContainer - && m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed) == _sName; + && getEntryType(m_pCurrentlyDisplayed) == getChildType(_pContainer) + && m_pTreeView->getListBox().GetParent(m_pCurrentlyDisplayed) == _pContainer + && m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed) == _sName; } // ------------------------------------------------------------------------- void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException) @@ -2727,7 +2727,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven String aName = ::comphelper::getString(_rEvent.Accessor).getStr(); if ( isCurrentlyDisplayedChanged( aName, pContainer) ) - { // the element displayed currently has been replaced + { // the element displayed currently has been replaced // we need to remember the old value SvLBoxEntry* pTemp = m_pCurrentlyDisplayed; @@ -2774,11 +2774,11 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve Reference< XNameAccess > xNames(_rEvent.Source, UNO_QUERY); SvLBoxEntry* pContainer = getEntryFromContainer(xNames); if ( pContainer ) - { // a table or query as been replaced + { // a table or query as been replaced String aName = ::comphelper::getString(_rEvent.Accessor).getStr(); if ( isCurrentlyDisplayedChanged( aName, pContainer) ) - { // the element displayed currently has been replaced + { // the element displayed currently has been replaced // we need to remember the old value SvLBoxEntry* pTemp = m_pCurrentlyDisplayed; @@ -2829,7 +2829,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve checkDocumentDataSource(); } else if (xNames.get() == m_xDatabaseContext.get()) - { // a datasource has been replaced in the context + { // a datasource has been replaced in the context DBG_ERROR("SbaTableQueryBrowser::elementReplaced: no support for replaced data sources!"); // very suspicious: the database context should not allow to replace data source, only to register // and revoke them @@ -3064,20 +3064,20 @@ void SbaTableQueryBrowser::impl_initialize() ::rtl::OUString* pStringIter = aProperties.getArray(); Any* pValueIter = aValues.getArray(); - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")); - *pValueIter++ <<= sal_False; - *pStringIter++ = PROPERTY_BORDER; - *pValueIter++ <<= sal_Int16(0); + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")); + *pValueIter++ <<= sal_False; + *pStringIter++ = PROPERTY_BORDER; + *pValueIter++ <<= sal_Int16(0); - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar")); - *pValueIter++ <<= sal_False; - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker")); - *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar")); + *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker")); + *pValueIter++ <<= sal_False; - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")); - *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")); + *pValueIter++ <<= sal_False; - Reference< XMultiPropertySet > xFormMultiSet(getFormComponent(), UNO_QUERY); + Reference< XMultiPropertySet > xFormMultiSet(getFormComponent(), UNO_QUERY); if ( xFormMultiSet.is() ) xFormMultiSet->setPropertyValues(aProperties, aValues); } @@ -3220,8 +3220,8 @@ sal_Bool SbaTableQueryBrowser::ensureConnection(SvLBoxEntry* _pAnyEntry, SharedC SvLBoxEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent(_pAnyEntry); DBTreeListUserData* pDSData = pDSEntry - ? static_cast<DBTreeListUserData*>(pDSEntry->GetUserData()) - : NULL; + ? static_cast<DBTreeListUserData*>(pDSEntry->GetUserData()) + : NULL; return ensureConnection( pDSEntry, pDSData, _rConnection ); } @@ -3242,8 +3242,8 @@ sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvLBoxEntry* _pAnyEntry SvLBoxEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent( _pAnyEntry ); DBTreeListUserData* pDSData = pDSEntry - ? static_cast< DBTreeListUserData* >( pDSEntry->GetUserData() ) - : NULL; + ? static_cast< DBTreeListUserData* >( pDSEntry->GetUserData() ) + : NULL; if ( pDSData ) _rConnection = pDSData->xConnection; return _rConnection.is(); @@ -3340,7 +3340,7 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa String sLeftText = pLeftTextItem->GetText(); String sRightText = pRightTextItem->GetText(); - sal_Int32 nCompareResult = 0; // equal by default + sal_Int32 nCompareResult = 0; // equal by default if (m_xCollator.is()) { @@ -3503,12 +3503,12 @@ sal_Bool SbaTableQueryBrowser::implGetQuerySignature( ::rtl::OUString& _rCommand // ontain the dss (data source signature) of the form ::rtl::OUString sDataSourceName; ::rtl::OUString sCommand; - sal_Int32 nCommandType = CommandType::COMMAND; + sal_Int32 nCommandType = CommandType::COMMAND; Reference< XPropertySet > xRowsetProps( getRowSet(), UNO_QUERY ); ODataAccessDescriptor aDesc( xRowsetProps ); sDataSourceName = aDesc.getDataSource(); - aDesc[ daCommand ] >>= sCommand; - aDesc[ daCommandType ] >>= nCommandType; + aDesc[ daCommand ] >>= sCommand; + aDesc[ daCommandType ] >>= nCommandType; // do we need to do anything? if ( CommandType::QUERY != nCommandType ) @@ -3559,8 +3559,8 @@ void SbaTableQueryBrowser::clearGridColumns(const Reference< XNameContainer >& _ { // first we have to clear the grid Sequence< ::rtl::OUString > aNames = _xColContainer->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); Reference< XInterface > xColumn; for (; pIter != pEnd;++pIter) { @@ -3723,7 +3723,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour return; if ( isSelected( pDataSourceEntry ) ) - { // a table or query belonging to the deleted data source is currently beeing displayed. + { // a table or query belonging to the deleted data source is currently beeing displayed. OSL_ENSURE( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) == pDataSourceEntry, "SbaTableQueryBrowser::impl_cleanupDataSourceEntry: inconsistence (1)!" ); unloadAndCleanup( sal_True ); @@ -3731,7 +3731,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour else OSL_ENSURE( ( NULL == m_pCurrentlyDisplayed ) - || ( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) != pDataSourceEntry ), + || ( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) != pDataSourceEntry ), "SbaTableQueryBrowser::impl_cleanupDataSourceEntry: inconsistence (2)!"); // delete any user data of the child entries of the to-be-removed entry @@ -3779,7 +3779,7 @@ void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegis // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 094b1c6f4271..8dc0b41f75cd 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ DBG_NAME(OColumnControlWindow) //======================================================================== OColumnControlWindow::OColumnControlWindow(Window* pParent ,const Reference<XMultiServiceFactory>& _rxFactory) - : OFieldDescControl(pParent,NULL) + : OFieldDescControl(pParent,NULL) , m_xORB(_rxFactory) , m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) , m_bAutoIncrementEnabled(sal_True) @@ -73,7 +73,7 @@ void OColumnControlWindow::ActivateAggregate( EControlType eType ) { case tpFormat: case tpDefault: -// case tpAutoIncrement: +// case tpAutoIncrement: case tpColumnName: break; default: @@ -87,7 +87,7 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType ) { case tpFormat: case tpDefault: -// case tpAutoIncrement: +// case tpAutoIncrement: case tpColumnName: break; default: @@ -100,7 +100,7 @@ void OColumnControlWindow::CellModified(long /*nRow*/, USHORT /*nColId*/ ) saveCurrentFieldDescData(); } // ----------------------------------------------------------------------------- -::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const +::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const { return m_aLocale; } @@ -131,7 +131,7 @@ TOTypeInfoSP OColumnControlWindow::getTypeInfo(sal_Int32 _nPos) return ( _nPos >= 0 && _nPos < static_cast<sal_Int32>(m_aDestTypeInfoIndex.size())) ? m_aDestTypeInfoIndex[_nPos]->second : TOTypeInfoSP(); } // ----------------------------------------------------------------------------- -const OTypeInfoMap* OColumnControlWindow::getTypeInfo() const +const OTypeInfoMap* OColumnControlWindow::getTypeInfo() const { return &m_aDestTypeInfo; } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 353fba74e3e1..e05829656531 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,10 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN +#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY +#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY +#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK +#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN #include "FieldDescControl.hxx" #include "FieldControls.hxx" @@ -51,7 +51,7 @@ #include <svx/svxids.hrc> #include <svx/algitem.hxx> #include <svl/itempool.hxx> -#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx> +#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx> #include <svl/zforlist.hxx> #include <svl/rngitem.hxx> #include <svl/intitem.hxx> @@ -84,18 +84,18 @@ using namespace ::com::sun::star::util; //================================================================== // fuer die Controls auf der OFieldDescGenPage -#define CONTROL_SPACING_X 18 // 6 -#define CONTROL_SPACING_Y 4 -#define CONTROL_WIDTH_1 160 // 100 -#define CONTROL_WIDTH_2 100 // 60 -#define CONTROL_WIDTH_3 250 -#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5) +#define CONTROL_SPACING_X 18 // 6 +#define CONTROL_SPACING_Y 4 +#define CONTROL_WIDTH_1 160 // 100 +#define CONTROL_WIDTH_2 100 // 60 +#define CONTROL_WIDTH_3 250 +#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5) -#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem -#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format -#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem +#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem +#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format +#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem -#define HSCROLL_STEP 20 +#define HSCROLL_STEP 20 namespace @@ -105,7 +105,7 @@ namespace { double nValue = _nValue; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(_xNumberFormatter,_nFormatKey); - if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE + if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME ) { nValue = DBTypeConversion::toStandardDbDate(DBTypeConversion::getNULLDate(_xNumberFormatter->getNumberFormatsSupplier()),nValue); @@ -263,11 +263,11 @@ OFieldDescControl::~OFieldDescControl() { ::std::auto_ptr<Window> aTemp(m_pVertScroll); - m_pVertScroll = NULL; + m_pVertScroll = NULL; } { ::std::auto_ptr<Window> aTemp(m_pHorzScroll); - m_pHorzScroll = NULL; + m_pHorzScroll = NULL; } if ( m_bAdded ) ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); @@ -410,7 +410,7 @@ void OFieldDescControl::CheckScrollBars() { m_pVertScroll->Show(); m_pVertScroll->SetRangeMax(nActive - nLastVisible); -// m_pVertScroll->SetThumbPos(0); +// m_pVertScroll->SetThumbPos(0); m_pVertScroll->SetPosSizePixel( Point(nNewHWidth, 0), Size(nVScrollWidth, szOverallSize.Height()) ); } @@ -425,7 +425,7 @@ void OFieldDescControl::CheckScrollBars() { m_pHorzScroll->Show(); m_pHorzScroll->SetRangeMax((lMaxXPosition - lMaxXAvailable + HSCROLL_STEP - 1 )/HSCROLL_STEP); -// m_pHorzScroll->SetThumbPos(0); +// m_pHorzScroll->SetThumbPos(0); m_pHorzScroll->SetPosSizePixel( Point(0, nNewVHeight), Size(bNeedVScrollBar ? nNewHWidth : szOverallSize.Width(), nHScrollHeight) ); } @@ -475,12 +475,12 @@ void OFieldDescControl::ScrollAllAggregates() if (nDeltaX || nDeltaY) { - Control* ppAggregates[] = { pRequired, pNumType + Control* ppAggregates[] = { pRequired, pNumType , pAutoIncrement, pDefault , pTextLen, pLength , pScale, m_pColumnName , m_pType, m_pAutoIncrementValue}; - Control* ppAggregatesText[] = { pRequiredText, pNumTypeText + Control* ppAggregatesText[] = { pRequiredText, pNumTypeText , pAutoIncrementText, pDefaultText , pTextLenText, pLengthText , pScaleText, m_pColumnNameText @@ -527,13 +527,13 @@ void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly ) DBG_CHKTHIS(OFieldDescControl,NULL); ////////////////////////////////////////////////////////////////////// // Controls enablen/disablen - Control* ppAggregates[] = { pRequired, pNumType + Control* ppAggregates[] = { pRequired, pNumType , pAutoIncrement, pDefault , pTextLen, pLength , pScale, m_pColumnName , m_pType, m_pAutoIncrementValue , pFormat}; - Control* ppAggregatesText[] = { pRequiredText, pNumTypeText + Control* ppAggregatesText[] = { pRequiredText, pNumTypeText , pAutoIncrementText, pDefaultText , pTextLenText, pLengthText , pScaleText, m_pColumnNameText @@ -729,7 +729,7 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ ) } // ----------------------------------------------------------------------- -void OFieldDescControl::SetModified(sal_Bool /*bModified*/) +void OFieldDescControl::SetModified(sal_Bool /*bModified*/) { } //------------------------------------------------------------------------ @@ -814,9 +814,9 @@ void OFieldDescControl::ArrangeAggregates() // die Beschreibung eines Controls struct AGGREGATE_DESCRIPTION { - Control* pctrlInputControl; // das eigentliche Control zur Eingabe - Control* pctrlTextControl; // das Label dazu - USHORT nPosSizeArgument; // das zweite Argument fuer SetPosSize + Control* pctrlInputControl; // das eigentliche Control zur Eingabe + Control* pctrlTextControl; // das Label dazu + USHORT nPosSizeArgument; // das zweite Argument fuer SetPosSize }; AGGREGATE_DESCRIPTION adAggregates[] = { { m_pColumnName, m_pColumnNameText, 1}, @@ -924,7 +924,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) pRequired->InsertEntry( aYes ); pRequired->InsertEntry( aNo ); pRequired->SelectEntryPos(1); - + InitializeControl(pRequired,HID_TAB_ENT_REQUIRED,true); } } @@ -1094,7 +1094,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER ); pControl->SetDecimalDigits(0); pControl->SetMin(0); - pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig + pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig pControl->SetStrictFormat(TRUE); InitializeControl(pControl,_nHelpId,false); @@ -1170,7 +1170,7 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType ) void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 nCol ) { DBG_CHKTHIS(OFieldDescControl,NULL); - + ////////////////////////////////////////////////////////////////////// // Groesse ermitteln const sal_Int32 nControlHeight = GetMaxControlHeight(); @@ -1228,12 +1228,12 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MAP_APPFONT).Height(); aPosition.Y() += ((nRow+1)*nControl_Spacing_y) + (nRow*nControlHeight); - + ////////////////////////////////////////////////////////////////////// // Control anzeigen (*ppControl)->SetPosSizePixel( aPosition, aSize ); aSize = (*ppControl)->GetSizePixel(); - + (*ppControl)->Show(); } //------------------------------------------------------------------------------ @@ -1461,7 +1461,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) { // disable autoincrement value because it should only be visible when autoincrement is to true DeactivateAggregate( tpAutoIncrementValue ); - pAutoIncrement->SelectEntryPos( 1 ); // no + pAutoIncrement->SelectEntryPos( 1 ); // no ActivateAggregate( tpDefault ); // hat Auswirkungen auf pRequired if(!pFieldDescr->IsPrimaryKey()) @@ -1478,7 +1478,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( pBoolDefault ) { // wenn pRequired auf sal_True gesetzt ist, dann darf das sal_Bool Feld nicht den Eintrag <<keiner>> besitzen - ::rtl::OUString sValue; + ::rtl::OUString sValue; pFieldDescr->GetControlDefault() >>= sValue; String sDef = BoolStringUI(sValue); @@ -1507,9 +1507,9 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( pRequired ) { if( pFieldDescr->IsNullable() ) - pRequired->SelectEntryPos( 1 ); // no + pRequired->SelectEntryPos( 1 ); // no else - pRequired->SelectEntryPos( 0 ); // yes + pRequired->SelectEntryPos( 0 ); // yes } if( pTextLen ) @@ -1540,7 +1540,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) USHORT nPos = pFieldType.get() ? m_pType->GetEntryPos(String(pFieldDescr->getTypeInfo()->aUIName)) : LISTBOX_ENTRY_NOTFOUND; if(nPos == LISTBOX_ENTRY_NOTFOUND) { - const OTypeInfoMap* pMap = getTypeInfo(); + const OTypeInfoMap* pMap = getTypeInfo(); OTypeInfoMap::const_iterator aIter = pMap->find(pFieldType.get() ? pFieldDescr->getTypeInfo()->nType : pFieldDescr->GetType()); if(aIter == pMap->end() && !pMap->empty()) { @@ -1787,9 +1787,9 @@ void OFieldDescControl::LoseFocus() sal_Bool OFieldDescControl::isCopyAllowed() { sal_Bool bAllowed = (m_pActFocusWindow != NULL) && - (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || - m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || - m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || + (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || + m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || + m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || m_pActFocusWindow == m_pAutoIncrementValue) && static_cast<Edit*>(m_pActFocusWindow)->GetSelected().Len() != 0; @@ -1799,9 +1799,9 @@ sal_Bool OFieldDescControl::isCopyAllowed() sal_Bool OFieldDescControl::isCutAllowed() { sal_Bool bAllowed = (m_pActFocusWindow != NULL) && - (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || - m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || - m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || + (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || + m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || + m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || m_pActFocusWindow == m_pAutoIncrementValue) && static_cast<Edit*>(m_pActFocusWindow)->GetSelected().Len() != 0; return bAllowed; @@ -1810,9 +1810,9 @@ sal_Bool OFieldDescControl::isCutAllowed() sal_Bool OFieldDescControl::isPasteAllowed() { sal_Bool bAllowed = (m_pActFocusWindow != NULL) && - (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || - m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || - m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || + (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || + m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || + m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || m_pActFocusWindow == m_pAutoIncrementValue); if ( bAllowed ) { @@ -1915,7 +1915,7 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= aLocale; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey); - if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE + if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME ) { nValue = DBTypeConversion::toNullDate(DBTypeConversion::getNULLDate(xNumberFormatter->getNumberFormatsSupplier()),nValue); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 0687b61d7b8e..d4a70092980f 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ #include <algorithm> -#define SOURCE_COLUMN 1 -#define DEST_COLUMN 2 +#define SOURCE_COLUMN 1 +#define DEST_COLUMN 2 namespace dbaui { @@ -67,20 +67,20 @@ namespace dbaui friend class OTableListBoxControl; ::std::auto_ptr< ::svt::ListBoxControl> m_pListCell; - TTableConnectionData::value_type m_pConnData; - const OJoinTableView::OTableWindowMap* m_pTableMap; - OTableListBoxControl* m_pBoxControl; - long m_nDataPos; - Reference< XPropertySet> m_xSourceDef; - Reference< XPropertySet> m_xDestDef; + TTableConnectionData::value_type m_pConnData; + const OJoinTableView::OTableWindowMap* m_pTableMap; + OTableListBoxControl* m_pBoxControl; + long m_nDataPos; + Reference< XPropertySet> m_xSourceDef; + Reference< XPropertySet> m_xDestDef; void fillListBox(const Reference< XPropertySet>& _xDest,long nRow,USHORT nColumnId); /** returns the column id for the editbrowsebox - @param _nColId + @param _nColId the column id SOURCE_COLUMN or DEST_COLUMN - @return the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data + @return the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data */ USHORT getColumnIdent( USHORT _nColId ) const; public: @@ -88,9 +88,9 @@ namespace dbaui virtual ~ORelationControl(); /** searches for a connection between these two tables - @param _pSource + @param _pSource the left table - @param _pDest + @param _pDest the right window */ void setWindowTables(const OTableWindow* _pSource,const OTableWindow* _pDest); @@ -125,7 +125,7 @@ namespace dbaui private: DECL_LINK( AsynchActivate, void* ); - + }; //======================================================================== @@ -177,12 +177,12 @@ namespace dbaui ////////////////////////////////////////////////////////////////////// // set browse mode - SetMode( BROWSER_COLUMNSELECTION | - BROWSER_HLINESFULL | - BROWSER_VLINESFULL | - BROWSER_HIDECURSOR | - BROWSER_HIDESELECT | - BROWSER_AUTO_HSCROLL | + SetMode( BROWSER_COLUMNSELECTION | + BROWSER_HLINESFULL | + BROWSER_VLINESFULL | + BROWSER_HIDECURSOR | + BROWSER_HIDESELECT | + BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL); } else @@ -209,7 +209,7 @@ namespace dbaui PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate)); else if (rNEvt.GetType() == EVENT_GETFOCUS) PostUserEvent(LINK(this, ORelationControl, AsynchActivate)); - + return EditBrowseBox::PreNotify(rNEvt); } @@ -234,8 +234,8 @@ namespace dbaui long nRow = GetCurRow(); USHORT nCol = GetCurColumnId(); - BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1))) - || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0))); + BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1))) + || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0))); return bRet && EditBrowseBox::IsTabAllowed(bForward); } @@ -304,18 +304,18 @@ namespace dbaui void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId ) { DBG_CHKTHIS(ORelationControl,NULL); - + ULONG nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; Reference< XPropertySet> xDef; switch ( getColumnIdent(nColumnId) ) { case SOURCE_COLUMN: - xDef = m_xSourceDef; + xDef = m_xSourceDef; nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; break; case DEST_COLUMN: - xDef = m_xDestDef; + xDef = m_xDestDef; nHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL; break; default: @@ -359,7 +359,7 @@ namespace dbaui DBG_CHKTHIS(ORelationControl,NULL); String aText =const_cast< ORelationControl*>(this)->GetCellText( m_nDataPos, nColumnId ); - Point aPos( rRect.TopLeft() ); + Point aPos( rRect.TopLeft() ); Size aTextSize( GetDataWindow().GetTextHeight(),GetDataWindow().GetTextWidth( aText )); if( aPos.X() < rRect.Right() || aPos.X() + aTextSize.Width() > rRect.Right() || @@ -409,7 +409,7 @@ namespace dbaui { m_xSourceDef = _pSource->GetTable(); SetColumnTitle(1, _pSource->GetName()); - + m_xDestDef = _pDest->GetTable(); SetColumnTitle(2, _pDest->GetName()); @@ -465,11 +465,11 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent ,IRelationControlInterface* _pParentDialog) : Window(_pParent,_rResId) , m_aFL_InvolvedTables( this, ResId(FL_INVOLVED_TABLES,*_rResId.GetResMgr())) - , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr())) - , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr())) + , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr())) + , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr())) , m_aFL_InvolvedFields( this, ResId(FL_INVOLVED_FIELDS,*_rResId.GetResMgr())) , m_pTableMap(_pTableMap) - , m_pParentDialog(_pParentDialog) + , m_pParentDialog(_pParentDialog) { m_pRC_Tables = new ORelationControl( this,m_pTableMap ); m_pRC_Tables->SetHelpId(HID_RELDLG_KEYFIELDS); @@ -530,7 +530,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent m_pRC_Tables->setWindowTables(pInitialLeft,pInitialRight); // die in einer ComboBox ausgewaehlte Tabelle darf nicht in der anderen zur Verfuegung stehen - + if ( m_pTableMap->size() > 2 ) { m_lmbLeftTable.RemoveEntry(m_strCurrentRight); @@ -547,8 +547,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox*, pListBox ) { String strSelected(pListBox->GetSelectEntry()); - OTableWindow* pLeft = NULL; - OTableWindow* pRight = NULL; + OTableWindow* pLeft = NULL; + OTableWindow* pRight = NULL; // eine Sonderbehandlung : wenn es nur zwei Tabellen gibt, muss ich bei Wechsel in einer LB auch in der anderen umschalten if ( m_pTableMap->size() == 2 ) @@ -567,13 +567,13 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent if ( m_lmbLeftTable.GetSelectEntry() == String(pFirst->GetName()) ) { - pLeft = pFirst; - pRight = pSecond; + pLeft = pFirst; + pRight = pSecond; } else { - pLeft = pSecond; - pRight = pFirst; + pLeft = pSecond; + pRight = pFirst; } } else @@ -592,10 +592,10 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent m_lmbRightTable.InsertEntry(m_strCurrentLeft); // und den jetzt selektierten raus m_lmbRightTable.RemoveEntry(strSelected); - m_strCurrentLeft = strSelected; - + m_strCurrentLeft = strSelected; + pLeft = pLoop; - + OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_lmbRightTable.GetSelectEntry()); OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name"); if ( aIter != m_pTableMap->end() ) @@ -700,8 +700,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent return bRet; } // ----------------------------------------------------------------------------- - TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const - { + TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const + { return m_pRC_Tables->getData()->getReferencingTable(); } // ----------------------------------------------------------------------------- @@ -710,7 +710,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent if ( !_bEnable ) PostUserEvent(LINK(m_pRC_Tables, ORelationControl, AsynchDeactivate)); m_pRC_Tables->Enable(_bEnable); - + } // ----------------------------------------------------------------------------- } diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx index 47cac018ffc5..2299e47688a5 100644 --- a/dbaccess/source/ui/control/ScrollHelper.cxx +++ b/dbaccess/source/ui/control/ScrollHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include "ScrollHelper.hxx" #include <tools/debug.hxx> -#define LISTBOX_SCROLLING_AREA 12 +#define LISTBOX_SCROLLING_AREA 12 namespace dbaui { DBG_NAME(OScrollHelper) @@ -47,7 +47,7 @@ DBG_NAME(OScrollHelper) // ----------------------------------------------------------------------------- OScrollHelper::~OScrollHelper() { - + DBG_DTOR(OScrollHelper,NULL); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 5acc67d433a6..8e05e67fb2cc 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace dbaui //------------------------------------------------------------------ sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars) { - return ( + return ( (_cChar >= 'A' && _cChar <= 'Z') || _cChar == '_' || _sAllowedChars.indexOf(_cChar) != -1 || @@ -43,16 +43,16 @@ namespace dbaui ); } //------------------------------------------------------------------ - sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, + sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, const ::rtl::OUString& _sToCheck, ::rtl::OUString& _rsCorrected) { sal_Bool bCorrected = sal_False; if ( m_bCheck ) { - XubString sSavedValue = _sOldValue; - XubString sText = _sToCheck; - xub_StrLen nMatch = 0; + XubString sSavedValue = _sOldValue; + XubString sText = _sToCheck; + xub_StrLen nMatch = 0; for ( xub_StrLen i=nMatch;i < sText.Len(); ++i ) { if ( !isCharOk( sText.GetBuffer()[i], i == 0, m_bOnlyUpperCase, m_sAllowedChars ) ) diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 991dca50d804..57ea25f505a2 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,13 +47,13 @@ using namespace ::dbaui; using namespace ::svt; const USHORT COL_TABLE_NAME = 1; -const USHORT COL_SELECT = 2; -const USHORT COL_INSERT = 3; -const USHORT COL_DELETE = 4; -const USHORT COL_UPDATE = 5; -const USHORT COL_ALTER = 6; -const USHORT COL_REF = 7; -const USHORT COL_DROP = 8; +const USHORT COL_SELECT = 2; +const USHORT COL_INSERT = 3; +const USHORT COL_DELETE = 4; +const USHORT COL_UPDATE = 5; +const USHORT COL_ALTER = 6; +const USHORT COL_REF = 7; +const USHORT COL_DROP = 8; DBG_NAME(OTableGrantControl) @@ -72,7 +72,7 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId) ////////////////////////////////////////////////////////////////////// // Spalten einfuegen USHORT i=1; - InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75); + InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75); FreezeColumn(i++); InsertDataColumn( i++, String(ModuleRes(STR_TABLE_PRIV_SELECT)), 75); InsertDataColumn( i++, String(ModuleRes(STR_TABLE_PRIV_INSERT)), 75); @@ -99,7 +99,7 @@ OTableGrantControl::~OTableGrantControl() delete m_pCheckCell; delete m_pEdit; - m_xTables = NULL; + m_xTables = NULL; } // ----------------------------------------------------------------------------- void OTableGrantControl::setTablesSupplier(const Reference< XTablesSupplier >& _xTablesSup) @@ -131,7 +131,7 @@ void OTableGrantControl::UpdateTables() if(m_xTables.is()) RowInserted(0, m_aTableNames.getLength()); - // m_bEnable = m_xDb->GetUser() != ((OUserAdmin*)GetParent())->GetUser(); + // m_bEnable = m_xDb->GetUser() != ((OUserAdmin*)GetParent())->GetUser(); } //------------------------------------------------------------------------ void OTableGrantControl::Init() @@ -143,10 +143,10 @@ void OTableGrantControl::Init() // ComboBox instanzieren if(!m_pCheckCell) { - m_pCheckCell = new CheckBoxControl( &GetDataWindow() ); + m_pCheckCell = new CheckBoxControl( &GetDataWindow() ); m_pCheckCell->GetBox().EnableTriState(FALSE); - m_pEdit = new Edit( &GetDataWindow() ); + m_pEdit = new Edit( &GetDataWindow() ); m_pEdit->SetReadOnly(); m_pEdit->Enable(FALSE); } @@ -155,7 +155,7 @@ void OTableGrantControl::Init() ////////////////////////////////////////////////////////////////////// // Browser Mode setzen BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | - BROWSER_HIDECURSOR | BROWSER_HIDESELECT; + BROWSER_HIDECURSOR | BROWSER_HIDESELECT; SetMode(nMode); } @@ -219,10 +219,10 @@ BOOL OTableGrantControl::IsTabAllowed(BOOL bForward) const return EditBrowseBox::IsTabAllowed(bForward); } //------------------------------------------------------------------------------ -#define GRANT_REVOKE_RIGHT(what) \ - if(m_pCheckCell->GetBox().IsChecked()) \ +#define GRANT_REVOKE_RIGHT(what) \ + if(m_pCheckCell->GetBox().IsChecked()) \ xAuth->grantPrivileges(sTableName,PrivilegeObject::TABLE,what);\ - else \ + else \ xAuth->revokePrivileges(sTableName,PrivilegeObject::TABLE,what) //------------------------------------------------------------------------------ @@ -238,7 +238,7 @@ BOOL OTableGrantControl::SaveModified() BOOL bErg = TRUE; try { - + if ( m_xUsers->hasByName(m_sUserName) ) { Reference<XAuthorizable> xAuth(m_xUsers->getByName(m_sUserName),UNO_QUERY); @@ -291,7 +291,7 @@ String OTableGrantControl::GetCellText( long nRow, USHORT nColId ) const DBG_CHKTHIS(OTableGrantControl,NULL); if(COL_TABLE_NAME == nColId) return m_aTableNames[nRow]; - + sal_Int32 nPriv = 0; TTablePrivilegeMap::const_iterator aFind = findPrivilege(nRow); if(aFind != m_aPrivMap.end()) @@ -316,9 +316,9 @@ void OTableGrantControl::InitController( CellControllerRef& /*rController*/, lon } } // ----------------------------------------------------------------------------- -void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const +void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const { - + if ( m_xUsers->hasByName(m_sUserName) ) { try @@ -328,7 +328,7 @@ void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const { // get the privileges TPrivileges nRights; - nRights.nRights = xAuth->getPrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE); + nRights.nRights = xAuth->getPrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE); if(m_xGrantUser.is()) nRights.nWithGrant = m_xGrantUser->getGrantablePrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE); else @@ -429,7 +429,7 @@ BOOL OTableGrantControl::SeekRow( long nRow ) void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const { DBG_CHKTHIS(OTableGrantControl,NULL); - + if(nColumnId != COL_TABLE_NAME) { TTablePrivilegeMap::const_iterator aFind = findPrivilege(m_nDataPos); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src index 8da72a1f9fe1..9ed55e529906 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.src +++ b/dbaccess/source/ui/control/TableGrantCtrl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 929b5c050743..c3eed83c5d43 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <tools/debug.hxx> -#define SPLITTER_WIDTH 80 +#define SPLITTER_WIDTH 80 using namespace ::dbaui; @@ -46,8 +46,8 @@ OSplitterView::OSplitterView(Window* _pParent,sal_Bool _bVertical) : Window(_pPa ,m_pRight(NULL) ,m_bVertical(_bVertical) { - DBG_CTOR(OSplitterView,NULL); - ImplInitSettings( sal_True, sal_True, sal_True ); + DBG_CTOR(OSplitterView,NULL); + ImplInitSettings( sal_True, sal_True, sal_True ); } // ----------------------------------------------------------------------------- OSplitterView::~OSplitterView() @@ -59,7 +59,7 @@ OSplitterView::~OSplitterView() IMPL_LINK( OSplitterView, SplitHdl, Splitter*, /*pSplit*/ ) { OSL_ENSURE(m_pSplitter, "Splitter is NULL!"); - if ( m_bVertical ) + if ( m_bVertical ) { long nPosY = m_pSplitter->GetPosPixel().Y(); m_pSplitter->SetPosPixel( Point( m_pSplitter->GetSplitPosPixel(), nPosY ) ); @@ -81,7 +81,7 @@ void OSplitterView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_ if ( IsControlFont() ) aFont.Merge( GetControlFont() ); SetPointFont( aFont ); -// Set/*Zoomed*/PointFont( aFont ); +// Set/*Zoomed*/PointFont( aFont ); } if ( bFont || bForeground ) @@ -130,18 +130,18 @@ void OSplitterView::Resize() Window::Resize(); OSL_ENSURE( m_pRight, "No init called!"); - Point aSplitPos; - Size aSplitSize; - Point aPlaygroundPos( 0,0 ); - Size aPlaygroundSize( GetOutputSizePixel() ); + Point aSplitPos; + Size aSplitSize; + Point aPlaygroundPos( 0,0 ); + Size aPlaygroundSize( GetOutputSizePixel() ); if ( m_pLeft && m_pLeft->IsVisible() && m_pSplitter ) { - aSplitPos = m_pSplitter->GetPosPixel(); - aSplitSize = m_pSplitter->GetOutputSizePixel(); - if ( m_bVertical ) + aSplitPos = m_pSplitter->GetPosPixel(); + aSplitSize = m_pSplitter->GetOutputSizePixel(); + if ( m_bVertical ) { - // calculate the splitter pos and size + // calculate the splitter pos and size aSplitPos.Y() = aPlaygroundPos.Y(); aSplitSize.Height() = aPlaygroundSize.Height(); @@ -152,8 +152,8 @@ void OSplitterView::Resize() aSplitPos.X() = aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.3); // the tree pos and size - Point aTreeViewPos( aPlaygroundPos ); - Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); + Point aTreeViewPos( aPlaygroundPos ); + Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); // set the size of treelistbox m_pLeft->SetPosSizePixel( aTreeViewPos, aTreeViewSize ); @@ -174,8 +174,8 @@ void OSplitterView::Resize() aSplitPos.Y() = aPlaygroundPos.Y() + sal_Int32(aPlaygroundSize.Height() * 0.3); // the tree pos and size - Point aTreeViewPos( aPlaygroundPos ); - Size aTreeViewSize( aPlaygroundSize.Width() ,aSplitPos.Y()); + Point aTreeViewPos( aPlaygroundPos ); + Size aTreeViewSize( aPlaygroundSize.Width() ,aSplitPos.Y()); // set the size of treelistbox m_pLeft->SetPosSizePixel( aTreeViewPos, aTreeViewSize ); @@ -188,7 +188,7 @@ void OSplitterView::Resize() if ( m_pRight ) { - if ( m_bVertical ) + if ( m_bVertical ) m_pRight->SetPosSizePixel( aSplitPos.X() + aSplitSize.Width(), aPlaygroundPos.Y(), aPlaygroundSize.Width() - aSplitSize.Width() - aSplitPos.X(), aPlaygroundSize.Height()); else diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index bd72946958ca..df1d6261fd44 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 43f8ae2e6a57..ec8c6e3faf7b 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ OConnectionURLEdit::~OConnectionURLEdit() Edit* pSubEdit = GetSubEdit(); SetSubEdit(NULL); delete pSubEdit; - delete m_pForcedPrefix; + delete m_pForcedPrefix; } //------------------------------------------------------------------------- @@ -128,7 +128,7 @@ void OConnectionURLEdit::SetText(const String& _rStr, const Selection& /*_rNewSe GetSubEdit()->Show(); // do the real SetTex -// Edit::SetText(bIsEmpty ? _rStr : m_pTypeCollection->cutPrefix(_rStr), _rNewSelection); +// Edit::SetText(bIsEmpty ? _rStr : m_pTypeCollection->cutPrefix(_rStr), _rNewSelection); String sNewText( _rStr ); if ( !bIsEmpty ) sNewText = m_pTypeCollection->cutPrefix( _rStr ); @@ -150,7 +150,7 @@ void OConnectionURLEdit::ShowPrefix(BOOL _bShowPrefix) m_pForcedPrefix->Show(m_bShowPrefix); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 381c7036677f..c2d057037c9f 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ using namespace ::com::sun::star::ui; using namespace ::com::sun::star::view; DBG_NAME(DBTreeListBox) -#define SPACEBETWEENENTRIES 4 +#define SPACEBETWEENENTRIES 4 //======================================================================== // class DBTreeListBox //======================================================================== @@ -92,7 +92,7 @@ DBTreeListBox::DBTreeListBox( Window* pParent, const Reference< XMultiServiceFac ,m_xORB(_rxORB) { DBG_CTOR(DBTreeListBox,NULL); - init(); + init(); } // ----------------------------------------------------------------------------- void DBTreeListBox::init() @@ -119,7 +119,7 @@ DBTreeListBox::~DBTreeListBox() //------------------------------------------------------------------------ SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const IEntryFilter* _pFilter ) const { - SvLBoxTreeList* myModel = GetModel(); + SvLBoxTreeList* myModel = GetModel(); SvTreeEntryList* pChilds = myModel->GetChildList(pStart); SvLBoxEntry* pEntry = NULL; if ( pChilds ) @@ -349,7 +349,7 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt ) void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) { KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); - USHORT nCode = rKEvt.GetKeyCode().GetCode(); + USHORT nCode = rKEvt.GetKeyCode().GetCode(); sal_Bool bHandled = sal_False; if(eFunc != KEYFUNC_DONTKNOW) @@ -407,7 +407,7 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) // 2002-12-02 - 105831 - fs@openoffice.org } - if ( !bHandled ) + if ( !bHandled ) SvTreeListBox::KeyInput(rKEvt); } // ----------------------------------------------------------------------------- @@ -427,7 +427,7 @@ BOOL DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText m_aSelectedEntries.erase( pEntry ); } SetEntryText(pEntry,aEntry.aNewText); - + return FALSE; // we never want that the base change our text } @@ -592,20 +592,20 @@ namespace throw IllegalArgumentException(); // API bug: this should be a NoSupportException } - + //-------------------------------------------------------------------- Any SAL_CALL SelectionSupplier::getSelection( ) throw (RuntimeException) { return m_aSelection; } - + //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { OSL_ENSURE( false, "SelectionSupplier::removeSelectionChangeListener: no support!" ); // API bug: this should be a NoSupportException } - + //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { @@ -711,7 +711,7 @@ IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/) { implStopSelectionTimer(); - m_aSelChangeHdl.Call( NULL ); + m_aSelChangeHdl.Call( NULL ); return 0L; } // ----------------------------------------------------------------------------- @@ -721,7 +721,7 @@ void DBTreeListBox::StateChanged( StateChangedType nStateChange ) implStopSelectionTimer(); } // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx index 2f2c7afd2a60..7de4fc35bf56 100644 --- a/dbaccess/source/ui/control/listviewitems.cxx +++ b/dbaccess/source/ui/control/listviewitems.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace dbaui } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 1ecb15575ca9..bca4ebe053cf 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; //......................................................................... -#define SPACEBETWEENENTRIES 4 +#define SPACEBETWEENENTRIES 4 //======================================================================== //= OMarkableTreeListBox //======================================================================== DBG_NAME(OMarkableTreeListBox) //------------------------------------------------------------------------ -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle ) +OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle ) : DBTreeListBox(pParent,_rxORB,nWinStyle) { DBG_CTOR(OMarkableTreeListBox,NULL); @@ -53,7 +53,7 @@ OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XM InitButtonData(); } //------------------------------------------------------------------------ -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, const ResId& rResId) +OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, const ResId& rResId) : DBTreeListBox(pParent,_rxORB,rResId) { DBG_CTOR(OMarkableTreeListBox,NULL); @@ -205,7 +205,7 @@ void OMarkableTreeListBox::CheckButtonHdl() void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) { SvButtonState eState = GetCheckButtonState( _pEntry); - if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken + if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken { SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry); SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry); @@ -220,7 +220,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) while(pEntry) { SetCheckButtonState(pEntry,eState); - if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken + if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken { SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry); SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry); @@ -237,7 +237,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) //------------------------------------------------------------------------ //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 78fd8f4fdd1c..5672fc94941c 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 3eee26f30959..066085de70b1 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -175,7 +175,7 @@ void OSqlEdit::SetText(const String& rNewText) { DBG_CHKTHIS(OSqlEdit,NULL); if (m_timerUndoActionCreation.IsActive()) - { // die noch anstehenden Undo-Action erzeugen + { // die noch anstehenden Undo-Action erzeugen m_timerUndoActionCreation.Stop(); LINK(this, OSqlEdit, OnUndoActionTimer).Call(NULL); } diff --git a/dbaccess/source/ui/control/statusbarontroller.cxx b/dbaccess/source/ui/control/statusbarontroller.cxx index 37cb9c85f990..ddf46a3f0479 100644 --- a/dbaccess/source/ui/control/statusbarontroller.cxx +++ b/dbaccess/source/ui/control/statusbarontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 832459021f1e..fa593339152b 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -318,7 +318,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn TNames::const_iterator aEnd = _rTables.end(); Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW ); - for ( ; aIter != aEnd; ++aIter ) + for ( ; aIter != aEnd; ++aIter ) { // add the entry implAddEntry( @@ -409,8 +409,8 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, // special emphasizing handling for the "all objects" entry // 89709 - 16.07.2001 - frank.schoenheit@sun.com sal_Bool bAllObjectsEntryAffected = haveVirtualRoot() && (getAllObjectsEntry() == _pEntry); - if ( GetModel()->HasChilds(_pEntry) // the entry has children - || bAllObjectsEntryAffected // or it is the "all objects" entry + if ( GetModel()->HasChilds(_pEntry) // the entry has children + || bAllObjectsEntryAffected // or it is the "all objects" entry ) { OBoldListboxString* pTextItem = static_cast<OBoldListboxString*>(_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING)); @@ -690,7 +690,7 @@ void OTableTreeListBox::removedTable( const ::rtl::OUString& _rName ) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/tabletree.hrc b/dbaccess/source/ui/control/tabletree.hrc index 1566e1ec10ce..b5450948e978 100644 --- a/dbaccess/source/ui/control/tabletree.hrc +++ b/dbaccess/source/ui/control/tabletree.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ //------------------------------------------------------------------------ //- menu ids -#define MID_SORT_ASCENDING 1 -#define MID_SORT_DECENDING 2 +#define MID_SORT_ASCENDING 1 +#define MID_SORT_DECENDING 2 #endif // _DBAUI_TABLETREE_HRC_ diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src index d08535f3e8da..26342fe28ba2 100644 --- a/dbaccess/source/ui/control/tabletree.src +++ b/dbaccess/source/ui/control/tabletree.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 57618dea47b1..ad90d8a35e04 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ namespace dbaui m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewViewSQL")) ,sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuery")) ,sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuerySql")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReportAutoPilot")),sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTable")) ,sal_True)); } diff --git a/dbaccess/source/ui/control/undosqledit.cxx b/dbaccess/source/ui/control/undosqledit.cxx index 39e44be96f3f..ae527a9080a1 100644 --- a/dbaccess/source/ui/control/undosqledit.cxx +++ b/dbaccess/source/ui/control/undosqledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src index 814a304d18c0..09884a24b906 100644 --- a/dbaccess/source/ui/control/undosqledit.src +++ b/dbaccess/source/ui/control/undosqledit.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/AdabasPage.hrc b/dbaccess/source/ui/dlg/AdabasPage.hrc index a36dbb25da27..52b14304d910 100644 --- a/dbaccess/source/ui/dlg/AdabasPage.hrc +++ b/dbaccess/source/ui/dlg/AdabasPage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,23 +27,23 @@ #ifndef DBAUI_ADABASPAGE_HRC #define DBAUI_ADABASPAGE_HRC -#define FT_CACHE_SIZE 1 -#define FT_DATA_INCREMENT 2 -#define FT_CTRLPASSWORD 3 -#define FT_CTRLUSERNAME 4 +#define FT_CACHE_SIZE 1 +#define FT_DATA_INCREMENT 2 +#define FT_CTRLPASSWORD 3 +#define FT_CTRLUSERNAME 4 -#define NF_DATA_INCREMENT 1 -#define NF_CACHE_SIZE 2 +#define NF_DATA_INCREMENT 1 +#define NF_CACHE_SIZE 2 -#define CB_SHUTDB 1 +#define CB_SHUTDB 1 -#define FL_1 1 +#define FL_1 1 -#define PB_STAT 1 +#define PB_STAT 1 -#define ET_CTRLPASSWORD 1 -#define ET_CTRLUSERNAME 2 +#define ET_CTRLPASSWORD 1 +#define ET_CTRLUSERNAME 2 #endif // DBAUI_ADABASPAGE_HRC diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx index 6f4af6e9aae8..b1c24e3b090f 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.cxx +++ b/dbaccess/source/ui/dlg/AdabasStat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,20 +63,20 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, const Reference< XMultiServiceFactory >& _xFactory) : ModalDialog( pParent, ModuleRes(DLG_ADABASSTAT) ) ,m_FL_FILES( this , ModuleRes(FL_FILES)) - ,m_FT_SYSDEVSPACE( this , ModuleRes(FT_SYSDEVSPACE)) - ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ModuleRes(ET_SYSDEVSPACE)) - ,m_FT_TRANSACTIONLOG( this , ModuleRes(FT_TRANSACTIONLOG)) - ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ModuleRes(ET_TRANSACTIONLOG)) - ,m_FT_DATADEVSPACE( this , ModuleRes(FT_DATADEVSPACE)) - ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ModuleRes(LB_DATADEVS)) + ,m_FT_SYSDEVSPACE( this , ModuleRes(FT_SYSDEVSPACE)) + ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ModuleRes(ET_SYSDEVSPACE)) + ,m_FT_TRANSACTIONLOG( this , ModuleRes(FT_TRANSACTIONLOG)) + ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ModuleRes(ET_TRANSACTIONLOG)) + ,m_FT_DATADEVSPACE( this , ModuleRes(FT_DATADEVSPACE)) + ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ModuleRes(LB_DATADEVS)) ,m_FL_SIZES( this , ModuleRes(FL_SIZES)) - ,m_FT_SIZE( this , ModuleRes(FT_SIZE)) - ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ModuleRes(ET_SIZE)) - ,m_FT_FREESIZE( this , ModuleRes(FT_FREESIZE)) - ,m_ET_FREESIZE( this , STR_ADABAS_HELP_FREESIZE,ModuleRes(ET_FREESIZE)) - ,m_FT_MEMORYUSING( this , ModuleRes(FT_MEMORYUSING)) - ,m_ET_MEMORYUSING( this , STR_ADABAS_HELP_MEMORYUSING,ModuleRes(ET_MEMORYUSING)) - ,m_PB_OK( this , ModuleRes(PB_OK)) + ,m_FT_SIZE( this , ModuleRes(FT_SIZE)) + ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ModuleRes(ET_SIZE)) + ,m_FT_FREESIZE( this , ModuleRes(FT_FREESIZE)) + ,m_ET_FREESIZE( this , STR_ADABAS_HELP_FREESIZE,ModuleRes(ET_FREESIZE)) + ,m_FT_MEMORYUSING( this , ModuleRes(FT_MEMORYUSING)) + ,m_ET_MEMORYUSING( this , STR_ADABAS_HELP_MEMORYUSING,ModuleRes(ET_MEMORYUSING)) + ,m_PB_OK( this , ModuleRes(PB_OK)) ,m_xConnection(_xCurrentConnection) ,m_bErrorShown(sal_False) { @@ -90,17 +90,17 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, Reference<XStatement> xStmt; Reference<XResultSet> xRes; - sal_Bool bCanSelect = sal_False; + sal_Bool bCanSelect = sal_False; ::rtl::OUString aStmt; ::rtl::OUString sSchema = _rUser.toAsciiUpperCase(); Reference<XDatabaseMetaData> xMetaData; - // first read the sizes + // first read the sizes try { xMetaData = m_xConnection->getMetaData(); bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("SERVERDBSTATISTICS"),sSchema); - + if(bCanSelect) { aStmt = ::rtl::OUString::createFromAscii("SELECT SERVERDBSIZE, UNUSEDPAGES FROM "); @@ -154,7 +154,7 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, try { bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("DATADEVSPACES"),sSchema); - + if(bCanSelect) { // then the db files @@ -198,7 +198,7 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, try { bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("CONFIGURATION"),sSchema); - + if(bCanSelect) { aStmt = ::rtl::OUString::createFromAscii("SELECT * FROM "); diff --git a/dbaccess/source/ui/dlg/AdabasStat.hrc b/dbaccess/source/ui/dlg/AdabasStat.hrc index 32734ea9075a..d2bb95c38b2e 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hrc +++ b/dbaccess/source/ui/dlg/AdabasStat.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,22 +28,22 @@ #define DBAUI_ADABASSTAT_HRC -#define FT_SYSDEVSPACE 1 -#define FT_TRANSACTIONLOG 2 -#define FT_DATADEVSPACE 3 -#define FT_SIZE 4 -#define FT_FREESIZE 5 -#define FT_MEMORYUSING 6 +#define FT_SYSDEVSPACE 1 +#define FT_TRANSACTIONLOG 2 +#define FT_DATADEVSPACE 3 +#define FT_SIZE 4 +#define FT_FREESIZE 5 +#define FT_MEMORYUSING 6 -#define ET_SYSDEVSPACE 1 -#define ET_TRANSACTIONLOG 2 -#define ET_MEMORYUSING 3 -#define ET_SIZE 4 -#define ET_FREESIZE 5 +#define ET_SYSDEVSPACE 1 +#define ET_TRANSACTIONLOG 2 +#define ET_MEMORYUSING 3 +#define ET_SIZE 4 +#define ET_FREESIZE 5 -#define LB_DATADEVS 1 +#define LB_DATADEVS 1 -#define PB_OK 1 +#define PB_OK 1 #define FL_FILES 1 #define FL_SIZES 2 diff --git a/dbaccess/source/ui/dlg/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx index 7bba19f59724..f9cec381c65b 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hxx +++ b/dbaccess/source/ui/dlg/AdabasStat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,32 +47,32 @@ namespace dbaui protected: FixedLine m_FL_FILES; - FixedText m_FT_SYSDEVSPACE; - OPropEditCtrl m_ET_SYSDEVSPACE; - FixedText m_FT_TRANSACTIONLOG; - OPropEditCtrl m_ET_TRANSACTIONLOG; - FixedText m_FT_DATADEVSPACE; - OPropListBoxCtrl m_LB_DATADEVS; + FixedText m_FT_SYSDEVSPACE; + OPropEditCtrl m_ET_SYSDEVSPACE; + FixedText m_FT_TRANSACTIONLOG; + OPropEditCtrl m_ET_TRANSACTIONLOG; + FixedText m_FT_DATADEVSPACE; + OPropListBoxCtrl m_LB_DATADEVS; FixedLine m_FL_SIZES; - FixedText m_FT_SIZE; - OPropEditCtrl m_ET_SIZE; - FixedText m_FT_FREESIZE; - OPropEditCtrl m_ET_FREESIZE; - FixedText m_FT_MEMORYUSING; - OPropNumericEditCtrl m_ET_MEMORYUSING; + FixedText m_FT_SIZE; + OPropEditCtrl m_ET_SIZE; + FixedText m_FT_FREESIZE; + OPropEditCtrl m_ET_FREESIZE; + FixedText m_FT_MEMORYUSING; + OPropNumericEditCtrl m_ET_MEMORYUSING; - OKButton m_PB_OK; + OKButton m_PB_OK; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xConnection; /// valid as long as the page is active - sal_Bool m_bErrorShown; // true when we shown already the error + m_xConnection; /// valid as long as the page is active + sal_Bool m_bErrorShown; // true when we shown already the error // check if the given table is accessable by the connected user sal_Bool checkSystemTable(const ::rtl::OUString& _rsSystemTable, ::rtl::OUString& _rsSchemaName ); void showError(); public: - OAdabasStatistics( Window* pParent, + OAdabasStatistics( Window* pParent, const ::rtl::OUString& _rUser, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCurrentConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory); diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src index ff29ac12383d..77472536425e 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.src +++ b/dbaccess/source/ui/dlg/AdabasStat.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,129 +37,129 @@ ModalDialog DLG_ADABASSTAT { - OutputSize = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + OutputSize = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; FixedLine FL_FILES { - Pos = MAP_APPFONT ( 6 , 3 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 12, 8 ) ; Text [ en-US ] = "Database files"; }; FixedText FT_SYSDEVSPACE { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "S~YSDEVSPACE:"; }; Edit ET_SYSDEVSPACE { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 14 ) ; - Size = MAP_APPFONT ( 128 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 14 ) ; + Size = MAP_APPFONT ( 128 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_TRANSACTIONLOG { - Pos = MAP_APPFONT ( 12 , 32 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 32 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "~TRANSACTIONLOG:"; }; Edit ET_TRANSACTIONLOG { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 31 ) ; - Size = MAP_APPFONT ( 128 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 31 ) ; + Size = MAP_APPFONT ( 128 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_DATADEVSPACE { - Pos = MAP_APPFONT ( 12 , 49 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 49 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "DATAD~EVSPACE:"; }; ListBox LB_DATADEVS { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 48 ) ; - Size = MAP_APPFONT ( 128 , 42 ) ; - TabStop = TRUE; - AutoHScroll = TRUE; - VScroll = TRUE; - HScroll = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 48 ) ; + Size = MAP_APPFONT ( 128 , 42 ) ; + TabStop = TRUE; + AutoHScroll = TRUE; + VScroll = TRUE; + HScroll = TRUE; }; FixedLine FL_SIZES { - Pos = MAP_APPFONT ( 6 , 99 ) ; + Pos = MAP_APPFONT ( 6 , 99 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ; Text [ en-US ] = "Database sizes"; }; FixedText FT_SIZE { - Pos = MAP_APPFONT ( 12 , 110 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 110 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "S~ize (MB):"; }; Edit ET_SIZE { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 109 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 109 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_FREESIZE { - Pos = MAP_APPFONT ( 12 , 127 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 127 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "~Free memory space (MB):"; }; Edit ET_FREESIZE { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 126 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 126 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_MEMORYUSING { - Pos = MAP_APPFONT ( 12 , 144 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 144 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "~Memory utilization (in %):"; }; NumericField ET_MEMORYUSING { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 144 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 144 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; OKButton PB_OK { - Pos = MAP_APPFONT ( WINDOW_SIZE_X - 56,WINDOW_SIZE_Y - 20 ) ; - Size = MAP_APPFONT ( 50, 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; + Pos = MAP_APPFONT ( WINDOW_SIZE_X - 56,WINDOW_SIZE_Y - 20 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; }; Text [ en-US ] = "Database Statistics"; diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src index 1bfe3c0233a9..9036489b37ea 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ String STR_MSACCESS_MDB_FILE Text[ en-US ] = "Microsoft Access database file"; }; - + String STR_NO_ADDITIONAL_SETTINGS { Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button."; diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index 425e713094f3..5ec09c3ae5c7 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ #endif -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define EDIT_X 101 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define EDIT_X 101 #define FT_AUTOJDBCDRIVERCLASS 80 #define FT_AUTOFIELDSEPARATOR 81 @@ -107,55 +107,55 @@ #define AUTO_WIZARDHELPTEXT( AUTO_LINECOUNT ) \ - FixedText FT_AUTOWIZARDHEADER \ - { \ + FixedText FT_AUTOWIZARDHEADER \ + { \ Pos = MAP_APPFONT ( START_X , 8 ) ; \ Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = ""; \ - WordBreak = TRUE; \ + WordBreak = TRUE; \ }; \ \ - FixedText FT_AUTOWIZARDHELPTEXT \ - { \ + FixedText FT_AUTOWIZARDHELPTEXT \ + { \ Pos = MAP_APPFONT ( START_X , INIT_Y ) ; \ Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6 , AUTO_LINECOUNT * FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = ""; \ - WordBreak = TRUE; \ + WordBreak = TRUE; \ }; // ------------------------------------------------------------------------------------------------- -#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \ - FixedText FT_AUTOBROWSEURL { \ - Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \ - Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = ""; \ - }; \ +#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \ + FixedText FT_AUTOBROWSEURL { \ + Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \ + Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = ""; \ + }; \ \ \ Edit ET_AUTOBROWSEURL \ - { \ - Pos = MAP_APPFONT ( AUTO_X , AUTO_Y + FIXEDTEXT_HEIGHT + 3) ; \ - Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 - 3 - BUTTON_WIDTH , EDIT_HEIGHT ) ; \ - HelpId = AUTO_HID; \ - TabStop = TRUE ; \ - Border = TRUE ; \ - }; \ + { \ + Pos = MAP_APPFONT ( AUTO_X , AUTO_Y + FIXEDTEXT_HEIGHT + 3) ; \ + Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 - 3 - BUTTON_WIDTH , EDIT_HEIGHT ) ; \ + HelpId = AUTO_HID; \ + TabStop = TRUE ; \ + Border = TRUE ; \ + }; \ \ - PushButton PB_AUTOBROWSEURL \ - { \ - Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \ - Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ - HelpId = (AUTO_HID + 1); \ - TabStop = TRUE ; \ + PushButton PB_AUTOBROWSEURL \ + { \ + Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \ + Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ + HelpId = (AUTO_HID + 1); \ + TabStop = TRUE ; \ Text[ en-US ] = "Browse"; \ }; // -------------------------------------------------------------------------------------------------- -#define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTODATABASENAME \ { \ Pos = MAP_APPFONT ( START_X , AUTO_Y + 2) ; \ @@ -163,39 +163,39 @@ Text[ en-US ] = "Database name"; \ }; \ \ - Edit ET_AUTODATABASENAME \ - { \ - Pos = MAP_APPFONT ( EDIT_X, AUTO_Y) ; \ - Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ - HelpId = AUTO_HID; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + Edit ET_AUTODATABASENAME \ + { \ + Pos = MAP_APPFONT ( EDIT_X, AUTO_Y) ; \ + Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ + HelpId = AUTO_HID; \ + TabStop = TRUE ; \ + Border = TRUE ; \ }; // -------------------------------------------------------------------------------------------------- #define AUTO_HOSTCONTROLGROUP(AUTO_Y, AUTO_HID) \ - FixedText FT_AUTOHOSTNAME \ + FixedText FT_AUTOHOSTNAME \ { \ Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \ Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ); \ Text [ en-US ] = "Server" ; \ }; \ \ - Edit ET_AUTOHOSTNAME \ + Edit ET_AUTOHOSTNAME \ { \ - Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ - Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ - HelpId = AUTO_HID; \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + HelpId = AUTO_HID; \ TabStop = TRUE ; \ - Border = TRUE ; \ - }; + Border = TRUE ; \ + }; // -------------------------------------------------------------------------------------------------- -#define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTOBASEDN \ { \ Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \ @@ -207,9 +207,9 @@ { \ HelpId = AUTO_HID ; \ Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ - Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + TabStop = TRUE ; \ + Border = TRUE ; \ }; \ // -------------------------------------------------------------------------------------------------- @@ -225,18 +225,18 @@ \ NumericField NF_AUTOPORTNUMBER \ { \ - HelpId = AUTO_HID ; \ - Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + HelpId = AUTO_HID ; \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ Size = MAP_APPFONT ( 22 , EDIT_HEIGHT ) ; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + TabStop = TRUE ; \ + Border = TRUE ; \ NoThousandSep = TRUE; \ }; \ \ FixedText FT_AUTOPORTNUMBERDEFAULT \ { \ - HelpId = AUTO_HID + 1 ; \ - Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \ + HelpId = AUTO_HID + 1 ; \ + Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \ Size = MAP_APPFONT ( WIZARD_PAGE_X - EDIT_X - 22 - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "" ; \ }; @@ -267,12 +267,12 @@ CurPos = 0 ; \ }; \ -// -------------------------------------------------------------------------------------------------- +// -------------------------------------------------------------------------------------------------- #define AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X) \ \ FixedText FT_AUTOEXTENSIONHEADER \ { \ - Pos = MAP_APPFONT ( START_X , AUTO_Y) ; \ + Pos = MAP_APPFONT ( START_X , AUTO_Y) ; \ Size = MAP_APPFONT ( AUTOPAGE_X - 2*START_X , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "Specify the type of files you want to access" ; \ }; \ @@ -305,9 +305,9 @@ { \ HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION; \ Pos = MAP_APPFONT (START_X + 66, AUTO_Y + 3*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS - 2 ) ; \ - Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + TabStop = TRUE ; \ + Border = TRUE ; \ }; \ \ FIXEDTEXT FT_AUTOOWNEXTENSIONAPPENDIX \ @@ -332,7 +332,7 @@ }; \ ComboBox CM_AUTOFIELDSEPARATOR \ { \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT - 2 ) ; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT - 2 ) ; \ Size = MAP_APPFONT ( 32 , 60 ) ; \ Text = ";" ; \ TabStop = TRUE ; \ @@ -437,7 +437,7 @@ String STR_AUTONO_WILDCARDS \ { \ Text[ en-US ] = "Wildcards such as ?,* are not allowed in #1." ; \ - }; + }; #define NAMECONTROLGROUP_HEIGHT (FIXEDTEXT_HEIGHT + 2 + EDIT_HEIGHT) @@ -445,8 +445,8 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \ - AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \ +#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \ + AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \ AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID) @@ -455,11 +455,11 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \ \ FixedText FT_AUTOJDBCDRIVERCLASS \ { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \ + Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \ Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ; \ Text [ en-US ] = "JDBC d~river class"; \ }; \ @@ -470,7 +470,7 @@ Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - BUTTON_WIDTH - RELATED_CONTROLS - UNRELATED_CONTROLS , EDIT_HEIGHT ) ; \ TabStop = TRUE ; \ Border = TRUE ; \ - HelpId = AUTO_HID; \ + HelpId = AUTO_HID; \ }; \ \ PushButton PB_AUTOTESTDRIVERCLASS \ @@ -478,8 +478,8 @@ TabStop = TRUE ; \ Pos = MAP_APPFONT ( WIZARD_PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , AUTO_Y + FIXEDTEXT_HEIGHT + 2) ; \ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ - Size = MAP_APPFONT (50, 14); \ - HelpId = AUTO_HID + 1; \ + Size = MAP_APPFONT (50, 14); \ + HelpId = AUTO_HID + 1; \ Text[ en-US ] = "Test class" ; \ }; @@ -493,22 +493,22 @@ Text [ en-US ] = "Socket" ; \ }; \ \ - Edit ET_SOCKET \ + Edit ET_SOCKET \ { \ - Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ - Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ TabStop = TRUE ; \ - Border = TRUE ; \ - }; + Border = TRUE ; \ + }; -#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \ +#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \ AUTO_WIZARDHELPTEXT( 6 ) \ AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID ) \ - AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \ - AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \ + AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \ + AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \ AUTO_SOCKETCONTROLGROUP(129) \ - AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) + AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) // -------------------------------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index c3308fd53f9a..196a19453198 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #include <osl/thread.h> #include <connectivity/dbexception.hxx> -#define FILEDIALOG_DEF_IMAGEBORDER 10 +#define FILEDIALOG_DEF_IMAGEBORDER 10 //......................................................................... namespace dbaui { @@ -79,17 +79,17 @@ OCollectionView::OCollectionView( Window * pParent ,const ::rtl::OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) : ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW)) - , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) - , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) ) - , m_aUp( this, ModuleRes( BTN_EXPLORERFILE_UP ) ) - , m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE ) - , m_aFTName( this, ModuleRes( FT_EXPLORERFILE_FILENAME ) ) - , m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) ) - , m_aFL( this, ModuleRes( FL_1 ) ) - , m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) ) - , m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) - , m_aPB_HELP( this, ModuleRes( PB_HELP ) ) - , m_sPath( ModuleRes( STR_PATHNAME ) ) + , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) + , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) ) + , m_aUp( this, ModuleRes( BTN_EXPLORERFILE_UP ) ) + , m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE ) + , m_aFTName( this, ModuleRes( FT_EXPLORERFILE_FILENAME ) ) + , m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) ) + , m_aFL( this, ModuleRes( FL_1 ) ) + , m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) ) + , m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) + , m_aPB_HELP( this, ModuleRes( PB_HELP ) ) + , m_sPath( ModuleRes( STR_PATHNAME ) ) , m_xContent(_xContent) , m_xORB(_xORB) , m_bCreateForm(sal_True) @@ -336,7 +336,7 @@ void OCollectionView::initCurrentPath() } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/CollectionView.hrc b/dbaccess/source/ui/dlg/CollectionView.hrc index 0a385ff7f23c..8c43b4c0c5a5 100644 --- a/dbaccess/source/ui/dlg/CollectionView.hrc +++ b/dbaccess/source/ui/dlg/CollectionView.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,23 +28,23 @@ #ifndef DBAUI_COLLECTIONVIEW_HRC #define DBAUI_COLLECTIONVIEW_HRC -#define CTRL_VIEW 1 +#define CTRL_VIEW 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define PB_CANCEL 1 +#define PB_HELP 1 -#define ED_EXPLORERFILE_FILENAME 1 +#define ED_EXPLORERFILE_FILENAME 1 -#define FT_EXPLORERFILE_CURRENTPATH 1 -#define FT_EXPLORERFILE_FILENAME 2 +#define FT_EXPLORERFILE_CURRENTPATH 1 +#define FT_EXPLORERFILE_FILENAME 2 -#define BTN_EXPLORERFILE_NEWFOLDER 1 -#define BTN_EXPLORERFILE_UP 2 -#define BTN_EXPLORERFILE_SAVE 3 +#define BTN_EXPLORERFILE_NEWFOLDER 1 +#define BTN_EXPLORERFILE_UP 2 +#define BTN_EXPLORERFILE_SAVE 3 -#define STR_PATHNAME 1 +#define STR_PATHNAME 1 -#define FL_1 1 +#define FL_1 1 #endif //DBAUI_COLLECTIONVIEW_HRC diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src index 018893384dab..3b82d565a7ac 100644 --- a/dbaccess/source/ui/dlg/CollectionView.src +++ b/dbaccess/source/ui/dlg/CollectionView.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,14 +34,14 @@ #define WIN_X 200 #define WIN_Y 192 -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define FIXEDLINE_HEIGHT 1 -#define IMG_SIZE 15 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define FIXEDLINE_HEIGHT 1 +#define IMG_SIZE 15 ModalDialog DLG_COLLECTION_VIEW @@ -55,7 +55,7 @@ ModalDialog DLG_COLLECTION_VIEW Size = MAP_APPFONT ( WIN_X , WIN_Y ) ; Text [ en-US ] = "Save" ; - + FixedText FT_EXPLORERFILE_CURRENTPATH { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS ) ; @@ -76,7 +76,7 @@ ModalDialog DLG_COLLECTION_VIEW Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ; QuickHelpText [ en-US ] = "Up One Level" ; }; - + Control CTRL_VIEW { TabStop = TRUE ; @@ -98,13 +98,13 @@ ModalDialog DLG_COLLECTION_VIEW Border = TRUE ; TabStop = TRUE ; }; - + FixedLine FL_1 { Pos = MAP_APPFONT ( 0 , WIN_Y - 2*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT) ; Size = MAP_APPFONT ( WIN_X , FIXEDLINE_HEIGHT ) ; }; - + PushButton BTN_EXPLORERFILE_SAVE { Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; @@ -113,22 +113,22 @@ ModalDialog DLG_COLLECTION_VIEW TabStop = TRUE ; Text [ en-US ] = "Save" ; }; - + CancelButton PB_CANCEL { TabStop = TRUE ; - Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; + Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ; }; - + HelpButton PB_HELP { TabStop = TRUE ; - Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; + Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ; }; - - + + String STR_PATHNAME { Text [ en-US ] = "~Path:" ; @@ -141,7 +141,7 @@ String STR_NEW_FOLDER }; Image IMG_NAVIGATION_BTN_UP_SC { - ImageBitmap = Bitmap { File = "fp010"; }; + ImageBitmap = Bitmap { File = "fp010"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; Image IMG_NAVIGATION_BTN_UP_SCH diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 7e6ac39f658f..743cf89beb5e 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -307,28 +307,28 @@ DBG_NAME(OConnectionHelper) sal_Bool bOldFashion = sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength(); if(!bOldFashion) // we have a normal adabas installation - { // so we check the local database names in $DBROOT/config - sAdabasConfigDir = sRootDir; - sAdabasWorkDir = sRootDir; + { // so we check the local database names in $DBROOT/config + sAdabasConfigDir = sRootDir; + sAdabasWorkDir = sRootDir; } if(sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength() && sRootDir.getLength()) { - aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); + aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); if(!aInstalledDBs.size() && bOldFashion) { - sAdabasConfigDir = sRootDir; - sAdabasWorkDir = sRootDir; - aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); + sAdabasConfigDir = sRootDir; + sAdabasWorkDir = sRootDir; + aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); } ODatasourceSelectDialog aSelector(GetParent(), aInstalledDBs, true,m_pItemSetHelper->getWriteOutputSet()); if (RET_OK == aSelector.Execute()) { setURLNoPrefix(aSelector.GetSelected()); - // checkCreateDatabase( ::dbaccess::DST_ADABAS); + // checkCreateDatabase( ::dbaccess::DST_ADABAS); SetRoadmapStateValue(sal_True); callModifiedHdl(); } @@ -560,7 +560,7 @@ DBG_NAME(OConnectionHelper) do { if ( !createDirectoryDeep(_rURL) ) - { // could not create the directory + { // could not create the directory sQuery = String(ModuleRes(STR_COULD_NOT_CREATE_DIRECTORY)); sQuery.SearchAndReplaceAscii("$name$", aTransformer.get(OFileNotation::N_SYSTEM)); @@ -634,7 +634,7 @@ DBG_NAME(OConnectionHelper) { } if (bIsFolder && aAdabasConfigDir.get().is()) - { // we have a content for the directory, loop through all entries + { // we have a content for the directory, loop through all entries Sequence< ::rtl::OUString > aProperties(1); aProperties[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); @@ -678,8 +678,8 @@ DBG_NAME(OConnectionHelper) StringBag aInstalledDBs; // collect the names of the installed databases StringBag aConfigDBs,aWrkDBs; - aConfigDBs = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY); - aWrkDBs = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY); + aConfigDBs = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY); + aWrkDBs = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY); ConstStringBagIterator aOuter = aConfigDBs.begin(); ConstStringBagIterator aOuterEnd = aConfigDBs.end(); for(;aOuter != aOuterEnd;++aOuter) @@ -730,16 +730,16 @@ DBG_NAME(OConnectionHelper) { case EVENT_GETFOCUS: if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) - { // a descendant of the URL edit field got the focus + { // a descendant of the URL edit field got the focus m_aConnectionURL.SaveValueNoPrefix(); } break; case EVENT_LOSEFOCUS: if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) - { // a descendant of the URL edit field lost the focus + { // a descendant of the URL edit field lost the focus if (!commitURL()) - return 1L; // handled + return 1L; // handled } break; } // switch (_rNEvt.GetType()) @@ -760,15 +760,15 @@ DBG_NAME(OConnectionHelper) INetProtocol eProtocol = aParser.GetProtocol(); - ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels + ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels // search a level which exists // #106016# --------------------- IS_PATH_EXIST eParentExists = PATH_NOT_EXIST; while ( eParentExists == PATH_NOT_EXIST && aParser.getSegmentCount()) { - aToBeCreated.push_back(aParser.getName()); // remember the local name for creation - aParser.removeSegment(); // cut the local name + aToBeCreated.push_back(aParser.getName()); // remember the local name for creation + aParser.removeSegment(); // cut the local name eParentExists = pathExists(aParser.GetMainURL(INetURLObject::NO_DECODE), sal_False); } @@ -802,7 +802,7 @@ DBG_NAME(OConnectionHelper) Sequence< Any > aNewDirectoryAttributes(1); // loop - for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); + for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); aLocalName != aToBeCreated.rend(); ++aLocalName ) @@ -847,7 +847,7 @@ DBG_NAME(OConnectionHelper) if ( m_pCollection->isFileSystemBased(m_eType) ) { if ( ( sURL != sOldPath ) && ( 0 != sURL.Len() ) ) - { // the text changed since entering the control + { // the text changed since entering the control // the path may be in system notation .... OFileNotation aTransformer(sURL); @@ -907,7 +907,7 @@ DBG_NAME(OConnectionHelper) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 3e4c538d084c..b9b378329a0d 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,11 +35,11 @@ #include <sfx2/filedlghelper.hxx> -#define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \ - if (editcontrol.GetText() != editcontrol.GetSavedValue()) \ - { \ - itemset.Put(SfxStringItem(itemid, editcontrol.GetText())); \ - modifiedflag = sal_True; \ +#define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \ + if (editcontrol.GetText() != editcontrol.GetSavedValue()) \ + { \ + itemset.Put(SfxStringItem(itemid, editcontrol.GetText())); \ + modifiedflag = sal_True; \ } //......................................................................... @@ -59,21 +59,21 @@ namespace dbaui class OConnectionHelper : public OGenericAdministrationPage { - sal_Bool m_bUserGrabFocus : 1; + sal_Bool m_bUserGrabFocus : 1; public: OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper(); - FixedText m_aFT_Connection; - OConnectionURLEdit m_aConnectionURL; - PushButton m_aPB_Connection; + FixedText m_aFT_Connection; + OConnectionURLEdit m_aConnectionURL; + PushButton m_aPB_Connection; ::rtl::OUString m_eType; // the type can't be changed in this class, so we hold it as member. public: // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes - ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance + ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance virtual long PreNotify( NotifyEvent& _rNEvt ); // <method>OGenericAdministrationPage::fillControls</method> @@ -85,25 +85,25 @@ namespace dbaui // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes - //String getURL( OConnectionURLEdit* _m_pConnection ) const; - //void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection ); + //String getURL( OConnectionURLEdit* _m_pConnection ) const; + //void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection ); - String getURLNoPrefix( ) const; - void setURLNoPrefix( const String& _rURL ); + String getURLNoPrefix( ) const; + void setURLNoPrefix( const String& _rURL ); /** checks if the path is existence - @param _rURL + @param _rURL The URL to check. - */ - sal_Int32 checkPathExistence(const String& _rURL); - + */ + sal_Int32 checkPathExistence(const String& _rURL); - IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const; - sal_Bool createDirectoryDeep(const String& _rPathNormalized); - sal_Bool commitURL(); + + IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const; + sal_Bool createDirectoryDeep(const String& _rPathNormalized); + sal_Bool commitURL(); /** opens the FileOpen dialog and asks for a FileName - @param _aFileOpen + @param _aFileOpen Executes the file open dialog, which must be filled from caller. */ void askForFileName(::sfx2::FileDialogHelper& _aFileOpen); @@ -113,21 +113,21 @@ namespace dbaui OGenericAdministrationPage::SetServiceFactory(_rxORB); } - protected: - void setURL( const String& _rURL ); + protected: + void setURL( const String& _rURL ); virtual bool checkTestConnection(); private: DECL_LINK(OnBrowseConnections, PushButton*); StringBag getInstalledAdabasDBDirs(const String &_rPath,const ::ucbhelper::ResultSetInclude& _reResultSetInclude); StringBag getInstalledAdabasDBs(const String &_rConfigDir,const String &_rWorkDir); - String impl_getURL( sal_Bool _bPrefix ) const; - void impl_setURL( const String& _rURL, sal_Bool _bPrefix ); + String impl_getURL( sal_Bool _bPrefix ) const; + void impl_setURL( const String& _rURL, sal_Bool _bPrefix ); void implUpdateURLDependentStates() const; }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_CONNECTIONHELPER_HXX diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 03f2b5f057df..af1745c72852 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OConnectionTabPage( pParent, _rAttrSet ) ); } @@ -376,7 +376,7 @@ namespace dbaui return 0L; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hrc b/dbaccess/source/ui/dlg/ConnectionPage.hrc index 347b0f0bac28..6c18a3e42ced 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hrc +++ b/dbaccess/source/ui/dlg/ConnectionPage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 140ea6792efc..ff50f7d715fb 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,24 +48,24 @@ namespace dbaui */ class OConnectionTabPage : public OConnectionHelper { - sal_Bool m_bUserGrabFocus : 1; + sal_Bool m_bUserGrabFocus : 1; protected: - // connection - FixedLine m_aFL1; + // connection + FixedLine m_aFL1; // user authentification - FixedLine m_aFL2; - FixedText m_aUserNameLabel; - Edit m_aUserName; - CheckBox m_aPasswordRequired; + FixedLine m_aFL2; + FixedText m_aUserNameLabel; + Edit m_aUserName; + CheckBox m_aPasswordRequired; // jdbc driver - FixedLine m_aFL3; - FixedText m_aJavaDriverLabel; - Edit m_aJavaDriver; - PushButton m_aTestJavaDriver; + FixedLine m_aFL3; + FixedText m_aJavaDriverLabel; + Edit m_aJavaDriver; + PushButton m_aTestJavaDriver; // connection test - PushButton m_aTestConnection; + PushButton m_aTestConnection; // called when the test connection button was clicked @@ -73,10 +73,10 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(sal_False); } inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); } @@ -101,7 +101,7 @@ namespace dbaui virtual bool checkTestConnection(); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src index 8ead374bdef4..22eed5dee2fa 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ b/dbaccess/source/ui/dlg/ConnectionPage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index fcc5af853afd..066e6c23519c 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ namespace dbaui - OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_DBASE, _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE); oDBWizardPage->FreeResource(); @@ -94,35 +94,35 @@ namespace dbaui } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_MSACCESS, _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADABAS, _rAttrSet, STR_ADABAS_HELPTEXT, STR_ADABAS_HEADERTEXT, STR_ADABAS_DATABASE_NAME); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADO, _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ODBC, _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_USERDEFINED, _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL); oDBWizardPage->FreeResource(); @@ -201,12 +201,12 @@ namespace dbaui //! TODO //if ( m_eType >= ::dbaccess::DST_USERDEFINE1 ) //{ - // String sDisplayName = m_pCollection->getTypeDisplayName(m_eType); - // FixedText* ppTextControls[] ={&m_aFT_Connection}; - // for (size_t i = 0; i < SAL_N_ELEMENTS(ppTextControls); ++i) - // { - // ppTextControls[i]->SetText(sDisplayName); - // } + // String sDisplayName = m_pCollection->getTypeDisplayName(m_eType); + // FixedText* ppTextControls[] ={&m_aFT_Connection}; + // for (size_t i = 0; i < SAL_N_ELEMENTS(ppTextControls); ++i) + // { + // ppTextControls[i]->SetText(sDisplayName); + // } //} callModifiedHdl(); @@ -238,7 +238,7 @@ namespace dbaui return 0L; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index c49fcc8d28ad..96eba0545bce 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace dbaui { //......................................................................... -/* // #106016# -------------- +/* // #106016# -------------- enum IS_PATH_EXIST { PATH_NOT_EXIST = 0, @@ -60,7 +60,7 @@ namespace dbaui */ class OConnectionTabPageSetup : public OConnectionHelper { - sal_Bool m_bUserGrabFocus : 1; + sal_Bool m_bUserGrabFocus : 1; protected: FixedText m_aFT_HelpText; @@ -69,17 +69,17 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); @@ -90,8 +90,8 @@ namespace dbaui <p>The new URL must be of the type which is currently selected, only the parts which do not affect the type may be changed (compared to the previous URL).</p> */ - void changeConnectionURL( const String& _rNewDSN ); - String getConnectionURL( ) const; + void changeConnectionURL( const String& _rNewDSN ); + String getConnectionURL( ) const; protected: @@ -102,9 +102,9 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 66a1c3b44787..75c0bdd46529 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,16 +73,16 @@ namespace dbaui { //......................................................................... using namespace ::com::sun::star; -// using namespace ::com::sun::star::ucb; -// using namespace ::com::sun::star::ui::dialogs; -// using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::lang; -// using namespace ::com::sun::star::container; -// using namespace ::dbtools; -// using namespace ::svt; +// using namespace ::com::sun::star::ucb; +// using namespace ::com::sun::star::ui::dialogs; +// using namespace ::com::sun::star::sdbc; +// using namespace ::com::sun::star::beans; +// using namespace ::com::sun::star::lang; +// using namespace ::com::sun::star::container; +// using namespace ::dbtools; +// using namespace ::svt; - OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OTextConnectionPageSetup( pParent, _rAttrSet ) ); } @@ -165,7 +165,7 @@ DBG_NAME(OTextConnectionPageSetup) } - OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPConnectionPageSetup( pParent, _rAttrSet ) ); } @@ -178,12 +178,12 @@ DBG_NAME(OTextConnectionPageSetup) :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_LDAP), _rCoreAttrs) ,m_aFTHeaderText (this, ModuleRes(FT_LDAP_HEADERTEXT)) ,m_aFTHelpText (this, ModuleRes(FT_LDAP_HELPTEXT)) - ,m_aFTHostServer (this, ModuleRes(FT_AUTOHOSTNAME)) - ,m_aETHostServer (this, ModuleRes(ET_AUTOHOSTNAME)) - ,m_aFTBaseDN (this, ModuleRes(FT_AUTOBASEDN)) - ,m_aETBaseDN (this, ModuleRes(ET_AUTOBASEDN)) - ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) + ,m_aFTHostServer (this, ModuleRes(FT_AUTOHOSTNAME)) + ,m_aETHostServer (this, ModuleRes(ET_AUTOHOSTNAME)) + ,m_aFTBaseDN (this, ModuleRes(FT_AUTOBASEDN)) + ,m_aETBaseDN (this, ModuleRes(ET_AUTOBASEDN)) + ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT)) ,m_aCBUseSSL (this, ModuleRes(CB_WIZ_USESSL)) { @@ -433,16 +433,16 @@ DBG_NAME(OMySQLIntroPageSetup) OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId, USHORT _nDefaultPortResId, USHORT _nHelpTextResId, USHORT _nHeaderTextResId, USHORT _nDriverClassId) :OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs) ,m_aFTHelpText (this, ModuleRes(FT_AUTOWIZARDHELPTEXT)) - ,m_aFTDatabasename (this, ModuleRes(FT_AUTODATABASENAME)) - ,m_aETDatabasename (this, ModuleRes(ET_AUTODATABASENAME)) - ,m_aFTHostname (this, ModuleRes(FT_AUTOHOSTNAME)) - ,m_aETHostname (this, ModuleRes(ET_AUTOHOSTNAME)) - ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) + ,m_aFTDatabasename (this, ModuleRes(FT_AUTODATABASENAME)) + ,m_aETDatabasename (this, ModuleRes(ET_AUTODATABASENAME)) + ,m_aFTHostname (this, ModuleRes(FT_AUTOHOSTNAME)) + ,m_aETHostname (this, ModuleRes(ET_AUTOHOSTNAME)) + ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT)) - ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) - ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) - ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) - ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) + ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) + ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) + ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) + ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) ,m_nPortId(_nPortId) { m_aFTDriverClass.SetText(String(ModuleRes(_nDriverClassId))); @@ -474,7 +474,7 @@ DBG_NAME(OMySQLIntroPageSetup) // ----------------------------------------------------------------------- - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, PAGE_DBWIZARD_MYSQL_JDBC, @@ -487,7 +487,7 @@ DBG_NAME(OMySQLIntroPageSetup) } // ----------------------------------------------------------------------- - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, PAGE_DBWIZARD_ORACLE, @@ -606,7 +606,7 @@ DBG_NAME(OMySQLIntroPageSetup) } // ----------------------------------------------------------------------- - OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet)); } @@ -617,9 +617,9 @@ DBG_NAME(OMySQLIntroPageSetup) //======================================================================== OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_JDBC, _rCoreAttrs, STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL) - ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) - ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) - ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) + ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) + ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) + ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) { m_aETDriverClass.SetModifyHdl(LINK(this, OJDBCConnectionPageSetup, OnEditModified)); m_aPBTestJavaDriver.SetClickHdl(LINK(this,OJDBCConnectionPageSetup,OnTestJavaClickHdl)); @@ -686,7 +686,7 @@ DBG_NAME(OMySQLIntroPageSetup) BOOL bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0); bEnableTestConnection = bEnableTestConnection && (m_aETDriverClass.GetText().Len() != 0); return bEnableTestConnection; -// m_aTestConnection.Enable(bEnableTestConnection); +// m_aTestConnection.Enable(bEnableTestConnection); } @@ -726,7 +726,7 @@ DBG_NAME(OMySQLIntroPageSetup) } - OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) ); } @@ -778,7 +778,7 @@ DBG_NAME(OSpreadSheetConnectionPageSetup) return bChangedSomething; } - OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAuthentificationPageSetup( pParent, _rAttrSet) ); } @@ -857,7 +857,7 @@ DBG_NAME(OAuthentificationPageSetup) } - OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet) { return ( new OFinalDBPageSetup( pParent, _rAttrSet) ); } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index da3735b18cc7..fe236af08f2e 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace dbaui //......................................................................... class IDatabaseSettingsDialog; -// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); +// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); //======================================================================== @@ -57,8 +57,8 @@ namespace dbaui class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); protected: @@ -78,12 +78,12 @@ namespace dbaui class OTextConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: - + protected: virtual ~OTextConnectionPageSetup(); virtual sal_Bool prepareLeave(); @@ -102,8 +102,8 @@ namespace dbaui class OLDAPConnectionPageSetup : public OGenericAdministrationPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual Link getControlModifiedLink() { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } @@ -118,11 +118,11 @@ namespace dbaui FixedText m_aFTHelpText; FixedText m_aFTHostServer; Edit m_aETHostServer; - FixedText m_aFTBaseDN; - Edit m_aETBaseDN; - FixedText m_aFTPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTDefaultPortNumber; + FixedText m_aFTBaseDN; + Edit m_aETBaseDN; + FixedText m_aFTPortNumber; + NumericField m_aNFPortNumber; + FixedText m_aFTDefaultPortNumber; CheckBox m_aCBUseSSL; }; @@ -145,7 +145,7 @@ namespace dbaui virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ); - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual Link getControlModifiedLink(); @@ -168,11 +168,11 @@ namespace dbaui , USHORT _nHelpTextResId , USHORT _nHeaderTextResId , USHORT _nDriverClassId ); - static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -183,19 +183,19 @@ namespace dbaui FixedText m_aFTHelpText; FixedText m_aFTDatabasename; Edit m_aETDatabasename; - FixedText m_aFTHostname; - Edit m_aETHostname; - FixedText m_aFTPortNumber; - FixedText m_aFTDefaultPortNumber; - NumericField m_aNFPortNumber; - - - FixedText m_aFTDriverClass; - Edit m_aETDriverClass; - PushButton m_aPBTestJavaDriver; - - String m_sDefaultJdbcDriverName; - USHORT m_nPortId; + FixedText m_aFTHostname; + Edit m_aETHostname; + FixedText m_aFTPortNumber; + FixedText m_aFTDefaultPortNumber; + NumericField m_aNFPortNumber; + + + FixedText m_aFTDriverClass; + Edit m_aETDriverClass; + PushButton m_aPBTestJavaDriver; + + String m_sDefaultJdbcDriverName; + USHORT m_nPortId; }; @@ -206,21 +206,21 @@ namespace dbaui { public: OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual bool checkTestConnection(); - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); - FixedText m_aFTDriverClass; - Edit m_aETDriverClass; - PushButton m_aPBTestJavaDriver; + FixedText m_aFTDriverClass; + Edit m_aETDriverClass; + PushButton m_aPBTestJavaDriver; }; @@ -240,7 +240,7 @@ namespace dbaui OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs); - static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); Link maClickHdl; void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } @@ -248,7 +248,7 @@ namespace dbaui DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); - + protected: virtual BOOL FillItemSet(SfxItemSet& _rSet); @@ -278,8 +278,8 @@ namespace dbaui class OAuthentificationPageSetup : public OGenericAdministrationPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); protected: @@ -305,8 +305,8 @@ namespace dbaui class OFinalDBPageSetup : public OGenericAdministrationPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); FixedText m_aFTFinalHeader; FixedText m_aFTFinalHelpText; @@ -337,7 +337,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 8be379b9aa89..88eb810bf869 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/task/XInteractionRequest.hpp> +#include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp> #include <com/sun/star/ucb/AuthenticationRequest.hpp> /** === end UNO includes === **/ @@ -141,7 +141,7 @@ namespace String lcl_createHostWithPort(const SfxStringItem* _pHostName,const SfxInt32Item* _pPortNumber) { String sNewUrl; - + if ( _pHostName && _pHostName->GetValue().Len() ) sNewUrl = _pHostName->GetValue(); @@ -254,7 +254,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pUser, SfxStringItem, DSID_USER, sal_True); if (pUser && pUser->GetValue().Len()) aReturn.push_back( - PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), 0, + PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), 0, makeAny(::rtl::OUString(pUser->GetValue())), PropertyState_DIRECT_VALUE)); // check if the connection type requires a password @@ -280,7 +280,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if ( !xHandler.is() ) ShowServiceNotAvailableError(m_pParent->GetParent(), String(SERVICE_TASK_INTERACTION_HANDLER), sal_True); } - + String sName = pName ? pName->GetValue() : String(); String sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD)); ::rtl::OUString sTemp = sName; @@ -333,7 +333,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert } if (!pAuthenticate->wasSelected()) return sal_False; - + sPassword = pAuthenticate->getPassword(); if (pAuthenticate->getRememberPassword()) m_pItemSetHelper->getWriteOutputSet()->Put(SfxStringItem(DSID_PASSWORD, sPassword)); @@ -341,7 +341,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if (sPassword.Len()) aReturn.push_back( - PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")), 0, + PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")), 0, makeAny(::rtl::OUString(sPassword)), PropertyState_DIRECT_VALUE)); } @@ -476,7 +476,7 @@ Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSourc } } - + DBG_ASSERT(m_xDatasource.is(), "ODbDataSourceAdministrationHelper::getCurrentDataSource: no data source!"); return m_xDatasource; } @@ -586,7 +586,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const break; case ::dbaccess::DST_LDAP: { - // SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); + // SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True); sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue()); sNewUrl += lcl_createHostWithPort(NULL,pPortNumber); @@ -612,7 +612,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const struct PropertyValueLess { bool operator() (const PropertyValue& x, const PropertyValue& y) const - { return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning + { return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning }; DECLARE_STL_SET( PropertyValue, PropertyValueLess, PropertyValueSet); @@ -624,7 +624,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr if (_rxSource.is()) { - for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); + for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); aDirect != m_aDirectPropTranslator.end(); ++aDirect ) @@ -662,7 +662,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr for (sal_Int32 i=0; i<aAdditionalInfo.getLength(); ++i, ++pAdditionalInfo) { if (0 == pAdditionalInfo->Name.compareToAscii("JDBCDRV")) - { // compatibility + { // compatibility PropertyValue aCompatibility(*pAdditionalInfo); aCompatibility.Name = ::rtl::OUString::createFromAscii("JavaDriverClass"); aInfos.insert(aCompatibility); @@ -676,7 +676,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr { PropertyValue aSearchFor; ConstMapInt2StringIterator aEnd = m_aIndirectPropTranslator.end(); - for ( ConstMapInt2StringIterator aIndirect = m_aIndirectPropTranslator.begin(); + for ( ConstMapInt2StringIterator aIndirect = m_aIndirectPropTranslator.begin(); aIndirect != aEnd; ++aIndirect) { @@ -715,11 +715,11 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r Reference< XPropertySetInfo > xInfo; try { xInfo = _rxDest->getPropertySetInfo(); } catch(Exception&) { } - + const ::rtl::OUString sUrlProp(RTL_CONSTASCII_USTRINGPARAM("URL")); // ----------------------------- // transfer the direct properties - for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); + for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); aDirect != m_aDirectPropTranslator.end(); ++aDirect ) @@ -738,7 +738,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r if ( sUrlProp == aDirect->second ) { Any aValue(makeAny(::rtl::OUString(getConnectionURL()))); - // aValue <<= ::rtl::OUString(); + // aValue <<= ::rtl::OUString(); lcl_putProperty(_rxDest, aDirect->second,aValue); } else @@ -800,7 +800,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS } // settings to preserve - MapInt2String aPreservedSettings; + MapInt2String aPreservedSettings; // now aRelevantSettings contains all the property values relevant for the current data source type, // check the original sequence if it already contains any of these values (which have to be overwritten, then) @@ -813,13 +813,13 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS aSearchFor.Name = pInfo->Name; PropertyValueSetIterator aOverwrittenSetting = aRelevantSettings.find(aSearchFor); if (aRelevantSettings.end() != aOverwrittenSetting) - { // the setting was present in the original sequence, and it is to be overwritten -> replace it + { // the setting was present in the original sequence, and it is to be overwritten -> replace it if ( !::comphelper::compare(pInfo->Value,aOverwrittenSetting->Value) ) *pInfo = *aOverwrittenSetting; aRelevantSettings.erase(aOverwrittenSetting); } else if (0 == pInfo->Name.compareToAscii("JDBCDRV")) - { // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass) + { // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass) nObsoleteSetting = i; } else @@ -829,7 +829,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ::comphelper::removeElementAt(_rInfo, nObsoleteSetting); if ( !aPreservedSettings.empty() ) - { // check if there are settings which + { // check if there are settings which // * are known as indirect properties // * but not relevant for the current data source type // These settings have to be removed: If they're not relevant, we have no UI for changing them. @@ -846,7 +846,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ::std::vector< sal_Int32 > aRemoveIndexes; sal_Int32 nPositionCorrector = 0; ConstMapInt2StringIterator aPreservedEnd = aPreservedSettings.end(); - for ( ConstMapInt2StringIterator aPreserved = aPreservedSettings.begin(); + for ( ConstMapInt2StringIterator aPreserved = aPreservedSettings.begin(); aPreserved != aPreservedEnd; ++aPreserved ) @@ -862,7 +862,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS } // now finally remove all such props ::std::vector< sal_Int32 >::const_iterator aRemoveEnd = aRemoveIndexes.end(); - for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); + for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); aRemoveIndex != aRemoveEnd; ++aRemoveIndex ) @@ -894,7 +894,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS _rInfo.realloc(nOldLength + aRelevantSettings.size()); PropertyValue* pAppendValues = _rInfo.getArray() + nOldLength; ConstPropertyValueSetIterator aRelevantEnd = aRelevantSettings.end(); - for ( ConstPropertyValueSetIterator aLoop = aRelevantSettings.begin(); + for ( ConstPropertyValueSetIterator aLoop = aRelevantSettings.begin(); aLoop != aRelevantEnd; ++aLoop, ++pAppendValues ) @@ -997,9 +997,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no string)!" ) ).getStr() ); } @@ -1027,9 +1027,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no boolean)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no boolean)!" ) ).getStr() ); } @@ -1044,9 +1044,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no int)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no int)!" ) ).getStr() ); } @@ -1077,9 +1077,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string sequence)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no string sequence)!" ) ).getStr() ); } @@ -1116,8 +1116,8 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest) ::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection(); DBG_ASSERT(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!"); - USHORT nPortNumberId = 0; - sal_Int32 nPortNumber = -1; + USHORT nPortNumberId = 0; + sal_Int32 nPortNumber = -1; String sNewHostName; //String sUrl = pCollection->cutPrefix(pUrlItem->GetValue()); String sUrlPart; @@ -1175,8 +1175,8 @@ sal_Bool ODbDataSourceAdministrationHelper::saveChanges(const SfxItemSet& _rSour return sal_True; } // ----------------------------------------------------------------------------- -void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName ) -{ +void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName ) +{ DBG_ASSERT( !m_aDataSourceOrName.hasValue(), "ODbDataSourceAdministrationHelper::setDataSourceOrName: already have one!" ); // hmm. We could reset m_xDatasource/m_xModel, probably, and continue working m_aDataSourceOrName = _rDataSourceOrName; @@ -1213,7 +1213,7 @@ SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 02ef746fcd7a..ad5a323cf98e 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,23 +68,23 @@ namespace dbaui private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xORB; /// service factory + m_xORB; /// service factory ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xDatabaseContext; /// database context we're working in + m_xDatabaseContext; /// database context we're working in ::com::sun::star::uno::Reference< ::com::sun::star::uno::XNamingService > - m_xDynamicContext; /// just another interface of the context ... + m_xDynamicContext; /// just another interface of the context ... ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDatasource; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Any m_aDataSourceOrName; - typedef ::std::set< ::rtl::OUString > StringSet; - typedef StringSet::const_iterator ConstStringSetIterator; - + ::com::sun::star::uno::Any m_aDataSourceOrName; + typedef ::std::set< ::rtl::OUString > StringSet; + typedef StringSet::const_iterator ConstStringSetIterator; - MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source) - MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source) - Window* m_pParent; - IItemSetHelper* m_pItemSetHelper; + + MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source) + MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source) + Window* m_pParent; + IItemSetHelper* m_pItemSetHelper; public: ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB @@ -94,15 +94,15 @@ namespace dbaui /** translate the current dialog SfxItems into driver relevant PropertyValues @see successfullyConnected */ - sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); + sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); /** to be called if the settings got from getCurrentSettings have been used for successfully connecting @see getCurrentSettings */ - void successfullyConnected(); + void successfullyConnected(); /// clear the password in the current data source's item set - void clearPassword(); + void clearPassword(); inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xORB; } @@ -111,16 +111,16 @@ namespace dbaui /** creates a new connection. The caller is responsible to dispose it !!!! */ - ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); + ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); /** return the corresponding driver for the selected URL */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(const ::rtl::OUString& _sURL); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(const ::rtl::OUString& _sURL); /** returns the data source the dialog is currently working with */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); // returns the Url of a database document String getDocumentUrl(SfxItemSet& _rDest); @@ -143,9 +143,9 @@ namespace dbaui const MapInt2String& getIndirectProperties() const { return m_aIndirectPropTranslator; } /** translates properties of an UNO data source into SfxItems - @param _rxSource + @param _rxSource The data source - @param _rDest + @param _rDest The item set to fill. */ void translateProperties( @@ -153,9 +153,9 @@ namespace dbaui SfxItemSet& _rDest); /** translate SfxItems into properties of an UNO data source - @param _rSource + @param _rSource The item set to read from. - @param _rxDest + @param _rxDest The data source to fill. */ void translateProperties( @@ -169,18 +169,18 @@ namespace dbaui void fillDatasourceInfo(const SfxItemSet& _rSource, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo); /// translate the given value into an SfxPoolItem, put this into the given set under the given id - void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue); - + void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue); + /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type> ::com::sun::star::uno::Any implTranslateProperty(const SfxPoolItem* _pItem); /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type>, set it (under the given name) on the given property set - void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const ::rtl::OUString& _rName, const SfxPoolItem* _pItem); + void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const ::rtl::OUString& _rName, const SfxPoolItem* _pItem); /** check if the data source described by the given set needs authentication<p/> The return value depends on the data source type only. */ - sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; + sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; #ifdef DBG_UTIL ::rtl::OString translatePropertyId( sal_Int32 _nId ); @@ -188,7 +188,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DBADMINIMPL_HXX_ diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index 23390d34bba2..e531109c470c 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 13b4b50e5943..754b391b42aa 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,66 +44,66 @@ namespace dbaui /** filles the IDs of the settings which are reflected in indirect data source properties (aka properties in the css.sdb.DataSource.Info sequence) - @param _eType + @param _eType The Type of the data source. - @param _out_rDetailsIds + @param _out_rDetailsIds Will be filled. */ static void getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory,::std::vector< sal_Int32>& _out_rDetailsIds ); /** Creates the detail page for Dbase */ - static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for ODBC */ - static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for user */ - static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for MySQLODBC */ - static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for MySQLJDBC */ - static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for MySQLNATIVE */ - static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for Oracle JDBC */ - static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for Adabas */ - static SfxTabPage* CreateAdabas( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateAdabas( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for LDAP */ - static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet ); /// Creates the detail page for Text - static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet& _rAttrSet ); /// creates the GeneratedValues page - static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ); /// creates the "Special Settings" page of the "Advanced Settings" dialog - static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); }; } diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx index 47b77106cd3e..ff1f6407d12f 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,9 +66,9 @@ DBG_NAME( dbu_OExtensionNotPresentDialog ) OExtensionNotPresentDialog::OExtensionNotPresentDialog( Window* _pParent, uno::Reference< lang::XMultiServiceFactory > _xORB) : ModalDialog( _pParent, ModuleRes(RID_EXTENSION_NOT_PRESENT_DLG) ) ,m_aFI_WARNING(this, ModuleRes(FI_WARNING)) - ,m_aFT_TEXT(this, ModuleRes(FT_TEXT ) ) - ,m_aPB_DOWNLOAD(this, ModuleRes(PB_DOWNLOAD)) - ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,m_aFT_TEXT(this, ModuleRes(FT_TEXT ) ) + ,m_aPB_DOWNLOAD(this, ModuleRes(PB_DOWNLOAD)) + ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) ,m_xMultiServiceFactory(_xORB) { DBG_CTOR( dbu_OExtensionNotPresentDialog, NULL); @@ -84,10 +84,10 @@ DBG_NAME( dbu_OExtensionNotPresentDialog ) // set a ClickHandler for the 'Download' button m_aPB_DOWNLOAD.SetClickHdl( LINK( this, OExtensionNotPresentDialog, Download_Click ) ); - + // get message string out of the resource String sText = String( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) ); - // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) ); + // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) ); String sExtensionName = getFromConfigurationExtension("Name"); sText.SearchAndReplaceAscii("%RPT_EXTENSION_NAME", sExtensionName); @@ -137,12 +137,12 @@ DBG_NAME( dbu_OExtensionNotPresentDialog ) // WinBits aBits = m_aFI_WARNING.GetStyle(); // aBits |= WB_SCALE; // m_aFI_WARNING.SetStyle(aBits); - // + // // Size aImageSize = m_aFI_WARNING.GetSizePixel(); // (void) aImageSize; // m_aFI_WARNING.Resize(); - + Resize(); FreeResource(); } @@ -174,9 +174,9 @@ rtl::OUString OExtensionNotPresentDialog::getFromConfigurationExtension(rtl::OUS { // get the URL to open in a browser from Configuration static const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign/Extension" ) ); - + ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithServiceFactory( m_xMultiServiceFactory, sConfigName ) ); - + rtl::OUString aValue; aConfiguration.getNodeValue( _sPropertyName ) >>= aValue; return aValue; @@ -195,14 +195,14 @@ IMPL_LINK( OExtensionNotPresentDialog, Download_Click, PushButton*, EMPTYARG ) try { EndDialog( TRUE ); - + rtl::OUString suDownloadURL = getFromConfigurationExtension("DownloadURL"); if (suDownloadURL.getLength() == 0) { // fallback suDownloadURL = UNISTRING("http://extensions.libreoffice.org"); } - + // open such URL in a browser localizeWebserviceURI(suDownloadURL); uno::Reference< com::sun::star::system::XSystemShellExecute > xShellExecute( getShellExecuter() ); diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc index 69794e3a76bc..cb314b9f7683 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,22 +27,22 @@ #ifndef DBU_EXTENSIONNOTPRESENT_HRC #define DBU_EXTENSIONNOTPRESENT_HRC -#define FT_TEXT (1) -#define FI_WARNING (2) -#define PB_DOWNLOAD (10) -#define PB_CANCEL (11) +#define FT_TEXT (1) +#define FI_WARNING (2) +#define PB_DOWNLOAD (10) +#define PB_CANCEL (11) -#define FIXEDTEXT_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 #define CELL_PADDING 8 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 55 -#define BROWSER_HEIGHT 75 -// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING) +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 55 +#define BROWSER_HEIGHT 75 +// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING) #define LEFT_PADDING 32 /* size for the icon */ #define RIGHT_PADDING 16 -#define DLG_WIDTH ( 250 ) +#define DLG_WIDTH ( 250 ) #define ACTION_LINE_START (CELL_PADDING + ( 3 * FIXEDTEXT_HEIGHT ) + 2 * CELL_PADDING + 1 ) -#define DLG_HEIGHT (ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING) +#define DLG_HEIGHT (ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING) #endif /* DBU_EXTENSIONNOTPRESENT_HRC */ diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src index 9507c4256360..9944278cd359 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ String RID_STR_EXTENSION_NOT_PRESENT // To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name // String RID_STR_EXTENSION_NAME // { -// Text = "Sun(TM) Report Builder"; +// Text = "Sun(TM) Report Builder"; // }; ModalDialog RID_EXTENSION_NOT_PRESENT_DLG @@ -52,7 +52,7 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG HelpId = HID_EXTENSION_NOT_PRESENT_DLG; Moveable = TRUE ; Closeable = TRUE ; - + // most of the calulated values here are overridden by the ExtensionNotPresent ctor itself. FixedImage FI_WARNING { @@ -60,12 +60,12 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG Size = (32, 32); Fixed=BMP_EXCEPTION_WARNING; }; - + FixedText FT_TEXT { - Pos = MAP_APPFONT ( 32 , CELL_PADDING ) ; - Size = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ; + Pos = MAP_APPFONT ( 32 , CELL_PADDING ) ; + Size = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ; // Border = TRUE ; // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT }; diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 947bec14a021..e574d4051040 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,15 +68,15 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, ,m_pTableMap(pParent->GetTabWinMap()) ,aFL_CascUpd( this, ModuleRes(FL_CASC_UPD) ) - ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) ) - ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) ) - ,aRB_CascUpdNull( this, ModuleRes(RB_CASC_UPD_NULL) ) - ,aRB_CascUpdDefault( this, ModuleRes(RB_CASC_UPD_DEFAULT) ) + ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) ) + ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) ) + ,aRB_CascUpdNull( this, ModuleRes(RB_CASC_UPD_NULL) ) + ,aRB_CascUpdDefault( this, ModuleRes(RB_CASC_UPD_DEFAULT) ) ,aFL_CascDel( this, ModuleRes(FL_CASC_DEL) ) - ,aRB_NoCascDel( this, ModuleRes(RB_NO_CASC_DEL) ) - ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) ) - ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) ) - ,aRB_CascDelDefault( this, ModuleRes(RB_CASC_DEL_DEFAULT) ) + ,aRB_NoCascDel( this, ModuleRes(RB_NO_CASC_DEL) ) + ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) ) + ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) ) + ,aRB_CascDelDefault( this, ModuleRes(RB_CASC_DEL_DEFAULT) ) ,aPB_OK( this, ModuleRes( PB_OK ) ) ,aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) @@ -218,7 +218,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) } catch( const SQLException& ) { - ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ), + ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ), this, static_cast<OJoinTableView*>(GetParent())->getDesignView()->getController().getORB()); } diff --git a/dbaccess/source/ui/dlg/RelationDlg.hrc b/dbaccess/source/ui/dlg/RelationDlg.hrc index b0d14aa6d93a..0e1f57174b3b 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.hrc +++ b/dbaccess/source/ui/dlg/RelationDlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,18 +34,18 @@ #define FL_CASC_DEL 3 #define FL_CASC_UPD 4 -#define RB_NO_CASC_DEL 1 -#define RB_NO_CASC_UPD 2 -#define RB_CASC_DEL 3 -#define RB_CASC_UPD 4 -#define RB_CASC_DEL_NULL 5 -#define RB_CASC_DEL_DEFAULT 6 -#define RB_CASC_UPD_NULL 7 +#define RB_NO_CASC_DEL 1 +#define RB_NO_CASC_UPD 2 +#define RB_CASC_DEL 3 +#define RB_CASC_UPD 4 +#define RB_CASC_DEL_NULL 5 +#define RB_CASC_DEL_DEFAULT 6 +#define RB_CASC_UPD_NULL 7 #define RB_CASC_UPD_DEFAULT 8 -#define PB_OK 1 -#define PB_CANCEL 2 -#define PB_HELP 3 +#define PB_OK 1 +#define PB_CANCEL 2 +#define PB_HELP 3 #define WND_CONTROL 1 diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src index 68399ca52619..f0517f5c989e 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.src +++ b/dbaccess/source/ui/dlg/RelationDlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,8 +86,8 @@ ModalDialog DLG_REL_PROPERTIES }; }; - - + + FixedLine FL_CASC_UPD { diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index fe392d82cbe0..ebdc2519bc26 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,7 +131,7 @@ SfxItemSet* OTableSubscriptionDialog::getWriteOutputSet() } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 4e2864aaaa52..97922615c81d 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,22 +93,22 @@ DBG_NAME(OTextConnectionHelper) ,m_aRBAccessOtherFiles (this, ModuleRes(RB_AUTOACCESSOTHERS)) ,m_aETOwnExtension (this, ModuleRes(ET_AUTOOWNEXTENSION)) ,m_aFTExtensionExample (this, ModuleRes(FT_AUTOOWNEXTENSIONAPPENDIX)) - ,m_aLineFormat (this, ModuleRes(FL_AUTOSEPARATOR2)) - ,m_aFieldSeparatorLabel (this, ModuleRes(FT_AUTOFIELDSEPARATOR)) - ,m_aFieldSeparator (this, ModuleRes(CM_AUTOFIELDSEPARATOR)) - ,m_aTextSeparatorLabel (this, ModuleRes(FT_AUTOTEXTSEPARATOR)) - ,m_aTextSeparator (this, ModuleRes(CM_AUTOTEXTSEPARATOR)) - ,m_aDecimalSeparatorLabel (this, ModuleRes(FT_AUTODECIMALSEPARATOR)) - ,m_aDecimalSeparator (this, ModuleRes(CM_AUTODECIMALSEPARATOR)) - ,m_aThousandsSeparatorLabel (this, ModuleRes(FT_AUTOTHOUSANDSSEPARATOR)) - ,m_aThousandsSeparator (this, ModuleRes(CM_AUTOTHOUSANDSSEPARATOR)) + ,m_aLineFormat (this, ModuleRes(FL_AUTOSEPARATOR2)) + ,m_aFieldSeparatorLabel (this, ModuleRes(FT_AUTOFIELDSEPARATOR)) + ,m_aFieldSeparator (this, ModuleRes(CM_AUTOFIELDSEPARATOR)) + ,m_aTextSeparatorLabel (this, ModuleRes(FT_AUTOTEXTSEPARATOR)) + ,m_aTextSeparator (this, ModuleRes(CM_AUTOTEXTSEPARATOR)) + ,m_aDecimalSeparatorLabel (this, ModuleRes(FT_AUTODECIMALSEPARATOR)) + ,m_aDecimalSeparator (this, ModuleRes(CM_AUTODECIMALSEPARATOR)) + ,m_aThousandsSeparatorLabel (this, ModuleRes(FT_AUTOTHOUSANDSSEPARATOR)) + ,m_aThousandsSeparator (this, ModuleRes(CM_AUTOTHOUSANDSSEPARATOR)) ,m_aRowHeader (this, ModuleRes(CB_AUTOHEADER)) ,m_aCharSetHeader (this, ModuleRes(FL_DATACONVERT)) ,m_aCharSetLabel (this, ModuleRes(FT_CHARSET)) ,m_aCharSet (this, ModuleRes(LB_CHARSET)) - ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) - ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) - ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE)) + ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) + ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) + ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE)) ,m_nAvailableSections( _nAvailableSections ) { DBG_CTOR(OTextConnectionHelper,NULL); @@ -335,59 +335,59 @@ DBG_NAME(OTextConnectionHelper) String sExtension = GetExtension(); String aErrorText; Control* pErrorWin = NULL; - // if (!m_aFieldSeparator.GetText().Len()) + // if (!m_aFieldSeparator.GetText().Len()) // bug (#42168) if this line is compiled under OS2 (in a product environent) // -> use a temporary variable String aDelText(m_aFieldSeparator.GetText()); if(!aDelText.Len()) - { // Kein FeldTrenner + { // Kein FeldTrenner aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (!m_aDecimalSeparator.GetText().Len()) - { // kein Decimaltrenner + { // kein Decimaltrenner aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING)); aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText()); pErrorWin = &m_aDecimalSeparator; } else if (m_aTextSeparator.GetText() == m_aFieldSeparator.GetText()) - { // Feld und TextTrenner duerfen nicht gleich sein + { // Feld und TextTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aFieldSeparatorLabel.GetText()); pErrorWin = &m_aTextSeparator; } else if (m_aDecimalSeparator.GetText() == m_aThousandsSeparator.GetText()) - { // Tausender und DecimalTrenner duerfen nicht gleich sein + { // Tausender und DecimalTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aDecimalSeparator; } else if (m_aFieldSeparator.GetText() == m_aThousandsSeparator.GetText()) - { // Tausender und FeldTrenner duerfen nicht gleich sein + { // Tausender und FeldTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (m_aFieldSeparator.GetText() == m_aDecimalSeparator.GetText()) - { // Zehner und FeldTrenner duerfen nicht gleich sein + { // Zehner und FeldTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (m_aTextSeparator.GetText() == m_aThousandsSeparator.GetText()) - { // Tausender und TextTrenner duerfen nicht gleich sein + { // Tausender und TextTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aTextSeparator; } else if (m_aTextSeparator.GetText() == m_aDecimalSeparator.GetText()) - { // Zehner und TextTrenner duerfen nicht gleich sein + { // Zehner und TextTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText()); @@ -500,8 +500,8 @@ DBG_NAME(OTextConnectionHelper) //------------------------------------------------------------------------ String OTextConnectionHelper::GetSeparator( const ComboBox& rBox, const String& rList ) { - sal_Unicode nTok = '\t'; - xub_StrLen nPos(rBox.GetEntryPos( rBox.GetText() )); + sal_Unicode nTok = '\t'; + xub_StrLen nPos(rBox.GetEntryPos( rBox.GetText() )); if( nPos == COMBOBOX_ENTRY_NOTFOUND ) return rBox.GetText().Copy(0); @@ -517,13 +517,13 @@ DBG_NAME(OTextConnectionHelper) //------------------------------------------------------------------------ void OTextConnectionHelper::SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ) { - char nTok = '\t'; - xub_StrLen nCnt(rList.GetTokenCount( nTok )); - xub_StrLen i; + char nTok = '\t'; + xub_StrLen nCnt(rList.GetTokenCount( nTok )); + xub_StrLen i; for( i=0 ; i<nCnt ; i+=2 ) { - String sTVal( + String sTVal( static_cast< sal_Unicode >( rList.GetToken( (i+1), nTok ).ToInt32())); @@ -544,7 +544,7 @@ DBG_NAME(OTextConnectionHelper) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 8c1d0aa0c0fd..c178e3a68c08 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace dbaui { OTextConnectionHelper(); - Link m_aModifiedHandler; /// to be called if something on the page has been modified + Link m_aModifiedHandler; /// to be called if something on the page has been modified public: OTextConnectionHelper( Window* pParent, const short _nAvailableSections ); @@ -71,24 +71,24 @@ namespace dbaui RadioButton m_aRBAccessOtherFiles; Edit m_aETOwnExtension; FixedText m_aFTExtensionExample; - FixedLine m_aLineFormat; - FixedText m_aFieldSeparatorLabel; - ComboBox m_aFieldSeparator; - FixedText m_aTextSeparatorLabel; - ComboBox m_aTextSeparator; - FixedText m_aDecimalSeparatorLabel; - ComboBox m_aDecimalSeparator; - FixedText m_aThousandsSeparatorLabel; - ComboBox m_aThousandsSeparator; - CheckBox m_aRowHeader; + FixedLine m_aLineFormat; + FixedText m_aFieldSeparatorLabel; + ComboBox m_aFieldSeparator; + FixedText m_aTextSeparatorLabel; + ComboBox m_aTextSeparator; + FixedText m_aDecimalSeparatorLabel; + ComboBox m_aDecimalSeparator; + FixedText m_aThousandsSeparatorLabel; + ComboBox m_aThousandsSeparator; + CheckBox m_aRowHeader; FixedLine m_aCharSetHeader; FixedText m_aCharSetLabel; CharSetListBox m_aCharSet; - String m_aFieldSeparatorList; - String m_aTextSeparatorList; - String m_aTextNone; + String m_aFieldSeparatorList; + String m_aTextSeparatorList; + String m_aTextNone; String m_aOldExtension; - Link m_aGetExtensionHandler; /// to be called if a new type is selected + Link m_aGetExtensionHandler; /// to be called if a new type is selected short m_nAvailableSections; @@ -100,11 +100,11 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); private: - String GetSeparator( const ComboBox& rBox, const String& rList ); - void SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ); + String GetSeparator( const ComboBox& rBox, const String& rList ); + void SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ); void SetExtension(const String& _rVal); - + public: void implInitControls(const SfxItemSet& _rSet, sal_Bool _bValid); void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -116,7 +116,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBWIZ2_HXX diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index d22e8c4839a7..961375276259 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,16 +64,16 @@ using namespace comphelper; class OPasswordDialog : public ModalDialog { - FixedLine aFLUser; - FixedText aFTOldPassword; - Edit aEDOldPassword; - FixedText aFTPassword; - Edit aEDPassword; - FixedText aFTPasswordRepeat; - Edit aEDPasswordRepeat; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + FixedLine aFLUser; + FixedText aFTOldPassword; + Edit aEDOldPassword; + FixedText aFTPassword; + Edit aEDPassword; + FixedText aFTPasswordRepeat; + Edit aEDPasswordRepeat; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; DECL_LINK( OKHdl_Impl, OKButton * ); @@ -82,24 +82,24 @@ class OPasswordDialog : public ModalDialog public: OPasswordDialog( Window* pParent,const String& _sUserName); - String GetOldPassword() const { return aEDOldPassword.GetText(); } - String GetNewPassword() const { return aEDPassword.GetText(); } + String GetOldPassword() const { return aEDOldPassword.GetText(); } + String GetNewPassword() const { return aEDPassword.GetText(); } }; OPasswordDialog::OPasswordDialog(Window* _pParent,const String& _sUserName) : ModalDialog( _pParent, ModuleRes( DLG_PASSWORD) ), - aFLUser ( this, ModuleRes( FL_USER ) ), - aFTOldPassword ( this, ModuleRes( FT_OLDPASSWORD ) ), - aEDOldPassword ( this, ModuleRes( ED_OLDPASSWORD ) ), - aFTPassword ( this, ModuleRes( FT_PASSWORD ) ), - aEDPassword ( this, ModuleRes( ED_PASSWORD ) ), - aFTPasswordRepeat ( this, ModuleRes( FT_PASSWORD_REPEAT ) ), - aEDPasswordRepeat ( this, ModuleRes( ED_PASSWORD_REPEAT ) ), - aOKBtn ( this, ModuleRes( BTN_PASSWORD_OK ) ), - aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ), - aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) ) + aFLUser ( this, ModuleRes( FL_USER ) ), + aFTOldPassword ( this, ModuleRes( FT_OLDPASSWORD ) ), + aEDOldPassword ( this, ModuleRes( ED_OLDPASSWORD ) ), + aFTPassword ( this, ModuleRes( FT_PASSWORD ) ), + aEDPassword ( this, ModuleRes( ED_PASSWORD ) ), + aFTPasswordRepeat ( this, ModuleRes( FT_PASSWORD_REPEAT ) ), + aEDPasswordRepeat ( this, ModuleRes( ED_PASSWORD_REPEAT ) ), + aOKBtn ( this, ModuleRes( BTN_PASSWORD_OK ) ), + aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ), + aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) ) { // hide until a help is avalable aHelpBtn.Hide(); @@ -142,14 +142,14 @@ DBG_NAME(OUserAdmin); //================================================================================ OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet) : OGenericAdministrationPage( pParent, ModuleRes(TAB_PAGE_USERADMIN), _rAttrSet) - ,m_FL_USER( this , ModuleRes(FL_USER)) - ,m_FT_USER( this , ModuleRes(FT_USER)) - ,m_LB_USER( this , ModuleRes(LB_USER)) - ,m_PB_NEWUSER( this , ModuleRes(PB_NEWUSER)) - ,m_PB_CHANGEPWD( this , ModuleRes(PB_CHANGEPWD)) - ,m_PB_DELETEUSER( this , ModuleRes(PB_DELETEUSER)) + ,m_FL_USER( this , ModuleRes(FL_USER)) + ,m_FT_USER( this , ModuleRes(FT_USER)) + ,m_LB_USER( this , ModuleRes(LB_USER)) + ,m_PB_NEWUSER( this , ModuleRes(PB_NEWUSER)) + ,m_PB_CHANGEPWD( this , ModuleRes(PB_CHANGEPWD)) + ,m_PB_DELETEUSER( this , ModuleRes(PB_DELETEUSER)) ,m_FL_TABLE_GRANTS( this , ModuleRes(FL_TABLE_GRANTS)) - ,m_TableCtrl( this , ModuleRes(CTRL_TABLE_GRANTS)) + ,m_TableCtrl( this , ModuleRes(CTRL_TABLE_GRANTS)) { DBG_CTOR(OUserAdmin,NULL); m_LB_USER.SetSelectHdl(LINK(this, OUserAdmin, ListDblClickHdl)); @@ -186,7 +186,7 @@ void OUserAdmin::FillUserNames() m_aUserNames = m_xUsers->getElementNames(); const ::rtl::OUString* pBegin = m_aUserNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength(); + const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength(); ::rtl::OUString sUserName = m_UserName; for(;pBegin != pEnd;++pBegin) m_LB_USER.InsertEntry(*pBegin); @@ -215,7 +215,7 @@ void OUserAdmin::FillUserNames() } // ----------------------------------------------------------------------- -SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet ) +SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OUserAdmin( pParent, _rAttrSet ) ); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.hrc b/dbaccess/source/ui/dlg/UserAdmin.hrc index 6a012724f49a..35ae40db6632 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hrc +++ b/dbaccess/source/ui/dlg/UserAdmin.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,33 +27,33 @@ #ifndef DBAUI_USERADMIN_HRC #define DBAUI_USERADMIN_HRC -#define FT_USER 1 - -#define LB_USER 1 - -#define NF_TIMEOUT 1 +#define FT_USER 1 -#define FL_TABLE_GRANTS 1 -#define FL_USER 2 +#define LB_USER 1 + +#define NF_TIMEOUT 1 + +#define FL_TABLE_GRANTS 1 +#define FL_USER 2 -#define CTRL_TABLE_GRANTS 1 +#define CTRL_TABLE_GRANTS 1 -#define PB_NEWUSER 2 -#define PB_CHANGEPWD 3 -#define PB_DELETEUSER 4 +#define PB_NEWUSER 2 +#define PB_CHANGEPWD 3 +#define PB_DELETEUSER 4 -#define FT_OLDPASSWORD 19 -#define ED_OLDPASSWORD 19 -#define FT_PASSWORD 20 -#define ED_PASSWORD 21 -#define FT_PASSWORD_REPEAT 22 -#define ED_PASSWORD_REPEAT 23 +#define FT_OLDPASSWORD 19 +#define ED_OLDPASSWORD 19 +#define FT_PASSWORD 20 +#define ED_PASSWORD 21 +#define FT_PASSWORD_REPEAT 22 +#define ED_PASSWORD_REPEAT 23 -#define BTN_PASSWORD_OK 50 -#define BTN_PASSWORD_CANCEL 51 -#define BTN_PASSWORD_HELP 52 +#define BTN_PASSWORD_OK 50 +#define BTN_PASSWORD_CANCEL 51 +#define BTN_PASSWORD_HELP 52 #endif // DBAUI_USERADMIN_HRC diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 73458126dbb1..45995bc201d9 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,32 +48,32 @@ namespace dbaui class OUserAdmin : public OGenericAdministrationPage { protected: - FixedLine m_FL_USER; - FixedText m_FT_USER; - ListBox m_LB_USER; - PushButton m_PB_NEWUSER; - PushButton m_PB_CHANGEPWD; - PushButton m_PB_DELETEUSER; - FixedLine m_FL_TABLE_GRANTS; - OTableGrantControl m_TableCtrl; // show the grant rights of one user - - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames; - - String m_UserName; + FixedLine m_FL_USER; + FixedText m_FT_USER; + ListBox m_LB_USER; + PushButton m_PB_NEWUSER; + PushButton m_PB_CHANGEPWD; + PushButton m_PB_DELETEUSER; + FixedLine m_FL_TABLE_GRANTS; + OTableGrantControl m_TableCtrl; // show the grant rights of one user + + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; + ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames; + String m_UserName; + // methods DECL_LINK( ListDblClickHdl, ListBox * ); - DECL_LINK( CloseHdl, PushButton * ); - DECL_LINK( UserHdl, PushButton * ); + DECL_LINK( CloseHdl, PushButton * ); + DECL_LINK( UserHdl, PushButton * ); - void FillUserNames(); + void FillUserNames(); OUserAdmin( Window* pParent, const SfxItemSet& _rCoreAttrs); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); - + static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + ~OUserAdmin(); String GetUser(); diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src index 2cab4f9e89f0..7ec8120b51b1 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.src +++ b/dbaccess/source/ui/dlg/UserAdmin.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,82 +40,82 @@ TabPage TAB_PAGE_USERADMIN { - SVLook = TRUE ; - HelpId = HID_TAB_PAGE_USERADMIN ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + SVLook = TRUE ; + HelpId = HID_TAB_PAGE_USERADMIN ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; Hide = TRUE; FixedLine FL_USER { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; - Text [ en-US ] = "User selection"; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; + Text [ en-US ] = "User selection"; }; FixedText FT_USER { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; - Text [ en-US ] = "Us~er:"; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 90 , 10 ) ; + Text [ en-US ] = "Us~er:"; }; ListBox LB_USER { - Border = TRUE ; - Pos = MAP_APPFONT ( 108 , 13) ; - Size = MAP_APPFONT ( 105 , 97 ) ; - TabStop = TRUE ; - HScroll = TRUE ; - Sort = TRUE ; - DropDown = TRUE ; - HelpId = HID_TAB_PAGE_LBUSER ; + Border = TRUE ; + Pos = MAP_APPFONT ( 108 , 13) ; + Size = MAP_APPFONT ( 105 , 97 ) ; + TabStop = TRUE ; + HScroll = TRUE ; + Sort = TRUE ; + DropDown = TRUE ; + HelpId = HID_TAB_PAGE_LBUSER ; }; PushButton PB_NEWUSER { - Pos = MAP_APPFONT ( 12 , 29 ) ; - Size = MAP_APPFONT ( 70 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - HelpId = HID_TAB_PAGE_PBUSER ; + Pos = MAP_APPFONT ( 12 , 29 ) ; + Size = MAP_APPFONT ( 70 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + HelpId = HID_TAB_PAGE_PBUSER ; Text [ en-US ] = "~Add User..."; }; PushButton PB_CHANGEPWD { - Pos = MAP_APPFONT ( 95 , 29 ) ; - Size = MAP_APPFONT ( 70 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - HelpId = HID_TAB_PAGE_PBCHGPWD ; + Pos = MAP_APPFONT ( 95 , 29 ) ; + Size = MAP_APPFONT ( 70 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + HelpId = HID_TAB_PAGE_PBCHGPWD ; Text [ en-US ] = "Change ~Password..."; }; PushButton PB_DELETEUSER { - Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ; - Size = MAP_APPFONT ( 70 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - HelpId = HID_TAB_PAGE_PBUSERDELETE ; + Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ; + Size = MAP_APPFONT ( 70 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + HelpId = HID_TAB_PAGE_PBUSERDELETE ; Text [ en-US ] = "~Delete User..."; }; FixedLine FL_TABLE_GRANTS { - Pos = MAP_APPFONT ( 6 , 52 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; + Pos = MAP_APPFONT ( 6 , 52 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; Text [ en-US ] = "Access rights for selected user"; }; Control CTRL_TABLE_GRANTS { - Pos = MAP_APPFONT ( 12 , 63 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 22, WINDOW_SIZE_Y - 75 ); - Border = TRUE ; - TabStop = TRUE ; - HelpId = HID_TAB_PAGE_TBLGRANTS ; + Pos = MAP_APPFONT ( 12 , 63 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 22, WINDOW_SIZE_Y - 75 ); + Border = TRUE ; + TabStop = TRUE ; + HelpId = HID_TAB_PAGE_TBLGRANTS ; }; }; @@ -130,10 +130,10 @@ String STR_USERADMIN_NOT_AVAILABLE Text [ en-US ] = "The database does not support user administration." ; }; -#define EDIT_SIZE_X 50 -#define FT_SIZE_X 90 -#define WIN_X 220 -#define WIN_Y 72 +#define EDIT_SIZE_X 50 +#define FT_SIZE_X 90 +#define WIN_X 220 +#define WIN_Y 72 ModalDialog DLG_PASSWORD { @@ -191,7 +191,7 @@ ModalDialog DLG_PASSWORD Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ; PassWord = TRUE ; }; - + OKButton BTN_PASSWORD_OK { Pos = MAP_APPFONT ( WIN_X - 56 , 6 ) ; @@ -207,7 +207,7 @@ ModalDialog DLG_PASSWORD { Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; - }; + }; Text [ en-US ] = "Change Password"; }; diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 5e7e28158777..3f731cade662 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -178,7 +178,7 @@ DBG_NAME(OUserAdminDlg) return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const + ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -203,7 +203,7 @@ DBG_NAME(OUserAdminDlg) return PrepareLeaveCurrentPage(); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.hrc b/dbaccess/source/ui/dlg/UserAdminDlg.hrc index c1e023cfc9b7..dd1bdd5b57af 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.hrc +++ b/dbaccess/source/ui/dlg/UserAdminDlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #ifndef DBAUI_USERADMINDLG_HRC #define DBAUI_USERADMINDLG_HRC -#define STR_PAGETITLE_USERADMIN 1 +#define STR_PAGETITLE_USERADMIN 1 #endif // DBAUI_USERADMINDLG_HRC diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src index faa7f33302d7..bed16e575dc1 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.src +++ b/dbaccess/source/ui/dlg/UserAdminDlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,14 +37,14 @@ TabDialog DLG_DATABASE_USERADMIN -{ +{ OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; Hide = TRUE; HelpId = HID_DSADMIN_USERADMIN; - + TabControl 1 { OutputSize = TRUE ; @@ -55,6 +55,6 @@ TabDialog DLG_DATABASE_USERADMIN { Text[ en-US ] = "User Settings"; }; - + Text [ en-US ] = "User administration" ; }; diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index cfdc2dd3842f..5213bda4c8a5 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,18 +152,18 @@ namespace dbaui //-------------------------------------------------------------------- MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink ) :Control( &_rParent, ModuleRes( RID_MYSQL_NATIVE_SETTINGS ).SetAutoRelease( FALSE ) ) - ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) ) - ,m_aDatabaseName ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) ) + ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) ) + ,m_aDatabaseName ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) ) ,m_aHostPortRadio ( this, ModuleRes( RB_MYSQL_HOST_PORT ) ) - ,m_aSocketRadio ( this, ModuleRes( RB_MYSQL_SOCKET ) ) - ,m_aNamedPipeRadio ( this, ModuleRes( RB_MYSQL_NAMED_PIPE ) ) - ,m_aHostNameLabel ( this, ModuleRes( FT_COMMON_HOST_NAME ) ) - ,m_aHostName ( this, ModuleRes( ED_COMMON_HOST_NAME ) ) - ,m_aPortLabel ( this, ModuleRes( FT_COMMON_PORT ) ) - ,m_aPort ( this, ModuleRes( NF_COMMON_PORT ) ) + ,m_aSocketRadio ( this, ModuleRes( RB_MYSQL_SOCKET ) ) + ,m_aNamedPipeRadio ( this, ModuleRes( RB_MYSQL_NAMED_PIPE ) ) + ,m_aHostNameLabel ( this, ModuleRes( FT_COMMON_HOST_NAME ) ) + ,m_aHostName ( this, ModuleRes( ED_COMMON_HOST_NAME ) ) + ,m_aPortLabel ( this, ModuleRes( FT_COMMON_PORT ) ) + ,m_aPort ( this, ModuleRes( NF_COMMON_PORT ) ) ,m_aDefaultPort ( this, ModuleRes( FT_COMMON_PORT_DEFAULT ) ) - ,m_aSocket ( this, ModuleRes( ED_MYSQL_SOCKET ) ) - ,m_aNamedPipe ( this, ModuleRes( ED_MYSQL_NAMED_PIPE ) ) + ,m_aSocket ( this, ModuleRes( ED_MYSQL_SOCKET ) ) + ,m_aNamedPipe ( this, ModuleRes( ED_MYSQL_NAMED_PIPE ) ) { FreeResource(); diff --git a/dbaccess/source/ui/dlg/admincontrols.hrc b/dbaccess/source/ui/dlg/admincontrols.hrc index 8286bc7f8b25..01eadee58e83 100755 --- a/dbaccess/source/ui/dlg/admincontrols.hrc +++ b/dbaccess/source/ui/dlg/admincontrols.hrc @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index cd3246cdc332..4caa61be5664 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,10 +55,10 @@ namespace dbaui FixedText m_aHostNameLabel; Edit m_aHostName; FixedText m_aPortLabel; - NumericField m_aPort; - FixedText m_aDefaultPort; - Edit m_aSocket; - Edit m_aNamedPipe; + NumericField m_aPort; + FixedText m_aDefaultPort; + Edit m_aSocket; + Edit m_aNamedPipe; ::svt::ControlDependencyManager m_aControlDependencies; diff --git a/dbaccess/source/ui/dlg/admincontrols.src b/dbaccess/source/ui/dlg/admincontrols.src index 8ce3bb4030dc..5e5ceda60428 100755 --- a/dbaccess/source/ui/dlg/admincontrols.src +++ b/dbaccess/source/ui/dlg/admincontrols.src @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Size = MAP_APPFONT ( COLUMN_WIDTH_1 - UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ); Text[ en-US ] = "~Database name"; }; - + Edit ED_MYSQL_DATABASE_NAME { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, 0 ); @@ -84,7 +84,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Text [ en-US ] = "~Port" ; Group = TRUE; }; - + NumericField NF_COMMON_PORT { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + LINE_HEIGHT ); @@ -93,7 +93,7 @@ Control RID_MYSQL_NATIVE_SETTINGS NoThousandSep = TRUE; Value = 3306; }; - + FixedText FT_COMMON_PORT_DEFAULT { Pos = MAP_APPFONT ( COLUMN_WIDTH_1 + 25 + RELATED_CONTROLS, OPTION_GROUP_START + LINE_HEIGHT + 2 ); @@ -107,7 +107,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS, FIXEDTEXT_HEIGHT ); Text [ en-US ] = "So~cket"; }; - + Edit ED_MYSQL_SOCKET { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 * LINE_HEIGHT ); @@ -121,7 +121,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS, FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Named p~ipe"; }; - + Edit ED_MYSQL_NAMED_PIPE { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 * LINE_HEIGHT ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index e87ca6a93d45..2e4d3fbee797 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ namespace dbaui OGenericAdministrationPage::~OGenericAdministrationPage() { DELETEZ(m_pFT_HeaderText); - + DBG_DTOR(OGenericAdministrationPage,NULL); } @@ -186,7 +186,7 @@ namespace dbaui fillControls(aControlList); ::std::for_each(aControlList.begin(),aControlList.end(),TSaveValueWrapperFunctor()); } - + if ( bReadonly ) { fillWindows(aControlList); @@ -264,7 +264,7 @@ namespace dbaui // ----------------------------------------------------------------------- IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/) - { + { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); sal_Bool bSuccess = sal_False; if ( m_pAdminDialog ) @@ -294,7 +294,7 @@ namespace dbaui else { eImage = OSQLMessageBox::Error; - aMessage = String(ModuleRes(STR_CONNECTION_NO_SUCCESS)); + aMessage = String(ModuleRes(STR_CONNECTION_NO_SUCCESS)); } OSQLMessageBox aMsg( this, sTitle, aMessage, WB_OK, eImage ); aMsg.Execute(); @@ -333,7 +333,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index eba739fec877..9a6775269bf0 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,10 +50,10 @@ namespace dbaui virtual bool SaveValue() = 0; virtual bool Disable() = 0; }; - + template < class T > class OSaveValueWrapper : public ISaveValueWrapper { - T* m_pSaveValue; + T* m_pSaveValue; public: OSaveValueWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } @@ -64,7 +64,7 @@ namespace dbaui template < class T > class ODisableWrapper : public ISaveValueWrapper { - T* m_pSaveValue; + T* m_pSaveValue; public: ODisableWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } @@ -75,14 +75,14 @@ namespace dbaui struct TSaveValueWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool> { - bool operator() (ISaveValueWrapper* lhs) + bool operator() (ISaveValueWrapper* lhs) { return lhs->SaveValue(); } }; struct TDisableWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool> { - bool operator() (ISaveValueWrapper* lhs) + bool operator() (ISaveValueWrapper* lhs) { return lhs->Disable(); } @@ -90,7 +90,7 @@ namespace dbaui struct TDeleteWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool> { - bool operator() (ISaveValueWrapper* lhs) + bool operator() (ISaveValueWrapper* lhs) { delete lhs; return true; @@ -101,12 +101,12 @@ namespace dbaui //= OGenericAdministrationPage //========================================================================= class IDatabaseSettingsDialog; - class IItemSetHelper; + class IItemSetHelper; class OGenericAdministrationPage :public SfxTabPage ,public ::svt::IWizardPageController { private: - Link m_aModifiedHandler; /// to be called if something on the page has been modified + Link m_aModifiedHandler; /// to be called if something on the page has been modified sal_Bool m_abEnableRoadmap; protected: IDatabaseSettingsDialog* m_pAdminDialog; @@ -123,32 +123,32 @@ namespace dbaui void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; } /** Sets the ParentDialog - @param _pAdminDialog + @param _pAdminDialog the ParentDialog - @param _pItemSetHelper + @param _pItemSetHelper the itemset helper */ - inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper) - { + inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper) + { OSL_ENSURE(_pDialog && _pItemSetHelper,"Values are NULL!"); - m_pAdminDialog = _pDialog; + m_pAdminDialog = _pDialog; m_pItemSetHelper = _pItemSetHelper; } /** Sets the ServiceFactory - @param _rxORB + @param _rxORB The service factory. */ virtual void SetServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB) - { - m_xORB = _rxORB; + { + m_xORB = _rxORB; } /** opens a dialog filled with all data sources available for this type and returns the selected on. - @param _eType + @param _eType The type for which the data source dialog should be opened. - @param _sReturn + @param _sReturn <OUT/> contains the selected name. @return <FALSE/> if an error occured, otherwise <TRUE/> @@ -168,12 +168,12 @@ namespace dbaui virtual int DeactivatePage(SfxItemSet* pSet); using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False - virtual void Reset(const SfxItemSet& _rCoreAttrs); + virtual void Reset(const SfxItemSet& _rCoreAttrs); /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True virtual void ActivatePage(const SfxItemSet& _rSet); // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage(); protected: void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call((void*)this); } @@ -182,7 +182,7 @@ namespace dbaui virtual sal_Bool prepareLeave() { return sal_True; } /** called from within Reset and ActivatePage, use to initialize the controls with the items from the given set - @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls + @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls */ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); @@ -190,28 +190,28 @@ namespace dbaui void getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly); /** will be called inside <method>implInitControls</method> to save the value if necessary - @param _rControlList - The list must be filled with the controls. + @param _rControlList + The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. */ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) = 0; /** will be called inside <method>implInitControls</method> to disable if necessary - @param _rControlList - The list must be filled with the controls. + @param _rControlList + The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. */ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) = 0; public: /** fills the Boolean value into the item set when the value changed. - @param _rSet + @param _rSet The item set where to put the new value into. - @param _pCheckBox + @param _pCheckBox The check box which is checked. - @param _nID + @param _nID The id in the itemset to set whith the new value. - @param _bChangedSomething + @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> @param _bRevertValue set to <TRUE/> if the display value should be reverted before putting it into the set @@ -219,25 +219,25 @@ namespace dbaui static void fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, USHORT _nID, sal_Bool& _bChangedSomething, bool _bRevertValue = false); /** fills the int value into the item set when the value changed. - @param _rSet + @param _rSet The item set where to put the new value into. - @param _pEdit + @param _pEdit The check box which is checked. - @param _nID + @param _nID The id in the itemset to set whith the new value. - @param _bChangedSomething + @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ static void fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething); /** fills the String value into the item set when the value changed. - @param _rSet + @param _rSet The item set where to put the new value into. - @param _pEdit + @param _pEdit The check box which is checked. - @param _nID + @param _nID The id in the itemset to set whith the new value. - @param _bChangedSomething + @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ static void fillString(SfxItemSet& _rSet,Edit* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething); @@ -280,7 +280,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ADMINPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index a0f0365fb22b..21f806db613a 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,14 +71,14 @@ BSTR PromptNew(long hWnd) // Initialize COM ::CoInitialize( NULL ); - + // Instantiate DataLinks object. hr = CoCreateInstance( - CLSID_DataLinks, //clsid -- Data Links UI - NULL, //pUnkOuter - CLSCTX_INPROC_SERVER, //dwClsContext - IID_IDataSourceLocator, //riid - (void**)&dlPrompt //ppvObj + CLSID_DataLinks, //clsid -- Data Links UI + NULL, //pUnkOuter + CLSCTX_INPROC_SERVER, //dwClsContext + IID_IDataSourceLocator, //riid + (void**)&dlPrompt //ppvObj ); if( FAILED( hr ) ) { @@ -86,7 +86,7 @@ BSTR PromptNew(long hWnd) dlPrompt->Release( ); return connstr; } - + dlPrompt->put_hWnd(hWnd); if( FAILED( hr ) ) { @@ -98,7 +98,7 @@ BSTR PromptNew(long hWnd) // Prompt for connection information. hr = dlPrompt->PromptNew((IDispatch **)&piTmpConnection); - if( FAILED( hr ) || !piTmpConnection ) + if( FAILED( hr ) || !piTmpConnection ) { dlPrompt->Release( ); return connstr; @@ -128,7 +128,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) // Initialize COM ::CoInitialize( NULL ); - hr = CoCreateInstance(CLSID_CADOConnection, + hr = CoCreateInstance(CLSID_CADOConnection, NULL, CLSCTX_INPROC_SERVER, IID_IADOConnection, @@ -139,21 +139,21 @@ BSTR PromptEdit(long hWnd,BSTR connstr) return connstr; } - + hr = piTmpConnection->put_ConnectionString(connstr); if( FAILED( hr ) ) { piTmpConnection->Release( ); return connstr; } - + // Instantiate DataLinks object. hr = CoCreateInstance( - CLSID_DataLinks, //clsid -- Data Links UI - NULL, //pUnkOuter - CLSCTX_INPROC_SERVER, //dwClsContext - IID_IDataSourceLocator, //riid - (void**)&dlPrompt //ppvObj + CLSID_DataLinks, //clsid -- Data Links UI + NULL, //pUnkOuter + CLSCTX_INPROC_SERVER, //dwClsContext + IID_IDataSourceLocator, //riid + (void**)&dlPrompt //ppvObj ); if( FAILED( hr ) ) { @@ -161,7 +161,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) dlPrompt->Release( ); return connstr; } - + dlPrompt->put_hWnd(hWnd); if( FAILED( hr ) ) { @@ -171,7 +171,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) } VARIANT_BOOL pbSuccess; - + // Prompt for connection information. hr = dlPrompt->PromptEdit((IDispatch **)&piTmpConnection,&pbSuccess); if( SUCCEEDED( hr ) && FALSE == pbSuccess ) //if user press cancel then FALSE == pbSuccess @@ -181,7 +181,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) return connstr; } - if( FAILED( hr ) ) + if( FAILED( hr ) ) { // Prompt for new connection information. piTmpConnection->Release( ); diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index e5f299e7a7be..e7c08b3e1b6e 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 68b7d64abd8c..49bc28b34b4c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ class TableListFacade : public ::cppu::BaseMutex { OTableTreeListBox& m_rTableList; Reference< XConnection > m_xConnection; - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; bool m_bAllowViews; @@ -94,7 +94,7 @@ public: { } virtual ~TableListFacade(); - + private: virtual void updateTableObjectList( bool _bAllowViews ); @@ -133,8 +133,8 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const try { Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW ); - if ( !aCatalog.getLength() - && aSchema.getLength() + if ( !aCatalog.getLength() + && aSchema.getLength() && xMeta->supportsCatalogsInDataManipulation() && !xMeta->supportsSchemasInDataManipulation() ) { @@ -175,7 +175,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) try { Reference< XTablesSupplier > xTableSupp( m_xConnection, UNO_QUERY_THROW ); - + Reference< XViewsSupplier > xViewSupp; Reference< XNameAccess > xTables, xViews; Sequence< ::rtl::OUString > sTables, sViews; @@ -203,12 +203,12 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) // if no views are allowed remove the views also out the table name filter if ( !_bAllowViews ) { - const ::rtl::OUString* pTableBegin = sTables.getConstArray(); - const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength(); + const ::rtl::OUString* pTableBegin = sTables.getConstArray(); + const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength(); ::std::vector< ::rtl::OUString > aTables(pTableBegin,pTableEnd); const ::rtl::OUString* pViewBegin = sViews.getConstArray(); - const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength(); + const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength(); ::comphelper::TStringMixEqualFunctor aEqualFunctor; for(;pViewBegin != pViewEnd;++pViewBegin) aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end()); @@ -249,7 +249,7 @@ class QueryListFacade : public ::cppu::BaseMutex { SvTreeListBox& m_rQueryList; Reference< XConnection > m_xConnection; - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; public: @@ -513,7 +513,7 @@ BOOL OAddTableDlg::Close() //------------------------------------------------------------------------------ bool OAddTableDlg::impl_isAddAllowed() { - return m_rContext.allowAddition(); + return m_rContext.allowAddition(); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/dlg/adtabdlg.hrc b/dbaccess/source/ui/dlg/adtabdlg.hrc index 3c0e348abfaa..ce0a9ba4f227 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.hrc +++ b/dbaccess/source/ui/dlg/adtabdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,13 +28,13 @@ #define DBAUI_ADTABDLG_HRC #define LB_TABLE_OR_QUERY 1 -#define LB_DATABASE 2 +#define LB_DATABASE 2 -#define FT_DATABASE 1 +#define FT_DATABASE 1 -#define PB_ADDTABLE 1 -#define PB_CLOSE 2 -#define PB_HELP 3 +#define PB_ADDTABLE 1 +#define PB_CLOSE 2 +#define PB_HELP 3 #define RB_CASE_TABLES 1 #define RB_CASE_QUERIES 2 diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src index af1d861a0faa..69b202644a6c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.src +++ b/dbaccess/source/ui/dlg/adtabdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 66df4a24c74c..b42aa4843c66 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -447,7 +447,7 @@ namespace dbaui // auto-generated values? if ( rFeatures.supportsGeneratedValues() ) AddTabPage( PAGE_GENERATED_VALUES, String( ModuleRes( STR_GENERATED_VALUE ) ), ODriversSettings::CreateGeneratedValuesPage, NULL ); - + // any "special settings"? if ( rFeatures.supportsAnySpecialSetting() ) AddTabPage( PAGE_ADVANCED_SETTINGS_SPECIAL, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateSpecialSettingsPage, NULL ); @@ -532,7 +532,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const + ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.hrc b/dbaccess/source/ui/dlg/advancedsettings.hrc index 8abc5d8810d2..8a09c0adcf7a 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hrc +++ b/dbaccess/source/ui/dlg/advancedsettings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #define ADVANCED_CHECKBOX_OPTIONS 15 #define ADVANCED_LISTBOX_OPTIONS 1 -#define ADVANCED_PAGE_X 200 +#define ADVANCED_PAGE_X 200 #define ADVANCED_PAGE_Y \ /* top space */ START_Y + \ /* label */ FIXEDTEXT_HEIGHT + RELATED_CONTROLS + \ @@ -40,23 +40,23 @@ /* bottom space */ START_Y -#define STR_GENERATED_VALUE 1 -#define STR_DS_BEHAVIOUR 2 +#define STR_GENERATED_VALUE 1 +#define STR_DS_BEHAVIOUR 2 -#define FL_SEPARATORAUTO 1 -#define FL_DATAHANDLING 2 +#define FL_SEPARATORAUTO 1 +#define FL_DATAHANDLING 2 -#define CB_SUPPRESVERSIONCL 1 -#define CB_SQL92CHECK 2 -#define CB_RETRIEVE_AUTO 3 -#define CB_APPENDTABLEALIAS 4 +#define CB_SUPPRESVERSIONCL 1 +#define CB_SQL92CHECK 2 +#define CB_RETRIEVE_AUTO 3 +#define CB_APPENDTABLEALIAS 4 #define CB_IGNOREDRIVER_PRIV 5 -#define CB_PARAMETERNAMESUBST 6 -#define CB_ENABLEOUTERJOIN 7 -#define CB_SCHEMA 8 -#define CB_CATALOG 9 -#define CB_IGNOREINDEXAPPENDIX 10 -#define CB_DOSLINEENDS 11 +#define CB_PARAMETERNAMESUBST 6 +#define CB_ENABLEOUTERJOIN 7 +#define CB_SCHEMA 8 +#define CB_CATALOG 9 +#define CB_IGNOREINDEXAPPENDIX 10 +#define CB_DOSLINEENDS 11 #define CB_AS_BEFORE_CORR_NAME 12 #define CB_CHECK_REQUIRED 13 #define CB_IGNORECURRENCY 14 @@ -64,12 +64,12 @@ #define CB_PRIMARY_KEY_SUPPORT 16 #define ET_AUTOINCREMENTVALUE 1 -#define ET_RETRIEVE_AUTO 2 +#define ET_RETRIEVE_AUTO 2 -#define FT_AUTOINCREMENTVALUE 1 -#define FT_RETRIEVE_AUTO 2 -#define FT_BOOLEANCOMPARISON 3 +#define FT_AUTOINCREMENTVALUE 1 +#define FT_RETRIEVE_AUTO 2 +#define FT_BOOLEANCOMPARISON 3 -#define LB_BOOLEANCOMPARISON 1 +#define LB_BOOLEANCOMPARISON 1 #endif // DBAUI_ADVANCEDSETTINGS_HRC diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index f4c6e75e4f3f..b13043ca71b0 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ namespace dbaui CheckBox* m_pIndexAppendix; CheckBox* m_pDosLineEnds; CheckBox* m_pCheckRequiredFields; - CheckBox* m_pIgnoreCurrency; + CheckBox* m_pIgnoreCurrency; CheckBox* m_pEscapeDateTime; CheckBox* m_pPrimaryKeySupport; @@ -127,7 +127,7 @@ namespace dbaui GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: - + // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten virtual ~GeneratedValuesPage(); diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src index 4c5a7d924d33..a4eb47133f63 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.src +++ b/dbaccess/source/ui/dlg/advancedsettings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -174,14 +174,14 @@ }; //------------------------------------------------------------------------- -#define AUTO_IGNORECURRENCY(AUTO_Y) \ - CheckBox CB_IGNORECURRENCY \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ - Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ - TabStop = TRUE ; \ - HelpId = HID_DSADMIN_IGNORECURRENCY; \ - Text [ en-US ] = "Ignore currency field information"; \ +#define AUTO_IGNORECURRENCY(AUTO_Y) \ + CheckBox CB_IGNORECURRENCY \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_IGNORECURRENCY; \ + Text [ en-US ] = "Ignore currency field information"; \ }; //------------------------------------------------------------------------- @@ -227,7 +227,7 @@ < "SQL" ; Default ; > ; \ < "Mixed" ; Default ; > ; \ < "MS Access" ; Default ; > ; \ - }; + }; #define AUTO_BOOLEANCOMPARISON(AUTO_Y) \ @@ -337,30 +337,30 @@ TabPage PAGE_ADVANCED_SETTINGS_SPECIAL //------------------------------------------------------------------------- TabDialog DLG_DATABASE_ADVANCED -{ +{ OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; Hide = TRUE; HelpId = HID_DSADMIN_ADVANCED; - + TabControl 1 { OutputSize = TRUE ; HelpId = HID_DSADMIN_TABCONTROL; SingleLine=TRUE; }; - + String STR_GENERATED_VALUE { Text [ en-US ] = "Generated Values"; }; - + String STR_DS_BEHAVIOUR { Text [ en-US ] = "Special Settings"; }; - + Text [ en-US ] = "Advanced Properties" ; }; diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 028705d806ea..2783d030b347 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,7 +149,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD { case ::dbaccess::DST_DBASE: addDetailPage(PAGE_DBASE, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateDbase); - // bResetPasswordRequired = sal_True; + // bResetPasswordRequired = sal_True; break; case ::dbaccess::DST_ADO: @@ -158,7 +158,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD case ::dbaccess::DST_FLAT: addDetailPage(PAGE_TEXT, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateText); - // bResetPasswordRequired = sal_True; + // bResetPasswordRequired = sal_True; break; case ::dbaccess::DST_ODBC: @@ -188,7 +188,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD case ::dbaccess::DST_LDAP: addDetailPage(PAGE_LDAP,STR_PAGETITLE_ADVANCED,ODriversSettings::CreateLDAP); break; - case ::dbaccess::DST_USERDEFINE1: /// first user defined driver + case ::dbaccess::DST_USERDEFINE1: /// first user defined driver case ::dbaccess::DST_USERDEFINE2: case ::dbaccess::DST_USERDEFINE3: case ::dbaccess::DST_USERDEFINE4: @@ -228,7 +228,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou // are set. Select another data source of the same type, where the indirect props are not set (yet). Then, // the indirect property values of the first ds are shown in the second ds ...) const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties(); - for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); + for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); aIndirect != rMap.end(); ++aIndirect ) @@ -282,7 +282,7 @@ sal_Bool ODbAdminDialog::saveDatasource() ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges() { if (!PrepareLeaveCurrentPage()) - { // the page did not allow us to leave + { // the page did not allow us to leave return AR_KEEP; } @@ -331,7 +331,7 @@ Reference< XDriver > ODbAdminDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const +::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -351,7 +351,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp const ::rtl::OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); // create and initialize the defaults _rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1]; - SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults + SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults *pCounter++ = new SfxStringItem(DSID_NAME, String()); *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, String()); *pCounter++ = new SfxStringItem(DSID_CONNECTURL, String()); @@ -509,9 +509,9 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, _rppDefaults = NULL; // no need to explicitly delete the defaults, this has been done by the ReleaseDefaults } - + //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc index 88ed5aea8d47..d49537cfdab2 100644 --- a/dbaccess/source/ui/dlg/dbadmin.hrc +++ b/dbaccess/source/ui/dlg/dbadmin.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ #define CB_PASSWORD_REQUIRED 1 #define CB_SHOWDELETEDROWS 2 #define CB_USESSL 3 -#define CB_USECATALOG 4 +#define CB_USECATALOG 4 #define FL_SEPARATOR2 1 @@ -103,9 +103,9 @@ //======================================================================== // menu item ids -#define MID_NEW_DATASOURCE 1 -#define MID_DELETE_DATASOURCE 2 -#define MID_RESTORE_DATASOURCE 3 +#define MID_NEW_DATASOURCE 1 +#define MID_DELETE_DATASOURCE 2 +#define MID_RESTORE_DATASOURCE 3 #endif // _DBAUI_DBADMIN_HRC_ diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index c4457c62eec0..02389611a993 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,55 +48,55 @@ //------------------------------------------------------------------------- #define AUTO_USECATALOG(AUTO_Y) \ - CheckBox CB_USECATALOG \ - { \ - Pos = MAP_APPFONT ( 6 ,AUTO_Y) ; \ - Size = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ - TabStop = TRUE ; \ - HelpId = HID_DSADMIN_USECATALOG; \ - Text[ en-US ] = "Use catalog for file-based databases"; \ + CheckBox CB_USECATALOG \ + { \ + Pos = MAP_APPFONT ( 6 ,AUTO_Y) ; \ + Size = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_USECATALOG; \ + Text[ en-US ] = "Use catalog for file-based databases"; \ }; //------------------------------------------------------------------------- #define AUTO_FIXEDLINE_CONNSETTINGS(AUTO_Y) \ - FixedLine FL_SEPARATOR1 \ - { \ - Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \ - Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = "Connection Settings"; \ - }; \ - -#define AUTO_HOST_AND_PORT(AUTO_Y) \ - FixedText FT_HOSTNAME \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y + 2 ) ; \ - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = "~Host name"; \ - }; \ - Edit ET_HOSTNAME \ - { \ - TabStop = TRUE ; \ - Border = TRUE ; \ - HelpId = HID_DSADMIN_HOSTNAME; \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ; \ - Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ - }; \ + FixedLine FL_SEPARATOR1 \ + { \ + Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = "Connection Settings"; \ + }; \ + +#define AUTO_HOST_AND_PORT(AUTO_Y) \ + FixedText FT_HOSTNAME \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y + 2 ) ; \ + Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = "~Host name"; \ + }; \ + Edit ET_HOSTNAME \ + { \ + TabStop = TRUE ; \ + Border = TRUE ; \ + HelpId = HID_DSADMIN_HOSTNAME; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ; \ + Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ + }; \ \ - FixedText FT_PORTNUMBER \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ; \ - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = "~Port number"; \ - }; \ - NumericField NF_PORTNUMBER \ - { \ - TabStop = TRUE ; \ - Border = TRUE ; \ - HelpId = HID_DSADMIN_PORTNUMBER; \ + FixedText FT_PORTNUMBER \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ; \ + Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = "~Port number"; \ + }; \ + NumericField NF_PORTNUMBER \ + { \ + TabStop = TRUE ; \ + Border = TRUE ; \ + HelpId = HID_DSADMIN_PORTNUMBER; \ NoThousandSep = TRUE; \ Pos = MAP_APPFONT ( EDIT_X , AUTO_Y +UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT ) ; \ - Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ + Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ }; //------------------------------------------------------------------------- @@ -393,7 +393,7 @@ TabPage PAGE_ODBC HelpId = HID_DSADMIN_ODBC_OPTIONS; }; - AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) + AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) }; TabPage PAGE_ADABAS @@ -434,11 +434,11 @@ TabPage PAGE_ADABAS }; NumericField NF_CACHE_SIZE { - Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ; - Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ; + Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; SpinSize = 1; StrictFormat = TRUE; }; @@ -451,11 +451,11 @@ TabPage PAGE_ADABAS }; NumericField NF_DATA_INCREMENT { - Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; - Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; + Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; SpinSize = 1; StrictFormat = TRUE; }; @@ -502,8 +502,8 @@ TabPage PAGE_ADABAS PushButton PB_STAT { - Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ; - Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; + Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ; + Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text[ en-US ] = "E~xtended..."; }; @@ -511,9 +511,9 @@ TabPage PAGE_ADABAS }; //......................................................................... -#define MYSQL_YDIST 53 -#define MYSQL_FL_Y 8 -#define MYSQL_DRIVERCLASS_Y 8 +#define MYSQL_YDIST 53 +#define MYSQL_FL_Y 8 +#define MYSQL_DRIVERCLASS_Y 8 TabPage PAGE_MYSQL_ODBC { diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src index 50b796541872..2a7c0abb178a 100644 --- a/dbaccess/source/ui/dlg/dbadmin2.src +++ b/dbaccess/source/ui/dlg/dbadmin2.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,10 +102,10 @@ String STR_HINT_CONNECTION_NOT_CAPABLE Text [ en-US ] = "(Not supported by this connection)"; }; -#define EDIT_SIZE_X 50 -#define FT_SIZE_X 90 -#define WIN_X 220 -#define WIN_Y 72 +#define EDIT_SIZE_X 50 +#define FT_SIZE_X 90 +#define WIN_X 220 +#define WIN_Y 72 ModalDialog DLG_DOMAINPASSWORD { @@ -145,7 +145,7 @@ ModalDialog DLG_DOMAINPASSWORD { Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; - }; + }; }; #define PAGE_X_T (PAGE_X -80) @@ -158,7 +158,7 @@ TabPage PAGE_TABLESUBSCRIPTION Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( PAGE_X_T, PAGE_Y_T) ; HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION; - + Text [ en-US ] = "Tables Filter" ; FixedLine FL_SEPARATOR1 @@ -169,17 +169,17 @@ TabPage PAGE_TABLESUBSCRIPTION }; Control CTL_TABLESUBSCRIPTION { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ; - Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ; - Group = TRUE; - Border = TRUE ; + Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ; + Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ; + Group = TRUE; + Border = TRUE ; TabStop = TRUE ; HelpId = HID_DSADMIN_TABLE_SELECTOR; }; FixedText FT_FILTER_EXPLANATION { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 2*UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + 81 ) ; - Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ; + Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ; HelpId = HID_DSADMIN_FILTER_EXPLANATION; WordBreak = TRUE; Text [ en-US ] = "Mark the tables that should be visible for the applications."; diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc index 7d6757951089..282557af2485 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.hrc +++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,45 +40,45 @@ #endif -#define STR_DBASE_HELPTEXT 28 -#define STR_MSACCESS_HELPTEXT 29 -#define STR_TEXT_HELPTEXT 30 +#define STR_DBASE_HELPTEXT 28 +#define STR_MSACCESS_HELPTEXT 29 +#define STR_TEXT_HELPTEXT 30 // FREE -#define STR_ADO_HELPTEXT 32 -#define STR_JDBC_HELPTEXT 33 -#define STR_ODBC_HELPTEXT 34 -#define STR_MYSQLJDBC_HELPTEXT 35 -#define STR_SPREADSHEET_HELPTEXT 36 +#define STR_ADO_HELPTEXT 32 +#define STR_JDBC_HELPTEXT 33 +#define STR_ODBC_HELPTEXT 34 +#define STR_MYSQLJDBC_HELPTEXT 35 +#define STR_SPREADSHEET_HELPTEXT 36 // FREE -#define STR_FINAL_HELPTEXT 38 -#define STR_ADABAS_HELPTEXT 39 -#define STR_ORACLE_HELPTEXT 40 -#define STR_DBASE_HEADERTEXT 41 -#define STR_MSACCESS_HEADERTEXT 42 -#define STR_TEXT_HEADERTEXT 43 +#define STR_FINAL_HELPTEXT 38 +#define STR_ADABAS_HELPTEXT 39 +#define STR_ORACLE_HELPTEXT 40 +#define STR_DBASE_HEADERTEXT 41 +#define STR_MSACCESS_HEADERTEXT 42 +#define STR_TEXT_HEADERTEXT 43 // FREE -#define STR_ADO_HEADERTEXT 45 -#define STR_JDBC_HEADERTEXT 46 -#define STR_ODBC_HEADERTEXT 47 +#define STR_ADO_HEADERTEXT 45 +#define STR_JDBC_HEADERTEXT 46 +#define STR_ODBC_HEADERTEXT 47 #define STR_MYSQLJDBC_HEADERTEXT 48 // FREE -#define STR_SPREADSHEET_HEADERTEXT 50 -#define STR_FINAL_HEADERTEXT 52 -#define STR_ADABAS_HEADERTEXT 53 -#define STR_ORACLE_HEADERTEXT 54 +#define STR_SPREADSHEET_HEADERTEXT 50 +#define STR_FINAL_HEADERTEXT 52 +#define STR_ADABAS_HEADERTEXT 53 +#define STR_ORACLE_HEADERTEXT 54 #define STR_GENERAL_HEADERTEXT 55 #define STR_DBWIZARDTITLE 56 -#define STR_DEFAULTLDAPPORTNUMBER 60 +#define STR_DEFAULTLDAPPORTNUMBER 60 -#define STR_ADABASNAME 61 -#define STR_ODBCDATASOURCENAME 63 -#define STR_SPREADSHEETPATH 64 -#define STR_DBLOCATIONLABEL 65 -#define STR_ADMIN_HELPTEXT 66 +#define STR_ADABASNAME 61 +#define STR_ODBCDATASOURCENAME 63 +#define STR_SPREADSHEETPATH 64 +#define STR_DBLOCATIONLABEL 65 +#define STR_ADMIN_HELPTEXT 66 #define STR_ORACLE_DEFAULT 67 -#define STR_PAGETITLE_INTROPAGE 69 +#define STR_PAGETITLE_INTROPAGE 69 #define STR_PAGETITLE_DBASE 70 #define STR_PAGETITLE_TEXT 71 #define STR_PAGETITLE_MSACCESS 72 @@ -100,15 +100,15 @@ #define FT_PORTNUMBERDEFAULT 1 -#define FT_LDAP_HELPTEXT 2 -#define FT_MYSQL_HELPTEXT 3 -#define FT_MYSQL_HEADERTEXT 4 -#define FT_MYSQLCONNECTIONMODE 5 -#define FT_BROWSEURL 6 -#define FT_AUTHENTIFICATIONHELPTEXT 7 +#define FT_LDAP_HELPTEXT 2 +#define FT_MYSQL_HELPTEXT 3 +#define FT_MYSQL_HEADERTEXT 4 +#define FT_MYSQLCONNECTIONMODE 5 +#define FT_BROWSEURL 6 +#define FT_AUTHENTIFICATIONHELPTEXT 7 #define FT_AUTHENTIFICATIONHEADERTEXT 8 -#define FT_LDAP_HEADERTEXT 9 -#define FT_GENERALUSERNAME 10 +#define FT_LDAP_HEADERTEXT 9 +#define FT_GENERALUSERNAME 10 #define FT_FINALHEADER 11 #define FT_FINALTEXT 12 #define FT_FINALHELPTEXT 13 @@ -116,19 +116,19 @@ #define FT_SETUP_WIZARD_HEADER 15 #define FT_SETUP_WIZARD_HELP 16 -#define ET_GENERALUSERNAME 1 +#define ET_GENERALUSERNAME 1 -#define PB_TESTCONNECTION 1 +#define PB_TESTCONNECTION 1 -#define RB_CONNECTVIAODBC 1 -#define RB_CONNECTVIAJDBC 2 +#define RB_CONNECTVIAODBC 1 +#define RB_CONNECTVIAJDBC 2 #define RB_REGISTERDATASOURCE 3 #define RB_DONTREGISTERDATASOURCE 4 #define RB_CONNECTVIANATIVE 5 #define CB_WIZ_USESSL 1 -#define CB_STARTTABLEWIZARD 2 -#define CB_OPENAFTERWARDS 3 +#define CB_STARTTABLEWIZARD 2 +#define CB_OPENAFTERWARDS 3 #define CB_SPREADSHEETPASSWORDREQUIRED 4 #define CB_GENERALPASSWORDREQUIRED 5 diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index 7b0dbe011342..00fa1b3cd3e5 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,12 +34,12 @@ #endif -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define EDIT_X 101 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define EDIT_X 101 // ----------------------------------------------------------------------------- @@ -214,7 +214,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; Hide = TRUE ; - FixedText FT_AUTHENTIFICATIONHEADERTEXT + FixedText FT_AUTHENTIFICATIONHEADERTEXT { Pos = MAP_APPFONT ( START_X , 8 ) ; Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ; @@ -387,7 +387,7 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE Text[ en-US ] = "Set up connection to a MySQL database" ; WordBreak = TRUE; }; - + FixedText FT_SETUP_WIZARD_HELP { Pos = MAP_APPFONT ( START_X , INIT_Y ) ; @@ -492,9 +492,9 @@ TabPage PAGE_DBWIZARD_LDAP Text[ en-US ] = "Please enter the required information to connect to an LDAP directory.\nPlease contact your system administrator if you are unsure about the following settings." ; WordBreak = TRUE ; }; - AUTO_HOSTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER) - AUTO_BASEDNCONTROLGROUP(INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + EDIT_HEIGHT + RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_BASEDN) - AUTO_PORTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 2 * EDIT_HEIGHT + 2 * RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER) + AUTO_HOSTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER) + AUTO_BASEDNCONTROLGROUP(INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + EDIT_HEIGHT + RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_BASEDN) + AUTO_PORTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 2 * EDIT_HEIGHT + 2 * RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER) String STR_LDAP_DEFAULT{ Text[ en-US ] = "Default: 389" ; @@ -503,7 +503,7 @@ TabPage PAGE_DBWIZARD_LDAP CheckBox CB_WIZ_USESSL { HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ; - Pos = MAP_APPFONT (START_X , INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 3 * EDIT_HEIGHT + 4 * RELATED_CONTROLS ) ; + Pos = MAP_APPFONT (START_X , INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 3 * EDIT_HEIGHT + 4 * RELATED_CONTROLS ) ; Size = MAP_APPFONT ( 212 , 8 ) ; Text[ en-US ] = "Use ~secure connection (SSL)" ; }; diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 809ccddc27eb..23aff6374ead 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,16 +61,16 @@ DBG_NAME(ODbaseIndexDialog) //------------------------------------------------------------------------- ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName ) : ModalDialog( pParent, ModuleRes(DLG_DBASE_INDEXES) ), - aPB_OK( this, ModuleRes( PB_OK ) ), - aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ), - aPB_HELP( this, ModuleRes( PB_HELP ) ), - m_FT_Tables( this, ModuleRes( FT_TABLES ) ), - aCB_Tables( this, ModuleRes( CB_TABLES ) ), + aPB_OK( this, ModuleRes( PB_OK ) ), + aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ), + aPB_HELP( this, ModuleRes( PB_HELP ) ), + m_FT_Tables( this, ModuleRes( FT_TABLES ) ), + aCB_Tables( this, ModuleRes( CB_TABLES ) ), m_FL_Indexes( this, ModuleRes( FL_INDEXES ) ), - m_FT_TableIndexes( this, ModuleRes( FT_TABLEINDEXES ) ), - aLB_TableIndexes( this, ModuleRes( LB_TABLEINDEXES ) ), - m_FT_AllIndexes( this, ModuleRes( FT_ALLINDEXES ) ), - aLB_FreeIndexes( this, ModuleRes( LB_FREEINDEXES ) ), + m_FT_TableIndexes( this, ModuleRes( FT_TABLEINDEXES ) ), + aLB_TableIndexes( this, ModuleRes( LB_TABLEINDEXES ) ), + m_FT_AllIndexes( this, ModuleRes( FT_ALLINDEXES ) ), + aLB_FreeIndexes( this, ModuleRes( LB_FREEINDEXES ) ), aIB_Add( this, ModuleRes( IB_ADD ) ), aIB_Remove( this, ModuleRes( IB_REMOVE ) ), aIB_AddAll( this, ModuleRes( IB_ADDALL ) ), @@ -96,10 +96,10 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName ) FreeResource(); // set Hi contrast bitmaps - aIB_Add.SetModeImage( ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST); - aIB_AddAll.SetModeImage( ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST); - aIB_Remove.SetModeImage( ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST); - aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST); + aIB_Add.SetModeImage( ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST); + aIB_AddAll.SetModeImage( ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST); + aIB_Remove.SetModeImage( ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST); + aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST); } //------------------------------------------------------------------------- @@ -112,7 +112,7 @@ ODbaseIndexDialog::~ODbaseIndexDialog() //------------------------------------------------------------------------- sal_Bool ODbaseIndexDialog::GetTable(const String& _rName, TableInfoListIterator& _rPosition) { - for ( _rPosition = m_aTableInfoList.begin(); + for ( _rPosition = m_aTableInfoList.begin(); _rPosition != m_aTableInfoList.end(); ++_rPosition ) @@ -149,7 +149,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const String& _rName, TableIndexL sal_Int32 nPos = 0; TableIndexListIterator aSearch; - for ( aSearch = _rList.begin(); + for ( aSearch = _rList.begin(); aSearch != _rList.end(); ++aSearch, ++nPos ) @@ -212,7 +212,7 @@ IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ ) { // let all tables write their INF file - for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); + for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); aLoop != m_aTableInfoList.end(); ++aLoop ) @@ -291,7 +291,7 @@ IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox ) // fill the listbox for the indexes aLB_TableIndexes.Clear(); - for ( ConstTableIndexListIterator aLoop = aTablePos->aIndexList.begin(); + for ( ConstTableIndexListIterator aLoop = aTablePos->aIndexList.begin(); aLoop != aTablePos->aIndexList.end(); ++aLoop ) @@ -335,7 +335,7 @@ void ODbaseIndexDialog::Init() aURL.SetSmartURL(m_aDSN); - // String aFileName = aURL.PathToFileName(); + // String aFileName = aURL.PathToFileName(); m_aDSN = aURL.GetMainURL(INetURLObject::NO_DECODE); ::ucbhelper::Content aFile; sal_Bool bFolder=sal_True; @@ -413,7 +413,7 @@ void ODbaseIndexDialog::Init() } } - for ( ::std::vector< String >::const_iterator aUsedIndex = aUsedIndexes.begin(); + for ( ::std::vector< String >::const_iterator aUsedIndex = aUsedIndexes.begin(); aUsedIndex != aUsedIndexes.end(); ++aUsedIndex ) @@ -436,7 +436,7 @@ void ODbaseIndexDialog::Init() void ODbaseIndexDialog::SetCtrls() { // ComboBox Tabellen - for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); + for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); aLoop != m_aTableInfoList.end(); ++aLoop ) @@ -449,7 +449,7 @@ void ODbaseIndexDialog::SetCtrls() aCB_Tables.SetText( rTabInfo.aTableName ); // ListBox der Tabellenindizes aufbauen - for ( ConstTableIndexListIterator aIndex = rTabInfo.aIndexList.begin(); + for ( ConstTableIndexListIterator aIndex = rTabInfo.aIndexList.begin(); aIndex != rTabInfo.aIndexList.end(); ++aIndex ) @@ -461,7 +461,7 @@ void ODbaseIndexDialog::SetCtrls() } // ListBox freie Indizes - for ( ConstTableIndexListIterator aFree = m_aFreeIndexList.begin(); + for ( ConstTableIndexListIterator aFree = m_aFreeIndexList.begin(); aFree != m_aFreeIndexList.end(); ++aFree ) @@ -522,13 +522,13 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const // Jetzt alle gespeicherten Indizes hinzufuegen sal_uInt16 nPos = 0; - for ( ConstTableIndexListIterator aIndex = aIndexList.begin(); + for ( ConstTableIndexListIterator aIndex = aIndexList.begin(); aIndex != aIndexList.end(); ++aIndex, ++nPos ) { aKeyName = "NDX"; - if( nPos > 0 ) // Erster Index erhaelt keine Ziffer + if( nPos > 0 ) // Erster Index erhaelt keine Ziffer aKeyName += ByteString::CreateFromInt32( nPos ); aInfFile.WriteKey( aKeyName, ByteString(aIndex->GetIndexFileName(), gsl_getSystemTextEncoding()) ); } @@ -555,7 +555,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbfindex.hrc b/dbaccess/source/ui/dlg/dbfindex.hrc index 0d67da065568..988cedbe2a3b 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hrc +++ b/dbaccess/source/ui/dlg/dbfindex.hrc @@ -1,20 +1,20 @@ #ifndef _DBAUI_DBF_INDEXES_HRC_ #define _DBAUI_DBF_INDEXES_HRC_ -#define CB_TABLES 1 +#define CB_TABLES 1 -#define FT_TABLES 1 -#define FT_TABLEINDEXES 2 -#define FT_ALLINDEXES 3 +#define FT_TABLES 1 +#define FT_TABLEINDEXES 2 +#define FT_ALLINDEXES 3 #define FL_INDEXES 1 -#define LB_TABLEINDEXES 1 -#define LB_FREEINDEXES 2 +#define LB_TABLEINDEXES 1 +#define LB_FREEINDEXES 2 -#define PB_OK 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define PB_OK 1 +#define PB_CANCEL 1 +#define PB_HELP 1 #define IB_ADD 1 #define IB_REMOVE 2 diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 59b1f0f66f1e..58318800591d 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public: }; //------------------------------------------------------------------------- -typedef ::std::list< OTableIndex > TableIndexList; +typedef ::std::list< OTableIndex > TableIndexList; DECLARE_STL_ITERATORS(TableIndexList); //========================================================================= @@ -87,7 +87,7 @@ public: }; //------------------------------------------------------------------------- -typedef ::std::list< OTableInfo > TableInfoList; +typedef ::std::list< OTableInfo > TableInfoList; DECLARE_STL_ITERATORS(TableInfoList); ////////////////////////////////////////////////////////////////////////// @@ -95,20 +95,20 @@ DECLARE_STL_ITERATORS(TableInfoList); class ODbaseIndexDialog : public ModalDialog { protected: - OKButton aPB_OK; - CancelButton aPB_CANCEL; - HelpButton aPB_HELP; + OKButton aPB_OK; + CancelButton aPB_CANCEL; + HelpButton aPB_HELP; - FixedText m_FT_Tables; - ComboBox aCB_Tables; + FixedText m_FT_Tables; + ComboBox aCB_Tables; FixedLine m_FL_Indexes; - FixedText m_FT_TableIndexes; - ListBox aLB_TableIndexes; + FixedText m_FT_TableIndexes; + ListBox aLB_TableIndexes; - FixedText m_FT_AllIndexes; - ListBox aLB_FreeIndexes; + FixedText m_FT_AllIndexes; + ListBox aLB_FreeIndexes; ImageButton aIB_Add; ImageButton aIB_Remove; @@ -123,22 +123,22 @@ protected: DECL_LINK( OKClickHdl, PushButton* ); DECL_LINK( OnListEntrySelected, ListBox* ); - String m_aDSN; - TableInfoList m_aTableInfoList; - TableIndexList m_aFreeIndexList; - BOOL m_bCaseSensitiv; + String m_aDSN; + TableInfoList m_aTableInfoList; + TableIndexList m_aFreeIndexList; + BOOL m_bCaseSensitiv; - void Init(); - void SetCtrls(); - sal_Bool GetTable(const String& rName, TableInfoListIterator& _rPosition); + void Init(); + void SetCtrls(); + sal_Bool GetTable(const String& rName, TableInfoListIterator& _rPosition); - OTableIndex implRemoveIndex(const String& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist); - void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay); + OTableIndex implRemoveIndex(const String& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist); + void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay); - OTableIndex RemoveFreeIndex( const String& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, aLB_FreeIndexes, _bMustExist); } - void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, aLB_FreeIndexes); } - OTableIndex RemoveTableIndex( const String& _rTableName, const String& _rIndexName, sal_Bool _bMustExist ); - void InsertTableIndex( const String& _rTableName, const OTableIndex& _rIndex ); + OTableIndex RemoveFreeIndex( const String& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, aLB_FreeIndexes, _bMustExist); } + void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, aLB_FreeIndexes); } + OTableIndex RemoveTableIndex( const String& _rTableName, const String& _rIndexName, sal_Bool _bMustExist ); + void InsertTableIndex( const String& _rTableName, const OTableIndex& _rIndex ); void checkButtons(); @@ -148,7 +148,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DBFINDEX_HXX_ diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src index ad401102601d..8f6ef6e49697 100644 --- a/dbaccess/source/ui/dlg/dbfindex.src +++ b/dbaccess/source/ui/dlg/dbfindex.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -170,7 +170,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94 , 60 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -189,7 +189,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94 , 77 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -208,7 +208,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94 , 98 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -227,7 +227,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94, 114 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index cac6a8499601..1355a6556cab 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,14 +62,14 @@ using namespace com::sun::star::util; using namespace com::sun::star::beans; using namespace com::sun::star::container; -#define START_PAGE 0 -#define CONNECTION_PAGE 1 -#define ADDITIONAL_PAGE_DBASE 2 +#define START_PAGE 0 +#define CONNECTION_PAGE 1 +#define ADDITIONAL_PAGE_DBASE 2 #define ADDITIONAL_PAGE_FLAT 3 #define ADDITIONAL_PAGE_LDAP 4 #define ADDITIONAL_PAGE_ADABAS 5 #define ADDITIONAL_PAGE_MYSQL_JDBC 6 -#define ADDITIONAL_PAGE_MYSQL_ODBC 7 +#define ADDITIONAL_PAGE_MYSQL_ODBC 7 #define ADDITIONAL_PAGE_ORACLE_JDBC 8 #define ADDITIONAL_PAGE_ADO 9 #define ADDITIONAL_PAGE_ODBC 10 @@ -93,7 +93,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent ,m_bApplied(sal_False) ,m_bUIEnabled( sal_True ) { - DBG_CTOR(ODbTypeWizDialog,NULL); + DBG_CTOR(ODbTypeWizDialog,NULL); m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); @@ -125,8 +125,8 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent //------------------------------------------------------------------------- ODbTypeWizDialog::~ODbTypeWizDialog() { - DBG_DTOR(ODbTypeWizDialog,NULL); - delete m_pOutSet; + DBG_DTOR(ODbTypeWizDialog,NULL); + delete m_pOutSet; } //------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage) @@ -245,7 +245,7 @@ Reference< XDriver > ODbTypeWizDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const +::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -316,7 +316,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) // register ourself as modified listener if ( pPage ) - { + { static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory(m_pImpl->getORB()); static_cast<OGenericAdministrationPage*>(pPage)->SetAdminDialog(this,this); // open our own resource block, as the page titles are strings local to this block @@ -380,7 +380,7 @@ sal_Bool ODbTypeWizDialog::onFinish() return m_pImpl->saveChanges(*m_pOutSet) ? OWizardMachine::onFinish() : sal_False; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index aea15cf0fb8a..56bd08565ac4 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,8 +120,8 @@ using namespace ::com::sun::star::document; using namespace ::comphelper; using namespace ::cppu; -#define START_PAGE 0 -#define CONNECTION_PAGE 1 +#define START_PAGE 0 +#define CONNECTION_PAGE 1 OFinalDBPageSetup* pFinalPage; @@ -181,7 +181,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ); m_pImpl->translateProperties(xDatasource, *m_pOutSet); -// eType = m_pImpl->getDatasourceType(*m_pOutSet); +// eType = m_pImpl->getDatasourceType(*m_pOutSet); SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT)); ShowButtonFixedLine(sal_True); @@ -430,7 +430,7 @@ void ODbTypeWizDialogSetup::resetPages(const Reference< XPropertySet >& _rxDatas // are set. Select another data source of the same type, where the indirect props are not set (yet). Then, // the indirect property values of the first ds are shown in the second ds ...) const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties(); - for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); + for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); aIndirect != rMap.end(); ++aIndirect ) @@ -490,7 +490,7 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const +::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const { ::rtl::OUString sRet = m_pImpl->getDatasourceType(_rSet); if (m_pMySQLIntroPage != NULL && m_pMySQLIntroPage->IsVisible() ) @@ -576,11 +576,11 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) pPage = OConnectionTabPageSetup::CreateAdabasTabPage( this, *m_pOutSet); break; - case PAGE_DBSETUPWIZARD_LDAP : + case PAGE_DBSETUPWIZARD_LDAP : pPage = OLDAPConnectionPageSetup::CreateLDAPTabPage(this,*m_pOutSet); break; - case PAGE_DBSETUPWIZARD_SPREADSHEET: /// first user defined driver + case PAGE_DBSETUPWIZARD_SPREADSHEET: /// first user defined driver pPage = OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage(this,*m_pOutSet); break; @@ -1135,7 +1135,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index fb3a27decc66..6e53e81d0c77 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ namespace dbaui m_pCharset->SetSelectHdl(getControlModifiedLink()); } - Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine, + Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine, m_pAutoIncrementLabel, m_pAutoIncrement, m_pAutoRetrievingLabel, m_pAutoRetrieving }; @@ -231,10 +231,10 @@ namespace dbaui //------------------------------------------------------------------------ ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS)) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aFT_Message (this, ModuleRes( FT_SPECIAL_MESSAGE) ) - ,m_aIndexes (this, ModuleRes(PB_INDICIES)) + ,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_aFT_Message (this, ModuleRes( FT_SPECIAL_MESSAGE) ) + ,m_aIndexes (this, ModuleRes(PB_INDICIES)) { DBG_CTOR(ODbaseDetailsPage,NULL); @@ -255,7 +255,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new ODbaseDetailsPage( pParent, _rAttrSet ) ); } @@ -346,7 +346,7 @@ namespace dbaui DBG_DTOR(OAdoDetailsPage,NULL); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAdoDetailsPage( pParent, _rAttrSet ) ); } @@ -357,8 +357,8 @@ namespace dbaui //======================================================================== OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS,false) - ,m_aFL_1 (this, ModuleRes(FL_SEPARATOR1)) - ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) + ,m_aFL_1 (this, ModuleRes(FL_SEPARATOR1)) + ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) { m_aUseCatalog.SetToggleHdl(getControlModifiedLink()); FreeResource(); @@ -373,7 +373,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OOdbcDetailsPage( pParent, _rAttrSet ) ); } @@ -417,18 +417,18 @@ namespace dbaui OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_USERDRIVER, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS ,false) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) + ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) + ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) + ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) { m_aUseCatalog.SetToggleHdl(getControlModifiedLink()); FreeResource(); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) ); } @@ -492,7 +492,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OMySQLODBCDetailsPage( pParent, _rAttrSet ) ); } @@ -502,16 +502,16 @@ namespace dbaui //======================================================================== OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId) :OCommonBehaviourTabPage(pParent, _nResId, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aFTSocket (this, ModuleRes(FT_SOCKET)) - ,m_aEDSocket (this, ModuleRes(ET_SOCKET)) - ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS)) - ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS)) - ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) + ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) + ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aFTSocket (this, ModuleRes(FT_SOCKET)) + ,m_aEDSocket (this, ModuleRes(ET_SOCKET)) + ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS)) + ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS)) + ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS)) ,m_nPortId(_nPortId) ,m_bUseClass(true) { @@ -538,7 +538,7 @@ namespace dbaui m_aFTSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); m_aEDSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); - + m_aEDHostname.SetModifyHdl(getControlModifiedLink()); m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); m_aEDSocket.SetModifyHdl(getControlModifiedLink()); @@ -750,18 +750,18 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_MYSQL_JDBC, _rAttrSet,DSID_MYSQL_PORTNUMBER ) ); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new MySQLNativePage( pParent, _rAttrSet ) ); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_ORACLE_JDBC, _rAttrSet,DSID_ORACLE_PORTNUMBER) ); } @@ -772,35 +772,35 @@ namespace dbaui //======================================================================== OAdabasDetailsPage::OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_ADABAS, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_FT_CACHE_SIZE( this, ModuleRes( FT_CACHE_SIZE ) ) - ,m_NF_CACHE_SIZE( this, ModuleRes( NF_CACHE_SIZE ) ) - ,m_FT_DATA_INCREMENT( this, ModuleRes( FT_DATA_INCREMENT ) ) - ,m_NF_DATA_INCREMENT( this, ModuleRes( NF_DATA_INCREMENT ) ) - ,m_aFL_2( this, ModuleRes( FL_SEPARATOR2 ) ) - ,m_FT_CTRLUSERNAME( this, ModuleRes( FT_CTRLUSERNAME ) ) - ,m_ET_CTRLUSERNAME( this, ModuleRes( ET_CTRLUSERNAME ) ) - ,m_FT_CTRLPASSWORD( this, ModuleRes( FT_CTRLPASSWORD ) ) - ,m_ET_CTRLPASSWORD( this, ModuleRes( ET_CTRLPASSWORD ) ) - ,m_CB_SHUTDB( this, ModuleRes( CB_SHUTDB ) ) - ,m_PB_STAT( this, ModuleRes( PB_STAT ) ) + ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) + ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_FT_CACHE_SIZE( this, ModuleRes( FT_CACHE_SIZE ) ) + ,m_NF_CACHE_SIZE( this, ModuleRes( NF_CACHE_SIZE ) ) + ,m_FT_DATA_INCREMENT( this, ModuleRes( FT_DATA_INCREMENT ) ) + ,m_NF_DATA_INCREMENT( this, ModuleRes( NF_DATA_INCREMENT ) ) + ,m_aFL_2( this, ModuleRes( FL_SEPARATOR2 ) ) + ,m_FT_CTRLUSERNAME( this, ModuleRes( FT_CTRLUSERNAME ) ) + ,m_ET_CTRLUSERNAME( this, ModuleRes( ET_CTRLUSERNAME ) ) + ,m_FT_CTRLPASSWORD( this, ModuleRes( FT_CTRLPASSWORD ) ) + ,m_ET_CTRLPASSWORD( this, ModuleRes( ET_CTRLPASSWORD ) ) + ,m_CB_SHUTDB( this, ModuleRes( CB_SHUTDB ) ) + ,m_PB_STAT( this, ModuleRes( PB_STAT ) ) { m_aEDHostname.SetModifyHdl(getControlModifiedLink()); FreeResource(); - m_PB_STAT.SetClickHdl( LINK(this,OAdabasDetailsPage,PBClickHdl)); + m_PB_STAT.SetClickHdl( LINK(this,OAdabasDetailsPage,PBClickHdl)); - m_CB_SHUTDB.SetClickHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_NF_DATA_INCREMENT.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLUSERNAME.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLPASSWORD.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_CB_SHUTDB.SetClickHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_NF_DATA_INCREMENT.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_ET_CTRLUSERNAME.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_ET_CTRLPASSWORD.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLUSERNAME.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); - m_ET_CTRLPASSWORD.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); + m_ET_CTRLUSERNAME.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); + m_ET_CTRLPASSWORD.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); m_NF_DATA_INCREMENT.SetMin(20); m_NF_DATA_INCREMENT.SetMax(LONG_MAX); @@ -826,7 +826,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateAdabas( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateAdabas( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAdabasDetailsPage( pParent, _rAttrSet ) ); } @@ -941,14 +941,14 @@ namespace dbaui //======================================================================== OLDAPDetailsPage::OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_LDAP, _rCoreAttrs,0,false) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aBaseDN (this, ModuleRes(FT_BASEDN)) - ,m_aETBaseDN (this, ModuleRes(ET_BASEDN)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_aBaseDN (this, ModuleRes(FT_BASEDN)) + ,m_aETBaseDN (this, ModuleRes(ET_BASEDN)) ,m_aCBUseSSL (this, ModuleRes(CB_USESSL)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aFTRowCount (this, ModuleRes(FT_LDAPROWCOUNT)) - ,m_aNFRowCount (this, ModuleRes(NF_LDAPROWCOUNT)) + ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aFTRowCount (this, ModuleRes(FT_LDAPROWCOUNT)) + ,m_aNFRowCount (this, ModuleRes(NF_LDAPROWCOUNT)) { m_aETBaseDN.SetModifyHdl(getControlModifiedLink()); m_aCBUseSSL.SetToggleHdl(getControlModifiedLink()); @@ -963,7 +963,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPDetailsPage( pParent, _rAttrSet ) ); } @@ -1065,7 +1065,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OTextDetailsPage( pParent, _rAttrSet ) ); } @@ -1109,20 +1109,20 @@ namespace dbaui } //------------------------------------------------------------------------ - SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ) { return new GeneratedValuesPage( _pParent, _rAttrSet ); } //------------------------------------------------------------------------ - SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) { ::rtl::OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( _rAttrSet ); DataSourceMetaData aMetaData( eType ); - return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData ); + return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData ); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 2d304430e865..f2a4cfbc5542 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ namespace dbaui //========================================================================= //= OCommonBehaviourTabPage //========================================================================= - #define CBTP_NONE 0x00000000 - #define CBTP_USE_CHARSET 0x00000002 - #define CBTP_USE_OPTIONS 0x00000004 + #define CBTP_NONE 0x00000000 + #define CBTP_USE_CHARSET 0x00000002 + #define CBTP_USE_OPTIONS 0x00000004 /** eases the implementation of tab pages handling user/password and/or character set and/or generic options input @@ -64,33 +64,33 @@ namespace dbaui { protected: - FixedText* m_pOptionsLabel; - Edit* m_pOptions; + FixedText* m_pOptionsLabel; + Edit* m_pOptions; - FixedLine* m_pDataConvertFixedLine; - FixedText* m_pCharsetLabel; + FixedLine* m_pDataConvertFixedLine; + FixedText* m_pCharsetLabel; CharSetListBox* m_pCharset; - FixedLine* m_pAutoFixedLine; - CheckBox* m_pAutoRetrievingEnabled; - FixedText* m_pAutoIncrementLabel; - Edit* m_pAutoIncrement; - FixedText* m_pAutoRetrievingLabel; - Edit* m_pAutoRetrieving; + FixedLine* m_pAutoFixedLine; + CheckBox* m_pAutoRetrievingEnabled; + FixedText* m_pAutoIncrementLabel; + Edit* m_pAutoIncrement; + FixedText* m_pAutoRetrievingLabel; + Edit* m_pAutoRetrieving; - sal_uInt32 m_nControlFlags; + sal_uInt32 m_nControlFlags; public: - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); OCommonBehaviourTabPage(Window* pParent, USHORT nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true); protected: - + // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten virtual ~OCommonBehaviourTabPage(); // must be overloaded by subclasses, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); // <method>OGenericAdministrationPage::fillControls</method> virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -105,20 +105,20 @@ namespace dbaui class ODbaseDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs); private: // please add new controls also to <method>fillControls</method> or <method>fillWindows</method> - CheckBox m_aShowDeleted; - FixedLine m_aFL_1; - FixedText m_aFT_Message; - PushButton m_aIndexes; + CheckBox m_aShowDeleted; + FixedLine m_aFL_1; + FixedText m_aFT_Message; + PushButton m_aIndexes; - String m_sDsn; + String m_sDsn; protected: - + virtual ~ODbaseDetailsPage(); protected: @@ -148,7 +148,7 @@ namespace dbaui class OOdbcDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -156,8 +156,8 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedLine m_aFL_1; - CheckBox m_aUseCatalog; + FixedLine m_aFL_1; + CheckBox m_aUseCatalog; }; @@ -167,7 +167,7 @@ namespace dbaui class OUserDriverDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -175,11 +175,11 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - CheckBox m_aUseCatalog; + FixedText m_aFTHostname; + Edit m_aEDHostname; + FixedText m_aPortNumber; + NumericField m_aNFPortNumber; + CheckBox m_aUseCatalog; }; //======================================================================== @@ -199,35 +199,35 @@ namespace dbaui public: OGeneralSpecialJDBCDetailsPage( Window* pParent , USHORT _nResId - , const SfxItemSet& _rCoreAttrs + , const SfxItemSet& _rCoreAttrs , USHORT _nPortId ); protected: + - - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); - - FixedLine m_aFL_1; - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTSocket; - Edit m_aEDSocket; - - FixedText m_aFTDriverClass; - Edit m_aEDDriverClass; - PushButton m_aTestJavaDriver; - - String m_sDefaultJdbcDriverName; - USHORT m_nPortId; + + FixedLine m_aFL_1; + FixedText m_aFTHostname; + Edit m_aEDHostname; + FixedText m_aPortNumber; + NumericField m_aNFPortNumber; + FixedText m_aFTSocket; + Edit m_aEDSocket; + + FixedText m_aFTDriverClass; + Edit m_aEDDriverClass; + PushButton m_aTestJavaDriver; + + String m_sDefaultJdbcDriverName; + USHORT m_nPortId; bool m_bUseClass; }; @@ -241,16 +241,16 @@ namespace dbaui const SfxItemSet& _rCoreAttrs ); private: - FixedLine m_aSeparator1; + FixedLine m_aSeparator1; MySQLNativeSettings m_aMySQLSettings; - FixedLine m_aSeparator2; - FixedText m_aUserNameLabel; - Edit m_aUserName; - CheckBox m_aPasswordRequired; + FixedLine m_aSeparator2; + FixedText m_aUserNameLabel; + Edit m_aUserName; + CheckBox m_aPasswordRequired; protected: - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -262,7 +262,7 @@ namespace dbaui class OAdabasDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -271,30 +271,30 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedLine m_aFL_1; - FixedText m_FT_CACHE_SIZE; - NumericField m_NF_CACHE_SIZE; - - FixedText m_FT_DATA_INCREMENT; - NumericField m_NF_DATA_INCREMENT; - - FixedLine m_aFL_2; - FixedText m_FT_CTRLUSERNAME; - Edit m_ET_CTRLUSERNAME; - FixedText m_FT_CTRLPASSWORD; - Edit m_ET_CTRLPASSWORD; - - CheckBox m_CB_SHUTDB; - PushButton m_PB_STAT; - String m_sUser; - BOOL bAttrsChanged; - - DECL_LINK( AttributesChangedHdl, void * ); - DECL_LINK( UserSettingsHdl, void * ); - DECL_LINK( LoseFocusHdl, Edit * ); - DECL_LINK( PBClickHdl, Button *); + FixedText m_aFTHostname; + Edit m_aEDHostname; + FixedLine m_aFL_1; + FixedText m_FT_CACHE_SIZE; + NumericField m_NF_CACHE_SIZE; + + FixedText m_FT_DATA_INCREMENT; + NumericField m_NF_DATA_INCREMENT; + + FixedLine m_aFL_2; + FixedText m_FT_CTRLUSERNAME; + Edit m_ET_CTRLUSERNAME; + FixedText m_FT_CTRLPASSWORD; + Edit m_ET_CTRLPASSWORD; + + CheckBox m_CB_SHUTDB; + PushButton m_PB_STAT; + String m_sUser; + BOOL bAttrsChanged; + + DECL_LINK( AttributesChangedHdl, void * ); + DECL_LINK( UserSettingsHdl, void * ); + DECL_LINK( LoseFocusHdl, Edit * ); + DECL_LINK( PBClickHdl, Button *); }; //======================================================================== @@ -303,7 +303,7 @@ namespace dbaui class OLDAPDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -311,17 +311,17 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedLine m_aFL_1; - FixedText m_aBaseDN; - Edit m_aETBaseDN; - CheckBox m_aCBUseSSL; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTRowCount; - NumericField m_aNFRowCount; - - sal_Int32 m_iSSLPort; - sal_Int32 m_iNormalPort; + FixedLine m_aFL_1; + FixedText m_aBaseDN; + Edit m_aETBaseDN; + CheckBox m_aCBUseSSL; + FixedText m_aPortNumber; + NumericField m_aNFPortNumber; + FixedText m_aFTRowCount; + NumericField m_aNFRowCount; + + sal_Int32 m_iSSLPort; + sal_Int32 m_iNormalPort; DECL_LINK( OnCheckBoxClick, CheckBox * ); }; @@ -343,16 +343,16 @@ namespace dbaui class OTextDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: - String m_aFieldSeparatorList; - String m_aTextSeparatorList; - String m_aTextNone; + String m_aFieldSeparatorList; + String m_aTextSeparatorList; + String m_aTextNone; protected: virtual ~OTextDetailsPage(); virtual sal_Bool prepareLeave(); @@ -365,7 +365,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index d964da262c30..90390d488c16 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace dbaui LargeEntryListBox( Window* _pParent, const ResId& _rId ); protected: - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); }; //-------------------------------------------------------------------- @@ -83,17 +83,17 @@ DBG_NAME(DirectSQLDialog) //-------------------------------------------------------------------- DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference< XConnection >& _rxConn ) :ModalDialog(_pParent, ModuleRes(DLG_DIRECTSQL)) - ,m_aFrame (this, ModuleRes(FL_SQL)) - ,m_aSQLLabel (this, ModuleRes(FT_SQL)) - ,m_aSQL (this, ModuleRes(ME_SQL)) - ,m_aExecute (this, ModuleRes(PB_EXECUTE)) - ,m_aHistoryLabel (this, ModuleRes(FT_HISTORY)) + ,m_aFrame (this, ModuleRes(FL_SQL)) + ,m_aSQLLabel (this, ModuleRes(FT_SQL)) + ,m_aSQL (this, ModuleRes(ME_SQL)) + ,m_aExecute (this, ModuleRes(PB_EXECUTE)) + ,m_aHistoryLabel (this, ModuleRes(FT_HISTORY)) ,m_pSQLHistory(new LargeEntryListBox(this, ModuleRes(LB_HISTORY))) - ,m_aStatusFrame (this, ModuleRes(FL_STATUS)) - ,m_aStatus (this, ModuleRes(ME_STATUS)) - ,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS)) - ,m_aHelp (this, ModuleRes(PB_HELP)) - ,m_aClose (this, ModuleRes(PB_CLOSE)) + ,m_aStatusFrame (this, ModuleRes(FL_STATUS)) + ,m_aStatus (this, ModuleRes(ME_STATUS)) + ,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS)) + ,m_aHelp (this, ModuleRes(PB_HELP)) + ,m_aClose (this, ModuleRes(PB_CLOSE)) ,m_nHistoryLimit(20) ,m_nStatusCount(1) ,m_xConnection(_rxConn) @@ -127,7 +127,7 @@ DBG_NAME(DirectSQLDialog) stopAllComponentListening(); } delete m_pSQLHistory; - + DBG_DTOR(DirectSQLDialog,NULL); } @@ -345,7 +345,7 @@ DBG_NAME(DirectSQLDialog) } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/directsql.hrc b/dbaccess/source/ui/dlg/directsql.hrc index 23f19a350ab4..ee09db68e896 100644 --- a/dbaccess/source/ui/dlg/directsql.hrc +++ b/dbaccess/source/ui/dlg/directsql.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,16 +28,16 @@ #ifndef _DBACCESS_UI_DIRECTSQL_HRC_ #define _DBACCESS_UI_DIRECTSQL_HRC_ -#define FL_SQL 1 -#define FT_SQL 2 -#define ME_SQL 3 -#define PB_EXECUTE 4 -#define FT_HISTORY 5 -#define LB_HISTORY 6 -#define FL_STATUS 7 -#define ME_STATUS 8 -#define FL_BUTTONS 9 -#define PB_HELP 10 -#define PB_CLOSE 11 +#define FL_SQL 1 +#define FT_SQL 2 +#define ME_SQL 3 +#define PB_EXECUTE 4 +#define FT_HISTORY 5 +#define LB_HISTORY 6 +#define FL_STATUS 7 +#define ME_STATUS 8 +#define FL_BUTTONS 9 +#define PB_HELP 10 +#define PB_CLOSE 11 #endif // _DBACCESS_UI_DIRECTSQL_HRC_ diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src index 230fe4dac320..1fa897b80da6 100644 --- a/dbaccess/source/ui/dlg/directsql.src +++ b/dbaccess/source/ui/dlg/directsql.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,19 +32,19 @@ #include "dbu_dlg.hrc" #endif -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 -#define WINDOW_SIZE_X 200 -#define WINDOW_SIZE_Y 210 + BUTTON_SIZE_Y + BUTTON_SIZE_Y +#define WINDOW_SIZE_X 200 +#define WINDOW_SIZE_Y 210 + BUTTON_SIZE_Y + BUTTON_SIZE_Y ModalDialog DLG_DIRECTSQL { - OutputSize = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + OutputSize = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; FixedLine FL_SQL { @@ -119,7 +119,7 @@ ModalDialog DLG_DIRECTSQL Text [ en-US ] = "Close"; }; - Text [ en-US ] = "Execute SQL Statement" ; + Text [ en-US ] = "Execute SQL Statement" ; }; String STR_COMMAND_EXECUTED_SUCCESSFULLY diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index 20537fce089d..6e5d8a9b6a7f 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) case RID_SVXPAGE_CHAR_STD: { - // ((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem()); + // ((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem()); } break; diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src index 8dce0835aa69..6c793ac524e1 100644 --- a/dbaccess/source/ui/dlg/dlgattr.src +++ b/dbaccess/source/ui/dlg/dlgattr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index d9466a39663e..67719b64d8d0 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,34 +62,34 @@ namespace dbaui class OSaveAsDlgImpl { public: - FixedText m_aDescription; - FixedText m_aCatalogLbl; - OSQLNameComboBox m_aCatalog; - FixedText m_aSchemaLbl; - OSQLNameComboBox m_aSchema; - FixedText m_aLabel; - OSQLNameEdit m_aTitle; - OKButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_HELP; - String m_aQryLabel; - String m_sTblLabel; + FixedText m_aDescription; + FixedText m_aCatalogLbl; + OSQLNameComboBox m_aCatalog; + FixedText m_aSchemaLbl; + OSQLNameComboBox m_aSchema; + FixedText m_aLabel; + OSQLNameEdit m_aTitle; + OKButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_HELP; + String m_aQryLabel; + String m_sTblLabel; rtl::OUString m_sCatalog; - rtl::OUString m_sSchema; - String m_aName; + rtl::OUString m_sSchema; + String m_aName; const IObjectNameCheck& m_rObjectNameCheck; - String m_sParentURL; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; - sal_Int32 m_nType; - sal_Int32 m_nFlags; + String m_sParentURL; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + sal_Int32 m_nType; + sal_Int32 m_nFlags; - OSaveAsDlgImpl( Window * pParent,const sal_Int32& _rType, + OSaveAsDlgImpl( Window * pParent,const sal_Int32& _rType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); - OSaveAsDlgImpl( Window * pParent, + OSaveAsDlgImpl( Window * pParent, const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); @@ -264,15 +264,15 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_pImpl->m_xMetaData, m_pImpl->m_aName, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); USHORT nPos = m_pImpl->m_aCatalog.GetEntryPos(String(sCatalog)); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) m_pImpl->m_aCatalog.SelectEntryPos(nPos); - + if ( sSchema.getLength() ) { nPos = m_pImpl->m_aSchema.GetEntryPos(String(sSchema)); @@ -300,7 +300,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, m_pImpl->m_aTitle.setCheck(bCheck); // enable non valid sql chars as well m_pImpl->m_aSchema.setCheck(bCheck); // enable non valid sql chars as well m_pImpl->m_aCatalog.setCheck(bCheck); // enable non valid sql chars as well - + Size aSize = GetSizePixel(); aSize.Height() = aPos.Y() + m_pImpl->m_aPB_OK.GetSizePixel().Height() + m_pImpl->m_aTitle.GetSizePixel().Height() / 2; @@ -326,7 +326,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, { m_pImpl = new OSaveAsDlgImpl(this,rDefault,_rObjectNameCheck,_nFlags); implInitOnlyTitle(_sLabel); - implInit(); + implInit(); } // ----------------------------------------------------------------------------- OSaveAsDlg::~OSaveAsDlg() @@ -408,7 +408,7 @@ void OSaveAsDlg::implInit() sal_Int32 nMoveUp = m_pImpl->m_aCatalog.GetPosPixel().Y() - m_pImpl->m_aDescription.GetPosPixel().Y(); // loop to all controls and move them ... - for ( Window* pChildControl = GetWindow( WINDOW_FIRSTCHILD ); + for ( Window* pChildControl = GetWindow( WINDOW_FIRSTCHILD ); pChildControl; pChildControl= pChildControl->GetWindow( WINDOW_NEXT ) ) @@ -434,15 +434,15 @@ void OSaveAsDlg::implInit() SetText( String( ModuleRes( STR_TITLE_RENAME ) ) ); m_pImpl->m_aTitle.SetHelpId(HID_DLG_RENAME); } - + m_pImpl->m_aPB_OK.SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl)); m_pImpl->m_aTitle.SetModifyHdl(LINK(this,OSaveAsDlg,EditModifyHdl)); m_pImpl->m_aTitle.GrabFocus(); FreeResource(); } // ----------------------------------------------------------------------------- -String OSaveAsDlg::getName() const { return m_pImpl->m_aName; } -String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); } -String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); } +String OSaveAsDlg::getName() const { return m_pImpl->m_aName; } +String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); } +String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgsave.hrc b/dbaccess/source/ui/dlg/dlgsave.hrc index 7a36319ef4de..7778745d9991 100644 --- a/dbaccess/source/ui/dlg/dlgsave.hrc +++ b/dbaccess/source/ui/dlg/dlgsave.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,24 +30,24 @@ // defines ------------------------------------------------------------------ -#define PB_OK 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define PB_OK 1 +#define PB_CANCEL 1 +#define PB_HELP 1 -#define ET_CATALOG 1 -#define ET_SCHEMA 2 -#define ET_TITLE 3 +#define ET_CATALOG 1 +#define ET_SCHEMA 2 +#define ET_TITLE 3 -#define FT_DESCRIPTION 1 -#define FT_CATALOG 2 -#define FT_SCHEMA 3 -#define FT_TITLE 4 +#define FT_DESCRIPTION 1 +#define FT_CATALOG 2 +#define FT_SCHEMA 3 +#define FT_TITLE 4 -#define STR_TBL_LABEL 1 -#define STR_VW_LABEL 2 -#define STR_QRY_LABEL 3 -#define STR_TITLE_RENAME 4 -#define STR_TITLE_PASTE_AS 6 +#define STR_TBL_LABEL 1 +#define STR_VW_LABEL 2 +#define STR_QRY_LABEL 3 +#define STR_TITLE_RENAME 4 +#define STR_TITLE_PASTE_AS 6 #endif // DBAUI_DLGSAVE_HRC diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src index d550704b85f8..a6c036ec2831 100644 --- a/dbaccess/source/ui/dlg/dlgsave.src +++ b/dbaccess/source/ui/dlg/dlgsave.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,9 +64,9 @@ ModalDialog DLG_SAVE_AS Border = TRUE ; Pos = MAP_APPFONT ( 77 , 25 ) ; Size = MAP_APPFONT ( 89 , 12 ) ; - SVLook = TRUE ; - TabStop = TRUE ; - DropDown = TRUE ; + SVLook = TRUE ; + TabStop = TRUE ; + DropDown = TRUE ; AutoHScroll = TRUE ; }; FixedText FT_SCHEMA @@ -80,9 +80,9 @@ ModalDialog DLG_SAVE_AS Border = TRUE ; Pos = MAP_APPFONT ( 77 , 42 ) ; Size = MAP_APPFONT ( 89 , 12 ) ; - SVLook = TRUE ; - TabStop = TRUE ; - DropDown = TRUE ; + SVLook = TRUE ; + TabStop = TRUE ; + DropDown = TRUE ; AutoHScroll = TRUE ; }; FixedText FT_TITLE diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index a42122657c23..f70bdac69bb8 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAl :ModalDialog( pParent, ModuleRes(bRow ? DLG_ROWHEIGHT : DLG_COLWIDTH)) ,m_nPrevValue(nVal) ,m_nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH) - ,aFT_VALUE(this, ModuleRes( FT_VALUE)) - ,aMF_VALUE(this, ModuleRes( MF_VALUE)) + ,aFT_VALUE(this, ModuleRes( FT_VALUE)) + ,aMF_VALUE(this, ModuleRes( MF_VALUE)) ,aCB_STANDARD(this, ModuleRes(CB_STANDARD)) - ,aPB_OK(this, ModuleRes(PB_OK)) - ,aPB_CANCEL(this, ModuleRes(PB_CANCEL)) - ,aPB_HELP(this, ModuleRes(PB_HELP)) + ,aPB_OK(this, ModuleRes(PB_OK)) + ,aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,aPB_HELP(this, ModuleRes(PB_HELP)) { DBG_CTOR(DlgSize,NULL); @@ -117,7 +117,7 @@ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton ) } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/dlgsize.hrc b/dbaccess/source/ui/dlg/dlgsize.hrc index 3eef0951a0dd..2a83edf70e04 100644 --- a/dbaccess/source/ui/dlg/dlgsize.hrc +++ b/dbaccess/source/ui/dlg/dlgsize.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,12 +28,12 @@ #ifndef DBAUI_DLGSIZE_HRC #define DBAUI_DLGSIZE_HRC -#define FT_VALUE 1 -#define MF_VALUE 1 -#define CB_STANDARD 2 -#define PB_OK 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define FT_VALUE 1 +#define MF_VALUE 1 +#define CB_STANDARD 2 +#define PB_OK 1 +#define PB_CANCEL 1 +#define PB_HELP 1 #endif //DBAUI_DLGSIZE_HRC diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src index ade6f3ff1222..b690e7e50afd 100644 --- a/dbaccess/source/ui/dlg/dlgsize.src +++ b/dbaccess/source/ui/dlg/dlgsize.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,10 +29,10 @@ // (c) Copyright 1996 - 2000 by Star Division GmbH, Hamburg, Germany // // Ersterstellung: - // JN + // JN // // Letzte Aenderung: - // $Author: rt $ $Date: 2008-04-10 14:52:17 $ $Revision: 1.32 $ + // $Author: rt $ $Date: 2008-04-10 14:52:17 $ $Revision: 1.32 $ // //--------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index a3b542a1d4f6..eb9aa07d791e 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,20 +50,20 @@ namespace dbaui */ class DbuTypeCollectionItem : public SfxPoolItem { - ::dbaccess::ODsnTypeCollection* m_pCollection; + ::dbaccess::ODsnTypeCollection* m_pCollection; public: TYPEINFO(); DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; + virtual int operator==(const SfxPoolItem& _rItem) const; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; - ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } + ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DSNITEM_HXX_ diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index dc7e5426c1d8..f0dfb02a6be3 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,19 +66,19 @@ using namespace ::comphelper; //================================================================== ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet) :ModalDialog(_pParent, ModuleRes(DLG_DATASOURCE_SELECTION)) - ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) - ,m_aDatasource (this, ModuleRes(LB_DATASOURCE)) - ,m_aOk (this, ModuleRes(PB_OK)) - ,m_aCancel (this, ModuleRes(PB_CANCEL)) - ,m_aHelp (this, ModuleRes(PB_HELP)) + ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) + ,m_aDatasource (this, ModuleRes(LB_DATASOURCE)) + ,m_aOk (this, ModuleRes(PB_OK)) + ,m_aCancel (this, ModuleRes(PB_CANCEL)) + ,m_aHelp (this, ModuleRes(PB_HELP)) #ifdef HAVE_ODBC_ADMINISTRATION - ,m_aManageDatasources (this, ModuleRes(PB_MANAGE)) + ,m_aManageDatasources (this, ModuleRes(PB_MANAGE)) #endif - ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE)) + ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE)) ,m_pOutputSet(_pOutputSet) { if ( _bAdabas ) - { // set a new title (indicating that we're browsing local data sources only) + { // set a new title (indicating that we're browsing local data sources only) SetText(ModuleRes(STR_LOCAL_DATASOURCES)); m_aDescription.SetText(ModuleRes(STR_DESCRIPTION2)); @@ -156,7 +156,7 @@ IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, /*pButton*/ ) xORB->createInstanceWithArguments(SERVICE_SDB_ADABASCREATIONDIALOG, aArgs), UNO_QUERY); if (!xDialog.is()) { - // ShowServiceNotAvailableError(this, String(SERVICE_SDB_ADABASCREATIONDIALOG), sal_True); + // ShowServiceNotAvailableError(this, String(SERVICE_SDB_ADABASCREATIONDIALOG), sal_True); return 0L; } @@ -249,13 +249,13 @@ IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ ) #endif // ----------------------------------------------------------------------------- void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) -{ +{ ::rtl::OUString sSelected; if (m_aDatasource.GetEntryCount()) sSelected = m_aDatasource.GetSelectEntry(); m_aDatasource.Clear(); // fill the list - for ( ConstStringBagIterator aDS = _rDatasources.begin(); + for ( ConstStringBagIterator aDS = _rDatasources.begin(); aDS != _rDatasources.end(); ++aDS ) @@ -267,13 +267,13 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) { if (sSelected.getLength()) m_aDatasource.SelectEntry(sSelected); - else // select the first entry + else // select the first entry m_aDatasource.SelectEntryPos(0); } } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dsselect.hrc b/dbaccess/source/ui/dlg/dsselect.hrc index 5deffeeef102..47aed265ec26 100644 --- a/dbaccess/source/ui/dlg/dsselect.hrc +++ b/dbaccess/source/ui/dlg/dsselect.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,14 +28,14 @@ #ifndef _DBAUI_DSSELECT_HRC_ #define _DBAUI_DSSELECT_HRC_ -#define LB_DATASOURCE 1 -#define PB_OK 2 -#define PB_CANCEL 3 -#define PB_HELP 4 -#define PB_MANAGE 5 -#define FT_DESCRIPTION 6 -#define STR_LOCAL_DATASOURCES 7 -#define PB_CREATE 9 -#define STR_DESCRIPTION2 10 +#define LB_DATASOURCE 1 +#define PB_OK 2 +#define PB_CANCEL 3 +#define PB_HELP 4 +#define PB_MANAGE 5 +#define FT_DESCRIPTION 6 +#define STR_LOCAL_DATASOURCES 7 +#define PB_CREATE 9 +#define STR_DESCRIPTION2 10 #endif // _DBAUI_DSSELECT_HRC_ diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 555464635b84..2ab0f86db71c 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,16 +54,16 @@ namespace dbaui class ODatasourceSelectDialog : public ModalDialog { protected: - FixedText m_aDescription; - ListBox m_aDatasource; - OKButton m_aOk; - CancelButton m_aCancel; - HelpButton m_aHelp; + FixedText m_aDescription; + ListBox m_aDatasource; + OKButton m_aOk; + CancelButton m_aCancel; + HelpButton m_aHelp; #ifdef HAVE_ODBC_ADMINISTRATION - PushButton m_aManageDatasources; + PushButton m_aManageDatasources; #endif - PushButton m_aCreateAdabasDB; - SfxItemSet* m_pOutputSet; + PushButton m_aCreateAdabasDB; + SfxItemSet* m_pOutputSet; #ifdef HAVE_ODBC_ADMINISTRATION ::std::auto_ptr< OOdbcManagement > m_pODBCManagement; @@ -73,10 +73,10 @@ public: ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet = NULL ); ~ODatasourceSelectDialog(); - inline String GetSelected() const { return m_aDatasource.GetSelectEntry();} - void Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); } + inline String GetSelected() const { return m_aDatasource.GetSelectEntry();} + void Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); } - virtual BOOL Close(); + virtual BOOL Close(); protected: DECL_LINK( ListDblClickHdl, ListBox * ); @@ -89,7 +89,7 @@ protected: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DSSELECT_HXX_ diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src index 8eff7fffe6c4..4539754e808b 100644 --- a/dbaccess/source/ui/dlg/dsselect.src +++ b/dbaccess/source/ui/dlg/dsselect.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ ModalDialog DLG_DATASOURCE_SELECTION HScroll = TRUE ; Sort = TRUE ; }; - + OKButton PB_OK { Pos = MAP_APPFONT ( 166 , 6 ) ; diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx index aee6876e8ebc..cdb919578cd7 100644 --- a/dbaccess/source/ui/dlg/finteraction.cxx +++ b/dbaccess/source/ui/dlg/finteraction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace dbaui } //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index bbc837e0b074..4015f2fdcb62 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ namespace dbaui //==================================================================== //= OFilePickerInteractionHandler //==================================================================== - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler - > OFilePickerInteractionHandler_Base; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler + > OFilePickerInteractionHandler_Base; /** a InteractionHandler implementation which extends another handler with some customizability */ @@ -49,13 +49,13 @@ namespace dbaui { protected: ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > - m_xMaster; // our master handler - sal_Bool m_bDoesNotExist; + m_xMaster; // our master handler + sal_Bool m_bDoesNotExist; public: OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster ); - inline sal_Bool isDoesNotExist( ) const { return m_bDoesNotExist; } + inline sal_Bool isDoesNotExist( ) const { return m_bDoesNotExist; } protected: // XInteractionHandler @@ -65,7 +65,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBAUI_FILEPICKER_INTERACTION_HXX diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 1103a375b636..9c4038dbf89f 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,14 +77,14 @@ namespace dbaui ,m_aFT_DocListLabel (this, ModuleRes(FT_DOCLISTLABEL)) ,m_pLB_DocumentList ( new OpenDocumentListBox( this, "com.sun.star.sdb.OfficeDatabaseDocument", ModuleRes( LB_DOCUMENTLIST ) ) ) ,m_aPB_OpenDocument (this, "com.sun.star.sdb.OfficeDatabaseDocument", ModuleRes(PB_OPENDOCUMENT)) - ,m_aTypePreLabel (this, ModuleRes(FT_DATASOURCETYPE_PRE)) - ,m_aDatasourceTypeLabel (this, ModuleRes(FT_DATATYPE)) - ,m_pDatasourceType ( new ListBox(this, ModuleRes(LB_DATATYPE))) + ,m_aTypePreLabel (this, ModuleRes(FT_DATASOURCETYPE_PRE)) + ,m_aDatasourceTypeLabel (this, ModuleRes(FT_DATATYPE)) + ,m_pDatasourceType ( new ListBox(this, ModuleRes(LB_DATATYPE))) ,m_aFTDataSourceAppendix (this, ModuleRes(FT_DATATYPEAPPENDIX)) - ,m_aTypePostLabel (this, ModuleRes(FT_DATASOURCETYPE_POST)) - ,m_aSpecialMessage (this, ModuleRes(FT_SPECIAL_MESSAGE)) + ,m_aTypePostLabel (this, ModuleRes(FT_DATASOURCETYPE_POST)) + ,m_aSpecialMessage (this, ModuleRes(FT_SPECIAL_MESSAGE)) ,m_DBWizardMode (_bDBWizardMode) - ,m_sMySQLEntry (ModuleRes(STR_MYSQLENTRY)) + ,m_sMySQLEntry (ModuleRes(STR_MYSQLENTRY)) ,m_eOriginalCreationMode (eCreateNew) ,m_pCollection (NULL) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN) @@ -190,16 +190,16 @@ namespace dbaui DisplayedTypes aDisplayedTypes; ::dbaccess::ODsnTypeCollection::TypeIterator aEnd = m_pCollection->end(); - for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop = m_pCollection->begin(); + for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop = m_pCollection->begin(); aTypeLoop != aEnd; ++aTypeLoop ) { const ::rtl::OUString sURLPrefix = aTypeLoop.getURLPrefix(); if ( sURLPrefix.getLength() ) - { + { String sDisplayName = aTypeLoop.getDisplayName(); - if ( m_pDatasourceType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND + if ( m_pDatasourceType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND && approveDataSourceType( sURLPrefix, sDisplayName ) ) { aDisplayedTypes.push_back( DisplayedTypes::value_type( sURLPrefix, sDisplayName ) ); @@ -383,9 +383,9 @@ namespace dbaui if ( approveDataSourceType( m_eCurrentSelection, sDisplayName ) && ( LISTBOX_ENTRY_NOTFOUND == m_pDatasourceType->GetEntryPos( sDisplayName ) ) ) - { // this indicates it's really a type which is known in general, but not supported on the current platform + { // this indicates it's really a type which is known in general, but not supported on the current platform // show a message saying so - // eSpecialMessage = smUnsupportedType; + // eSpecialMessage = smUnsupportedType; insertDatasourceTypeEntryData(m_eCurrentSelection, sDisplayName); // remember this type so we can show the special message again if the user selects this // type again (without changing the data source) @@ -479,7 +479,7 @@ namespace dbaui } //------------------------------------------------------------------------- - SfxTabPage* OGeneralPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet, sal_Bool _bWizardMode) + SfxTabPage* OGeneralPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet, sal_Bool _bWizardMode) { return ( new OGeneralPage( _pParent, _rAttrSet, _bWizardMode ) ); } @@ -607,7 +607,7 @@ namespace dbaui const SfxFilter* pFilter = getStandardDatabaseFilter(); if ( pFilter ) { -// aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); +// aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); aFileDlg.SetCurrentFilter(pFilter->GetUIName()); } if ( aFileDlg.Execute() == ERRCODE_NONE ) @@ -632,7 +632,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index ad28e2dc0692..d67aabc96c5c 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,15 +76,15 @@ namespace dbaui ::std::auto_ptr< OpenDocumentListBox > m_pLB_DocumentList; OpenDocumentButton m_aPB_OpenDocument; - FixedText m_aTypePreLabel; - FixedText m_aDatasourceTypeLabel; + FixedText m_aTypePreLabel; + FixedText m_aDatasourceTypeLabel; ::std::auto_ptr< ListBox > m_pDatasourceType; FixedText m_aFTDataSourceAppendix; - FixedText m_aTypePostLabel; - FixedText m_aSpecialMessage; + FixedText m_aTypePostLabel; + FixedText m_aSpecialMessage; sal_Bool m_DBWizardMode; - String m_sMySQLEntry; + String m_sMySQLEntry; CreationMode m_eOriginalCreationMode; DocumentDescriptor m_aBrowsedDocument; @@ -93,47 +93,47 @@ namespace dbaui ::std::vector< ::rtl::OUString> m_aURLPrefixes; - ::dbaccess::ODsnTypeCollection* - m_pCollection; /// the DSN type collection instance - ::rtl::OUString m_eCurrentSelection; /// currently selected type - ::dbaccess::DATASOURCE_TYPE m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered .... + ::dbaccess::ODsnTypeCollection* + m_pCollection; /// the DSN type collection instance + ::rtl::OUString m_eCurrentSelection; /// currently selected type + ::dbaccess::DATASOURCE_TYPE m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered .... enum SPECIAL_MESSAGE { smNone, smUnsupportedType }; - SPECIAL_MESSAGE m_eLastMessage; + SPECIAL_MESSAGE m_eLastMessage; - Link m_aTypeSelectHandler; /// to be called if a new type is selected - Link m_aCreationModeHandler; /// to be called if a new type is selected - Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected + Link m_aTypeSelectHandler; /// to be called if a new type is selected + Link m_aCreationModeHandler; /// to be called if a new type is selected + Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected Link m_aChooseDocumentHandler; /// to be called when a recent document has been definately chosen - sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted - sal_Bool m_bUserGrabFocus : 1; - bool m_bInitTypeList : 1; + sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted + sal_Bool m_bUserGrabFocus : 1; + bool m_bInitTypeList : 1; bool approveDataSourceType( const ::rtl::OUString& _sURLPrefix, String& _inout_rDisplayName ); - void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName); + void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName); public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& _rAttrSet, sal_Bool _bDBWizardMode = sal_False); + static SfxTabPage* Create(Window* pParent, const SfxItemSet& _rAttrSet, sal_Bool _bDBWizardMode = sal_False); /// set a handler which gets called every time the user selects a new type - void SetTypeSelectHandler(const Link& _rHandler) { m_aTypeSelectHandler = _rHandler; } - void SetCreationModeHandler(const Link& _rHandler) { m_aCreationModeHandler = _rHandler; } - void SetDocumentSelectionHandler( const Link& _rHandler) { m_aDocumentSelectionHandler = _rHandler; } - void SetChooseDocumentHandler( const Link& _rHandler) { m_aChooseDocumentHandler = _rHandler; } + void SetTypeSelectHandler(const Link& _rHandler) { m_aTypeSelectHandler = _rHandler; } + void SetCreationModeHandler(const Link& _rHandler) { m_aCreationModeHandler = _rHandler; } + void SetDocumentSelectionHandler( const Link& _rHandler) { m_aDocumentSelectionHandler = _rHandler; } + void SetChooseDocumentHandler( const Link& _rHandler) { m_aChooseDocumentHandler = _rHandler; } CreationMode GetDatabaseCreationMode() const; DocumentDescriptor GetSelectedDocument() const; /// get the currently selected datasource type - ::rtl::OUString GetSelectedType() const { return m_eCurrentSelection; } + ::rtl::OUString GetSelectedType() const { return m_eCurrentSelection; } protected: // SfxTabPage overridables - virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); - virtual void Reset(const SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); + virtual void Reset(const SfxItemSet& _rCoreAttrs); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); @@ -163,7 +163,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_GENERALPAGE_HXX_ diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 780fe621157f..756d5c1183b3 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,8 +59,8 @@ namespace dbaui //------------------------------------------------------------------ sal_Bool operator ==(const OIndexField& _rLHS, const OIndexField& _rRHS) { - return (_rLHS.sFieldName == _rRHS.sFieldName) - && (_rLHS.bSortAscending == _rRHS.bSortAscending); + return (_rLHS.sFieldName == _rRHS.sFieldName) + && (_rLHS.bSortAscending == _rRHS.bSortAscending); } //------------------------------------------------------------------ @@ -78,7 +78,7 @@ namespace dbaui ConstIndexFieldsIterator aLeft = _rLHS.begin(); ConstIndexFieldsIterator aLeftEnd = _rLHS.end(); ConstIndexFieldsIterator aRight = _rRHS.begin(); - for (; aLeft != aLeftEnd; ++aLeft, ++aRight) + for (; aLeft != aLeftEnd; ++aLeft, ++aRight) { if (*aLeft != *aRight) return sal_False; @@ -116,9 +116,9 @@ namespace dbaui ::rtl::OUString sNewName(_rNewText); ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters()); if ( ( xMeta->supportsMixedCaseQuotedIdentifiers() ) - ? - sAlias != sNewName - : + ? + sAlias != sNewName + : !sNewName.equalsIgnoreAsciiCase(sAlias)) return sal_False; } @@ -180,23 +180,23 @@ namespace dbaui //================================================================== DBG_NAME(DbaIndexDialog) //------------------------------------------------------------------ - DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames, - const Reference< XNameAccess >& _rxIndexes, + DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames, + const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, const Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _nMaxColumnsInIndex) :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN)) ,m_xConnection(_rxConnection) ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString::createFromAscii("dbaccess.tabledesign.indexdialog")) - ,m_aActions (this, ModuleRes(TLB_ACTIONS)) - ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) - ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) - ,m_aDescriptionLabel (this, ModuleRes(FT_DESC_LABEL)) - ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) - ,m_aUnique (this, ModuleRes(CB_UNIQUE)) - ,m_aFieldsLabel (this, ModuleRes(FT_FIELDS)) - ,m_pFields(new IndexFieldsControl (this, ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" ))) - ,m_aClose (this, ModuleRes(PB_CLOSE)) - ,m_aHelp (this, ModuleRes(HB_HELP)) + ,m_aActions (this, ModuleRes(TLB_ACTIONS)) + ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) + ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) + ,m_aDescriptionLabel (this, ModuleRes(FT_DESC_LABEL)) + ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) + ,m_aUnique (this, ModuleRes(CB_UNIQUE)) + ,m_aFieldsLabel (this, ModuleRes(FT_FIELDS)) + ,m_pFields(new IndexFieldsControl (this, ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" ))) + ,m_aClose (this, ModuleRes(PB_CLOSE)) + ,m_aHelp (this, ModuleRes(HB_HELP)) ,m_pIndexes(NULL) ,m_pPreviousSelection(NULL) ,m_bEditAgain(sal_False) @@ -240,17 +240,17 @@ DBG_NAME(DbaIndexDialog) m_aClose.SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog)); // get our most recent geometry settings -// if (m_aGeometrySettings.Exists()) -// { -// Point aPos; -// m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y()); -// SetPosPixel(aPos); -// } +// if (m_aGeometrySettings.Exists()) +// { +// Point aPos; +// m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y()); +// SetPosPixel(aPos); +// } // if all of the indexes have an empty description, we're not interested in displaying it Indexes::const_iterator aCheck; - for ( aCheck = m_pIndexes->begin(); + for ( aCheck = m_pIndexes->begin(); aCheck != m_pIndexes->end(); ++aCheck ) @@ -294,7 +294,7 @@ DBG_NAME(DbaIndexDialog) SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); sal_Bool bSelectedAnything = NULL != pSelected; - + if (pSelected) { @@ -344,9 +344,9 @@ DBG_NAME(DbaIndexDialog) delete m_pFields; // save our geometry settings -// Point aPos = GetPosPixel(); -// m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y()); - +// Point aPos = GetPosPixel(); +// m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y()); + DBG_DTOR(DbaIndexDialog,NULL); } @@ -552,7 +552,7 @@ DBG_NAME(DbaIndexDialog) OnDropIndex(sal_False); return; } - + SQLExceptionInfo aExceptionInfo; try { @@ -619,7 +619,7 @@ DBG_NAME(DbaIndexDialog) { // the descriptor Indexes::const_iterator aSelected = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData()); - + if (aSelected->isModified() || aSelected->isNew()) { QueryBox aQuestion(this, ModuleRes(QUERY_SAVE_CURRENT_INDEX)); @@ -656,7 +656,7 @@ DBG_NAME(DbaIndexDialog) IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvLBoxEntry*, _pEntry ) { Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); - + DBG_ASSERT(aPosition >= m_pIndexes->begin() && aPosition < m_pIndexes->end(), "DbaIndexDialog::OnEntryEdited: invalid entry!"); @@ -739,7 +739,7 @@ DBG_NAME(DbaIndexDialog) // no double fields DECLARE_STL_STDKEY_SET( String, StringBag ); StringBag aExistentFields; - for ( ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin(); + for ( ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin(); aFieldCheck != _rPos->aFields.end(); ++aFieldCheck ) @@ -830,7 +830,7 @@ DBG_NAME(DbaIndexDialog) // commit the old data if (m_aIndexes.FirstSelected() != m_pPreviousSelection) - { // (this call may happen in case somebody ended an in-place edit with 'return', so we need to check this before committing) + { // (this call may happen in case somebody ended an in-place edit with 'return', so we need to check this before committing) if (!implCommitPreviouslySelected()) { m_aIndexes.SelectNoHandlerCall(m_pPreviousSelection); @@ -871,7 +871,7 @@ DBG_NAME(DbaIndexDialog) { // The physical toolbar changed its outlook and shows another logical toolbar! // We have to set the correct high contrast mode on the new tbx manager. - // pMgr->SetHiContrast( IsHiContrastMode() ); + // pMgr->SetHiContrast( IsHiContrastMode() ); checkImageList(); } } @@ -880,9 +880,9 @@ DBG_NAME(DbaIndexDialog) { ModalDialog::DataChanged( rDCEvt ); - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode checkImageList(); @@ -893,7 +893,7 @@ DBG_NAME(DbaIndexDialog) { sal_Int16 nN = IMG_INDEX_DLG_SC; sal_Int16 nH = IMG_INDEX_DLG_SCH; - if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) + if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) { nN = IMG_INDEX_DLG_LC; nH = IMG_INDEX_DLG_LCH; @@ -910,7 +910,7 @@ DBG_NAME(DbaIndexDialog) Size aDlgSize = GetSizePixel(); // adjust size of dlg SetSizePixel(Size(aDlgSize.Width() + _rDiff.Width(), - aDlgSize.Height() + _rDiff.Height()) + aDlgSize.Height() + _rDiff.Height()) ); Size aIndexSize = m_aIndexes.GetSizePixel(); m_aIndexes.SetPosSizePixel(m_aIndexes.GetPosPixel() + Point(0,_rDiff.Height()), @@ -934,7 +934,7 @@ DBG_NAME(DbaIndexDialog) } //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexdialog.hrc b/dbaccess/source/ui/dlg/indexdialog.hrc index 825e96de2edc..003bcf6a0903 100644 --- a/dbaccess/source/ui/dlg/indexdialog.hrc +++ b/dbaccess/source/ui/dlg/indexdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,21 +29,21 @@ #define _DBAUI_INDEXDIALOG_HRC_ -#define CTR_INDEXLIST 1 -#define CTR_FIELDS 2 +#define CTR_INDEXLIST 1 +#define CTR_FIELDS 2 -#define FL_INDEXDETAILS 1 +#define FL_INDEXDETAILS 1 -#define CB_UNIQUE 1 +#define CB_UNIQUE 1 -#define FT_FIELDS 1 -#define FT_DESC_LABEL 2 -#define FT_DESCRIPTION 3 +#define FT_FIELDS 1 +#define FT_DESC_LABEL 2 +#define FT_DESCRIPTION 3 -#define TLB_ACTIONS 1 +#define TLB_ACTIONS 1 -#define PB_CLOSE 1 +#define PB_CLOSE 1 -#define HB_HELP 1 +#define HB_HELP 1 #endif // _DBAUI_INDEXDIALOG_HRC_ diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src index ae8f80d6c616..ead770c40482 100644 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ b/dbaccess/source/ui/dlg/indexdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ #include "dbaccess_helpid.hrc" #endif -#define DIALOG_SIZE_X 220 -#define DIALOG_SIZE_Y 140 -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define DIALOG_SIZE_X 220 +#define DIALOG_SIZE_Y 140 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 -#define LIST_WIDTH 70 +#define LIST_WIDTH 70 ModalDialog DLG_INDEXDESIGN { @@ -57,7 +57,7 @@ ModalDialog DLG_INDEXDESIGN ToolBox TLB_ACTIONS { Pos = MAP_APPFONT ( 6 , 6 ) ; - // Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ; + // Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ; ButtonType = BUTTON_SYMBOL; Align = BOXALIGN_TOP; HelpId = HID_INDEX_DIALOG_ACTION_TB; diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index a617abd6baa6..e4b78625718f 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,11 +39,11 @@ namespace dbaui { //...................................................................... -#define BROWSER_STANDARD_FLAGS BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | \ +#define BROWSER_STANDARD_FLAGS BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | \ BROWSER_HIDECURSOR | BROWSER_HIDESELECT | BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL -#define COLUMN_ID_FIELDNAME 1 -#define COLUMN_ID_ORDER 2 +#define COLUMN_ID_FIELDNAME 1 +#define COLUMN_ID_ORDER 2 using namespace ::com::sun::star::uno; using namespace ::svt; @@ -54,8 +54,8 @@ namespace dbaui class DbaMouseDownListBoxController : public ListBoxCellController { protected: - Link m_aOriginalModifyHdl; - Link m_aAdditionalModifyHdl; + Link m_aOriginalModifyHdl; + Link m_aAdditionalModifyHdl; public: DbaMouseDownListBoxController(ListBoxControl* _pParent) @@ -131,7 +131,7 @@ DBG_NAME(IndexFieldsControl) { delete m_pSortingCell; delete m_pFieldNameCell; - + DBG_DTOR(IndexFieldsControl,NULL); } @@ -198,7 +198,7 @@ DBG_NAME(IndexFieldsControl) // insert rows for the the fields RowInserted(GetRowCount(), m_aFields.size(), sal_False); // insert an additional row for a new field for that index -// if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex ) +// if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex ) RowInserted(GetRowCount(), 1, sal_False); SetUpdateMode(sal_True); @@ -282,7 +282,7 @@ DBG_NAME(IndexFieldsControl) // for the field name cell m_pFieldNameCell = new ListBoxControl(&GetDataWindow()); m_pFieldNameCell->InsertEntry(String()); - m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); + m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); const ::rtl::OUString* pFields = _rAvailableFields.getConstArray(); const ::rtl::OUString* pFieldsEnd = pFields + _rAvailableFields.getLength(); for (;pFields < pFieldsEnd; ++pFields) @@ -363,7 +363,7 @@ DBG_NAME(IndexFieldsControl) { sal_Int32 nRow = GetCurRow(); OSL_ENSURE(nRow < (sal_Int32)m_aFields.size(), "IndexFieldsControl::SaveModified: invalid current row!"); - if (nRow >= 0) // may be -1 in case the control was empty + if (nRow >= 0) // may be -1 in case the control was empty { // remove the field from the selection IndexFieldsIterator aPos = m_aFields.begin() + nRow; @@ -436,9 +436,9 @@ DBG_NAME(IndexFieldsControl) m_aModifyHdl.Call(this); if (_pBox == m_pFieldNameCell) - { // a field has been selected + { // a field has been selected if (GetCurRow() >= GetRowCount() - 2) - { // and we're in one of the last two rows + { // and we're in one of the last two rows String sSelectedEntry = m_pFieldNameCell->GetSelectEntry(); sal_Int32 nCurrentRow = GetCurRow(); sal_Int32 rowCount = GetRowCount(); @@ -446,14 +446,14 @@ DBG_NAME(IndexFieldsControl) OSL_ENSURE(((sal_Int32)(m_aFields.size() + 1)) == rowCount, "IndexFieldsControl::OnListEntrySelected: inconsistence!"); if (sSelectedEntry.Len() && (nCurrentRow == rowCount - 1) /*&& (!m_nMaxColumnsInIndex || rowCount < m_nMaxColumnsInIndex )*/ ) - { // in the last row, an non-empty string has been selected + { // in the last row, an non-empty string has been selected // -> insert a new row m_aFields.push_back(OIndexField()); RowInserted(GetRowCount(), 1); Invalidate(GetRowRectPixel(nCurrentRow)); } else if (!sSelectedEntry.Len() && (nCurrentRow == rowCount - 2)) - { // in the (last-1)th row, an empty entry has been selected + { // in the (last-1)th row, an empty entry has been selected // -> remove the last row m_aFields.erase(m_aFields.end() - 1); RowRemoved(GetRowCount() - 1, 1); @@ -504,7 +504,7 @@ DBG_NAME(IndexFieldsControl) //------------------------------------------------------------------ //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 1f27f2408f17..488be71caad1 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,22 +42,22 @@ #ifdef HAVE_ODBC_SUPPORT #if defined(WIN) || defined(OS2) -#define ODBC_LIBRARY "ODBC.DLL" -#define ODBC_UI_LIBRARY "ODBCINST.DLL" +#define ODBC_LIBRARY "ODBC.DLL" +#define ODBC_UI_LIBRARY "ODBCINST.DLL" #endif #if defined WNT -#define ODBC_LIBRARY "ODBC32.DLL" -#define ODBC_UI_LIBRARY "ODBCCP32.DLL" +#define ODBC_LIBRARY "ODBC32.DLL" +#define ODBC_UI_LIBRARY "ODBCCP32.DLL" #endif #ifdef UNX #ifdef MACOSX -#define ODBC_LIBRARY "libiodbc.dylib" -#define ODBC_UI_LIBRARY "libiodbcinst.dylib" +#define ODBC_LIBRARY "libiodbc.dylib" +#define ODBC_UI_LIBRARY "libiodbcinst.dylib" #else -#define ODBC_LIBRARY_1 "libodbc.so.1" -#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1" -#define ODBC_LIBRARY "libodbc.so" -#define ODBC_UI_LIBRARY "libodbcinst.so" +#define ODBC_LIBRARY_1 "libodbc.so.1" +#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1" +#define ODBC_LIBRARY "libodbc.so" +#define ODBC_UI_LIBRARY "libodbcinst.so" #endif #endif @@ -101,10 +101,10 @@ #else -#define ODBC_LIBRARY "" -#define ODBC_UI_LIBRARY "" +#define ODBC_LIBRARY "" +#define ODBC_UI_LIBRARY "" -#endif // HAVE_ODBC_SUPPORT +#endif // HAVE_ODBC_SUPPORT //......................................................................... namespace dbaui @@ -114,10 +114,10 @@ namespace dbaui #ifdef HAVE_ODBC_SUPPORT typedef SQLRETURN (SQL_API* TSQLManageDataSource) (SQLHWND hwndParent); -typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr); +typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr); typedef SQLRETURN (SQL_API* TSQLFreeHandle) (SQLSMALLINT HandleType, SQLHANDLE Handle); typedef SQLRETURN (SQL_API* TSQLSetEnvAttr) (SQLHENV EnvironmentHandle, SQLINTEGER Attribute, SQLPOINTER ValuePtr, SQLINTEGER StringLength); -typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, +typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, SQLSMALLINT BufferLength1, SQLSMALLINT* NameLength1Ptr, SQLCHAR* Description, SQLSMALLINT BufferLength2, SQLSMALLINT* NameLength2Ptr); #define NSQLManageDataSource(a) (*(TSQLManageDataSource)(m_pSQLManageDataSource))(a) @@ -184,10 +184,10 @@ OOdbcLibWrapper::~OOdbcLibWrapper() struct OdbcTypesImpl { #ifdef HAVE_ODBC_SUPPORT - SQLHANDLE hEnvironment; + SQLHANDLE hEnvironment; OdbcTypesImpl() : hEnvironment(0) { } #else - void* pDummy; + void* pDummy; #endif }; DBG_NAME(OOdbcEnumeration) @@ -291,7 +291,7 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) SQLRETURN nResult = SQL_SUCCESS; rtl_TextEncoding nTextEncoding = osl_getThreadTextEncoding(); - for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription); + for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription); ; nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_NEXT, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription) ) @@ -382,7 +382,7 @@ bool OOdbcManagement::isRunning() const #endif // HAVE_ODBC_ADMINISTRATION //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 479c0743953b..e66e0bf21c2c 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,14 +56,14 @@ namespace dbaui */ class OOdbcLibWrapper { - oslModule m_pOdbcLib; // the library handle - ::rtl::OUString m_sLibPath; // the path to the library + oslModule m_pOdbcLib; // the library handle + ::rtl::OUString m_sLibPath; // the path to the library public: #ifdef HAVE_ODBC_SUPPORT - sal_Bool isLoaded() const { return NULL != m_pOdbcLib; } + sal_Bool isLoaded() const { return NULL != m_pOdbcLib; } #else - sal_Bool isLoaded() const { return sal_False; } + sal_Bool isLoaded() const { return sal_False; } #endif ::rtl::OUString getLibraryName() const { return m_sLibPath; } @@ -78,9 +78,9 @@ protected: oslGenericFunction loadSymbol(const sal_Char* _pFunctionName); /// load the lib - sal_Bool load(const sal_Char* _pLibPath); + sal_Bool load(const sal_Char* _pLibPath); /// unload the lib - void unload(); + void unload(); }; //========================================================================= @@ -97,7 +97,7 @@ class OOdbcEnumeration : public OOdbcLibWrapper oslGenericFunction m_pDataSources; #endif - OdbcTypesImpl* m_pImpl; + OdbcTypesImpl* m_pImpl; // needed because we can't have a member of type SQLHANDLE: this would require us to include the respective // ODBC file, which would lead to a lot of conflicts with other includes @@ -105,13 +105,13 @@ public: OOdbcEnumeration(); ~OOdbcEnumeration(); - void getDatasourceNames(StringBag& _rNames); + void getDatasourceNames(StringBag& _rNames); protected: /// ensure that an ODBC environment is allocated - sal_Bool allocEnv(); + sal_Bool allocEnv(); /// free any allocated ODBC environment - void freeEnv(); + void freeEnv(); }; //========================================================================= @@ -134,7 +134,7 @@ public: #endif //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ODBC_CONFIG_HXX_ diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index 5a271ab4be45..050ab6e6f7cd 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index 0fdb2dedf611..6890ac7a2df5 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ namespace dbaui OptionalBoolItem( sal_Int16 nWhich ); OptionalBoolItem( const OptionalBoolItem& _rSource ); - virtual int operator==( const SfxPoolItem& _rItem ) const; - virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const; + virtual int operator==( const SfxPoolItem& _rItem ) const; + virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const; bool HasValue() const { return !!m_aValue; } void ClearValue() { m_aValue.reset(); } diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 21023208a4d7..29d0460eda39 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ #include "localresaccess.hxx" #include <unotools/syslocale.hxx> -#define EF_VISITED 0x0001 -#define EF_DIRTY 0x0002 +#define EF_VISITED 0x0001 +#define EF_DIRTY 0x0002 //......................................................................... namespace dbaui { //......................................................................... - + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -66,19 +66,19 @@ namespace dbaui //================================================================== //------------------------------------------------------------------------------ - #define INIT_MEMBERS() \ - :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \ - ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \ - ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \ - ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \ - ,m_aParam (this, ModuleRes(ET_PARAM)) \ - ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \ - ,m_aOKBtn (this, ModuleRes(BT_OK)) \ - ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \ - ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \ - ,m_xConnection(_rxConnection) \ - ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \ - ,m_bNeedErrorOnCurrent(sal_True) \ + #define INIT_MEMBERS() \ + :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \ + ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \ + ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \ + ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \ + ,m_aParam (this, ModuleRes(ET_PARAM)) \ + ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \ + ,m_aOKBtn (this, ModuleRes(BT_OK)) \ + ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \ + ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \ + ,m_xConnection(_rxConnection) \ + ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \ + ,m_bNeedErrorOnCurrent(sal_True) \ //------------------------------------------------------------------------------ @@ -136,7 +136,7 @@ DBG_NAME(OParameterDialog) { DBG_UNHANDLED_EXCEPTION(); } - + Construct(); @@ -169,12 +169,12 @@ DBG_NAME(OParameterDialog) m_aAllParams.SelectEntryPos(0); LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams); - if (m_aAllParams.GetEntryCount() == 1) + if (m_aAllParams.GetEntryCount() == 1) { m_aTravelNext.Enable(sal_False); } - if (m_aAllParams.GetEntryCount() > 1) + if (m_aAllParams.GetEntryCount() > 1) { m_aOKBtn.SetStyle(m_aOKBtn.GetStyle() & ~WB_DEFBUTTON); m_aTravelNext.SetStyle(m_aTravelNext.GetStyle() | WB_DEFBUTTON); @@ -216,14 +216,14 @@ DBG_NAME(OParameterDialog) if (!m_bNeedErrorOnCurrent) return 1L; - m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified + m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified ::rtl::OUString sName; - try - { - sName = ::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME)); - } - catch(Exception&) + try + { + sName = ::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME)); + } + catch(Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -250,8 +250,8 @@ DBG_NAME(OParameterDialog) if (&m_aCancelBtn == pButton) { // no interpreting of the given values anymore .... - m_aParam.SetLoseFocusHdl(Link()); // no direct call from the control anymore ... - m_bNeedErrorOnCurrent = sal_False; // in case of any indirect calls -> no error message + m_aParam.SetLoseFocusHdl(Link()); // no direct call from the control anymore ... + m_bNeedErrorOnCurrent = sal_False; // in case of any indirect calls -> no error message m_aCancelBtn.SetClickHdl(Link()); m_aCancelBtn.Click(); } @@ -259,7 +259,7 @@ DBG_NAME(OParameterDialog) { // transfer the current values into the Any if (LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams) != 0L) - { // there was an error interpreting the current text + { // there was an error interpreting the current text m_bNeedErrorOnCurrent = sal_True; // we're are out of the complex web :) of direct and indirect calls to OnValueLoseFocus now, // so the next time it is called we need an error message, again .... @@ -288,7 +288,7 @@ DBG_NAME(OParameterDialog) { DBG_UNHANDLED_EXCEPTION(); } - + } // to close the dialog (which is more code than a simple EndDialog) m_aOKBtn.SetClickHdl(Link()); @@ -333,7 +333,7 @@ DBG_NAME(OParameterDialog) { // do the transformation of the current text if (LINK(this, OParameterDialog, OnValueLoseFocus).Call(&m_aParam) != 0L) - { // there was an error interpreting the text + { // there was an error interpreting the text m_aAllParams.SelectEntryPos(m_nCurrentlySelected); return 1L; } @@ -369,7 +369,7 @@ DBG_NAME(OParameterDialog) // was it the last "not visited yet" entry ? ConstByteVectorIterator aIter; - for ( aIter = m_aVisitedParams.begin(); + for ( aIter = m_aVisitedParams.begin(); aIter < m_aVisitedParams.end(); ++aIter ) @@ -378,10 +378,10 @@ DBG_NAME(OParameterDialog) break; } if (aIter == m_aVisitedParams.end()) - { // yes, there isn't another one -> change the "default button" + { // yes, there isn't another one -> change the "default button" m_aTravelNext.SetStyle(m_aTravelNext.GetStyle() & ~WB_DEFBUTTON); m_aOKBtn.SetStyle(m_aOKBtn.GetStyle() | WB_DEFBUTTON); - + // set to focus to one of the buttons temporary (with this their "default"-state is really updated) Window* pOldFocus = Application::GetFocusWindow(); @@ -421,7 +421,7 @@ DBG_NAME(OParameterDialog) //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/paramdialog.hrc b/dbaccess/source/ui/dlg/paramdialog.hrc index 0b834dd3e7eb..c344ef454c65 100644 --- a/dbaccess/source/ui/dlg/paramdialog.hrc +++ b/dbaccess/source/ui/dlg/paramdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,19 +28,19 @@ #ifndef _DBAUI_PARAMDIALOG_HRC_ #define _DBAUI_PARAMDIALOG_HRC_ -#define LB_ALLPARAMS 1 -#define FL_PARAMS 2 -#define FT_VALUE 3 -#define ET_PARAM 4 -#define CB_NULLVAL 5 -#define BT_TRAVELNEXT 6 -#define BT_OK 7 -#define BT_CANCEL 8 -#define AB_PREV 9 -#define AB_NEXT 10 +#define LB_ALLPARAMS 1 +#define FL_PARAMS 2 +#define FT_VALUE 3 +#define ET_PARAM 4 +#define CB_NULLVAL 5 +#define BT_TRAVELNEXT 6 +#define BT_OK 7 +#define BT_CANCEL 8 +#define AB_PREV 9 +#define AB_NEXT 10 -#define STR_COULD_NOT_CONVERT_PARAM 1 +#define STR_COULD_NOT_CONVERT_PARAM 1 #endif // _DBAUI_PARAMDIALOG_HRC_ diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src index 3993096f8847..c35e395c697c 100644 --- a/dbaccess/source/ui/dlg/paramdialog.src +++ b/dbaccess/source/ui/dlg/paramdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,8 +32,8 @@ #include "dbu_dlg.hrc" #endif -#define LIST_WIDTH 100 -#define LIST_HEIGHT 50 +#define LIST_WIDTH 100 +#define LIST_HEIGHT 50 ModalDialog DLG_PARAMETERS { diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 6c3a6124f5b4..a6baa7f06439 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,26 +88,26 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, const Reference< XNameAccess>& _rxCols ) :ModalDialog( pParent, ModuleRes( DLG_FILTERCRIT ) ) - ,aLB_WHEREFIELD1 ( this, ModuleRes( LB_WHEREFIELD1 ) ) - ,aLB_WHERECOMP1 ( this, ModuleRes( LB_WHERECOMP1 ) ) - ,aET_WHEREVALUE1 ( this, ModuleRes( ET_WHEREVALUE1 ) ) - ,aLB_WHERECOND2 ( this, ModuleRes( LB_WHERECOND2 ) ) - ,aLB_WHEREFIELD2 ( this, ModuleRes( LB_WHEREFIELD2 ) ) - ,aLB_WHERECOMP2 ( this, ModuleRes( LB_WHERECOMP2 ) ) - ,aET_WHEREVALUE2 ( this, ModuleRes( ET_WHEREVALUE2 ) ) - ,aLB_WHERECOND3 ( this, ModuleRes( LB_WHERECOND3 ) ) - ,aLB_WHEREFIELD3 ( this, ModuleRes( LB_WHEREFIELD3 ) ) - ,aLB_WHERECOMP3 ( this, ModuleRes( LB_WHERECOMP3 ) ) - ,aET_WHEREVALUE3 ( this, ModuleRes( ET_WHEREVALUE3 ) ) - ,aFT_WHEREFIELD ( this, ModuleRes( FT_WHEREFIELD ) ) - ,aFT_WHERECOMP ( this, ModuleRes( FT_WHERECOMP ) ) - ,aFT_WHEREVALUE ( this, ModuleRes( FT_WHEREVALUE ) ) - ,aFT_WHEREOPER ( this, ModuleRes( FT_WHEREOPER ) ) + ,aLB_WHEREFIELD1 ( this, ModuleRes( LB_WHEREFIELD1 ) ) + ,aLB_WHERECOMP1 ( this, ModuleRes( LB_WHERECOMP1 ) ) + ,aET_WHEREVALUE1 ( this, ModuleRes( ET_WHEREVALUE1 ) ) + ,aLB_WHERECOND2 ( this, ModuleRes( LB_WHERECOND2 ) ) + ,aLB_WHEREFIELD2 ( this, ModuleRes( LB_WHEREFIELD2 ) ) + ,aLB_WHERECOMP2 ( this, ModuleRes( LB_WHERECOMP2 ) ) + ,aET_WHEREVALUE2 ( this, ModuleRes( ET_WHEREVALUE2 ) ) + ,aLB_WHERECOND3 ( this, ModuleRes( LB_WHERECOND3 ) ) + ,aLB_WHEREFIELD3 ( this, ModuleRes( LB_WHEREFIELD3 ) ) + ,aLB_WHERECOMP3 ( this, ModuleRes( LB_WHERECOMP3 ) ) + ,aET_WHEREVALUE3 ( this, ModuleRes( ET_WHEREVALUE3 ) ) + ,aFT_WHEREFIELD ( this, ModuleRes( FT_WHEREFIELD ) ) + ,aFT_WHERECOMP ( this, ModuleRes( FT_WHERECOMP ) ) + ,aFT_WHEREVALUE ( this, ModuleRes( FT_WHEREVALUE ) ) + ,aFT_WHEREOPER ( this, ModuleRes( FT_WHEREOPER ) ) ,aFL_FIELDS ( this, ModuleRes( FL_FIELDS ) ) - ,aBT_OK ( this, ModuleRes( BT_OK ) ) - ,aBT_CANCEL ( this, ModuleRes( BT_CANCEL ) ) - ,aBT_HELP ( this, ModuleRes( BT_HELP ) ) - ,aSTR_NOENTRY ( ModuleRes( STR_NOENTRY ) ) + ,aBT_OK ( this, ModuleRes( BT_OK ) ) + ,aBT_CANCEL ( this, ModuleRes( BT_CANCEL ) ) + ,aBT_HELP ( this, ModuleRes( BT_HELP ) ) + ,aSTR_NOENTRY ( ModuleRes( STR_NOENTRY ) ) ,aSTR_COMPARE_OPERATORS( ModuleRes( STR_COMPARE_OPERATORS ) ) ,m_xQueryComposer(_rxComposer) ,m_xColumns( _rxCols ) @@ -221,8 +221,8 @@ DlgFilterCrit::~DlgFilterCrit() DBG_DTOR(DlgFilterCrit,NULL); } -#define LbText(x) ((x).GetSelectEntry()) -#define LbPos(x) ((x).GetSelectEntryPos()) +#define LbText(x) ((x).GetSelectEntry()) +#define LbPos(x) ((x).GetSelectEntryPos()) //------------------------------------------------------------------------------ sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const String& _rSelectedPredicate ) const @@ -335,7 +335,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom { if ( xInfo->hasPropertyByName(PROPERTY_TABLENAME) ) { - xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; + xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; if ( sTableName.getLength() ) { // properly quote all parts of the table name, so e.g. <schema>.<table> becomes "<schema>"."<table>" @@ -344,7 +344,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, sal_True, ::dbtools::eInDataManipulation ); } } - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction")); if ( xInfo->hasPropertyByName(sAgg) ) xColumn->getPropertyValue(sAgg) >>= bHaving; @@ -354,7 +354,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom } if ( !bFunction ) { - const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); + const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); _rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name); if ( sTableName.getLength() ) { @@ -394,14 +394,14 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie { Sequence< ::rtl::OUString> aSeq = xColumns->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xProp(xColumns->getByName(*pIter),UNO_QUERY); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { ::rtl::OUString sRealName; - xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; if ( sRealName == _rFieldName ) { if ( m_xColumns.is() && m_xColumns->hasByName( *pIter ) ) @@ -487,7 +487,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Bool _bOr ) { DBG_CHKTHIS(DlgFilterCrit,NULL); - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; _rItem.Value >>= aCondition; String aStr = aCondition.getStr(); ::Replace_SQL_PlaceHolder(aStr); @@ -499,7 +499,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo switch(_rItem.Handle) { case SQLFilterOperator::EQUAL: - // aStr.Erase(0,1); + // aStr.Erase(0,1); break; case SQLFilterOperator::NOT_EQUAL: aStr.Erase(0,2); @@ -586,11 +586,11 @@ void DlgFilterCrit::SelectField( ListBox& rBox, const String& rField ) { DBG_CHKTHIS(DlgFilterCrit,NULL); sal_uInt16 nCnt = rBox.GetEntryCount(); - // sal_Bool bCase = m_rIterator.TablesAreSensitive(); + // sal_Bool bCase = m_rIterator.TablesAreSensitive(); for( sal_uInt16 i=0 ; i<nCnt ; i++ ) { - // if(bCase ? rBox.GetEntry(i) == rField : rBox.GetEntry(i).EqualsIgnoreCaseAscii(rField)) + // if(bCase ? rBox.GetEntry(i) == rField : rBox.GetEntry(i).EqualsIgnoreCaseAscii(rField)) if(rBox.GetEntry(i) == rField) { rBox.SelectEntryPos(i); @@ -781,7 +781,7 @@ void DlgFilterCrit::BuildWherePart() Sequence<Sequence<PropertyValue> > aFilter,aHaving; aFilter.realloc(1); aHaving.realloc(1); - // ::rtl::OUString aFilter; + // ::rtl::OUString aFilter; if( LbPos(aLB_WHEREFIELD1) != 0 ) { @@ -859,13 +859,13 @@ void DlgFilterCrit::BuildWherePart() void DlgFilterCrit::fillLines(const Sequence<Sequence<PropertyValue > >& _aValues) { const Sequence<PropertyValue >* pOrIter = _aValues.getConstArray(); - const Sequence<PropertyValue >* pOrEnd = pOrIter + _aValues.getLength(); + const Sequence<PropertyValue >* pOrEnd = pOrIter + _aValues.getLength(); sal_Bool bOr = sal_True; for(sal_uInt16 i=0;pOrIter != pOrEnd; ++pOrIter) { bOr = sal_True; - const PropertyValue* pAndIter = pOrIter->getConstArray(); - const PropertyValue* pAndEnd = pAndIter + pOrIter->getLength(); + const PropertyValue* pAndIter = pOrIter->getConstArray(); + const PropertyValue* pAndEnd = pAndIter + pOrIter->getLength(); for(;pAndIter != pAndEnd; ++pAndIter) { SetLine( i++,*pAndIter,bOr); diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc index ff2aaaca30d0..9895f222e274 100644 --- a/dbaccess/source/ui/dlg/queryfilter.hrc +++ b/dbaccess/source/ui/dlg/queryfilter.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,34 +31,34 @@ #include "dbu_dlg.hrc" #endif -#define FT_WHEREFIELD 1 -#define FT_WHERECOMP 2 -#define FT_WHEREVALUE 3 -#define FT_WHEREOPER 4 +#define FT_WHEREFIELD 1 +#define FT_WHERECOMP 2 +#define FT_WHEREVALUE 3 +#define FT_WHEREOPER 4 -#define LB_WHEREFIELD1 1 -#define LB_WHERECOMP1 2 -#define LB_WHEREFIELD2 3 -#define LB_WHERECOMP2 4 -#define LB_WHEREFIELD3 5 -#define LB_WHERECOMP3 6 -#define LB_WHERECOND2 7 -#define LB_WHERECOND3 8 +#define LB_WHEREFIELD1 1 +#define LB_WHERECOMP1 2 +#define LB_WHEREFIELD2 3 +#define LB_WHERECOMP2 4 +#define LB_WHEREFIELD3 5 +#define LB_WHERECOMP3 6 +#define LB_WHERECOND2 7 +#define LB_WHERECOND3 8 #define FL_FIELDS 1 -#define ET_WHEREVALUE1 1 -#define ET_WHEREVALUE2 2 -#define ET_WHEREVALUE3 3 +#define ET_WHEREVALUE1 1 +#define ET_WHEREVALUE2 2 +#define ET_WHEREVALUE3 3 -#define STR_NOENTRY 1 -#define STR_NOENTRY2 2 -#define STR_DEFAULT 3 +#define STR_NOENTRY 1 +#define STR_NOENTRY2 2 +#define STR_DEFAULT 3 #define STR_COMPARE_OPERATORS 4 -#define BT_OK 1 -#define BT_CANCEL 2 -#define BT_HELP 3 +#define BT_OK 1 +#define BT_CANCEL 2 +#define BT_HELP 3 #endif // DBAUI_QUERYFILTER_HRC diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src index 2b1ef6e6baf5..fcabfdcb496e 100644 --- a/dbaccess/source/ui/dlg/queryfilter.src +++ b/dbaccess/source/ui/dlg/queryfilter.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,11 +84,11 @@ ModalDialog DLG_FILTERCRIT TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; -// STRLST_AND_OR +// STRLST_AND_OR StringList [ en-US ] = { - < "AND" ; Default ; > ; - < "OR" ; Default ; > ; + < "AND" ; Default ; > ; + < "OR" ; Default ; > ; }; }; ListBox LB_WHEREFIELD2 @@ -124,11 +124,11 @@ ModalDialog DLG_FILTERCRIT TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; -// STRLST_AND_OR +// STRLST_AND_OR StringList [ en-US ] = { - < "AND" ; Default ; > ; - < "OR" ; Default ; > ; + < "AND" ; Default ; > ; + < "OR" ; Default ; > ; }; }; ListBox LB_WHEREFIELD3 diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index d237978ce1ce..527cc15a4deb 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,27 +60,27 @@ using namespace ::com::sun::star::beans; DBG_NAME(DlgOrderCrit) //------------------------------------------------------------------------------ -DlgOrderCrit::DlgOrderCrit( Window * pParent, +DlgOrderCrit::DlgOrderCrit( Window * pParent, const Reference< XConnection>& _rxConnection, const Reference< XSingleSelectQueryComposer >& _rxComposer, const Reference< XNameAccess>& _rxCols) :ModalDialog( pParent, ModuleRes(DLG_ORDERCRIT) ) - ,aLB_ORDERFIELD1( this, ModuleRes( LB_ORDERFIELD1 ) ) - ,aLB_ORDERVALUE1( this, ModuleRes( LB_ORDERVALUE1 ) ) - ,aLB_ORDERFIELD2( this, ModuleRes( LB_ORDERFIELD2 ) ) - ,aLB_ORDERVALUE2( this, ModuleRes( LB_ORDERVALUE2 ) ) - ,aLB_ORDERFIELD3( this, ModuleRes( LB_ORDERFIELD3 ) ) - ,aLB_ORDERVALUE3( this, ModuleRes( LB_ORDERVALUE3 ) ) - ,aFT_ORDERFIELD( this, ModuleRes( FT_ORDERFIELD ) ) - ,aFT_ORDERAFTER1( this, ModuleRes( FT_ORDERAFTER1 ) ) - ,aFT_ORDERAFTER2( this, ModuleRes( FT_ORDERAFTER2 ) ) - ,aFT_ORDEROPER( this, ModuleRes( FT_ORDEROPER ) ) - ,aFT_ORDERDIR( this, ModuleRes( FT_ORDERDIR ) ) - ,aBT_OK( this, ModuleRes( BT_OK ) ) - ,aBT_CANCEL( this, ModuleRes( BT_CANCEL ) ) - ,aBT_HELP( this, ModuleRes( BT_HELP ) ) + ,aLB_ORDERFIELD1( this, ModuleRes( LB_ORDERFIELD1 ) ) + ,aLB_ORDERVALUE1( this, ModuleRes( LB_ORDERVALUE1 ) ) + ,aLB_ORDERFIELD2( this, ModuleRes( LB_ORDERFIELD2 ) ) + ,aLB_ORDERVALUE2( this, ModuleRes( LB_ORDERVALUE2 ) ) + ,aLB_ORDERFIELD3( this, ModuleRes( LB_ORDERFIELD3 ) ) + ,aLB_ORDERVALUE3( this, ModuleRes( LB_ORDERVALUE3 ) ) + ,aFT_ORDERFIELD( this, ModuleRes( FT_ORDERFIELD ) ) + ,aFT_ORDERAFTER1( this, ModuleRes( FT_ORDERAFTER1 ) ) + ,aFT_ORDERAFTER2( this, ModuleRes( FT_ORDERAFTER2 ) ) + ,aFT_ORDEROPER( this, ModuleRes( FT_ORDEROPER ) ) + ,aFT_ORDERDIR( this, ModuleRes( FT_ORDERDIR ) ) + ,aBT_OK( this, ModuleRes( BT_OK ) ) + ,aBT_CANCEL( this, ModuleRes( BT_CANCEL ) ) + ,aBT_HELP( this, ModuleRes( BT_HELP ) ) ,aFL_ORDER( this, ModuleRes( FL_ORDER ) ) - ,aSTR_NOENTRY( ModuleRes( STR_NOENTRY ) ) + ,aSTR_NOENTRY( ModuleRes( STR_NOENTRY ) ) ,m_xQueryComposer( _rxComposer ) ,m_xColumns(_rxCols) ,m_xConnection(_rxConnection) @@ -156,8 +156,8 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent, //------------------------------------------------------------------------------ -#define LbText(x) ((x).GetSelectEntry()) -#define LbPos(x) ((x).GetSelectEntryPos()) +#define LbText(x) ((x).GetSelectEntry()) +#define LbPos(x) ((x).GetSelectEntryPos()) //------------------------------------------------------------------------------ DlgOrderCrit::~DlgOrderCrit() @@ -246,7 +246,7 @@ void DlgOrderCrit::EnableLines() { DBG_CHKTHIS(DlgOrderCrit,NULL); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); - ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); + ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); static const ::rtl::OUString sDESC = ::rtl::OUString::createFromAscii(" DESC "); static const ::rtl::OUString sASC = ::rtl::OUString::createFromAscii(" ASC "); @@ -270,7 +270,7 @@ void DlgOrderCrit::EnableLines() if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { ::rtl::OUString sRealName; - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; sName = sRealName; static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction")); static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function")); diff --git a/dbaccess/source/ui/dlg/queryorder.hrc b/dbaccess/source/ui/dlg/queryorder.hrc index 059151ba9a8d..fde41dfc39d9 100644 --- a/dbaccess/source/ui/dlg/queryorder.hrc +++ b/dbaccess/source/ui/dlg/queryorder.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,26 +32,26 @@ #endif -#define FT_ORDERFIELD 1 -#define FT_ORDERDIR 3 -#define FT_ORDERAFTER1 4 -#define FT_ORDERAFTER2 5 -#define FT_ORDEROPER 6 +#define FT_ORDERFIELD 1 +#define FT_ORDERDIR 3 +#define FT_ORDERAFTER1 4 +#define FT_ORDERAFTER2 5 +#define FT_ORDEROPER 6 -#define LB_ORDERFIELD1 1 -#define LB_ORDERFIELD2 2 -#define LB_ORDERFIELD3 3 -#define LB_ORDERVALUE1 4 -#define LB_ORDERVALUE2 5 -#define LB_ORDERVALUE3 6 +#define LB_ORDERFIELD1 1 +#define LB_ORDERFIELD2 2 +#define LB_ORDERFIELD3 3 +#define LB_ORDERVALUE1 4 +#define LB_ORDERVALUE2 5 +#define LB_ORDERVALUE3 6 #define FL_ORDER 1 -#define BT_OK 1 -#define BT_CANCEL 2 -#define BT_HELP 3 +#define BT_OK 1 +#define BT_CANCEL 2 +#define BT_HELP 3 -#define STR_NOENTRY 1 +#define STR_NOENTRY 1 #endif // DBAUI_QUERYORDER_HRC diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src index 2f2f85a797a0..2927be9d838a 100644 --- a/dbaccess/source/ui/dlg/queryorder.src +++ b/dbaccess/source/ui/dlg/queryorder.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 0220c2691ade..20db037334ef 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include "UITools.hxx" #include "moduledbu.hxx" -#define BUTTONID_MORE BUTTONID_RETRY + 1 +#define BUTTONID_MORE BUTTONID_RETRY + 1 #define DIALOG_WIDTH 220 #define OUTER_MARGIN 6 @@ -126,7 +126,7 @@ namespace :m_label( ModuleRes( _labelResourceID ) ) { } - + virtual String getLabel() const { return m_label; @@ -327,11 +327,11 @@ namespace class OExceptionChainDialog : public ModalDialog { FixedLine m_aFrame; - FixedText m_aListLabel; - SvTreeListBox m_aExceptionList; - FixedText m_aDescLabel; - MultiLineEdit m_aExceptionText; - OKButton m_aOK; + FixedText m_aListLabel; + SvTreeListBox m_aExceptionList; + FixedText m_aDescLabel; + MultiLineEdit m_aExceptionText; + OKButton m_aOK; String m_sStatusLabel; String m_sErrorCodeLabel; @@ -350,12 +350,12 @@ DBG_NAME(OExceptionChainDialog) //------------------------------------------------------------------------------ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions ) :ModalDialog(pParent, ModuleRes(DLG_SQLEXCEPTIONCHAIN)) - ,m_aFrame (this, ModuleRes(FL_DETAILS)) - ,m_aListLabel (this, ModuleRes(FT_ERRORLIST)) - ,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST)) - ,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION)) - ,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION)) - ,m_aOK (this, ModuleRes(PB_OK)) + ,m_aFrame (this, ModuleRes(FL_DETAILS)) + ,m_aListLabel (this, ModuleRes(FT_ERRORLIST)) + ,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST)) + ,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION)) + ,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION)) + ,m_aOK (this, ModuleRes(PB_OK)) ,m_aExceptions( _rExceptions ) { DBG_CTOR(OExceptionChainDialog,NULL); @@ -505,11 +505,11 @@ void OSQLMessageBox::impl_positionControls() { OSL_PRECOND( !m_pImpl->aDisplayInfo.empty(), "OSQLMessageBox::impl_positionControls: nothing to display at all?" ); - + if ( m_pImpl->aDisplayInfo.empty() ) return; const ExceptionDisplayInfo* pSecondInfo = NULL; - + const ExceptionDisplayInfo& rFirstInfo = *m_pImpl->aDisplayInfo.begin(); if ( m_pImpl->aDisplayInfo.size() > 1 ) pSecondInfo = &m_pImpl->aDisplayInfo[1]; @@ -781,7 +781,7 @@ OSQLWarningBox::OSQLWarningBox( Window* _pParent, const UniString& _rMessage, Wi } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/sqlmessage.hrc b/dbaccess/source/ui/dlg/sqlmessage.hrc index 76f722a1b08f..b8267bafcb7a 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.hrc +++ b/dbaccess/source/ui/dlg/sqlmessage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,23 +28,23 @@ #ifndef _DBAUI_SQLMESSAGE_HRC_ #define _DBAUI_SQLMESSAGE_HRC_ -#define FT_ERRORLIST 1 -#define FT_DESCRIPTION 2 +#define FT_ERRORLIST 1 +#define FT_DESCRIPTION 2 -#define ED_TEXT 1 +#define ED_TEXT 1 #define FL_DATA 1 -#define FL_DETAILS 1 +#define FL_DETAILS 1 -#define PB_OK 1 -#define PB_CANCEL 2 +#define PB_OK 1 +#define PB_CANCEL 2 -#define CTL_ERRORLIST 1 +#define CTL_ERRORLIST 1 -#define ME_DESCRIPTION 1 +#define ME_DESCRIPTION 1 -#define STR_EXCEPTION_STATUS 1 -#define STR_EXCEPTION_ERRORCODE 2 +#define STR_EXCEPTION_STATUS 1 +#define STR_EXCEPTION_ERRORCODE 2 #endif // _DBAUI_SQLMESSAGE_HRC_ diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src index af3d53f785dd..fe368f1824d5 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ b/dbaccess/source/ui/dlg/sqlmessage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 441aa6c6f846..99857a2c8249 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,11 +86,11 @@ DBG_NAME(OTableSubscriptionPage) //------------------------------------------------------------------------ OTableSubscriptionPage::OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs,OTableSubscriptionDialog* _pTablesDlg ) :OGenericAdministrationPage( pParent, ModuleRes(PAGE_TABLESUBSCRIPTION), _rCoreAttrs ) - ,m_aTables (this, ModuleRes(FL_SEPARATOR1)) - ,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True) - ,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION)) - ,m_bCheckedAll ( sal_False ) - ,m_bCatalogAtStart ( sal_True ) + ,m_aTables (this, ModuleRes(FL_SEPARATOR1)) + ,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True) + ,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION)) + ,m_bCheckedAll ( sal_False ) + ,m_bCatalogAtStart ( sal_True ) ,m_pTablesDlg(_pTablesDlg) { DBG_CTOR(OTableSubscriptionPage,NULL); @@ -140,9 +140,9 @@ DBG_NAME(OTableSubscriptionPage) { OGenericAdministrationPage::DataChanged( rDCEvt ); - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode m_aTablesList.notifyHiContrastChanged(); @@ -233,13 +233,13 @@ DBG_NAME(OTableSubscriptionPage) void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter ) { if (!_rTableFilter.getLength()) - { // no tables visible + { // no tables visible CheckAll(sal_False); } else { if ((1 == _rTableFilter.getLength()) && _rTableFilter[0].equalsAsciiL("%", 1)) - { // all tables visible + { // all tables visible CheckAll(sal_True); } else @@ -260,7 +260,7 @@ DBG_NAME(OTableSubscriptionPage) String sDSName = pNameItem->GetValue(); if (bValid && sDSName.Len() && !m_xCurrentConnection.is() ) - { // get the current table list from the connection for the current settings + { // get the current table list from the connection for the current settings // the PropertyValues for the current dialog settings Sequence< PropertyValue > aConnectionParams; @@ -313,7 +313,7 @@ DBG_NAME(OTableSubscriptionPage) Any aTableTypeFilter = xProp->getPropertyValue(PROPERTY_TABLETYPEFILTER); Reference<XModifiable> xModi(getDataSourceOrModel(xProp),UNO_QUERY); - sal_Bool bModified = ( xModi.is() && xModi->isModified() ); + sal_Bool bModified = ( xModi.is() && xModi->isModified() ); Sequence< ::rtl::OUString > aNewTableFilter(1); aNewTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); @@ -330,7 +330,7 @@ DBG_NAME(OTableSubscriptionPage) xModi->setModified(sal_False); } - + if ( m_xCurrentConnection.is() ) { m_aTablesList.UpdateTableList( m_xCurrentConnection ); @@ -362,8 +362,8 @@ DBG_NAME(OTableSubscriptionPage) else { // in addition, we need some infos about the connection used - m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default) - m_bCatalogAtStart = sal_True; // (default) + m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default) + m_bCatalogAtStart = sal_True; // (default) try { Reference< XDatabaseMetaData > xMeta; @@ -459,7 +459,7 @@ DBG_NAME(OTableSubscriptionPage) String sLeftText = pLeftTextItem->GetText(); String sRightText = pRightTextItem->GetText(); - sal_Int32 nCompareResult = 0; // equal by default + sal_Int32 nCompareResult = 0; // equal by default if (m_xCollator.is()) { @@ -492,13 +492,13 @@ DBG_NAME(OTableSubscriptionPage) SvLBoxEntry* pEntry = m_aTablesList.GetModel()->Next(const_cast<SvLBoxEntry*>(pAllObjectsEntry)); while(pEntry) { - sal_Bool bCatalogWildcard = sal_False; - sal_Bool bSchemaWildcard = sal_False; + sal_Bool bCatalogWildcard = sal_False; + sal_Bool bSchemaWildcard = sal_False; SvLBoxEntry* pSchema = NULL; SvLBoxEntry* pCatalog = NULL; if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChilds(pEntry)) - { // checked and a leaf, which means it's no catalog, no schema, but a real table + { // checked and a leaf, which means it's no catalog, no schema, but a real table ::rtl::OUString sCatalog; if(m_aTablesList.GetModel()->HasParent(pEntry)) { @@ -508,7 +508,7 @@ DBG_NAME(OTableSubscriptionPage) pSchema = NULL; if (pSchema) - { // it's a real schema entry, not the "all objects" root + { // it's a real schema entry, not the "all objects" root if(m_aTablesList.GetModel()->HasParent(pSchema)) { pCatalog = m_aTablesList.GetModel()->GetParent(pSchema); @@ -517,7 +517,7 @@ DBG_NAME(OTableSubscriptionPage) pCatalog = NULL; if (pCatalog) - { // it's a real catalog entry, not the "all objects" root + { // it's a real catalog entry, not the "all objects" root bCatalogWildcard = m_aTablesList.isWildcardChecked(pCatalog); if (m_bCatalogAtStart) { @@ -598,7 +598,7 @@ DBG_NAME(OTableSubscriptionPage) ///////////////////////////////////////////////////////////////////////// // create the output string which contains all the table names if ( m_xCurrentConnection.is() ) - { // collect the table filter data only if we have a connection - else no tables are displayed at all + { // collect the table filter data only if we have a connection - else no tables are displayed at all Sequence< ::rtl::OUString > aTableFilter; if (m_aTablesList.isWildcardChecked(m_aTablesList.getAllObjectsEntry())) { @@ -628,7 +628,7 @@ DBG_NAME(OTableSubscriptionPage) } // ----------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index a15e7e159e53..97d343d6bf3a 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,34 +51,34 @@ namespace dbaui :public OGenericAdministrationPage { private: - FixedLine m_aTables; - OTableTreeListBox m_aTablesList; - FixedText m_aExplanation; + FixedLine m_aTables; + OTableTreeListBox m_aTablesList; + FixedText m_aExplanation; - ::rtl::OUString m_sCatalogSeparator; - sal_Bool m_bCheckedAll : 1; - sal_Bool m_bCatalogAtStart : 1; + ::rtl::OUString m_sCatalogSeparator; + sal_Bool m_bCheckedAll : 1; + sal_Bool m_bCatalogAtStart : 1; - ::osl::Mutex m_aNotifierMutex; + ::osl::Mutex m_aNotifierMutex; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xCurrentConnection; /// valid as long as the page is active + m_xCurrentConnection; /// valid as long as the page is active ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; OTableSubscriptionDialog* m_pTablesDlg; public: - virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); - virtual int DeactivatePage(SfxItemSet* _pSet); + virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); + virtual int DeactivatePage(SfxItemSet* _pSet); using OGenericAdministrationPage::DeactivatePage; - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); /** will be called when the controls need to be resized. */ - virtual void resizeControls(const Size& _rDiff); + virtual void resizeControls(const Size& _rDiff); OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg); virtual ~OTableSubscriptionPage(); @@ -91,9 +91,9 @@ namespace dbaui DECL_LINK( OnTreeEntryChecked, Control* ); private: + - - /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> + /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> */ void implCheckTables(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTables); @@ -115,7 +115,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_TABLESPAGE_HXX_ diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 2ceefab64a35..6371268a9324 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.src b/dbaccess/source/ui/dlg/textconnectionsettings.src index cca76e7f65a3..f285199c54ba 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.src +++ b/dbaccess/source/ui/dlg/textconnectionsettings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src index 2e2a64d87448..c579bc1b7323 100644 --- a/dbaccess/source/ui/imagelists/dbimagelists.src +++ b/dbaccess/source/ui/imagelists/dbimagelists.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx index adcd7bf75c4b..a6e8fbeed6d1 100644 --- a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx +++ b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,20 +32,20 @@ namespace dbaui { - class SAL_NO_VTABLE IAccessibleHelper + class SAL_NO_VTABLE IAccessibleHelper { protected: /** isEditable returns the current editable state - @return true if it is editable otherwise false + @return true if it is editable otherwise false */ virtual sal_Bool isEditable() const = 0; public: /** notifies all listeners that this object has changed - @param _nEventId the event id - @param _aOldValue the old value - @param _aNewValue the new value + @param _nEventId the event id + @param _aOldValue the old value + @param _aNewValue the new value */ - virtual void notifyAccessibleEvent( sal_Int16 _nEventId, + virtual void notifyAccessibleEvent( sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _aOldValue, const ::com::sun::star::uno::Any& _aNewValue) = 0; }; diff --git a/dbaccess/source/ui/inc/AppElementType.hxx b/dbaccess/source/ui/inc/AppElementType.hxx index 006f5ced1c73..6a6c25c704d7 100644 --- a/dbaccess/source/ui/inc/AppElementType.hxx +++ b/dbaccess/source/ui/inc/AppElementType.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,20 +37,20 @@ namespace dbaui enum ElementType { - E_TABLE = ::com::sun::star::sdb::application::DatabaseObject::TABLE, - E_QUERY = ::com::sun::star::sdb::application::DatabaseObject::QUERY, - E_FORM = ::com::sun::star::sdb::application::DatabaseObject::FORM, - E_REPORT = ::com::sun::star::sdb::application::DatabaseObject::REPORT, + E_TABLE = ::com::sun::star::sdb::application::DatabaseObject::TABLE, + E_QUERY = ::com::sun::star::sdb::application::DatabaseObject::QUERY, + E_FORM = ::com::sun::star::sdb::application::DatabaseObject::FORM, + E_REPORT = ::com::sun::star::sdb::application::DatabaseObject::REPORT, - E_NONE = 4, + E_NONE = 4, E_ELEMENT_TYPE_COUNT = E_NONE }; enum PreviewMode { - E_PREVIEWNONE = 0, - E_DOCUMENT = 1, - E_DOCUMENTINFO = 2 + E_PREVIEWNONE = 0, + E_DOCUMENT = 1, + E_DOCUMENTINFO = 2 }; enum ElementOpenMode diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 395ad71f3e0c..deb5750b9566 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,24 +43,24 @@ namespace dbaui /* this class allows to browse through the collection of forms and reports */ class OCollectionView : public ModalDialog - { - FixedText m_aFTCurrentPath; - ImageButton m_aNewFolder; - ImageButton m_aUp; - SvtFileView m_aView; - FixedText m_aFTName; - Edit m_aName; - FixedLine m_aFL; - PushButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_HELP; - String m_sPath; - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; - Size m_aDlgSize; - Size m_a6Size; - sal_Int32 m_nFixDeltaHeight; - sal_Bool m_bCreateForm; + { + FixedText m_aFTCurrentPath; + ImageButton m_aNewFolder; + ImageButton m_aUp; + SvtFileView m_aView; + FixedText m_aFTName; + Edit m_aName; + FixedLine m_aFL; + PushButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_HELP; + String m_sPath; + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; + Size m_aDlgSize; + Size m_a6Size; + sal_Int32 m_nFixDeltaHeight; + sal_Bool m_bCreateForm; DECL_LINK(Up_Click,PushButton*); DECL_LINK(NewFolder_Click,PushButton*); @@ -80,7 +80,7 @@ namespace dbaui ::rtl::OUString getName() const; }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index d0376cbf76dc..d0a7357d66be 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,28 +42,28 @@ namespace dbaui // ============================================================================================= class OColumnControlWindow : public OFieldDescControl { - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + ::com::sun::star::lang::Locale m_aLocale; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier - OTypeInfoMap m_aDestTypeInfo; + OTypeInfoMap m_aDestTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aDestTypeInfoIndex; - mutable TOTypeInfoSP m_pTypeInfo; // default type - String m_sTypeNames; // these type names are the ones out of the resource file - ::rtl::OUString m_sAutoIncrementValue; - sal_Bool m_bAutoIncrementEnabled; + mutable TOTypeInfoSP m_pTypeInfo; // default type + String m_sTypeNames; // these type names are the ones out of the resource file + ::rtl::OUString m_sAutoIncrementValue; + sal_Bool m_bAutoIncrementEnabled; protected: - virtual void ActivateAggregate( EControlType eType ); - virtual void DeactivateAggregate( EControlType eType ); + virtual void ActivateAggregate( EControlType eType ); + virtual void DeactivateAggregate( EControlType eType ); - virtual ::com::sun::star::lang::Locale GetLocale() const; + virtual ::com::sun::star::lang::Locale GetLocale() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); - virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; - virtual void CellModified(long nRow, USHORT nColId ); + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); + virtual sal_Bool isAutoIncrementValueEnabled() const; + virtual ::rtl::OUString getAutoIncrementValue() const; + virtual void CellModified(long nRow, USHORT nColId ); public: OColumnControlWindow(Window* pParent @@ -74,11 +74,11 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(); - virtual const OTypeInfoMap* getTypeInfo() const; + virtual const OTypeInfoMap* getTypeInfo() const; TOTypeInfoSP getDefaultTyp() const; }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_COLUMNCONTROLWINDOW_HXX diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index a8070ecd183e..1fdbc04b182d 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ namespace dbaui { //================================================================== - // ConnData ---------->* ConnLineData - // ^1 ^1 - // | | - // Conn ---------->* ConnLine + // ConnData ---------->* ConnLineData + // ^1 ^1 + // | | + // Conn ---------->* ConnLine //================================================================== /* @@ -50,14 +50,14 @@ namespace dbaui class OConnectionLineData; class OTableConnection; class OTableWindow; - class OConnectionLine + class OConnectionLine { - OTableConnection* m_pTabConn; - OConnectionLineDataRef m_pData; + OTableConnection* m_pTabConn; + OConnectionLineDataRef m_pData; - Point m_aSourceConnPos, + Point m_aSourceConnPos, m_aDestConnPos; - Point m_aSourceDescrLinePos, + Point m_aSourceDescrLinePos, m_aDestDescrLinePos; public: OConnectionLine( OTableConnection* pConn, OConnectionLineDataRef pLineData ); @@ -66,25 +66,25 @@ namespace dbaui virtual OConnectionLine& operator=( const OConnectionLine& rLine ); - Rectangle GetBoundingRect(); - BOOL RecalcLine(); - void Draw( OutputDevice* pOutDev ); - bool CheckHit( const Point& rMousePos ) const; - String GetSourceFieldName() const { return m_pData->GetSourceFieldName(); } - String GetDestFieldName() const { return m_pData->GetDestFieldName(); } + Rectangle GetBoundingRect(); + BOOL RecalcLine(); + void Draw( OutputDevice* pOutDev ); + bool CheckHit( const Point& rMousePos ) const; + String GetSourceFieldName() const { return m_pData->GetSourceFieldName(); } + String GetDestFieldName() const { return m_pData->GetDestFieldName(); } - BOOL IsValid() const; + BOOL IsValid() const; - Rectangle GetSourceTextPos() const; - Rectangle GetDestTextPos() const; + Rectangle GetSourceTextPos() const; + Rectangle GetDestTextPos() const; - OConnectionLineDataRef GetData() const { return m_pData; } + OConnectionLineDataRef GetData() const { return m_pData; } - Point getMidPoint() const; + Point getMidPoint() const; }; /// unary_function Functor object for class OConnectionLine returntype is void /// draws a connectionline object on outputdevice - struct TConnectionLineDrawFunctor : ::std::unary_function<OConnectionLine*,void> + struct TConnectionLineDrawFunctor : ::std::unary_function<OConnectionLine*,void> { OutputDevice* pDevice; TConnectionLineDrawFunctor(OutputDevice* _pDevice) @@ -98,9 +98,9 @@ namespace dbaui }; /// binary_function Functor object for class OConnectionLine returntype is bool /// checks if the point is on connectionline - struct TConnectionLineCheckHitFunctor : ::std::binary_function<OConnectionLine*,Point,bool> + struct TConnectionLineCheckHitFunctor : ::std::binary_function<OConnectionLine*,Point,bool> { - inline bool operator()(const OConnectionLine* lhs,const Point& rhs) const + inline bool operator()(const OConnectionLine* lhs,const Point& rhs) const { return lhs->CheckHit(rhs); } diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index d36af945165f..e9edc1837a5c 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,17 +41,17 @@ namespace dbaui /** the class OConnectionLineAccess represents the accessible object for the connection between two table windows like they are used in the QueryDesign and the RelationDesign */ - class OConnectionLineAccess : public VCLXAccessibleComponent - , public OConnectionLineAccess_BASE + class OConnectionLineAccess : public VCLXAccessibleComponent + , public OConnectionLineAccess_BASE { - const OTableConnection* m_pLine; // the window which I should give accessibility to + const OTableConnection* m_pLine; // the window which I should give accessibility to protected: /** this function is called upon disposing the component */ virtual void SAL_CALL disposing(); /** isEditable returns the current editable state - @return true if it is editable otherwise false + @return true if it is editable otherwise false */ virtual sal_Bool isEditable() const; public: @@ -75,7 +75,7 @@ namespace dbaui static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - + // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index 50898937894c..176e169b3fd3 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,10 +40,10 @@ namespace dbaui { //================================================================== - // ConnData ---------->* ConnLineData - // ^1 ^1 - // | | - // Conn ---------->* ConnLine + // ConnData ---------->* ConnLineData + // ^1 ^1 + // | | + // Conn ---------->* ConnLine //================================================================== @@ -65,23 +65,23 @@ namespace dbaui OConnectionLineData(); OConnectionLineData( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ); OConnectionLineData( const OConnectionLineData& rConnLineData ); - + // eine Kopie der eigenen Instanz liefern (das ist mir irgendwie angenehmer als ein virtueller Zuweisungsoperator) void CopyFrom(const OConnectionLineData& rSource); // Memberzugriff (schreiben) - void SetFieldName(EConnectionSide nWhich, const ::rtl::OUString& strFieldName) - { - if (nWhich==JTCS_FROM) - m_aSourceFieldName = strFieldName; - else - m_aDestFieldName = strFieldName; + void SetFieldName(EConnectionSide nWhich, const ::rtl::OUString& strFieldName) + { + if (nWhich==JTCS_FROM) + m_aSourceFieldName = strFieldName; + else + m_aDestFieldName = strFieldName; } void SetSourceFieldName( const ::rtl::OUString& rSourceFieldName){ SetFieldName(JTCS_FROM, rSourceFieldName); } void SetDestFieldName( const ::rtl::OUString& rDestFieldName ){ SetFieldName(JTCS_TO, rDestFieldName); } inline bool clearSourceFieldName() { SetSourceFieldName(::rtl::OUString()); return true;} - inline bool clearDestFieldName() { SetDestFieldName(::rtl::OUString()); return true;} + inline bool clearDestFieldName() { SetDestFieldName(::rtl::OUString()); return true;} // Memberzugriff (lesen) ::rtl::OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; } @@ -94,8 +94,8 @@ namespace dbaui //------------------------------------------------------------------------- //------------------------------------------------------------------ - typedef ::rtl::Reference< OConnectionLineData > OConnectionLineDataRef; - typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec; + typedef ::rtl::Reference< OConnectionLineData > OConnectionLineDataRef; + typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec; } #endif // DBAUI_CONNECTIONLINEDATA_HXX diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 4a96c8176825..fde1711272a7 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include "IUpdateHelper.hxx" #include "WTypeSelect.hxx" -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace awt{ struct FontDescriptor; } @@ -69,26 +69,26 @@ namespace dbaui { public: DECLARE_STL_MAP(::rtl::OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns); - typedef ::std::vector<TColumns::const_iterator> TColumnVector; - typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > TPositions; + typedef ::std::vector<TColumns::const_iterator> TColumnVector; + typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > TPositions; protected: - TPositions m_vColumns; // Welche Spalten "ubernommen werden sollen - ::std::vector<sal_Int32> m_vColumnTypes; // FeldTypen f"ur schnelleren Zugriff - ::std::vector<sal_Int32> m_vColumnSize; - ::std::vector<sal_Int16> m_vNumberFormat; - ::com::sun::star::lang::Locale m_aLocale; - - TColumns m_aDestColumns; // container for new created columns - TColumnVector m_vDestVector; - - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; // dest table - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables; // container - SharedConnection m_xConnection; // dest conn - + TPositions m_vColumns; // Welche Spalten "ubernommen werden sollen + ::std::vector<sal_Int32> m_vColumnTypes; // FeldTypen f"ur schnelleren Zugriff + ::std::vector<sal_Int32> m_vColumnSize; + ::std::vector<sal_Int16> m_vNumberFormat; + ::com::sun::star::lang::Locale m_aLocale; + + TColumns m_aDestColumns; // container for new created columns + TColumnVector m_vDestVector; + + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; // dest table + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables; // container + SharedConnection m_xConnection; // dest conn + ::boost::shared_ptr<IUpdateHelper> m_pUpdateHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; // - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; // + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; ::com::sun::star::util::Date m_aNullDate; @@ -96,49 +96,49 @@ namespace dbaui SvStream& m_rInputStream; //dyf add 2006/06/01 //for save the selected tablename - ::rtl::OUString m_sDefaultTableName; + ::rtl::OUString m_sDefaultTableName; //dyf add end - String m_sTextToken; // Zellen Inhalt - String m_sNumToken; /// SDNUM value - String m_sValToken; /// SDVAL value - TOTypeInfoSP m_pTypeInfo; // contains the default type + String m_sTextToken; // Zellen Inhalt + String m_sNumToken; /// SDNUM value + String m_sValToken; /// SDVAL value + TOTypeInfoSP m_pTypeInfo; // contains the default type const TColumnVector* m_pColumnList; const OTypeInfoMap* m_pInfoMap; - sal_Int32 m_nColumnPos; // aktuelle Spaltenposition - sal_Int32 m_nRows; // Anzahl der Zeilen die durchsucht werden sollen - sal_Int32 m_nRowCount; // current count of rows - rtl_TextEncoding m_nDefToken; // Sprache - sal_Bool m_bError; // Fehler und Abbruchstatus - sal_Bool m_bInTbl; // Ist gesetzt, wenn der Parser sich in der RTF Tabelle befindet - sal_Bool m_bHead; // ist true, wenn die Kopfzeile noch nicht gelesen wurde - sal_Bool m_bDontAskAgain;// Falls beim Einf"ugen ein Fehler auftritt, soll die Fehlermeldung nicht - sal_Bool m_bIsAutoIncrement; // if PKey is set by user - sal_Bool m_bFoundTable; // set to true when a table was found - sal_Bool m_bCheckOnly; + sal_Int32 m_nColumnPos; // aktuelle Spaltenposition + sal_Int32 m_nRows; // Anzahl der Zeilen die durchsucht werden sollen + sal_Int32 m_nRowCount; // current count of rows + rtl_TextEncoding m_nDefToken; // Sprache + sal_Bool m_bError; // Fehler und Abbruchstatus + sal_Bool m_bInTbl; // Ist gesetzt, wenn der Parser sich in der RTF Tabelle befindet + sal_Bool m_bHead; // ist true, wenn die Kopfzeile noch nicht gelesen wurde + sal_Bool m_bDontAskAgain;// Falls beim Einf"ugen ein Fehler auftritt, soll die Fehlermeldung nicht + sal_Bool m_bIsAutoIncrement; // if PKey is set by user + sal_Bool m_bFoundTable; // set to true when a table was found + sal_Bool m_bCheckOnly; bool m_bAppendFirstLine; - virtual sal_Bool CreateTable(int nToken) = 0; + virtual sal_Bool CreateTable(int nToken) = 0; virtual TypeSelectionPageFactory getTypeSelectionPageFactory() = 0; - void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); - sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); + void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); + sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); void adjustFormat(); void eraseTokens(); - void insertValueIntoColumn(); - sal_Bool createRowSet(); - void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e); + void insertValueIntoColumn(); + sal_Bool createRowSet(); + void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e); void ensureFormatter(); /** executeWizard calls a wizard to create/append data - @param _sTableName the tablename - @param _aTextColor the text color of the new created table - @param _rFont the font of the new table + @param _sTableName the tablename + @param _aTextColor the text color of the new created table + @param _rFont the font of the new table - @return true when an error occurs + @return true when an error occurs */ - sal_Bool executeWizard( const ::rtl::OUString& _sTableName, + sal_Bool executeWizard( const ::rtl::OUString& _sTableName, const ::com::sun::star::uno::Any& _aTextColor, const ::com::sun::star::awt::FontDescriptor& _rFont); @@ -165,11 +165,11 @@ namespace dbaui SvStream& _rInputStream ); - void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); - + void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); + //dyf add 20070601 inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; } - //dyf add end + //dyf add end virtual void release() = 0; diff --git a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx index 9252a6b3974c..78f88c3eb522 100644 --- a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx +++ b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,15 +47,15 @@ namespace dbaui |* Groups and Sorting dialog |* \************************************************************************/ -class OExtensionNotPresentDialog : public ModalDialog +class OExtensionNotPresentDialog : public ModalDialog { FixedImage m_aFI_WARNING; FixedText m_aFT_TEXT; - PushButton m_aPB_DOWNLOAD; - CancelButton m_aPB_CANCEL; + PushButton m_aPB_DOWNLOAD; + CancelButton m_aPB_CANCEL; - ::com::sun::star::lang::Locale m_nLocale; + ::com::sun::star::lang::Locale m_nLocale; com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xMultiServiceFactory; /** returns the format string. @@ -77,7 +77,7 @@ class OExtensionNotPresentDialog : public ModalDialog public: OExtensionNotPresentDialog( Window* pParent, com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > ); virtual ~OExtensionNotPresentDialog(); - virtual short Execute(); + virtual short Execute(); inline String getText() const { return m_aFT_TEXT.GetText(); } }; diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 5ccb33bb70dc..3a9133dc193e 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,8 +52,8 @@ namespace dbaui class OPropColumnEditCtrl : public OSQLNameEdit { OModuleClient m_aModuleClient; - short m_nPos; - String m_strHelpText; + short m_nPos; + String m_strHelpText; public: inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); @@ -69,9 +69,9 @@ namespace dbaui } }; inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, - ::rtl::OUString& _rAllowedChars, - USHORT nHelpId, - short nPosition, + ::rtl::OUString& _rAllowedChars, + USHORT nHelpId, + short nPosition, WinBits nWinStyle) :OSQLNameEdit(pParent, _rAllowedChars,nWinStyle) ,m_nPos(nPosition) @@ -79,11 +79,11 @@ namespace dbaui m_strHelpText=String(ModuleRes(nHelpId)); } //================================================================== - class OPropEditCtrl : public Edit + class OPropEditCtrl : public Edit { OModuleClient m_aModuleClient; - short m_nPos; - String m_strHelpText; + short m_nPos; + String m_strHelpText; public: inline OPropEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); @@ -117,8 +117,8 @@ namespace dbaui //================================================================== class OPropNumericEditCtrl : public NumericField { - short m_nPos; - String m_strHelpText; + short m_nPos; + String m_strHelpText; public: inline OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); @@ -152,8 +152,8 @@ namespace dbaui //================================================================== class OPropListBoxCtrl : public ListBox { - short m_nPos; - String m_strHelpText; + short m_nPos; + String m_strHelpText; public: inline OPropListBoxCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 38c270610a5f..d6677b14169e 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,25 +36,25 @@ //------------------------------------------------------------------ // die Spalten einer Feld-Beschreibung einer Tabelle -#define FIELD_NAME 1 -#define FIELD_TYPE 2 -#define HELP_TEXT 3 +#define FIELD_NAME 1 +#define FIELD_TYPE 2 +#define HELP_TEXT 3 #define COLUMN_DESCRIPTION 4 -#define FIELD_FIRST_VIRTUAL_COLUMN 5 - -#define FIELD_PROPERTY_REQUIRED 5 -#define FIELD_PROPERTY_NUMTYPE 6 -#define FIELD_PROPERTY_AUTOINC 7 -#define FIELD_PROPERTY_DEFAULT 8 -#define FIELD_PROPERTY_TEXTLEN 9 -#define FIELD_PROPERTY_LENGTH 10 -#define FIELD_PROPERTY_SCALE 11 -#define FIELD_PROPERTY_BOOL_DEFAULT 12 -#define FIELD_PROPERTY_FORMAT 13 -#define FIELD_PRPOERTY_COLUMNNAME 14 -#define FIELD_PRPOERTY_TYPE 15 -#define FIELD_PRPOERTY_AUTOINCREMENT 16 +#define FIELD_FIRST_VIRTUAL_COLUMN 5 + +#define FIELD_PROPERTY_REQUIRED 5 +#define FIELD_PROPERTY_NUMTYPE 6 +#define FIELD_PROPERTY_AUTOINC 7 +#define FIELD_PROPERTY_DEFAULT 8 +#define FIELD_PROPERTY_TEXTLEN 9 +#define FIELD_PROPERTY_LENGTH 10 +#define FIELD_PROPERTY_SCALE 11 +#define FIELD_PROPERTY_BOOL_DEFAULT 12 +#define FIELD_PROPERTY_FORMAT 13 +#define FIELD_PRPOERTY_COLUMNNAME 14 +#define FIELD_PRPOERTY_TYPE 15 +#define FIELD_PRPOERTY_AUTOINCREMENT 16 class FixedText; class PushButton; @@ -79,56 +79,56 @@ namespace dbaui class OFieldDescControl : public TabPage { private: - OTableDesignHelpBar* pHelp; - Window* pLastFocusWindow; - Window* m_pActFocusWindow; - - FixedText* pDefaultText; - FixedText* pRequiredText; - FixedText* pAutoIncrementText; - FixedText* pTextLenText; - FixedText* pNumTypeText; - FixedText* pLengthText; - FixedText* pScaleText; - FixedText* pFormatText; - FixedText* pBoolDefaultText; - FixedText* m_pColumnNameText; - FixedText* m_pTypeText; - FixedText* m_pAutoIncrementValueText; - - OPropListBoxCtrl* pRequired; - OPropListBoxCtrl* pNumType; - OPropListBoxCtrl* pAutoIncrement; - OPropEditCtrl* pDefault; - OPropNumericEditCtrl* pTextLen; - OPropNumericEditCtrl* pLength; - OPropNumericEditCtrl* pScale; - OPropEditCtrl* pFormatSample; - OPropListBoxCtrl* pBoolDefault; - OPropColumnEditCtrl* m_pColumnName; - OPropListBoxCtrl* m_pType; - OPropEditCtrl* m_pAutoIncrementValue; - - PushButton* pFormat; - - ScrollBar* m_pVertScroll; - ScrollBar* m_pHorzScroll; - - TOTypeInfoSP m_pPreviousType; - USHORT nCurChildId; - short m_nPos; - XubString aYes; - XubString aNo; - - long m_nOldVThumb; - long m_nOldHThumb; - sal_Int32 m_nWidth; - - ULONG nDelayedGrabFocusEvent; + OTableDesignHelpBar* pHelp; + Window* pLastFocusWindow; + Window* m_pActFocusWindow; + + FixedText* pDefaultText; + FixedText* pRequiredText; + FixedText* pAutoIncrementText; + FixedText* pTextLenText; + FixedText* pNumTypeText; + FixedText* pLengthText; + FixedText* pScaleText; + FixedText* pFormatText; + FixedText* pBoolDefaultText; + FixedText* m_pColumnNameText; + FixedText* m_pTypeText; + FixedText* m_pAutoIncrementValueText; + + OPropListBoxCtrl* pRequired; + OPropListBoxCtrl* pNumType; + OPropListBoxCtrl* pAutoIncrement; + OPropEditCtrl* pDefault; + OPropNumericEditCtrl* pTextLen; + OPropNumericEditCtrl* pLength; + OPropNumericEditCtrl* pScale; + OPropEditCtrl* pFormatSample; + OPropListBoxCtrl* pBoolDefault; + OPropColumnEditCtrl* m_pColumnName; + OPropListBoxCtrl* m_pType; + OPropEditCtrl* m_pAutoIncrementValue; + + PushButton* pFormat; + + ScrollBar* m_pVertScroll; + ScrollBar* m_pHorzScroll; + + TOTypeInfoSP m_pPreviousType; + USHORT nCurChildId; + short m_nPos; + XubString aYes; + XubString aNo; + + long m_nOldVThumb; + long m_nOldHThumb; + sal_Int32 m_nWidth; + + ULONG nDelayedGrabFocusEvent; sal_Bool m_bAdded; bool m_bRightAligned; - OFieldDescription* pActFieldDescr; + OFieldDescription* pActFieldDescr; DECL_LINK( OnScroll, ScrollBar*); @@ -140,15 +140,15 @@ namespace dbaui DECL_LINK( OnControlFocusLost, Control* ); DECL_LINK( OnControlFocusGot, Control* ); - void UpdateFormatSample(OFieldDescription* pFieldDescr); - void ArrangeAggregates(); + void UpdateFormatSample(OFieldDescription* pFieldDescr); + void ArrangeAggregates(); - void SetPosSize( Control** ppControl, long nRow, USHORT nCol ); + void SetPosSize( Control** ppControl, long nRow, USHORT nCol ); - void ScrollAggregate(Control* pText, Control* pInput, Control* pButton, long nDeltaX, long nDeltaY); - void ScrollAllAggregates(); + void ScrollAggregate(Control* pText, Control* pInput, Control* pButton, long nDeltaX, long nDeltaY); + void ScrollAllAggregates(); - sal_Bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; + sal_Bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; void Contruct(); OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId); FixedText* CreateText(USHORT _nTextRes); @@ -162,70 +162,70 @@ namespace dbaui inline OFieldDescription* getCurrentFieldDescData() { return pActFieldDescr; } inline void setCurrentFieldDescData( OFieldDescription* _pDesc ) { pActFieldDescr = _pDesc; } - sal_uInt16 CountActiveAggregates() const; + sal_uInt16 CountActiveAggregates() const; sal_Int32 GetMaxControlHeight() const; - virtual void ActivateAggregate( EControlType eType ); - virtual void DeactivateAggregate( EControlType eType ); - virtual BOOL IsReadOnly() { return FALSE; }; + virtual void ActivateAggregate( EControlType eType ); + virtual void DeactivateAggregate( EControlType eType ); + virtual BOOL IsReadOnly() { return FALSE; }; // Sind von den abgeleiteten Klassen zu impl. virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const = 0; + + virtual ::com::sun::star::lang::Locale GetLocale() const = 0; - virtual ::com::sun::star::lang::Locale GetLocale() const = 0; - - virtual void CellModified(long nRow, USHORT nColId ) = 0; - virtual void SetModified(BOOL bModified); // base implementation is empty - - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) = 0; - virtual const OTypeInfoMap* getTypeInfo() const = 0; - - virtual sal_Bool isAutoIncrementValueEnabled() const = 0; - virtual ::rtl::OUString getAutoIncrementValue() const = 0; + virtual void CellModified(long nRow, USHORT nColId ) = 0; + virtual void SetModified(BOOL bModified); // base implementation is empty + + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) = 0; + virtual const OTypeInfoMap* getTypeInfo() const = 0; + + virtual sal_Bool isAutoIncrementValueEnabled() const = 0; + virtual ::rtl::OUString getAutoIncrementValue() const = 0; - String BoolStringPersistent(const String& rUIString) const; - String BoolStringUI(const String& rPersistentString) const; + String BoolStringPersistent(const String& rUIString) const; + String BoolStringUI(const String& rPersistentString) const; - const OPropColumnEditCtrl* getColumnCtrl() const { return m_pColumnName; } + const OPropColumnEditCtrl* getColumnCtrl() const { return m_pColumnName; } public: OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar); OFieldDescControl( Window* pParent, const ResId& rResId, OTableDesignHelpBar* pHelpBar); virtual ~OFieldDescControl(); - void DisplayData(OFieldDescription* pFieldDescr ); - // void DisplayData(const OColumn* pColumn); + void DisplayData(OFieldDescription* pFieldDescr ); + // void DisplayData(const OColumn* pColumn); - void SaveData( OFieldDescription* pFieldDescr ); - // void SaveData( OColumn* pColumn); + void SaveData( OFieldDescription* pFieldDescr ); + // void SaveData( OColumn* pColumn); - void SetControlText( USHORT nControlId, const String& rText ); - String GetControlText( USHORT nControlId ); - void SetReadOnly( BOOL bReadOnly ); + void SetControlText( USHORT nControlId, const String& rText ); + String GetControlText( USHORT nControlId ); + void SetReadOnly( BOOL bReadOnly ); // Resize aufegrufen - void CheckScrollBars(); - sal_Bool isCutAllowed(); - sal_Bool isCopyAllowed(); - sal_Bool isPasteAllowed(); + void CheckScrollBars(); + sal_Bool isCutAllowed(); + sal_Bool isCopyAllowed(); + sal_Bool isPasteAllowed(); - void cut(); - void copy(); - void paste(); + void cut(); + void copy(); + void paste(); - virtual void Init(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Resize(); + virtual void Init(); + virtual void GetFocus(); + virtual void LoseFocus(); + virtual void Resize(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() = 0; - String getControlDefault( const OFieldDescription* _pFieldDescr ,sal_Bool _bCheck = sal_True) const; + String getControlDefault( const OFieldDescription* _pFieldDescr ,sal_Bool _bCheck = sal_True) const; - inline void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; } + inline void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; } protected: - void implFocusLost(Window* _pWhich); + void implFocusLost(Window* _pWhich); }; } #endif // DBAUI_FIELDDESCRIPTIONCONTROL_HXX diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index 980b23050f3e..6764192599aa 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,32 +40,32 @@ namespace dbaui class OFieldDescription { private: - ::com::sun::star::uno::Any m_aDefaultValue; // the default value from the database - ::com::sun::star::uno::Any m_aControlDefault; // the value which the control inserts as default - ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void - ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void - - TOTypeInfoSP m_pType; + ::com::sun::star::uno::Any m_aDefaultValue; // the default value from the database + ::com::sun::star::uno::Any m_aControlDefault; // the value which the control inserts as default + ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void + ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; + TOTypeInfoSP m_pType; - ::rtl::OUString m_sName; - ::rtl::OUString m_sTypeName; - ::rtl::OUString m_sDescription; - ::rtl::OUString m_sHelpText; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; - ::rtl::OUString m_sAutoIncrementValue; - sal_Int32 m_nType; // only used when m_pType is null - sal_Int32 m_nPrecision; - sal_Int32 m_nScale; - sal_Int32 m_nIsNullable; - sal_Int32 m_nFormatKey; - SvxCellHorJustify m_eHorJustify; - sal_Bool m_bIsAutoIncrement; - sal_Bool m_bIsPrimaryKey; - sal_Bool m_bIsCurrency; - sal_Bool m_bHidden; + ::rtl::OUString m_sName; + ::rtl::OUString m_sTypeName; + ::rtl::OUString m_sDescription; + ::rtl::OUString m_sHelpText; + + ::rtl::OUString m_sAutoIncrementValue; + sal_Int32 m_nType; // only used when m_pType is null + sal_Int32 m_nPrecision; + sal_Int32 m_nScale; + sal_Int32 m_nIsNullable; + sal_Int32 m_nFormatKey; + SvxCellHorJustify m_eHorJustify; + sal_Bool m_bIsAutoIncrement; + sal_Bool m_bIsPrimaryKey; + sal_Bool m_bIsCurrency; + sal_Bool m_bHidden; public: OFieldDescription(); @@ -74,49 +74,49 @@ namespace dbaui ,sal_Bool _bUseAsDest = sal_False); ~OFieldDescription(); - void SetName(const ::rtl::OUString& _rName); + void SetName(const ::rtl::OUString& _rName); void SetDescription(const ::rtl::OUString& _rDescription); void SetHelpText(const ::rtl::OUString& _sHelptext); - void SetDefaultValue(const ::com::sun::star::uno::Any& _rDefaultValue); + void SetDefaultValue(const ::com::sun::star::uno::Any& _rDefaultValue); void SetControlDefault(const ::com::sun::star::uno::Any& _rControlDefault); - void SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue); + void SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue); void SetType(TOTypeInfoSP _pType); void SetTypeValue(sal_Int32 _nType); void SetTypeName(const ::rtl::OUString& _sTypeName); - void SetPrecision(const sal_Int32& _rPrecision); - void SetScale(const sal_Int32& _rScale); - void SetIsNullable(const sal_Int32& _rIsNullable); - void SetFormatKey(const sal_Int32& _rFormatKey); - void SetHorJustify(const SvxCellHorJustify& _rHorJustify); - void SetAutoIncrement(sal_Bool _bAuto); - void SetPrimaryKey(sal_Bool _bPKey); + void SetPrecision(const sal_Int32& _rPrecision); + void SetScale(const sal_Int32& _rScale); + void SetIsNullable(const sal_Int32& _rIsNullable); + void SetFormatKey(const sal_Int32& _rFormatKey); + void SetHorJustify(const SvxCellHorJustify& _rHorJustify); + void SetAutoIncrement(sal_Bool _bAuto); + void SetPrimaryKey(sal_Bool _bPKey); void SetCurrency(sal_Bool _bIsCurrency); /** copies the content of the field eescription into the column - @param _rxColumn the dest + @param _rxColumn the dest */ void copyColumnSettingsTo(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn); void FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bForce,sal_Bool _bReset); - ::rtl::OUString GetName() const; - ::rtl::OUString GetDescription() const; - ::rtl::OUString GetHelpText() const; - ::com::sun::star::uno::Any GetControlDefault() const; - ::rtl::OUString GetAutoIncrementValue() const; - sal_Int32 GetType() const; - ::rtl::OUString GetTypeName() const; - sal_Int32 GetPrecision() const; - sal_Int32 GetScale() const; - sal_Int32 GetIsNullable() const; - sal_Int32 GetFormatKey() const; - SvxCellHorJustify GetHorJustify() const; - TOTypeInfoSP getTypeInfo() const; - TOTypeInfoSP getSpecialTypeInfo() const; - sal_Bool IsAutoIncrement() const; - sal_Bool IsPrimaryKey() const; - sal_Bool IsCurrency() const; - sal_Bool IsNullable() const; + ::rtl::OUString GetName() const; + ::rtl::OUString GetDescription() const; + ::rtl::OUString GetHelpText() const; + ::com::sun::star::uno::Any GetControlDefault() const; + ::rtl::OUString GetAutoIncrementValue() const; + sal_Int32 GetType() const; + ::rtl::OUString GetTypeName() const; + sal_Int32 GetPrecision() const; + sal_Int32 GetScale() const; + sal_Int32 GetIsNullable() const; + sal_Int32 GetFormatKey() const; + SvxCellHorJustify GetHorJustify() const; + TOTypeInfoSP getTypeInfo() const; + TOTypeInfoSP getSpecialTypeInfo() const; + sal_Bool IsAutoIncrement() const; + sal_Bool IsPrimaryKey() const; + sal_Bool IsCurrency() const; + sal_Bool IsNullable() const; }; } #endif // DBAUI_FIELDDESCRIPTIONS_HXX diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 29e4d09e5670..727ffb091b0a 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,14 +42,14 @@ namespace dbaui OModuleClient m_aModuleClient; protected: - String m_strComment; // undo, redo comment + String m_strComment; // undo, redo comment public: TYPEINFO(); OCommentUndoAction(USHORT nCommentID) { m_strComment = String(ModuleRes(nCommentID)); } - virtual UniString GetComment() const { return m_strComment; } - }; + virtual UniString GetComment() const { return m_strComment; } + }; } #endif // DBAUI_GENERALUNDO_HXX diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 83d1926f1b1c..73f9db169066 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,22 +43,22 @@ namespace dbaui class OHTMLReader : public HTMLParser, public ODatabaseExport { String m_sCurrent; - sal_Int32 m_nTableCount; - sal_Int16 m_nWidth; - sal_Int16 m_nColumnWidth; // max. Spaltenbreite - sal_Bool m_bMetaOptions; // true when we scaned the meta information - sal_Bool m_bSDNum; - + sal_Int32 m_nTableCount; + sal_Int16 m_nWidth; + sal_Int16 m_nColumnWidth; // max. Spaltenbreite + sal_Bool m_bMetaOptions; // true when we scaned the meta information + sal_Bool m_bSDNum; + protected: - virtual void NextToken( int nToken ); // Basisklasse - virtual sal_Bool CreateTable(int nToken); + virtual void NextToken( int nToken ); // Basisklasse + virtual sal_Bool CreateTable(int nToken); virtual TypeSelectionPageFactory getTypeSelectionPageFactory(); - void TableDataOn(SvxCellHorJustify& eVal,int nToken); - void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); - sal_Int16 GetWidthPixel( const HTMLOption* pOption ); - void setTextEncoding(); + void TableDataOn(SvxCellHorJustify& eVal,int nToken); + void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); + sal_Int16 GetWidthPixel( const HTMLOption* pOption ); + void setTextEncoding(); void fetchOptions(); virtual ~OHTMLReader(); public: @@ -78,8 +78,8 @@ namespace dbaui const OTypeInfoMap* _pInfoMap, sal_Bool _bAutoIncrementEnabled); - virtual SvParserState CallParser();// Basisklasse - virtual void release(); + virtual SvParserState CallParser();// Basisklasse + virtual void release(); // birgt nur korrekte Daten, wenn der 1. CTOR benutzt wurde }; diff --git a/dbaccess/source/ui/inc/IClipBoardTest.hxx b/dbaccess/source/ui/inc/IClipBoardTest.hxx index 2f64d667379d..dfb7085965fb 100644 --- a/dbaccess/source/ui/inc/IClipBoardTest.hxx +++ b/dbaccess/source/ui/inc/IClipBoardTest.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,15 +34,15 @@ namespace dbaui class SAL_NO_VTABLE IClipboardTest { public: - virtual sal_Bool isCutAllowed() = 0; - virtual sal_Bool isCopyAllowed() = 0; - virtual sal_Bool isPasteAllowed() = 0; + virtual sal_Bool isCutAllowed() = 0; + virtual sal_Bool isCopyAllowed() = 0; + virtual sal_Bool isPasteAllowed() = 0; - virtual sal_Bool hasChildPathFocus() = 0; + virtual sal_Bool hasChildPathFocus() = 0; - virtual void copy() = 0; - virtual void cut() = 0; - virtual void paste() = 0; + virtual void copy() = 0; + virtual void cut() = 0; + virtual void paste() = 0; }; } #endif // DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index 8d39925c33e0..d6e082d77510 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,10 +53,10 @@ namespace dbaui public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const = 0; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() = 0; virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const = 0; virtual void clearPassword() = 0; - virtual sal_Bool saveDatasource() = 0; + virtual sal_Bool saveDatasource() = 0; virtual void setTitle(const ::rtl::OUString& _sTitle) = 0; /** enables or disables the user's possibility to confirm the settings diff --git a/dbaccess/source/ui/inc/IUpdateHelper.hxx b/dbaccess/source/ui/inc/IUpdateHelper.hxx index b9976efe9935..a13dbb5fa6a2 100644 --- a/dbaccess/source/ui/inc/IUpdateHelper.hxx +++ b/dbaccess/source/ui/inc/IUpdateHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 7ecb0dbf4aa4..bfedcaa2ed66 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,22 +36,22 @@ namespace dbaui class OJoinTableView; typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessible > OJoinDesignViewAccess_BASE; - /** the class OJoinDesignViewAccess represents the accessible object for join views + /** the class OJoinDesignViewAccess represents the accessible object for join views like the QueryDesign and the RelationDesign */ - class OJoinDesignViewAccess : public VCLXAccessibleComponent, public OJoinDesignViewAccess_BASE + class OJoinDesignViewAccess : public VCLXAccessibleComponent, public OJoinDesignViewAccess_BASE { - OJoinTableView* m_pTableView; // the window which I should give accessibility to + OJoinTableView* m_pTableView; // the window which I should give accessibility to protected: /** isEditable returns the current editable state - @return true if the controller is not readonly otherwise false + @return true if the controller is not readonly otherwise false */ virtual sal_Bool isEditable() const; public: /** OJoinDesignViewAccess needs a valid view */ - OJoinDesignViewAccess( OJoinTableView* _pTableView); + OJoinDesignViewAccess( OJoinTableView* _pTableView); // XInterface DECLARE_XINTERFACE( ) @@ -70,7 +70,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - OJoinTableView* getTableView() const { return m_pTableView; } + OJoinTableView* getTableView() const { return m_pTableView; } void notifyAccessibleEvent( const sal_Int16 _nEventId, @@ -80,7 +80,7 @@ namespace dbaui { NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); } - + void clearTableView(); }; } diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 7c27a499e783..bf8b02ddb4a4 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,32 +62,32 @@ namespace dbaui TTableConnectionData m_vTableConnectionData; TTableWindowData m_vTableData; - Fraction m_aZoom; - ::dbtools::SQLExceptionInfo m_aExceptionInfo; + Fraction m_aZoom; + ::dbtools::SQLExceptionInfo m_aExceptionInfo; - OAddTableDlg* m_pAddTableDialog; + OAddTableDlg* m_pAddTableDialog; ::std::auto_ptr< AddTableDialogContext > m_pDialogContext; Point m_aMinimumTableViewSize; // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); /** loads the information for the windows. - @param i_rViewSettings + @param i_rViewSettings The properties which comes from the layout information. */ void loadTableWindows( const ::comphelper::NamedValueCollection& i_rViewSettings ); /** loads the information for one window. - @param _rTable + @param _rTable The properties which comes from the layout information. */ void loadTableWindow( const ::comphelper::NamedValueCollection& i_rTableWindowSettings ); /** saves the TableWindows structure in a sequence of property values - @param _rViewProps + @param _rViewProps Contains the new sequence. */ void saveTableWindows( ::comphelper::NamedValueCollection& o_rViewSettings ) const; @@ -98,8 +98,8 @@ namespace dbaui // --------------------------------------------------------------- // attribute access - inline TTableWindowData* getTableWindowData() { return &m_vTableData; } - inline TTableConnectionData* getTableConnectionData() { return &m_vTableConnectionData;} + inline TTableWindowData* getTableWindowData() { return &m_vTableData; } + inline TTableConnectionData* getTableConnectionData() { return &m_vTableConnectionData;} inline OAddTableDlg* getAddTableDialog()const { return m_pAddTableDialog; } // --------------------------------------------------------------- @@ -120,19 +120,19 @@ namespace dbaui /** provides access to the OJoinDesignView belonging to the controller, which might or might not be the direct view (getView) */ - virtual OJoinDesignView* getJoinView(); + virtual OJoinDesignView* getJoinView(); // --------------------------------------------------------------- /** erase the data in the data vector - @param _pData + @param _pData the data whioch should be erased */ void removeConnectionData(const TTableConnectionData::value_type& _pData); void SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabWinList, long nOffsetX, long nOffsetY ); - void SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, long nOffsetY); + void SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, long nOffsetY); // --------------------------------------------------------------- // UNO interface overridables @@ -140,7 +140,7 @@ namespace dbaui virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); // ::com::sun::star::frame::XController virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); @@ -169,7 +169,7 @@ namespace dbaui // ask the user if the design should be saved when it is modified virtual short saveModified() = 0; // called when the orignal state should be reseted (first time load) - virtual void reset() = 0; + virtual void reset() = 0; virtual void describeSupportedFeatures(); AddTableDialogContext& impl_getDialogContext() const; diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index ce67cc1b8990..386d49777ab8 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,16 +46,16 @@ namespace dbaui class OScrollWindowHelper; class OJoinTableView; class OTableWindow; - + class OJoinDesignView : public ODataView { protected: - OScrollWindowHelper* m_pScrollWindow; // contains only the scrollbars - OJoinTableView* m_pTableView; // presents the upper window - OJoinController& m_rController; + OScrollWindowHelper* m_pScrollWindow; // contains only the scrollbars + OJoinTableView* m_pTableView; // presents the upper window + OJoinController& m_rController; public: - OJoinDesignView(Window* pParent, + OJoinDesignView(Window* pParent, OJoinController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); virtual ~OJoinDesignView(); diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 44f19b89c528..d56547513301 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,17 @@ namespace dbaui :public TransferableHelper ,public OJoinExchObj_Base { - static String m_sJoinFormat; - sal_Bool m_bFirstEntry; + static String m_sJoinFormat; + sal_Bool m_bFirstEntry; protected: - OJoinExchangeData m_jxdSourceDescription; - IDragTransferableListener* m_pDragListener; + OJoinExchangeData m_jxdSourceDescription; + IDragTransferableListener* m_pDragListener; virtual ~OJoinExchObj(); public: OJoinExchObj(const OJoinExchangeData& jxdSource,sal_Bool _bFirstEntry=sal_False); - + // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); @@ -69,13 +69,13 @@ namespace dbaui void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); - static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject); - static sal_Bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID=SOT_FORMATSTR_ID_SBA_JOIN); + static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject); + static sal_Bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID=SOT_FORMATSTR_ID_SBA_JOIN); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void DragFinished( sal_Int8 nDropAction ); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 72f5d054345e..a2fa86925441 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ namespace dbaui class OJoinTableView; class OScrollWindowHelper : public Window { - ScrollBar m_aHScrollBar; - ScrollBar m_aVScrollBar; - Window* m_pCornerWindow; - OJoinTableView* m_pTableView; + ScrollBar m_aHScrollBar; + ScrollBar m_aVScrollBar; + Window* m_pCornerWindow; + OJoinTableView* m_pTableView; protected: virtual void Resize(); @@ -78,7 +78,7 @@ namespace dbaui }; - class OJoinTableView : public Window + class OJoinTableView : public Window ,public IDragTransferableListener ,public DropTargetHelper { @@ -86,31 +86,31 @@ namespace dbaui public: DECLARE_STL_USTRINGACCESS_MAP(OTableWindow*,OTableWindowMap); private: - OTableWindowMap m_aTableMap; - ::std::vector<OTableConnection*> m_vTableConnection; - - Timer m_aDragScrollTimer; - Rectangle m_aDragRect; - Rectangle m_aSizingRect; - Point m_aDragOffset; - Point m_aScrollOffset; - Point m_ptPrevDraggingPos; - Size m_aOutputSize; - - - OTableWindow* m_pDragWin; - OTableWindow* m_pSizingWin; - OTableConnection* m_pSelectedConn; - - - BOOL m_bTrackingInitiallyMoved; + OTableWindowMap m_aTableMap; + ::std::vector<OTableConnection*> m_vTableConnection; + + Timer m_aDragScrollTimer; + Rectangle m_aDragRect; + Rectangle m_aSizingRect; + Point m_aDragOffset; + Point m_aScrollOffset; + Point m_ptPrevDraggingPos; + Size m_aOutputSize; + + + OTableWindow* m_pDragWin; + OTableWindow* m_pSizingWin; + OTableConnection* m_pSelectedConn; + + + BOOL m_bTrackingInitiallyMoved; DECL_LINK(OnDragScrollTimer, void*); - + protected: - OTableWindow* m_pLastFocusTabWin; - OJoinDesignView* m_pView; - OJoinDesignViewAccess* m_pAccessible; + OTableWindow* m_pLastFocusTabWin; + OJoinDesignView* m_pView; + OJoinDesignViewAccess* m_pAccessible; public: OJoinTableView( Window* pParent, OJoinDesignView* pView ); @@ -141,15 +141,15 @@ namespace dbaui virtual void RemoveTabWin( OTableWindow* pTabWin ); // alle TabWins verstecken (NICHT loeschen, sie werden in eine Undo-Action gepackt) - virtual void HideTabWins(); + virtual void HideTabWins(); virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) = 0; /** RemoveConnection allows to remove connections from join table view, it implies that the same as addConnection - @param _pConnection + @param _pConnection the connection which should be removed - @param _bDelete + @param _bDelete when truie then the connection will be deleted @return an iterator to next valid connection, so it can be used in any loop @@ -158,45 +158,45 @@ namespace dbaui /** allows to add new connections to join table view, it implies an invalidation of the features ID_BROWSER_ADDTABLE and SID_RELATION_ADD_RELATION also the modified flag will be set to true - @param _pConnection + @param _pConnection the connection which should be added - @param _bAddData - <TRUE/> when the data should also be appended + @param _bAddData + <TRUE/> when the data should also be appended */ void addConnection(OTableConnection* _pConnection,sal_Bool _bAddData = sal_True); - BOOL ScrollPane( long nDelta, BOOL bHoriz, BOOL bPaintScrollBars ); - ULONG GetTabWinCount(); - Point GetScrollOffset() const { return m_aScrollOffset; } + BOOL ScrollPane( long nDelta, BOOL bHoriz, BOOL bPaintScrollBars ); + ULONG GetTabWinCount(); + Point GetScrollOffset() const { return m_aScrollOffset; } - OJoinDesignView* getDesignView() const { return m_pView; } - OTableWindow* GetTabWindow( const String& rName ); + OJoinDesignView* getDesignView() const { return m_pView; } + OTableWindow* GetTabWindow( const String& rName ); - OTableConnection* GetSelectedConn() { return m_pSelectedConn; } - void DeselectConn(OTableConnection* pConn); // NULL ist ausdruecklich zugelassen, dann passiert nichts - void SelectConn(OTableConnection* pConn); + OTableConnection* GetSelectedConn() { return m_pSelectedConn; } + void DeselectConn(OTableConnection* pConn); // NULL ist ausdruecklich zugelassen, dann passiert nichts + void SelectConn(OTableConnection* pConn); - OTableWindowMap* GetTabWinMap() { return &m_aTableMap; } - const OTableWindowMap* GetTabWinMap() const { return &m_aTableMap; } + OTableWindowMap* GetTabWinMap() { return &m_aTableMap; } + const OTableWindowMap* GetTabWinMap() const { return &m_aTableMap; } /** gives a read only access to the connection vector */ - const ::std::vector<OTableConnection*>* getTableConnections() const { return &m_vTableConnection; } + const ::std::vector<OTableConnection*>* getTableConnections() const { return &m_vTableConnection; } - - BOOL ExistsAConn(const OTableWindow* pFromWin) const; + + BOOL ExistsAConn(const OTableWindow* pFromWin) const; /** getTableConnections searchs for all connections of a table - @param _pFromWin the table for which connections should be found - + @param _pFromWin the table for which connections should be found + @return an iterator which can be used to travel all connections of the table */ ::std::vector<OTableConnection*>::const_iterator getTableConnections(const OTableWindow* _pFromWin) const; /** getConnectionCount returns how many connection belongs to single table - @param _pFromWin the table for which connections should be found + @param _pFromWin the table for which connections should be found - @return the count of connections wich belongs to this table + @return the count of connections wich belongs to this table */ sal_Int32 getConnectionCount(const OTableWindow* _pFromWin) const; @@ -220,9 +220,9 @@ namespace dbaui virtual long PreNotify(NotifyEvent& rNEvt); // DnD stuff - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); /** can be used in derevied classes to make some special ui handling @@ -242,9 +242,9 @@ namespace dbaui void modified(); /** returns if teh given window is visible. - @param _rPoint + @param _rPoint The Point to check - @param _rSize + @param _rSize The Size to be check as well @return <TRUE/> if the area is visible otherwise <FALSE/> @@ -283,7 +283,7 @@ namespace dbaui ,const ::rtl::OUString& _rWinName); /** factory method to create table windows - @param _pData + @param _pData The data corresponding to the window. @return The new TableWindow @@ -302,18 +302,18 @@ namespace dbaui virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const; private: - void InitColors(); - BOOL ScrollWhileDragging(); + void InitColors(); + BOOL ScrollWhileDragging(); /** executePopup opens the context menu to delate a connection - @param _aPos the position where the popup menu should appear - @param _pSelConnection the connection which should be deleted + @param _aPos the position where the popup menu should appear + @param _pSelConnection the connection which should be deleted */ void executePopup(const Point& _aPos,OTableConnection* _pSelConnection); - /** invalidateAndModify invalidates this window without children and + /** invalidateAndModify invalidates this window without children and set the controller modified - @param _pAction a possible undo action to add at the controller + @param _pAction a possible undo action to add at the controller */ void invalidateAndModify(SfxUndoAction *_pAction=NULL); diff --git a/dbaccess/source/ui/inc/QEnumTypes.hxx b/dbaccess/source/ui/inc/QEnumTypes.hxx index 13ea803c3866..828595cd39b5 100644 --- a/dbaccess/source/ui/inc/QEnumTypes.hxx +++ b/dbaccess/source/ui/inc/QEnumTypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,35 +30,35 @@ namespace dbaui { - enum EOrderDir - { - ORDER_NONE=0, - ORDER_ASC, - ORDER_DESC + enum EOrderDir + { + ORDER_NONE=0, + ORDER_ASC, + ORDER_DESC }; enum EFunctionType { - FKT_NONE =0x00000000, - FKT_OTHER =0x00000001, - FKT_AGGREGATE =0x00000002, - FKT_CONDITION =0x00000004, - FKT_NUMERIC =0x00000008 + FKT_NONE =0x00000000, + FKT_OTHER =0x00000001, + FKT_AGGREGATE =0x00000002, + FKT_CONDITION =0x00000004, + FKT_NUMERIC =0x00000008 // wenn dieser Fkt.Typ gesetzt handelt es sich um EXISTS oder UNIQUE, der FieldName enthält das gesamte Statement }; - enum EConnectionSide - { - JTCS_FROM=0, - JTCS_TO + enum EConnectionSide + { + JTCS_FROM=0, + JTCS_TO }; - enum ETableFieldType - { - TAB_NORMAL_FIELD=0, - TAB_PRIMARY_FIELD + enum ETableFieldType + { + TAB_NORMAL_FIELD=0, + TAB_PRIMARY_FIELD }; - + enum EJoinType { FULL_JOIN=0, diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 4fa761fa3b64..5c781b77d74b 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ namespace dbaui class OTableConnection; class OQueryTableConnectionData; class OQueryContainerWindow; - + class OQueryDesignView : public OQueryView { enum ChildFocusState @@ -79,15 +79,15 @@ namespace dbaui NONE }; - Splitter m_aSplitter; + Splitter m_aSplitter; + + ::com::sun::star::lang::Locale m_aLocale; + ::rtl::OUString m_sDecimalSep; - ::com::sun::star::lang::Locale m_aLocale; - ::rtl::OUString m_sDecimalSep; - - OSelectionBrowseBox* m_pSelectionBox; // presents the lower window - ChildFocusState m_eChildFocus; - sal_Bool m_bInKeyEvent; - sal_Bool m_bInSplitHandler; + OSelectionBrowseBox* m_pSelectionBox; // presents the lower window + ChildFocusState m_eChildFocus; + sal_Bool m_bInKeyEvent; + sal_Bool m_bInSplitHandler; public: OQueryDesignView(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); @@ -115,13 +115,13 @@ namespace dbaui // window overloads virtual long PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); - + sal_Bool isSlotEnabled(sal_Int32 _nSlotId); void setSlotEnabled(sal_Int32 _nSlotId,sal_Bool _bEnable); void setNoneVisbleRow(sal_Int32 _nRows); - ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} - ::rtl::OUString getDecimalSeparator() const { return m_sDecimalSep;} + ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} + ::rtl::OUString getDecimalSeparator() const { return m_sDecimalSep;} SqlParseError InsertField( const OTableFieldDescRef& rInfo, sal_Bool bVis=sal_True, sal_Bool bActivate = sal_True); bool HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const; @@ -155,7 +155,7 @@ namespace dbaui const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rFieldDescriptions ); - ::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry, + ::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry, const String& _sCriteria, ::rtl::OUString& _rsErrorMessage, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn) const; diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index 5bd45e30ccb9..590ef4a42925 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,9 +37,9 @@ namespace dbaui struct TabWinsChangeNotification { - enum ACTION_TYPE { AT_ADDED_WIN, AT_REMOVED_WIN }; - ACTION_TYPE atActionPerformed; - String strAffectedTable; + enum ACTION_TYPE { AT_ADDED_WIN, AT_REMOVED_WIN }; + ACTION_TYPE atActionPerformed; + String strAffectedTable; TabWinsChangeNotification(ACTION_TYPE at, const String& str) : atActionPerformed(at), strAffectedTable(str) { } }; @@ -52,14 +52,14 @@ namespace dbaui class OQueryDesignView; class OQueryTableView : public OJoinTableView { - Link m_lnkTabWinsChangeHandler; + Link m_lnkTabWinsChangeHandler; protected: virtual void ConnDoubleClicked(OTableConnection* pConnection); virtual void KeyInput(const KeyEvent& rEvt); virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData); - + /** called when init fails at the tablewindowdata because the m_xTable object could not provide columns, but no exception was thrown. Expected to throw. */ @@ -76,10 +76,10 @@ namespace dbaui virtual void RemoveTabWin(OTableWindow* pTabWin); // und ein AddTabWin, das einen Alias vorgibt - void AddTabWin(const ::rtl::OUString& strDatabase, const ::rtl::OUString& strTableName, const ::rtl::OUString& strAlias, BOOL bNewTable = FALSE); + void AddTabWin(const ::rtl::OUString& strDatabase, const ::rtl::OUString& strTableName, const ::rtl::OUString& strAlias, BOOL bNewTable = FALSE); // TabWin suchen - OQueryTableWindow* FindTable(const String& rAliasName); - BOOL FindTableFromField(const String& rFieldName, OTableFieldDescRef& rInfo, USHORT& rCnt); + OQueryTableWindow* FindTable(const String& rAliasName); + BOOL FindTableFromField(const String& rFieldName, OTableFieldDescRef& rInfo, USHORT& rCnt); // Basisklasse ueberschrieben : Connections kreieren und loeschen virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest); @@ -96,14 +96,14 @@ namespace dbaui // natuerlich alle Connections an diesen Fenstern und alle Abfrage-Spalten, die auf diesen Tabellen basierten. // TabWin anzeigen oder verstecken (NICHT kreieren oder loeschen) - BOOL ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend); - void HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction); + BOOL ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend); + void HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction); // Sichbarkeit eines TabWins sicherstellen (+ Invalidieren der Connections) virtual void EnsureVisible(const OTableWindow* _pWin); // wieviel Tabellen mit einem bestimmten Namen habe ich schon ? - sal_Int32 CountTableAlias(const String& rName, sal_Int32& rMax); + sal_Int32 CountTableAlias(const String& rName, sal_Int32& rMax); // ein Feld einfuegen (wird einfach an das Elter weitergereicht void InsertField(const OTableFieldDescRef& rInfo); @@ -119,7 +119,7 @@ namespace dbaui // eine neu Connection bekanntgeben und einfuegen lassen, wenn nicht schon existent void NotifyTabConnection(const OQueryTableConnection& rNewConn, BOOL _bCreateUndoAction = TRUE); - Link SetTabWinsChangeHandler(const Link& lnk) { Link lnkRet = m_lnkTabWinsChangeHandler; m_lnkTabWinsChangeHandler = lnk; return lnkRet; } + Link SetTabWinsChangeHandler(const Link& lnk) { Link lnkRet = m_lnkTabWinsChangeHandler; m_lnkTabWinsChangeHandler = lnk; return lnkRet; } // der Handler bekommt einen Zeiger auf eine TabWinsChangeNotification-Struktur BOOL ExistsAVisitedConn(const OQueryTableWindow* pFrom) const; diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index d541e972169c..b8b4861c08cb 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace dbaui class OQueryTextView : public Window { friend class OQueryViewSwitch; - OSqlEdit* m_pEdit; + OSqlEdit* m_pEdit; public: OQueryTextView( OQueryContainerWindow* pParent ); virtual ~OQueryTextView(); @@ -63,7 +63,7 @@ namespace dbaui // allow access to our edit OSqlEdit* getSqlEdit() const { return m_pEdit; } - OQueryContainerWindow* getContainerWindow() { return static_cast< OQueryContainerWindow* >( GetParent() ); } + OQueryContainerWindow* getContainerWindow() { return static_cast< OQueryContainerWindow* >( GetParent() ); } protected: virtual void Resize(); }; diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index 9ddc6ce20108..a55803a53d1c 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,11 +41,11 @@ namespace dbaui class OQueryTextView; class OAddTableDlg; class OQueryContainerWindow; - class OQueryViewSwitch + class OQueryViewSwitch { - OQueryDesignView* m_pDesignView; - OQueryTextView* m_pTextView; - sal_Bool m_bAddTableDialogWasVisible; // true if so + OQueryDesignView* m_pDesignView; + OQueryTextView* m_pTextView; + sal_Bool m_bAddTableDialogWasVisible; // true if so public: OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); virtual ~OQueryViewSwitch(); @@ -78,8 +78,8 @@ namespace dbaui bool switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo ); void forceInitialView(); sal_Bool isSlotEnabled(sal_Int32 _nSlotId); - void setSlotEnabled(sal_Int32 _nSlotId,sal_Bool _bEnable); - void setNoneVisbleRow(sal_Int32 _nRows); + void setSlotEnabled(sal_Int32 _nSlotId,sal_Bool _bEnable); + void setNoneVisbleRow(sal_Int32 _nRows); void SaveUIConfig(); bool reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ); void GrabFocus(); @@ -87,8 +87,8 @@ namespace dbaui // returs the add table dialog from the design view OAddTableDlg* getAddTableDialog(); - OQueryDesignView* getDesignView() const { return m_pDesignView; } - OQueryContainerWindow* getContainer() const; + OQueryDesignView* getDesignView() const { return m_pDesignView; } + OQueryContainerWindow* getContainer() const; void SetPosSizePixel( Point _rPt,Size _rSize); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 184e0e97cbdb..19d4f801388b 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,19 +35,19 @@ namespace dbaui { - const UINT16 CARDINAL_UNDEFINED = 0x0000; - const UINT16 CARDINAL_ONE_MANY = 0x0001; - const UINT16 CARDINAL_MANY_ONE = 0x0002; - const UINT16 CARDINAL_ONE_ONE = 0x0004; + const UINT16 CARDINAL_UNDEFINED = 0x0000; + const UINT16 CARDINAL_ONE_MANY = 0x0001; + const UINT16 CARDINAL_MANY_ONE = 0x0002; + const UINT16 CARDINAL_ONE_ONE = 0x0004; class OConnectionLineData; //================================================================== - class ORelationTableConnectionData : public OTableConnectionData + class ORelationTableConnectionData : public OTableConnectionData { friend bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs); friend bool operator!=(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs) { return !(lhs == rhs); } - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; // @see com.sun.star.sdbc.KeyRule sal_Int32 m_nUpdateRules; @@ -55,8 +55,8 @@ namespace dbaui sal_Int32 m_nCardinality; BOOL checkPrimaryKey(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const; - BOOL IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); } - BOOL IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); } + BOOL IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); } + BOOL IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); } protected: virtual OConnectionLineDataRef CreateLineDataObj(); @@ -79,19 +79,19 @@ namespace dbaui @return true if successful */ virtual BOOL Update(); + + void SetCardinality(); + inline void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; } + inline void SetDeleteRules( sal_Int32 nAttr ){ m_nDeleteRules = nAttr; } - void SetCardinality(); - inline void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; } - inline void SetDeleteRules( sal_Int32 nAttr ){ m_nDeleteRules = nAttr; } - - inline sal_Int32 GetUpdateRules() const { return m_nUpdateRules; } - inline sal_Int32 GetDeleteRules() const { return m_nDeleteRules; } - inline sal_Int32 GetCardinality() const { return m_nCardinality; } + inline sal_Int32 GetUpdateRules() const { return m_nUpdateRules; } + inline sal_Int32 GetDeleteRules() const { return m_nDeleteRules; } + inline sal_Int32 GetCardinality() const { return m_nCardinality; } - BOOL IsConnectionPossible(); - void ChangeOrientation(); - BOOL DropRelation(); + BOOL IsConnectionPossible(); + void ChangeOrientation(); + BOOL DropRelation(); }; } diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx index 20912af0af1c..6e33ef2367d9 100644 --- a/dbaccess/source/ui/inc/RefFunctor.hxx +++ b/dbaccess/source/ui/inc/RefFunctor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,10 +47,10 @@ namespace dbaui { m_aFunction(_aType.get()); } -// inline void operator()(const ::rtl::Reference<T>& _aType) -// { -// m_aFunction(_aType.get()); -// } +// inline void operator()(const ::rtl::Reference<T>& _aType) +// { +// m_aFunction(_aType.get()); +// } }; // ----------------------------------------------------------------------------- } // namespace dbaui diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index ab0366263e50..d5a1d5b299e6 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,14 +44,14 @@ namespace dbaui virtual TTableConnectionData::value_type getConnectionData() const = 0; /** setValid set the valid inside, can be used for OK buttons - @param _bValid true when the using control allows an update + @param _bValid true when the using control allows an update */ virtual void setValid(sal_Bool _bValid) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() = 0; /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists - @param _pConnectionData the connection which exists between the new tables + @param _pConnectionData the connection which exists between the new tables */ virtual void notifyConnectionChange() = 0; }; diff --git a/dbaccess/source/ui/inc/RelationControl.hrc b/dbaccess/source/ui/inc/RelationControl.hrc index 6f0c811db3da..1f833d9fb922 100644 --- a/dbaccess/source/ui/inc/RelationControl.hrc +++ b/dbaccess/source/ui/inc/RelationControl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index 55983b1dff6e..ec5108d280a9 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,28 +37,28 @@ namespace dbaui //======================================================================== class OTableListBoxControl; class OTableConnectionData; - class ORelationTableConnectionData; - class IRelationControlInterface; + class ORelationTableConnectionData; + class IRelationControlInterface; class ORelationControl; - class OTableListBoxControl : public Window + class OTableListBoxControl : public Window { - FixedLine m_aFL_InvolvedTables; - ListBox m_lmbLeftTable, + FixedLine m_aFL_InvolvedTables; + ListBox m_lmbLeftTable, m_lmbRightTable; - FixedLine m_aFL_InvolvedFields; + FixedLine m_aFL_InvolvedFields; - ORelationControl* m_pRC_Tables; - const OJoinTableView::OTableWindowMap* m_pTableMap; - IRelationControlInterface* m_pParentDialog; - String m_strCurrentLeft; - String m_strCurrentRight; + ORelationControl* m_pRC_Tables; + const OJoinTableView::OTableWindowMap* m_pTableMap; + IRelationControlInterface* m_pParentDialog; + String m_strCurrentLeft; + String m_strCurrentRight; private: DECL_LINK( OnTableChanged, ListBox* ); public: OTableListBoxControl(Window* _pParent, const ResId& _rResId, - const OJoinTableView::OTableWindowMap* _pTableMap, + const OJoinTableView::OTableWindowMap* _pTableMap, IRelationControlInterface* _pParentDialog); virtual ~OTableListBoxControl(); @@ -67,7 +67,7 @@ namespace dbaui void fillListBoxes(); /** fillAndDisable fill the listboxes only with one entry and then disable them - @param _pConnectionData + @param _pConnectionData contains the data which should be filled into the listboxes */ void fillAndDisable(const TTableConnectionData::value_type& _pConnectionData); @@ -83,7 +83,7 @@ namespace dbaui void NotifyCellChange(); /** Init is a call through to the control inside this one - @param _pConnData + @param _pConnData the connection data which is used to init the control */ void Init(const TTableConnectionData::value_type& _pConnData); @@ -92,7 +92,7 @@ namespace dbaui BOOL SaveModified(); - TTableWindowData::value_type getReferencingTable() const; + TTableWindowData::value_type getReferencingTable() const; /** getContainer returns the container interface @return the interface of the container diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 3b0e375f8537..e16dfa9356da 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,22 +42,22 @@ namespace dbaui class OTableWindow; class ORelationController : public OJoinController { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; ::std::auto_ptr<WaitObject> m_pWaitObject; - ULONG m_nThreadEvent; - sal_Bool m_bRelationsPossible; + ULONG m_nThreadEvent; + sal_Bool m_bRelationsPossible; protected: // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); - ORelationDesignView* getRelationView() { return static_cast<ORelationDesignView*>( getView() ); } + ORelationDesignView* getRelationView() { return static_cast<ORelationDesignView*>( getView() ); } void loadData(); TTableWindowData::value_type existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const; - + // load the window positions out of the datasource void loadLayoutInformation(); void loadTableData(const ::com::sun::star::uno::Any& _aTable); @@ -67,9 +67,9 @@ namespace dbaui ~ORelationController(); // temp void SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabWinList, long nOffsetX, long nOffsetY ); - + void mergeData(const TTableConnectionData& _aConnectionData); - + virtual sal_Bool Construct(Window* pParent); // XServiceInfo diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index 423885b3ee38..dae48967302a 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace dbaui class ORelationTableConnectionData; class OConnectionLineData; class ORelationController; - + class ORelationDesignView : public OJoinDesignView { public: @@ -56,7 +56,7 @@ namespace dbaui virtual void Construct(); virtual void initialize(); - + virtual long PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); }; diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index bbd66b2ba7b8..044eaa418ed3 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ namespace dbaui ,public IRelationControlInterface { OModuleClient m_aModuleClient; - ::std::auto_ptr<OTableListBoxControl> m_pTableControl; - OJoinTableView::OTableWindowMap* m_pTableMap; + ::std::auto_ptr<OTableListBoxControl> m_pTableControl; + OJoinTableView::OTableWindowMap* m_pTableMap; FixedLine aFL_CascUpd; RadioButton aRB_NoCascUpd, @@ -57,21 +57,21 @@ namespace dbaui aRB_CascUpdNull, aRB_CascUpdDefault; FixedLine aFL_CascDel; - RadioButton aRB_NoCascDel, + RadioButton aRB_NoCascDel, aRB_CascDel, aRB_CascDelNull, aRB_CascDelDefault; - OKButton aPB_OK; + OKButton aPB_OK; CancelButton aPB_CANCEL; - HelpButton aPB_HELP; - + HelpButton aPB_HELP; - TTableConnectionData::value_type m_pConnData; - TTableConnectionData::value_type m_pOrigConnData; + + TTableConnectionData::value_type m_pConnData; + TTableConnectionData::value_type m_pOrigConnData; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - BOOL m_bTriedOneUpdate; + BOOL m_bTriedOneUpdate; public: ORelationDialog(OJoinTableView* pParent, @@ -94,19 +94,19 @@ namespace dbaui virtual TTableConnectionData::value_type getConnectionData() const; /** setValid set the valid inside, can be used for OK buttons - @param _bValid true when the using control allows an update + @param _bValid true when the using control allows an update */ virtual void setValid(sal_Bool _bValid); /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists - @param _pConnectionData the connection which exists between the new tables + @param _pConnectionData the connection which exists between the new tables */ virtual void notifyConnectionChange(); protected: void Init(const TTableConnectionData::value_type& _pConnectionData); private: - DECL_LINK( OKClickHdl, Button* ); + DECL_LINK( OKClickHdl, Button* ); }; } #endif // DBAUI_RELATIONDIALOG_HXX diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index b7213e440754..ab0533164091 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef DBAUI_RELATION_TABLEVIEW_HXX #define DBAUI_RELATION_TABLEVIEW_HXX - + #include "JoinTableView.hxx" #include <comphelper/containermultiplexer.hxx> #include <cppuhelper/basemutex.hxx> @@ -40,12 +40,12 @@ namespace dbaui , public OJoinTableView , public ::comphelper::OContainerListener { - OTableConnection* m_pExistingConnection; // is set when a connection was draged on an existing connection + OTableConnection* m_pExistingConnection; // is set when a connection was draged on an existing connection TTableConnectionData::value_type m_pCurrentlyTabConnData; // set when we creating a connection with more than one keycolumn - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; bool m_bInRemove; - + virtual void ConnDoubleClicked( OTableConnection* pConnection ); virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL bNewTable = FALSE); diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 299274aef315..457768327088 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,25 +39,25 @@ namespace dbaui { class ORTFReader : public SvRTFParser , public ODatabaseExport { - ::std::vector<sal_Int32> m_vecColor; + ::std::vector<sal_Int32> m_vecColor; - // void insertValueIntoColumn(); + // void insertValueIntoColumn(); protected: - virtual sal_Bool CreateTable(int nToken); - virtual void NextToken( int nToken ); // Basisklasse + virtual sal_Bool CreateTable(int nToken); + virtual void NextToken( int nToken ); // Basisklasse virtual TypeSelectionPageFactory getTypeSelectionPageFactory(); ~ORTFReader(); public: - ORTFReader( SvStream& rIn, + ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* rList = 0, const OTypeInfoMap* _pInfoMap = 0); // wird f"ur auto. Typ-Erkennung gebraucht - ORTFReader( SvStream& rIn, + ORTFReader( SvStream& rIn, sal_Int32 nRows, const TPositions &_rColumnPositions, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, @@ -66,8 +66,8 @@ namespace dbaui const OTypeInfoMap* _pInfoMap, sal_Bool _bAutoIncrementEnabled); - virtual SvParserState CallParser();// Basisklasse - virtual void release(); + virtual SvParserState CallParser();// Basisklasse + virtual void release(); // birgt nur korrekte Daten, wenn der 2. CTOR benutzt wurde // ansonsten wird die SbaColumnList ohne "Anderung zur"uckgegeben }; diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx index 6835c99eef3e..5eda7f69940a 100644 --- a/dbaccess/source/ui/inc/ScrollHelper.hxx +++ b/dbaccess/source/ui/inc/ScrollHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ namespace dbaui { class OScrollHelper { - Link m_aUpScroll; - Link m_aDownScroll; + Link m_aUpScroll; + Link m_aDownScroll; public: /** default contructor */ @@ -46,7 +46,7 @@ namespace dbaui ~OScrollHelper(); /** set the memthod which should be called when scrolling up - @param _rUpScroll + @param _rUpScroll the method to set */ inline void setUpScrollMethod( const Link& _rUpScroll ) @@ -55,7 +55,7 @@ namespace dbaui } /** set the memthod which should be called when scrolling down - @param _rDownScroll + @param _rDownScroll the method to set */ inline void setDownScrollMethod( const Link& _rDownScroll ) @@ -64,9 +64,9 @@ namespace dbaui } /** check if a scroll method has to be called - @param _rPoint + @param _rPoint the current selection point - @param _rOutputSize + @param _rOutputSize the output size of the window */ void scroll(const Point& _rPoint, const Size& _rOutputSize); diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index edeed2d4f40b..2356e9d0ed58 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ namespace dbaui class OSQLNameChecker { ::rtl::OUString m_sAllowedChars; - sal_Bool m_bOnlyUpperCase; - sal_Bool m_bCheck; // true when we should check for invalid chars + sal_Bool m_bOnlyUpperCase; + sal_Bool m_bCheck; // true when we should check for invalid chars public: OSQLNameChecker(const ::rtl::OUString& _rAllowedChars) :m_sAllowedChars(_rAllowedChars) @@ -46,12 +46,12 @@ namespace dbaui { } - void setUpperCase(sal_Bool _bUpper=sal_True) - { - m_bOnlyUpperCase = _bUpper; + void setUpperCase(sal_Bool _bUpper=sal_True) + { + m_bOnlyUpperCase = _bUpper; } - void setAllowedChars(const ::rtl::OUString& _rAllowedChars) - { + void setAllowedChars(const ::rtl::OUString& _rAllowedChars) + { m_sAllowedChars = _rAllowedChars; } // default is false because it is initialized with true @@ -66,19 +66,19 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameEdit(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) + OSQLNameEdit(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) : Edit(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameEdit(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) + OSQLNameEdit(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) : Edit(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { } // Window overload - // virtual long PreNotify( NotifyEvent& rNEvt ); + // virtual long PreNotify( NotifyEvent& rNEvt ); // Edit virtual void Modify(); }; @@ -87,16 +87,16 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameComboBox(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) + OSQLNameComboBox(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) : ComboBox(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) + OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) : ComboBox(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { - } + } // Window overload // Edit diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 5eb3429ce931..02519af26207 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ namespace dbaui DBG_NAMEEX(OTableConnection) class OTableConnection : public Window { - ::std::vector<OConnectionLine*> m_vConnLine; - TTableConnectionData::value_type + ::std::vector<OConnectionLine*> m_vConnLine; + TTableConnectionData::value_type m_pData; - OJoinTableView* m_pParent; + OJoinTableView* m_pParent; - BOOL m_bSelected; + BOOL m_bSelected; void Init(); /** clearLineData loops through the vector and deletes all lines @@ -73,35 +73,35 @@ namespace dbaui virtual ~OTableConnection(); OTableConnection& operator=( const OTableConnection& rConn ); + - - void Select(); - void Deselect(); - BOOL IsSelected() const { return m_bSelected; } - BOOL CheckHit( const Point& rMousePos ) const; - bool InvalidateConnection(); - void UpdateLineList(); + void Select(); + void Deselect(); + BOOL IsSelected() const { return m_bSelected; } + BOOL CheckHit( const Point& rMousePos ) const; + bool InvalidateConnection(); + void UpdateLineList(); OTableWindow* GetSourceWin() const; OTableWindow* GetDestWin() const; bool RecalcLines(); /** isTableConnection - @param _pTable the table where we should check if we belongs to it + @param _pTable the table where we should check if we belongs to it - @return true when the source or the destination window are equal + @return true when the source or the destination window are equal */ bool isTableConnection(const OTableWindow* _pTable) { return (_pTable == GetSourceWin() || _pTable == GetDestWin()); } - Rectangle GetBoundingRect() const; + Rectangle GetBoundingRect() const; - inline TTableConnectionData::value_type GetData() const { return m_pData; } + inline TTableConnectionData::value_type GetData() const { return m_pData; } const ::std::vector<OConnectionLine*>* GetConnLineList() const { return &m_vConnLine; } - inline OJoinTableView* GetParent() const { return m_pParent; } - virtual void Draw( const Rectangle& rRect ); + inline OJoinTableView* GetParent() const { return m_pParent; } + virtual void Draw( const Rectangle& rRect ); using Window::Draw; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 0a91e9bf5cc2..2d558249f1c3 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,20 +39,20 @@ namespace dbaui { #define MAX_CONN_COUNT 2 //================================================================== - // ConnData ---------->* ConnLineData - // ^1 ^1 - // | | - // Conn ---------->* ConnLine + // ConnData ---------->* ConnLineData + // ^1 ^1 + // | | + // Conn ---------->* ConnLine //================================================================== - + //================================================================== /* - the class OTableConnectionData contains all connection data which exists between two windows + the class OTableConnectionData contains all connection data which exists between two windows **/ class OTableConnectionData { - + protected: TTableWindowData::value_type m_pReferencingTable; TTableWindowData::value_type m_pReferencedTable; @@ -60,7 +60,7 @@ namespace dbaui OConnectionLineDataVec m_vConnLineData; - void Init(); + void Init(); virtual OConnectionLineDataRef CreateLineDataObj(); virtual OConnectionLineDataRef CreateLineDataObj( const OConnectionLineData& rConnLineData ); diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 5b61c5ada9eb..0b07cccd51e0 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,32 +44,32 @@ namespace dbaui { class OTableRow; class OFieldDescription; - typedef OSingleDocumentController OTableController_BASE; + typedef OSingleDocumentController OTableController_BASE; class OTableController : public OTableController_BASE { private: OModuleClient m_aModuleClient; - ::std::vector< ::boost::shared_ptr<OTableRow> > m_vRowList; - OTypeInfoMap m_aTypeInfo; + ::std::vector< ::boost::shared_ptr<OTableRow> > m_vRowList; + OTypeInfoMap m_aTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - - ::rtl::OUString m_sCatalogName; // catalog for update data - ::rtl::OUString m_sSchemaName; // schema for update data - ::rtl::OUString m_sName; // table for update data - ::rtl::OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource - String m_sTypeNames; // these type names are the ones out of the resource file - TOTypeInfoSP m_pTypeInfo; // fall back when type is unkown because database driver has a failure + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - sal_Bool m_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has a AutoIncrementValue property in their info property - sal_Bool m_bNew : 1; // is true when we create a new table + ::rtl::OUString m_sCatalogName; // catalog for update data + ::rtl::OUString m_sSchemaName; // schema for update data + ::rtl::OUString m_sName; // table for update data + ::rtl::OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource + String m_sTypeNames; // these type names are the ones out of the resource file + TOTypeInfoSP m_pTypeInfo; // fall back when type is unkown because database driver has a failure + sal_Bool m_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has a AutoIncrementValue property in their info property + sal_Bool m_bNew : 1; // is true when we create a new table + void reSyncRows(); - void assignTable(); // set the table if a name is given + void assignTable(); // set the table if a name is given void loadData(); - sal_Bool checkColumns(sal_Bool _bNew) throw(::com::sun::star::sdbc::SQLException); // check if we have double column names + sal_Bool checkColumns(sal_Bool _bNew) throw(::com::sun::star::sdbc::SQLException); // check if we have double column names String createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxTables,const String& _rDefault); void appendColumns(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup,sal_Bool _bNew,sal_Bool _bKeyColumns = sal_False); void appendPrimaryKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup,sal_Bool _bNew); @@ -77,63 +77,63 @@ namespace dbaui void dropPrimaryKey(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getKeyColumns() const; ::rtl::OUString createUniqueName(const ::rtl::OUString& _rName); - + void reload(); - + // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual void losingConnection( ); virtual ::rtl::OUString getPrivateTitle( ) const; - - void doEditIndexes(); - sal_Bool doSaveDoc(sal_Bool _bSaveAs); + + void doEditIndexes(); + sal_Bool doSaveDoc(sal_Bool _bSaveAs); virtual ~OTableController(); public: OTableController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getTable() { return m_xTable;} - - sal_Bool isAddAllowed() const; - sal_Bool isDropAllowed() const; - sal_Bool isAlterAllowed() const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getTable() { return m_xTable;} + + sal_Bool isAddAllowed() const; + sal_Bool isDropAllowed() const; + sal_Bool isAlterAllowed() const; bool isAutoIncrementPrimaryKey() const; - inline sal_Bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } - inline const ::rtl::OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } - + inline sal_Bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } + inline const ::rtl::OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } + virtual void impl_onModifyChanged(); - // const ::connectivity::OSQLParseNode* getParseTree() const { return m_aSqlIterator.getParseTree();} + // const ::connectivity::OSQLParseNode* getParseTree() const { return m_aSqlIterator.getParseTree();} // need for undo's and redo's SfxUndoManager* getUndoMgr(); - inline ::std::vector< ::boost::shared_ptr<OTableRow> >* getRows() { return &m_vRowList; } + inline ::std::vector< ::boost::shared_ptr<OTableRow> >* getRows() { return &m_vRowList; } /// returns the postion of the the first empty row - sal_Int32 getFirstEmptyRowPosition(); - - inline const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } - - inline TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } - TOTypeInfoSP getTypeInfoByType(sal_Int32 _nDataType) const; + sal_Int32 getFirstEmptyRowPosition(); - inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; } + inline const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } - virtual sal_Bool Construct(Window* pParent); + inline TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } + TOTypeInfoSP getTypeInfoByType(sal_Int32 _nDataType) const; + + inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; } + + virtual sal_Bool Construct(Window* pParent); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); @@ -144,7 +144,7 @@ namespace dbaui static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); - // + // virtual void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxIn); virtual void Save(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOut); diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 86012fa3706f..778739896747 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ namespace dbaui /// unary_function Functor object for class DataFlavorExVector::value_type returntype is bool struct TAppSupportedSotFunctor : ::std::unary_function<DataFlavorExVector::value_type,bool> { - ElementType eEntryType; - sal_Bool bQueryDrop; + ElementType eEntryType; + sal_Bool bQueryDrop; TAppSupportedSotFunctor(const ElementType& _eEntryType,sal_Bool _bQueryDrop) : eEntryType(_eEntryType) , bQueryDrop(_bQueryDrop) @@ -58,12 +58,12 @@ namespace dbaui { switch (_aType.mnSotId) { - case SOT_FORMAT_RTF: // RTF data descriptions - case SOT_FORMATSTR_ID_HTML: // HTML data descriptions - case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor + case SOT_FORMAT_RTF: // RTF data descriptions + case SOT_FORMATSTR_ID_HTML: // HTML data descriptions + case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor return (E_TABLE == eEntryType); - case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor - case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command + case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor + case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command return ((E_QUERY == eEntryType) || ( !bQueryDrop && E_TABLE == eEntryType)); } return false; @@ -74,24 +74,24 @@ namespace dbaui { private: OGenericUnoController* m_pController; - ::rtl::OUString m_sTableNameForAppend; + ::rtl::OUString m_sTableNameForAppend; public: // is needed to describe the drop target struct DropDescriptor { - ::svx::ODataAccessDescriptor aDroppedData; + ::svx::ODataAccessDescriptor aDroppedData; //dyf add 20070601 //for transfor the tablename ::rtl::OUString sDefaultTableName; //dyf add end - String aUrl; - SotStorageStreamRef aHtmlRtfStorage; - ElementType nType; + String aUrl; + SotStorageStreamRef aHtmlRtfStorage; + ElementType nType; SvLBoxEntry* pDroppedAt; - sal_Int8 nAction; - sal_Bool bHtml; - sal_Bool bError; + sal_Int8 nAction; + sal_Bool bHtml; + sal_Bool bError; DropDescriptor() : nType(E_TABLE),pDroppedAt(NULL),nAction(DND_ACTION_NONE) { } }; @@ -99,9 +99,9 @@ namespace dbaui OTableCopyHelper(OGenericUnoController* _pControler); /** pastes a table into the data source - @param _rPasteData + @param _rPasteData The data helper. - @param _sDestDataSourceName + @param _sDestDataSourceName The name of the dest data source. */ void pasteTable( const TransferableDataHelper& _rTransData @@ -109,11 +109,11 @@ namespace dbaui ,const SharedConnection& _xConnection); /** pastes a table into the data source - @param _nFormatId + @param _nFormatId The format which should be copied. - @param _rPasteData + @param _rPasteData The data helper. - @param _sDestDataSourceName + @param _sDestDataSourceName The name of the dest data source. */ void pasteTable( SotFormatStringId _nFormatId @@ -122,9 +122,9 @@ namespace dbaui ,const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF - @param _rDesc + @param _rDesc The Drop descriptor - @param _bCheck + @param _bCheck If set to <TRUE/> than the controller checks only if a copy is possible. @param _xConnection The connection @@ -134,9 +134,9 @@ namespace dbaui const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF - @param _rDesc + @param _rDesc The Drop descriptor - @param _bCheck + @param _bCheck If set to <TRUE/> than the controller checks only if a copy is possible. @param _xConnection The connection @@ -148,7 +148,7 @@ namespace dbaui /** copies a table which was constructed by tags like HTML or RTF @param _aDroppedData The dropped data - @param _rDesc + @param _rDesc IN/OUT parameter @param _xConnection The connection @@ -166,9 +166,9 @@ namespace dbaui private: /** pastes a table into the data source - @param _rPasteData + @param _rPasteData The data descriptor. - @param _sDestDataSourceName + @param _sDestDataSourceName The name of the dest data source. */ void pasteTable( @@ -193,7 +193,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBUI_TABLECOPYHELPER_HXX diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index 9acd1fbf02eb..c9468a15b597 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,28 +46,28 @@ namespace dbaui friend class OTableDesignUndoAct; protected: - long m_nDataPos; // derzeit benoetigte Zeile - long m_nCurrentPos; // Aktuelle Position der ausgewaehlten Column + long m_nDataPos; // derzeit benoetigte Zeile + long m_nCurrentPos; // Aktuelle Position der ausgewaehlten Column private: - USHORT m_nCurUndoActId; + USHORT m_nCurUndoActId; protected: - BOOL m_bCurrentModified; - BOOL m_bUpdatable; - BOOL m_bClipboardFilled; + BOOL m_bCurrentModified; + BOOL m_bUpdatable; + BOOL m_bClipboardFilled; public: OTableRowView(Window* pParent); virtual ~OTableRowView(); - virtual void SetCellData( long nRow, USHORT nColId, const TOTypeInfoSP& _pTypeInfo ) = 0; - virtual void SetCellData( long nRow, USHORT nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0; - virtual ::com::sun::star::uno::Any GetCellData( long nRow, USHORT nColId ) = 0; - virtual void SetControlText( long nRow, USHORT nColId, const String& rText ) = 0; - virtual String GetControlText( long nRow, USHORT nColId ) = 0; + virtual void SetCellData( long nRow, USHORT nColId, const TOTypeInfoSP& _pTypeInfo ) = 0; + virtual void SetCellData( long nRow, USHORT nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0; + virtual ::com::sun::star::uno::Any GetCellData( long nRow, USHORT nColId ) = 0; + virtual void SetControlText( long nRow, USHORT nColId, const String& rText ) = 0; + virtual String GetControlText( long nRow, USHORT nColId ) = 0; virtual OTableDesignView* GetView() const = 0; - USHORT GetCurUndoActId(){ return m_nCurUndoActId; } + USHORT GetCurUndoActId(){ return m_nCurUndoActId; } // IClipboardTest virtual void cut(); @@ -77,14 +77,14 @@ namespace dbaui protected: void Paste( long nRow ); - virtual void CopyRows() = 0; - virtual void DeleteRows() = 0; - virtual void InsertRows( long nRow ) = 0; - virtual void InsertNewRows( long nRow ) = 0; + virtual void CopyRows() = 0; + virtual void DeleteRows() = 0; + virtual void InsertRows( long nRow ) = 0; + virtual void InsertNewRows( long nRow ) = 0; - virtual sal_Bool IsPrimaryKeyAllowed( long nRow ) = 0; - virtual sal_Bool IsInsertNewAllowed( long nRow ) = 0; - virtual sal_Bool IsDeleteAllowed( long nRow ) = 0; + virtual sal_Bool IsPrimaryKeyAllowed( long nRow ) = 0; + virtual sal_Bool IsInsertNewAllowed( long nRow ) = 0; + virtual sal_Bool IsDeleteAllowed( long nRow ) = 0; virtual BOOL IsUpdatable() const {return m_bUpdatable;} virtual void SetUpdatable( BOOL bUpdate=TRUE ); diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index 5e7c440a1466..b3d40d329812 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,9 +43,9 @@ namespace dbaui ,public IClipboardTest { private: - String m_sHelpText; - MultiLineEdit* m_pTextWin; - USHORT m_nDummy; + String m_sHelpText; + MultiLineEdit* m_pTextWin; + USHORT m_nDummy; protected: virtual void Resize(); diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index b7bc8356ed76..4608010afa93 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,9 +42,9 @@ namespace dbaui //================================================================== class OTableBorderWindow : public Window { - Splitter m_aHorzSplitter; - OTableFieldDescWin* m_pFieldDescWin; - OTableEditorCtrl* m_pEditorCtrl; + Splitter m_aHorzSplitter; + OTableFieldDescWin* m_pFieldDescWin; + OTableEditorCtrl* m_pEditorCtrl; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); void ArrangeChilds( long nSplitPos ,Rectangle& rRect); @@ -58,8 +58,8 @@ namespace dbaui virtual void Resize(); virtual void GetFocus(); - OTableEditorCtrl* GetEditorCtrl() const { return m_pEditorCtrl; } - OTableFieldDescWin* GetDescWin() const { return m_pFieldDescWin; } + OTableEditorCtrl* GetEditorCtrl() const { return m_pEditorCtrl; } + OTableFieldDescWin* GetDescWin() const { return m_pFieldDescWin; } }; //================================================================== class OTableDesignView : public ODataView @@ -72,33 +72,33 @@ namespace dbaui NONE }; private: - ::com::sun::star::lang::Locale m_aLocale; - OTableBorderWindow* m_pWin; - OTableController& m_rController; - ChildFocusState m_eChildFocus; + ::com::sun::star::lang::Locale m_aLocale; + OTableBorderWindow* m_pWin; + OTableController& m_rController; + ChildFocusState m_eChildFocus; IClipboardTest* getActiveChild() const; protected: - + // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect); public: - OTableDesignView( Window* pParent, + OTableDesignView( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&, OTableController& _rController); virtual ~OTableDesignView(); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void GetFocus(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void GetFocus(); - OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } - OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } - OTableController& getController() const { return m_rController; } + OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } + OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } + OTableController& getController() const { return m_rController; } - ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} + ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} // IClipboardTest virtual sal_Bool isCutAllowed(); diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 6f716e30d5e8..1438d5bdac73 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,23 +53,23 @@ namespace dbaui ::std::vector< ::rtl::OUString > m_aCriteria; - ::rtl::OUString m_aTableName; - ::rtl::OUString m_aAliasName; // table range - ::rtl::OUString m_aFieldName; // column - ::rtl::OUString m_aFieldAlias; // column alias - ::rtl::OUString m_aFunctionName; // enth"alt den Funktionsnamen, nur wenn m_eFunctionType != FKT_NONE gesetzt - - Window* m_pTabWindow; - - sal_Int32 m_eDataType; - sal_Int32 m_eFunctionType; - ETableFieldType m_eFieldType; - EOrderDir m_eOrderDir; - sal_Int32 m_nIndex; - sal_Int32 m_nColWidth; - sal_uInt16 m_nColumnId; - sal_Bool m_bGroupBy; - sal_Bool m_bVisible; + ::rtl::OUString m_aTableName; + ::rtl::OUString m_aAliasName; // table range + ::rtl::OUString m_aFieldName; // column + ::rtl::OUString m_aFieldAlias; // column alias + ::rtl::OUString m_aFunctionName; // enth"alt den Funktionsnamen, nur wenn m_eFunctionType != FKT_NONE gesetzt + + Window* m_pTabWindow; + + sal_Int32 m_eDataType; + sal_Int32 m_eFunctionType; + ETableFieldType m_eFieldType; + EOrderDir m_eOrderDir; + sal_Int32 m_nIndex; + sal_Int32 m_nColWidth; + sal_uInt16 m_nColumnId; + sal_Bool m_bGroupBy; + sal_Bool m_bVisible; // !!!! bitte bei Erweiterung um neue Felder auch IsEmpty mitpflegen !!!! @@ -79,56 +79,56 @@ namespace dbaui OTableFieldDesc(const OTableFieldDesc& rRS); ~OTableFieldDesc(); - inline sal_Bool IsEmpty() const; - + inline sal_Bool IsEmpty() const; + OTableFieldDesc& operator=( const OTableFieldDesc& _aField ); - sal_Bool operator==( const OTableFieldDesc& rDesc ); - - sal_Bool IsVisible() const { return m_bVisible;} - sal_Bool IsGroupBy() const { return m_bGroupBy;} - - void SetVisible( sal_Bool bVis=sal_True ){ m_bVisible = bVis;} - void SetGroupBy( sal_Bool bGb=sal_False ){ m_bGroupBy = bGb;} - void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin;} - void SetField( const ::rtl::OUString& rF ){ m_aFieldName = rF;} - void SetFieldAlias( const ::rtl::OUString& rF ){ m_aFieldAlias = rF;} - void SetTable( const ::rtl::OUString& rT ){ m_aTableName = rT;} - void SetAlias( const ::rtl::OUString& rT ){ m_aAliasName = rT;} - void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT;} - void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; } - void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; } - void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; } - void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit); - void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; } - void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; } - void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; } - void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; } - - - ::rtl::OUString GetField() const { return m_aFieldName;} - ::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;} - ::rtl::OUString GetTable() const { return m_aTableName;} - ::rtl::OUString GetAlias() const { return m_aAliasName;} - ::rtl::OUString GetFunction() const { return m_aFunctionName;} - sal_Int32 GetDataType() const { return m_eDataType; } - ETableFieldType GetFieldType() const { return m_eFieldType; } - EOrderDir GetOrderDir() const { return m_eOrderDir; } - ::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const; - sal_Int32 GetColWidth() const { return m_nColWidth; } - sal_Int32 GetFieldIndex() const { return m_nIndex; } - Window* GetTabWindow() const { return m_pTabWindow;} - sal_Int32 GetFunctionType() const { return m_eFunctionType; } - sal_uInt16 GetColumnId() const { return m_nColumnId;} - - inline sal_Bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; } - inline sal_Bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; } - inline sal_Bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; } - inline sal_Bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; } - inline sal_Bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; } - inline sal_Bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); } - - sal_Bool HasCriteria() const - { + sal_Bool operator==( const OTableFieldDesc& rDesc ); + + sal_Bool IsVisible() const { return m_bVisible;} + sal_Bool IsGroupBy() const { return m_bGroupBy;} + + void SetVisible( sal_Bool bVis=sal_True ){ m_bVisible = bVis;} + void SetGroupBy( sal_Bool bGb=sal_False ){ m_bGroupBy = bGb;} + void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin;} + void SetField( const ::rtl::OUString& rF ){ m_aFieldName = rF;} + void SetFieldAlias( const ::rtl::OUString& rF ){ m_aFieldAlias = rF;} + void SetTable( const ::rtl::OUString& rT ){ m_aTableName = rT;} + void SetAlias( const ::rtl::OUString& rT ){ m_aAliasName = rT;} + void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT;} + void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; } + void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; } + void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; } + void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit); + void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; } + void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; } + void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; } + void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; } + + + ::rtl::OUString GetField() const { return m_aFieldName;} + ::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;} + ::rtl::OUString GetTable() const { return m_aTableName;} + ::rtl::OUString GetAlias() const { return m_aAliasName;} + ::rtl::OUString GetFunction() const { return m_aFunctionName;} + sal_Int32 GetDataType() const { return m_eDataType; } + ETableFieldType GetFieldType() const { return m_eFieldType; } + EOrderDir GetOrderDir() const { return m_eOrderDir; } + ::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const; + sal_Int32 GetColWidth() const { return m_nColWidth; } + sal_Int32 GetFieldIndex() const { return m_nIndex; } + Window* GetTabWindow() const { return m_pTabWindow;} + sal_Int32 GetFunctionType() const { return m_eFunctionType; } + sal_uInt16 GetColumnId() const { return m_nColumnId;} + + inline sal_Bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; } + inline sal_Bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; } + inline sal_Bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; } + inline sal_Bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; } + inline sal_Bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; } + inline sal_Bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); } + + sal_Bool HasCriteria() const + { ::std::vector< ::rtl::OUString>::const_iterator aIter = m_aCriteria.begin(); ::std::vector< ::rtl::OUString>::const_iterator aEnd = m_aCriteria.end(); for(;aIter != aEnd;++aIter) @@ -137,26 +137,26 @@ namespace dbaui return aIter != aEnd; } - const ::std::vector< ::rtl::OUString>& GetCriteria() const { return m_aCriteria; } + const ::std::vector< ::rtl::OUString>& GetCriteria() const { return m_aCriteria; } void Load( const ::com::sun::star::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria ); void Save( ::comphelper::NamedValueCollection& o_rSettings, const bool i_bIncludingCriteria ); }; //------------------------------------------------------------------ - inline sal_Bool OTableFieldDesc::IsEmpty() const + inline sal_Bool OTableFieldDesc::IsEmpty() const { - sal_Bool bEmpty = (!m_aTableName.getLength() && - !m_aAliasName.getLength() && - !m_aFieldName.getLength() && - !m_aFieldAlias.getLength() && - !m_aFunctionName.getLength() && + sal_Bool bEmpty = (!m_aTableName.getLength() && + !m_aAliasName.getLength() && + !m_aFieldName.getLength() && + !m_aFieldAlias.getLength() && + !m_aFunctionName.getLength() && !HasCriteria()); return bEmpty; } //------------------------------------------------------------------ - typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef; - typedef ::std::vector<OTableFieldDescRef> OTableFields; + typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef; + typedef ::std::vector<OTableFieldDescRef> OTableFields; } #endif // diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index bc4679434a0f..247966ff8018 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,19 +51,19 @@ class OTableGrantControl : public ::svt::EditBrowseBox OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable> m_xGrantUser; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aTableNames; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable> m_xGrantUser; + ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aTableNames; - mutable TTablePrivilegeMap m_aPrivMap; - ::rtl::OUString m_sUserName; - ::svt::CheckBoxControl* m_pCheckCell; - Edit* m_pEdit; - long m_nDataPos; - BOOL m_bEnable; - ULONG m_nDeactivateEvent; + mutable TTablePrivilegeMap m_aPrivMap; + ::rtl::OUString m_sUserName; + ::svt::CheckBoxControl* m_pCheckCell; + Edit* m_pEdit; + long m_nDataPos; + BOOL m_bEnable; + ULONG m_nDeactivateEvent; public: OTableGrantControl( Window* pParent,const ResId& _RsId); @@ -85,7 +85,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ); - + protected: virtual void Resize(); @@ -105,8 +105,8 @@ private: DECL_LINK( AsynchActivate, void* ); DECL_LINK( AsynchDeactivate, void* ); - sal_Bool isAllowed(USHORT _nColumnId,sal_Int32 _nPrivilege) const; - void fillPrivilege(sal_Int32 _nRow) const; + sal_Bool isAllowed(USHORT _nColumnId,sal_Int32 _nPrivilege) const; + void fillPrivilege(sal_Int32 _nRow) const; TTablePrivilegeMap::const_iterator findPrivilege(sal_Int32 _nRow) const; }; diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index 3fe4afa56854..edaab51ae6db 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,18 +37,18 @@ namespace dbaui { -// class OTableRow; -// friend SvStream& operator<<( SvStream& rStr, OTableRow& _rRow ); +// class OTableRow; +// friend SvStream& operator<<( SvStream& rStr, OTableRow& _rRow ); class OFieldDescription; class OTypeInfo; class OTableRow { private: - OFieldDescription* m_pActFieldDescr; - long m_nPos; - bool m_bReadOnly; - bool m_bOwnsDescriptions; + OFieldDescription* m_pActFieldDescr; + long m_nPos; + bool m_bReadOnly; + bool m_bOwnsDescriptions; protected: public: @@ -66,14 +66,14 @@ namespace dbaui BOOL IsPrimaryKey() const; /** returns the current position in the table. - @return + @return the current position in the table */ inline long GetPos() const { return m_nPos; } inline void SetPos(sal_Int32 _nPos) { m_nPos = _nPos; } /** set the row readonly - @param _bRead + @param _bRead if <TRUE/> then the row is redonly, otherwise not */ inline void SetReadOnly( bool _bRead=true ){ m_bReadOnly = _bRead; } @@ -84,8 +84,8 @@ namespace dbaui */ inline bool IsReadOnly() const { return m_bReadOnly; } - friend SvStream& operator<<( SvStream& rStr,const OTableRow& _rRow ); - friend SvStream& operator>>( SvStream& rStr, OTableRow& _rRow ); + friend SvStream& operator<<( SvStream& rStr,const OTableRow& _rRow ); + friend SvStream& operator>>( SvStream& rStr, OTableRow& _rRow ); }; } #endif // DBAUI_TABLEROW_HXX diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 4a433f7c849e..c927dd8ef21b 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,10 +42,10 @@ namespace dbaui public: OTableRowExchange(const ::std::vector< ::boost::shared_ptr<OTableRow> >& _rvTableRow); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); }; } #endif // DBAUI_TABLEROW_EXCHANGE_HXX diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 323656ca869d..3f2bb9bfdd33 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,11 +45,11 @@ namespace dbaui { ////////////////////////////////////////////////////////////////////////// // Flags fuer die Groessenanpassung der SbaJoinTabWins - const UINT16 SIZING_NONE = 0x0000; - const UINT16 SIZING_TOP = 0x0001; - const UINT16 SIZING_BOTTOM = 0x0002; - const UINT16 SIZING_LEFT = 0x0004; - const UINT16 SIZING_RIGHT = 0x0008; + const UINT16 SIZING_NONE = 0x0000; + const UINT16 SIZING_TOP = 0x0001; + const UINT16 SIZING_BOTTOM = 0x0002; + const UINT16 SIZING_LEFT = 0x0004; + const UINT16 SIZING_RIGHT = 0x0008; class OTableWindowListBox; class OJoinDesignView; @@ -65,19 +65,19 @@ namespace dbaui protected: // und die Tabelle selber (brauche ich, da ich sie locken will, solange das Fenster lebt) FixedImage m_aTypeImage; - OTableWindowTitle m_aTitle; - OTableWindowListBox* m_pListBox; - OTableWindowAccess* m_pAccessible; + OTableWindowTitle m_aTitle; + OTableWindowListBox* m_pListBox; + OTableWindowAccess* m_pAccessible; private: - TTableWindowData::value_type + TTableWindowData::value_type m_pData; - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; - sal_Int32 m_nMoveCount; // how often the arrow keys was pressed - sal_Int32 m_nMoveIncrement; // how many pixel we should move - UINT16 m_nSizingFlags; - BOOL m_bActive; + sal_Int32 m_nMoveCount; // how often the arrow keys was pressed + sal_Int32 m_nMoveIncrement; // how many pixel we should move + UINT16 m_nSizingFlags; + BOOL m_bActive; void Draw3DBorder( const Rectangle& rRect ); // OContainerListener @@ -86,13 +86,13 @@ namespace dbaui virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rEvt ); - virtual void MouseButtonDown( const MouseEvent& rEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); + virtual void MouseMove( const MouseEvent& rEvt ); + virtual void MouseButtonDown( const MouseEvent& rEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual OTableWindowListBox* CreateListBox(); + virtual OTableWindowListBox* CreateListBox(); // wird im ERSTEN Init aufgerufen BOOL FillListBox(); // wird in JEDEM Init aufgerufen @@ -101,29 +101,29 @@ namespace dbaui // wird aus dem DoubleClickHdl der ListBox heraus aufgerufen /** HandleKeyInput triues to handle the KeyEvent. Movement or deletion - @param rEvt + @param rEvt The KEyEvent @return <TRUE/> when the table could handle the keyevent. */ - BOOL HandleKeyInput( const KeyEvent& rEvt ); + BOOL HandleKeyInput( const KeyEvent& rEvt ); /** delete the user data with the equal type as created within createUserData - @param _pUserData + @param _pUserData The user data store in the listbox entries. Created with a call to createUserData. _pUserData may be <NULL/>. _pUserData will be set to <NULL/> after call. */ virtual void deleteUserData(void*& _pUserData); /** creates user information that will be append at the ListBoxentry - @param _xColumn + @param _xColumn The corresponding column, can be <NULL/>. - @param _bPrimaryKey + @param _bPrimaryKey <TRUE/> when the column belongs to the primary key @return the user data which will be append at the listbox entry, may be <NULL/> */ - virtual void* createUserData(const ::com::sun::star::uno::Reference< + virtual void* createUserData(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bPrimaryKey); @@ -139,55 +139,55 @@ namespace dbaui // spaeter Constructor, siehe auch CreateListbox und FillListbox virtual BOOL Init(); - OJoinTableView* getTableView(); - const OJoinTableView* getTableView() const; - OJoinDesignView* getDesignView(); - void SetPosPixel( const Point& rNewPos ); - void SetSizePixel( const Size& rNewSize ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + OJoinTableView* getTableView(); + const OJoinTableView* getTableView() const; + OJoinDesignView* getDesignView(); + void SetPosPixel( const Point& rNewPos ); + void SetSizePixel( const Size& rNewSize ); + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); - String getTitle() const; - void SetBoldTitle( BOOL bBold ); - void setActive(sal_Bool _bActive = sal_True); + String getTitle() const; + void SetBoldTitle( BOOL bBold ); + void setActive(sal_Bool _bActive = sal_True); - void Remove(); - BOOL IsActiveWindow(){ return m_bActive; } + void Remove(); + BOOL IsActiveWindow(){ return m_bActive; } - ::rtl::OUString GetTableName() const { return m_pData->GetTableName(); } - ::rtl::OUString GetWinName() const { return m_pData->GetWinName(); } - ::rtl::OUString GetComposedName() const { return m_pData->GetComposedName(); } - OTableWindowListBox* GetListBox() const { return m_pListBox; } + ::rtl::OUString GetTableName() const { return m_pData->GetTableName(); } + ::rtl::OUString GetWinName() const { return m_pData->GetWinName(); } + ::rtl::OUString GetComposedName() const { return m_pData->GetComposedName(); } + OTableWindowListBox* GetListBox() const { return m_pListBox; } TTableWindowData::value_type GetData() const { return m_pData; } - OTableWindowTitle* GetTitleCtrl() { return &m_aTitle; } + OTableWindowTitle* GetTitleCtrl() { return &m_aTitle; } /** returns the name which should be used when displaying join or relations @return The composed name or the window name. */ - virtual ::rtl::OUString GetName() const = 0; + virtual ::rtl::OUString GetName() const = 0; inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); } inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetTable() const { return m_pData->getTable(); } - UINT16 GetSizingFlags() const { return m_nSizingFlags; } + UINT16 GetSizingFlags() const { return m_nSizingFlags; } /** set the sizing flag to the direction - @param _rPos + @param _rPos The EndPosition after resizing. */ - void setSizingFlag(const Point& _rPos); + void setSizingFlag(const Point& _rPos); /** set the rsizing flag to NONE. */ - void resetSizingFlag() { m_nSizingFlags = SIZING_NONE; } + void resetSizingFlag() { m_nSizingFlags = SIZING_NONE; } - /** returns the new sizing + /** returns the new sizing */ Rectangle getSizingRect(const Point& _rPos,const Size& _rOutputSize) const; // window override - virtual void StateChanged( StateChangedType nStateChange ); - virtual void GetFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void Command(const CommandEvent& rEvt); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void GetFocus(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void Command(const CommandEvent& rEvt); // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index f8351362c001..a1fd78373b4a 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ namespace dbaui /** the class OTableWindowAccess represents the accessible object for table windows like they are used in the QueryDesign and the RelationDesign */ - class OTableWindowAccess : public VCLXAccessibleComponent - , public OTableWindowAccess_BASE + class OTableWindowAccess : public VCLXAccessibleComponent + , public OTableWindowAccess_BASE { - OTableWindow* m_pTable; // the window which I should give accessibility to + OTableWindow* m_pTable; // the window which I should give accessibility to ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getParentChild(sal_Int32 _nIndex); protected: @@ -53,13 +53,13 @@ namespace dbaui virtual void SAL_CALL disposing(); /** isEditable returns the current editable state - @return true if it is editable otherwise false + @return true if it is editable otherwise false */ virtual sal_Bool isEditable() const; virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); public: - OTableWindowAccess( OTableWindow* _pTable); + OTableWindowAccess( OTableWindow* _pTable); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); @@ -85,7 +85,7 @@ namespace dbaui // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); - + // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index aa44a8d6d5f5..5aaad03a4f40 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace dbaui { class OTableWindowData : public ::utl::OEventListenerAdapter { - mutable ::osl::Mutex m_aMutex; + mutable ::osl::Mutex m_aMutex; void listen(); protected: @@ -50,12 +50,12 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xKeys; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - ::rtl::OUString m_aTableName; - ::rtl::OUString m_aWinName; - ::rtl::OUString m_sComposedName; - Point m_aPosition; - Size m_aSize; - sal_Bool m_bShowAll; + ::rtl::OUString m_aTableName; + ::rtl::OUString m_aWinName; + ::rtl::OUString m_sComposedName; + Point m_aPosition; + Size m_aSize; + sal_Bool m_bShowAll; bool m_bIsQuery; bool m_bIsValid; @@ -68,38 +68,38 @@ namespace dbaui /** late constructor * - * \param _xConnection + * \param _xConnection * \param _bAllowQueries when true, queries are allowed * \return false if the table was unaccessible otherwise true */ bool init(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection ,bool _bAllowQueries); - inline ::rtl::OUString GetComposedName() const { return m_sComposedName; } - inline ::rtl::OUString GetTableName() const { return m_aTableName; } - inline ::rtl::OUString GetWinName() const { return m_aWinName; } - inline Point GetPosition() const { return m_aPosition; } - inline Size GetSize() const { return m_aSize; } - inline BOOL IsShowAll() const { return m_bShowAll; } + inline ::rtl::OUString GetComposedName() const { return m_sComposedName; } + inline ::rtl::OUString GetTableName() const { return m_aTableName; } + inline ::rtl::OUString GetWinName() const { return m_aWinName; } + inline Point GetPosition() const { return m_aPosition; } + inline Size GetSize() const { return m_aSize; } + inline BOOL IsShowAll() const { return m_bShowAll; } inline bool isQuery() const { return m_bIsQuery; } inline bool isValid() const { return m_bIsValid; } // it is either a table or query but it is known - BOOL HasPosition() const; - BOOL HasSize() const; + BOOL HasPosition() const; + BOOL HasSize() const; - inline void SetWinName( const ::rtl::OUString& rWinName ) { m_aWinName = rWinName; } - inline void SetPosition( const Point& rPos ) { m_aPosition=rPos; } - inline void SetSize( const Size& rSize ) { m_aSize = rSize; } - inline void ShowAll( BOOL bAll ) { m_bShowAll = bAll; } + inline void SetWinName( const ::rtl::OUString& rWinName ) { m_aWinName = rWinName; } + inline void SetPosition( const Point& rPos ) { m_aPosition=rPos; } + inline void SetSize( const Size& rSize ) { m_aSize = rSize; } + inline void ShowAll( BOOL bAll ) { m_bShowAll = bAll; } inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getTable() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xTable; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xKeys; } + inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xKeys; } inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getColumns() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xColumns; } // OEventListenerAdapter virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ); }; - typedef ::std::vector< ::boost::shared_ptr<OTableWindowData> > TTableWindowData; + typedef ::std::vector< ::boost::shared_ptr<OTableWindowData> > TTableWindowData; } #endif // DBAUI_TABLEWINDOWDATA_HXX diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index a3de07dac935..d5b9c250dd3c 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ namespace dbaui struct OJoinExchangeData { public: - OTableWindowListBox* pListBox; // die ListBox innerhalb desselben (daraus kann man sich das TabWin und daraus den WinName besorgen) - SvLBoxEntry* pEntry; // der Eintrag, der gedraggt oder auf den gedroppt wurde + OTableWindowListBox* pListBox; // die ListBox innerhalb desselben (daraus kann man sich das TabWin und daraus den WinName besorgen) + SvLBoxEntry* pEntry; // der Eintrag, der gedraggt oder auf den gedroppt wurde OJoinExchangeData(OTableWindowListBox* pBox); OJoinExchangeData() : pListBox(NULL), pEntry(NULL) { } @@ -61,38 +61,38 @@ namespace dbaui DECL_LINK( ScrollDownHdl, SvTreeListBox* ); DECL_LINK( DropHdl, void* ); DECL_LINK( LookForUiHdl, void* ); + + Timer m_aScrollTimer; + Point m_aMousePos; - Timer m_aScrollTimer; - Point m_aMousePos; - - OTableWindow* m_pTabWin; - ULONG m_nDropEvent; - ULONG m_nUiEvent; - OJoinDropData m_aDropInfo; + OTableWindow* m_pTabWin; + ULONG m_nDropEvent; + ULONG m_nUiEvent; + OJoinDropData m_aDropInfo; - BOOL m_bReallyScrolled : 1; - BOOL m_bDragSource : 1; + BOOL m_bReallyScrolled : 1; + BOOL m_bDragSource : 1; protected: virtual void LoseFocus(); virtual void GetFocus(); - virtual void NotifyScrolled(); + virtual void NotifyScrolled(); virtual void NotifyEndScroll(); virtual long PreNotify(NotifyEvent& rNEvt); virtual void dragFinished( ); - - + + public: OTableWindowListBox(OTableWindow* pParent); virtual ~OTableWindowListBox(); // DnD stuff - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); // window virtual void Command(const CommandEvent& rEvt); diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx index e81ab0be5597..a07e8fda099c 100644 --- a/dbaccess/source/ui/inc/TableWindowTitle.hxx +++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace dbaui protected: virtual void Command(const CommandEvent& rEvt); - // virtual void Paint( const Rectangle& rRect ); + // virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rEvt ); virtual void KeyInput( const KeyEvent& rEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index e9c7880caf9c..b861d4e11b07 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,11 +50,11 @@ class ODbDataSourceAdministrationHelper; //======================================================================== class OTableSubscriptionDialog : public SfxSingleTabDialog, public IItemSetHelper { - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; sal_Bool m_bStopExecution; // set when the dialog should not be executed DECL_LINK( OKClickHdl, OKButton* ); - SfxItemSet* m_pOutSet; + SfxItemSet* m_pOutSet; public: OTableSubscriptionDialog(Window* pParent @@ -65,21 +65,21 @@ class ODbDataSourceAdministrationHelper; virtual ~OTableSubscriptionDialog(); // forwards from ODbDataSourceAdministrationHelper - void successfullyConnected(); - sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); - void clearPassword(); - String getConnectionURL() const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); + void successfullyConnected(); + sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); + void clearPassword(); + String getConnectionURL() const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); inline void endExecution() { m_bStopExecution = sal_True; } virtual const SfxItemSet* getOutputSet() const; virtual SfxItemSet* getWriteOutputSet(); - virtual short Execute(); + virtual short Execute(); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_TABLESSINGLEDLG_HXX_ diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 1e87054a9ece..43952c95fc0d 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include <memory> -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace sdbc{ class XRowUpdate; } @@ -68,28 +68,28 @@ namespace dbaui void impl_initializeRowMember_throw(); protected: - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; + ::com::sun::star::lang::Locale m_aLocale; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; sal_Bool m_bBookmarkSelection; - SvStream* m_pStream; - ::com::sun::star::awt::FontDescriptor m_aFont; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xObject; // table/query + SvStream* m_pStream; + ::com::sun::star::awt::FontDescriptor m_aFont; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xObject; // table/query SharedConnection m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xRow; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate > m_xRowLocate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xResultSetMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xResultSetMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xRowSetColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; ::rtl::OUString m_sName; - //dyf add 20070601 + //dyf add 20070601 //for transfor the tablename ::rtl::OUString m_sDefaultTableName; //dyf add end ::rtl::OUString m_sDataSourceName; - sal_Int32 m_nCommandType; + sal_Int32 m_nCommandType; bool m_bNeedToReInitialize; #if defined UNX @@ -98,20 +98,20 @@ namespace dbaui static const char __FAR_DATA sNewLine[]; #endif - ODatabaseExport* m_pReader; - sal_Int32* m_pRowMarker; // wenn gesetzt, dann nur diese Rows kopieren + ODatabaseExport* m_pReader; + sal_Int32* m_pRowMarker; // wenn gesetzt, dann nur diese Rows kopieren rtl_TextEncoding m_eDestEnc; - sal_Bool m_bInInitialize; - sal_Bool m_bCheckOnly; + sal_Bool m_bInInitialize; + sal_Bool m_bCheckOnly; // export data - ODatabaseImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + ODatabaseImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const String& rExchange = String()); // import data - ODatabaseImportExport( const SharedConnection& _rxConnection, + ODatabaseImportExport( const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM); @@ -150,17 +150,17 @@ namespace dbaui void appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk); public: // export data - ORTFImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + ORTFImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const String& rExchange = String()) + const String& rExchange = String()) : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange) {}; // import data - ORTFImportExport( const SharedConnection& _rxConnection, + ORTFImportExport( const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) - : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) + : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) {} virtual BOOL Write(); @@ -174,15 +174,15 @@ namespace dbaui class OHTMLImportExport : public ODatabaseImportExport { // default HtmlFontSz[1-7] - static const sal_Int16 nDefaultFontSize[SBA_HTML_FONTSIZES]; + static const sal_Int16 nDefaultFontSize[SBA_HTML_FONTSIZES]; // HtmlFontSz[1-7] in s*3.ini [user] - static sal_Int16 nFontSize[SBA_HTML_FONTSIZES]; - static const sal_Int16 nCellSpacing; + static sal_Int16 nFontSize[SBA_HTML_FONTSIZES]; + static const sal_Int16 nCellSpacing; static const char __FAR_DATA sIndentSource[]; - char sIndent[nIndentMax+1]; - sal_Int16 m_nIndent; + char sIndent[nIndentMax+1]; + sal_Int16 m_nIndent; #ifdef DBG_UTIL - BOOL m_bCheckFont; + BOOL m_bCheckFont; #endif void WriteHeader(); @@ -190,21 +190,21 @@ namespace dbaui void WriteTables(); void WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_Int32 nHeightPixel,const char* pChar,const String& rValue,const char* pHtmlTag); void IncIndent( sal_Int16 nVal ); - const char* GetIndentStr() { return sIndent; } + const char* GetIndentStr() { return sIndent; } void FontOn(); inline void FontOff(); public: // export data - OHTMLImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + OHTMLImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const String& rExchange = String()); // import data - OHTMLImportExport( const SharedConnection& _rxConnection, + OHTMLImportExport( const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) - : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) + : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) {} virtual BOOL Write(); @@ -217,14 +217,14 @@ namespace dbaui class ORowSetImportExport : public ODatabaseImportExport { - OModuleClient m_aModuleClient; - ::std::vector<sal_Int32> m_aColumnMapping; - ::std::vector<sal_Int32> m_aColumnTypes; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; // - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; // - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; // - Window* m_pParent; - sal_Bool m_bAlreadyAsked; + OModuleClient m_aModuleClient; + ::std::vector<sal_Int32> m_aColumnMapping; + ::std::vector<sal_Int32> m_aColumnTypes; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; // + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; // + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; // + Window* m_pParent; + sal_Bool m_bAlreadyAsked; sal_Bool insertNewRow(); protected: @@ -240,10 +240,10 @@ namespace dbaui // import data ORowSetImportExport(const SharedConnection& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) - : ODatabaseImportExport(_rxConnection,NULL,_rM) + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) + : ODatabaseImportExport(_rxConnection,NULL,_rM) {} - + virtual BOOL Write(); virtual BOOL Read(); diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 10ea51cf58aa..73ffcbde5c50 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,63 +42,63 @@ namespace dbaui { //======================================================================== // Anhand dieser Ids werden die sprachabhaengigen ::rtl::OUString aus der Resource geholt -const sal_uInt16 TYPE_UNKNOWN = 0; -const sal_uInt16 TYPE_TEXT = 1; -const sal_uInt16 TYPE_NUMERIC = 2; -const sal_uInt16 TYPE_DATETIME = 3; -const sal_uInt16 TYPE_DATE = 4; -const sal_uInt16 TYPE_TIME = 5; -const sal_uInt16 TYPE_BOOL = 6; -const sal_uInt16 TYPE_CURRENCY = 7; -const sal_uInt16 TYPE_MEMO = 8; -const sal_uInt16 TYPE_COUNTER = 9; -const sal_uInt16 TYPE_IMAGE = 10; -const sal_uInt16 TYPE_CHAR = 11; -const sal_uInt16 TYPE_DECIMAL = 12; -const sal_uInt16 TYPE_BINARY = 13; -const sal_uInt16 TYPE_VARBINARY = 14; -const sal_uInt16 TYPE_BIGINT = 15; -const sal_uInt16 TYPE_DOUBLE = 16; -const sal_uInt16 TYPE_FLOAT = 17; -const sal_uInt16 TYPE_REAL = 18; -const sal_uInt16 TYPE_INTEGER = 19; -const sal_uInt16 TYPE_SMALLINT = 20; -const sal_uInt16 TYPE_TINYINT = 21; -const sal_uInt16 TYPE_SQLNULL = 22; -const sal_uInt16 TYPE_OBJECT = 23; -const sal_uInt16 TYPE_DISTINCT = 24; -const sal_uInt16 TYPE_STRUCT = 25; -const sal_uInt16 TYPE_ARRAY = 26; -const sal_uInt16 TYPE_BLOB = 27; -const sal_uInt16 TYPE_CLOB = 28; -const sal_uInt16 TYPE_REF = 29; -const sal_uInt16 TYPE_OTHER = 30; -const sal_uInt16 TYPE_BIT = 31; +const sal_uInt16 TYPE_UNKNOWN = 0; +const sal_uInt16 TYPE_TEXT = 1; +const sal_uInt16 TYPE_NUMERIC = 2; +const sal_uInt16 TYPE_DATETIME = 3; +const sal_uInt16 TYPE_DATE = 4; +const sal_uInt16 TYPE_TIME = 5; +const sal_uInt16 TYPE_BOOL = 6; +const sal_uInt16 TYPE_CURRENCY = 7; +const sal_uInt16 TYPE_MEMO = 8; +const sal_uInt16 TYPE_COUNTER = 9; +const sal_uInt16 TYPE_IMAGE = 10; +const sal_uInt16 TYPE_CHAR = 11; +const sal_uInt16 TYPE_DECIMAL = 12; +const sal_uInt16 TYPE_BINARY = 13; +const sal_uInt16 TYPE_VARBINARY = 14; +const sal_uInt16 TYPE_BIGINT = 15; +const sal_uInt16 TYPE_DOUBLE = 16; +const sal_uInt16 TYPE_FLOAT = 17; +const sal_uInt16 TYPE_REAL = 18; +const sal_uInt16 TYPE_INTEGER = 19; +const sal_uInt16 TYPE_SMALLINT = 20; +const sal_uInt16 TYPE_TINYINT = 21; +const sal_uInt16 TYPE_SQLNULL = 22; +const sal_uInt16 TYPE_OBJECT = 23; +const sal_uInt16 TYPE_DISTINCT = 24; +const sal_uInt16 TYPE_STRUCT = 25; +const sal_uInt16 TYPE_ARRAY = 26; +const sal_uInt16 TYPE_BLOB = 27; +const sal_uInt16 TYPE_CLOB = 28; +const sal_uInt16 TYPE_REF = 29; +const sal_uInt16 TYPE_OTHER = 30; +const sal_uInt16 TYPE_BIT = 31; class OTypeInfo { public: - ::rtl::OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName) - ::rtl::OUString aTypeName; // Name des Types in der Datenbank - ::rtl::OUString aLiteralPrefix; // Prefix zum Quoten - ::rtl::OUString aLiteralSuffix; // Suffix zum Quoten - ::rtl::OUString aCreateParams; // Parameter zum Erstellen - ::rtl::OUString aLocalTypeName; - - sal_Int32 nPrecision; // Laenge des Types - sal_Int32 nType; // Datenbanktyp - - sal_Int16 nMaximumScale; // Nachkommastellen - sal_Int16 nMinimumScale; // Min Nachkommastellen - - sal_Int16 nSearchType; // kann nach dem Typen gesucht werden - - - sal_Bool bCurrency : 1, // Waehrung - bAutoIncrement : 1, // Ist es ein automatisch incrementierendes Feld - bNullable : 1, // Kann das Feld NULL annehmen - bCaseSensitive : 1, // Ist der Type Casesensitive - bUnsigned : 1; // Ist der Type Unsigned + ::rtl::OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName) + ::rtl::OUString aTypeName; // Name des Types in der Datenbank + ::rtl::OUString aLiteralPrefix; // Prefix zum Quoten + ::rtl::OUString aLiteralSuffix; // Suffix zum Quoten + ::rtl::OUString aCreateParams; // Parameter zum Erstellen + ::rtl::OUString aLocalTypeName; + + sal_Int32 nPrecision; // Laenge des Types + sal_Int32 nType; // Datenbanktyp + + sal_Int16 nMaximumScale; // Nachkommastellen + sal_Int16 nMinimumScale; // Min Nachkommastellen + + sal_Int16 nSearchType; // kann nach dem Typen gesucht werden + + + sal_Bool bCurrency : 1, // Waehrung + bAutoIncrement : 1, // Ist es ein automatisch incrementierendes Feld + bNullable : 1, // Kann das Feld NULL annehmen + bCaseSensitive : 1, // Ist der Type Casesensitive + bUnsigned : 1; // Ist der Type Unsigned OTypeInfo() :nPrecision(0) @@ -114,21 +114,21 @@ const sal_uInt16 TYPE_BIT = 31; {} sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } sal_Bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; } - inline ::rtl::OUString getDBName() const { return aTypeName; } + inline ::rtl::OUString getDBName() const { return aTypeName; } }; - typedef ::boost::shared_ptr<OTypeInfo> TOTypeInfoSP; - typedef ::std::multimap<sal_Int32,TOTypeInfoSP> OTypeInfoMap; + typedef ::boost::shared_ptr<OTypeInfo> TOTypeInfoSP; + typedef ::std::multimap<sal_Int32,TOTypeInfoSP> OTypeInfoMap; /** return the most suitable typeinfo for a requested type - @param _rTypeInfo contains a map of type to typeinfo - @param _nType the requested type - @param _sTypeName the typename - @param _sCreateParams the create params - @param _nPrecision the precision - @param _nScale the scale - @param _bAutoIncrement if it is a auto increment - @param _brForceToType true when type was found which has some differenes + @param _rTypeInfo contains a map of type to typeinfo + @param _nType the requested type + @param _sTypeName the typename + @param _sCreateParams the create params + @param _nPrecision the precision + @param _nScale the scale + @param _bAutoIncrement if it is a auto increment + @param _brForceToType true when type was found which has some differenes */ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, sal_Int32 _nType, diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 8bd112c38742..6ecab0555549 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,12 +35,12 @@ #include <vcl/taskpanelist.hxx> #include <connectivity/dbtools.hxx> -#define RET_ALL 10 +#define RET_ALL 10 // we only need forward decl here namespace com { namespace sun { namespace star { - namespace beans { class XPropertySet;} + namespace beans { class XPropertySet;} namespace container { class XNameAccess; @@ -95,12 +95,12 @@ namespace dbaui class DBTreeListBox; /** creates a new connection and appends the eventlistener - @param _rsDataSourceName name of the datasource - @param _xDatabaseContext the database context + @param _rsDataSourceName name of the datasource + @param _xDatabaseContext the database context @param _rMF the multi service factory - @param _rEvtLst the eventlistener which will be added to the new created connection - @param _rOUTConnection this parameter will be filled with the new created connection - @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false + @param _rEvtLst the eventlistener which will be added to the new created connection + @param _rOUTConnection this parameter will be filled with the new created connection + @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false */ ::dbtools::SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, @@ -109,11 +109,11 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ); /** creates a new connection and appends the eventlistener - @param _xDataSource the datasource + @param _xDataSource the datasource @param _rMF the multi service factory - @param _rEvtLst the eventlistener which will be added to the new created connection - @param _rOUTConnection this parameter will be filled with the new created connection - @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false + @param _rEvtLst the eventlistener which will be added to the new created connection + @param _rOUTConnection this parameter will be filled with the new created connection + @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false */ ::dbtools::SQLExceptionInfo createConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDataSource, @@ -121,50 +121,50 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ); - /** creates a error dialog which displays the SQLExceptionInfo. Also it supports a "more" button where detailed information are available - @param _rInfo the error which should be shown, if the info is not valid no error dialog will appear - @param _pParent the parent of the error dialog - @param _xFactory need to create the dialog + /** creates a error dialog which displays the SQLExceptionInfo. Also it supports a "more" button where detailed information are available + @param _rInfo the error which should be shown, if the info is not valid no error dialog will appear + @param _pParent the parent of the error dialog + @param _xFactory need to create the dialog */ - void showError( const ::dbtools::SQLExceptionInfo& _rInfo, + void showError( const ::dbtools::SQLExceptionInfo& _rInfo, Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory); /** return a vector which contains all key columns for the @see com::sun::star::sdbc::KeyType _nKeyType - @param _rxTable the table which must be a @see com::sun::star::sdbcx::XColumnsSupplier - @param _nKeyType @see com::sun::star::sdbc::KeyType + @param _rxTable the table which must be a @see com::sun::star::sdbcx::XColumnsSupplier + @param _nKeyType @see com::sun::star::sdbc::KeyType */ ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> > - getKeyColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxKeys, + getKeyColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxKeys, sal_Int32 _nKeyType); /** fills a map and a vector with localized type names - @param _rxConnection the connection to acces the metadata - @param _rsTypeNames a list of localized type names seperated with ';' - @param _rTypeInfoMap the filled map with the type names - @param _rTypeInfoIters the vector filled with map iterators + @param _rxConnection the connection to acces the metadata + @param _rsTypeNames a list of localized type names seperated with ';' + @param _rTypeInfoMap the filled map with the type names + @param _rTypeInfoIters the vector filled with map iterators */ - void fillTypeInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, + void fillTypeInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const String& _rsTypeNames, OTypeInfoMap& _rTypeInfoMap, ::std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters); /** fill a column with data of a field description - @param _rxColumn the column which should be filled - @param _pFieldDesc the source of the data + @param _rxColumn the column which should be filled + @param _pFieldDesc the source of the data */ class OFieldDescription; - void setColumnProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, + void setColumnProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const OFieldDescription* _pFieldDesc); - ::rtl::OUString createDefaultName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, + ::rtl::OUString createDefaultName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTables, const ::rtl::OUString& _sName); /** checks if the given name exists in the database context */ - sal_Bool checkDataSourceAvailable( const ::rtl::OUString& _sDataSourceName, + sal_Bool checkDataSourceAvailable( const ::rtl::OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory_xORB); /** maps SvxCellHorJustify to com::sun::star::awt::TextAlign @@ -197,7 +197,7 @@ namespace dbaui ::dbtools::SQLExceptionInfo* _pErrorInfo ); - /** returns either the model when data source is given as parameter, + /** returns either the model when data source is given as parameter, or returns a data source when a model is given. @param _xObject Either a data source or a model. */ @@ -210,14 +210,14 @@ namespace dbaui SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment); /** convert Font to ::com::sun::star::awt::FontDescriptor - @param _rFont Font to be converted - @return the new FontDescriptor + @param _rFont Font to be converted + @return the new FontDescriptor */ ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const Font& _rFont ); /** call teh format dialog and set the selected format at the column - @param _xAffectedCol Font to be converted - @param _xField Font to be converted + @param _xAffectedCol Font to be converted + @param _xField Font to be converted */ void callColumnFormatDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xAffectedCol, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xField, @@ -231,13 +231,13 @@ namespace dbaui sal_Int32 _nDataType, sal_Int32& _nFormatKey, SvxCellHorJustify& _eJustify, - sal_uInt16& _nFlags, + sal_uInt16& _nFlags, sal_Bool _bHasFormat); /** append a name to tablefilter of a datasource - @param _xConnection the connection is need to get the datasource - @param _sName the name which should be appended - @param _xFactory needed to check if datasource is available - @param _pParent needed when an error must be shown + @param _xConnection the connection is need to get the datasource + @param _sName the name which should be appended + @param _xFactory needed to check if datasource is available + @param _pParent needed when an error must be shown @return false when datsource is not available otherwise true */ sal_Bool appendToFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, @@ -246,11 +246,11 @@ namespace dbaui Window* _pParent); /** notifySystemWindow adds or remove the given window _pToRegister at the Systemwindow found when search _pWindow. - @param _pWindow + @param _pWindow The window which is used to search for the SystemWindow. - @param _pToRegister + @param _pToRegister The window which should be added or removed on the TaskPaneList. - @param _rMemFunc + @param _rMemFunc The member function which should be called at the SystemWindow when found. Possible values are: ::comphelper::mem_fun(&TaskPaneList::AddWindow) @@ -261,13 +261,13 @@ namespace dbaui ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc); /** adjustToolBoxSize checks if the size of the ToolBox is still valid. If not it will be resized. - @param _pToolBox + @param _pToolBox The Toolbox which should be resized. */ void adjustToolBoxSize(ToolBox* _pToolBox); /** isHiContrast check if we are in hi contrast mode. - @param _pWindow + @param _pWindow The window we have to check on. @return <TRUE/> if so, otherwise <FALSE/> @@ -277,7 +277,7 @@ namespace dbaui void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId ); /** check if SQL92 name checking is enabled - @param _xConnection + @param _xConnection Used to get the datasource as parent from the connection. @return <TRUE/> if so otherwise <FALSE/> @@ -285,7 +285,7 @@ namespace dbaui sal_Bool isSQL92CheckEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** check if the alias name of the table should be added at select statements - @param _xConnection + @param _xConnection Used to get the datasource as parent from the connection. @return <TRUE/> if so otherwise <FALSE/> @@ -297,11 +297,11 @@ namespace dbaui sal_Bool generateAsBeforeTableAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection ); /** fills the bool and string value with information out of the datasource info property - @param _xDatasource + @param _xDatasource Asked for the properties. - @param _rAutoIncrementValueEnabled + @param _rAutoIncrementValueEnabled <OUT/> Set to TRUE when the property was set in the datasource. - @param _rsAutoIncrementValue + @param _rsAutoIncrementValue <OUT/> Set to the value when the property was set in the datasource. */ void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDatasource @@ -309,11 +309,11 @@ namespace dbaui ,::rtl::OUString& _rsAutoIncrementValue); /** fills the bool and string value with information out of the datasource info property - @param _xConnection + @param _xConnection Used to get the datasource as parent from the connection. - @param _rAutoIncrementValueEnabled + @param _rAutoIncrementValueEnabled <OUT/> Set to TRUE when the property was set in the datasource. - @param _rsAutoIncrementValue + @param _rsAutoIncrementValue <OUT/> Set to the value when the property was set in the datasource. */ void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection @@ -321,20 +321,20 @@ namespace dbaui ,::rtl::OUString& _rsAutoIncrementValue); /** creates the URL or the help agent - @param _sModuleName - @param _nHelpId + @param _sModuleName + @param _nHelpId @return The URL for the help agent to dispatch. */ - ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId); + ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId); /** set the evaluation flag at the number formatter - @param _rxFormatter + @param _rxFormatter */ void setEvalDateFormatForFormatter(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter); /** query for a type info which can be used to create a primary key column - @param _rTypeInfo + @param _rTypeInfo The map which contains all available types. @return The type info which can be used to create a primary key column. @@ -342,9 +342,9 @@ namespace dbaui TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo); /** query for a specific type. - @param _nDataType + @param _nDataType The type we are searching. - @param _rTypeInfo + @param _rTypeInfo The map which contains all available types. @return The type or <NULL/> if we can't find it. @@ -355,18 +355,18 @@ namespace dbaui @return the configuration node name of user defined drivers. */ - + /** returns the result of the user action when view the query dialog. - @param _pParent + @param _pParent The parent of the dialog - @param _nTitle + @param _nTitle A string resource id for the text which will be displayed as title. - @param _nText + @param _nText A string resource id for the text which will be displayed above the buttons. When the string contains a #1. This will be replaced by the name. - @param _bAll + @param _bAll When set to <TRUE/>, the all button will be appended. - @param _sName + @param _sName The name of the object to ask for. @return RET_YES, RET_NO, RET_ALL @@ -374,11 +374,11 @@ namespace dbaui sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Bool _bAll,const ::rtl::OUString& _sName); /** creates a new view from a query or table - @param _sName + @param _sName The name of the view to be created. - @param _xConnection + @param _xConnection The source connection. - @param _xSourceObject + @param _xSourceObject The object for which a view should be created. @return The created view. @@ -396,9 +396,9 @@ namespace dbaui ); /** returns the stripped database name. - @param _xDataSource + @param _xDataSource The data source - @param _rsDatabaseName + @param _rsDatabaseName Will be filled with the original data source if it is empty. @return The stripped database name either the registered naem or if it is a file url the last segment. @@ -413,21 +413,21 @@ namespace dbaui const SfxFilter* getStandardDatabaseFilter(); /** opens a save dialog to store a form or report folder in the current hierachy. - @param _pParent + @param _pParent The parent of the dialog. @param _rxORB a multi service factory which can be used to instantiate usual global services - @param _xNames + @param _xNames Where to insert the new object. - @param _sParentFolder + @param _sParentFolder The name of the parent folder. - @param _bForm + @param _bForm <TRUE/> if a form should be inserted - @param _bCollection + @param _bCollection A folder should be inserted - @param _xContent + @param _xContent The content which should be copied. - @param _bMove + @param _bMove if <TRUE/> the name of the content must be inserted without any change, otherwise not. @return <TRUE/> if the insert opertions was successfull, otherwise <FALSE/>. @@ -444,9 +444,9 @@ namespace dbaui ); /** creates a number formatter - @param _rxConnection + @param _rxConnection The connection is needed to create the formatter - @param _rMF + @param _rMF The multi service factory */ ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF ); diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 3b510f9a8926..96df23c0ae71 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,10 +54,10 @@ namespace dbaui class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - sal_Bool m_bOwnConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + sal_Bool m_bOwnConnection; protected: virtual void PageCreated(USHORT _nId, SfxTabPage& _rPage); public: @@ -66,18 +66,18 @@ namespace dbaui ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); - + virtual ~OUserAdminDlg(); virtual const SfxItemSet* getOutputSet() const; virtual SfxItemSet* getWriteOutputSet(); - virtual short Execute(); + virtual short Execute(); // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); @@ -85,7 +85,7 @@ namespace dbaui virtual void enableConfirmSettings( bool _bEnable ); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_USERADMINDLG_HXX diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index 32f35779288e..3d484f6c9ec4 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,10 @@ namespace dbaui //================================================================== class OSplitterView : public Window { - Splitter* m_pSplitter; - Window* m_pLeft; - Window* m_pRight; - sal_Bool m_bVertical; + Splitter* m_pSplitter; + Window* m_pLeft; + Window* m_pRight; + sal_Bool m_bVertical; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); DECL_LINK( SplitHdl, Splitter* ); diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 110e8227027d..c683e6b324d9 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,23 +45,23 @@ namespace dbaui class OCopyTable : public OWizardPage { protected: - FixedText m_ftTableName; - Edit m_edTableName; + FixedText m_ftTableName; + Edit m_edTableName; FixedLine m_aFL_Options; - RadioButton m_aRB_DefData; - RadioButton m_aRB_Def; - RadioButton m_aRB_View; - RadioButton m_aRB_AppendData; - CheckBox m_aCB_UseHeaderLine; - CheckBox m_aCB_PrimaryColumn; - FixedText m_aFT_KeyName; - Edit m_edKeyName; + RadioButton m_aRB_DefData; + RadioButton m_aRB_Def; + RadioButton m_aRB_View; + RadioButton m_aRB_AppendData; + CheckBox m_aCB_UseHeaderLine; + CheckBox m_aCB_PrimaryColumn; + FixedText m_aFT_KeyName; + Edit m_edKeyName; sal_Int16 m_nOldOperation; - OWizColumnSelect* m_pPage2; - OWizNormalExtend* m_pPage3; + OWizColumnSelect* m_pPage2; + OWizNormalExtend* m_pPage3; - BOOL m_bPKeyAllowed; + BOOL m_bPKeyAllowed; BOOL m_bUseHeaderAllowed; @@ -75,19 +75,19 @@ namespace dbaui //--------add end public: - virtual void Reset(); - virtual void ActivatePage(); - virtual BOOL LeavePage(); - virtual String GetTitle() const ; + virtual void Reset(); + virtual void ActivatePage(); + virtual BOOL LeavePage(); + virtual String GetTitle() const ; OCopyTable( Window * pParent ); virtual ~OCopyTable(); - inline BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); } - inline BOOL IsOptionDef() const { return m_aRB_Def.IsChecked(); } - inline BOOL IsOptionAppendData() const { return m_aRB_AppendData.IsChecked(); } - inline BOOL IsOptionView() const { return m_aRB_View.IsChecked(); } - inline BOOL UseHeaderLine() const { return m_aCB_UseHeaderLine.IsChecked(); } + inline BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); } + inline BOOL IsOptionDef() const { return m_aRB_Def.IsChecked(); } + inline BOOL IsOptionAppendData() const { return m_aRB_AppendData.IsChecked(); } + inline BOOL IsOptionView() const { return m_aRB_View.IsChecked(); } + inline BOOL UseHeaderLine() const { return m_aCB_UseHeaderLine.IsChecked(); } String GetKeyName() const { return m_edKeyName.GetText(); } void setCreateStyleAction(); diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 8c0f16228bd2..6dd66a547ed5 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ namespace dbaui { FixedLine m_flColumns; - MultiListBox m_lbOrgColumnNames; // left side + MultiListBox m_lbOrgColumnNames; // left side ImageButton m_ibColumn_RH; ImageButton m_ibColumns_RH; ImageButton m_ibColumn_LH; ImageButton m_ibColumns_LH; - MultiListBox m_lbNewColumnNames; // right side + MultiListBox m_lbNewColumnNames; // right side DECL_LINK( ButtonClickHdl, Button * ); @@ -61,38 +61,38 @@ namespace dbaui void clearListBox(MultiListBox& _rListBox); - void fillColumns( ListBox* pRight, + void fillColumns( ListBox* pRight, ::std::vector< ::rtl::OUString> &_rRightColumns); - void createNewColumn( ListBox* _pListbox, + void createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase); - void moveColumn( ListBox* _pRight, + void moveColumn( ListBox* _pRight, ListBox* _pLeft, ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase); void enableButtons(); - + USHORT adjustColumnPosition(ListBox* _pLeft, - const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::TStringMixEqualFunctor& _aCase); public: - virtual void Reset ( ); - virtual void ActivatePage(); - virtual sal_Bool LeavePage(); - virtual String GetTitle() const ; + virtual void Reset ( ); + virtual void ActivatePage(); + virtual sal_Bool LeavePage(); + virtual String GetTitle() const ; OWizColumnSelect(Window* pParent); virtual ~OWizColumnSelect(); diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 7249dcdc1104..c28630bb18f3 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ namespace dbaui { m_pColumns = _pColumns; } - inline bool operator()(const ::rtl::OUString& _sColumnName) const + inline bool operator()(const ::rtl::OUString& _sColumnName) const { return m_pColumns->find(_sColumnName) != m_pColumns->end(); } @@ -83,7 +83,7 @@ namespace dbaui ,m_pVector(_pVector) { } - inline bool operator()(const ::rtl::OUString& _sColumnName) const + inline bool operator()(const ::rtl::OUString& _sColumnName) const { return ::std::find_if(m_pVector->begin(),m_pVector->end(), ::std::bind2nd(m_aCase, _sColumnName)) != m_pVector->end(); @@ -126,7 +126,7 @@ namespace dbaui /** copies the filter and sorting * - * \return + * \return */ virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const = 0; @@ -220,11 +220,11 @@ namespace dbaui // ======================================================== class OCopyTableWizard : public WizardDialog { - friend class OWizColumnSelect; - friend class OWizTypeSelect; - friend class OWizTypeSelectControl; - friend class OCopyTable; - friend class OWizNameMatching; + friend class OWizColumnSelect; + friend class OWizTypeSelect; + friend class OWizTypeSelectControl; + friend class OCopyTable; + friend class OWizNameMatching; public: DECLARE_STL_MAP(::rtl::OUString,::rtl::OUString,::comphelper::UStringMixLess,TNameMapping); @@ -239,54 +239,54 @@ namespace dbaui }; private: - ODatabaseExport::TColumns m_vDestColumns; // contains the columns - ODatabaseExport::TColumnVector m_aDestVec; // the order to insert the columns - ODatabaseExport::TColumns m_vSourceColumns; - ODatabaseExport::TColumnVector m_vSourceVec; + ODatabaseExport::TColumns m_vDestColumns; // contains the columns + ODatabaseExport::TColumnVector m_aDestVec; // the order to insert the columns + ODatabaseExport::TColumns m_vSourceColumns; + ODatabaseExport::TColumnVector m_vSourceVec; HelpButton m_pbHelp; - CancelButton m_pbCancel; - PushButton m_pbPrev; - PushButton m_pbNext; - OKButton m_pbFinish; + CancelButton m_pbCancel; + PushButton m_pbPrev; + PushButton m_pbNext; + OKButton m_pbFinish; - OTypeInfoMap m_aTypeInfo; + OTypeInfoMap m_aTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; - OTypeInfoMap m_aDestTypeInfo; + OTypeInfoMap m_aDestTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aDestTypeInfoIndex; - TNameMapping m_mNameMapping; + TNameMapping m_mNameMapping; - ODatabaseExport::TPositions m_vColumnPos; - ::std::vector<sal_Int32> m_vColumnTypes; + ODatabaseExport::TPositions m_vColumnPos; + ::std::vector<sal_Int32> m_vColumnTypes; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xDestConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xDestConnection; const ICopyTableSourceObject& m_rSourceObject; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> m_xInteractionHandler; - String m_sTypeNames; // these type names are the ones out of the resource file - sal_uInt32 m_nPageCount; - sal_Bool m_bDeleteSourceColumns; + String m_sTypeNames; // these type names are the ones out of the resource file + sal_uInt32 m_nPageCount; + sal_Bool m_bDeleteSourceColumns; bool m_bInterConnectionCopy; // are we copying between different connections? - ::com::sun::star::lang::Locale m_aLocale; - ::rtl::OUString m_sName; // for a table the name is composed - ::rtl::OUString m_sSourceName; - ::rtl::OUString m_aKeyName; - TOTypeInfoSP m_pTypeInfo; // default type - sal_Bool m_bAddPKFirstTime; + ::com::sun::star::lang::Locale m_aLocale; + ::rtl::OUString m_sName; // for a table the name is composed + ::rtl::OUString m_sSourceName; + ::rtl::OUString m_aKeyName; + TOTypeInfoSP m_pTypeInfo; // default type + sal_Bool m_bAddPKFirstTime; sal_Int16 m_nOperation; - Wizard_Button_Style m_ePressed; - sal_Bool m_bCreatePrimaryKeyColumn; + Wizard_Button_Style m_ePressed; + sal_Bool m_bCreatePrimaryKeyColumn; sal_Bool m_bUseHeaderLine; private: - DECL_LINK( ImplPrevHdl , PushButton* ); - DECL_LINK( ImplNextHdl , PushButton* ); - DECL_LINK( ImplOKHdl , OKButton* ); + DECL_LINK( ImplPrevHdl , PushButton* ); + DECL_LINK( ImplNextHdl , PushButton* ); + DECL_LINK( ImplOKHdl , OKButton* ); DECL_LINK( ImplActivateHdl, WizardDialog* ); sal_Bool CheckColumns(sal_Int32& _rnBreakPos); void loadData( const ICopyTableSourceObject& _rSourceObject, @@ -308,8 +308,8 @@ namespace dbaui const ::rtl::OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xSourceConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xSourceConnection, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler>& _xInteractionHandler ); @@ -322,7 +322,7 @@ namespace dbaui const ODatabaseExport::TColumns& _rDestColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _xFormatter, + const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM @@ -330,36 +330,36 @@ namespace dbaui virtual ~OCopyTableWizard(); - virtual long DeactivatePage(); - OKButton& GetOKButton() { return m_pbFinish; } + virtual long DeactivatePage(); + OKButton& GetOKButton() { return m_pbFinish; } Wizard_Button_Style GetPressedButton() const { return m_ePressed; } - void EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable); - void AddWizardPage(OWizardPage* pPage); // Page wird von OCopyTableWizard gelöscht - void RemoveWizardPage(OWizardPage* pPage); // Page goes again to user - void CheckButtons(); // checks which button can be disabled, enabled + void EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable); + void AddWizardPage(OWizardPage* pPage); // Page wird von OCopyTableWizard gelöscht + void RemoveWizardPage(OWizardPage* pPage); // Page goes again to user + void CheckButtons(); // checks which button can be disabled, enabled // returns a vector where the position of a column and if the column is in the selection // when not the value is COLUMN_POSITION_NOT_FOUND == (sal_uInt32)-1 - ODatabaseExport::TPositions GetColumnPositions() const { return m_vColumnPos; } - ::std::vector<sal_Int32> GetColumnTypes() const { return m_vColumnTypes; } + ODatabaseExport::TPositions GetColumnPositions() const { return m_vColumnPos; } + ::std::vector<sal_Int32> GetColumnTypes() const { return m_vColumnTypes; } sal_Bool UseHeaderLine() const { return m_bUseHeaderLine; } void setUseHeaderLine(sal_Bool _bUseHeaderLine) { m_bUseHeaderLine = _bUseHeaderLine; } void insertColumn(sal_Int32 _nPos,OFieldDescription* _pField); /** replaces a field description with another one. The name must not be known so far. - @param _nPos + @param _nPos The pos inside the vector, 0 based. - @param _pField + @param _pField The field to set. - @param _sOldName + @param _sOldName The name of column to be replaced. */ void replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const ::rtl::OUString& _sOldName); /** returns whether a primary key should be created in the target database */ - sal_Bool shouldCreatePrimaryKey() const; + sal_Bool shouldCreatePrimaryKey() const; void setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ); static bool supportsPrimaryKey( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); @@ -372,23 +372,23 @@ namespace dbaui @return The name of the primary key. */ - ::rtl::OUString getPrimaryKeyName() const { return m_aKeyName; } + ::rtl::OUString getPrimaryKeyName() const { return m_aKeyName; } - TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } - const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } + TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } + const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } - TOTypeInfoSP getDestTypeInfo(sal_Int32 _nPos) const { return m_aDestTypeInfoIndex[_nPos]->second; } - const OTypeInfoMap* getDestTypeInfo() const { return &m_aDestTypeInfo; } + TOTypeInfoSP getDestTypeInfo(sal_Int32 _nPos) const { return m_aDestTypeInfoIndex[_nPos]->second; } + const OTypeInfoMap* getDestTypeInfo() const { return &m_aDestTypeInfo; } - ::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; } + ::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; } ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const { return m_xFormatter; } ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> GetFactory() const { return m_xFactory; } - const ODatabaseExport::TColumns* getSourceColumns() const{ return &m_vSourceColumns; } - const ODatabaseExport::TColumnVector* getSrcVector() const { return &m_vSourceVec; } - ODatabaseExport::TColumns* getDestColumns() { return &m_vDestColumns; } - const ODatabaseExport::TColumnVector* getDestVector() const { return &m_aDestVec; } - ::rtl::OUString getName() const { return m_sName; } + const ODatabaseExport::TColumns* getSourceColumns() const{ return &m_vSourceColumns; } + const ODatabaseExport::TColumnVector* getSrcVector() const { return &m_vSourceVec; } + ODatabaseExport::TColumns* getDestColumns() { return &m_vDestColumns; } + const ODatabaseExport::TColumnVector* getDestVector() const { return &m_aDestVec; } + ::rtl::OUString getName() const { return m_sName; } /** clears the dest vectors */ @@ -401,10 +401,10 @@ namespace dbaui void setOperation( const sal_Int16 _nOperation ); sal_Int16 getOperation() const; - ::rtl::OUString convertColumnName( const TColumnFindFunctor& _rCmpFunctor, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen); + ::rtl::OUString convertColumnName( const TColumnFindFunctor& _rCmpFunctor, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen); TOTypeInfoSP convertType(const TOTypeInfoSP&_pType,sal_Bool& _bNotConvert); ::rtl::OUString createUniqueName(const ::rtl::OUString& _sName); diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index b12578deda6b..7e82893041ca 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ namespace dbaui class OWizHTMLExtend : public OWizTypeSelect { protected: - virtual SvParser* createReader(sal_Int32 _nRows); + virtual SvParser* createReader(sal_Int32 _nRows); public: - OWizHTMLExtend(Window* pParent, SvStream& _rStream) + OWizHTMLExtend(Window* pParent, SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } @@ -58,7 +58,7 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows); public: - OWizRTFExtend(Window* pParent,SvStream& _rStream) + OWizRTFExtend(Window* pParent,SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 06d6a76fe655..e9d056347764 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,20 +63,20 @@ namespace dbaui // ======================================================== class OWizNameMatching : public OWizardPage { - FixedText m_FT_TABLE_LEFT; - FixedText m_FT_TABLE_RIGHT; - OColumnTreeBox m_CTRL_LEFT; // left side - OColumnTreeBox m_CTRL_RIGHT; // right side + FixedText m_FT_TABLE_LEFT; + FixedText m_FT_TABLE_RIGHT; + OColumnTreeBox m_CTRL_LEFT; // left side + OColumnTreeBox m_CTRL_RIGHT; // right side ImageButton m_ibColumn_up; ImageButton m_ibColumn_down; ImageButton m_ibColumn_up_right; ImageButton m_ibColumn_down_right; - PushButton m_pbAll; - PushButton m_pbNone; - String m_sSourceText; - String m_sDestText; + PushButton m_pbAll; + PushButton m_pbNone; + String m_sSourceText; + String m_sDestText; - sal_Bool m_bAttrsChanged; + sal_Bool m_bAttrsChanged; DECL_LINK( ButtonClickHdl, Button * ); DECL_LINK( RightButtonClickHdl, Button * ); @@ -85,10 +85,10 @@ namespace dbaui DECL_LINK( TableListRightSelectHdl, void* ); public: - virtual void Reset ( ); - virtual void ActivatePage(); - virtual sal_Bool LeavePage(); - virtual String GetTitle() const ; + virtual void Reset ( ); + virtual void ActivatePage(); + virtual sal_Bool LeavePage(); + virtual String GetTitle() const ; OWizNameMatching(Window* pParent); virtual ~OWizNameMatching(); diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index 7aa6c138bd1b..9b86bd0e5bfe 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,20 +37,20 @@ namespace dbaui // Wizard Page // ======================================================== class OCopyTableWizard; - class OWizardPage : public TabPage + class OWizardPage : public TabPage { protected: - OCopyTableWizard* m_pParent; - sal_Bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode + OCopyTableWizard* m_pParent; + sal_Bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode OWizardPage( Window* pParent, const ResId& rResId );// : TabPage(pParent,rResId),m_pParent((OCopyTableWizard*)pParent),m_bFirstTime(sal_True) {}; public: - virtual void Reset ( ) = 0; - virtual sal_Bool LeavePage() = 0; - virtual String GetTitle() const = 0; + virtual void Reset ( ) = 0; + virtual sal_Bool LeavePage() = 0; + virtual String GetTitle() const = 0; - sal_Bool IsFirstTime() const { return m_bFirstTime; } + sal_Bool IsFirstTime() const { return m_bFirstTime; } }; } #endif // DBAUI_WIZ_TABBPAGE_HXX diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index ab57648adf90..d5ddf0790bc2 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,17 +48,17 @@ namespace dbaui class OWizTypeSelectControl : public OFieldDescControl { protected: - virtual void ActivateAggregate( EControlType eType ); - virtual void DeactivateAggregate( EControlType eType ); + virtual void ActivateAggregate( EControlType eType ); + virtual void DeactivateAggregate( EControlType eType ); - virtual void CellModified(long nRow, sal_uInt16 nColId ); + virtual void CellModified(long nRow, sal_uInt16 nColId ); - virtual ::com::sun::star::lang::Locale GetLocale() const; + virtual ::com::sun::star::lang::Locale GetLocale() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); - virtual const OTypeInfoMap* getTypeInfo() const; - virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); + virtual const OTypeInfoMap* getTypeInfo() const; + virtual sal_Bool isAutoIncrementValueEnabled() const; + virtual ::rtl::OUString getAutoIncrementValue() const; public: OWizTypeSelectControl(Window* pParent, const ResId& rResId,OTableDesignHelpBar* pHelpBar=NULL); @@ -75,17 +75,17 @@ namespace dbaui // ======================================================== class OWizTypeSelectList : public MultiListBox { - sal_Bool m_bPKey; - sal_Bool IsPrimaryKeyAllowed() const; - void setPrimaryKey( OFieldDescription* _pFieldDescr, + sal_Bool m_bPKey; + sal_Bool IsPrimaryKeyAllowed() const; + void setPrimaryKey( OFieldDescription* _pFieldDescr, sal_uInt16 _nPos, sal_Bool _bSet=sal_False); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); public: OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) {}; OWizTypeSelectList( Window* pParent, const ResId& rResId ) : MultiListBox(pParent,rResId) {}; - void SetPKey(sal_Bool bPKey) { m_bPKey = bPKey; } + void SetPKey(sal_Bool bPKey) { m_bPKey = bPKey; } }; // ======================================================== @@ -101,31 +101,31 @@ namespace dbaui DECL_LINK( ColumnSelectHdl, MultiListBox* ); DECL_LINK( ButtonClickHdl, Button * ); protected: - OWizTypeSelectList m_lbColumnNames; + OWizTypeSelectList m_lbColumnNames; FixedLine m_flColumns; - OWizTypeSelectControl m_aTypeControl; + OWizTypeSelectControl m_aTypeControl; FixedLine m_flAutoType; - FixedText m_ftAuto; - NumericField m_etAuto; - PushButton m_pbAuto; + FixedText m_ftAuto; + NumericField m_etAuto; + PushButton m_pbAuto; - Image m_imgPKey; - SvStream* m_pParserStream; // stream to read the tokens from or NULL - ::rtl::OUString m_sAutoIncrementValue; - sal_Int32 m_nDisplayRow; - sal_Bool m_bAutoIncrementEnabled; - sal_Bool m_bDuplicateName; + Image m_imgPKey; + SvStream* m_pParserStream; // stream to read the tokens from or NULL + ::rtl::OUString m_sAutoIncrementValue; + sal_Int32 m_nDisplayRow; + sal_Bool m_bAutoIncrementEnabled; + sal_Bool m_bDuplicateName; - void fillColumnList(sal_uInt32 nRows); - virtual SvParser* createReader(sal_Int32 _nRows) = 0; + void fillColumnList(sal_uInt32 nRows); + virtual SvParser* createReader(sal_Int32 _nRows) = 0; - void EnableAuto(sal_Bool bEnable); + void EnableAuto(sal_Bool bEnable); public: - virtual void Reset ( ); - virtual void ActivatePage( ); - virtual void Resize(); - virtual sal_Bool LeavePage(); - virtual String GetTitle() const; + virtual void Reset ( ); + virtual void ActivatePage( ); + virtual void Resize(); + virtual sal_Bool LeavePage(); + virtual String GetTitle() const; OWizTypeSelect(Window* pParent, SvStream* _pStream = NULL ); virtual ~OWizTypeSelect(); diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 214e5f9113e3..b1627f8f81e0 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,14 +78,14 @@ namespace dbaui RadioButton m_aCaseTables; RadioButton m_aCaseQueries; - OTableTreeListBox m_aTableList; + OTableTreeListBox m_aTableList; SvTreeListBox m_aQueryList; ::std::auto_ptr< TableObjectListFacade > m_pCurrentList; - PushButton aAddButton; - CancelButton aCloseButton; - HelpButton aHelpButton; + PushButton aAddButton; + CancelButton aCloseButton; + HelpButton aHelpButton; IAddTableDialogContext& m_rContext; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 092afbb98108..c4f5a81d00fe 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace dbaui ,public IDatabaseSettingsDialog { OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; protected: @@ -66,7 +66,7 @@ namespace dbaui ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName); - + virtual ~AdvancedSettingsDialog(); /// determines whether or not the given data source type has any advanced setting @@ -75,12 +75,12 @@ namespace dbaui virtual const SfxItemSet* getOutputSet() const; virtual SfxItemSet* getWriteOutputSet(); - virtual short Execute(); + virtual short Execute(); // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); diff --git a/dbaccess/source/ui/inc/asyncmodaldialog.hxx b/dbaccess/source/ui/inc/asyncmodaldialog.hxx index 4cdc83d70dfc..9711070bc9a0 100644 --- a/dbaccess/source/ui/inc/asyncmodaldialog.hxx +++ b/dbaccess/source/ui/inc/asyncmodaldialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx index 7bd5a7c67171..3bac18ae4fb8 100644 --- a/dbaccess/source/ui/inc/browserids.hxx +++ b/dbaccess/source/ui/inc/browserids.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,89 +31,89 @@ #include <svx/svxids.hrc> #include "dbaccess_slotid.hrc" -#define ID_BROWSER_COPY SID_COPY -#define ID_BROWSER_CUT SID_CUT -#define ID_BROWSER_EDITDOC SID_EDITDOC -#define ID_BROWSER_UNDORECORD SID_FM_RECORD_UNDO -#define ID_BROWSER_SAVERECORD SID_FM_RECORD_SAVE -#define ID_BROWSER_PASTE SID_PASTE -#define ID_BROWSER_CLIPBOARD_FORMAT_ITEMS SID_CLIPBOARD_FORMAT_ITEMS -#define ID_BROWSER_REDO SID_REDO -#define ID_BROWSER_SAVEDOC SID_SAVEDOC -#define ID_BROWSER_SAVEASDOC SID_SAVEASDOC -#define ID_BROWSER_TITLE SID_DOCINFO_TITLE -#define ID_BROWSER_UNDO SID_UNDO -#define ID_BROWSER_INSERTCOLUMNS SID_SBA_BRW_INSERT -#define ID_BROWSER_FORMLETTER SID_SBA_BRW_MERGE -#define ID_BROWSER_INSERTCONTENT SID_SBA_BRW_UPDATE +#define ID_BROWSER_COPY SID_COPY +#define ID_BROWSER_CUT SID_CUT +#define ID_BROWSER_EDITDOC SID_EDITDOC +#define ID_BROWSER_UNDORECORD SID_FM_RECORD_UNDO +#define ID_BROWSER_SAVERECORD SID_FM_RECORD_SAVE +#define ID_BROWSER_PASTE SID_PASTE +#define ID_BROWSER_CLIPBOARD_FORMAT_ITEMS SID_CLIPBOARD_FORMAT_ITEMS +#define ID_BROWSER_REDO SID_REDO +#define ID_BROWSER_SAVEDOC SID_SAVEDOC +#define ID_BROWSER_SAVEASDOC SID_SAVEASDOC +#define ID_BROWSER_TITLE SID_DOCINFO_TITLE +#define ID_BROWSER_UNDO SID_UNDO +#define ID_BROWSER_INSERTCOLUMNS SID_SBA_BRW_INSERT +#define ID_BROWSER_FORMLETTER SID_SBA_BRW_MERGE +#define ID_BROWSER_INSERTCONTENT SID_SBA_BRW_UPDATE -#define ID_BROWSER_SEARCH SID_FM_SEARCH -#define ID_BROWSER_SORTUP SID_FM_SORTUP -#define ID_BROWSER_SORTDOWN SID_FM_SORTDOWN -#define ID_BROWSER_AUTOFILTER SID_FM_AUTOFILTER -#define ID_BROWSER_FILTERCRIT SID_FM_FILTERCRIT -#define ID_BROWSER_ORDERCRIT SID_FM_ORDERCRIT -#define ID_BROWSER_REMOVEFILTER SID_FM_REMOVE_FILTER_SORT -#define ID_BROWSER_FILTERED SID_FM_FORM_FILTERED -#define ID_BROWSER_REFRESH SID_FM_REFRESH -#define ID_BROWSER_EXPL_PREVLEVEL SID_EXPLORER_PREVLEVEL -#define ID_BROWSER_COLATTRSET 20 // Spaltenformatierung -#define ID_BROWSER_COLWIDTH 21 // Spaltenbreite -#define ID_BROWSER_TABLEATTR 22 // table format attributes -#define ID_BROWSER_ROWHEIGHT 23 // Zeilenhoehe -#define ID_BROWSER_COLUMNINFO 24 // copies the column description to insert it into the table design -#define ID_BROWSER_COUNTALL SID_FM_COUNTALL // count all -#define ID_BROWSER_ADDTABLE SID_FM_ADDTABLE -#define ID_BROWSER_EXPLORER SID_DSBROWSER_EXPLORER -#define ID_BROWSER_DOCUMENT_DATASOURCE SID_DOCUMENT_DATA_SOURCE +#define ID_BROWSER_SEARCH SID_FM_SEARCH +#define ID_BROWSER_SORTUP SID_FM_SORTUP +#define ID_BROWSER_SORTDOWN SID_FM_SORTDOWN +#define ID_BROWSER_AUTOFILTER SID_FM_AUTOFILTER +#define ID_BROWSER_FILTERCRIT SID_FM_FILTERCRIT +#define ID_BROWSER_ORDERCRIT SID_FM_ORDERCRIT +#define ID_BROWSER_REMOVEFILTER SID_FM_REMOVE_FILTER_SORT +#define ID_BROWSER_FILTERED SID_FM_FORM_FILTERED +#define ID_BROWSER_REFRESH SID_FM_REFRESH +#define ID_BROWSER_EXPL_PREVLEVEL SID_EXPLORER_PREVLEVEL +#define ID_BROWSER_COLATTRSET 20 // Spaltenformatierung +#define ID_BROWSER_COLWIDTH 21 // Spaltenbreite +#define ID_BROWSER_TABLEATTR 22 // table format attributes +#define ID_BROWSER_ROWHEIGHT 23 // Zeilenhoehe +#define ID_BROWSER_COLUMNINFO 24 // copies the column description to insert it into the table design +#define ID_BROWSER_COUNTALL SID_FM_COUNTALL // count all +#define ID_BROWSER_ADDTABLE SID_FM_ADDTABLE +#define ID_BROWSER_EXPLORER SID_DSBROWSER_EXPLORER +#define ID_BROWSER_DOCUMENT_DATASOURCE SID_DOCUMENT_DATA_SOURCE // The following ids are local to special components (e.g. menus), so they don't need to be unique // overall. Please have this in mind when changing anything #define ID_TREE_EDIT_DATABASE 1 -#define ID_TREE_CLOSE_CONN 2 +#define ID_TREE_CLOSE_CONN 2 // FREE -#define ID_TREE_ADMINISTRATE 4 +#define ID_TREE_ADMINISTRATE 4 #define ID_MIGRATE_SCRIPTS 5 -#define ID_REPORT_NEW_TEXT 14 -#define ID_FORM_NEW_TEXT 15 -#define ID_FORM_NEW_CALC 16 -#define ID_FORM_NEW_IMPRESS 17 -#define ID_NEW_QUERY_DESIGN 20 -#define ID_EDIT_QUERY_DESIGN 21 -#define ID_NEW_QUERY_SQL 22 -#define ID_EDIT_QUERY_SQL 23 -#define ID_NEW_TABLE_DESIGN 25 -#define ID_NEW_VIEW_DESIGN 28 -#define ID_DIRECT_SQL 32 -#define ID_BROWSER_REFRESH_REBUILD 34 -#define ID_INDEX_NEW 36 -#define ID_INDEX_DROP 37 -#define ID_INDEX_RENAME 38 -#define ID_INDEX_SAVE 39 -#define ID_INDEX_RESET 40 -#define ID_DOCUMENT_CREATE_REPWIZ 41 -#define ID_BROWSER_SQL 42 +#define ID_REPORT_NEW_TEXT 14 +#define ID_FORM_NEW_TEXT 15 +#define ID_FORM_NEW_CALC 16 +#define ID_FORM_NEW_IMPRESS 17 +#define ID_NEW_QUERY_DESIGN 20 +#define ID_EDIT_QUERY_DESIGN 21 +#define ID_NEW_QUERY_SQL 22 +#define ID_EDIT_QUERY_SQL 23 +#define ID_NEW_TABLE_DESIGN 25 +#define ID_NEW_VIEW_DESIGN 28 +#define ID_DIRECT_SQL 32 +#define ID_BROWSER_REFRESH_REBUILD 34 +#define ID_INDEX_NEW 36 +#define ID_INDEX_DROP 37 +#define ID_INDEX_RENAME 38 +#define ID_INDEX_SAVE 39 +#define ID_INDEX_RESET 40 +#define ID_DOCUMENT_CREATE_REPWIZ 41 +#define ID_BROWSER_SQL 42 -#define ID_APP_NEW_QUERY_AUTO_PILOT 44 -#define ID_NEW_TABLE_DESIGN_AUTO_PILOT 45 -#define ID_NEW_VIEW_DESIGN_AUTO_PILOT 46 +#define ID_APP_NEW_QUERY_AUTO_PILOT 44 +#define ID_NEW_TABLE_DESIGN_AUTO_PILOT 45 +#define ID_NEW_VIEW_DESIGN_AUTO_PILOT 46 // other -#define ID_BROWSER_QUERY_EXECUTE SID_FM_EXECUTE +#define ID_BROWSER_QUERY_EXECUTE SID_FM_EXECUTE -#define ID_BROWSER_CLOSE SID_CLOSEWIN -#define ID_BROWSER_ESACPEPROCESSING SID_FM_NATIVESQL +#define ID_BROWSER_CLOSE SID_CLOSEWIN +#define ID_BROWSER_ESACPEPROCESSING SID_FM_NATIVESQL -#define ID_QUERY_FUNCTION (SID_SBA_START + 41) // Funktionen anzeigen -#define ID_QUERY_TABLENAME (SID_SBA_START + 42) // Tabellennamen anzeigen -#define ID_QUERY_ALIASNAME (SID_SBA_START + 43) // Aliasnamen anzeigen -#define ID_QUERY_DISTINCT (SID_SBA_START + 44) // Distinct anzeigen -#define ID_QUERY_EDIT_JOINCONNECTION (SID_SBA_START + 45) // show-edit Join -#define ID_BROWSER_INSERT_ROW (SID_SBA_START + 46) // insert row -#define ID_QUERY_ZOOM_IN SID_ZOOM_IN -#define ID_QUERY_ZOOM_OUT SID_ZOOM_OUT +#define ID_QUERY_FUNCTION (SID_SBA_START + 41) // Funktionen anzeigen +#define ID_QUERY_TABLENAME (SID_SBA_START + 42) // Tabellennamen anzeigen +#define ID_QUERY_ALIASNAME (SID_SBA_START + 43) // Aliasnamen anzeigen +#define ID_QUERY_DISTINCT (SID_SBA_START + 44) // Distinct anzeigen +#define ID_QUERY_EDIT_JOINCONNECTION (SID_SBA_START + 45) // show-edit Join +#define ID_BROWSER_INSERT_ROW (SID_SBA_START + 46) // insert row +#define ID_QUERY_ZOOM_IN SID_ZOOM_IN +#define ID_QUERY_ZOOM_OUT SID_ZOOM_OUT #endif // DBACCESS_UI_BROWSER_ID_HXX diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index ccc53bc650c7..9f2fe801ddce 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ namespace dbaui , ::com::sun::star::awt::XFocusListener , ::com::sun::star::container::XContainerListener , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::frame::XModule + , ::com::sun::star::frame::XModule > SbaXDataBrowserController_Base; class SbaXDataBrowserController :public SbaXDataBrowserController_Base @@ -93,47 +93,47 @@ namespace dbaui friend class FormControllerImpl; OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; // our rowset - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xColumnsSupplier; // queried from the rowset member - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xLoadable; // queried from the rowset member as well - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > m_xGridModel; // the model of our grid - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xFormControllerImpl; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > - m_xParser; // for sorting 'n filtering + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; // our rowset + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xColumnsSupplier; // queried from the rowset member + ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xLoadable; // queried from the rowset member as well + ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > m_xGridModel; // the model of our grid + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xFormControllerImpl; + mutable ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > + m_xParser; // for sorting 'n filtering sal_Int32 m_nRowSetPrivileges; // cached Privileges property of m_xRowSet - AutoTimer m_aInvalidateClipboard; // for testing the state of the CUT/COPY/PASTE-slots + AutoTimer m_aInvalidateClipboard; // for testing the state of the CUT/COPY/PASTE-slots - TransferableDataHelper m_aSystemClipboard; // content of the clipboard + TransferableDataHelper m_aSystemClipboard; // content of the clipboard TransferableClipboardListener* - m_pClipbordNotifier; // notifier for changes in the clipboard + m_pClipbordNotifier; // notifier for changes in the clipboard - ::osl::Mutex m_aAsyncLoadSafety; // for multi-thread access to our members + ::osl::Mutex m_aAsyncLoadSafety; // for multi-thread access to our members - OAsyncronousLink m_aAsyncGetCellFocus; + OAsyncronousLink m_aAsyncGetCellFocus; OAsyncronousLink m_aAsyncDisplayError; ::dbtools::SQLExceptionInfo m_aCurrentError; - String m_sStateSaveRecord; - String m_sStateUndoRecord; + String m_sStateSaveRecord; + String m_sStateUndoRecord; ::rtl::OUString m_sModuleIdentifier; // members for asynchronous load operations - FormControllerImpl* m_pFormControllerImpl; // implementing the XFormController + FormControllerImpl* m_pFormControllerImpl; // implementing the XFormController - ULONG m_nPendingLoadFinished; // the event used to tell ourself that the load is finished - sal_uInt16 m_nFormActionNestingLevel; // see enter-/leaveFormAction + ULONG m_nPendingLoadFinished; // the event used to tell ourself that the load is finished + sal_uInt16 m_nFormActionNestingLevel; // see enter-/leaveFormAction - sal_Bool m_bLoadCanceled : 1; // the load was canceled somehow - sal_Bool m_bClosingKillOpen : 1; // are we killing the load thread because we are to be suspended ? + sal_Bool m_bLoadCanceled : 1; // the load was canceled somehow + sal_Bool m_bClosingKillOpen : 1; // are we killing the load thread because we are to be suspended ? bool m_bCannotSelectUnfiltered : 1; // recieved an DATA_CANNOT_SELECT_UNFILTERED error protected: class FormErrorHelper { - SbaXDataBrowserController* m_pOwner; + SbaXDataBrowserController* m_pOwner; public: FormErrorHelper(SbaXDataBrowserController* pOwner) : m_pOwner(pOwner) { m_pOwner->enterFormAction(); } virtual ~FormErrorHelper() { m_pOwner->leaveFormAction(); } @@ -143,20 +143,20 @@ namespace dbaui // ================ // attribute access protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getRowSet() const { return m_xRowSet; } - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > getColumnsSupplier()const { return m_xColumnsSupplier; } - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > getLoadable() const { return m_xLoadable; } - - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > getFormComponent() const { return m_xGridModel; } - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > getControlModel() const { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > (m_xGridModel, ::com::sun::star::uno::UNO_QUERY); } - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter()const { return m_xFormatter; } - - sal_Bool isValid() const { return m_xRowSet.is() && m_xGridModel.is(); } - sal_Bool isValidCursor() const; // checks the ::com::sun::star::data::XDatabaseCursor-interface of m_xRowSet - sal_Bool isLoaded() const; - sal_Bool loadingCancelled() const { return m_bLoadCanceled; } + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getRowSet() const { return m_xRowSet; } + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > getColumnsSupplier()const { return m_xColumnsSupplier; } + ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > getLoadable() const { return m_xLoadable; } + + ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > getFormComponent() const { return m_xGridModel; } + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > getControlModel() const { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > (m_xGridModel, ::com::sun::star::uno::UNO_QUERY); } + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter()const { return m_xFormatter; } + + sal_Bool isValid() const { return m_xRowSet.is() && m_xGridModel.is(); } + sal_Bool isValidCursor() const; // checks the ::com::sun::star::data::XDatabaseCursor-interface of m_xRowSet + sal_Bool isLoaded() const; + sal_Bool loadingCancelled() const { return m_bLoadCanceled; } void onStartLoading( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable ); - void setLoadingCancelled() { m_bLoadCanceled = sal_True; } + void setLoadingCancelled() { m_bLoadCanceled = sal_True; } const TransferableDataHelper& getViewClipboard() const { return m_aSystemClipboard; } @@ -169,7 +169,7 @@ namespace dbaui virtual sal_Bool Construct(Window* pParent); // UNO - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -201,19 +201,19 @@ namespace dbaui virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); // ::com::sun::star::frame::XFrameActionListener - virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::sdb::XSQLErrorListener - virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::form::XDatabaseParameterListener - virtual sal_Bool SAL_CALL approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::form::XConfirmDeleteListener - virtual sal_Bool SAL_CALL confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::form::XLoadListener virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException ); @@ -241,11 +241,11 @@ namespace dbaui virtual ~SbaXDataBrowserController(); // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual void startFrameListening( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); virtual void stopFrameListening( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); @@ -268,8 +268,8 @@ namespace dbaui // you most probably don't want to override this behaviuor // the default implementation of disposing distributes the events to the following disposingXXX functions - virtual void disposingGridControl(const ::com::sun::star::lang::EventObject& Source); // calls removeControlListeners - virtual void disposingGridModel(const ::com::sun::star::lang::EventObject& Source); // calls removeModelListeners + virtual void disposingGridControl(const ::com::sun::star::lang::EventObject& Source); // calls removeControlListeners + virtual void disposingGridModel(const ::com::sun::star::lang::EventObject& Source); // calls removeModelListeners virtual void disposingFormModel(const ::com::sun::star::lang::EventObject& Source); virtual void disposingColumnModel(const ::com::sun::star::lang::EventObject& Source); @@ -313,7 +313,7 @@ namespace dbaui virtual sal_Bool SaveModified(sal_Bool bAskFor = sal_True); // save the modified record - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; // a PropertySet corresponding to the cursor field a column is bound to // if nViewPos is (sal_uInt16)-1 (the default) then the field for the current column will be retrieved @@ -336,18 +336,18 @@ namespace dbaui void ExecuteFilterSortCrit(sal_Bool bFilter); // execute the search slot - void ExecuteSearch(); + void ExecuteSearch(); void initializeParser() const; // changes the mutable member m_xParser - void applyParserFilter(const ::rtl::OUString& _rOldFilter, sal_Bool _bOldFilterApplied,const ::rtl::OUString& _sOldHaving,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); - void applyParserOrder(const ::rtl::OUString& _rOldOrder,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); + void applyParserFilter(const ::rtl::OUString& _rOldFilter, sal_Bool _bOldFilterApplied,const ::rtl::OUString& _sOldHaving,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); + void applyParserOrder(const ::rtl::OUString& _rOldOrder,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); sal_Int16 getCurrentColumnPosition(); - void setCurrentColumnPosition( sal_Int16 _nPos ); - void addColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); + void setCurrentColumnPosition( sal_Int16 _nPos ); + void addColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); void impl_checkForCannotSelectUnfiltered( const ::dbtools::SQLExceptionInfo& _rError ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > createParser_nothrow(); + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > createParser_nothrow(); // time to check the CUT/COPY/PASTE-slot-states DECL_LINK( OnInvalidateClipboard, AutoTimer* ); diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index b73016ea34e8..b954688867bd 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,21 +56,21 @@ namespace dbaui class UnoDataBrowserView : public ODataView, public ::utl::OEventListenerAdapter { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > m_xGrid; // our grid's UNO representation - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xMe; // our own UNO representation - DBTreeView* m_pTreeView; - Splitter* m_pSplitter; - mutable SbaGridControl* m_pVclControl; // our grid's VCL representation - Window* m_pStatus; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > m_xGrid; // our grid's UNO representation + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xMe; // our own UNO representation + DBTreeView* m_pTreeView; + Splitter* m_pSplitter; + mutable SbaGridControl* m_pVclControl; // our grid's VCL representation + Window* m_pStatus; DECL_LINK( SplitHdl, void* ); // attribute access public: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > getGridControl() const { return m_xGrid; } - SbaGridControl* getVclControl() const; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > getGridControl() const { return m_xGrid; } + SbaGridControl* getVclControl() const; public: - UnoDataBrowserView( Window* pParent, + UnoDataBrowserView( Window* pParent, IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); virtual ~UnoDataBrowserView(); @@ -78,20 +78,20 @@ namespace dbaui /// late construction virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel); - /** as columns may be hidden there is a difference between a columns model pos and its view pos + /** as columns may be hidden there is a difference between a columns model pos and its view pos so we you may use these translation function */ sal_uInt16 View2ModelPos(sal_uInt16 nPos) const; - /// for the same reason the view column count isn't the same as the model column count + /// for the same reason the view column count isn't the same as the model column count void setSplitter(Splitter* _pSplitter); void setTreeView(DBTreeView* _pTreeView); - void showStatus( const String& _rStatus ); - void hideStatus(); - - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getContainer() { return m_xMe; } + void showStatus( const String& _rStatus ); + void hideStatus(); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getContainer() { return m_xMe; } + protected: virtual long PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); @@ -105,7 +105,7 @@ namespace dbaui class BrowserViewStatusDisplay { protected: - UnoDataBrowserView* m_pView; + UnoDataBrowserView* m_pView; public: BrowserViewStatusDisplay( UnoDataBrowserView* _pView, const String& _rStatus ); diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx index 355e8faafcad..2acd041c6673 100644 --- a/dbaccess/source/ui/inc/callbacks.hxx +++ b/dbaccess/source/ui/inc/callbacks.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,15 +64,15 @@ namespace dbaui /** handler for StartDrag requests @return <TRUE/> if a drag operation was started */ - virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ) = 0; + virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ) = 0; /** check whether or not a drop request should be accepted */ - virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) = 0; + virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) = 0; /** execute a drop request */ - virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) = 0; + virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) = 0; }; //==================================================================== @@ -117,11 +117,11 @@ namespace dbaui { public: /// called when a drag operation done with a Transferable has been finished - virtual void dragFinished( ) = 0; + virtual void dragFinished( ) = 0; }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // _DBACCESS_UI_CALLBACKS_HXX_ diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 0f581e61b670..e566e8b8a410 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace dbaui bool StoreSelectedCharSet( SfxItemSet& _rSet, const USHORT _nItemId ); private: - OCharsetDisplay m_aCharSets; + OCharsetDisplay m_aCharSets; }; //........................................................................ diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index f5f51690178c..00a4a1f83a1f 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace dbaui ,protected SvxTextEncodingTable { protected: - ::rtl::OUString m_aSystemDisplayName; + ::rtl::OUString m_aSystemDisplayName; public: class ExtendedCharsetIterator; @@ -65,14 +65,14 @@ namespace dbaui const_iterator findDisplayName(const ::rtl::OUString& _rDisplayName) const; /// get access to the first element of the charset collection - const_iterator begin() const; + const_iterator begin() const; /// get access to the (last + 1st) element of the charset collection - const_iterator end() const; + const_iterator end() const; // size of the map - sal_Int32 size() const { return OCharsetDisplay_Base::size(); } + sal_Int32 size() const { return OCharsetDisplay_Base::size(); } protected: - virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; + virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; private: using OCharsetDisplay_Base::find; @@ -86,14 +86,14 @@ namespace dbaui { friend class OCharsetDisplay::ExtendedCharsetIterator; - ::rtl::OUString m_sDisplayName; + ::rtl::OUString m_sDisplayName; public: CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper& _rSource); - rtl_TextEncoding getEncoding() const { return CharsetDisplayDerefHelper_Base::getEncoding(); } - ::rtl::OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); } - ::rtl::OUString getDisplayName() const { return m_sDisplayName; } + rtl_TextEncoding getEncoding() const { return CharsetDisplayDerefHelper_Base::getEncoding(); } + ::rtl::OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); } + ::rtl::OUString getDisplayName() const { return m_sDisplayName; } protected: CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const ::rtl::OUString& _rDisplayName); @@ -109,12 +109,12 @@ namespace dbaui friend bool operator==(const ExtendedCharsetIterator& lhs, const ExtendedCharsetIterator& rhs); friend bool operator!=(const ExtendedCharsetIterator& lhs, const ExtendedCharsetIterator& rhs) { return !(lhs == rhs); } - typedef ::dbtools::OCharsetMap container; - typedef container::CharsetIterator base_iterator; + typedef ::dbtools::OCharsetMap container; + typedef container::CharsetIterator base_iterator; protected: - const OCharsetDisplay* m_pContainer; - base_iterator m_aPosition; + const OCharsetDisplay* m_pContainer; + base_iterator m_aPosition; public: ExtendedCharsetIterator(const ExtendedCharsetIterator& _rSource); @@ -122,21 +122,21 @@ namespace dbaui CharsetDisplayDerefHelper operator*() const; /// prefix increment - const ExtendedCharsetIterator& operator++(); + const ExtendedCharsetIterator& operator++(); /// postfix increment - const ExtendedCharsetIterator operator++(int) { ExtendedCharsetIterator hold(*this); ++*this; return hold; } + const ExtendedCharsetIterator operator++(int) { ExtendedCharsetIterator hold(*this); ++*this; return hold; } /// prefix decrement - const ExtendedCharsetIterator& operator--(); + const ExtendedCharsetIterator& operator--(); /// postfix decrement - const ExtendedCharsetIterator operator--(int) { ExtendedCharsetIterator hold(*this); --*this; return hold; } + const ExtendedCharsetIterator operator--(int) { ExtendedCharsetIterator hold(*this); --*this; return hold; } protected: ExtendedCharsetIterator( const OCharsetDisplay* _pContainer, const base_iterator& _rPosition ); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_CHARSETS_HXX_ diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index 4fde4f6d1b38..61dede6f134f 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <comphelper/stl_types.hxx> #include <unotools/sharedunocomponent.hxx> -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace sdbc { class XConnection; } @@ -50,7 +50,7 @@ namespace dbaui typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_COMMON_TYPES_HXX_ diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index 5983f252c8e5..3bff8de08eef 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ class OConnectionURLEdit : public Edit { ::dbaccess::ODsnTypeCollection* m_pTypeCollection; - FixedText* m_pForcedPrefix; - String m_sSaveValueNoPrefix; - BOOL m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not + FixedText* m_pForcedPrefix; + String m_sSaveValueNoPrefix; + BOOL m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not public: OConnectionURLEdit(Window* pParent, const ResId& rResId,BOOL _bShowPrefix = FALSE); @@ -60,28 +60,28 @@ public: public: // Edit overridables - virtual void SetText(const String& _rStr); - virtual void SetText(const String& _rStr, const Selection& _rNewSelection); - virtual String GetText() const; + virtual void SetText(const String& _rStr); + virtual void SetText(const String& _rStr, const Selection& _rNewSelection); + virtual String GetText() const; /** Showsthe Prefix - @param _bShowPrefix + @param _bShowPrefix If <TRUE/> than the prefix will be visible, otherwise not. */ void ShowPrefix(BOOL _bShowPrefix); /// get the currently set text, excluding the prefix indicating the type - virtual String GetTextNoPrefix() const; + virtual String GetTextNoPrefix() const; /// set a new text, leave the current prefix unchanged - virtual void SetTextNoPrefix(const String& _rText); + virtual void SetTextNoPrefix(const String& _rText); - inline void SaveValueNoPrefix() { m_sSaveValueNoPrefix = GetTextNoPrefix(); } - inline String GetSavedValueNoPrefix() const { return m_sSaveValueNoPrefix; } + inline void SaveValueNoPrefix() { m_sSaveValueNoPrefix = GetTextNoPrefix(); } + inline String GetSavedValueNoPrefix() const { return m_sSaveValueNoPrefix; } inline void SetTypeCollection(::dbaccess::ODsnTypeCollection* _pTypeCollection) { m_pTypeCollection = _pTypeCollection; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_CURLEDIT_HXX_ diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index 97659f454888..9ea455557b17 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ namespace dbaui /** sets the target frame into which the view should be loaded. - By default, the view is loaded into a top-level frame not being part of the + By default, the view is loaded into a top-level frame not being part of the Desktop. */ void setTargetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) @@ -144,7 +144,7 @@ namespace dbaui the data source for which a new object is to be created @param _rObjectName the name of the object to be edited - @param _rArgs + @param _rArgs Additional settings which should be forwarded to the frame @return the frame into which the view has been loaded @@ -225,13 +225,13 @@ namespace dbaui class ResultSetBrowser : public DatabaseObjectView { private: - sal_Bool m_bTable; + sal_Bool m_bTable; protected: virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rQualifiedName + const ::rtl::OUString& _rQualifiedName ); public: @@ -256,7 +256,7 @@ namespace dbaui ); }; // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... #endif // DBACCESS_DATABASE_OBJECT_VIEW_HXX diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index cb2842591dd6..12aba17aed6f 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,10 +51,10 @@ namespace dbaui class ODatasourceConnector { protected: - Window* m_pErrorMessageParent; + Window* m_pErrorMessageParent; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; - ::rtl::OUString m_sContextInformation; + ::rtl::OUString m_sContextInformation; public: ODatasourceConnector( @@ -68,7 +68,7 @@ namespace dbaui ); /// returns <TRUE/> if the object is able to create data source connections - sal_Bool isValid() const { return m_xORB.is(); } + sal_Bool isValid() const { return m_xORB.is(); } /** creates a connection to the data source, displays the possible error to the user, or returns it */ @@ -88,7 +88,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DATASOURCECONNECTOR_HXX_ diff --git a/dbaccess/source/ui/inc/datasourcemap.hxx b/dbaccess/source/ui/inc/datasourcemap.hxx index 836f001bf580..4b19d28b36a1 100644 --- a/dbaccess/source/ui/inc/datasourcemap.hxx +++ b/dbaccess/source/ui/inc/datasourcemap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace dbaui { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xDatasource; - SfxItemSet* pModifications; + SfxItemSet* pModifications; DatasourceInfo() :pModifications (NULL) { } DatasourceInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDS, @@ -60,16 +60,16 @@ namespace dbaui }; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xORB; /// service factory + m_xORB; /// service factory ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xDatabaseContext; /// database context we're working in + m_xDatabaseContext; /// database context we're working in DECLARE_STL_USTRINGACCESS_MAP(DatasourceInfo, DatasourceInfos); - DatasourceInfos m_aDatasources; /// known infos about data sources + DatasourceInfos m_aDatasources; /// known infos about data sources // deleted data sources, not necessarily with distinct names, that's why accessed via unique ids DECLARE_STL_MAP(sal_Int32, DatasourceInfo, ::std::less< sal_Int32 >, MapInt2Info); - MapInt2Info m_aDeletedDatasources; + MapInt2Info m_aDeletedDatasources; public: /// iterating through all data sources @@ -89,63 +89,63 @@ namespace dbaui getContext() { return m_xDatabaseContext; } /// first element for iterating through the datasources - Iterator begin(); + Iterator begin(); /// last element for iterating through the datasources - Iterator end(); + Iterator end(); /// first element for iterating through the deleted datasources - Iterator beginDeleted(); + Iterator beginDeleted(); /// last element for iterating through the deleted datasources - Iterator endDeleted(); + Iterator endDeleted(); /// check if the object contains a valid datasource enumeration - sal_Bool isValid() const { return m_xDatabaseContext.is(); } + sal_Bool isValid() const { return m_xDatabaseContext.is(); } /// check if a datasource with the given name exists - sal_Bool exists(const ::rtl::OUString& _rName) const; + sal_Bool exists(const ::rtl::OUString& _rName) const; /// return the number of datasources available - sal_Int32 size() const { return m_aDatasources.size(); } + sal_Int32 size() const { return m_aDatasources.size(); } /// clear the map (non-deleted <em>and</em> deleted items) - void clear(); + void clear(); /// clear the map (deleted items only) - void clearDeleted(); + void clearDeleted(); /// clear the modification items for a datasource - void clearModifiedFlag(const ::rtl::OUString& _rName); + void clearModifiedFlag(const ::rtl::OUString& _rName); /** tell the map that a data source is scheduled to be deleted. - @return id for accessing the deleted data source later. -1 if no free id existed or an error occured + @return id for accessing the deleted data source later. -1 if no free id existed or an error occured */ - sal_Int32 markDeleted(const ::rtl::OUString& _rName); + sal_Int32 markDeleted(const ::rtl::OUString& _rName); /** restores a datasource which has previously been marked as deleted.<p/> - @param _nAccessId the access id as got from <method>markDeleted</method> - @param _rName contains, upon return, the name of the datasource the access key refers to - @return sal_True if the datasource was successfully restored, sal_False if it could not be restored + @param _nAccessId the access id as got from <method>markDeleted</method> + @param _rName contains, upon return, the name of the datasource the access key refers to + @return sal_True if the datasource was successfully restored, sal_False if it could not be restored because of a naming conflict (e.g. because another data source now has the name of the to-be-restored one). - @see renamed - @see markDeleted + @see renamed + @see markDeleted */ - sal_Bool restoreDeleted(sal_Int32 _nAccessId, ::rtl::OUString& _rName); + sal_Bool restoreDeleted(sal_Int32 _nAccessId, ::rtl::OUString& _rName); /// remove an element from the map - void deleted(const ::rtl::OUString& _rName); + void deleted(const ::rtl::OUString& _rName); // (should be an erase(const Iterator&), but this is way to general ... /// update the infos for a data source with a given item set - void update(const ::rtl::OUString& _rName, SfxItemSet& _rSet); + void update(const ::rtl::OUString& _rName, SfxItemSet& _rSet); /** Tells the map that an entry has been renamed in a sense that it should be accessible under a new name. This does not necesssarily mean that the data source has been renamed within it's database context */ - void renamed(const ::rtl::OUString& _rOldName, const ::rtl::OUString& _rNewName); + void renamed(const ::rtl::OUString& _rOldName, const ::rtl::OUString& _rNewName); /** adjust the registration name if necessary<p/> The real name of the data source (as indicated in the SfxItemSet for this ds) may be another one than the name the ds is registered for. This method corrects this, the ds will become registered under it's real name. - @param _rName the name the ds is registered for - @return the real name of the data source + @param _rName the name the ds is registered for + @return the real name of the data source */ ::rtl::OUString adjustRealName(const ::rtl::OUString& _rName); @@ -154,7 +154,7 @@ namespace dbaui This method allows us lazy access to the data sources: They're retrieved from the context only if they're accessed by somebody. */ - void ensureObject(const ::rtl::OUString& _rName); + void ensureObject(const ::rtl::OUString& _rName); }; //------------------------------------------------------------------------- @@ -166,27 +166,27 @@ namespace dbaui friend class ODatasourceMap::Iterator; private: - ODatasourceMap* m_pOwner; - const ODatasourceMap::DatasourceInfo& m_rInfoImpl; - ::rtl::OUString m_sName; - sal_Int32 m_nAccessKey; + ODatasourceMap* m_pOwner; + const ODatasourceMap::DatasourceInfo& m_rInfoImpl; + ::rtl::OUString m_sName; + sal_Int32 m_nAccessKey; public: ODatasourceInfo(const ODatasourceInfo& _rSource) :m_pOwner(_rSource.m_pOwner), m_sName(_rSource.m_sName), m_rInfoImpl(_rSource.m_rInfoImpl), m_nAccessKey(_rSource.m_nAccessKey) { } /// check if the datasource settings are modified - sal_Bool isModified() const; + sal_Bool isModified() const; /// get the name the datasource is registered under - ::rtl::OUString getName() const { return m_sName; } + ::rtl::OUString getName() const { return m_sName; } /// get the original name of a datasource (may habe been renamed) - ::rtl::OUString getOriginalName() const; + ::rtl::OUString getOriginalName() const; /// get the real name of the datasource, which is the name which is in the item set - ::rtl::OUString getRealName() const; + ::rtl::OUString getRealName() const; /// check if the datasource should is about to be renamed (which means the original name does not equal the real name - sal_Bool isRenamed() const { return !getRealName().equals(getOriginalName()); } + sal_Bool isRenamed() const { return !getRealName().equals(getOriginalName()); } /// get the key used to acces the object in the data source map - sal_Int32 getAccessKey() const { return m_nAccessKey; } + sal_Int32 getAccessKey() const { return m_nAccessKey; } /// return the datasource the object represents ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > @@ -216,10 +216,10 @@ namespace dbaui { friend class ODatasourceMap; protected: - ODatasourceMap* m_pOwner; - ODatasourceMap::ConstDatasourceInfosIterator m_aPos; - ODatasourceMap::ConstMapInt2InfoIterator m_aPosDeleted; - sal_Bool m_bLoopingDeleted; + ODatasourceMap* m_pOwner; + ODatasourceMap::ConstDatasourceInfosIterator m_aPos; + ODatasourceMap::ConstMapInt2InfoIterator m_aPosDeleted; + sal_Bool m_bLoopingDeleted; public: Iterator(const Iterator& _rSource); @@ -228,14 +228,14 @@ namespace dbaui ODatasourceInfo operator*() const; /// prefix increment - const Iterator& operator++(); + const Iterator& operator++(); /// postfix increment - const Iterator operator++(int) { Iterator hold(*this); ++*this; return hold; } + const Iterator operator++(int) { Iterator hold(*this); ++*this; return hold; } /// prefix decrement - const Iterator& operator--(); + const Iterator& operator--(); /// postfix decrement - const Iterator operator--(int) { Iterator hold(*this); --*this; return hold; } + const Iterator operator--(int) { Iterator hold(*this); --*this; return hold; } // compare two iterators @@ -258,7 +258,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DATASOURCEMAP_HXX diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 4ba63866454b..0a31ba19f7de 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,12 +56,12 @@ class ODbAdminDialog : public SfxTabDialog , public IItemSetHelper, public IData { private: typedef ::std::stack< sal_Int32 > PageStack; - PageStack m_aCurrentDetailPages; // ids of all currently enabled (type-dependent) detail pages + PageStack m_aCurrentDetailPages; // ids of all currently enabled (type-dependent) detail pages - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; - sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing - sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> + sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing + sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> USHORT m_nMainPageID; public: @@ -75,16 +75,16 @@ public: virtual ~ODbAdminDialog(); /** create and return an item set for use with the dialog. - @param _pTypeCollection pointer to an <type>ODatasourceMap</type>. May be NULL, in this case + @param _pTypeCollection pointer to an <type>ODatasourceMap</type>. May be NULL, in this case the pool will not contain a typecollection default. */ - static SfxItemSet* createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection); + static SfxItemSet* createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection); /** destroy and item set / item pool / pool defaults previously created by <method>createItemSet</method> */ - static void destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults); + static void destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults); /** selects the DataSource - @param _rName + @param _rName The name of the data source */ void selectDataSource(const ::com::sun::star::uno::Any& _aDataSourceName); @@ -95,7 +95,7 @@ public: // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); @@ -110,8 +110,8 @@ protected: virtual short Ok(); protected: - inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } - inline void disabledUI() { m_bUIEnabled = sal_False; } + inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } + inline void disabledUI() { m_bUIEnabled = sal_False; } private: /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. @@ -121,17 +121,17 @@ private: enum ApplyResult { - AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed - AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed + AR_LEAVE_UNCHANGED, // no changes were made + AR_KEEP // don't leave the page (e.g. because an error occured) }; /** apply all changes made */ - ApplyResult implApplyChanges(); + ApplyResult implApplyChanges(); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DBADMIN_HXX_ diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 29a8c3c2867e..f41d5971afd6 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,25 +47,25 @@ namespace dbaui class OHTMLImportExport; class ODataClipboard : public ::svx::ODataAccessObjectTransferable - + { ::rtl::Reference< OHTMLImportExport > m_pHtml; ::rtl::Reference< ORTFImportExport > m_pRtf; public: ODataClipboard( - const ::rtl::OUString& _rDatasource, - const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const ::rtl::OUString& _rDatasource, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); ODataClipboard( - const ::rtl::OUString& _rDatasource, - const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const ::rtl::OUString& _rDatasource, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); @@ -81,10 +81,10 @@ namespace dbaui virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); }; } diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 4a7cbf0131c6..cb3f00cda447 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ namespace dbaui { struct DBTreeEditedEntry { - SvLBoxEntry* pEntry; - XubString aNewText; + SvLBoxEntry* pEntry; + XubString aNewText; }; class IEntryFilter @@ -56,30 +56,30 @@ namespace dbaui //======================================================================== class IControlActionListener; class IContextMenuProvider; - class DBTreeListBox :public SvTreeListBox + class DBTreeListBox :public SvTreeListBox { OModuleClient m_aModuleClient; - OScrollHelper m_aScrollHelper; - Timer m_aTimer; // is needed for table updates - Point m_aMousePos; + OScrollHelper m_aScrollHelper; + Timer m_aTimer; // is needed for table updates + Point m_aMousePos; ::std::set< SvListEntry* > m_aSelectedEntries; - SvLBoxEntry* m_pDragedEntry; - IControlActionListener* m_pActionListener; + SvLBoxEntry* m_pDragedEntry; + IControlActionListener* m_pActionListener; IContextMenuProvider* m_pContextMenuProvider; - Link m_aPreExpandHandler; // handler to be called before a node is expanded + Link m_aPreExpandHandler; // handler to be called before a node is expanded Link m_aSelChangeHdl; // handlet to be called (asynchronously) when the selection changes in any way - Link m_aCutHandler; // called when someone press CTRL+X - Link m_aCopyHandler; // called when someone press CTRL+C - Link m_aPasteHandler; // called when someone press CTRL+V - Link m_aDeleteHandler; // called when someone press DELETE Key - Link m_aEditingHandler; // called before someone will edit an entry - Link m_aEditedHandler; // called after someone edited an entry - Link m_aEnterKeyHdl; - + Link m_aCutHandler; // called when someone press CTRL+X + Link m_aCopyHandler; // called when someone press CTRL+C + Link m_aPasteHandler; // called when someone press CTRL+V + Link m_aDeleteHandler; // called when someone press DELETE Key + Link m_aEditingHandler; // called before someone will edit an entry + Link m_aEditedHandler; // called after someone edited an entry + Link m_aEnterKeyHdl; + - sal_Bool m_bHandleEnterKey; + sal_Bool m_bHandleEnterKey; protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; @@ -94,68 +94,68 @@ namespace dbaui public: DBTreeListBox( Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB - ,WinBits nWinStyle=0 + ,WinBits nWinStyle=0 ,sal_Bool _bHandleEnterKey = sal_False); DBTreeListBox( Window* pParent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB - ,const ResId& rResId + ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + ,const ResId& rResId ,sal_Bool _bHandleEnterKey = sal_False); ~DBTreeListBox(); - void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } - void setContextMenuProvider( IContextMenuProvider* _pContextMenuProvider ) { m_pContextMenuProvider = _pContextMenuProvider; } + void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } + void setContextMenuProvider( IContextMenuProvider* _pContextMenuProvider ) { m_pContextMenuProvider = _pContextMenuProvider; } inline void setORB(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) { m_xORB = _xORB; } + - - void SetPreExpandHandler(const Link& _rHdl) { m_aPreExpandHandler = _rHdl; } + void SetPreExpandHandler(const Link& _rHdl) { m_aPreExpandHandler = _rHdl; } void SetSelChangeHdl( const Link& _rHdl ) { m_aSelChangeHdl = _rHdl; } - void setCutHandler(const Link& _rHdl) { m_aCutHandler = _rHdl; } - void setCopyHandler(const Link& _rHdl) { m_aCopyHandler = _rHdl; } - void setPasteHandler(const Link& _rHdl) { m_aPasteHandler = _rHdl; } - void setDeleteHandler(const Link& _rHdl) { m_aDeleteHandler = _rHdl; } - void setEditingHandler(const Link& _rHdl) { m_aEditingHandler = _rHdl; } - void setEditedHandler(const Link& _rHdl) { m_aEditedHandler = _rHdl; } + void setCutHandler(const Link& _rHdl) { m_aCutHandler = _rHdl; } + void setCopyHandler(const Link& _rHdl) { m_aCopyHandler = _rHdl; } + void setPasteHandler(const Link& _rHdl) { m_aPasteHandler = _rHdl; } + void setDeleteHandler(const Link& _rHdl) { m_aDeleteHandler = _rHdl; } + void setEditingHandler(const Link& _rHdl) { m_aEditingHandler = _rHdl; } + void setEditedHandler(const Link& _rHdl) { m_aEditedHandler = _rHdl; } // modified the given entry so that the expand handler is called whenever the entry is expanded // (normally, the expand handler is called only once) - void EnableExpandHandler(SvLBoxEntry* _pEntry); + void EnableExpandHandler(SvLBoxEntry* _pEntry); - SvLBoxEntry* GetEntryPosByName( const String& aName, SvLBoxEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const; - virtual void RequestingChilds( SvLBoxEntry* pParent ); - virtual void SelectHdl(); - virtual void DeselectHdl(); + SvLBoxEntry* GetEntryPosByName( const String& aName, SvLBoxEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const; + virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual void SelectHdl(); + virtual void DeselectHdl(); // Window - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); virtual void StateChanged( StateChangedType nStateChange ); - virtual void InitEntry( SvLBoxEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind); + virtual void InitEntry( SvLBoxEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind); // enable editing for tables/views and queries - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); + virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& ); + virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); - virtual BOOL DoubleClickHdl(); + virtual BOOL DoubleClickHdl(); virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); + virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); - void SetEnterKeyHdl(const Link& rNewHdl) {m_aEnterKeyHdl = rNewHdl;} + void SetEnterKeyHdl(const Link& rNewHdl) {m_aEnterKeyHdl = rNewHdl;} void clearCurrentSelection() { m_aSelectedEntries.clear(); } protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); - virtual void ModelHasRemoved( SvListEntry* pEntry ); - virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); + virtual void ModelHasRemoved( SvListEntry* pEntry ); + virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); void implStopSelectionTimer(); void implStartSelectionTimer(); diff --git a/dbaccess/source/ui/inc/dbu_brw.hrc b/dbaccess/source/ui/inc/dbu_brw.hrc index 8d49e1101045..8473a0ad81fa 100644 --- a/dbaccess/source/ui/inc/dbu_brw.hrc +++ b/dbaccess/source/ui/inc/dbu_brw.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,24 +32,24 @@ #endif // FREE RID_STR_BRW_START + 0 -#define RID_STR_DATABROWSER_FILTERED RID_STR_BRW_START + 1 -#define SBA_BROWSER_SETTING_ORDER RID_STR_BRW_START + 2 -#define SBA_BROWSER_SETTING_FILTER RID_STR_BRW_START + 3 -#define STR_DATASOURCE_GRIDCONTROL_DESC RID_STR_BRW_START + 4 -#define RID_STR_UNDO_MODIFY_RECORD RID_STR_BRW_START + 5 -#define STR_NO_COLUMNNAME_MATCHING RID_STR_BRW_START + 6 -#define RID_STR_SAVE_CURRENT_RECORD RID_STR_BRW_START + 7 -#define STR_DATASOURCE_GRIDCONTROL_NAME RID_STR_BRW_START + 8 -#define STR_OPENTABLES_WARNINGS RID_STR_BRW_START + 9 -#define STR_OPENTABLES_WARNINGS_DETAILS RID_STR_BRW_START + 10 -#define STR_CONNECTING_DATASOURCE RID_STR_BRW_START + 11 -#define STR_LOADING_QUERY RID_STR_BRW_START + 12 -#define STR_LOADING_TABLE RID_STR_BRW_START + 13 - -// please adjust checking before insert new strings - -#if STR_LOADING_TABLE > RID_STR_BRW_END -#error Resource-Id Ueberlauf in #file, #line -#endif +#define RID_STR_DATABROWSER_FILTERED RID_STR_BRW_START + 1 +#define SBA_BROWSER_SETTING_ORDER RID_STR_BRW_START + 2 +#define SBA_BROWSER_SETTING_FILTER RID_STR_BRW_START + 3 +#define STR_DATASOURCE_GRIDCONTROL_DESC RID_STR_BRW_START + 4 +#define RID_STR_UNDO_MODIFY_RECORD RID_STR_BRW_START + 5 +#define STR_NO_COLUMNNAME_MATCHING RID_STR_BRW_START + 6 +#define RID_STR_SAVE_CURRENT_RECORD RID_STR_BRW_START + 7 +#define STR_DATASOURCE_GRIDCONTROL_NAME RID_STR_BRW_START + 8 +#define STR_OPENTABLES_WARNINGS RID_STR_BRW_START + 9 +#define STR_OPENTABLES_WARNINGS_DETAILS RID_STR_BRW_START + 10 +#define STR_CONNECTING_DATASOURCE RID_STR_BRW_START + 11 +#define STR_LOADING_QUERY RID_STR_BRW_START + 12 +#define STR_LOADING_TABLE RID_STR_BRW_START + 13 -#endif // _DBU_BRW_HRC_ +// please adjust checking before insert new strings + +#if STR_LOADING_TABLE > RID_STR_BRW_END +#error Resource-Id Ueberlauf in #file, #line +#endif + +#endif // _DBU_BRW_HRC_ diff --git a/dbaccess/source/ui/inc/dbu_control.hrc b/dbaccess/source/ui/inc/dbu_control.hrc index 7b597a8dc6e1..6a2a74e955ae 100644 --- a/dbaccess/source/ui/inc/dbu_control.hrc +++ b/dbaccess/source/ui/inc/dbu_control.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,20 +31,20 @@ #include "dbu_resource.hrc" #endif -#define STR_TABLE_PRIV_NAME RID_STR_CONTROL_START -#define STR_TABLE_PRIV_INSERT RID_STR_CONTROL_START + 1 -#define STR_TABLE_PRIV_DELETE RID_STR_CONTROL_START + 2 -#define STR_TABLE_PRIV_UPDATE RID_STR_CONTROL_START + 3 -#define STR_TABLE_PRIV_ALTER RID_STR_CONTROL_START + 4 -#define STR_TABLE_PRIV_REFERENCE RID_STR_CONTROL_START + 5 -#define STR_TABLE_PRIV_DROP RID_STR_CONTROL_START + 6 -#define STR_TABLE_PRIV_SELECT RID_STR_CONTROL_START + 7 -#define STR_ALL_TABLES_AND_VIEWS RID_STR_CONTROL_START + 8 -#define STR_COULDNOTCONNECT RID_STR_CONTROL_START + 9 -#define STR_COULDNOTCONNECT_PLEASECHECK RID_STR_CONTROL_START + 10 -#define STR_NOTABLEINFO RID_STR_CONTROL_START + 11 -#define STR_ALL_TABLES RID_STR_CONTROL_START + 12 -#define STR_ALL_VIEWS RID_STR_CONTROL_START + 13 +#define STR_TABLE_PRIV_NAME RID_STR_CONTROL_START +#define STR_TABLE_PRIV_INSERT RID_STR_CONTROL_START + 1 +#define STR_TABLE_PRIV_DELETE RID_STR_CONTROL_START + 2 +#define STR_TABLE_PRIV_UPDATE RID_STR_CONTROL_START + 3 +#define STR_TABLE_PRIV_ALTER RID_STR_CONTROL_START + 4 +#define STR_TABLE_PRIV_REFERENCE RID_STR_CONTROL_START + 5 +#define STR_TABLE_PRIV_DROP RID_STR_CONTROL_START + 6 +#define STR_TABLE_PRIV_SELECT RID_STR_CONTROL_START + 7 +#define STR_ALL_TABLES_AND_VIEWS RID_STR_CONTROL_START + 8 +#define STR_COULDNOTCONNECT RID_STR_CONTROL_START + 9 +#define STR_COULDNOTCONNECT_PLEASECHECK RID_STR_CONTROL_START + 10 +#define STR_NOTABLEINFO RID_STR_CONTROL_START + 11 +#define STR_ALL_TABLES RID_STR_CONTROL_START + 12 +#define STR_ALL_VIEWS RID_STR_CONTROL_START + 13 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc index 7e1b7df0d100..f403caafd712 100644 --- a/dbaccess/source/ui/inc/dbu_dlg.hrc +++ b/dbaccess/source/ui/inc/dbu_dlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,22 +31,22 @@ #include "dbu_resource.hrc" #endif -#define PAGE_X 281 -#define PAGE_Y 185 -#define WIZARD_PAGE_X 225 -#define WIZARD_PAGE_Y 210 -#define START_X 6 +#define PAGE_X 281 +#define PAGE_Y 185 +#define WIZARD_PAGE_X 225 +#define WIZARD_PAGE_Y 210 +#define START_X 6 #define START_Y 6 -#define CHECKBOX_HEIGHT 8 +#define CHECKBOX_HEIGHT 8 #define LISTBOX_HEIGHT 12 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 //constants for the wizards #define INIT_Y 28 @@ -55,62 +55,62 @@ #define INDENT_BELOW_CHECK 10 -#define STR_ADABAS_HELP_SYSDEVSPACE RID_STR_DLG_START -#define STR_ADABAS_HELP_TRANSACT RID_STR_DLG_START + 1 -#define STR_ADABAS_HELP_DATADEVSPACES RID_STR_DLG_START + 2 -#define STR_ADABAS_HELP_SIZE RID_STR_DLG_START + 3 -#define STR_ADABAS_HELP_FREESIZE RID_STR_DLG_START + 4 -#define STR_ADABAS_HELP_MEMORYUSING RID_STR_DLG_START + 5 -#define STR_ADABAS_ERROR_SYSTEMTABLES RID_STR_DLG_START + 6 -#define STR_ERROR_PASSWORDS_NOT_IDENTICAL RID_STR_DLG_START + 7 -#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME RID_STR_DLG_START + 8 -#define STR_DATASOURCE_DEFAULTNAME RID_STR_DLG_START + 9 -#define STR_ERR_EMPTY_DSN_NAME RID_STR_DLG_START + 10 -#define STR_ERR_USE_CONNECT_TO RID_STR_DLG_START + 11 -#define STR_ALREADYEXISTOVERWRITE RID_STR_DLG_START + 12 -#define STR_QUERY_DROP_ALL RID_STR_DLG_START + 13 -#define STR_INDEX_NAME_ALREADY_USED RID_STR_DLG_START + 14 -#define STR_ASK_FOR_DIRECTORY_CREATION RID_STR_DLG_START + 15 -#define STR_COULD_NOT_CREATE_DIRECTORY RID_STR_DLG_START + 16 -#define STR_ADDRESSBOOK_SYSTEM RID_STR_DLG_START + 17 -#define STR_ADDRESSBOOK_MOZILLA RID_STR_DLG_START + 18 -#define STR_ADDRESSBOOK_EVOLUTION RID_STR_DLG_START + 19 +#define STR_ADABAS_HELP_SYSDEVSPACE RID_STR_DLG_START +#define STR_ADABAS_HELP_TRANSACT RID_STR_DLG_START + 1 +#define STR_ADABAS_HELP_DATADEVSPACES RID_STR_DLG_START + 2 +#define STR_ADABAS_HELP_SIZE RID_STR_DLG_START + 3 +#define STR_ADABAS_HELP_FREESIZE RID_STR_DLG_START + 4 +#define STR_ADABAS_HELP_MEMORYUSING RID_STR_DLG_START + 5 +#define STR_ADABAS_ERROR_SYSTEMTABLES RID_STR_DLG_START + 6 +#define STR_ERROR_PASSWORDS_NOT_IDENTICAL RID_STR_DLG_START + 7 +#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME RID_STR_DLG_START + 8 +#define STR_DATASOURCE_DEFAULTNAME RID_STR_DLG_START + 9 +#define STR_ERR_EMPTY_DSN_NAME RID_STR_DLG_START + 10 +#define STR_ERR_USE_CONNECT_TO RID_STR_DLG_START + 11 +#define STR_ALREADYEXISTOVERWRITE RID_STR_DLG_START + 12 +#define STR_QUERY_DROP_ALL RID_STR_DLG_START + 13 +#define STR_INDEX_NAME_ALREADY_USED RID_STR_DLG_START + 14 +#define STR_ASK_FOR_DIRECTORY_CREATION RID_STR_DLG_START + 15 +#define STR_COULD_NOT_CREATE_DIRECTORY RID_STR_DLG_START + 16 +#define STR_ADDRESSBOOK_SYSTEM RID_STR_DLG_START + 17 +#define STR_ADDRESSBOOK_MOZILLA RID_STR_DLG_START + 18 +#define STR_ADDRESSBOOK_EVOLUTION RID_STR_DLG_START + 19 // FREE -#define STR_ADDRESSBOOK_LDAP RID_STR_DLG_START + 21 -#define STR_ADDRESSBOOK_OUTLOOK RID_STR_DLG_START + 22 -#define STR_COMMAND_EXECUTED_SUCCESSFULLY RID_STR_DLG_START + 23 -#define STR_DIRECTSQL_CONNECTIONLOST RID_STR_DLG_START + 24 -#define STR_HINT_READONLY_CONNECTION RID_STR_DLG_START + 25 -#define STR_HINT_CONNECTION_NOT_CAPABLE RID_STR_DLG_START + 26 -#define STR_USERADMIN_NOT_AVAILABLE RID_STR_DLG_START + 27 -#define STR_TAB_INDEX_SORTORDER RID_STR_DLG_START + 28 -#define STR_TAB_INDEX_FIELD RID_STR_DLG_START + 29 -#define STR_ORDER_ASCENDING RID_STR_DLG_START + 30 -#define STR_ORDER_DESCENDING RID_STR_DLG_START + 31 -#define STR_CONFIRM_DROP_INDEX RID_STR_DLG_START + 32 -#define STR_LOGICAL_INDEX_NAME RID_STR_DLG_START + 33 -#define STR_CONNECTION_TEST RID_STR_DLG_START + 34 -#define STR_CONNECTION_SUCCESS RID_STR_DLG_START + 35 +#define STR_ADDRESSBOOK_LDAP RID_STR_DLG_START + 21 +#define STR_ADDRESSBOOK_OUTLOOK RID_STR_DLG_START + 22 +#define STR_COMMAND_EXECUTED_SUCCESSFULLY RID_STR_DLG_START + 23 +#define STR_DIRECTSQL_CONNECTIONLOST RID_STR_DLG_START + 24 +#define STR_HINT_READONLY_CONNECTION RID_STR_DLG_START + 25 +#define STR_HINT_CONNECTION_NOT_CAPABLE RID_STR_DLG_START + 26 +#define STR_USERADMIN_NOT_AVAILABLE RID_STR_DLG_START + 27 +#define STR_TAB_INDEX_SORTORDER RID_STR_DLG_START + 28 +#define STR_TAB_INDEX_FIELD RID_STR_DLG_START + 29 +#define STR_ORDER_ASCENDING RID_STR_DLG_START + 30 +#define STR_ORDER_DESCENDING RID_STR_DLG_START + 31 +#define STR_CONFIRM_DROP_INDEX RID_STR_DLG_START + 32 +#define STR_LOGICAL_INDEX_NAME RID_STR_DLG_START + 33 +#define STR_CONNECTION_TEST RID_STR_DLG_START + 34 +#define STR_CONNECTION_SUCCESS RID_STR_DLG_START + 35 // FREE -#define STR_JDBCDRIVER_SUCCESS RID_STR_DLG_START + 37 -#define STR_JDBCDRIVER_NO_SUCCESS RID_STR_DLG_START + 38 -#define STR_MSACCESS_FILTERNAME RID_STR_DLG_START + 39 -#define STR_CONNECTION_NO_SUCCESS RID_STR_DLG_START + 40 -#define STR_DBASE_PATH_OR_FILE RID_STR_DLG_START + 41 -#define STR_TEXT_PATH_OR_FILE RID_STR_DLG_START + 45 -#define STR_FLAT_PATH_OR_FILE RID_STR_DLG_START + 46 -#define STR_CALC_PATH_OR_FILE RID_STR_DLG_START + 47 -#define STR_NAME_OF_ODBC_DATASOURCE RID_STR_DLG_START + 48 -#define STR_MYSQL_DATABASE_NAME RID_STR_DLG_START + 49 -#define STR_ORACLE_DATABASE_NAME RID_STR_DLG_START + 50 -#define STR_ADABAS_DATABASE_NAME RID_STR_DLG_START + 51 -#define STR_MSACCESS_MDB_FILE RID_STR_DLG_START + 52 -#define STR_COMMONURL RID_STR_DLG_START + 53 -#define STR_DATABASEDEFAULTNAME RID_STR_DLG_START + 54 -#define STR_NO_ADABASE_DATASOURCES RID_STR_DLG_START + 55 -#define STR_NO_ADDITIONAL_SETTINGS RID_STR_DLG_START + 56 +#define STR_JDBCDRIVER_SUCCESS RID_STR_DLG_START + 37 +#define STR_JDBCDRIVER_NO_SUCCESS RID_STR_DLG_START + 38 +#define STR_MSACCESS_FILTERNAME RID_STR_DLG_START + 39 +#define STR_CONNECTION_NO_SUCCESS RID_STR_DLG_START + 40 +#define STR_DBASE_PATH_OR_FILE RID_STR_DLG_START + 41 +#define STR_TEXT_PATH_OR_FILE RID_STR_DLG_START + 45 +#define STR_FLAT_PATH_OR_FILE RID_STR_DLG_START + 46 +#define STR_CALC_PATH_OR_FILE RID_STR_DLG_START + 47 +#define STR_NAME_OF_ODBC_DATASOURCE RID_STR_DLG_START + 48 +#define STR_MYSQL_DATABASE_NAME RID_STR_DLG_START + 49 +#define STR_ORACLE_DATABASE_NAME RID_STR_DLG_START + 50 +#define STR_ADABAS_DATABASE_NAME RID_STR_DLG_START + 51 +#define STR_MSACCESS_MDB_FILE RID_STR_DLG_START + 52 +#define STR_COMMONURL RID_STR_DLG_START + 53 +#define STR_DATABASEDEFAULTNAME RID_STR_DLG_START + 54 +#define STR_NO_ADABASE_DATASOURCES RID_STR_DLG_START + 55 +#define STR_NO_ADDITIONAL_SETTINGS RID_STR_DLG_START + 56 #define STR_HOSTNAME RID_STR_DLG_START + 57 -#define STR_ADDRESSBOOK_THUNDERBIRD RID_STR_DLG_START + 58 +#define STR_ADDRESSBOOK_THUNDERBIRD RID_STR_DLG_START + 58 #define STR_MOZILLA_PROFILE_NAME RID_STR_DLG_START + 59 #define STR_THUNDERBIRD_PROFILE_NAME RID_STR_DLG_START + 60 #define STR_EXPLAN_STRINGCONVERSION_ERROR RID_STR_DLG_START + 61 diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc index 04017faab8f0..dcf86cdf04b4 100644 --- a/dbaccess/source/ui/inc/dbu_misc.hrc +++ b/dbaccess/source/ui/inc/dbu_misc.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,22 +33,22 @@ // free // free -#define STR_WIZ_COLUMN_SELECT_TITEL RID_STR_MISC_START + 2 -#define STR_WIZ_TYPE_SELECT_TITEL RID_STR_MISC_START + 3 -#define STR_WIZ_PKEY_ALREADY_DEFINED RID_STR_MISC_START + 4 -#define STR_WIZ_NAME_MATCHING_TITEL RID_STR_MISC_START + 5 -#define STR_WIZ_TABLE_COPY RID_STR_MISC_START + 6 -#define STR_COPYTABLE_TITLE_COPY RID_STR_MISC_START + 7 -#define STR_COULDNOTOPEN_LINKEDDOC RID_STR_MISC_START + 8 +#define STR_WIZ_COLUMN_SELECT_TITEL RID_STR_MISC_START + 2 +#define STR_WIZ_TYPE_SELECT_TITEL RID_STR_MISC_START + 3 +#define STR_WIZ_PKEY_ALREADY_DEFINED RID_STR_MISC_START + 4 +#define STR_WIZ_NAME_MATCHING_TITEL RID_STR_MISC_START + 5 +#define STR_WIZ_TABLE_COPY RID_STR_MISC_START + 6 +#define STR_COPYTABLE_TITLE_COPY RID_STR_MISC_START + 7 +#define STR_COULDNOTOPEN_LINKEDDOC RID_STR_MISC_START + 8 #define STR_SUGGEST_APPEND_TABLE_DATA RID_STR_MISC_START + 9 -#define STR_UNDO_COLON RID_STR_MISC_START + 10 -#define STR_REDO_COLON RID_STR_MISC_START + 11 -#define STR_UNKNOWN_TYPE_FOUND RID_STR_MISC_START + 12 +#define STR_UNDO_COLON RID_STR_MISC_START + 10 +#define STR_REDO_COLON RID_STR_MISC_START + 11 +#define STR_UNKNOWN_TYPE_FOUND RID_STR_MISC_START + 12 #define STR_FILE_DOES_NOT_EXIST RID_STR_MISC_START + 13 #define STR_WARNINGS_DURING_CONNECT RID_STR_MISC_START + 14 #define STR_NAMED_OBJECT_ALREADY_EXISTS RID_STR_MISC_START + 15 -#define STR_INVALID_TABLE_NAME RID_STR_MISC_START + 16 -#define STR_INVALID_TABLE_NAME_LENGTH RID_STR_MISC_START + 17 +#define STR_INVALID_TABLE_NAME RID_STR_MISC_START + 16 +#define STR_INVALID_TABLE_NAME_LENGTH RID_STR_MISC_START + 17 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc index 26bd4c82b374..04b2daa5da66 100644 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ b/dbaccess/source/ui/inc/dbu_qry.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,50 +32,50 @@ #endif -#define STR_QRY_FUNCTIONS RID_STR_QRY_START -#define STR_QRY_SORTTEXT RID_STR_QRY_START + 1 -#define STR_QUERY_UNDO_MOVETABWIN RID_STR_QRY_START + 2 -#define STR_QUERY_UNDO_SIZETABWIN RID_STR_QRY_START + 3 -#define STR_QUERY_UNDO_INSERTCONNECTION RID_STR_QRY_START + 4 -#define STR_QUERY_UNDO_REMOVECONNECTION RID_STR_QRY_START + 5 -#define STR_QUERY_UNDO_TABWINSHOW RID_STR_QRY_START + 6 -#define STR_QUERY_UNDO_TABWINDELETE RID_STR_QRY_START + 7 -#define STR_QUERY_UNDO_MODIFY_CELL RID_STR_QRY_START + 8 -#define STR_QUERY_UNDO_SIZE_COLUMN RID_STR_QRY_START + 9 -#define STR_QUERY_UNDO_TABFIELDDELETE RID_STR_QRY_START + 10 -#define STR_QUERY_UNDO_TABFIELDCREATE RID_STR_QRY_START + 11 -#define STR_QRY_TOOCOMPLEX RID_STR_QRY_START + 12 -#define RID_STR_TABLE_DOESNT_EXIST RID_STR_QRY_START + 13 -#define RID_STR_FIELD_DOESNT_EXIST RID_STR_QRY_START + 14 -#define RID_STR_TOMUCHTABLES RID_STR_QRY_START + 15 -#define STR_QUERY_INNER_JOIN RID_STR_QRY_START + 16 -#define STR_QUERY_LEFTRIGHT_JOIN RID_STR_QRY_START + 17 -#define STR_QUERY_FULL_JOIN RID_STR_QRY_START + 18 -#define STR_QUERY_SORTTEXT RID_STR_QRY_START + 19 -#define STR_QUERY_FUNCTIONS RID_STR_QRY_START + 20 -#define STR_QUERY_NOTABLE RID_STR_QRY_START + 21 -#define STR_QRY_ORDERBY_UNRELATED RID_STR_QRY_START + 22 -#define STR_QUERY_HANDLETEXT RID_STR_QRY_START + 23 -#define STR_QUERY_FALSE RID_STR_QRY_START + 24 -#define STR_QUERY_TRUE RID_STR_QRY_START + 25 -#define STR_QRY_TOO_MANY_COLUMNS RID_STR_QRY_START + 26 -#define STR_SVT_SQL_SYNTAX_ERROR RID_STR_QRY_START + 27 -#define STR_QUERYDESIGN_NO_VIEW_SUPPORT RID_STR_QRY_START + 28 -#define STR_QUERYDESIGN_NO_VIEW_ASK RID_STR_QRY_START + 29 -#define STR_QRY_NOSELECT RID_STR_QRY_START + 30 -#define STR_QRY_COLUMN_NOT_FOUND RID_STR_QRY_START + 31 -#define STR_QRY_JOIN_COLUMN_COMPARE RID_STR_QRY_START + 32 -#define STR_QRY_LIKE_LEFT_NO_COLUMN RID_STR_QRY_START + 33 -#define STR_QRY_CHECK_CASESENSITIVE RID_STR_QRY_START + 34 -#define STR_QUERY_UNDO_TABFIELDMOVED RID_STR_QRY_START + 35 -#define STR_QRY_ILLEGAL_JOIN RID_STR_QRY_START + 36 -#define STR_QRY_TOO_LONG_STATEMENT RID_STR_QRY_START + 37 -#define STR_QRY_SYNTAX RID_STR_QRY_START + 38 -#define STR_QRY_NATIVE RID_STR_QRY_START + 39 -#define STR_QRY_TOO_MANY_TABLES RID_STR_QRY_START + 40 -#define STR_QRY_TOOMANYCOND RID_STR_QRY_START + 41 -#define STR_QUERYDESIGN RID_STR_QRY_START + 42 -#define STR_VIEWDESIGN RID_STR_QRY_START + 43 +#define STR_QRY_FUNCTIONS RID_STR_QRY_START +#define STR_QRY_SORTTEXT RID_STR_QRY_START + 1 +#define STR_QUERY_UNDO_MOVETABWIN RID_STR_QRY_START + 2 +#define STR_QUERY_UNDO_SIZETABWIN RID_STR_QRY_START + 3 +#define STR_QUERY_UNDO_INSERTCONNECTION RID_STR_QRY_START + 4 +#define STR_QUERY_UNDO_REMOVECONNECTION RID_STR_QRY_START + 5 +#define STR_QUERY_UNDO_TABWINSHOW RID_STR_QRY_START + 6 +#define STR_QUERY_UNDO_TABWINDELETE RID_STR_QRY_START + 7 +#define STR_QUERY_UNDO_MODIFY_CELL RID_STR_QRY_START + 8 +#define STR_QUERY_UNDO_SIZE_COLUMN RID_STR_QRY_START + 9 +#define STR_QUERY_UNDO_TABFIELDDELETE RID_STR_QRY_START + 10 +#define STR_QUERY_UNDO_TABFIELDCREATE RID_STR_QRY_START + 11 +#define STR_QRY_TOOCOMPLEX RID_STR_QRY_START + 12 +#define RID_STR_TABLE_DOESNT_EXIST RID_STR_QRY_START + 13 +#define RID_STR_FIELD_DOESNT_EXIST RID_STR_QRY_START + 14 +#define RID_STR_TOMUCHTABLES RID_STR_QRY_START + 15 +#define STR_QUERY_INNER_JOIN RID_STR_QRY_START + 16 +#define STR_QUERY_LEFTRIGHT_JOIN RID_STR_QRY_START + 17 +#define STR_QUERY_FULL_JOIN RID_STR_QRY_START + 18 +#define STR_QUERY_SORTTEXT RID_STR_QRY_START + 19 +#define STR_QUERY_FUNCTIONS RID_STR_QRY_START + 20 +#define STR_QUERY_NOTABLE RID_STR_QRY_START + 21 +#define STR_QRY_ORDERBY_UNRELATED RID_STR_QRY_START + 22 +#define STR_QUERY_HANDLETEXT RID_STR_QRY_START + 23 +#define STR_QUERY_FALSE RID_STR_QRY_START + 24 +#define STR_QUERY_TRUE RID_STR_QRY_START + 25 +#define STR_QRY_TOO_MANY_COLUMNS RID_STR_QRY_START + 26 +#define STR_SVT_SQL_SYNTAX_ERROR RID_STR_QRY_START + 27 +#define STR_QUERYDESIGN_NO_VIEW_SUPPORT RID_STR_QRY_START + 28 +#define STR_QUERYDESIGN_NO_VIEW_ASK RID_STR_QRY_START + 29 +#define STR_QRY_NOSELECT RID_STR_QRY_START + 30 +#define STR_QRY_COLUMN_NOT_FOUND RID_STR_QRY_START + 31 +#define STR_QRY_JOIN_COLUMN_COMPARE RID_STR_QRY_START + 32 +#define STR_QRY_LIKE_LEFT_NO_COLUMN RID_STR_QRY_START + 33 +#define STR_QRY_CHECK_CASESENSITIVE RID_STR_QRY_START + 34 +#define STR_QUERY_UNDO_TABFIELDMOVED RID_STR_QRY_START + 35 +#define STR_QRY_ILLEGAL_JOIN RID_STR_QRY_START + 36 +#define STR_QRY_TOO_LONG_STATEMENT RID_STR_QRY_START + 37 +#define STR_QRY_SYNTAX RID_STR_QRY_START + 38 +#define STR_QRY_NATIVE RID_STR_QRY_START + 39 +#define STR_QRY_TOO_MANY_TABLES RID_STR_QRY_START + 40 +#define STR_QRY_TOOMANYCOND RID_STR_QRY_START + 41 +#define STR_QUERYDESIGN RID_STR_QRY_START + 42 +#define STR_VIEWDESIGN RID_STR_QRY_START + 43 #define STR_JOIN_TYPE_HINT RID_STR_QRY_START + 44 #define STR_QUERY_SAVEMODIFIED RID_STR_QRY_START + 45 #define STR_ERROR_PARSING_STATEMENT RID_STR_QRY_START + 46 diff --git a/dbaccess/source/ui/inc/dbu_rel.hrc b/dbaccess/source/ui/inc/dbu_rel.hrc index 8a08e160171c..b53c752e619e 100644 --- a/dbaccess/source/ui/inc/dbu_rel.hrc +++ b/dbaccess/source/ui/inc/dbu_rel.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,13 +32,13 @@ #endif -#define STR_QUERY_REL_EDIT_RELATION RID_STR_REL_START -#define STR_RELATIONDESIGN RID_STR_REL_START + 1 -#define STR_RELATIONDESIGN_NOT_AVAILABLE RID_STR_REL_START + 2 -#define STR_QUERY_REL_DELETE_WINDOW RID_STR_REL_START + 3 -#define STR_QUERY_REL_EDIT RID_STR_REL_START + 4 -#define STR_QUERY_REL_CREATE RID_STR_REL_START + 5 -#define STR_QUERY_REL_COULD_NOT_CREATE RID_STR_REL_START + 6 +#define STR_QUERY_REL_EDIT_RELATION RID_STR_REL_START +#define STR_RELATIONDESIGN RID_STR_REL_START + 1 +#define STR_RELATIONDESIGN_NOT_AVAILABLE RID_STR_REL_START + 2 +#define STR_QUERY_REL_DELETE_WINDOW RID_STR_REL_START + 3 +#define STR_QUERY_REL_EDIT RID_STR_REL_START + 4 +#define STR_QUERY_REL_CREATE RID_STR_REL_START + 5 +#define STR_QUERY_REL_COULD_NOT_CREATE RID_STR_REL_START + 6 // please adjust checking before insert new strings #if STR_QUERY_REL_COULD_NOT_CREATE > RID_STR_REL_END diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index be49adc0e518..8228be7bbcbf 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,51 +32,51 @@ #include <svl/solar.hrc> #endif -#define RID_DIALOG_START RID_DBACCESS_START -#define RID_PAGE_START RID_DBACCESS_START -#define RID_ERRORBOX_START RID_DBACCESS_START -#define RID_QUERYBOX_START RID_DBACCESS_START -#define RID_TOOLBOX_START RID_DBACCESS_START -#define RID_BITMAP_START RID_DBACCESS_START -#define RID_IMAGE_START RID_DBACCESS_START -#define RID_IMAGELIST_START RID_DBACCESS_START -#define RID_MENU_START RID_DBACCESS_START -#define RID_STRING_START RID_DBACCESS_START -#define RID_UNTYPED_START RID_DBACCESS_START -#define RID_WARN_START RID_DBACCESS_START -#define RID_CONTROL_START RID_DBACCESS_START +#define RID_DIALOG_START RID_DBACCESS_START +#define RID_PAGE_START RID_DBACCESS_START +#define RID_ERRORBOX_START RID_DBACCESS_START +#define RID_QUERYBOX_START RID_DBACCESS_START +#define RID_TOOLBOX_START RID_DBACCESS_START +#define RID_BITMAP_START RID_DBACCESS_START +#define RID_IMAGE_START RID_DBACCESS_START +#define RID_IMAGELIST_START RID_DBACCESS_START +#define RID_MENU_START RID_DBACCESS_START +#define RID_STRING_START RID_DBACCESS_START +#define RID_UNTYPED_START RID_DBACCESS_START +#define RID_WARN_START RID_DBACCESS_START +#define RID_CONTROL_START RID_DBACCESS_START #define RID_MISC_START RID_DBACCESS_START // new defines to make the strings folder specific -#define RID_STR_BRW_START RID_DBACCESS_START -#define RID_STR_BRW_END RID_STR_BRW_START + 40 // 0 - 39 +#define RID_STR_BRW_START RID_DBACCESS_START +#define RID_STR_BRW_END RID_STR_BRW_START + 40 // 0 - 39 -#define RID_STR_CONTROL_START RID_STR_BRW_END -#define RID_STR_CONTROL_END RID_STR_CONTROL_START + 30 // 40 - 69 +#define RID_STR_CONTROL_START RID_STR_BRW_END +#define RID_STR_CONTROL_END RID_STR_CONTROL_START + 30 // 40 - 69 -#define RID_STR_DLG_START RID_STR_CONTROL_END -#define RID_STR_DLG_END RID_STR_DLG_START + 80 // 70 - 149 +#define RID_STR_DLG_START RID_STR_CONTROL_END +#define RID_STR_DLG_END RID_STR_DLG_START + 80 // 70 - 149 -#define RID_STR_MISC_START RID_STR_DLG_END -#define RID_STR_MISC_END RID_STR_MISC_START + 20 // 150 - 169 +#define RID_STR_MISC_START RID_STR_DLG_END +#define RID_STR_MISC_END RID_STR_MISC_START + 20 // 150 - 169 -#define RID_STR_QRY_START RID_STR_MISC_END -#define RID_STR_QRY_END RID_STR_QRY_START + 80 // 170 - 249 +#define RID_STR_QRY_START RID_STR_MISC_END +#define RID_STR_QRY_END RID_STR_QRY_START + 80 // 170 - 249 -#define RID_STR_TBL_START RID_STR_QRY_END -#define RID_STR_TBL_END RID_STR_TBL_START + 80 // 250 - 329 +#define RID_STR_TBL_START RID_STR_QRY_END +#define RID_STR_TBL_END RID_STR_TBL_START + 80 // 250 - 329 -#define RID_STR_REL_START RID_STR_TBL_END -#define RID_STR_REL_END RID_STR_REL_START + 10 // 330 - 349 +#define RID_STR_REL_START RID_STR_TBL_END +#define RID_STR_REL_END RID_STR_REL_START + 10 // 330 - 349 -#define RID_STR_UNO_START RID_STR_REL_END -#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 350 - 369 +#define RID_STR_UNO_START RID_STR_REL_END +#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 350 - 369 -#define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 55 // 370 - 424 +#define RID_STR_GEN_START RID_STR_UNO_END +#define RID_STR_GEN_END RID_STR_GEN_START + 55 // 370 - 424 -#define RID_STR_APP_START RID_STR_GEN_END -#define RID_STR_APP_END RID_STR_APP_START + 40 // 425 - 464 +#define RID_STR_APP_START RID_STR_GEN_END +#define RID_STR_APP_END RID_STR_APP_START + 40 // 425 - 464 #if RID_STR_GEN_END > RID_DBACCESS_END @@ -86,84 +86,84 @@ //======================================================================== // dialog ids -#define DLG_DATABASE_ADMINISTRATION RID_DIALOG_START + 0 -#define DLG_DBASE_INDEXES RID_DIALOG_START + 1 -#define DLG_SQLMESSAGE RID_DIALOG_START + 2 -#define DLG_SQLEXCEPTIONCHAIN RID_DIALOG_START + 3 -#define DLG_DATASOURCE_SELECTION RID_DIALOG_START + 4 -#define DLG_PARAMETERS RID_DIALOG_START + 5 -#define DLG_FILTERCRIT RID_DIALOG_START + 6 -#define DLG_ORDERCRIT RID_DIALOG_START + 7 -#define DLG_ROWHEIGHT RID_DIALOG_START + 8 -#define DLG_COLWIDTH RID_DIALOG_START + 9 -#define DLG_ATTR RID_DIALOG_START + 10 -#define DLG_SAVE_AS RID_DIALOG_START + 11 -#define DLG_ERROR RID_DIALOG_START + 12 -#define DLG_TEXT RID_DIALOG_START + 13 -#define DLG_JOIN_TABADD RID_DIALOG_START + 14 -#define DLG_QRY_JOIN RID_DIALOG_START + 15 -#define WIZ_RTFCOPYTABLE RID_DIALOG_START + 16 -#define DLG_REL_PROPERTIES RID_DIALOG_START + 17 -#define DLG_ADABASSTAT RID_DIALOG_START + 18 -#define DLG_INDEXDESIGN RID_DIALOG_START + 19 -#define DLG_DATABASE_ADABASADMIN RID_DIALOG_START + 20 -#define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21 -#define DLG_DIRECTSQL RID_DIALOG_START + 22 -#define DLG_PASSWORD RID_DIALOG_START + 23 -#define DLG_DOMAINPASSWORD RID_DIALOG_START + 24 -#define DLG_RENAME RID_DIALOG_START + 25 -#define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26 -#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27 -#define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28 -#define DLG_DATABASE_WIZARD RID_DIALOG_START + 29 +#define DLG_DATABASE_ADMINISTRATION RID_DIALOG_START + 0 +#define DLG_DBASE_INDEXES RID_DIALOG_START + 1 +#define DLG_SQLMESSAGE RID_DIALOG_START + 2 +#define DLG_SQLEXCEPTIONCHAIN RID_DIALOG_START + 3 +#define DLG_DATASOURCE_SELECTION RID_DIALOG_START + 4 +#define DLG_PARAMETERS RID_DIALOG_START + 5 +#define DLG_FILTERCRIT RID_DIALOG_START + 6 +#define DLG_ORDERCRIT RID_DIALOG_START + 7 +#define DLG_ROWHEIGHT RID_DIALOG_START + 8 +#define DLG_COLWIDTH RID_DIALOG_START + 9 +#define DLG_ATTR RID_DIALOG_START + 10 +#define DLG_SAVE_AS RID_DIALOG_START + 11 +#define DLG_ERROR RID_DIALOG_START + 12 +#define DLG_TEXT RID_DIALOG_START + 13 +#define DLG_JOIN_TABADD RID_DIALOG_START + 14 +#define DLG_QRY_JOIN RID_DIALOG_START + 15 +#define WIZ_RTFCOPYTABLE RID_DIALOG_START + 16 +#define DLG_REL_PROPERTIES RID_DIALOG_START + 17 +#define DLG_ADABASSTAT RID_DIALOG_START + 18 +#define DLG_INDEXDESIGN RID_DIALOG_START + 19 +#define DLG_DATABASE_ADABASADMIN RID_DIALOG_START + 20 +#define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21 +#define DLG_DIRECTSQL RID_DIALOG_START + 22 +#define DLG_PASSWORD RID_DIALOG_START + 23 +#define DLG_DOMAINPASSWORD RID_DIALOG_START + 24 +#define DLG_RENAME RID_DIALOG_START + 25 +#define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26 +#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27 +#define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28 +#define DLG_DATABASE_WIZARD RID_DIALOG_START + 29 #define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 #define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31 //======================================================================== // tab pages -#define PAGE_GENERAL RID_PAGE_START + 0 -#define PAGE_DBASE RID_PAGE_START + 1 -#define PAGE_ODBC RID_PAGE_START + 3 -#define PAGE_TEXT RID_PAGE_START + 4 -#define PAGE_ADABAS RID_PAGE_START + 5 -#define PAGE_CONNECTION RID_PAGE_START + 6 -#define PAGE_ADO RID_PAGE_START + 7 -#define PAGE_QUERYADMINISTRATION RID_PAGE_START + 8 -#define TAB_WIZ_COLUMN_SELECT RID_PAGE_START + 9 -#define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10 -#define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11 -#define TAB_WIZ_COPYTABLE RID_PAGE_START + 12 -#define TAB_PAG_ADABAS_SETTINGS RID_PAGE_START + 13 +#define PAGE_GENERAL RID_PAGE_START + 0 +#define PAGE_DBASE RID_PAGE_START + 1 +#define PAGE_ODBC RID_PAGE_START + 3 +#define PAGE_TEXT RID_PAGE_START + 4 +#define PAGE_ADABAS RID_PAGE_START + 5 +#define PAGE_CONNECTION RID_PAGE_START + 6 +#define PAGE_ADO RID_PAGE_START + 7 +#define PAGE_QUERYADMINISTRATION RID_PAGE_START + 8 +#define TAB_WIZ_COLUMN_SELECT RID_PAGE_START + 9 +#define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10 +#define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11 +#define TAB_WIZ_COPYTABLE RID_PAGE_START + 12 +#define TAB_PAG_ADABAS_SETTINGS RID_PAGE_START + 13 // free -#define PAGE_LDAP RID_PAGE_START + 15 -#define TAB_PAGE_USERADMIN RID_PAGE_START + 16 -#define PAGE_MYSQL_ODBC RID_PAGE_START + 17 -#define TAB_PAGE_TABLEPRIVILEGES RID_PAGE_START + 18 -#define PAGE_USERDRIVER RID_PAGE_START + 19 -#define PAGE_MYSQL_JDBC RID_PAGE_START + 20 -#define PAGE_GENERATED_VALUES RID_PAGE_START + 22 +#define PAGE_LDAP RID_PAGE_START + 15 +#define TAB_PAGE_USERADMIN RID_PAGE_START + 16 +#define PAGE_MYSQL_ODBC RID_PAGE_START + 17 +#define TAB_PAGE_TABLEPRIVILEGES RID_PAGE_START + 18 +#define PAGE_USERDRIVER RID_PAGE_START + 19 +#define PAGE_MYSQL_JDBC RID_PAGE_START + 20 +#define PAGE_GENERATED_VALUES RID_PAGE_START + 22 #define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23 #define PAGE_MYSQL_NATIVE RID_PAGE_START + 24 // FREE // FREE -#define PAGE_ORACLE_JDBC RID_PAGE_START + 27 -#define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28 +#define PAGE_ORACLE_JDBC RID_PAGE_START + 27 +#define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28 // FREE // FREE // FREE -#define PAGE_MOZILLA RID_PAGE_START + 32 +#define PAGE_MOZILLA RID_PAGE_START + 32 #define PAGE_DS_ORACLE_ADVANCED_SETTINGS RID_PAGE_START + 33 #define PAGE_DBWIZARD_INTRO RID_PAGE_START + 40 -#define PAGE_DBWIZARD_DBASE RID_PAGE_START + 41 +#define PAGE_DBWIZARD_DBASE RID_PAGE_START + 41 #define PAGE_DBWIZARD_TEXT RID_PAGE_START + 42 #define PAGE_DBWIZARD_MSACCESS RID_PAGE_START + 43 #define PAGE_DBWIZARD_LDAP RID_PAGE_START + 44 #define PAGE_DBWIZARD_ADABAS RID_PAGE_START + 45 #define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START + 46 -#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47 +#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47 #define PAGE_DBWIZARD_ORACLE RID_PAGE_START + 48 #define PAGE_DBWIZARD_JDBC RID_PAGE_START + 49 #define PAGE_DBWIZARD_ADO RID_PAGE_START + 50 @@ -172,44 +172,44 @@ #define PAGE_DBWIZARD_AUTHENTIFICATION RID_PAGE_START + 53 #define PAGE_DBWIZARD_MYSQL_JDBC RID_PAGE_START + 54 #define PAGE_DBWIZARD_FINAL RID_PAGE_START + 55 -#define PAGE_DBWIZARD_USERDEFINED RID_PAGE_START + 56 -#define PAGE_DBWIZARD_MYSQL_NATIVE RID_PAGE_START + 57 +#define PAGE_DBWIZARD_USERDEFINED RID_PAGE_START + 56 +#define PAGE_DBWIZARD_MYSQL_NATIVE RID_PAGE_START + 57 //======================================================================== // error boxes -#define ERR_NOREGISTEREDDATASOURCES RID_ERRORBOX_START + 0 +#define ERR_NOREGISTEREDDATASOURCES RID_ERRORBOX_START + 0 // free -#define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2 -#define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3 -#define ERR_QRY_AMB_FIELD RID_ERRORBOX_START + 4 +#define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2 +#define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3 +#define ERR_QRY_AMB_FIELD RID_ERRORBOX_START + 4 // FREE -#define ERR_INVALID_LISTBOX_ENTRY RID_ERRORBOX_START + 6 +#define ERR_INVALID_LISTBOX_ENTRY RID_ERRORBOX_START + 6 // FREE -#define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8 -#define ERR_QRY_NOSTATEMENT RID_ERRORBOX_START + 9 -#define ERR_QRY_NOCRITERIA RID_ERRORBOX_START + 10 -#define ERR_CANTDOTABLEACTION RID_ERRORBOX_START + 11 +#define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8 +#define ERR_QRY_NOSTATEMENT RID_ERRORBOX_START + 9 +#define ERR_QRY_NOCRITERIA RID_ERRORBOX_START + 10 +#define ERR_CANTDOTABLEACTION RID_ERRORBOX_START + 11 //======================================================================== // query boxes -#define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0 -#define QUERY_BRW_SAVEMODIFIED RID_QUERYBOX_START + 1 -#define QUERY_CONNECTION_LOST RID_QUERYBOX_START + 2 -#define QUERY_BRW_DELETE_QUERY_CONFIRM RID_QUERYBOX_START + 3 -#define APP_SAVEMODIFIED RID_QUERYBOX_START + 4 -#define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5 -#define TABLE_QUERY_CONNECTION_LOST RID_QUERYBOX_START + 6 -#define QUERY_SAVE_CURRENT_INDEX RID_QUERYBOX_START + 7 -#define QUERY_SAVE_TABLE_EDIT_INDEXES RID_QUERYBOX_START + 8 -#define RELATION_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 9 +#define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0 +#define QUERY_BRW_SAVEMODIFIED RID_QUERYBOX_START + 1 +#define QUERY_CONNECTION_LOST RID_QUERYBOX_START + 2 +#define QUERY_BRW_DELETE_QUERY_CONFIRM RID_QUERYBOX_START + 3 +#define APP_SAVEMODIFIED RID_QUERYBOX_START + 4 +#define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5 +#define TABLE_QUERY_CONNECTION_LOST RID_QUERYBOX_START + 6 +#define QUERY_SAVE_CURRENT_INDEX RID_QUERYBOX_START + 7 +#define QUERY_SAVE_TABLE_EDIT_INDEXES RID_QUERYBOX_START + 8 +#define RELATION_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 9 // FREE -#define APP_CLOSEDOCUMENTS RID_QUERYBOX_START + 11 -#define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12 -#define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13 +#define APP_CLOSEDOCUMENTS RID_QUERYBOX_START + 11 +#define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12 +#define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13 @@ -221,166 +221,166 @@ //======================================================================== // toolboxes -#define RID_BRW_TAB_TOOLBOX RID_TOOLBOX_START + 0 -#define RID_BRW_QRY_TOOLBOX RID_TOOLBOX_START + 1 -#define RID_QRY_TOOLBOX_SQL RID_TOOLBOX_START + 2 -#define RID_BRW_QUERYDESIGN_TOOLBOX RID_TOOLBOX_START + 3 -#define RID_BRW_REALTIONDESIGN_TOOLBOX RID_TOOLBOX_START + 4 -#define RID_BRW_APPLICATION_TOOLBOX RID_TOOLBOX_START + 5 +#define RID_BRW_TAB_TOOLBOX RID_TOOLBOX_START + 0 +#define RID_BRW_QRY_TOOLBOX RID_TOOLBOX_START + 1 +#define RID_QRY_TOOLBOX_SQL RID_TOOLBOX_START + 2 +#define RID_BRW_QUERYDESIGN_TOOLBOX RID_TOOLBOX_START + 3 +#define RID_BRW_REALTIONDESIGN_TOOLBOX RID_TOOLBOX_START + 4 +#define RID_BRW_APPLICATION_TOOLBOX RID_TOOLBOX_START + 5 //======================================================================== // bitmaps -// start with RID_BITMAP_START +// start with RID_BITMAP_START //======================================================================== // images -#define TABLE_TREE_ICON RID_IMAGE_START + 0 -#define VIEW_TREE_ICON RID_IMAGE_START + 1 -#define TABLEFOLDER_TREE_ICON RID_IMAGE_START + 2 -#define BMP_EXCEPTION_ERROR RID_IMAGE_START + 3 -#define BMP_EXCEPTION_WARNING RID_IMAGE_START + 4 -#define BMP_EXCEPTION_INFO RID_IMAGE_START + 5 -#define QUERYFOLDER_TREE_ICON RID_IMAGE_START + 6 -#define QUERY_TREE_ICON RID_IMAGE_START + 7 -#define DATABASE_TREE_ICON RID_IMAGE_START + 8 +#define TABLE_TREE_ICON RID_IMAGE_START + 0 +#define VIEW_TREE_ICON RID_IMAGE_START + 1 +#define TABLEFOLDER_TREE_ICON RID_IMAGE_START + 2 +#define BMP_EXCEPTION_ERROR RID_IMAGE_START + 3 +#define BMP_EXCEPTION_WARNING RID_IMAGE_START + 4 +#define BMP_EXCEPTION_INFO RID_IMAGE_START + 5 +#define QUERYFOLDER_TREE_ICON RID_IMAGE_START + 6 +#define QUERY_TREE_ICON RID_IMAGE_START + 7 +#define DATABASE_TREE_ICON RID_IMAGE_START + 8 // free // free // free -#define IMG_PKEYICON RID_IMAGE_START + 12 -#define REPORTFOLDER_TREE_ICON_SCH RID_IMAGE_START + 13 -#define FORMFOLDER_TREE_ICON_SCH RID_IMAGE_START + 14 -#define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15 -#define QUERYFOLDER_TREE_ICON_SCH RID_IMAGE_START + 16 -#define TABLEFOLDER_TREE_ICON_SCH RID_IMAGE_START + 17 +#define IMG_PKEYICON RID_IMAGE_START + 12 +#define REPORTFOLDER_TREE_ICON_SCH RID_IMAGE_START + 13 +#define FORMFOLDER_TREE_ICON_SCH RID_IMAGE_START + 14 +#define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15 +#define QUERYFOLDER_TREE_ICON_SCH RID_IMAGE_START + 16 +#define TABLEFOLDER_TREE_ICON_SCH RID_IMAGE_START + 17 // free -#define DATABASE_TREE_ICON_SCH RID_IMAGE_START + 19 -#define IMG_DATABASE_CONNECTED_SCH RID_IMAGE_START + 20 -#define TABLE_TREE_ICON_SCH RID_IMAGE_START + 21 -#define VIEW_TREE_ICON_SCH RID_IMAGE_START + 22 -#define QUERY_TREE_ICON_SCH RID_IMAGE_START + 23 -#define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24 +#define DATABASE_TREE_ICON_SCH RID_IMAGE_START + 19 +#define IMG_DATABASE_CONNECTED_SCH RID_IMAGE_START + 20 +#define TABLE_TREE_ICON_SCH RID_IMAGE_START + 21 +#define VIEW_TREE_ICON_SCH RID_IMAGE_START + 22 +#define QUERY_TREE_ICON_SCH RID_IMAGE_START + 23 +#define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24 // free // free // free -#define BMP_EXCEPTION_ERROR_SCH RID_IMAGE_START + 28 -#define BMP_EXCEPTION_WARNING_SCH RID_IMAGE_START + 29 -#define BMP_EXCEPTION_INFO_SCH RID_IMAGE_START + 30 -#define IMG_PKEYICON_SCH RID_IMAGE_START + 31 -#define IMG_JOINS_H RID_IMAGE_START + 32 -#define IMG_ALL_LEFT_H RID_IMAGE_START + 33 -#define IMG_ONE_LEFT_H RID_IMAGE_START + 34 -#define IMG_ONE_RIGHT_H RID_IMAGE_START + 35 -#define IMG_ALL_RIGHT_H RID_IMAGE_START + 36 -#define IMG_SORTUP_H RID_IMAGE_START + 37 -#define IMG_SORTDOWN_H RID_IMAGE_START + 38 -#define IMG_FORMFOLDER_TREE_L RID_IMAGE_START + 39 -#define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40 -#define IMG_QUERYFOLDER_TREE_L RID_IMAGE_START + 41 -#define IMG_TABLEFOLDER_TREE_L RID_IMAGE_START + 42 -#define IMG_FORMFOLDER_TREE_LHC RID_IMAGE_START + 43 -#define IMG_REPORTFOLDER_TREE_LHC RID_IMAGE_START + 44 -#define IMG_QUERYFOLDER_TREE_LHC RID_IMAGE_START + 45 -#define IMG_TABLEFOLDER_TREE_LHC RID_IMAGE_START + 46 -#define IMG_NAVIGATION_BTN_UP_SC RID_IMAGE_START + 47 -#define IMG_NAVIGATION_BTN_UP_SCH RID_IMAGE_START + 48 -#define IMG_NAVIGATION_CREATEFOLDER_SC RID_IMAGE_START + 49 -#define IMG_NAVIGATION_CREATEFOLDER_SCH RID_IMAGE_START + 50 -#define FORM_TREE_ICON RID_IMAGE_START + 51 -#define REPORT_TREE_ICON RID_IMAGE_START + 52 -#define FORM_TREE_ICON_SCH RID_IMAGE_START + 53 -#define REPORT_TREE_ICON_SCH RID_IMAGE_START + 54 -#define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55 +#define BMP_EXCEPTION_ERROR_SCH RID_IMAGE_START + 28 +#define BMP_EXCEPTION_WARNING_SCH RID_IMAGE_START + 29 +#define BMP_EXCEPTION_INFO_SCH RID_IMAGE_START + 30 +#define IMG_PKEYICON_SCH RID_IMAGE_START + 31 +#define IMG_JOINS_H RID_IMAGE_START + 32 +#define IMG_ALL_LEFT_H RID_IMAGE_START + 33 +#define IMG_ONE_LEFT_H RID_IMAGE_START + 34 +#define IMG_ONE_RIGHT_H RID_IMAGE_START + 35 +#define IMG_ALL_RIGHT_H RID_IMAGE_START + 36 +#define IMG_SORTUP_H RID_IMAGE_START + 37 +#define IMG_SORTDOWN_H RID_IMAGE_START + 38 +#define IMG_FORMFOLDER_TREE_L RID_IMAGE_START + 39 +#define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40 +#define IMG_QUERYFOLDER_TREE_L RID_IMAGE_START + 41 +#define IMG_TABLEFOLDER_TREE_L RID_IMAGE_START + 42 +#define IMG_FORMFOLDER_TREE_LHC RID_IMAGE_START + 43 +#define IMG_REPORTFOLDER_TREE_LHC RID_IMAGE_START + 44 +#define IMG_QUERYFOLDER_TREE_LHC RID_IMAGE_START + 45 +#define IMG_TABLEFOLDER_TREE_LHC RID_IMAGE_START + 46 +#define IMG_NAVIGATION_BTN_UP_SC RID_IMAGE_START + 47 +#define IMG_NAVIGATION_BTN_UP_SCH RID_IMAGE_START + 48 +#define IMG_NAVIGATION_CREATEFOLDER_SC RID_IMAGE_START + 49 +#define IMG_NAVIGATION_CREATEFOLDER_SCH RID_IMAGE_START + 50 +#define FORM_TREE_ICON RID_IMAGE_START + 51 +#define REPORT_TREE_ICON RID_IMAGE_START + 52 +#define FORM_TREE_ICON_SCH RID_IMAGE_START + 53 +#define REPORT_TREE_ICON_SCH RID_IMAGE_START + 54 +#define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55 //======================================================================== // image lists -#define IMG_JOINS RID_IMAGELIST_START + 0 -#define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1 -#define IMG_INDEX_DLG_SCH RID_IMAGELIST_START + 2 -#define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3 -#define IMG_INDEX_DLG_LCH RID_IMAGELIST_START + 4 -#define IMP_FORM_SC RID_IMAGELIST_START + 5 -#define IMP_FORM_SCH RID_IMAGELIST_START + 6 -#define IMP_FORM_LC RID_IMAGELIST_START + 7 -#define IMP_FORM_LCH RID_IMAGELIST_START + 8 -#define IMP_REPORT_SC RID_IMAGELIST_START + 9 -#define IMP_REPORT_SCH RID_IMAGELIST_START + 10 -#define IMP_REPORT_LC RID_IMAGELIST_START + 11 -#define IMP_REPORT_LCH RID_IMAGELIST_START + 12 +#define IMG_JOINS RID_IMAGELIST_START + 0 +#define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1 +#define IMG_INDEX_DLG_SCH RID_IMAGELIST_START + 2 +#define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3 +#define IMG_INDEX_DLG_LCH RID_IMAGELIST_START + 4 +#define IMP_FORM_SC RID_IMAGELIST_START + 5 +#define IMP_FORM_SCH RID_IMAGELIST_START + 6 +#define IMP_FORM_LC RID_IMAGELIST_START + 7 +#define IMP_FORM_LCH RID_IMAGELIST_START + 8 +#define IMP_REPORT_SC RID_IMAGELIST_START + 9 +#define IMP_REPORT_SCH RID_IMAGELIST_START + 10 +#define IMP_REPORT_LC RID_IMAGELIST_START + 11 +#define IMP_REPORT_LCH RID_IMAGELIST_START + 12 //======================================================================== // menues -#define MENU_TABLETREE_POPUP RID_MENU_START + 0 -#define MENU_DATASOURCELIST_POPUP RID_MENU_START + 1 -#define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2 -#define RID_SBA_GRID_ROWCTXMENU RID_MENU_START + 3 -#define MENU_BROWSERTREE_CONTEXT RID_MENU_START + 4 -#define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5 -#define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6 -#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7 -#define RID_BRW_TABLEDESIGN_TOOLBOX RID_MENU_START + 8 -#define RID_SBA_RTF_PKEYPOPUP RID_MENU_START + 9 -#define RID_MENU_APP_EDIT RID_MENU_START + 10 -#define RID_MENU_APP_NEW RID_MENU_START + 11 -#define RID_MENU_APP_PREVIEW RID_MENU_START + 12 -#define RID_NEW_FORM RID_MENU_START + 13 -#define MENU_BROWSER_DEFAULTCONTEXT RID_MENU_START + 14 -#define RID_MENU_REFRESH_DATA RID_MENU_START + 15 -#define RID_MENU_JOINVIEW_CONNECTION RID_MENU_START + 16 -#define RID_MENU_JOINVIEW_TABLE RID_MENU_START + 17 +#define MENU_TABLETREE_POPUP RID_MENU_START + 0 +#define MENU_DATASOURCELIST_POPUP RID_MENU_START + 1 +#define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2 +#define RID_SBA_GRID_ROWCTXMENU RID_MENU_START + 3 +#define MENU_BROWSERTREE_CONTEXT RID_MENU_START + 4 +#define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5 +#define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6 +#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7 +#define RID_BRW_TABLEDESIGN_TOOLBOX RID_MENU_START + 8 +#define RID_SBA_RTF_PKEYPOPUP RID_MENU_START + 9 +#define RID_MENU_APP_EDIT RID_MENU_START + 10 +#define RID_MENU_APP_NEW RID_MENU_START + 11 +#define RID_MENU_APP_PREVIEW RID_MENU_START + 12 +#define RID_NEW_FORM RID_MENU_START + 13 +#define MENU_BROWSER_DEFAULTCONTEXT RID_MENU_START + 14 +#define RID_MENU_REFRESH_DATA RID_MENU_START + 15 +#define RID_MENU_JOINVIEW_CONNECTION RID_MENU_START + 16 +#define RID_MENU_JOINVIEW_TABLE RID_MENU_START + 17 //======================================================================== // controls -#define RID_DB_TAB_EDITOR RID_CONTROL_START + 0 +#define RID_DB_TAB_EDITOR RID_CONTROL_START + 0 #define RID_MYSQL_NATIVE_SETTINGS RID_CONTROL_START + 1 //======================================================================== // strings -#define STR_TBL_TITLE RID_STR_GEN_START +#define STR_TBL_TITLE RID_STR_GEN_START #define STR_ERROR_DURING_CREATION RID_STR_GEN_START + 1 -#define RID_STR_CONNECTION_LOST RID_STR_GEN_START + 2 +#define RID_STR_CONNECTION_LOST RID_STR_GEN_START + 2 #define STR_NAME_ALREADY_EXISTS RID_STR_GEN_START + 3 // free -#define STR_TITLE_CONFIRM_DELETION RID_STR_GEN_START + 5 -#define STR_STAT_WARNING RID_STR_GEN_START + 6 -#define STR_TABLEDESIGN_DATASOURCE_DELETED RID_STR_GEN_START + 7 -#define STR_TABLEDESIGN_DBFIELDTYPES RID_STR_GEN_START + 8 -#define STR_QRY_CONTINUE RID_STR_GEN_START + 9 -#define STR_COLUMN_NAME RID_STR_GEN_START + 10 -#define STR_ERROR_OCCURED_WHILE_COPYING RID_STR_GEN_START + 11 -#define STR_MISSING_TABLES_XDROP RID_STR_GEN_START + 12 -#define STR_QUERY_DELETE_TABLE RID_STR_GEN_START + 13 -#define STR_BUTTON_TEXT_ALL RID_STR_GEN_START + 14 -#define STR_COULDNOTCREATE_DRIVERMANAGER RID_STR_GEN_START + 15 -#define STR_UNEXPECTED_ERROR RID_STR_GEN_START + 16 -#define STR_REMEMBERPASSWORD_SESSION RID_STR_GEN_START + 17 -#define STR_ENTER_CONNECTION_PASSWORD RID_STR_GEN_START + 18 -#define STR_NOREGISTEREDDRIVER RID_STR_GEN_START + 19 -#define STR_DATASOURCE_DELETED RID_STR_GEN_START + 20 -#define STR_QUERY_UNDO_MODIFYSQLEDIT RID_STR_GEN_START + 21 -#define STR_QRY_TITLE RID_STR_GEN_START + 22 -#define STR_VIEW_TITLE RID_STR_GEN_START + 23 +#define STR_TITLE_CONFIRM_DELETION RID_STR_GEN_START + 5 +#define STR_STAT_WARNING RID_STR_GEN_START + 6 +#define STR_TABLEDESIGN_DATASOURCE_DELETED RID_STR_GEN_START + 7 +#define STR_TABLEDESIGN_DBFIELDTYPES RID_STR_GEN_START + 8 +#define STR_QRY_CONTINUE RID_STR_GEN_START + 9 +#define STR_COLUMN_NAME RID_STR_GEN_START + 10 +#define STR_ERROR_OCCURED_WHILE_COPYING RID_STR_GEN_START + 11 +#define STR_MISSING_TABLES_XDROP RID_STR_GEN_START + 12 +#define STR_QUERY_DELETE_TABLE RID_STR_GEN_START + 13 +#define STR_BUTTON_TEXT_ALL RID_STR_GEN_START + 14 +#define STR_COULDNOTCREATE_DRIVERMANAGER RID_STR_GEN_START + 15 +#define STR_UNEXPECTED_ERROR RID_STR_GEN_START + 16 +#define STR_REMEMBERPASSWORD_SESSION RID_STR_GEN_START + 17 +#define STR_ENTER_CONNECTION_PASSWORD RID_STR_GEN_START + 18 +#define STR_NOREGISTEREDDRIVER RID_STR_GEN_START + 19 +#define STR_DATASOURCE_DELETED RID_STR_GEN_START + 20 +#define STR_QUERY_UNDO_MODIFYSQLEDIT RID_STR_GEN_START + 21 +#define STR_QRY_TITLE RID_STR_GEN_START + 22 +#define STR_VIEW_TITLE RID_STR_GEN_START + 23 #define STR_SUB_DOCS_WITH_SCRIPTS RID_STR_GEN_START + 24 #define STR_SUB_DOCS_WITH_SCRIPTS_DETAIL RID_STR_GEN_START + 25 -#define STR_TABLEDESIGN_DUPLICATE_NAME RID_STR_GEN_START + 26 -#define STR_COULDNOTCONNECT_DATASOURCE RID_STR_GEN_START + 27 -#define STR_NO_TABLE_FORMAT_INSIDE RID_STR_GEN_START + 28 -#define RID_STR_QUERIES_CONTAINER RID_STR_GEN_START + 29 -#define RID_STR_TABLES_CONTAINER RID_STR_GEN_START + 30 -#define STR_NEW_FOLDER RID_STR_GEN_START + 31 -#define RID_STR_FORM RID_STR_GEN_START + 32 -#define RID_STR_REPORT RID_STR_GEN_START + 33 -#define STR_FRM_LABEL RID_STR_GEN_START + 34 -#define STR_RPT_LABEL RID_STR_GEN_START + 35 -#define STR_FOLDER_LABEL RID_STR_GEN_START + 36 -#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD RID_STR_GEN_START + 37 -#define STR_TABLEDESIGN_NO_PRIM_KEY RID_STR_GEN_START + 38 +#define STR_TABLEDESIGN_DUPLICATE_NAME RID_STR_GEN_START + 26 +#define STR_COULDNOTCONNECT_DATASOURCE RID_STR_GEN_START + 27 +#define STR_NO_TABLE_FORMAT_INSIDE RID_STR_GEN_START + 28 +#define RID_STR_QUERIES_CONTAINER RID_STR_GEN_START + 29 +#define RID_STR_TABLES_CONTAINER RID_STR_GEN_START + 30 +#define STR_NEW_FOLDER RID_STR_GEN_START + 31 +#define RID_STR_FORM RID_STR_GEN_START + 32 +#define RID_STR_REPORT RID_STR_GEN_START + 33 +#define STR_FRM_LABEL RID_STR_GEN_START + 34 +#define STR_RPT_LABEL RID_STR_GEN_START + 35 +#define STR_FOLDER_LABEL RID_STR_GEN_START + 36 +#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD RID_STR_GEN_START + 37 +#define STR_TABLEDESIGN_NO_PRIM_KEY RID_STR_GEN_START + 38 // FREE #define RID_STR_EXTENSION_NOT_PRESENT RID_STR_GEN_START + 40 #define RID_STR_EXTENSION_NAME RID_STR_GEN_START + 41 @@ -389,32 +389,32 @@ // untyped resources // free -#define RSC_CHARSETS RID_UNTYPED_START + 2 +#define RSC_CHARSETS RID_UNTYPED_START + 2 // free #define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4 -#define IMG_TABLESUBCRIPTION_SC RID_UNTYPED_START + 5 -#define IMG_TABLESUBCRIPTION_SCH RID_UNTYPED_START + 6 -#define IMG_TABLESUBCRIPTION_LC RID_UNTYPED_START + 7 -#define IMG_TABLESUBCRIPTION_LCH RID_UNTYPED_START + 8 -#define IMG_QUERYADMINISTRATION_SC RID_UNTYPED_START + 9 -#define IMG_QUERYADMINISTRATION_SCH RID_UNTYPED_START + 10 -#define IMG_QUERYADMINISTRATION_LC RID_UNTYPED_START + 11 -#define IMG_QUERYADMINISTRATION_LCH RID_UNTYPED_START + 12 -#define IMG_DOCUMENTLINKS_SC RID_UNTYPED_START + 13 -#define IMG_DOCUMENTLINKS_SCH RID_UNTYPED_START + 14 -#define IMG_DOCUMENTLINKS_LC RID_UNTYPED_START + 15 -#define IMG_DOCUMENTLINKS_LCH RID_UNTYPED_START + 16 +#define IMG_TABLESUBCRIPTION_SC RID_UNTYPED_START + 5 +#define IMG_TABLESUBCRIPTION_SCH RID_UNTYPED_START + 6 +#define IMG_TABLESUBCRIPTION_LC RID_UNTYPED_START + 7 +#define IMG_TABLESUBCRIPTION_LCH RID_UNTYPED_START + 8 +#define IMG_QUERYADMINISTRATION_SC RID_UNTYPED_START + 9 +#define IMG_QUERYADMINISTRATION_SCH RID_UNTYPED_START + 10 +#define IMG_QUERYADMINISTRATION_LC RID_UNTYPED_START + 11 +#define IMG_QUERYADMINISTRATION_LCH RID_UNTYPED_START + 12 +#define IMG_DOCUMENTLINKS_SC RID_UNTYPED_START + 13 +#define IMG_DOCUMENTLINKS_SCH RID_UNTYPED_START + 14 +#define IMG_DOCUMENTLINKS_LC RID_UNTYPED_START + 15 +#define IMG_DOCUMENTLINKS_LCH RID_UNTYPED_START + 16 //======================================================================== // various -#define PB_FORMAT RID_MISC_START + 0 -#define FIXED_NO_CONNECTION RID_MISC_START + 1 -#define LB_LEFT_TABLE RID_MISC_START + 2 -#define LB_RIGHT_TABLE RID_MISC_START + 3 -#define LB_CONTROL RID_MISC_START + 4 -#define FL_INVOLVED_TABLES RID_MISC_START + 5 -#define FL_INVOLVED_FIELDS RID_MISC_START + 6 +#define PB_FORMAT RID_MISC_START + 0 +#define FIXED_NO_CONNECTION RID_MISC_START + 1 +#define LB_LEFT_TABLE RID_MISC_START + 2 +#define LB_RIGHT_TABLE RID_MISC_START + 3 +#define LB_CONTROL RID_MISC_START + 4 +#define FL_INVOLVED_TABLES RID_MISC_START + 5 +#define FL_INVOLVED_FIELDS RID_MISC_START + 6 #endif // _DBU_RESOURCE_HRC_ diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc index a0a6b2eb8736..310baa5eb512 100644 --- a/dbaccess/source/ui/inc/dbu_tbl.hrc +++ b/dbaccess/source/ui/inc/dbu_tbl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,62 +31,62 @@ #include "dbu_resource.hrc" #endif -#define STR_HELP_AUTOINCREMENT_VALUE RID_STR_TBL_START -#define STR_TABLEDESIGN_UNDO_PRIMKEY RID_STR_TBL_START + 1 -#define STR_VALUE_YES RID_STR_TBL_START + 2 -#define STR_VALUE_NO RID_STR_TBL_START + 3 -#define STR_VALUE_ASC RID_STR_TBL_START + 4 -#define STR_VALUE_DESC RID_STR_TBL_START + 5 -#define STR_VALUE_NONE RID_STR_TBL_START + 6 -#define STR_TAB_FIELD_NAME RID_STR_TBL_START + 7 -#define STR_TAB_FIELD_DATATYPE RID_STR_TBL_START + 8 -#define STR_TAB_FIELD_LENGTH RID_STR_TBL_START + 9 -#define STR_TAB_HELP_TEXT RID_STR_TBL_START + 10 -#define STR_TAB_FIELD_NULLABLE RID_STR_TBL_START + 11 -#define STR_FIELD_AUTOINCREMENT RID_STR_TBL_START + 12 -#define STR_TAB_PROPERTIES RID_STR_TBL_START + 13 -#define STR_TABPAGE_GENERAL RID_STR_TBL_START + 14 -#define STR_TAB_TABLE_DESCRIPTION RID_STR_TBL_START + 15 -#define STR_TAB_TABLE_PROPERTIES RID_STR_TBL_START + 16 -#define STR_TABED_UNDO_TYPE_CHANGED RID_STR_TBL_START + 17 -#define STR_TABED_UNDO_ROWDELETED RID_STR_TBL_START + 18 -#define STR_TABED_UNDO_ROWINSERTED RID_STR_TBL_START + 19 -#define STR_TABED_UNDO_NEWROWINSERTED RID_STR_TBL_START + 20 -#define STR_TABED_UNDO_PRIMKEY RID_STR_TBL_START + 21 -#define STR_HELP_AUTOINCREMENT RID_STR_TBL_START + 22 -#define STR_HELP_FORMAT_CODE RID_STR_TBL_START + 23 -#define STR_HELP_SCALE RID_STR_TBL_START + 24 -#define STR_HELP_LENGTH RID_STR_TBL_START + 25 -#define STR_HELP_NUMERIC_TYPE RID_STR_TBL_START + 26 -#define STR_HELP_TEXT_LENGTH RID_STR_TBL_START + 27 -#define STR_HELP_FIELD_REQUIRED RID_STR_TBL_START + 28 -#define STR_HELP_DEFAULT_VALUE RID_STR_TBL_START + 29 -#define STR_HELP_BOOL_DEFAULT RID_STR_TBL_START + 30 -#define STR_FORMAT RID_STR_TBL_START + 31 -#define STR_SCALE RID_STR_TBL_START + 32 -#define STR_LENGTH RID_STR_TBL_START + 33 -#define STR_NUMERIC_TYPE RID_STR_TBL_START + 34 -#define STR_TEXT_LENGTH RID_STR_TBL_START + 35 -#define STR_FIELD_REQUIRED RID_STR_TBL_START + 36 -#define STR_DEFAULT_VALUE RID_STR_TBL_START + 37 -#define STR_TABED_UNDO_CELLMODIFIED RID_STR_TBL_START + 38 -#define STR_TAB_FIELD_COLUMN_NAME RID_STR_TBL_START + 39 -#define STR_TBL_COLUMN_IS_KEYCOLUMN RID_STR_TBL_START + 40 -#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE RID_STR_TBL_START + 41 -#define STR_TABLEDESIGN_ALTER_ERROR RID_STR_TBL_START + 42 -#define STR_AUTOINCREMENT_VALUE RID_STR_TBL_START + 43 -#define STR_HELP_FORMAT_BUTTON RID_STR_TBL_START + 44 -#define STR_TABLEDESIGN_CONNECTION_MISSING RID_STR_TBL_START + 45 -#define STR_TAB_FIELD_COLUMN_DATATYPE RID_STR_TBL_START + 46 -#define STR_TABLEDESIGN_TITLE RID_STR_TBL_START + 47 -#define STR_NO_TYPE_INFO_AVAILABLE RID_STR_TBL_START + 48 +#define STR_HELP_AUTOINCREMENT_VALUE RID_STR_TBL_START +#define STR_TABLEDESIGN_UNDO_PRIMKEY RID_STR_TBL_START + 1 +#define STR_VALUE_YES RID_STR_TBL_START + 2 +#define STR_VALUE_NO RID_STR_TBL_START + 3 +#define STR_VALUE_ASC RID_STR_TBL_START + 4 +#define STR_VALUE_DESC RID_STR_TBL_START + 5 +#define STR_VALUE_NONE RID_STR_TBL_START + 6 +#define STR_TAB_FIELD_NAME RID_STR_TBL_START + 7 +#define STR_TAB_FIELD_DATATYPE RID_STR_TBL_START + 8 +#define STR_TAB_FIELD_LENGTH RID_STR_TBL_START + 9 +#define STR_TAB_HELP_TEXT RID_STR_TBL_START + 10 +#define STR_TAB_FIELD_NULLABLE RID_STR_TBL_START + 11 +#define STR_FIELD_AUTOINCREMENT RID_STR_TBL_START + 12 +#define STR_TAB_PROPERTIES RID_STR_TBL_START + 13 +#define STR_TABPAGE_GENERAL RID_STR_TBL_START + 14 +#define STR_TAB_TABLE_DESCRIPTION RID_STR_TBL_START + 15 +#define STR_TAB_TABLE_PROPERTIES RID_STR_TBL_START + 16 +#define STR_TABED_UNDO_TYPE_CHANGED RID_STR_TBL_START + 17 +#define STR_TABED_UNDO_ROWDELETED RID_STR_TBL_START + 18 +#define STR_TABED_UNDO_ROWINSERTED RID_STR_TBL_START + 19 +#define STR_TABED_UNDO_NEWROWINSERTED RID_STR_TBL_START + 20 +#define STR_TABED_UNDO_PRIMKEY RID_STR_TBL_START + 21 +#define STR_HELP_AUTOINCREMENT RID_STR_TBL_START + 22 +#define STR_HELP_FORMAT_CODE RID_STR_TBL_START + 23 +#define STR_HELP_SCALE RID_STR_TBL_START + 24 +#define STR_HELP_LENGTH RID_STR_TBL_START + 25 +#define STR_HELP_NUMERIC_TYPE RID_STR_TBL_START + 26 +#define STR_HELP_TEXT_LENGTH RID_STR_TBL_START + 27 +#define STR_HELP_FIELD_REQUIRED RID_STR_TBL_START + 28 +#define STR_HELP_DEFAULT_VALUE RID_STR_TBL_START + 29 +#define STR_HELP_BOOL_DEFAULT RID_STR_TBL_START + 30 +#define STR_FORMAT RID_STR_TBL_START + 31 +#define STR_SCALE RID_STR_TBL_START + 32 +#define STR_LENGTH RID_STR_TBL_START + 33 +#define STR_NUMERIC_TYPE RID_STR_TBL_START + 34 +#define STR_TEXT_LENGTH RID_STR_TBL_START + 35 +#define STR_FIELD_REQUIRED RID_STR_TBL_START + 36 +#define STR_DEFAULT_VALUE RID_STR_TBL_START + 37 +#define STR_TABED_UNDO_CELLMODIFIED RID_STR_TBL_START + 38 +#define STR_TAB_FIELD_COLUMN_NAME RID_STR_TBL_START + 39 +#define STR_TBL_COLUMN_IS_KEYCOLUMN RID_STR_TBL_START + 40 +#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE RID_STR_TBL_START + 41 +#define STR_TABLEDESIGN_ALTER_ERROR RID_STR_TBL_START + 42 +#define STR_AUTOINCREMENT_VALUE RID_STR_TBL_START + 43 +#define STR_HELP_FORMAT_BUTTON RID_STR_TBL_START + 44 +#define STR_TABLEDESIGN_CONNECTION_MISSING RID_STR_TBL_START + 45 +#define STR_TAB_FIELD_COLUMN_DATATYPE RID_STR_TBL_START + 46 +#define STR_TABLEDESIGN_TITLE RID_STR_TBL_START + 47 +#define STR_NO_TYPE_INFO_AVAILABLE RID_STR_TBL_START + 48 #define STR_CHANGE_COLUMN_NAME RID_STR_TBL_START + 49 #define STR_CHANGE_COLUMN_TYPE RID_STR_TBL_START + 50 #define STR_CHANGE_COLUMN_DESCRIPTION RID_STR_TBL_START + 51 #define STR_CHANGE_COLUMN_ATTRIBUTE RID_STR_TBL_START + 52 #define STR_TABLEDESIGN_SAVE_ERROR RID_STR_TBL_START + 53 #define STR_TABLEDESIGN_COULD_NOT_DROP_COL RID_STR_TBL_START + 54 -#define STR_COLUMN_DESCRIPTION RID_STR_TBL_START + 55 +#define STR_COLUMN_DESCRIPTION RID_STR_TBL_START + 55 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/inc/dbu_uno.hrc b/dbaccess/source/ui/inc/dbu_uno.hrc index f60fd615ec9e..f76c46cfbc7e 100644 --- a/dbaccess/source/ui/inc/dbu_uno.hrc +++ b/dbaccess/source/ui/inc/dbu_uno.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "dbu_resource.hrc" #endif -#define STR_REMEMBERPASSWORD_PERSISTENT ( RID_STR_UNO_START + 0 ) +#define STR_REMEMBERPASSWORD_PERSISTENT ( RID_STR_UNO_START + 0 ) #define STR_CTW_NO_VIEWS_SUPPORT ( RID_STR_UNO_START + 1 ) #define STR_CTW_NO_PRIMARY_KEY_SUPPORT ( RID_STR_UNO_START + 2 ) #define STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ( RID_STR_UNO_START + 3 ) @@ -40,9 +40,9 @@ #define STR_CTW_UNSUPPORTED_COLUMN_TYPE ( RID_STR_UNO_START + 6 ) #define STR_CTW_ILLEGAL_PARAMETER_COUNT ( RID_STR_UNO_START + 7 ) #define STR_CTW_ERROR_DURING_INITIALIZATION ( RID_STR_UNO_START + 8 ) -#define STR_CTW_ERROR_UNSUPPORTED_SETTING ( RID_STR_UNO_START + 9 ) -#define STR_CTW_ERROR_NO_QUERY ( RID_STR_UNO_START + 10 ) -#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ( RID_STR_UNO_START + 11 ) +#define STR_CTW_ERROR_UNSUPPORTED_SETTING ( RID_STR_UNO_START + 9 ) +#define STR_CTW_ERROR_NO_QUERY ( RID_STR_UNO_START + 10 ) +#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ( RID_STR_UNO_START + 11 ) // please adjust when inserting new strings: #define RID_STR_UNO_LAST_USED STR_CTW_ERROR_INVALID_INTERACTIONHANDLER diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 882f78b806de..26fe862cd059 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,15 +61,15 @@ class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, pub { private: OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; - SfxItemSet* m_pOutSet; - ::dbaccess::ODsnTypeCollection* - m_pCollection; /// the DSN type collection instance + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + SfxItemSet* m_pOutSet; + ::dbaccess::ODsnTypeCollection* + m_pCollection; /// the DSN type collection instance ::rtl::OUString m_eType; - sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages - sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing - sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> + sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages + sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing + sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed @@ -88,7 +88,7 @@ public: // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); @@ -97,16 +97,16 @@ public: protected: /// to override to create new pages - virtual TabPage* createPage(WizardState _nState); - virtual WizardState determineNextState(WizardState _nCurrentState) const; - virtual sal_Bool leaveState(WizardState _nState); + virtual TabPage* createPage(WizardState _nState); + virtual WizardState determineNextState(WizardState _nCurrentState) const; + virtual sal_Bool leaveState(WizardState _nState); virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const; virtual sal_Bool onFinish(); protected: - inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } - inline void disabledUI() { m_bUIEnabled = sal_False; } + inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } + inline void disabledUI() { m_bUIEnabled = sal_False; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. void implSelectDatasource(const ::rtl::OUString& _rRegisteredName); @@ -114,20 +114,20 @@ protected: enum ApplyResult { - AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed - AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed + AR_LEAVE_UNCHANGED, // no changes were made + AR_KEEP // don't leave the page (e.g. because an error occured) }; /** apply all changes made */ - ApplyResult implApplyChanges(); + ApplyResult implApplyChanges(); private: DECL_LINK(OnTypeSelected, OGeneralPage*); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBWIZ_HXX diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index ad8c6fb07eef..f416cbf6d8e9 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,13 +64,13 @@ class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, private: OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; - SfxItemSet* m_pOutSet; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + SfxItemSet* m_pOutSet; ::rtl::OUString m_sURL; ::rtl::OUString m_sOldURL; - sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages - sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing - sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> + sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages + sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing + sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> sal_Bool m_bIsConnectable : 1; String m_sRM_IntroText; String m_sRM_dBaseText; @@ -90,9 +90,9 @@ private: INetURLObject m_aDocURL; String m_sWorkPath; OGeneralPage* m_pGeneralPage; - OMySQLIntroPageSetup* m_pMySQLIntroPage; - ::dbaccess::ODsnTypeCollection* - m_pCollection; /// the DSN type collection instance + OMySQLIntroPageSetup* m_pMySQLIntroPage; + ::dbaccess::ODsnTypeCollection* + m_pCollection; /// the DSN type collection instance @@ -113,7 +113,7 @@ public: // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual void setTitle(const ::rtl::OUString& _sTitle); @@ -131,15 +131,15 @@ public: protected: /// to override to create new pages - virtual TabPage* createPage(WizardState _nState); - virtual sal_Bool leaveState(WizardState _nState); + virtual TabPage* createPage(WizardState _nState); + virtual sal_Bool leaveState(WizardState _nState); virtual void enterState(WizardState _nState); virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const; virtual sal_Bool onFinish(); protected: - inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } - inline void disabledUI() { m_bUIEnabled = sal_False; } + inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } + inline void disabledUI() { m_bUIEnabled = sal_False; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. void implSelectDatasource(const ::rtl::OUString& _rRegisteredName); @@ -147,9 +147,9 @@ protected: enum ApplyResult { - AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed - AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed + AR_LEAVE_UNCHANGED, // no changes were made + AR_KEEP // don't leave the page (e.g. because an error occured) }; private: @@ -189,7 +189,7 @@ private: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBWIZ2_HXX diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index c84b1dcdfd69..4914cc7a23f8 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index dcb9ec5f96c1..fa4463374f01 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,26 +56,26 @@ namespace dbaui { protected: OModuleClient m_aModuleClient; - ::osl::Mutex m_aMutex; - - FixedLine m_aFrame; - FixedText m_aSQLLabel; - MultiLineEditSyntaxHighlight m_aSQL; - PushButton m_aExecute; - FixedText m_aHistoryLabel; - ListBox* m_pSQLHistory; - FixedLine m_aStatusFrame; - MultiLineEdit m_aStatus; - FixedLine m_aButtonSeparator; - HelpButton m_aHelp; - PushButton m_aClose; - - typedef ::std::deque< String > StringQueue; - StringQueue m_aStatementHistory; // previous statements - StringQueue m_aNormalizedHistory; // previous statements, normalized to be used in the list box - - sal_Int32 m_nHistoryLimit; - sal_Int32 m_nStatusCount; + ::osl::Mutex m_aMutex; + + FixedLine m_aFrame; + FixedText m_aSQLLabel; + MultiLineEditSyntaxHighlight m_aSQL; + PushButton m_aExecute; + FixedText m_aHistoryLabel; + ListBox* m_pSQLHistory; + FixedLine m_aStatusFrame; + MultiLineEdit m_aStatus; + FixedLine m_aButtonSeparator; + HelpButton m_aHelp; + PushButton m_aClose; + + typedef ::std::deque< String > StringQueue; + StringQueue m_aStatementHistory; // previous statements + StringQueue m_aNormalizedHistory; // previous statements, normalized to be used in the list box + + sal_Int32 m_nHistoryLimit; + sal_Int32 m_nStatusCount; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; @@ -122,18 +122,18 @@ namespace dbaui //==================================================================== #ifdef DBG_UTIL -#define CHECK_INVARIANTS(methodname) \ - { \ - const sal_Char* pError = impl_CheckInvariants(); \ - if (pError) \ - OSL_ENSURE(sal_False, (ByteString(methodname) += ByteString(": ") += ByteString(pError)).GetBuffer()); \ +#define CHECK_INVARIANTS(methodname) \ + { \ + const sal_Char* pError = impl_CheckInvariants(); \ + if (pError) \ + OSL_ENSURE(sal_False, (ByteString(methodname) += ByteString(": ") += ByteString(pError)).GetBuffer()); \ } #else #define CHECK_INVARIANTS(methodname) #endif //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // _DBACCESS_UI_DIRECTSQL_HXX_ diff --git a/dbaccess/source/ui/inc/dlgattr.hrc b/dbaccess/source/ui/inc/dlgattr.hrc index c26d7ae92280..f2649fc3e782 100644 --- a/dbaccess/source/ui/inc/dlgattr.hrc +++ b/dbaccess/source/ui/inc/dlgattr.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,10 +28,10 @@ #ifndef DBAUI_SBATTRDLG_HRC #define DBAUI_SBATTRDLG_HRC -#define TP_ATTR_CHAR 1 -#define TP_ATTR_NUMBER 2 -#define TP_ATTR_ALIGN 4 -#define ST_ROW 5 +#define TP_ATTR_CHAR 1 +#define TP_ATTR_NUMBER 2 +#define TP_ATTR_ALIGN 4 +#define ST_ROW 5 #endif//DBAUI_SBATTRDLG_HRC diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index a1a3c82ec76a..1191360415db 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace dbaui virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif//DBAUI_SBATTRDLG_HXX diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 315aad0e7aa5..2a9f49f32d6b 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/msgbox.hxx> -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace container { class XNameAccess; class XHierarchicalNameAccess; @@ -46,12 +46,12 @@ namespace com { namespace sun { namespace star { }}} -#define SAD_DEFAULT 0x0000 -#define SAD_ADDITIONAL_DESCRIPTION 0x0001 +#define SAD_DEFAULT 0x0000 +#define SAD_ADDITIONAL_DESCRIPTION 0x0001 -#define SAD_TITLE_STORE_AS 0x0000 -#define SAD_TITLE_PASTE_AS 0x0100 -#define SAD_TITLE_RENAME 0x0200 +#define SAD_TITLE_STORE_AS 0x0000 +#define SAD_TITLE_PASTE_AS 0x0100 +#define SAD_TITLE_RENAME 0x0200 class Button; class Edit; @@ -65,14 +65,14 @@ namespace dbaui OSaveAsDlgImpl* m_pImpl; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; public: - OSaveAsDlg( Window * pParent,const sal_Int32& _rType, + OSaveAsDlg( Window * pParent,const sal_Int32& _rType, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); - OSaveAsDlg( Window* _pParent, + OSaveAsDlg( Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const String& _rDefault, const String& _sLabel, diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 3617c72e4a47..30b581b83f01 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,18 +44,18 @@ namespace dbaui class DlgSize : public ModalDialog { private: - sal_Int32 m_nPrevValue, m_nStandard; - void SetValue( sal_Int32 nVal ); + sal_Int32 m_nPrevValue, m_nStandard; + void SetValue( sal_Int32 nVal ); protected: DECL_LINK( CbClickHdl, Button * ); - FixedText aFT_VALUE; - MetricField aMF_VALUE; - CheckBox aCB_STANDARD; - OKButton aPB_OK; - CancelButton aPB_CANCEL; - HelpButton aPB_HELP; + FixedText aFT_VALUE; + MetricField aMF_VALUE; + CheckBox aCB_STANDARD; + OKButton aPB_OK; + CancelButton aPB_CANCEL; + HelpButton aPB_HELP; public: DlgSize( Window * pParent, sal_Int32 nVal, BOOL bRow, sal_Int32 _nAlternativeStandard = -1 ); @@ -64,7 +64,7 @@ namespace dbaui sal_Int32 GetValue(); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DLGSIZE_HXX diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx index 7437d8b54b6c..40595ac7119f 100644 --- a/dbaccess/source/ui/inc/dsitems.hxx +++ b/dbaccess/source/ui/inc/dsitems.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,56 +34,56 @@ typedef sal_Int32 ItemID; //======================================================================== //= item ids for the data source administration dialog -#define DSID_NAME 1 // name of a data source, SfxStringItem -#define DSID_ORIGINALNAME 2 // orginal name, internal, SfxStringItem -#define DSID_CONNECTURL 3 // connection URL, SfxStringItem -#define DSID_TABLEFILTER 4 // table filter, OStringListItem -#define DSID_TYPECOLLECTION 5 // collection of data source types, ODsnTypeCollection -#define DSID_INVALID_SELECTION 6 // is the selection (thus the set data) invalid?, SfxBoolItem -#define DSID_READONLY 7 // is the selection (thus the set data) readonly?, SfxBoolItem -#define DSID_USER 8 // the user name used for logon, SfxStringItem -#define DSID_PASSWORD 9 // the password used for logon, SfxStringItem -#define DSID_ADDITIONALOPTIONS 10 // additional options used for connecting, SfxStringItem -#define DSID_CHARSET 11 // character set to use, SfxStringItem by now -#define DSID_PASSWORDREQUIRED 12 // is the password required to connect?, SfxBoolItem -#define DSID_SHOWDELETEDROWS 13 // show deleted rows?, SfxBoolItem -#define DSID_ALLOWLONGTABLENAMES 14 // allow tables names longer than 8.3?, SfxBoolItem -#define DSID_JDBCDRIVERCLASS 15 // JDBC driver class, SfxStringItem -#define DSID_FIELDDELIMITER 16 // field delimiter, SfxUInt16Item -#define DSID_TEXTDELIMITER 17 // text delimiter, SfxUInt16Item -#define DSID_DECIMALDELIMITER 18 // decimal delimiter, SfxUInt16Item -#define DSID_THOUSANDSDELIMITER 19 // thousands delimiter, SfxUInt16Item -#define DSID_TEXTFILEEXTENSION 20 // extension for text files, SfxStringItem -#define DSID_TEXTFILEHEADER 21 // the text file contains a header?, SfxBoolItem -#define DSID_PARAMETERNAMESUBST 22 -#define DSID_CONN_PORTNUMBER 23 -#define DSID_SUPPRESSVERSIONCL 24 // meta data: sal_True if the data source described by the set is to-be-deleted -#define DSID_DATASOURCE_UNO 25 // meta data: OPropertySetItem, the data source the set represents -#define DSID_CONN_SHUTSERVICE 26 -#define DSID_CONN_DATAINC 27 -#define DSID_CONN_CACHESIZE 28 -#define DSID_CONN_CTRLUSER 29 -#define DSID_CONN_CTRLPWD 30 -#define DSID_USECATALOG 31 // should the driver use the catalog name when the database is filebased -#define DSID_CONN_HOSTNAME 32 -#define DSID_CONN_LDAP_BASEDN 33 -#define DSID_CONN_LDAP_PORTNUMBER 34 -#define DSID_CONN_LDAP_ROWCOUNT 35 -#define DSID_SQL92CHECK 36 -#define DSID_AUTOINCREMENTVALUE 37 -#define DSID_AUTORETRIEVEVALUE 38 -#define DSID_AUTORETRIEVEENABLED 39 -#define DSID_APPEND_TABLE_ALIAS 40 -#define DSID_MYSQL_PORTNUMBER 41 -#define DSID_IGNOREDRIVER_PRIV 42 -#define DSID_BOOLEANCOMPARISON 43 -#define DSID_ORACLE_PORTNUMBER 44 -#define DSID_ENABLEOUTERJOIN 45 -#define DSID_CATALOG 46 -#define DSID_SCHEMA 47 -#define DSID_INDEXAPPENDIX 48 -#define DSID_CONN_LDAP_USESSL 49 -#define DSID_DOCUMENT_URL 50 +#define DSID_NAME 1 // name of a data source, SfxStringItem +#define DSID_ORIGINALNAME 2 // orginal name, internal, SfxStringItem +#define DSID_CONNECTURL 3 // connection URL, SfxStringItem +#define DSID_TABLEFILTER 4 // table filter, OStringListItem +#define DSID_TYPECOLLECTION 5 // collection of data source types, ODsnTypeCollection +#define DSID_INVALID_SELECTION 6 // is the selection (thus the set data) invalid?, SfxBoolItem +#define DSID_READONLY 7 // is the selection (thus the set data) readonly?, SfxBoolItem +#define DSID_USER 8 // the user name used for logon, SfxStringItem +#define DSID_PASSWORD 9 // the password used for logon, SfxStringItem +#define DSID_ADDITIONALOPTIONS 10 // additional options used for connecting, SfxStringItem +#define DSID_CHARSET 11 // character set to use, SfxStringItem by now +#define DSID_PASSWORDREQUIRED 12 // is the password required to connect?, SfxBoolItem +#define DSID_SHOWDELETEDROWS 13 // show deleted rows?, SfxBoolItem +#define DSID_ALLOWLONGTABLENAMES 14 // allow tables names longer than 8.3?, SfxBoolItem +#define DSID_JDBCDRIVERCLASS 15 // JDBC driver class, SfxStringItem +#define DSID_FIELDDELIMITER 16 // field delimiter, SfxUInt16Item +#define DSID_TEXTDELIMITER 17 // text delimiter, SfxUInt16Item +#define DSID_DECIMALDELIMITER 18 // decimal delimiter, SfxUInt16Item +#define DSID_THOUSANDSDELIMITER 19 // thousands delimiter, SfxUInt16Item +#define DSID_TEXTFILEEXTENSION 20 // extension for text files, SfxStringItem +#define DSID_TEXTFILEHEADER 21 // the text file contains a header?, SfxBoolItem +#define DSID_PARAMETERNAMESUBST 22 +#define DSID_CONN_PORTNUMBER 23 +#define DSID_SUPPRESSVERSIONCL 24 // meta data: sal_True if the data source described by the set is to-be-deleted +#define DSID_DATASOURCE_UNO 25 // meta data: OPropertySetItem, the data source the set represents +#define DSID_CONN_SHUTSERVICE 26 +#define DSID_CONN_DATAINC 27 +#define DSID_CONN_CACHESIZE 28 +#define DSID_CONN_CTRLUSER 29 +#define DSID_CONN_CTRLPWD 30 +#define DSID_USECATALOG 31 // should the driver use the catalog name when the database is filebased +#define DSID_CONN_HOSTNAME 32 +#define DSID_CONN_LDAP_BASEDN 33 +#define DSID_CONN_LDAP_PORTNUMBER 34 +#define DSID_CONN_LDAP_ROWCOUNT 35 +#define DSID_SQL92CHECK 36 +#define DSID_AUTOINCREMENTVALUE 37 +#define DSID_AUTORETRIEVEVALUE 38 +#define DSID_AUTORETRIEVEENABLED 39 +#define DSID_APPEND_TABLE_ALIAS 40 +#define DSID_MYSQL_PORTNUMBER 41 +#define DSID_IGNOREDRIVER_PRIV 42 +#define DSID_BOOLEANCOMPARISON 43 +#define DSID_ORACLE_PORTNUMBER 44 +#define DSID_ENABLEOUTERJOIN 45 +#define DSID_CATALOG 46 +#define DSID_SCHEMA 47 +#define DSID_INDEXAPPENDIX 48 +#define DSID_CONN_LDAP_USESSL 49 +#define DSID_DOCUMENT_URL 50 #define DSID_DOSLINEENDS 51 #define DSID_DATABASENAME 52 #define DSID_AS_BEFORE_CORRNAME 53 @@ -99,8 +99,8 @@ typedef sal_Int32 ItemID; //======================================================================== //= item range. Adjust this if you introduce new items above -#define DSID_FIRST_ITEM_ID DSID_NAME -#define DSID_LAST_ITEM_ID DSID_PRIMARY_KEY_SUPPORT +#define DSID_FIRST_ITEM_ID DSID_NAME +#define DSID_LAST_ITEM_ID DSID_PRIMARY_KEY_SUPPORT #endif // _DBAUI_DATASOURCEITEMS_HXX_ diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index a7a0d5c6c80b..f354126b8256 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index 2fbd64bc99d5..531e7e382db3 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,10 +45,10 @@ namespace dbaui :public SbaXDataBrowserController ,public ::com::sun::star::util::XModifyBroadcaster { - ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::cppu::OInterfaceContainerHelper m_aModifyListeners; // for multiplexing the modify events - SbaXFormAdapter* m_pDataSourceImpl; - sal_Bool m_bInQueryDispatch; + SbaXFormAdapter* m_pDataSourceImpl; + sal_Bool m_bInQueryDispatch; // our queryDispatch will ask our frame, which first will ask our queryDispatch, so we need to protect against // recursion @@ -62,10 +62,10 @@ namespace dbaui // UNO DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, OGenericUnoController); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); - // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void); - // static ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getStaticIdlClass(); + // static ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getStaticIdlClass(); // ::com::sun::star::frame::XDispatch virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index f85cc2bd62e9..0d4d2f7d4d75 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,55 +75,55 @@ namespace dbaui // SbaXFormAdapter //================================================================== - typedef ::cppu::WeakImplHelper12< ::com::sun::star::sdbc::XResultSetMetaDataSupplier - , ::com::sun::star::sdb::XResultSetAccess - , ::com::sun::star::sdbc::XResultSetUpdate - , ::com::sun::star::sdbc::XRowSet - , ::com::sun::star::sdb::XRowSetApproveBroadcaster - , ::com::sun::star::sdbcx::XRowLocate - , ::com::sun::star::sdbc::XRowUpdate - , ::com::sun::star::sdbc::XRow - , ::com::sun::star::sdbcx::XColumnsSupplier - , ::com::sun::star::sdbc::XColumnLocate + typedef ::cppu::WeakImplHelper12< ::com::sun::star::sdbc::XResultSetMetaDataSupplier + , ::com::sun::star::sdb::XResultSetAccess + , ::com::sun::star::sdbc::XResultSetUpdate + , ::com::sun::star::sdbc::XRowSet + , ::com::sun::star::sdb::XRowSetApproveBroadcaster + , ::com::sun::star::sdbcx::XRowLocate + , ::com::sun::star::sdbc::XRowUpdate + , ::com::sun::star::sdbc::XRow + , ::com::sun::star::sdbcx::XColumnsSupplier + , ::com::sun::star::sdbc::XColumnLocate // --- stardiv::one::form::component::DatabaseForm --- - , ::com::sun::star::sdbc::XParameters - , ::com::sun::star::sdbcx::XDeleteRows - > SbaXFormAdapter_BASE1; - typedef ::cppu::ImplHelper12 < ::com::sun::star::sdbc::XWarningsSupplier - , ::com::sun::star::sdbc::XCloseable - , ::com::sun::star::form::XLoadable - , ::com::sun::star::sdb::XSQLErrorBroadcaster - , ::com::sun::star::form::XDatabaseParameterBroadcaster - // --- stardiv::one::form::component::Form --- - , ::com::sun::star::form::XForm - , ::com::sun::star::form::XSubmit - , ::com::sun::star::awt::XTabControllerModel + , ::com::sun::star::sdbc::XParameters + , ::com::sun::star::sdbcx::XDeleteRows + > SbaXFormAdapter_BASE1; + typedef ::cppu::ImplHelper12 < ::com::sun::star::sdbc::XWarningsSupplier + , ::com::sun::star::sdbc::XCloseable + , ::com::sun::star::form::XLoadable + , ::com::sun::star::sdb::XSQLErrorBroadcaster + , ::com::sun::star::form::XDatabaseParameterBroadcaster + // --- stardiv::one::form::component::Form --- + , ::com::sun::star::form::XForm + , ::com::sun::star::form::XSubmit + , ::com::sun::star::awt::XTabControllerModel // --- stardiv::one::form::FormComponent --- - , ::com::sun::star::lang::XComponent - , ::com::sun::star::beans::XFastPropertySet + , ::com::sun::star::lang::XComponent + , ::com::sun::star::beans::XFastPropertySet // already present : ::com::sun::star::form::XFormComponent (base of ::com::sun::star::form::XForm) - , ::com::sun::star::beans::XMultiPropertySet - , ::com::sun::star::container::XNamed - > SbaXFormAdapter_BASE2; - typedef ::cppu::ImplHelper10 < ::com::sun::star::io::XPersistObject - , ::com::sun::star::beans::XPropertySet + , ::com::sun::star::beans::XMultiPropertySet + , ::com::sun::star::container::XNamed + > SbaXFormAdapter_BASE2; + typedef ::cppu::ImplHelper10 < ::com::sun::star::io::XPersistObject + , ::com::sun::star::beans::XPropertySet // --- stardiv::one::data::DatabaseCursor --- - , ::com::sun::star::util::XCancellable + , ::com::sun::star::util::XCancellable // already present : ::com::sun::star::beans::XPropertySet // --- stardiv::one::data::DatabaseComponent --- // already present : ::com::sun::star::lang::XComponent // already present : ::com::sun::star::container::XChild (base of ::com::sun::star::form::XForm) // interfaces I don't know the service which they belong to ;) // (they are supported by FmXDatabaseForm, se we support it, too) - , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::form::XReset - , ::com::sun::star::container::XNameContainer - , ::com::sun::star::container::XIndexContainer - , ::com::sun::star::container::XContainer - , ::com::sun::star::container::XEnumerationAccess + , ::com::sun::star::beans::XPropertyState + , ::com::sun::star::form::XReset + , ::com::sun::star::container::XNameContainer + , ::com::sun::star::container::XIndexContainer + , ::com::sun::star::container::XContainer + , ::com::sun::star::container::XEnumerationAccess // interfaces we need because of other reasons - , ::com::sun::star::beans::XPropertyChangeListener - > SbaXFormAdapter_BASE3; + , ::com::sun::star::beans::XPropertyChangeListener + > SbaXFormAdapter_BASE3; class SbaXFormAdapter :public SbaXFormAdapter_BASE1 @@ -132,32 +132,32 @@ namespace dbaui { private: OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xMainForm; - ::osl::Mutex m_aMutex; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xMainForm; + ::osl::Mutex m_aMutex; - SbaXLoadMultiplexer m_aLoadListeners; - SbaXRowSetMultiplexer m_aRowSetListeners; - SbaXRowSetApproveMultiplexer m_aRowSetApproveListeners; - SbaXSQLErrorMultiplexer m_aErrorListeners; - SbaXParameterMultiplexer m_aParameterListeners; - SbaXSubmitMultiplexer m_aSubmitListeners; - SbaXResetMultiplexer m_aResetListeners; + SbaXLoadMultiplexer m_aLoadListeners; + SbaXRowSetMultiplexer m_aRowSetListeners; + SbaXRowSetApproveMultiplexer m_aRowSetApproveListeners; + SbaXSQLErrorMultiplexer m_aErrorListeners; + SbaXParameterMultiplexer m_aParameterListeners; + SbaXSubmitMultiplexer m_aSubmitListeners; + SbaXResetMultiplexer m_aResetListeners; - SbaXPropertyChangeMultiplexer m_aPropertyChangeListeners; - SbaXVetoableChangeMultiplexer m_aVetoablePropertyChangeListeners; - SbaXPropertiesChangeMultiplexer m_aPropertiesChangeListeners; + SbaXPropertyChangeMultiplexer m_aPropertyChangeListeners; + SbaXVetoableChangeMultiplexer m_aVetoablePropertyChangeListeners; + SbaXPropertiesChangeMultiplexer m_aPropertiesChangeListeners; - ::cppu::OInterfaceContainerHelper m_aDisposeListeners; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::cppu::OInterfaceContainerHelper m_aDisposeListeners; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; // hierarchy administration - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > > m_aChildren; - ::std::vector< ::rtl::OUString > m_aChildNames; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > > m_aChildren; + ::std::vector< ::rtl::OUString > m_aChildNames; // properties - ::rtl::OUString m_sName; - sal_Int32 m_nNamePropHandle; + ::rtl::OUString m_sName; + sal_Int32 m_nNamePropHandle; public: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getAttachedForm() const { return m_xMainForm; } @@ -166,14 +166,14 @@ namespace dbaui SbaXFormAdapter(); ~SbaXFormAdapter(); - // ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getIdlClass(); - // ::com::sun::star::uno::Sequence<::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(); + // ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getIdlClass(); + // ::com::sun::star::uno::Sequence<::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(); void AttachForm(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xNewMaster); // UNO DECLARE_UNO3_DEFAULTS(SbaXFormAdapter, SbaXFormAdapter_BASE1); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -260,7 +260,7 @@ namespace dbaui virtual sal_Bool SAL_CALL rowDeleted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // ::com::sun::star::sdbc::XResultSetUpdate + // ::com::sun::star::sdbc::XResultSetUpdate virtual void SAL_CALL insertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL deleteRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -326,7 +326,7 @@ namespace dbaui // ::com::sun::star::form::XDatabaseParameterBroadcaster virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); @@ -382,7 +382,7 @@ namespace dbaui virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XCancellable - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index fd1c479917f1..1ad4678d5559 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index 7e01de118b72..a7a7daaf8b26 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,13 +49,13 @@ namespace dbaui m_xIndexes; // cached information - Indexes m_aIndexes; + Indexes m_aIndexes; public: // construction OIndexCollection(); OIndexCollection(const OIndexCollection& _rSource); - // OIndexCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); + // OIndexCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); const OIndexCollection& operator=(const OIndexCollection& _rSource); @@ -94,14 +94,14 @@ namespace dbaui void detach(); // is the object valid? - sal_Bool isValid() const { return m_xIndexes.is(); } + sal_Bool isValid() const { return m_xIndexes.is(); } // number of contained indexes - sal_Int32 size() const { return m_aIndexes.size(); } + sal_Int32 size() const { return m_aIndexes.size(); } /// drop an index, and remove it from the collection - sal_Bool drop(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); + sal_Bool drop(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); /// simply drop the index described by the name, but don't remove the descriptor from the collection - sal_Bool dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); + sal_Bool dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); protected: void implConstructFrom(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); @@ -111,7 +111,7 @@ namespace dbaui //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_INDEXCOLLECTION_HXX_ diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index f7d4c41a45fb..965407e4ed14 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ namespace dbaui { protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - Link m_aSelectHdl; - Link m_aEndEditHdl; - sal_Bool m_bSuspendSelectHdl; + Link m_aSelectHdl; + Link m_aEndEditHdl; + sal_Bool m_bSuspendSelectHdl; public: DbaIndexList(Window* _pParent, const ResId& _rId); @@ -92,27 +92,27 @@ namespace dbaui //================================================================== class IndexFieldsControl; class OIndexCollection; - class DbaIndexDialog : public ModalDialog, + class DbaIndexDialog : public ModalDialog, public OToolBoxHelper { protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - SvtViewOptions m_aGeometrySettings; - - ToolBox m_aActions; - DbaIndexList m_aIndexes; - FixedLine m_aIndexDetails; - FixedText m_aDescriptionLabel; - FixedText m_aDescription; - CheckBox m_aUnique; - FixedText m_aFieldsLabel; - IndexFieldsControl* m_pFields; - PushButton m_aClose; - HelpButton m_aHelp; - - OIndexCollection* m_pIndexes; - SvLBoxEntry* m_pPreviousSelection; - sal_Bool m_bEditAgain; + SvtViewOptions m_aGeometrySettings; + + ToolBox m_aActions; + DbaIndexList m_aIndexes; + FixedLine m_aIndexDetails; + FixedText m_aDescriptionLabel; + FixedText m_aDescription; + CheckBox m_aUnique; + FixedText m_aFieldsLabel; + IndexFieldsControl* m_pFields; + PushButton m_aClose; + HelpButton m_aHelp; + + OIndexCollection* m_pIndexes; + SvLBoxEntry* m_pPreviousSelection; + sal_Bool m_bEditAgain; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; @@ -131,9 +131,9 @@ namespace dbaui virtual void DataChanged( const DataChangedEvent& rDCEvt ); /** will be called whenthe id of the image list is needed. - @param _eBitmapSet + @param _eBitmapSet <svtools/imgdef.hxx> - @param _bHiContast + @param _bHiContast <TRUE/> when in high contrast mode. */ virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const; @@ -177,7 +177,7 @@ namespace dbaui }; //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_INDEXDIALOG_HXX_ diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index 18e8f4ff0b5c..5457ec8bd17e 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace dbaui //================================================================== struct OIndexField { - String sFieldName; - sal_Bool bSortAscending; + String sFieldName; + sal_Bool bSortAscending; OIndexField() : bSortAscending(sal_True) { } }; @@ -63,15 +63,15 @@ namespace dbaui struct OIndex { protected: - ::rtl::OUString sOriginalName; - sal_Bool bModified; + ::rtl::OUString sOriginalName; + sal_Bool bModified; public: - ::rtl::OUString sName; - ::rtl::OUString sDescription; - sal_Bool bPrimaryKey; - sal_Bool bUnique; - IndexFields aFields; + ::rtl::OUString sName; + ::rtl::OUString sDescription; + sal_Bool bPrimaryKey; + sal_Bool bUnique; + IndexFields aFields; public: OIndex(const ::rtl::OUString& _rOriginalName) @@ -81,23 +81,23 @@ namespace dbaui const ::rtl::OUString& getOriginalName() const { return sOriginalName; } - sal_Bool isModified() const { return bModified; } - void setModified(sal_Bool _bModified) { bModified = _bModified; } - void clearModified() { setModified(sal_False); } - - sal_Bool isNew() const { return 0 == getOriginalName().getLength(); } - void flagAsNew(const GrantIndexAccess&) { sOriginalName = ::rtl::OUString(); } - void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; } + sal_Bool isModified() const { return bModified; } + void setModified(sal_Bool _bModified) { bModified = _bModified; } + void clearModified() { setModified(sal_False); } + sal_Bool isNew() const { return 0 == getOriginalName().getLength(); } + void flagAsNew(const GrantIndexAccess&) { sOriginalName = ::rtl::OUString(); } + void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; } + private: - OIndex(); // not implemented + OIndex(); // not implemented }; DECLARE_STL_VECTOR( OIndex, Indexes ); //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_INDEXES_HXX_ diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index d3802b03746d..4b622baa92f5 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,20 +46,20 @@ namespace dbaui { OModuleClient m_aModuleClient; protected: - IndexFields m_aSavedValue; - - IndexFields m_aFields; // !! order matters !! - ConstIndexFieldsIterator m_aSeekRow; // !! + IndexFields m_aSavedValue; - Link m_aModifyHdl; + IndexFields m_aFields; // !! order matters !! + ConstIndexFieldsIterator m_aSeekRow; // !! - ::svt::ListBoxControl* m_pSortingCell; - ::svt::ListBoxControl* m_pFieldNameCell; + Link m_aModifyHdl; - String m_sAscendingText; - String m_sDescendingText; + ::svt::ListBoxControl* m_pSortingCell; + ::svt::ListBoxControl* m_pFieldNameCell; - sal_Int32 m_nMaxColumnsInIndex; + String m_sAscendingText; + String m_sDescendingText; + + sal_Int32 m_nMaxColumnsInIndex; sal_Bool m_bAddIndexAppendix; public: @@ -74,8 +74,8 @@ namespace dbaui sal_Bool SaveModified(); sal_Bool IsModified() const; - const IndexFields& GetSavedValue() const { return m_aSavedValue; } - void SaveValue() { m_aSavedValue = m_aFields; } + const IndexFields& GetSavedValue() const { return m_aSavedValue; } + void SaveValue() { m_aSavedValue = m_aFields; } void SetModifyHdl(const Link& _rHdl) { m_aModifyHdl = _rHdl; } Link GetModifyHdl() const { return m_aModifyHdl; } @@ -88,8 +88,8 @@ namespace dbaui virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; - ::svt::CellController* GetController(long _nRow, sal_uInt16 _nColumnId); - void InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId); + ::svt::CellController* GetController(long _nRow, sal_uInt16 _nColumnId); + void InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId); protected: String GetRowCellText(const ConstIndexFieldsIterator& _rRow,sal_uInt16 nColId) const; @@ -104,7 +104,7 @@ namespace dbaui }; //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_INDEXFIELDSCONTROL_HXX_ diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index 84609bb1e5d2..7439bb7a56b9 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,11 @@ namespace dbaui m_xDocumentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > m_xDocumentUI; - Window* m_pDialogParent; - String m_sCurrentlyEditing; - ::rtl::OUString + Window* m_pDialogParent; + String m_sCurrentlyEditing; + ::rtl::OUString m_sDataSourceName; public: @@ -133,7 +133,7 @@ namespace dbaui }; //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_LINKEDDOCUMENTS_HXX_ diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index 6d5394667111..05d5492f9f77 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,14 +36,14 @@ namespace dbaui { //........................................................................ - #define SV_ITEM_ID_BOLDLBSTRING SV_ITEM_ID_LBOXSTRING + #define SV_ITEM_ID_BOLDLBSTRING SV_ITEM_ID_LBOXSTRING //==================================================================== //= OBoldListboxString //==================================================================== class OBoldListboxString : public SvLBoxString { - sal_Bool m_bEmphasized; + sal_Bool m_bEmphasized; public: OBoldListboxString(SvLBoxEntry* _pEntry, sal_uInt16 _nFlags, const XubString& _rStr) @@ -57,12 +57,12 @@ namespace dbaui virtual void Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); virtual void InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData); - sal_Bool isEmphasized() const { return m_bEmphasized; } - void emphasize(sal_Bool _bEmphasize) { m_bEmphasized = _bEmphasize; } + sal_Bool isEmphasized() const { return m_bEmphasized; } + void emphasize(sal_Bool _bEmphasize) { m_bEmphasized = _bEmphasize; } }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // _DBAUI_LISTVIEWITEMS_HXX_ diff --git a/dbaccess/source/ui/inc/localresaccess.hxx b/dbaccess/source/ui/inc/localresaccess.hxx index 9760ac354aac..f288666dc303 100644 --- a/dbaccess/source/ui/inc/localresaccess.hxx +++ b/dbaccess/source/ui/inc/localresaccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_LOCALRESACCESS_HXX_ diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index cc5f10791b2f..018e1c5bab45 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,8 +47,8 @@ namespace dbaui */ class OMarkableTreeListBox : public DBTreeListBox { - SvLBoxButtonData* m_pCheckButton; - Link m_aCheckButtonHandler; + SvLBoxButtonData* m_pCheckButton; + Link m_aCheckButtonHandler; public: OMarkableTreeListBox( Window* pParent @@ -60,8 +60,8 @@ public: ~OMarkableTreeListBox(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void CheckButtonHdl(); - void CheckButtons(); // make the button states consistent (bottom-up) + virtual void CheckButtonHdl(); + void CheckButtons(); // make the button states consistent (bottom-up) /// the handler given is called whenever the check state of one or more items changed void SetCheckHandler(const Link& _rHdl) { m_aCheckButtonHandler = _rHdl; } @@ -70,7 +70,7 @@ protected: virtual void Paint(const Rectangle& _rRect); virtual void checkedButton_noBroadcast(SvLBoxEntry* _pEntry); - SvButtonState implDetermineState(SvLBoxEntry* _pEntry); + SvButtonState implDetermineState(SvLBoxEntry* _pEntry); // determines the check state of the given entry, by analyzing the states of all descendants private: @@ -78,7 +78,7 @@ private: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_MARKTREE_HXX_ diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx index a57513f6c5e7..2b915f6fb70a 100644 --- a/dbaccess/source/ui/inc/moduledbu.hxx +++ b/dbaccess/source/ui/inc/moduledbu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,19 +53,19 @@ private: // not implemented. OModule is a static class protected: - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered + static ::osl::Mutex s_aMutex; /// access safety + static sal_Int32 s_nClients; /// number of registered clients + static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered public: /// get the vcl res manager of the module - static ResMgr* getResManager(); + static ResMgr* getResManager(); protected: /// register a client for the module - static void registerClient(); + static void registerClient(); /// revoke a client for the module - static void revokeClient(); + static void revokeClient(); private: /** ensure that the impl class exists @@ -77,13 +77,13 @@ private: //========================================================================= //= OModuleClient //========================================================================= -/** base class for objects which uses any global module-specific ressources +/** base class for objects which uses any global module-specific ressources */ class OModuleClient { public: - OModuleClient() { OModule::registerClient(); } - ~OModuleClient() { OModule::revokeClient(); } + OModuleClient() { OModule::registerClient(); } + ~OModuleClient() { OModule::revokeClient(); } }; //========================================================================= @@ -98,7 +98,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_MODULE_DBU_HXX_ diff --git a/dbaccess/source/ui/inc/objectnamecheck.hxx b/dbaccess/source/ui/inc/objectnamecheck.hxx index 144877d56d62..55c490a465cd 100644 --- a/dbaccess/source/ui/inc/objectnamecheck.hxx +++ b/dbaccess/source/ui/inc/objectnamecheck.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace dbaui @param _out_rErrorToDisplay output parameter taking an error message describing why the name is not valid, if applicable. - + @return <TRUE/> if and only if the given name is valid. */ diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 3e0e53e2d653..72900b49cfb8 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 73d9107b6176..fb9b9df2d5e6 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,15 +65,15 @@ namespace dbaui { protected: // the controls - FixedLine m_aNamesFrame; - ListBox m_aAllParams; - FixedText m_aValueFrame; - Edit m_aParam; - PushButton m_aTravelNext; - OKButton m_aOKBtn; - CancelButton m_aCancelBtn; + FixedLine m_aNamesFrame; + ListBox m_aAllParams; + FixedText m_aValueFrame; + Edit m_aParam; + PushButton m_aTravelNext; + OKButton m_aOKBtn; + CancelButton m_aCancelBtn; - sal_uInt16 m_nCurrentlySelected; + sal_uInt16 m_nCurrentlySelected; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xParams; @@ -85,13 +85,13 @@ namespace dbaui m_aPredicateInput; ByteVector m_aVisitedParams; - Timer m_aResetVisitFlag; + Timer m_aResetVisitFlag; // we reset the "visited flag" 1 second after and entry has been selected - sal_Bool m_bNeedErrorOnCurrent; + sal_Bool m_bNeedErrorOnCurrent; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - m_aFinalValues; /// the final values as entered by the user + m_aFinalValues; /// the final values as entered by the user public: OParameterDialog(Window* _pParent, @@ -118,7 +118,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_PARAMDIALOG_HXX_ diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index fa678989c06f..463d1449ae96 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace dbaui */ class OPropertySetItem : public SfxPoolItem { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSet; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSet; public: TYPEINFO(); @@ -53,15 +53,15 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet); OPropertySetItem(const OPropertySetItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; + virtual int operator==(const SfxPoolItem& _rItem) const; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getPropertySet() const { return m_xSet; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_PROPERTYSETITEM_HXX_ diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx index ef88f585631e..ec2d6122b180 100644 --- a/dbaccess/source/ui/inc/propertystorage.hxx +++ b/dbaccess/source/ui/inc/propertystorage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 7146b8306cfb..f439b40306bc 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ namespace dbaui //===================================================================== class OQueryContainerWindow : public ODataView { - OQueryViewSwitch* m_pViewSwitch; - OBeamer* m_pBeamer; - Splitter* m_pSplitter; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBeamer; + OQueryViewSwitch* m_pViewSwitch; + OBeamer* m_pBeamer; + Splitter* m_pSplitter; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBeamer; DECL_LINK( SplitHdl, void* ); public: @@ -69,38 +69,38 @@ namespace dbaui virtual void Construct(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); // show the beamer - void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); + void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); // called when the beamer has been disposed - void disposingPreview(); + void disposingPreview(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getPreviewFrame() const { return m_xBeamer; } - OQueryDesignView* getDesignView() { return m_pViewSwitch->getDesignView(); } + OQueryDesignView* getDesignView() { return m_pViewSwitch->getDesignView(); } - sal_Bool isCutAllowed() { return m_pViewSwitch->isCutAllowed(); } - sal_Bool isPasteAllowed() { return m_pViewSwitch->isPasteAllowed(); } - sal_Bool isCopyAllowed() { return m_pViewSwitch->isCopyAllowed(); } - void copy() { m_pViewSwitch->copy(); } - void cut() { m_pViewSwitch->cut(); } - void paste() { m_pViewSwitch->paste(); } + sal_Bool isCutAllowed() { return m_pViewSwitch->isCutAllowed(); } + sal_Bool isPasteAllowed() { return m_pViewSwitch->isPasteAllowed(); } + sal_Bool isCopyAllowed() { return m_pViewSwitch->isCopyAllowed(); } + void copy() { m_pViewSwitch->copy(); } + void cut() { m_pViewSwitch->cut(); } + void paste() { m_pViewSwitch->paste(); } - void clear() { m_pViewSwitch->clear(); } - sal_Bool isSlotEnabled( sal_Int32 _nSlotId ) { return m_pViewSwitch->isSlotEnabled( _nSlotId ); } - void setSlotEnabled( sal_Int32 _nSlotId, sal_Bool _bEnable ) { m_pViewSwitch->setSlotEnabled( _nSlotId, _bEnable ); } - void setNoneVisbleRow(sal_Int32 _nRows) { m_pViewSwitch->setNoneVisbleRow( _nRows); } + void clear() { m_pViewSwitch->clear(); } + sal_Bool isSlotEnabled( sal_Int32 _nSlotId ) { return m_pViewSwitch->isSlotEnabled( _nSlotId ); } + void setSlotEnabled( sal_Int32 _nSlotId, sal_Bool _bEnable ) { m_pViewSwitch->setSlotEnabled( _nSlotId, _bEnable ); } + void setNoneVisbleRow(sal_Int32 _nRows) { m_pViewSwitch->setNoneVisbleRow( _nRows); } - void setReadOnly( sal_Bool _bReadOnly ) { m_pViewSwitch->setReadOnly( _bReadOnly ); } + void setReadOnly( sal_Bool _bReadOnly ) { m_pViewSwitch->setReadOnly( _bReadOnly ); } - sal_Bool checkStatement() { return m_pViewSwitch->checkStatement( ); } - ::rtl::OUString getStatement() { return m_pViewSwitch->getStatement( ); } - void setStatement( const ::rtl::OUString& _rsStatement ) { m_pViewSwitch->setStatement( _rsStatement ); } + sal_Bool checkStatement() { return m_pViewSwitch->checkStatement( ); } + ::rtl::OUString getStatement() { return m_pViewSwitch->getStatement( ); } + void setStatement( const ::rtl::OUString& _rsStatement ) { m_pViewSwitch->setStatement( _rsStatement ); } - void initialize() { m_pViewSwitch->initialize(); } - void SaveUIConfig() { m_pViewSwitch->SaveUIConfig(); } + void initialize() { m_pViewSwitch->initialize(); } + void SaveUIConfig() { m_pViewSwitch->SaveUIConfig(); } bool reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) { return m_pViewSwitch->reset( _pErrorInfo ); } bool switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo ); @@ -118,7 +118,7 @@ namespace dbaui // end of temp classes //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_QUERYCONTAINERWINDOW_HXX diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 0f2813cd0b05..522dd44cfdbd 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,35 +77,35 @@ namespace dbaui ,public OQueryController_PBase ,public OQueryController_PABase { - OTableFields m_vTableFieldDesc; - OTableFields m_vUnUsedFieldsDesc; // contains fields which aren't visible and don't have any criteria + OTableFields m_vTableFieldDesc; + OTableFields m_vUnUsedFieldsDesc; // contains fields which aren't visible and don't have any criteria ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aFieldInformation; - ::svxform::OSystemParseContext* m_pParseContext; + ::svxform::OSystemParseContext* m_pParseContext; ::connectivity::OSQLParser m_aSqlParser; ::connectivity::OSQLParseTreeIterator* m_pSqlIterator; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer > m_xComposer; + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer > m_xComposer; /// if we're editing an existing view, this is non-NULL ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAlterView > m_xAlterView; - ::rtl::OUString m_sStatement; // contains the current sql statement - ::rtl::OUString m_sUpdateCatalogName; // catalog for update data - ::rtl::OUString m_sUpdateSchemaName; // schema for update data - ::rtl::OUString m_sUpdateTableName; // table for update data - mutable ::rtl::OUString - m_sName; // name of the query + ::rtl::OUString m_sStatement; // contains the current sql statement + ::rtl::OUString m_sUpdateCatalogName; // catalog for update data + ::rtl::OUString m_sUpdateSchemaName; // schema for update data + ::rtl::OUString m_sUpdateTableName; // table for update data + mutable ::rtl::OUString + m_sName; // name of the query - sal_Int32 m_nVisibleRows; // which rows the selection browse should show - sal_Int32 m_nSplitPos; // the position of the splitter + sal_Int32 m_nVisibleRows; // which rows the selection browse should show + sal_Int32 m_nSplitPos; // the position of the splitter sal_Int32 m_nCommandType; // the type of the object we're designing - sal_Bool m_bGraphicalDesign; // are we in the graphical design mode (TRUE) or in the text design (FALSE)? - sal_Bool m_bDistinct; // true when you want "select distinct" otherwise false - sal_Bool m_bViewAlias; // show the alias row in the design view - sal_Bool m_bViewTable; // show the table row in the design view - sal_Bool m_bViewFunction; // show the function row in the design view - sal_Bool m_bEscapeProcessing;// is true when we shouldn't parse the statement + sal_Bool m_bGraphicalDesign; // are we in the graphical design mode (TRUE) or in the text design (FALSE)? + sal_Bool m_bDistinct; // true when you want "select distinct" otherwise false + sal_Bool m_bViewAlias; // show the alias row in the design view + sal_Bool m_bViewTable; // show the table row in the design view + sal_Bool m_bViewFunction; // show the function row in the design view + sal_Bool m_bEscapeProcessing;// is true when we shouldn't parse the statement /** returns the container of queries, views, or command definitions, depending on what object type @@ -120,7 +120,7 @@ namespace dbaui inline bool editingQuery() const { return m_nCommandType == ::com::sun::star::sdb::CommandType::QUERY; } inline bool editingCommand() const { return m_nCommandType == ::com::sun::star::sdb::CommandType::COMMAND; } - sal_Bool askForNewName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xElements, + sal_Bool askForNewName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xElements, sal_Bool _bSaveAs); // creates the querycomposer void setQueryComposer(); @@ -136,13 +136,13 @@ namespace dbaui protected: // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); - virtual void reconnect( sal_Bool _bUI ); + virtual void reconnect( sal_Bool _bUI ); virtual ::rtl::OUString getPrivateTitle( ) const; OQueryContainerWindow* getContainer() const { return static_cast< OQueryContainerWindow* >( getView() ); } @@ -151,25 +151,25 @@ namespace dbaui OQueryController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM); virtual ~OQueryController(); - OTableFields& getTableFieldDesc() { return m_vTableFieldDesc; } - OTableFields& getUnUsedFields() { return m_vUnUsedFieldsDesc; } + OTableFields& getTableFieldDesc() { return m_vTableFieldDesc; } + OTableFields& getUnUsedFields() { return m_vUnUsedFieldsDesc; } - void clearFields(); + void clearFields(); virtual void impl_onModifyChanged(); - + // should the statement be parsed by our own sql parser - sal_Bool isEsacpeProcessing() const { return m_bEscapeProcessing; } - sal_Bool isGraphicalDesign() const { return m_bGraphicalDesign; } - sal_Bool isDistinct() const { return m_bDistinct; } - - ::rtl::OUString getStatement() const { return m_sStatement; } - sal_Int32 getSplitPos() const { return m_nSplitPos;} - sal_Int32 getVisibleRows() const { return m_nVisibleRows; } - - void setDistinct(sal_Bool _bDistinct) { m_bDistinct = _bDistinct;} - void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} - void setVisibleRows(sal_Int32 _nVisibleRows) { m_nVisibleRows = _nVisibleRows;} + sal_Bool isEsacpeProcessing() const { return m_bEscapeProcessing; } + sal_Bool isGraphicalDesign() const { return m_bGraphicalDesign; } + sal_Bool isDistinct() const { return m_bDistinct; } + + ::rtl::OUString getStatement() const { return m_sStatement; } + sal_Int32 getSplitPos() const { return m_nSplitPos;} + sal_Int32 getVisibleRows() const { return m_nVisibleRows; } + + void setDistinct(sal_Bool _bDistinct) { m_bDistinct = _bDistinct;} + void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} + void setVisibleRows(sal_Int32 _nVisibleRows) { m_nVisibleRows = _nVisibleRows;} sal_Int32 getColWidth(sal_uInt16 _nColPos) const; @@ -177,7 +177,7 @@ namespace dbaui getFieldInformation() const { return m_aFieldInformation; } ::connectivity::OSQLParser& getParser() { return m_aSqlParser; } - ::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; } + ::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; } virtual sal_Bool Construct(Window* pParent); @@ -191,7 +191,7 @@ namespace dbaui virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index bfb10cae1924..0a72392ae920 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,56 +78,56 @@ namespace com //================================================================== namespace dbaui { - class DlgFilterCrit :public ModalDialog + class DlgFilterCrit :public ModalDialog ,public ::svxform::OParseContextClient { private: - ListBox aLB_WHEREFIELD1; - ListBox aLB_WHERECOMP1; - Edit aET_WHEREVALUE1; - ListBox aLB_WHERECOND2; - ListBox aLB_WHEREFIELD2; - ListBox aLB_WHERECOMP2; - Edit aET_WHEREVALUE2; - ListBox aLB_WHERECOND3; - ListBox aLB_WHEREFIELD3; - ListBox aLB_WHERECOMP3; - Edit aET_WHEREVALUE3; - FixedText aFT_WHEREFIELD; - FixedText aFT_WHERECOMP; - FixedText aFT_WHEREVALUE; - FixedText aFT_WHEREOPER; + ListBox aLB_WHEREFIELD1; + ListBox aLB_WHERECOMP1; + Edit aET_WHEREVALUE1; + ListBox aLB_WHERECOND2; + ListBox aLB_WHEREFIELD2; + ListBox aLB_WHERECOMP2; + Edit aET_WHEREVALUE2; + ListBox aLB_WHERECOND3; + ListBox aLB_WHEREFIELD3; + ListBox aLB_WHERECOMP3; + Edit aET_WHEREVALUE3; + FixedText aFT_WHEREFIELD; + FixedText aFT_WHERECOMP; + FixedText aFT_WHEREVALUE; + FixedText aFT_WHEREOPER; FixedLine aFL_FIELDS; - OKButton aBT_OK; - CancelButton aBT_CANCEL; - HelpButton aBT_HELP; - String aSTR_NOENTRY; - String aSTR_COMPARE_OPERATORS; + OKButton aBT_OK; + CancelButton aBT_CANCEL; + HelpButton aBT_HELP; + String aSTR_NOENTRY; + String aSTR_COMPARE_OPERATORS; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; - ::dbtools::OPredicateInputController m_aPredicateInput; + ::dbtools::OPredicateInputController m_aPredicateInput; - void SelectField( ListBox& rBox, const String& rField ); + void SelectField( ListBox& rBox, const String& rField ); DECL_LINK( ListSelectHdl, ListBox * ); DECL_LINK( ListSelectCompHdl, ListBox * ); - void SetLine( USHORT nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,sal_Bool _bOr ); - void EnableLines(); - sal_Int32 GetOSQLPredicateType( const String& _rSelectedPredicate ) const; - USHORT GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const; - sal_Bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const; - void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues); + void SetLine( USHORT nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,sal_Bool _bOr ); + void EnableLines(); + sal_Int32 GetOSQLPredicateType( const String& _rSelectedPredicate ) const; + USHORT GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const; + sal_Bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const; + void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getMatchingColumn( const Edit& _rValueInput ) const; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getColumn( const ::rtl::OUString& _rFieldName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const ::rtl::OUString& _rFieldName ) const; public: - DlgFilterCrit( Window * pParent, + DlgFilterCrit( Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 86dc874197d8..7c2bab9caa40 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <vcl/button.hxx> -#define DOG_ROWS 3 +#define DOG_ROWS 3 namespace rtl { @@ -79,46 +79,46 @@ namespace dbaui class DlgOrderCrit : public ModalDialog { protected: - ListBox aLB_ORDERFIELD1; - ListBox aLB_ORDERVALUE1; - ListBox aLB_ORDERFIELD2; - ListBox aLB_ORDERVALUE2; - ListBox aLB_ORDERFIELD3; - ListBox aLB_ORDERVALUE3; - FixedText aFT_ORDERFIELD; - FixedText aFT_ORDERAFTER1; - FixedText aFT_ORDERAFTER2; - FixedText aFT_ORDEROPER; - FixedText aFT_ORDERDIR; - OKButton aBT_OK; - CancelButton aBT_CANCEL; - HelpButton aBT_HELP; + ListBox aLB_ORDERFIELD1; + ListBox aLB_ORDERVALUE1; + ListBox aLB_ORDERFIELD2; + ListBox aLB_ORDERVALUE2; + ListBox aLB_ORDERFIELD3; + ListBox aLB_ORDERVALUE3; + FixedText aFT_ORDERFIELD; + FixedText aFT_ORDERAFTER1; + FixedText aFT_ORDERAFTER2; + FixedText aFT_ORDEROPER; + FixedText aFT_ORDERDIR; + OKButton aBT_OK; + CancelButton aBT_CANCEL; + HelpButton aBT_HELP; FixedLine aFL_ORDER; - String aSTR_NOENTRY; - ::rtl::OUString m_sOrgOrder; + String aSTR_NOENTRY; + ::rtl::OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ListBox* m_aColumnList[DOG_ROWS]; - ListBox* m_aValueList[DOG_ROWS]; + ListBox* m_aColumnList[DOG_ROWS]; + ListBox* m_aValueList[DOG_ROWS]; DECL_LINK( FieldListSelectHdl, ListBox * ); - void EnableLines(); + void EnableLines(); public: - DlgOrderCrit( Window * pParent, + DlgOrderCrit( Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols); ~DlgOrderCrit(); - void BuildOrderPart(); + void BuildOrderPart(); - ::rtl::OUString GetOrderList( ) const; - ::rtl::OUString GetOrignalOrder() const { return m_sOrgOrder; } + ::rtl::OUString GetOrderList( ) const; + ::rtl::OUString GetOrignalOrder() const { return m_sOrgOrder; } private: void impl_initializeOrderList_nothrow(); diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index b1ead2c6c031..d7e5f728f036 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,12 +39,12 @@ namespace dbaui OQueryView(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); virtual ~OQueryView(); - virtual sal_Bool isCutAllowed() = 0; - virtual sal_Bool isPasteAllowed() = 0; - virtual sal_Bool isCopyAllowed() = 0; - virtual void copy() = 0; - virtual void cut() = 0; - virtual void paste() = 0; + virtual sal_Bool isCutAllowed() = 0; + virtual sal_Bool isPasteAllowed() = 0; + virtual sal_Bool isCopyAllowed() = 0; + virtual void copy() = 0; + virtual void cut() = 0; + virtual void paste() = 0; // clears the whole query virtual void clear() = 0; // set the view readonly or not diff --git a/dbaccess/source/ui/inc/sbagrid.hrc b/dbaccess/source/ui/inc/sbagrid.hrc index f10de1b90b68..52b1d1a65029 100644 --- a/dbaccess/source/ui/inc/sbagrid.hrc +++ b/dbaccess/source/ui/inc/sbagrid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,77 +30,77 @@ //----------------Menueitems------------------------------------------------- // Tabelle -#define SBA_WHICHID_START 100 +#define SBA_WHICHID_START 100 // Zeilenhoehe -#define SBA_DEF_ROWHEIGHT (SBA_WHICHID_START+131) // SbaColRowSizeItem +#define SBA_DEF_ROWHEIGHT (SBA_WHICHID_START+131) // SbaColRowSizeItem -#define SBA_DEF_RANGEFONT (SBA_WHICHID_START+132) // RangeItem -#define SBA_DEF_FONT (SBA_WHICHID_START+133) // SvxFontItem -#define SBA_DEF_FONTHEIGHT (SBA_WHICHID_START+134) // SvxFontHeightItem -#define SBA_DEF_FONTCOLOR (SBA_WHICHID_START+135) // SvxColorItem -#define SBA_DEF_FONTWEIGHT (SBA_WHICHID_START+136) // SvxWeightItem +#define SBA_DEF_RANGEFONT (SBA_WHICHID_START+132) // RangeItem +#define SBA_DEF_FONT (SBA_WHICHID_START+133) // SvxFontItem +#define SBA_DEF_FONTHEIGHT (SBA_WHICHID_START+134) // SvxFontHeightItem +#define SBA_DEF_FONTCOLOR (SBA_WHICHID_START+135) // SvxColorItem +#define SBA_DEF_FONTWEIGHT (SBA_WHICHID_START+136) // SvxWeightItem #define SBA_DEF_POSTURE (SBA_WHICHID_START+137) // SvxPostureItem #define SBA_DEF_SHADOWED (SBA_WHICHID_START+138) // SvxShadowedItem #define SBA_DEF_CONTOUR (SBA_WHICHID_START+139) // SvxContourItem #define SBA_DEF_CROSSEDOUT (SBA_WHICHID_START+140) // SvxCrossedOutItem #define SBA_DEF_UNDERLINE (SBA_WHICHID_START+141) // SvxUnderlineItem -#define SBA_DEF_LANGUAGE (SBA_WHICHID_START+142) // SvxLanguageItem +#define SBA_DEF_LANGUAGE (SBA_WHICHID_START+142) // SvxLanguageItem // Spalten // Formatierung -#define SBA_DEF_RANGEFORMAT (SBA_WHICHID_START+143) // RangeItem -#define SBA_DEF_FMTVALUE (SBA_WHICHID_START+144) // SfxULONG, Format +#define SBA_DEF_RANGEFORMAT (SBA_WHICHID_START+143) // RangeItem +#define SBA_DEF_FMTVALUE (SBA_WHICHID_START+144) // SfxULONG, Format // Ausrichtung -#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) // SvxHorJustifyItem +#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) // SvxHorJustifyItem // Spaltenbreite -#define SBA_DEF_FLTCOLWIDTH (SBA_WHICHID_START + 146) // SbaColRowSizeItem +#define SBA_DEF_FLTCOLWIDTH (SBA_WHICHID_START + 146) // SbaColRowSizeItem // Feldtyp -#define SBA_DEF_FLTTYPE (SBA_WHICHID_START + 147) // DataFieldTypeItem +#define SBA_DEF_FLTTYPE (SBA_WHICHID_START + 147) // DataFieldTypeItem // Feldlänge -#define SBA_DEF_FLTLENGTH (SBA_WHICHID_START + 148) // SfxUInt32Item +#define SBA_DEF_FLTLENGTH (SBA_WHICHID_START + 148) // SfxUInt32Item // Eingabe erforderlich -#define SBA_DEF_FLTREQUIRED (SBA_WHICHID_START + 149) // SfxBoolItem +#define SBA_DEF_FLTREQUIRED (SBA_WHICHID_START + 149) // SfxBoolItem // Position in der Tabelle, Abfrage -#define SBA_DEF_FLTPOS (SBA_WHICHID_START + 150) // SfxUInt16Item +#define SBA_DEF_FLTPOS (SBA_WHICHID_START + 150) // SfxUInt16Item // Name der zugehoerigen Tabelle -#define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem +#define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem // Spalte ausblenden -#define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem +#define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem // Ausrichtung -#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) // SvxHorJustifyItem +#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) // SvxHorJustifyItem // Spaltenbreite -#define SBA_DEF_FLTCOLWIDTH (SBA_WHICHID_START + 146) // SbaColRowSizeItem +#define SBA_DEF_FLTCOLWIDTH (SBA_WHICHID_START + 146) // SbaColRowSizeItem // Feldtyp -#define SBA_DEF_FLTTYPE (SBA_WHICHID_START + 147) // DataFieldTypeItem +#define SBA_DEF_FLTTYPE (SBA_WHICHID_START + 147) // DataFieldTypeItem // Feldlänge -#define SBA_DEF_FLTLENGTH (SBA_WHICHID_START + 148) // SfxUInt32Item +#define SBA_DEF_FLTLENGTH (SBA_WHICHID_START + 148) // SfxUInt32Item // Eingabe erforderlich -#define SBA_DEF_FLTREQUIRED (SBA_WHICHID_START + 149) // SfxBoolItem +#define SBA_DEF_FLTREQUIRED (SBA_WHICHID_START + 149) // SfxBoolItem // Position in der Tabelle, Abfrage -#define SBA_DEF_FLTPOS (SBA_WHICHID_START + 150) // SfxUInt16Item +#define SBA_DEF_FLTPOS (SBA_WHICHID_START + 150) // SfxUInt16Item // Name der zugehoerigen Tabelle -#define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem +#define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem // Spalte ausblenden -#define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem +#define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem // Kommentar zum Feld -#define SBA_DEF_FLTCOMMENT (SBA_WHICHID_START + 153) // SfxStringItem +#define SBA_DEF_FLTCOMMENT (SBA_WHICHID_START + 153) // SfxStringItem // default wert -#define SBA_DEF_FLTDEFAULT (SBA_WHICHID_START + 154) // SfxStringItem +#define SBA_DEF_FLTDEFAULT (SBA_WHICHID_START + 154) // SfxStringItem // Primärschluessel -#define SBA_DEF_FLTPRIMARY (SBA_WHICHID_START + 155) // SfxBoolItem +#define SBA_DEF_FLTPRIMARY (SBA_WHICHID_START + 155) // SfxBoolItem // table properties -#define SBA_DEF_TABLEPROP (SBA_WHICHID_START + 156) // SfxString -#define SBA_DEF_SORT (SBA_WHICHID_START + 157) // SfxString -#define SBA_DEF_FILTER (SBA_WHICHID_START + 158) // SfxString -#define SBA_DEF_FILTERAPPLIED (SBA_WHICHID_START + 159) // SfxBool -#define SBA_DEF_ROWHEIGHT_DEFAULT (SBA_WHICHID_START + 160) // SfxBool +#define SBA_DEF_TABLEPROP (SBA_WHICHID_START + 156) // SfxString +#define SBA_DEF_SORT (SBA_WHICHID_START + 157) // SfxString +#define SBA_DEF_FILTER (SBA_WHICHID_START + 158) // SfxString +#define SBA_DEF_FILTERAPPLIED (SBA_WHICHID_START + 159) // SfxBool +#define SBA_DEF_ROWHEIGHT_DEFAULT (SBA_WHICHID_START + 160) // SfxBool // the col has a default width ? -#define SBA_DEF_FLTCOLWIDTH_DEFAULT (SBA_WHICHID_START + 161) // SfxBool -#define SBA_DEF_WORDLINEMODE (SBA_WHICHID_START + 162) // SfxBool +#define SBA_DEF_FLTCOLWIDTH_DEFAULT (SBA_WHICHID_START + 161) // SfxBool +#define SBA_DEF_WORDLINEMODE (SBA_WHICHID_START + 162) // SfxBool diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 857c32d8f010..5e8a7c4470c6 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #ifndef _SBA_GRID_HXX #define _SBA_GRID_HXX -// #include <sdb/tools.hxx> +// #include <sdb/tools.hxx> #include <svx/fmgridcl.hxx> @@ -62,7 +62,7 @@ namespace dbaui // SbaXGridControl //================================================================== - // class ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ; + // class ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ; FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory) class SbaXStatusMultiplexer; @@ -71,7 +71,7 @@ namespace dbaui ,public ::com::sun::star::frame::XDispatch { DECLARE_STL_MAP(::com::sun::star::util::URL, SbaXStatusMultiplexer*, SbaURLCompare,StatusMultiplexerArray); - StatusMultiplexerArray m_aStatusMultiplexer; + StatusMultiplexerArray m_aStatusMultiplexer; public: SbaXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -79,7 +79,7 @@ namespace dbaui // UNO DECLARE_UNO3_DEFAULTS(SbaXGridControl, FmXGridControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -105,7 +105,7 @@ namespace dbaui virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( ::com::sun::star::uno::RuntimeException ); protected: - virtual FmXGridPeer* imp_CreatePeer(Window* pParent); + virtual FmXGridPeer* imp_CreatePeer(Window* pParent); }; //================================================================== @@ -116,7 +116,7 @@ namespace dbaui :public FmXGridPeer ,public ::com::sun::star::frame::XDispatch { - ::cppu::OMultiTypeInterfaceContainerHelperVar< ::com::sun::star::util::URL,SbaURLHash , SbaURLCompare> m_aStatusListeners; + ::cppu::OMultiTypeInterfaceContainerHelperVar< ::com::sun::star::util::URL,SbaURLHash , SbaURLCompare> m_aStatusListeners; public: SbaXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -125,7 +125,7 @@ namespace dbaui // UNO virtual void SAL_CALL acquire() throw() { FmXGridPeer::acquire(); } virtual void SAL_CALL release() throw() { FmXGridPeer::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); @@ -145,7 +145,7 @@ namespace dbaui virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); protected: - virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle); + virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle); #if defined(_MSC_VER) && (_MSC_VER >= 1310 ) typedef ::com::sun::star::frame::XStatusListener xstlist_type; typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type; @@ -158,10 +158,10 @@ namespace dbaui // for asny execution of XDispatch::dispatch struct DispatchArgs { - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; - ::std::queue< DispatchArgs > m_aDispatchArgs; + ::std::queue< DispatchArgs > m_aDispatchArgs; DECL_LINK( OnDispatchEvent, void* ); // for dynamic states of our 4 dispatchable URLs @@ -177,7 +177,7 @@ namespace dbaui DispatchType classifyDispatchURL( const ::com::sun::star::util::URL& _rURL ); DECLARE_STL_STDKEY_MAP( DispatchType, sal_Bool, MapDispatchToBool ); - MapDispatchToBool m_aDispatchStates; + MapDispatchToBool m_aDispatchStates; }; //================================================================== @@ -194,8 +194,8 @@ namespace dbaui protected: // FmGridHeader overridables - virtual void PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu); - virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult); + virtual void PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu); + virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult); private: // DragSourceHelper overridables @@ -216,13 +216,13 @@ namespace dbaui class SbaGridListener { public: - virtual void RowChanged() = 0; - virtual void ColumnChanged() = 0; - virtual void SelectionChanged() = 0; - virtual void CellActivated() = 0; - virtual void CellDeactivated() = 0; - virtual void BeforeDrop() = 0; - virtual void AfterDrop() = 0; + virtual void RowChanged() = 0; + virtual void ColumnChanged() = 0; + virtual void SelectionChanged() = 0; + virtual void CellActivated() = 0; + virtual void CellDeactivated() = 0; + virtual void BeforeDrop() = 0; + virtual void AfterDrop() = 0; }; //================================================================== @@ -237,19 +237,19 @@ namespace dbaui // Attributes protected: - ::svx::ODataAccessDescriptor m_aDataDescriptor; - SbaGridListener* m_pMasterListener; + ::svx::ODataAccessDescriptor m_aDataDescriptor; + SbaGridListener* m_pMasterListener; - sal_Int32 m_nAsyncDropEvent; + sal_Int32 m_nAsyncDropEvent; USHORT m_nCurrentActionColId; // ui actions (e.g. a context menu) may be performed on columns which aren't the current one // and aren't selected, so we have to track this column id - sal_Bool m_bActivatingForDrop; + sal_Bool m_bActivatingForDrop; // Attribute Access public: - sal_uInt16 GetCurrentActionColumn() const { return m_nCurrentActionColId; } + sal_uInt16 GetCurrentActionColumn() const { return m_nCurrentActionColId; } public: SbaGridControl(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP); @@ -258,9 +258,9 @@ namespace dbaui virtual void Command( const CommandEvent& rCEvt ); virtual void Select(); - void SetMasterListener(SbaGridListener* pListener) { m_pMasterListener = pListener; } + void SetMasterListener(SbaGridListener* pListener) { m_pMasterListener = pListener; } - virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True); + virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True); virtual void DeactivateCell(sal_Bool bUpdate = sal_True); void ActivateCell() { FmGridControl::ActivateCell(); } @@ -269,9 +269,9 @@ namespace dbaui HeaderBar* GetHeaderBar() const { return FmGridControl::GetHeaderBar(); } /** return the description of the specified object. - @param eObjType + @param eObjType The type to ask for - @param _nPosition + @param _nPosition The position of a tablecell (index position), header bar colum/row cell @return The description of the specified object. @@ -291,10 +291,10 @@ namespace dbaui virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); // BrowseBox overridables - virtual void CursorMoved(); + virtual void CursorMoved(); virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); - virtual void MouseButtonDown( const BrowserMouseEvent& rMEvt); + virtual void MouseButtonDown( const BrowserMouseEvent& rMEvt); // EditBrowseBox overridables virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent); @@ -333,7 +333,7 @@ namespace dbaui DECL_LINK(AsynchDropEvent, void*); private: - sal_Bool IsReadOnlyDB() const; + sal_Bool IsReadOnlyDB() const; void implTransferSelectedRows( sal_Int16 nRowPos, bool _bTrueIfClipboardFalseIfDrag ); private: diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 0fe8ba96aae6..23d5035f0594 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace dbaui class OSbaWeakSubObject : public ::cppu::OWeakObject { protected: - ::cppu::OWeakObject& m_rParent; + ::cppu::OWeakObject& m_rParent; public: OSbaWeakSubObject(::cppu::OWeakObject& rParent) : m_rParent(rParent) { } @@ -72,132 +72,132 @@ namespace dbaui //------------------------------------------------------------------ // declaration of a listener multiplexer class - #define BEGIN_DECLARE_LISTENER_MULTIPLEXER(classname, listenerclass) \ - class classname \ - :public OSbaWeakSubObject \ - ,public listenerclass \ - ,public ::cppu::OInterfaceContainerHelper \ - { \ - public: \ - classname( ::cppu::OWeakObject& rSource, \ - ::osl::Mutex& rMutex); \ - DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ + #define BEGIN_DECLARE_LISTENER_MULTIPLEXER(classname, listenerclass) \ + class classname \ + :public OSbaWeakSubObject \ + ,public listenerclass \ + ,public ::cppu::OInterfaceContainerHelper \ + { \ + public: \ + classname( ::cppu::OWeakObject& rSource, \ + ::osl::Mutex& rMutex); \ + DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); \ \ - /* ::com::sun::star::lang::XEventListener */ \ - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \ + /* ::com::sun::star::lang::XEventListener */ \ + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \ - #define DECLARE_MULTIPLEXER_VOID_METHOD(methodname, eventtype) \ + #define DECLARE_MULTIPLEXER_VOID_METHOD(methodname, eventtype) \ virtual void SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \ - #define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype) \ - virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \ + #define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype) \ + virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \ - #define END_DECLARE_LISTENER_MULTIPLEXER() \ - /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators */ \ - void * SAL_CALL operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); } \ - void SAL_CALL operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); } \ - }; \ + #define END_DECLARE_LISTENER_MULTIPLEXER() \ + /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators */ \ + void * SAL_CALL operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); } \ + void SAL_CALL operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); } \ + }; \ //------------------------------------------------------------------ // implementation of a listener multiplexer class - #define IMPLEMENT_LISTENER_MULTIPLEXER_CORE(classname, listenerclass) \ + #define IMPLEMENT_LISTENER_MULTIPLEXER_CORE(classname, listenerclass) \ \ - /*................................................................*/ \ - classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex) \ - :OSbaWeakSubObject(rSource) \ - ,OInterfaceContainerHelper(_rMutex) \ - { \ - } \ + /*................................................................*/ \ + classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex) \ + :OSbaWeakSubObject(rSource) \ + ,OInterfaceContainerHelper(_rMutex) \ + { \ + } \ \ - ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ + ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Any aReturn = \ - OSbaWeakSubObject::queryInterface(_rType); \ - if (!aReturn.hasValue()) \ - aReturn = ::cppu::queryInterface(_rType, \ - static_cast< listenerclass* >(this), \ - static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ - ); \ + { \ + ::com::sun::star::uno::Any aReturn = \ + OSbaWeakSubObject::queryInterface(_rType); \ + if (!aReturn.hasValue()) \ + aReturn = ::cppu::queryInterface(_rType, \ + static_cast< listenerclass* >(this), \ + static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ + ); \ \ - return aReturn; \ - } \ - /*................................................................*/ \ + return aReturn; \ + } \ + /*................................................................*/ \ void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)\ - { \ - } \ - - - #define IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(classname, listenerclass, methodname, eventtype) \ - void SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ - { \ - eventtype aMulti(e); \ - aMulti.Source = &m_rParent; \ - ::cppu::OInterfaceIteratorHelper aIt(*this); \ - while (aIt.hasMoreElements()) \ - static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ - } \ - - #define IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(classname, listenerclass, methodname, eventtype) \ - /*................................................................*/ \ - sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ - { \ - eventtype aMulti(e); \ - aMulti.Source = &m_rParent; \ - ::cppu::OInterfaceIteratorHelper aIt(*this); \ - sal_Bool bResult = sal_True; \ - while (bResult && aIt.hasMoreElements()) \ - bResult = static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ - return bResult; \ - } \ + { \ + } \ + + + #define IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(classname, listenerclass, methodname, eventtype) \ + void SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ + { \ + eventtype aMulti(e); \ + aMulti.Source = &m_rParent; \ + ::cppu::OInterfaceIteratorHelper aIt(*this); \ + while (aIt.hasMoreElements()) \ + static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ + } \ + + #define IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(classname, listenerclass, methodname, eventtype) \ + /*................................................................*/ \ + sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ + { \ + eventtype aMulti(e); \ + aMulti.Source = &m_rParent; \ + ::cppu::OInterfaceIteratorHelper aIt(*this); \ + sal_Bool bResult = sal_True; \ + while (bResult && aIt.hasMoreElements()) \ + bResult = static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ + return bResult; \ + } \ //------------------------------------------------------------------ // helper for classes which do event multiplexing #define IMPLEMENT_LISTENER_ADMINISTRATION(classname, listenernamespace, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - /*................................................................*/ \ + /*................................................................*/ \ void SAL_CALL classname::add##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException)\ - { \ - multiplexer.addInterface(l); \ - if (multiplexer.getLength() == 1) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(&multiplexer); \ - } \ - } \ - /*................................................................*/ \ + { \ + multiplexer.addInterface(l); \ + if (multiplexer.getLength() == 1) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->add##listenerdesc(&multiplexer); \ + } \ + } \ + /*................................................................*/ \ void SAL_CALL classname::remove##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException)\ - { \ - if (multiplexer.getLength() == 1) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(&multiplexer); \ - } \ - multiplexer.removeInterface(l); \ - } \ + { \ + if (multiplexer.getLength() == 1) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->remove##listenerdesc(&multiplexer); \ + } \ + multiplexer.removeInterface(l); \ + } \ #define STOP_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - if (multiplexer.getLength()) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(&multiplexer); \ - } \ + if (multiplexer.getLength()) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->remove##listenerdesc(&multiplexer); \ + } \ #define START_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - if (multiplexer.getLength()) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(&multiplexer); \ - } \ + if (multiplexer.getLength()) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->add##listenerdesc(&multiplexer); \ + } \ @@ -205,160 +205,160 @@ namespace dbaui // declaration of property listener multiplexers // (with support for specialized and unspecialized property listeners) - #define DECLARE_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \ - class classname \ - :public OSbaWeakSubObject \ - ,public listenerclass \ - { \ - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< \ - ::rtl::OUString, ::comphelper::UStringHash, ::comphelper::UStringEqual > ListenerContainerMap; \ - ListenerContainerMap m_aListeners; \ + #define DECLARE_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \ + class classname \ + :public OSbaWeakSubObject \ + ,public listenerclass \ + { \ + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< \ + ::rtl::OUString, ::comphelper::UStringHash, ::comphelper::UStringEqual > ListenerContainerMap; \ + ListenerContainerMap m_aListeners; \ \ - public: \ - classname( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); \ - DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ + public: \ + classname( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); \ + DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); \ \ - /* ::com::sun::star::lang::XEventListener */ \ - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \ + /* ::com::sun::star::lang::XEventListener */ \ + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \ \ - virtual void SAL_CALL methodname(const eventtype& e) throw exceptions; \ + virtual void SAL_CALL methodname(const eventtype& e) throw exceptions; \ \ - public: \ - void addInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ - void removeInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ + public: \ + void addInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ + void removeInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ \ - void disposeAndClear(); \ + void disposeAndClear(); \ \ - sal_Int32 getOverallLen() const; \ + sal_Int32 getOverallLen() const; \ \ - ::cppu::OInterfaceContainerHelper* getContainer(const ::rtl::OUString& rName) \ - { return m_aListeners.getContainer(rName); } \ + ::cppu::OInterfaceContainerHelper* getContainer(const ::rtl::OUString& rName) \ + { return m_aListeners.getContainer(rName); } \ \ - protected: \ - void Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e); \ - }; \ + protected: \ + void Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e); \ + }; \ //------------------------------------------------------------------ // implementation of property listener multiplexers - #define IMPLEMENT_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \ - /*................................................................*/ \ - classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex) \ - :OSbaWeakSubObject(rSource) \ - ,m_aListeners(rMutex) \ - { \ - } \ + #define IMPLEMENT_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \ + /*................................................................*/ \ + classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex) \ + :OSbaWeakSubObject(rSource) \ + ,m_aListeners(rMutex) \ + { \ + } \ \ - ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ + ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Any aReturn = \ - OSbaWeakSubObject::queryInterface(_rType); \ - if (!aReturn.hasValue()) \ - aReturn = ::cppu::queryInterface(_rType, \ - static_cast< listenerclass* >(this), \ - static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ - ); \ + { \ + ::com::sun::star::uno::Any aReturn = \ + OSbaWeakSubObject::queryInterface(_rType); \ + if (!aReturn.hasValue()) \ + aReturn = ::cppu::queryInterface(_rType, \ + static_cast< listenerclass* >(this), \ + static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ + ); \ \ - return aReturn; \ - } \ - /*................................................................*/ \ + return aReturn; \ + } \ + /*................................................................*/ \ void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)\ - { \ - } \ + { \ + } \ \ - void SAL_CALL classname::methodname(const eventtype& e) throw exceptions \ - { \ - ::cppu::OInterfaceContainerHelper* pListeners = m_aListeners.getContainer(e.PropertyName); \ - if (pListeners) \ - Notify(*pListeners, e); \ + void SAL_CALL classname::methodname(const eventtype& e) throw exceptions \ + { \ + ::cppu::OInterfaceContainerHelper* pListeners = m_aListeners.getContainer(e.PropertyName); \ + if (pListeners) \ + Notify(*pListeners, e); \ \ - /* do the notification for the unspecialized listeners, too */ \ - pListeners = m_aListeners.getContainer(::rtl::OUString()); \ - if (pListeners) \ - Notify(*pListeners, e); \ - } \ + /* do the notification for the unspecialized listeners, too */ \ + pListeners = m_aListeners.getContainer(::rtl::OUString()); \ + if (pListeners) \ + Notify(*pListeners, e); \ + } \ \ - void classname::addInterface(const ::rtl::OUString& rName, \ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ - { \ - m_aListeners.addInterface(rName, rListener); \ - } \ + void classname::addInterface(const ::rtl::OUString& rName, \ + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ + { \ + m_aListeners.addInterface(rName, rListener); \ + } \ \ - void classname::removeInterface(const ::rtl::OUString& rName, \ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ - { \ - m_aListeners.removeInterface(rName, rListener); \ - } \ + void classname::removeInterface(const ::rtl::OUString& rName, \ + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ + { \ + m_aListeners.removeInterface(rName, rListener); \ + } \ \ - void classname::disposeAndClear() \ - { \ - ::com::sun::star::lang::EventObject aEvt(m_rParent); \ - m_aListeners.disposeAndClear(aEvt); \ - } \ + void classname::disposeAndClear() \ + { \ + ::com::sun::star::lang::EventObject aEvt(m_rParent); \ + m_aListeners.disposeAndClear(aEvt); \ + } \ \ - sal_Int32 classname::getOverallLen() const \ - { \ - sal_Int32 nLen = 0; \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aContained = m_aListeners.getContainedTypes(); \ - const ::rtl::OUString* pContained = aContained.getConstArray(); \ - for ( sal_Int32 i=0; i<aContained.getLength(); ++i, ++pContained) \ - nLen += m_aListeners.getContainer(*pContained)->getLength(); \ - return nLen; \ - } \ + sal_Int32 classname::getOverallLen() const \ + { \ + sal_Int32 nLen = 0; \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aContained = m_aListeners.getContainedTypes(); \ + const ::rtl::OUString* pContained = aContained.getConstArray(); \ + for ( sal_Int32 i=0; i<aContained.getLength(); ++i, ++pContained) \ + nLen += m_aListeners.getContainer(*pContained)->getLength(); \ + return nLen; \ + } \ \ - void classname::Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e) \ - { \ - eventtype aMulti(e); \ - aMulti.Source = &m_rParent; \ - ::cppu::OInterfaceIteratorHelper aIt(rListeners); \ - while (aIt.hasMoreElements()) \ - static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ - } \ + void classname::Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e) \ + { \ + eventtype aMulti(e); \ + aMulti.Source = &m_rParent; \ + ::cppu::OInterfaceIteratorHelper aIt(rListeners); \ + while (aIt.hasMoreElements()) \ + static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ + } \ //------------------------------------------------------------------ // helper for classes which do property event multiplexing #define IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(classname, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - /*................................................................*/ \ + /*................................................................*/ \ void SAL_CALL classname::add##listenerdesc(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ - { \ - multiplexer.addInterface(rName, l); \ - if (multiplexer.getOverallLen() == 1) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ - } \ - } \ - /*................................................................*/ \ + { \ + multiplexer.addInterface(rName, l); \ + if (multiplexer.getOverallLen() == 1) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ + } \ + } \ + /*................................................................*/ \ void SAL_CALL classname::remove##listenerdesc(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ - { \ - if (multiplexer.getOverallLen() == 1) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ - } \ - multiplexer.removeInterface(rName, l); \ - } \ + { \ + if (multiplexer.getOverallLen() == 1) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ + } \ + multiplexer.removeInterface(rName, l); \ + } \ #define STOP_PROPERTY_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - if (multiplexer.getOverallLen()) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ - } \ + if (multiplexer.getOverallLen()) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ + } \ #define START_PROPERTY_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - if (multiplexer.getOverallLen()) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ - } \ + if (multiplexer.getOverallLen()) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ + } \ @@ -370,8 +370,8 @@ namespace dbaui DECLARE_MULTIPLEXER_VOID_METHOD(statusChanged, ::com::sun::star::frame::FeatureStateEvent) private: - ::com::sun::star::frame::FeatureStateEvent m_aLastKnownStatus; - public: \ + ::com::sun::star::frame::FeatureStateEvent m_aLastKnownStatus; + public: \ inline ::com::sun::star::frame::FeatureStateEvent getLastEvent( ) const { return m_aLastKnownStatus; } END_DECLARE_LISTENER_MULTIPLEXER() @@ -404,19 +404,19 @@ namespace dbaui BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXRowSetMultiplexer, ::com::sun::star::sdbc::XRowSetListener) DECLARE_MULTIPLEXER_VOID_METHOD(cursorMoved, ::com::sun::star::lang::EventObject) DECLARE_MULTIPLEXER_VOID_METHOD(rowChanged, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_VOID_METHOD(rowSetChanged, ::com::sun::star::lang::EventObject) + DECLARE_MULTIPLEXER_VOID_METHOD(rowSetChanged, ::com::sun::star::lang::EventObject) END_DECLARE_LISTENER_MULTIPLEXER() // ::com::sun::star::sdb::XRowSetApproveListener BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXRowSetApproveMultiplexer, ::com::sun::star::sdb::XRowSetApproveListener) DECLARE_MULTIPLEXER_BOOL_METHOD(approveCursorMove, ::com::sun::star::lang::EventObject) DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowChange, ::com::sun::star::sdb::RowChangeEvent) - DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowSetChange, ::com::sun::star::lang::EventObject) + DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowSetChange, ::com::sun::star::lang::EventObject) END_DECLARE_LISTENER_MULTIPLEXER() // ::com::sun::star::sdb::XSQLErrorListener BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXSQLErrorMultiplexer, ::com::sun::star::sdb::XSQLErrorListener) - DECLARE_MULTIPLEXER_VOID_METHOD(errorOccured, ::com::sun::star::sdb::SQLErrorEvent) + DECLARE_MULTIPLEXER_VOID_METHOD(errorOccured, ::com::sun::star::sdb::SQLErrorEvent) END_DECLARE_LISTENER_MULTIPLEXER() // ::com::sun::star::beans::XPropertyChangeListener diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 3ad5a4d93460..99ac2dbf1769 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,21 +39,21 @@ namespace dbaui class OSqlEdit : public MultiLineEditSyntaxHighlight, utl::ConfigurationListener { private: - Timer m_timerInvalidate; - Timer m_timerUndoActionCreation; - Link m_lnkTextModifyHdl; - String m_strOrigText; // wird beim Undo wiederhergestellt - OQueryTextView* m_pView; - BOOL m_bAccelAction; // Wird bei Cut, Copy, Paste gesetzt - BOOL m_bStopTimer; + Timer m_timerInvalidate; + Timer m_timerUndoActionCreation; + Link m_lnkTextModifyHdl; + String m_strOrigText; // wird beim Undo wiederhergestellt + OQueryTextView* m_pView; + BOOL m_bAccelAction; // Wird bei Cut, Copy, Paste gesetzt + BOOL m_bStopTimer; utl::SourceViewConfig m_SourceViewConfig; - svtools::ColorConfig m_ColorConfig; + svtools::ColorConfig m_ColorConfig; DECL_LINK(OnUndoActionTimer, void*); DECL_LINK(OnInvalidateTimer, void*); private: - void ImplSetFont(); + void ImplSetFont(); protected: virtual void KeyInput( const KeyEvent& rKEvt ); diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 554310078fb2..e7aaa6f8912f 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,9 +58,9 @@ namespace dbaui struct SQLMessageBox_Impl; class OSQLMessageBox : public ButtonDialog { - FixedImage m_aInfoImage; - FixedText m_aTitle; - FixedText m_aMessage; + FixedImage m_aInfoImage; + FixedText m_aTitle; + FixedText m_aMessage; ::rtl::OUString m_sHelpURL; ::std::auto_ptr< SQLMessageBox_Impl > m_pImpl; @@ -77,7 +77,7 @@ public: }; public: - /** display an SQLException with auto-recognizing a main and a detailed message + /** display an SQLException with auto-recognizing a main and a detailed message The first two messages from the exception chain are used as main and detailed message (recognizing the detailed field of an <type scope="com::sun::star::sdb">SQLContext</type>). @@ -89,10 +89,10 @@ public: const ::rtl::OUString& _rHelpURL = ::rtl::OUString() ); - /** display a database related error message + /** display a database related error message - @param rTitle the title to display - @param rMessage the detailed message to display + @param rTitle the title to display + @param rMessage the detailed message to display @param _eType determines the image to use. AUTO is disallowed in this constructor version */ OSQLMessageBox(Window* pParent, @@ -129,7 +129,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_SQLMESSAGE_HXX_ diff --git a/dbaccess/source/ui/inc/statusbarontroller.hxx b/dbaccess/source/ui/inc/statusbarontroller.hxx index 57d82d317605..e96616066898 100644 --- a/dbaccess/source/ui/inc/statusbarontroller.hxx +++ b/dbaccess/source/ui/inc/statusbarontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace dbaui { - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> OStatusbarController_BASE; + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> OStatusbarController_BASE; class OStatusbarController : public ::svt::StatusbarController, public OStatusbarController_BASE { diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 713026625d6f..88d02acde2f9 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,21 +46,21 @@ namespace dbaui */ class OStringListItem : public SfxPoolItem { - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aList; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aList; public: TYPEINFO(); OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rList); OStringListItem(const OStringListItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; + virtual int operator==(const SfxPoolItem& _rItem) const; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getList() const { return m_aList; } + ::com::sun::star::uno::Sequence< ::rtl::OUString > getList() const { return m_aList; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_STRINGLISTITEM_HXX_ diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 3b70a0324d46..6efcee71b872 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ protected: m_xConnection; // the connection we're working for, set in implOnNewConnection, called by UpdateTableList ::std::auto_ptr< ImageProvider > m_pImageProvider; // provider for our images - sal_Bool m_bVirtualRoot; // should the first entry be visible + sal_Bool m_bVirtualRoot; // should the first entry be visible bool m_bNoEmptyFolders; // should empty catalogs/schematas be prevented from being displayed? public: @@ -75,12 +75,12 @@ public: ~OTableTreeListBox(); - typedef ::std::pair< ::rtl::OUString,sal_Bool> TTableViewName; - typedef ::std::vector< TTableViewName > TNames; + typedef ::std::pair< ::rtl::OUString,sal_Bool> TTableViewName; + typedef ::std::vector< TTableViewName > TNames; void suppressEmptyFolders() { m_bNoEmptyFolders = true; } - /** call when HiContrast change. + /** call when HiContrast change. */ void notifyHiContrastChanged(); @@ -103,16 +103,16 @@ public: */ void UpdateTableList( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection - ) throw(::com::sun::star::sdbc::SQLException); + ) throw(::com::sun::star::sdbc::SQLException); /** fill the table list with the tables and views determined by the two given containers. The views sequence is used to determine which table is of type view. - @param _rxConnection the connection where you got the object names from. Must not be NULL. + @param _rxConnection the connection where you got the object names from. Must not be NULL. Used to split the full qualified names into it's parts. - @param _rTables table/view sequence - @param _rViews view sequence + @param _rTables table/view sequence + @param _rViews view sequence */ - void UpdateTableList( + void UpdateTableList( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _rTables, const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _rViews @@ -129,29 +129,29 @@ public: /** to be used if a foreign instance removed a table */ - void removedTable( const ::rtl::OUString& _rName ); + void removedTable( const ::rtl::OUString& _rName ); /** returns the fully qualified name of a table entry - @param _pEntry + @param _pEntry the entry whose name is to be obtained. Must not denote a folder entry. */ String getQualifiedTableName( SvLBoxEntry* _pEntry ) const; - SvLBoxEntry* getEntryByQualifiedName( const ::rtl::OUString& _rName ); + SvLBoxEntry* getEntryByQualifiedName( const ::rtl::OUString& _rName ); - SvLBoxEntry* getAllObjectsEntry() const; + SvLBoxEntry* getAllObjectsEntry() const; /** does a wildcard check of the given entry <p>There are two different 'checked' states: If the user checks all children of an entry, this is different from checking the entry itself. The second is called 'wildcard' checking, 'cause in the resulting table filter it's represented by a wildcard.</p> */ - void checkWildcard(SvLBoxEntry* _pEntry); + void checkWildcard(SvLBoxEntry* _pEntry); /** determine if the given entry is 'wildcard checked' @see checkWildcard */ - sal_Bool isWildcardChecked(SvLBoxEntry* _pEntry) const; + sal_Bool isWildcardChecked(SvLBoxEntry* _pEntry) const; protected: virtual void InitEntry(SvLBoxEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind); @@ -180,11 +180,11 @@ protected: sal_Bool haveVirtualRoot() const { return m_bVirtualRoot; } /** fill the table list with the tables and views determined by the two given containers - @param _rxConnection the connection where you got the object names from. Must not be NULL. + @param _rxConnection the connection where you got the object names from. Must not be NULL. Used to split the full qualified names into it's parts. - @param _rTables table/view sequence, the second argument is <TRUE/> if it is a table, otherwise it is a view. + @param _rTables table/view sequence, the second argument is <TRUE/> if it is a table, otherwise it is a view. */ - void UpdateTableList( + void UpdateTableList( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const TNames& _rTables ); @@ -192,7 +192,7 @@ protected: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_TABLETREE_HXX_ diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index dcda4a3acdb3..08af3e9d5809 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace dbaui */ static void bindItemStorages( SfxItemSet& _rSet, PropertyValues& _rValues ); - virtual short Execute(); + virtual short Execute(); private: ::std::auto_ptr< OTextConnectionHelper > m_pTextConnectionHelper; diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc index dfd035d42500..1706cdbffa6a 100644 --- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc +++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,49 +33,49 @@ #define MID_SBA_QRY_REFRESH \ Identifier = ID_BROWSER_REFRESH ; \ Text [ en-US ] = "Refresh"; \ - Text [ x-comment ] = " "; \ + Text [ x-comment ] = " "; \ #define MID_NEW_VIEW_DESIGN \ - Identifier = ID_NEW_VIEW_DESIGN; \ + Identifier = ID_NEW_VIEW_DESIGN; \ HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ; \ Text [ en-US ] = "New ~View Design" ; \ #define MID_NEW_TABLE_DESIGN \ - Identifier = ID_NEW_TABLE_DESIGN; \ + Identifier = ID_NEW_TABLE_DESIGN; \ HelpId = HID_BROWSER_TABLE_CREATE_DESIGN ; \ Text [ en-US ] = "New ~Table Design" ;\ - -#define MID_QUERY_WIZARD \ - Identifier = ID_NEW_QUERY_WIZARD; \ + +#define MID_QUERY_WIZARD \ + Identifier = ID_NEW_QUERY_WIZARD; \ HelpId = HID_BROWSER_QUERY_WIZARD ; \ - Text[ en-US ] = "Query AutoPilot..."; \ + Text[ en-US ] = "Query AutoPilot..."; \ -#define MID_QUERY_NEW_DESIGN \ - Identifier = ID_NEW_QUERY_DESIGN; \ +#define MID_QUERY_NEW_DESIGN \ + Identifier = ID_NEW_QUERY_DESIGN; \ HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ; \ Text [ en-US ] = "New ~Query (Design View)" ; \ -#define MID_QUERY_EDIT_DESIGN \ - Identifier = ID_EDIT_QUERY_DESIGN; \ +#define MID_QUERY_EDIT_DESIGN \ + Identifier = ID_EDIT_QUERY_DESIGN; \ HelpId = HID_BROWSER_QUERY_EDIT ; \ Text [ en-US ] = "~Edit Query" ; \ -#define MID_QUERY_NEW_SQL \ - Identifier = ID_NEW_QUERY_SQL; \ +#define MID_QUERY_NEW_SQL \ + Identifier = ID_NEW_QUERY_SQL; \ HelpId = HID_BROWSER_QUERY_CREATE_TEXT ; \ Text [ en-US ] = "New Query (~SQL View)" ; \ -#define MID_DBUI_QUERY_EDIT_JOINCONNECTION \ - Identifier = ID_QUERY_EDIT_JOINCONNECTION; \ - HelpId = HID_QUERY_EDIT_JOINCONNECTION ; \ - Text [ en-US ] = "Edit..."; \ +#define MID_DBUI_QUERY_EDIT_JOINCONNECTION \ + Identifier = ID_QUERY_EDIT_JOINCONNECTION; \ + HelpId = HID_QUERY_EDIT_JOINCONNECTION ; \ + Text [ en-US ] = "Edit..."; \ #define MID_COLUMN_WIDTH\ @@ -87,14 +87,14 @@ #define MID_DOCUMENT_CREATE_REPWIZ\ Identifier = ID_DOCUMENT_CREATE_REPWIZ ;\ HelpID = HID_DOCUMENT_CREATE_REPWIZ ;\ - Text [ en-US ] = "Report Wizard..."; \ + Text [ en-US ] = "Report Wizard..."; \ -#define MID_DOCUMENT_NEW_AUTOPILOT \ - Identifier = SID_DB_FORM_NEW_PILOT; \ +#define MID_DOCUMENT_NEW_AUTOPILOT \ + Identifier = SID_DB_FORM_NEW_PILOT; \ HelpID = SID_DB_FORM_NEW_PILOT ;\ - Text [ en-US ] = "Form AutoPilot..."; \ - + Text [ en-US ] = "Form AutoPilot..."; \ -#endif // DBAUI_TOOLBOX_HXX +#endif // DBAUI_TOOLBOX_HXX + diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index 96ab7e3175d6..8779c351c34e 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,15 +39,15 @@ class PopupMenu; namespace dbaui { - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> TToolboxController_BASE; + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> TToolboxController_BASE; class OToolboxController : public ::svt::ToolboxController ,public TToolboxController_BASE { DECLARE_STL_USTRINGACCESS_MAP(sal_Bool,TCommandState); - OModuleClient m_aModuleClient; - TCommandState m_aStates; - sal_uInt16 m_nToolBoxId; + OModuleClient m_aModuleClient; + TCommandState m_aStates; + sal_uInt16 m_nToolBoxId; ::std::auto_ptr<PopupMenu> getMenu(); public: diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index 0bcbcdabe095..f8bb1541d02f 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,11 +40,11 @@ namespace dbaui class OSqlEditUndoAct : public OCommentUndoAction { protected: - OSqlEdit* m_pOwner; - String m_strNextText; + OSqlEdit* m_pOwner; + String m_strNextText; - virtual void Undo() { ToggleText(); } - virtual void Redo() { ToggleText(); } + virtual void Undo() { ToggleText(); } + virtual void Redo() { ToggleText(); } void ToggleText(); public: diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 3ad794e9c52e..2d2ab40bfdba 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,13 +54,13 @@ class ODatabaseAdministrationDialog { OModuleClient m_aModuleClient; protected: - SfxItemSet* m_pDatasourceItems; // item set for the dialog - SfxItemPool* m_pItemPool; // item pool for the item set for the dialog - SfxPoolItem** m_pItemPoolDefaults; // pool defaults - ::dbaccess::ODsnTypeCollection* - m_pCollection; // datasource type collection + SfxItemSet* m_pDatasourceItems; // item set for the dialog + SfxItemPool* m_pItemPool; // item pool for the item set for the dialog + SfxPoolItem** m_pItemPoolDefaults; // pool defaults + ::dbaccess::ODsnTypeCollection* + m_pCollection; // datasource type collection - ::com::sun::star::uno::Any m_aInitialSelection; + ::com::sun::star::uno::Any m_aInitialSelection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; protected: @@ -73,7 +73,7 @@ protected: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_UNOADMIN_ diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index deb68c99b6a0..0d6ef5da40c5 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,12 +70,12 @@ namespace dbaui class ImageProvider; // ===================================================================== - typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XStatusListener - , ::com::sun::star::view::XSelectionSupplier + typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XStatusListener + , ::com::sun::star::view::XSelectionSupplier , ::com::sun::star::document::XScriptInvocationContext , ::com::sun::star::ui::XContextMenuInterception , ::com::sun::star::sdb::XDatabaseRegistrationsListener - > SbaTableQueryBrowser_Base; + > SbaTableQueryBrowser_Base; class SbaTableQueryBrowser :public SbaXDataBrowserController ,public SbaTableQueryBrowser_Base @@ -85,8 +85,8 @@ namespace dbaui protected: // --------------------------- - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xCurrentFrameParent; + ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xCurrentFrameParent; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMainToolbar; // --------------------------- @@ -104,30 +104,30 @@ namespace dbaui typedef ::std::map< sal_uInt16, ExternalFeature, ::std::less< sal_uInt16 > > ExternalFeaturesMap; ExternalFeaturesMap m_aExternalFeatures; - ::svx::ODataAccessDescriptor m_aDocumentDataSource; + ::svx::ODataAccessDescriptor m_aDocumentDataSource; // if we're part of a document, this is the state of the DocumentDataSource slot - ::cppu::OInterfaceContainerHelper m_aSelectionListeners; - ::cppu::OInterfaceContainerHelper m_aContextMenuInterceptors; + ::cppu::OInterfaceContainerHelper m_aSelectionListeners; + ::cppu::OInterfaceContainerHelper m_aContextMenuInterceptors; OTableCopyHelper::DropDescriptor m_aAsyncDrop; OTableCopyHelper m_aTableCopyHelper; - ::rtl::OUString m_sQueryCommand; // the command of the query currently loaded (if any) + ::rtl::OUString m_sQueryCommand; // the command of the query currently loaded (if any) //::rtl::OUString m_sToBeLoaded; // contains the element name which should be loaded if any - DBTreeView* m_pTreeView; - Splitter* m_pSplitter; - SvLBoxTreeList* m_pTreeModel; // contains the datasources of the registry - SvLBoxEntry* m_pCurrentlyDisplayed; - ULONG m_nAsyncDrop; + DBTreeView* m_pTreeView; + Splitter* m_pSplitter; + SvLBoxTreeList* m_pTreeModel; // contains the datasources of the registry + SvLBoxEntry* m_pCurrentlyDisplayed; + ULONG m_nAsyncDrop; - sal_Int16 m_nBorder; // TRUE when border should be shown + sal_Int16 m_nBorder; // TRUE when border should be shown - sal_Bool m_bQueryEscapeProcessing : 1; // the escape processing flag of the query currently loaded (if any) - sal_Bool m_bShowMenu; // if TRUE the menu should be visible otherwise not - sal_Bool m_bInSuspend; - sal_Bool m_bEnableBrowser; + sal_Bool m_bQueryEscapeProcessing : 1; // the escape processing flag of the query currently loaded (if any) + sal_Bool m_bShowMenu; // if TRUE the menu should be visible otherwise not + sal_Bool m_bInSuspend; + sal_Bool m_bEnableBrowser; ::boost::optional< bool > m_aDocScriptSupport; // relevant if and only if we are associated with exactly one DBDoc @@ -166,7 +166,7 @@ namespace dbaui // late construction virtual sal_Bool Construct(Window* pParent); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -180,7 +180,7 @@ namespace dbaui virtual void SAL_CALL attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw(::com::sun::star::uno::RuntimeException); @@ -226,7 +226,7 @@ namespace dbaui virtual sal_Bool InitializeGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid); virtual sal_Bool preReloadForm(); - virtual void postReloadForm(); + virtual void postReloadForm(); virtual void addModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); virtual void removeModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); @@ -238,15 +238,15 @@ namespace dbaui virtual void criticalFail(); - virtual void describeSupportedFeatures(); - virtual FeatureState GetState(sal_uInt16 nId) const; - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void describeSupportedFeatures(); + virtual FeatureState GetState(sal_uInt16 nId) const; + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); // IControlActionListener overridables virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const; - virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); - virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); - virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); + virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); + virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); // IContextMenuProvider virtual PopupMenu* getContextMenu( Control& _rControl ) const; @@ -264,18 +264,18 @@ namespace dbaui virtual void SelectionChanged(); // methods for showing/hiding the explorer part - sal_Bool haveExplorer() const; - void hideExplorer(); - void showExplorer(); - void toggleExplorer() { if (haveExplorer()) hideExplorer(); else showExplorer(); } + sal_Bool haveExplorer() const; + void hideExplorer(); + void showExplorer(); + void toggleExplorer() { if (haveExplorer()) hideExplorer(); else showExplorer(); } // methods for handling the 'selection' (paintin them bold) of SvLBoxEntries // returns <TRUE/> if the entry is selected (which means it's part of the selected path) - sal_Bool isSelected(SvLBoxEntry* _pEntry) const; + sal_Bool isSelected(SvLBoxEntry* _pEntry) const; // select the entry (and only the entry, not the whole path) - void select(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); + void select(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); // select the path of the entry (which must be an entry without children) - void selectPath(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); + void selectPath(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); @@ -290,7 +290,7 @@ namespace dbaui <p>The slot is available if an external dispatcher is responsible for it, _and_ if this dispatcher told us the slot is available.</p> */ - sal_Bool getExternalSlotState( sal_uInt16 _nId ) const; + sal_Bool getExternalSlotState( sal_uInt16 _nId ) const; /** add an entry (including the subentries for queries/tables) to the list model @@ -320,17 +320,17 @@ namespace dbaui void unloadAndCleanup( sal_Bool _bDisposeConnection = sal_True ); // disposes the connection associated with the given entry (which must represent a data source) - void disposeConnection( SvLBoxEntry* _pDSEntry ); + void disposeConnection( SvLBoxEntry* _pDSEntry ); /// flushs and disposes the given connection, and de-registers as listener void impl_releaseConnection( SharedConnection& _rxConnection ); /** close the connection (and collapse the list entries) of the given list entries */ - void closeConnection(SvLBoxEntry* _pEntry,sal_Bool _bDisposeConnection = sal_True); + void closeConnection(SvLBoxEntry* _pEntry,sal_Bool _bDisposeConnection = sal_True); void populateTree(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xNameAccess, SvLBoxEntry* _pParent, EntryType _eEntryType); - void initializeTreeModel(); + void initializeTreeModel(); /** search in the tree for query- or tablecontainer equal to this interface and return this container entry @@ -346,22 +346,22 @@ namespace dbaui ::std::auto_ptr< ImageProvider > getImageProviderFor( SvLBoxEntry* _pAnyEntry ); - void implAdministrate( SvLBoxEntry* _pApplyTo ); + void implAdministrate( SvLBoxEntry* _pApplyTo ); TransferableHelper* implCopyObject( SvLBoxEntry* _pApplyTo, sal_Int32 _nCommandType, sal_Bool _bAllowConnection = sal_True ); - EntryType getEntryType( SvLBoxEntry* _pEntry ) const; - EntryType getChildType( SvLBoxEntry* _pEntry ) const; - sal_Bool isObject( EntryType _eType ) const { return ( etTableOrView== _eType ) || ( etQuery == _eType ); } - sal_Bool isContainer( EntryType _eType ) const { return (etTableContainer == _eType) || (etQueryContainer == _eType); } - sal_Bool isContainer( SvLBoxEntry* _pEntry ) const { return isContainer( getEntryType( _pEntry ) ); } + EntryType getEntryType( SvLBoxEntry* _pEntry ) const; + EntryType getChildType( SvLBoxEntry* _pEntry ) const; + sal_Bool isObject( EntryType _eType ) const { return ( etTableOrView== _eType ) || ( etQuery == _eType ); } + sal_Bool isContainer( EntryType _eType ) const { return (etTableContainer == _eType) || (etQueryContainer == _eType); } + sal_Bool isContainer( SvLBoxEntry* _pEntry ) const { return isContainer( getEntryType( _pEntry ) ); } // ensure that the xObject for the given entry is set on the user data - sal_Bool ensureEntryObject( SvLBoxEntry* _pEntry ); + sal_Bool ensureEntryObject( SvLBoxEntry* _pEntry ); // get the display text of the entry given - String GetEntryText( SvLBoxEntry* _pEntry ) const; + String GetEntryText( SvLBoxEntry* _pEntry ) const; // is called when a table or a query was selected DECL_LINK( OnSelectionChange, void* ); @@ -448,7 +448,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connectWithStatus( const ::rtl::OUString& _rDataSourceName, - void* _pTreeListUserData // in rela a DBTreeListUserData*, but we do not know this class here .... + void* _pTreeListUserData // in rela a DBTreeListUserData*, but we do not know this class here .... ); #ifdef DBG_UTIL @@ -475,9 +475,9 @@ namespace dbaui /** checks if the currently displayed entry changed - @param _sName + @param _sName Name of the changed entry - @param _pContainer + @param _pContainer The container of the displayed entry @return <TRUE/> if it is the currently displayed otherwise <FALSE/> @@ -491,7 +491,7 @@ namespace dbaui }; // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... #endif // _SBA_UNODATBR_HXX_ diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 0022ab64af77..c5c7078d599d 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ class OSQLMessageDialog OModuleClient m_aModuleClient; protected: // <properties> - ::com::sun::star::uno::Any m_aException; + ::com::sun::star::uno::Any m_aException; ::rtl::OUString m_sHelpURL; // </properties> @@ -78,11 +78,11 @@ protected: virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& _rConvertedValue, com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const com::sun::star::uno::Any& _rValue) throw(com::sun::star::lang::IllegalArgumentException); // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_UNOSQLMESSAGE_HXX_ diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 4473031808fe..ce0e28f7b165 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows, ,m_bAppendFirstLine(false) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ODatabaseExport" ); - DBG_CTOR(ODatabaseExport,NULL); + DBG_CTOR(ODatabaseExport,NULL); m_nRows += nRows; sal_Int32 nCount = 0; @@ -182,7 +182,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, ,m_bAppendFirstLine(false) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ODatabaseExport" ); - DBG_CTOR(ODatabaseExport,NULL); + DBG_CTOR(ODatabaseExport,NULL); try { SvtSysLocale aSysLocale; @@ -232,53 +232,53 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); sal_Int32 nType = aValue; ++nPos; - + if( nType == DataType::VARCHAR ) { - m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); - - m_pTypeInfo->aTypeName = sTypeName; - m_pTypeInfo->nType = nType; - + m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); + + m_pTypeInfo->aTypeName = sTypeName; + m_pTypeInfo->nType = nType; + OSL_ENSURE((nPos) < static_cast<sal_Int32>(aTypes.size()),"aTypes: Illegal index for vector"); aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->nPrecision = aValue; + m_pTypeInfo->nPrecision = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->aLiteralPrefix = aValue; + m_pTypeInfo->aLiteralPrefix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->aLiteralSuffix = aValue; + m_pTypeInfo->aLiteralSuffix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->aCreateParams = aValue; + m_pTypeInfo->aCreateParams = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; + m_pTypeInfo->bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bCaseSensitive = (sal_Bool)aValue; + m_pTypeInfo->bCaseSensitive = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->nSearchType = aValue; + m_pTypeInfo->nSearchType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bUnsigned = (sal_Bool)aValue; + m_pTypeInfo->bUnsigned = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bCurrency = (sal_Bool)aValue; + m_pTypeInfo->bCurrency = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bAutoIncrement = (sal_Bool)aValue; + m_pTypeInfo->bAutoIncrement = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->aLocalTypeName = aValue; + m_pTypeInfo->aLocalTypeName = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->nMinimumScale = aValue; + m_pTypeInfo->nMinimumScale = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->nMaximumScale = aValue; + m_pTypeInfo->nMaximumScale = aValue; // check if values are less than zero like it happens in a oracle jdbc driver if( m_pTypeInfo->nPrecision < 0) @@ -292,13 +292,13 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, } } // if(xSet.is()) if ( !m_pTypeInfo ) - m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); + m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); SetColumnTypes(pList,_pInfoMap); } //--------------------------------------------------------------------------- ODatabaseExport::~ODatabaseExport() { - DBG_DTOR(ODatabaseExport,NULL); + DBG_DTOR(ODatabaseExport,NULL); m_pFormatter = NULL; ODatabaseExport::TColumns::iterator aIter = m_aDestColumns.begin(); ODatabaseExport::TColumns::iterator aEnd = m_aDestColumns.end(); @@ -306,7 +306,7 @@ ODatabaseExport::~ODatabaseExport() for(;aIter != aEnd;++aIter) delete aIter->second; m_vDestVector.clear(); - m_aDestColumns.clear(); + m_aDestColumns.clear(); } // ----------------------------------------------------------------------------- void ODatabaseExport::insertValueIntoColumn() @@ -357,7 +357,7 @@ void ODatabaseExport::insertValueIntoColumn() { Reference< XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); Reference<XNumberFormatTypes> xNumType(xSupplier->getNumberFormats(),UNO_QUERY); - sal_Int16 nFormats[] = { + sal_Int16 nFormats[] = { NumberFormat::DATETIME ,NumberFormat::DATE ,NumberFormat::TIME @@ -454,7 +454,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl xProp->getPropertyValue(PROPERTY_TYPE) >>= nNumberFormat; } else - { + { Reference<XNumberFormatTypes> xNumType(xFormats,UNO_QUERY); sal_Int32 nFormatKey = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::ALL,m_aLocale),aCheckToken); fOutNumber = m_xFormatter->convertStringToNumber(nFormatKey,aCheckToken); @@ -462,7 +462,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl Reference<XPropertySet> xProp = xFormats->getByKey(nFormatKey); sal_Int16 nType = 0; xProp->getPropertyValue(PROPERTY_TYPE) >>= nType; - + switch(nType) { case NumberFormat::ALL: @@ -590,15 +590,15 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo sal_Int32 nDataType; sal_Int32 nLength(0),nScale(0); sal_Int16 nType = m_vNumberFormat[i] & ~NumberFormat::DEFINED; - + switch ( nType ) { case NumberFormat::ALL: nDataType = DataType::DOUBLE; break; case NumberFormat::DEFINED: - nDataType = DataType::VARCHAR; - nLength = ((m_vColumnSize[i] % 10 ) ? m_vColumnSize[i]/ 10 + 1: m_vColumnSize[i]/ 10) * 10; + nDataType = DataType::VARCHAR; + nLength = ((m_vColumnSize[i] % 10 ) ? m_vColumnSize[i]/ 10 + 1: m_vColumnSize[i]/ 10) * 10; break; case NumberFormat::DATE: nDataType = DataType::DATE; @@ -611,8 +611,8 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo break; case NumberFormat::CURRENCY: nDataType = DataType::NUMERIC; - nScale = 4; - nLength = 19; + nScale = 4; + nLength = 19; break; case NumberFormat::NUMBER: case NumberFormat::SCIENTIFIC: @@ -625,7 +625,7 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo case NumberFormat::LOGICAL: default: nDataType = DataType::VARCHAR; - nLength = ((m_vColumnSize[i] % 10 ) ? m_vColumnSize[i]/ 10 + 1: m_vColumnSize[i]/ 10) * 10; + nLength = ((m_vColumnSize[i] % 10 ) ? m_vColumnSize[i]/ 10 + 1: m_vColumnSize[i]/ 10) * 10; break; } OTypeInfoMap::const_iterator aFind = _pInfoMap->find(nDataType); @@ -651,7 +651,7 @@ void ODatabaseExport::CreateDefaultColumn(const ::rtl::OUString& _rColumnName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::CreateDefaultColumn" ); DBG_CHKTHIS(ODatabaseExport,NULL); - Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData()); + Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData()); sal_Int32 nMaxNameLen(xDestMetaData->getMaxColumnNameLength()); ::rtl::OUString aAlias = _rColumnName; if ( isSQL92CheckEnabled(m_xConnection) ) @@ -659,7 +659,7 @@ void ODatabaseExport::CreateDefaultColumn(const ::rtl::OUString& _rColumnName) if(nMaxNameLen && aAlias.getLength() > nMaxNameLen) aAlias = aAlias.copy(0, ::std::min<sal_Int32>( nMaxNameLen-1, aAlias.getLength() ) ); - + ::rtl::OUString sName(aAlias); if(m_aDestColumns.find(sName) != m_aDestColumns.end()) { @@ -747,10 +747,10 @@ sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _rTableName,const if(_aTextColor.hasValue()) m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,_aTextColor); } - m_bIsAutoIncrement = aWizard.shouldCreatePrimaryKey(); - m_vColumns = aWizard.GetColumnPositions(); - m_vColumnTypes = aWizard.GetColumnTypes(); - m_bAppendFirstLine = !aWizard.UseHeaderLine(); + m_bIsAutoIncrement = aWizard.shouldCreatePrimaryKey(); + m_vColumns = aWizard.GetColumnPositions(); + m_vColumnTypes = aWizard.GetColumnTypes(); + m_bAppendFirstLine = !aWizard.UseHeaderLine(); } break; default: @@ -763,9 +763,9 @@ sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _rTableName,const if(!bError) bError = !createRowSet(); } - catch( const SQLException&) + catch( const SQLException&) { - ::dbaui::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), &aWizard, m_xFactory ); + ::dbaui::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), &aWizard, m_xFactory ); bError = sal_True; } catch( const Exception& ) diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 2764d2fc6116..0ddc53d92d58 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,20 +75,20 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; -#define DBAUI_HTML_FONTSIZES 8 // wie Export, HTML-Options -#define HTML_META_NONE 0 -#define HTML_META_AUTHOR 1 -#define HTML_META_DESCRIPTION 2 -#define HTML_META_KEYWORDS 3 -#define HTML_META_REFRESH 4 +#define DBAUI_HTML_FONTSIZES 8 // wie Export, HTML-Options +#define HTML_META_NONE 0 +#define HTML_META_AUTHOR 1 +#define HTML_META_DESCRIPTION 2 +#define HTML_META_KEYWORDS 3 +#define HTML_META_REFRESH 4 #define HTML_META_CLASSIFICATION 5 -#define HTML_META_CREATED 6 -#define HTML_META_CHANGEDBY 7 -#define HTML_META_CHANGED 8 -#define HTML_META_GENERATOR 9 -#define HTML_META_SDFOOTNOTE 10 -#define HTML_META_SDENDNOTE 11 -#define HTML_META_CONTENT_TYPE 12 +#define HTML_META_CREATED 6 +#define HTML_META_CHANGEDBY 7 +#define HTML_META_CHANGED 8 +#define HTML_META_GENERATOR 9 +#define HTML_META_SDFOOTNOTE 10 +#define HTML_META_SDENDNOTE 11 +#define HTML_META_CONTENT_TYPE 12 // ========================================================================== DBG_NAME(OHTMLReader) @@ -99,7 +99,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, - const OTypeInfoMap* _pInfoMap) + const OTypeInfoMap* _pInfoMap) :HTMLParser(rIn) ,ODatabaseExport( _rxConnection, _rxNumberF, _rM, pList, _pInfoMap, rIn ) ,m_nTableCount(0) @@ -161,13 +161,13 @@ void OHTMLReader::NextToken( int nToken ) if ( nToken == HTML_META ) setTextEncoding(); - if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll + if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll { switch(nToken) { case HTML_TABLE_ON: ++m_nTableCount; - { // es kann auch TD oder TH sein, wenn es vorher kein TABLE gab + { // es kann auch TD oder TH sein, wenn es vorher kein TABLE gab const HTMLOptions* pHtmlOptions = GetOptions(); sal_Int16 nArrLen = pHtmlOptions->Count(); for ( sal_Int16 i = 0; i < nArrLen; i++ ) @@ -176,7 +176,7 @@ void OHTMLReader::NextToken( int nToken ) switch( pOption->GetToken() ) { case HTML_O_WIDTH: - { // Prozent: von Dokumentbreite bzw. aeusserer Zelle + { // Prozent: von Dokumentbreite bzw. aeusserer Zelle m_nColumnWidth = GetWidthPixel( pOption ); } break; @@ -187,7 +187,7 @@ void OHTMLReader::NextToken( int nToken ) case HTML_TBODY_ON: { sal_uInt32 nTell = rInput.Tell(); // verändert vielleicht die Position des Streams - if ( !m_xTable.is() ) + if ( !m_xTable.is() ) {// erste Zeile als Header verwenden m_bError = !CreateTable(nToken); if ( m_bAppendFirstLine ) @@ -406,7 +406,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor) String aFontName; xub_StrLen nPos = 0; while( nPos != STRING_NOTFOUND ) - { // Fontliste, VCL: Semikolon als Separator, HTML: Komma + { // Fontliste, VCL: Semikolon als Separator, HTML: Komma String aFName = rFace.GetToken( 0, ',', nPos ); aFName.EraseTrailingChars().EraseLeadingChars(); if( aFontName.Len() ) @@ -438,19 +438,19 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption* pOption ) DBG_CHKTHIS(OHTMLReader,NULL); const String& rOptVal = pOption->GetString(); if ( rOptVal.Search('%') != STRING_NOTFOUND ) - { // Prozent + { // Prozent DBG_ASSERT( m_nColumnWidth, "WIDTH Option: m_nColumnWidth==0 und Width%" ); return (sal_Int16)((pOption->GetNumber() * m_nColumnWidth) / 100); } else { if ( rOptVal.Search('*') != STRING_NOTFOUND ) - { // relativ zu was?!? + { // relativ zu was?!? //2do: ColArray aller relativen Werte sammeln und dann MakeCol return 0; } else - return (sal_Int16)pOption->GetNumber(); // Pixel + return (sal_Int16)pOption->GetNumber(); // Pixel } } // --------------------------------------------------------------------------- @@ -559,13 +559,13 @@ sal_Bool OHTMLReader::CreateTable(int nToken) CreateDefaultColumn(aColumnName); if ( m_vDestVector.empty() ) - return sal_False; + return sal_False; if(!aTableName.Len()) aTableName = aTempName; - m_bInTbl = sal_False; - m_bFoundTable = sal_True; + m_bInTbl = sal_False; + m_bFoundTable = sal_True; if ( isCheckEnabled() ) return sal_True; diff --git a/dbaccess/source/ui/misc/ModuleHelper.cxx b/dbaccess/source/ui/misc/ModuleHelper.cxx index 7a38e3df08eb..59f432022dbd 100644 --- a/dbaccess/source/ui/misc/ModuleHelper.cxx +++ b/dbaccess/source/ui/misc/ModuleHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace dbaui return s_aModule; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 386c17312221..4fc81391ebec 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,16 +48,16 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::lang; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; // export data -ORowSetImportExport::ORowSetImportExport( Window* _pParent, +ORowSetImportExport::ORowSetImportExport( Window* _pParent, const Reference< XResultSetUpdate >& _xResultSetUpdate, const ::svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XMultiServiceFactory >& _rM, const String& rExchange - ) - : ODatabaseImportExport(_aDataDescriptor,_rM,NULL,rExchange) + ) + : ODatabaseImportExport(_aDataDescriptor,_rM,NULL,rExchange) ,m_xTargetResultSetUpdate(_xResultSetUpdate) ,m_xTargetRowUpdate(_xResultSetUpdate,UNO_QUERY) ,m_pParent(_pParent) @@ -70,15 +70,15 @@ ORowSetImportExport::ORowSetImportExport( Window* _pParent, void ORowSetImportExport::initialize() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::initialize" ); - ODatabaseImportExport::initialize(); - // do namemapping + ODatabaseImportExport::initialize(); + // do namemapping Reference<XColumnLocate> xColumnLocate(m_xResultSet,UNO_QUERY); OSL_ENSURE(xColumnLocate.is(),"The rowset normally should support this"); m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData(); if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() ) throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); - + sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount(); m_aColumnMapping.reserve(nCount); m_aColumnTypes.reserve(nCount); @@ -97,7 +97,7 @@ void ORowSetImportExport::initialize() if(m_xTargetResultSetMetaData->isNullable(i)) nPos = 0; // column doesn't exists but we could set it to null } - } + } m_aColumnMapping.push_back(nPos); if(nPos > 0) @@ -126,7 +126,7 @@ BOOL ORowSetImportExport::Read() if(m_aSelection.getLength()) { const Any* pBegin = m_aSelection.getConstArray(); - const Any* pEnd = pBegin + m_aSelection.getLength(); + const Any* pEnd = pBegin + m_aSelection.getLength(); for(;pBegin != pEnd && bContinue;++pBegin) { sal_Int32 nPos = -1; @@ -161,7 +161,7 @@ BOOL ORowSetImportExport::Read() if(!m_pRowMarker || m_pRowMarker[nRowFilterIndex] == nCurrentRow) { ++nRowFilterIndex; - bContinue = insertNewRow(); + bContinue = insertNewRow(); } } } diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index f4f1ae4013cb..725b82297a5e 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,13 +69,13 @@ DBG_NAME(ORTFReader) // ========================================================================== // ORTFReader // ========================================================================== -ORTFReader::ORTFReader( SvStream& rIn, +ORTFReader::ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap) - :SvRTFParser(rIn) + :SvRTFParser(rIn) ,ODatabaseExport( _rxConnection, _rxNumberF, _rM, pList, _pInfoMap, rIn ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" ); @@ -91,7 +91,7 @@ ORTFReader::ORTFReader(SvStream& rIn, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, sal_Bool _bAutoIncrementEnabled) - :SvRTFParser(rIn) + :SvRTFParser(rIn) ,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rM, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" ); @@ -122,7 +122,7 @@ void ORTFReader::NextToken( int nToken ) if(m_bError || !m_nRows) // falls Fehler oder keine Rows mehr zur "Uberpr"ufung dann gleich zur"uck return; - if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll + if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll { switch(nToken) { @@ -138,9 +138,9 @@ void ORTFReader::NextToken( int nToken ) { switch(nTmpToken2) { - case RTF_RED: aColor.SetRed((sal_uInt8)nTokenValue); break; - case RTF_BLUE: aColor.SetBlue((sal_uInt8)nTokenValue); break; - case RTF_GREEN: aColor.SetGreen((sal_uInt8)nTokenValue); break; + case RTF_RED: aColor.SetRed((sal_uInt8)nTokenValue); break; + case RTF_BLUE: aColor.SetBlue((sal_uInt8)nTokenValue); break; + case RTF_GREEN: aColor.SetGreen((sal_uInt8)nTokenValue); break; default: bNext = sal_False; } @@ -278,7 +278,7 @@ sal_Bool ORTFReader::CreateTable(int nToken) String aTableName(ModuleRes(STR_TBL_TITLE)); aTableName = aTableName.GetToken(0,' '); aTableName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTableName))); - + int nTmpToken2 = nToken; String aColumnName; @@ -315,8 +315,8 @@ sal_Bool ORTFReader::CreateTable(int nToken) } break; case RTF_CF: - // if(nTokenValue < m_vecColor.size()) - // m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,makeAny(m_vecColor[nTokenValue])); + // if(nTokenValue < m_vecColor.size()) + // m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,makeAny(m_vecColor[nTokenValue])); break; case RTF_B: aFont.Weight = ::com::sun::star::awt::FontWeight::BOLD; @@ -344,15 +344,15 @@ sal_Bool ORTFReader::CreateTable(int nToken) CreateDefaultColumn(aColumnName); } - m_bInTbl = sal_False; - m_bFoundTable = sal_True; + m_bInTbl = sal_False; + m_bFoundTable = sal_True; if ( isCheckEnabled() ) return sal_True; Any aTextColor; if(!m_vecColor.empty()) aTextColor <<= m_vecColor[0]; - + bOk = !executeWizard(aTableName,aTextColor,aFont) && m_xTable.is(); } return bOk; diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 8cca42ddf1b4..eb031d074420 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -197,7 +197,7 @@ void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteDa // ----------------------------------------------------------------------------- void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId - ,const TransferableDataHelper& _rTransData + ,const TransferableDataHelper& _rTransData ,const ::rtl::OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { @@ -219,8 +219,8 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId else const_cast<TransferableDataHelper&>(_rTransData).GetSotStorageStream(SOT_FORMAT_RTF,aTrans.aHtmlRtfStorage); - aTrans.nType = E_TABLE; - aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId; + aTrans.nType = E_TABLE; + aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !copyTagTable(aTrans,sal_False,_xConnection) ) m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString::createFromAscii("S1000") ,0,Any())); @@ -239,7 +239,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId } // ----------------------------------------------------------------------------- -void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData +void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData ,const ::rtl::OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { @@ -269,17 +269,17 @@ sal_Bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc //dyf add 20070601 //set the selected tablename pImport->setSTableName(_rDesc.sDefaultTableName); - //dyf add end + //dyf add end pImport->setStream(pStream); return pImport->Read(); } // ----------------------------------------------------------------------------- sal_Bool OTableCopyHelper::isTableFormat(const TransferableDataHelper& _rClipboard) const { - sal_Bool bTableFormat = _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE) - || _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) - || _rClipboard.HasFormat(SOT_FORMAT_RTF) - || _rClipboard.HasFormat(SOT_FORMATSTR_ID_HTML); + sal_Bool bTableFormat = _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE) + || _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) + || _rClipboard.HasFormat(SOT_FORMAT_RTF) + || _rClipboard.HasFormat(SOT_FORMATSTR_ID_HTML); return bTableFormat; } @@ -297,8 +297,8 @@ sal_Bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedD else const_cast<TransferableDataHelper&>(_aDroppedData).GetSotStorageStream(SOT_FORMAT_RTF,_rAsyncDrop.aHtmlRtfStorage); - _rAsyncDrop.bHtml = bHtml; - _rAsyncDrop.bError = !copyTagTable(_rAsyncDrop,sal_True,_xConnection); + _rAsyncDrop.bHtml = bHtml; + _rAsyncDrop.bError = !copyTagTable(_rAsyncDrop,sal_True,_xConnection); bRet = ( !_rAsyncDrop.bError && _rAsyncDrop.aHtmlRtfStorage.Is() ); if ( bRet ) @@ -339,7 +339,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index e165df1c7b1b..82d2bfddb827 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,12 +87,12 @@ const char __FAR_DATA ODatabaseImportExport::sNewLine = '\012'; const char __FAR_DATA ODatabaseImportExport::sNewLine[] = "\015\012"; #endif -const static char __FAR_DATA sMyBegComment[] = "<!-- "; -const static char __FAR_DATA sMyEndComment[] = " -->"; -const static char __FAR_DATA sFontFamily[] = "font-family: "; -const static char __FAR_DATA sFontSize[] = "font-size: "; +const static char __FAR_DATA sMyBegComment[] = "<!-- "; +const static char __FAR_DATA sMyEndComment[] = " -->"; +const static char __FAR_DATA sFontFamily[] = "font-family: "; +const static char __FAR_DATA sFontSize[] = "font-size: "; -#define SBA_FORMAT_SELECTION_COUNT 4 +#define SBA_FORMAT_SELECTION_COUNT 4 #define CELL_X 1437 DBG_NAME(ODatabaseImportExport) @@ -202,7 +202,7 @@ void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) thro dispose(); m_bNeedToReInitialize = true; //if(!m_bInInitialize) - // initialize(); + // initialize(); } } // ----------------------------------------------------------------------------- @@ -221,7 +221,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor { m_sDataSourceName = _aDataDescriptor.getDataSource(); _aDataDescriptor[daCommandType] >>= m_nCommandType; - _aDataDescriptor[daCommand] >>= m_sName; + _aDataDescriptor[daCommand] >>= m_sName; // some additonal information if(_aDataDescriptor.has(daConnection)) { @@ -284,7 +284,7 @@ void ODatabaseImportExport::initialize() m_bNeedToReInitialize = false; if ( !m_xConnection.is() ) - { // we need a connection + { // we need a connection OSL_ENSURE(m_sDataSourceName.getLength(),"There must be a datsource name!"); Reference<XNameAccess> xDatabaseContext = Reference< XNameAccess >(m_xFactory->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY); Reference< XEventListener> xEvt((::cppu::OWeakObject*)this,UNO_QUERY); @@ -400,8 +400,8 @@ BOOL ORTFImportExport::Write() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFImportExport::Write" ); ODatabaseImportExport::Write(); - (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_RTF; - (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << ODatabaseImportExport::sNewLine; + (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_RTF; + (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << ODatabaseImportExport::sNewLine; rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252; /* @@ -452,14 +452,14 @@ BOOL ORTFImportExport::Write() } */ - BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); - BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); - BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); - BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); + BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); + BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); + BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); + BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); sal_Int32 nColor = 0; if(m_xObject.is()) - m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; + m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; ::Color aColor(nColor); ByteString aFonts(String(m_aFont.Name),eDestEnc); @@ -471,7 +471,7 @@ BOOL ORTFImportExport::Write() ::rtl::OString aFormat("\\fcharset0\\fnil "); ByteString aFontNr; - (*m_pStream) << "{\\fonttbl"; + (*m_pStream) << "{\\fonttbl"; xub_StrLen nTokenCount = aFonts.GetTokenCount(); for(xub_StrLen j=0;j<nTokenCount;++j) { @@ -549,10 +549,10 @@ BOOL ORTFImportExport::Write() const char* pChar; switch( nAlign ) { - case 1: pChar = OOO_STRING_SVTOOLS_RTF_QC; break; - case 2: pChar = OOO_STRING_SVTOOLS_RTF_QR; break; + case 1: pChar = OOO_STRING_SVTOOLS_RTF_QC; break; + case 2: pChar = OOO_STRING_SVTOOLS_RTF_QR; break; case 0: - default:pChar = OOO_STRING_SVTOOLS_RTF_QL; break; + default:pChar = OOO_STRING_SVTOOLS_RTF_QL; break; } pHorzChar[i-1] = pChar; // um sp"ater nicht immer im ITEMSET zuw"uhlen @@ -561,10 +561,10 @@ BOOL ORTFImportExport::Write() (*m_pStream) << '{'; (*m_pStream) << OOO_STRING_SVTOOLS_RTF_QC; // column header always centered - if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B; - if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I; - if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL; - if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE; + if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B; + if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I; + if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL; + if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE; (*m_pStream) << aFS; (*m_pStream) << ' '; @@ -573,7 +573,7 @@ BOOL ORTFImportExport::Write() (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL; (*m_pStream) << '}'; (*m_pStream) << ODatabaseImportExport::sNewLine; - (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; + (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; } (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ROW; @@ -587,7 +587,7 @@ BOOL ORTFImportExport::Write() if ( m_aSelection.getLength() ) { const Any* pSelIter = m_aSelection.getConstArray(); - const Any* pEnd = pSelIter + m_aSelection.getLength(); + const Any* pEnd = pSelIter + m_aSelection.getLength(); sal_Bool bContinue = sal_True; for( ; pSelIter != pEnd && bContinue; ++pSelIter ) @@ -642,10 +642,10 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou (*m_pStream) << ODatabaseImportExport::sNewLine; } - const BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); - const BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); - const BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); - const BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); + const BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); + const BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); + const BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); + const BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); static const ::rtl::OString aFS2("\\fs20\\f1\\cf0\\cb1"); ::comphelper::ComponentContext aContext(m_xFactory); Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY); @@ -658,10 +658,10 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou (*m_pStream) << '{'; (*m_pStream) << pHorzChar[i-1]; - if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B; - if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I; - if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL; - if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE; + if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B; + if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I; + if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL; + if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE; (*m_pStream) << aFS2; (*m_pStream) << ' '; @@ -684,7 +684,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL; (*m_pStream) << '}'; (*m_pStream) << ODatabaseImportExport::sNewLine; - (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; + (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; } (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ROW << ODatabaseImportExport::sNewLine; (*m_pStream) << '}'; @@ -726,17 +726,17 @@ const char __FAR_DATA OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t //======================================================================== // Makros fuer HTML-Export //======================================================================== -#define OUT_PROLOGUE() ((*m_pStream) << sHTML30_Prologue << ODatabaseImportExport::sNewLine << ODatabaseImportExport::sNewLine) -#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag ) -#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, FALSE ) -#define OUT_STR( str ) HTMLOutFuncs::Out_String( (*m_pStream), str ) -#define OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine << GetIndentStr() -#define lcl_OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine -#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) -#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) -#define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule ) -#define OUT_COMMENT( comment ) ((*m_pStream) << sMyBegComment, OUT_STR( comment ) << sMyEndComment << ODatabaseImportExport::sNewLine << GetIndentStr()) -#define lcl_OUT_COMMENT( comment ) ((*m_pStream) << sMyBegComment, OUT_STR( comment ) << sMyEndComment << ODatabaseImportExport::sNewLine) +#define OUT_PROLOGUE() ((*m_pStream) << sHTML30_Prologue << ODatabaseImportExport::sNewLine << ODatabaseImportExport::sNewLine) +#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag ) +#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, FALSE ) +#define OUT_STR( str ) HTMLOutFuncs::Out_String( (*m_pStream), str ) +#define OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine << GetIndentStr() +#define lcl_OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine +#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) +#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) +#define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule ) +#define OUT_COMMENT( comment ) ((*m_pStream) << sMyBegComment, OUT_STR( comment ) << sMyEndComment << ODatabaseImportExport::sNewLine << GetIndentStr()) +#define lcl_OUT_COMMENT( comment ) ((*m_pStream) << sMyBegComment, OUT_STR( comment ) << sMyEndComment << ODatabaseImportExport::sNewLine) //------------------------------------------------------------------- OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor, @@ -839,7 +839,7 @@ void OHTMLImportExport::WriteBody() (*m_pStream) << '<' << OOO_STRING_SVTOOLS_HTML_body << ' ' << OOO_STRING_SVTOOLS_HTML_O_text << '='; sal_Int32 nColor = 0; if(m_xObject.is()) - m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; + m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; ::Color aColor(nColor); HTMLOutFuncs::Out_Color( (*m_pStream), aColor ); @@ -883,21 +883,21 @@ void OHTMLImportExport::WriteTables() } } - aStrOut = aStrOut + " "; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_align; - aStrOut = aStrOut + "="; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_AL_left; - aStrOut = aStrOut + " "; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cellspacing; - aStrOut = aStrOut + "="; - aStrOut = aStrOut + ::rtl::OString::valueOf((sal_Int32)nCellSpacing); - aStrOut = aStrOut + " "; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cols; - aStrOut = aStrOut + "="; - aStrOut = aStrOut + ::rtl::OString::valueOf(aNames.getLength()); - aStrOut = aStrOut + " "; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_border; - aStrOut = aStrOut + "=1"; + aStrOut = aStrOut + " "; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_align; + aStrOut = aStrOut + "="; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_AL_left; + aStrOut = aStrOut + " "; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cellspacing; + aStrOut = aStrOut + "="; + aStrOut = aStrOut + ::rtl::OString::valueOf((sal_Int32)nCellSpacing); + aStrOut = aStrOut + " "; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cols; + aStrOut = aStrOut + "="; + aStrOut = aStrOut + ::rtl::OString::valueOf(aNames.getLength()); + aStrOut = aStrOut + " "; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_border; + aStrOut = aStrOut + "=1"; IncIndent(1); TAG_ON( aStrOut ); @@ -907,7 +907,7 @@ void OHTMLImportExport::WriteTables() TAG_ON( OOO_STRING_SVTOOLS_HTML_caption ); TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); - (*m_pStream) << ::rtl::OString(m_sName,m_sName.getLength(), gsl_getSystemTextEncoding()); + (*m_pStream) << ::rtl::OString(m_sName,m_sName.getLength(), gsl_getSystemTextEncoding()); // TODO : think about the encoding of the name TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption ); @@ -953,9 +953,9 @@ void OHTMLImportExport::WriteTables() switch( nAlign ) { - case 1: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_center; break; - case 2: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_right; break; - default: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_left; break; + case 1: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_center; break; + case 2: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_right; break; + default: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_left; break; } if(i == aNames.getLength()-1) @@ -1036,8 +1036,8 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteCell" ); ::rtl::OString aStrTD = pHtmlTag; - nWidthPixel = nWidthPixel ? nWidthPixel : 86; - nHeightPixel = nHeightPixel ? nHeightPixel : 17; + nWidthPixel = nWidthPixel ? nWidthPixel : 86; + nHeightPixel = nHeightPixel ? nHeightPixel : 17; // trotz der <TABLE COLS=n> und <COL WIDTH=x> Angaben noetig, // da die nicht von Netscape beachtet werden.. @@ -1081,26 +1081,26 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I FontOn(); - BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); - BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); - BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); - BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); + BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); + BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); + BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); + BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); - if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); - if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic ); - if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline ); - if ( bStrikeout ) TAG_ON( OOO_STRING_SVTOOLS_HTML_strike ); + if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); + if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic ); + if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline ); + if ( bStrikeout ) TAG_ON( OOO_STRING_SVTOOLS_HTML_strike ); if ( !rValue.Len() ) - TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle + TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle else HTMLOutFuncs::Out_String( (*m_pStream), rValue ,m_eDestEnc); + - - if ( bStrikeout ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_strike ); - if ( bUnderline ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline ); - if ( bItalic ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic ); - if ( bBold ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); + if ( bStrikeout ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_strike ); + if ( bUnderline ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline ); + if ( bItalic ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic ); + if ( bBold ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); FontOff(); @@ -1131,7 +1131,7 @@ void OHTMLImportExport::FontOn() sal_Int32 nColor = 0; if(m_xObject.is()) - m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; + m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; ::Color aColor(nColor); HTMLOutFuncs::Out_Color( (*m_pStream), aColor ); diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 43e5883b86db..78b4fb71a589 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,21 +56,21 @@ namespace dbaui SvtMiscOptions().RemoveListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); DBG_DTOR(OToolBoxHelper,NULL); - } - + } + // ----------------------------------------------------------------------------- void OToolBoxHelper::checkImageList() { if ( m_pToolBox ) { sal_Int16 nCurSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); - if ( nCurSymbolsSize != m_nSymbolsSize || + if ( nCurSymbolsSize != m_nSymbolsSize || m_bIsHiContrast != m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode() ) { - m_nSymbolsSize = nCurSymbolsSize; + m_nSymbolsSize = nCurSymbolsSize; m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); - + m_pToolBox->SetImageList( getImageList(m_nSymbolsSize,m_bIsHiContrast) ); Size aTbOldSize = m_pToolBox->GetSizePixel(); adjustToolBoxSize(m_pToolBox); @@ -101,11 +101,11 @@ namespace dbaui if ( m_pToolBox && _pEvt && _pEvt->GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { DataChangedEvent* pData = reinterpret_cast<DataChangedEvent*>(_pEvt->GetData()); - if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) || - ( pData->GetType() == DATACHANGED_DISPLAY )) && - ( pData->GetFlags() & SETTINGS_STYLE ))) + if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) || + ( pData->GetType() == DATACHANGED_DISPLAY )) && + ( pData->GetFlags() & SETTINGS_STYLE ))) // check if imagelist changed - checkImageList(); + checkImageList(); } return 0L; @@ -117,7 +117,7 @@ namespace dbaui m_pToolBox = _pTB; if ( m_pToolBox ) { - // m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); + // m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); ConfigOptionsChanged(NULL); if ( bFirstTime ) adjustToolBoxSize(m_pToolBox); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 089025b511f7..83bbc4cc82ee 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,11 +84,11 @@ #include <svx/svxids.hrc> -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN -#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO +#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY +#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY +#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK +#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN +#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO #include <svl/itempool.hxx> #include <tools/string.hxx> @@ -151,7 +151,7 @@ using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING; using ::com::sun::star::frame::XModel; // ----------------------------------------------------------------------------- -SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, +SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, const Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF, Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, @@ -170,7 +170,7 @@ SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, return createConnection(xProp,_rMF,_rEvtLst,_rOUTConnection); } // ----------------------------------------------------------------------------- -SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource, +SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource, const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF, Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ) @@ -199,14 +199,14 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP try { if(bPwdReq && !sPwd.getLength()) - { // password required, but empty -> connect using an interaction handler + { // password required, but empty -> connect using an interaction handler Reference<XCompletedConnection> xConnectionCompletion(_xDataSource, UNO_QUERY); if (!xConnectionCompletion.is()) { OSL_ENSURE(0,"createConnection: missing an interface ... need an error message here!"); } else - { // instantiate the default SDB interaction handler + { // instantiate the default SDB interaction handler Reference< XInteractionHandler > xHandler(_rMF->createInstance(SERVICE_TASK_INTERACTION_HANDLER), UNO_QUERY); if (!xHandler.is()) { @@ -233,7 +233,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP catch(SQLException& e) { aInfo = SQLExceptionInfo(e); } catch(Exception&) { OSL_ENSURE(0,"SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); } - // showError(aInfo); + // showError(aInfo); return aInfo; } @@ -366,24 +366,24 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, { // search the best matching type #ifdef DBG_UTIL - ::rtl::OUString sDBTypeName = aIter->second->aTypeName; (void)sDBTypeName; - sal_Int32 nDBTypePrecision = aIter->second->nPrecision; (void)nDBTypePrecision; - sal_Int32 nDBTypeScale = aIter->second->nMaximumScale; (void)nDBTypeScale; - sal_Bool bDBAutoIncrement = aIter->second->bAutoIncrement; (void)bDBAutoIncrement; + ::rtl::OUString sDBTypeName = aIter->second->aTypeName; (void)sDBTypeName; + sal_Int32 nDBTypePrecision = aIter->second->nPrecision; (void)nDBTypePrecision; + sal_Int32 nDBTypeScale = aIter->second->nMaximumScale; (void)nDBTypeScale; + sal_Bool bDBAutoIncrement = aIter->second->bAutoIncrement; (void)bDBAutoIncrement; #endif - if ( ( + if ( ( !_sTypeName.getLength() - || (aIter->second->aTypeName.equalsIgnoreAsciiCase(_sTypeName)) + || (aIter->second->aTypeName.equalsIgnoreAsciiCase(_sTypeName)) ) - && ( + && ( ( !aIter->second->aCreateParams.getLength() - && !_sCreateParams.getLength() + && !_sCreateParams.getLength() ) - || ( - (aIter->second->nPrecision >= _nPrecision) - && (aIter->second->nMaximumScale >= _nScale) - && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) + || ( + (aIter->second->nPrecision >= _nPrecision) + && (aIter->second->nMaximumScale >= _nScale) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) ) ) @@ -397,33 +397,33 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, sal_Int32 nPrec = aIter->second->nPrecision; sal_Int32 nScale = aIter->second->nMaximumScale; // search the best matching type (now comparing the local names) - if ( (aIter->second->aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName)) - && (nPrec >= _nPrecision) - && (nScale >= _nScale) - && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) + if ( (aIter->second->aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName)) + && (nPrec >= _nPrecision) + && (nScale >= _nScale) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) { OSL_ENSURE(sal_False, - ( ::rtl::OString("getTypeInfoFromType: assuming column type ") - += ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding()) - += ::rtl::OString("\" (expected type name ") - += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) - += ::rtl::OString(" matches the type's local name).")).getStr()); + ( ::rtl::OString("getTypeInfoFromType: assuming column type ") + += ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString("\" (expected type name ") + += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString(" matches the type's local name).")).getStr()); break; } } } if (aIter == aPair.second) - { // no match for the names, no match for the local names + { // no match for the names, no match for the local names // -> drop the precision and the scale restriction, accept any type with the property // type id (nType) //OSL_ENSURE(sal_False, - // ( ::rtl::OString("getTypeInfoFromType: did not find a matching type") - // += ::rtl::OString(" (expected type name: ") - // += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) - // += ::rtl::OString(")! Defaulting to the first matching type.")).getStr()); + // ( ::rtl::OString("getTypeInfoFromType: did not find a matching type") + // += ::rtl::OString(" (expected type name: ") + // += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) + // += ::rtl::OString(")! Defaulting to the first matching type.")).getStr()); for(aIter = aPair.first; aIter != aPair.second; ++aIter) { // search the best matching type (now comparing the local names) @@ -432,9 +432,9 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, #endif sal_Int32 nPrec = aIter->second->nPrecision; sal_Int32 nScale = aIter->second->nMaximumScale; - if ( (nPrec >= _nPrecision) - && (nScale >= _nScale) - && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) + if ( (nPrec >= _nPrecision) + && (nScale >= _nScale) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) break; } @@ -450,8 +450,8 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, ::rtl::OUString sDBTypeName = aIter->second->aTypeName; #endif sal_Int32 nScale = aIter->second->nMaximumScale; - if ( (nScale >= _nScale) - && (aIter->second->bAutoIncrement == _bAutoIncrement) + if ( (nScale >= _nScale) + && (aIter->second->bAutoIncrement == _bAutoIncrement) ) break; } @@ -499,7 +499,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, return pTypeInfo; } // ----------------------------------------------------------------------------- -void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, +void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const String& _rsTypeNames, OTypeInfoMap& _rTypeInfoMap, ::std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters) @@ -538,49 +538,49 @@ void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo } aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aTypeName = aValue; + pInfo->aTypeName = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nType = aValue; + pInfo->nType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nPrecision = aValue; + pInfo->nPrecision = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aLiteralPrefix = aValue; + pInfo->aLiteralPrefix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aLiteralSuffix = aValue; + pInfo->aLiteralSuffix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aCreateParams = aValue; + pInfo->aCreateParams = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; + pInfo->bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bCaseSensitive = (sal_Bool)aValue; + pInfo->bCaseSensitive = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nSearchType = aValue; + pInfo->nSearchType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bUnsigned = (sal_Bool)aValue; + pInfo->bUnsigned = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bCurrency = (sal_Bool)aValue; + pInfo->bCurrency = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bAutoIncrement = (sal_Bool)aValue; + pInfo->bAutoIncrement = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aLocalTypeName = aValue; + pInfo->aLocalTypeName = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nMinimumScale = aValue; + pInfo->nMinimumScale = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nMaximumScale = aValue; + pInfo->nMaximumScale = aValue; nPos = 18; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); @@ -800,9 +800,9 @@ sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment) switch (_eAlignment) { case SVX_HOR_JUSTIFY_STANDARD: - case SVX_HOR_JUSTIFY_LEFT: nAlignment = ::com::sun::star::awt::TextAlign::LEFT; break; - case SVX_HOR_JUSTIFY_CENTER: nAlignment = ::com::sun::star::awt::TextAlign::CENTER; break; - case SVX_HOR_JUSTIFY_RIGHT: nAlignment = ::com::sun::star::awt::TextAlign::RIGHT; break; + case SVX_HOR_JUSTIFY_LEFT: nAlignment = ::com::sun::star::awt::TextAlign::LEFT; break; + case SVX_HOR_JUSTIFY_CENTER: nAlignment = ::com::sun::star::awt::TextAlign::CENTER; break; + case SVX_HOR_JUSTIFY_RIGHT: nAlignment = ::com::sun::star::awt::TextAlign::RIGHT; break; default: OSL_ENSURE(0,"Invalid TextAlign!"); } @@ -814,9 +814,9 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment) SvxCellHorJustify eJustify = SVX_HOR_JUSTIFY_LEFT; switch (_nAlignment) { - case ::com::sun::star::awt::TextAlign::LEFT : eJustify = SVX_HOR_JUSTIFY_LEFT; break; - case ::com::sun::star::awt::TextAlign::CENTER : eJustify = SVX_HOR_JUSTIFY_CENTER; break; - case ::com::sun::star::awt::TextAlign::RIGHT : eJustify = SVX_HOR_JUSTIFY_RIGHT; break; + case ::com::sun::star::awt::TextAlign::LEFT : eJustify = SVX_HOR_JUSTIFY_LEFT; break; + case ::com::sun::star::awt::TextAlign::CENTER : eJustify = SVX_HOR_JUSTIFY_CENTER; break; + case ::com::sun::star::awt::TextAlign::RIGHT : eJustify = SVX_HOR_JUSTIFY_RIGHT; break; default: OSL_ENSURE(0,"Invalid TextAlign!"); } @@ -880,24 +880,24 @@ float ConvertFontWidth( ::FontWidth eWidth ) ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const Font& rFont ) { ::com::sun::star::awt::FontDescriptor aFD; - aFD.Name = rFont.GetName(); - aFD.StyleName = rFont.GetStyleName(); - aFD.Height = (sal_Int16)rFont.GetSize().Height(); - aFD.Width = (sal_Int16)rFont.GetSize().Width(); - aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamily()); - aFD.CharSet = rFont.GetCharSet(); - aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch()); - aFD.CharacterWidth = ConvertFontWidth( rFont.GetWidthType() ); - aFD.Weight = ConvertFontWeight( rFont.GetWeight() ); - aFD.Slant = (::com::sun::star::awt::FontSlant)rFont.GetItalic(); - aFD.Underline = sal::static_int_cast< sal_Int16 >( + aFD.Name = rFont.GetName(); + aFD.StyleName = rFont.GetStyleName(); + aFD.Height = (sal_Int16)rFont.GetSize().Height(); + aFD.Width = (sal_Int16)rFont.GetSize().Width(); + aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamily()); + aFD.CharSet = rFont.GetCharSet(); + aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch()); + aFD.CharacterWidth = ConvertFontWidth( rFont.GetWidthType() ); + aFD.Weight = ConvertFontWeight( rFont.GetWeight() ); + aFD.Slant = (::com::sun::star::awt::FontSlant)rFont.GetItalic(); + aFD.Underline = sal::static_int_cast< sal_Int16 >( rFont.GetUnderline()); - aFD.Strikeout = sal::static_int_cast< sal_Int16 >( + aFD.Strikeout = sal::static_int_cast< sal_Int16 >( rFont.GetStrikeout()); - aFD.Orientation = rFont.GetOrientation(); - aFD.Kerning = rFont.IsKerning(); - aFD.WordLineMode = rFont.IsWordLineMode(); - aFD.Type = 0; // ??? => Nur an Metric... + aFD.Orientation = rFont.GetOrientation(); + aFD.Kerning = rFont.IsKerning(); + aFD.WordLineMode = rFont.IsWordLineMode(); + aFD.Type = 0; // ??? => Nur an Metric... return aFD; } // ----------------------------------------------------------------------------- @@ -943,7 +943,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, sal_Int32 _nDataType, sal_Int32& _nFormatKey, SvxCellHorJustify& _eJustify, - sal_uInt16& _nFlags, + sal_uInt16& _nFlags, sal_Bool _bHasFormat) { sal_Bool bRet = sal_False; @@ -958,10 +958,10 @@ sal_Bool callColumnFormatDialog(Window* _pParent, static SfxItemInfo aItemInfos[] = { { 0, 0 }, - { SID_ATTR_NUMBERFORMAT_VALUE, SFX_ITEM_POOLABLE }, - { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, - { SID_ATTR_NUMBERFORMAT_ONE_AREA, SFX_ITEM_POOLABLE }, - { SID_ATTR_NUMBERFORMAT_INFO, SFX_ITEM_POOLABLE } + { SID_ATTR_NUMBERFORMAT_VALUE, SFX_ITEM_POOLABLE }, + { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, + { SID_ATTR_NUMBERFORMAT_ONE_AREA, SFX_ITEM_POOLABLE }, + { SID_ATTR_NUMBERFORMAT_INFO, SFX_ITEM_POOLABLE } }; static sal_uInt16 aAttrMap[] = { @@ -981,8 +981,8 @@ sal_Bool callColumnFormatDialog(Window* _pParent, }; SfxItemPool* pPool = new SfxItemPool(String::CreateFromAscii("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); - pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why - pPool->FreezeIdRanges(); // the same + pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why + pPool->FreezeIdRanges(); // the same SfxItemSet* pFormatDescriptor = new SfxItemSet(*pPool, aAttrMap); // fill it @@ -1010,7 +1010,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, pFormatDescriptor->Put(aFormatter); } - { // want the dialog to be destroyed before our set + { // want the dialog to be destroyed before our set SbaSbAttrDlg aDlg(_pParent, pFormatDescriptor, _pFormatter, _nFlags); if (RET_OK == aDlg.Execute()) { @@ -1154,7 +1154,7 @@ sal_Bool isHiContrast(Window* _pWindow) { OSL_ENSURE(_pWindow,"Window must be not null!"); Window* pIter = _pWindow; - // while( pIter && pIter->GetBackground().GetColor().GetColor() == COL_TRANSPARENT ) + // while( pIter && pIter->GetBackground().GetColor().GetColor() == COL_TRANSPARENT ) while( pIter ) { if ( pIter->GetBackground().GetColor().GetColor() == COL_TRANSPARENT ) @@ -1183,7 +1183,7 @@ void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId { sal_Int32 nValue = aColumnSizeDlg.GetValue(); if ( -1 == nValue ) - { // default width + { // default width nValue = _pBox->GetDefaultColumnWidth( _pBox->GetColumnTitle( _nColId ) ); } else @@ -1330,7 +1330,7 @@ namespace } // annonymous // ......................................................................... // ----------------------------------------------------------------------------- -::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId) +::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId) { ::com::sun::star::util::URL aURL; aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) ); @@ -1382,8 +1382,8 @@ TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo) // because we don't have the possiblity to know how to create // such auto increment column later on // so until we know how to do it, we create a column without autoincrement - // if ( !aIter->second->bAutoIncrement ) - { // therefor we have searched + // if ( !aIter->second->bAutoIncrement ) + { // therefor we have searched if ( aIter->second->nType == DataType::INTEGER ) { pTypeInfo = aIter->second; // alternative @@ -1631,7 +1631,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XMultiService // here we have everything needed to create a new query object ... HierarchicalNameCheck aNameChecker( _xNames.get(), sName ); // ... ehm, except a new name - OSaveAsDlg aAskForName( _pParent, + OSaveAsDlg aAskForName( _pParent, _rxORB, sTargetName, sLabel, diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx index cff3c9f11a72..e6b52dee98a7 100644 --- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx +++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace dbaui { class ORowUpdateHelper : public IUpdateHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xResultSetUpdate; // + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xResultSetUpdate; // public: ORowUpdateHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _xRowSet) :m_xRowUpdate(_xRowSet,::com::sun::star::uno::UNO_QUERY) diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 905846ba9892..841b00a1d077 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,17 +69,17 @@ DBG_NAME(OCopyTable) //------------------------------------------------------------------------ OCopyTable::OCopyTable( Window * pParent ) :OWizardPage( pParent, ModuleRes(TAB_WIZ_COPYTABLE) ) - ,m_ftTableName( this, ModuleRes( FT_TABLENAME ) ) - ,m_edTableName( this, ModuleRes( ET_TABLENAME ) ) + ,m_ftTableName( this, ModuleRes( FT_TABLENAME ) ) + ,m_edTableName( this, ModuleRes( ET_TABLENAME ) ) ,m_aFL_Options( this, ModuleRes( FL_OPTIONS ) ) - ,m_aRB_DefData( this, ModuleRes( RB_DEFDATA ) ) - ,m_aRB_Def( this, ModuleRes( RB_DEF ) ) - ,m_aRB_View( this, ModuleRes( RB_VIEW ) ) - ,m_aRB_AppendData( this, ModuleRes( RB_APPENDDATA ) ) - ,m_aCB_UseHeaderLine( this, ModuleRes( CB_USEHEADERLINE ) ) - ,m_aCB_PrimaryColumn( this, ModuleRes( CB_PRIMARY_COLUMN ) ) - ,m_aFT_KeyName( this, ModuleRes( FT_KEYNAME ) ) - ,m_edKeyName( this, ModuleRes( ET_KEYNAME ) ) + ,m_aRB_DefData( this, ModuleRes( RB_DEFDATA ) ) + ,m_aRB_Def( this, ModuleRes( RB_DEF ) ) + ,m_aRB_View( this, ModuleRes( RB_VIEW ) ) + ,m_aRB_AppendData( this, ModuleRes( RB_APPENDDATA ) ) + ,m_aCB_UseHeaderLine( this, ModuleRes( CB_USEHEADERLINE ) ) + ,m_aCB_PrimaryColumn( this, ModuleRes( CB_PRIMARY_COLUMN ) ) + ,m_aFT_KeyName( this, ModuleRes( FT_KEYNAME ) ) + ,m_edKeyName( this, ModuleRes( ET_KEYNAME ) ) ,m_pPage2(NULL) ,m_pPage3(NULL) ,m_bUseHeaderAllowed(TRUE) @@ -98,11 +98,11 @@ OCopyTable::OCopyTable( Window * pParent ) m_aCB_PrimaryColumn.Enable(m_bPKeyAllowed); - m_aRB_AppendData.SetClickHdl( LINK( this, OCopyTable, AppendDataClickHdl ) ); + m_aRB_AppendData.SetClickHdl( LINK( this, OCopyTable, AppendDataClickHdl ) ); - m_aRB_DefData.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); - m_aRB_Def.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); - m_aRB_View.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); + m_aRB_DefData.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); + m_aRB_Def.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); + m_aRB_View.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); m_aCB_PrimaryColumn.SetClickHdl(LINK( this, OCopyTable, KeyClickHdl ) ); @@ -178,12 +178,12 @@ IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ ) sal_Bool OCopyTable::LeavePage() { DBG_CHKTHIS(OCopyTable,NULL); - m_pParent->m_bCreatePrimaryKeyColumn = (m_bPKeyAllowed && m_aCB_PrimaryColumn.IsEnabled()) ? m_aCB_PrimaryColumn.IsChecked() : sal_False; - m_pParent->m_aKeyName = m_pParent->m_bCreatePrimaryKeyColumn ? m_edKeyName.GetText() : String(); + m_pParent->m_bCreatePrimaryKeyColumn = (m_bPKeyAllowed && m_aCB_PrimaryColumn.IsEnabled()) ? m_aCB_PrimaryColumn.IsChecked() : sal_False; + m_pParent->m_aKeyName = m_pParent->m_bCreatePrimaryKeyColumn ? m_edKeyName.GetText() : String(); m_pParent->setUseHeaderLine( m_aCB_UseHeaderLine.IsChecked() ); // first check if the table already exists in the database - if( m_pParent->getOperation() != CopyTableOperation::AppendData ) + if( m_pParent->getOperation() != CopyTableOperation::AppendData ) { m_pParent->clearDestColumns(); DynamicTableOrQueryNameCheck aNameCheck( m_pParent->m_xDestConnection, CommandType::TABLE ); @@ -192,7 +192,7 @@ sal_Bool OCopyTable::LeavePage() { aErrorInfo.append( SQLExceptionInfo::SQL_CONTEXT, String( ModuleRes( STR_SUGGEST_APPEND_TABLE_DATA ) ) ); m_pParent->showError(aErrorInfo.get()); - + return sal_False; } @@ -201,7 +201,7 @@ sal_Bool OCopyTable::LeavePage() ::rtl::OUString sCatalog; ::rtl::OUString sSchema; ::rtl::OUString sTable; - ::dbtools::qualifiedNameComponents( xMeta, + ::dbtools::qualifiedNameComponents( xMeta, m_edTableName.GetText(), sCatalog, sSchema, @@ -214,10 +214,10 @@ sal_Bool OCopyTable::LeavePage() m_pParent->showError(sError); return sal_False; } - + // now we have to check if the name of the primary key already exists - if ( m_pParent->m_bCreatePrimaryKeyColumn - && m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) ) + if ( m_pParent->m_bCreatePrimaryKeyColumn + && m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) ) { String aInfoString( ModuleRes(STR_WIZ_PKEY_ALREADY_DEFINED) ); aInfoString += String(' '); @@ -270,10 +270,10 @@ void OCopyTable::ActivatePage() m_aCB_UseHeaderLine.Check(m_pParent->UseHeaderLine()); } //------------------------------------------------------------------------ -String OCopyTable::GetTitle() const -{ +String OCopyTable::GetTitle() const +{ DBG_CHKTHIS(OCopyTable,NULL); - return String(ModuleRes(STR_WIZ_TABLE_COPY)); + return String(ModuleRes(STR_WIZ_TABLE_COPY)); } //------------------------------------------------------------------------ void OCopyTable::Reset() @@ -306,9 +306,9 @@ sal_Bool OCopyTable::checkAppendData() ObjectCopySource aTableCopySource( m_pParent->m_xDestConnection, xTable ); m_pParent->loadData( aTableCopySource, m_pParent->m_vDestColumns, m_pParent->m_aDestVec ); // #90027# - const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); - ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); - ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end(); + const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); + ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); + ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end(); const sal_uInt32 nDestSize = pDestColumns->size(); sal_Bool bNotConvert; sal_uInt32 i = 0; @@ -322,13 +322,13 @@ sal_Bool OCopyTable::checkAppendData() m_pParent->showColumnTypeNotSupported((*aDestIter)->first); return sal_False; } - + if ( pTypeInfo.get() ) m_pParent->m_vColumnTypes[i] = pTypeInfo->nType; else m_pParent->m_vColumnTypes[i] = DataType::VARCHAR; } - + } if ( !xTable.is() ) diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 11095d00f660..d86e3e0170fd 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -161,7 +161,7 @@ sal_Bool OWizColumnSelect::LeavePage() { DBG_CHKTHIS(OWizColumnSelect,NULL); - // m_pParent->getColumns()->clear(); + // m_pParent->getColumns()->clear(); m_pParent->clearDestColumns(); for(sal_uInt16 i=0 ; i< m_lbNewColumnNames.GetEntryCount();++i) @@ -214,7 +214,7 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton ) Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() ); ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); - sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); + sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::TStringMixEqualFunctor aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); ::std::vector< ::rtl::OUString> aRightColumns; @@ -264,7 +264,7 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, MultiListBox *, pListBox ) // Wenn Datenbank PrimaryKeys verarbeiten kann, PrimaryKey anlegen Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() ); ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); - sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); + sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::TStringMixEqualFunctor aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); ::std::vector< ::rtl::OUString> aRightColumns; @@ -295,12 +295,12 @@ void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< ::rtl::OUStrin _rRightColumns.push_back(pRight->GetEntry(i)); } // ----------------------------------------------------------------------------- -void OWizColumnSelect::createNewColumn( ListBox* _pListbox, +void OWizColumnSelect::createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase) { ::rtl::OUString sConvertedName = m_pParent->convertColumnName(TMultiListBoxEntryFindFunctor(&_rRightColumns,_aCase), @@ -321,12 +321,12 @@ void OWizColumnSelect::createNewColumn( ListBox* _pListbox, m_pParent->showColumnTypeNotSupported(sConvertedName); } // ----------------------------------------------------------------------------- -void OWizColumnSelect::moveColumn( ListBox* _pRight, +void OWizColumnSelect::moveColumn( ListBox* _pRight, ListBox* _pLeft, ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase) { if(_pRight == &m_lbNewColumnNames) @@ -366,10 +366,10 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, // ----------------------------------------------------------------------------- // Simply returning fields back to their original position is // not enough. We need to take into acccount what fields have -// been removed earlier and adjust accordingly. Based on the +// been removed earlier and adjust accordingly. Based on the // algorithm employed in moveColumn(). USHORT OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, - const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::TStringMixEqualFunctor& _aCase) { diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 4ab963777312..0bdeb744bfde 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ using namespace dbtools; namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation; -#define MAX_PAGES 4 // max. Pages die angezeigt werden +#define MAX_PAGES 4 // max. Pages die angezeigt werden DBG_NAME(OCopyTableWizard) namespace @@ -193,8 +193,8 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _ ::rtl::OUString sStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); sStatement += sTargetName; sStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE 0=1")); - - + + for ( i=0; i < SAL_N_ELEMENTS( aProperties ); ++i ) { if ( m_xObjectPSI->hasPropertyByName( aProperties[i].first ) ) @@ -212,7 +212,7 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _ } } } - + _xConnection->createStatement()->executeQuery(sStatement); if ( m_xObjectPSI->hasPropertyByName( PROPERTY_APPLYFILTER ) ) @@ -633,7 +633,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD ::rtl::OUString sCatalog; ::rtl::OUString sSchema; ::rtl::OUString sTable; - ::dbtools::qualifiedNameComponents( xSrcMeta, + ::dbtools::qualifiedNameComponents( xSrcMeta, m_sName, sCatalog, sSchema, @@ -659,7 +659,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD // ----------------------------------------------------------------------------- OCopyTableWizard::OCopyTableWizard( Window* pParent, const ::rtl::OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rSourceColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, - const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter, + const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const Reference< XMultiServiceFactory >& _rM ) :WizardDialog( pParent, ModuleRes(WIZ_RTFCOPYTABLE)) ,m_vSourceColumns(_rSourceColumns) @@ -843,7 +843,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) } if ( bContainsColumns ) - { // we have dest columns so look for the matching column + { // we have dest columns so look for the matching column ODatabaseExport::TColumnVector::const_iterator aSrcIter = m_vSourceVec.begin(); ODatabaseExport::TColumnVector::const_iterator aSrcEnd = m_vSourceVec.end(); for(;aSrcIter != aSrcEnd;++aSrcIter) @@ -868,7 +868,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) { Reference< XDatabaseMetaData > xMetaData( m_xDestConnection->getMetaData() ); ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); - sal_Int32 nMaxNameLen = getMaxColumnNameLength(); + sal_Int32 nMaxNameLen = getMaxColumnNameLength(); ODatabaseExport::TColumnVector::const_iterator aSrcIter = m_vSourceVec.begin(); ODatabaseExport::TColumnVector::const_iterator aSrcEnd = m_vSourceVec.end(); @@ -880,7 +880,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) pField->SetType(pType); if ( !bPKeyAllowed ) pField->SetPrimaryKey(sal_False); - + // now create a column insertColumn(m_vDestColumns.size(),pField); m_vColumnPos.push_back(ODatabaseExport::TPositions::value_type(m_vDestColumns.size(),m_vDestColumns.size())); @@ -905,10 +905,10 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) case CopyTableOperation::CopyDefinitionOnly: { sal_Bool bOnFirstPage = GetCurLevel() == 0; - if ( bOnFirstPage ) + if ( bOnFirstPage ) { // we came from the first page so we have to clear - // all column information already collected + // all column information already collected clearDestColumns(); m_mNameMapping.clear(); } @@ -920,7 +920,7 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) OWizTypeSelect* pPage = static_cast<OWizTypeSelect*>(GetPage(3)); if ( pPage ) { - m_mNameMapping.clear(); + m_mNameMapping.clear(); pPage->setDisplayRow(nBreakPos); ShowPage(3); return 0; @@ -1049,7 +1049,7 @@ void OCopyTableWizard::CheckButtons() void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::EnableButton" ); -// CheckButtons(); +// CheckButtons(); Button* pButton; if(eStyle == WIZARD_NEXT) pButton = &m_pbNext; @@ -1103,7 +1103,7 @@ void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField, m_vDestColumns.erase(_sOldName); OSL_ENSURE( m_vDestColumns.find(_pField->GetName()) == m_vDestColumns.end(),"Column with that name already exist!"); - m_aDestVec[_nPos] = + m_aDestVec[_nPos] = m_vDestColumns.insert(ODatabaseExport::TColumns::value_type(_pField->GetName(),_pField)).first; } } @@ -1145,9 +1145,9 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, if ( !pActFieldDescr ) continue; - sal_Int32 nType = pActFieldDescr->GetType(); - sal_Int32 nScale = pActFieldDescr->GetScale(); - sal_Int32 nPrecision = pActFieldDescr->GetPrecision(); + sal_Int32 nType = pActFieldDescr->GetType(); + sal_Int32 nScale = pActFieldDescr->GetScale(); + sal_Int32 nPrecision = pActFieldDescr->GetPrecision(); sal_Bool bAutoIncrement = pActFieldDescr->IsAutoIncrement(); ::rtl::OUString sTypeName = pActFieldDescr->GetTypeName(); @@ -1331,7 +1331,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() if(xAppend.is()) xAppend->appendByDescriptor(xTable); - // xTable = NULL; + // xTable = NULL; // we need to reget the table because after appending it it is no longer valid if(xTables->hasByName(m_sName)) xTables->getByName(m_sName) >>= xTable; @@ -1361,7 +1361,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() Reference<XNameAccess> xNameAccess = xSuppDestinationColumns->getColumns(); Sequence< ::rtl::OUString> aSeq = xNameAccess->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); ::std::vector<int> aAlreadyFound(m_vColumnPos.size(),0); @@ -1485,10 +1485,10 @@ sal_Int16 OCopyTableWizard::getOperation() const return m_nOperation; } // ----------------------------------------------------------------------------- -::rtl::OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFunctor, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen) +::rtl::OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFunctor, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::convertColumnName" ); ::rtl::OUString sAlias = _sColumnName; diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx index 3b00f2289359..9b2d8686aa42 100644 --- a/dbaccess/source/ui/misc/WExtendPages.cxx +++ b/dbaccess/source/ui/misc/WExtendPages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 20a4177e3e3a..12a6744a7da6 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,17 +45,17 @@ using namespace ::dbaui; DBG_NAME(OWizNameMatching) //======================================================================== OWizNameMatching::OWizNameMatching( Window* pParent) - :OWizardPage( pParent, ModuleRes( TAB_WIZ_NAME_MATCHING ) ) - ,m_FT_TABLE_LEFT( this, ModuleRes( FT_TABLE_LEFT ) ) - ,m_FT_TABLE_RIGHT( this, ModuleRes( FT_TABLE_RIGHT ) ) - ,m_CTRL_LEFT( this, ModuleRes( CTRL_LEFT ) ) - ,m_CTRL_RIGHT( this, ModuleRes( CTRL_RIGHT ) ) + :OWizardPage( pParent, ModuleRes( TAB_WIZ_NAME_MATCHING ) ) + ,m_FT_TABLE_LEFT( this, ModuleRes( FT_TABLE_LEFT ) ) + ,m_FT_TABLE_RIGHT( this, ModuleRes( FT_TABLE_RIGHT ) ) + ,m_CTRL_LEFT( this, ModuleRes( CTRL_LEFT ) ) + ,m_CTRL_RIGHT( this, ModuleRes( CTRL_RIGHT ) ) ,m_ibColumn_up( this, ModuleRes( IB_COLUMN_UP ) ) ,m_ibColumn_down( this, ModuleRes( IB_COLUMN_DOWN ) ) ,m_ibColumn_up_right( this, ModuleRes( IB_COLUMN_UP_RIGHT ) ) ,m_ibColumn_down_right( this, ModuleRes( IB_COLUMN_DOWN_RIGHT ) ) - ,m_pbAll( this, ModuleRes( PB_ALL ) ) - ,m_pbNone( this, ModuleRes( PB_NONE ) ) + ,m_pbAll( this, ModuleRes( PB_ALL ) ) + ,m_pbNone( this, ModuleRes( PB_NONE ) ) { DBG_CTOR(OWizNameMatching,NULL); @@ -76,9 +76,9 @@ OWizNameMatching::OWizNameMatching( Window* pParent) m_CTRL_LEFT.SetWindowBits( WB_FORCE_MAKEVISIBLE ); m_CTRL_RIGHT.SetWindowBits( WB_FORCE_MAKEVISIBLE ); - m_sSourceText = m_FT_TABLE_LEFT.GetText(); + m_sSourceText = m_FT_TABLE_LEFT.GetText(); m_sSourceText.AppendAscii("\n"); - m_sDestText = m_FT_TABLE_RIGHT.GetText(); + m_sDestText = m_FT_TABLE_RIGHT.GetText(); m_sDestText.AppendAscii("\n"); // set hiContrast @@ -107,11 +107,11 @@ void OWizNameMatching::Reset() m_CTRL_RIGHT.SetEntryHeight(m_CTRL_LEFT.GetEntryHeight()); m_CTRL_RIGHT.SetIndent(m_CTRL_LEFT.GetIndent()); m_CTRL_RIGHT.SetSpaceBetweenEntries(m_CTRL_LEFT.GetSpaceBetweenEntries()); - + m_bFirstTime = sal_False; } - - // m_CTRL_LEFT.Clear(); + + // m_CTRL_LEFT.Clear(); } // ----------------------------------------------------------------------- void OWizNameMatching::ActivatePage( ) @@ -121,7 +121,7 @@ void OWizNameMatching::ActivatePage( ) // set source table name String aName = m_sSourceText; aName += String(m_pParent->m_sSourceName); - + m_FT_TABLE_LEFT.SetText(aName); // set dest table name @@ -129,7 +129,7 @@ void OWizNameMatching::ActivatePage( ) aName += String(m_pParent->m_sName); m_FT_TABLE_RIGHT.SetText(aName); - + m_CTRL_LEFT.FillListBox(*m_pParent->getSrcVector()); m_CTRL_RIGHT.FillListBox(*m_pParent->getDestVector()); @@ -138,7 +138,7 @@ void OWizNameMatching::ActivatePage( ) m_ibColumn_up_right.Enable( m_CTRL_RIGHT.GetEntryCount() > 1 ); m_ibColumn_down_right.Enable( m_CTRL_RIGHT.GetEntryCount() > 1 ); - + m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_False); m_CTRL_LEFT.GrabFocus(); @@ -149,13 +149,13 @@ sal_Bool OWizNameMatching::LeavePage() DBG_CHKTHIS(OWizNameMatching,NULL); const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector(); - + m_pParent->m_vColumnPos.clear(); m_pParent->m_vColumnTypes.clear(); m_pParent->m_vColumnPos.resize( pSrcColumns->size(), ODatabaseExport::TPositions::value_type( COLUMN_POSITION_NOT_FOUND, COLUMN_POSITION_NOT_FOUND ) ); m_pParent->m_vColumnTypes.resize( pSrcColumns->size(), COLUMN_POSITION_NOT_FOUND ); - + sal_Int32 nParamPos = 0; SvLBoxEntry* pLeftEntry = m_CTRL_LEFT.GetModel()->First(); SvLBoxEntry* pRightEntry = m_CTRL_RIGHT.GetModel()->First(); @@ -164,26 +164,26 @@ sal_Bool OWizNameMatching::LeavePage() OFieldDescription* pSrcField = static_cast<OFieldDescription*>(pLeftEntry->GetUserData()); DBG_ASSERT(pSrcField,"OWizNameMatching: OColumn can not be null!"); - ODatabaseExport::TColumnVector::const_iterator aSrcIter = pSrcColumns->begin(); - ODatabaseExport::TColumnVector::const_iterator aSrcEnd = pSrcColumns->end(); + ODatabaseExport::TColumnVector::const_iterator aSrcIter = pSrcColumns->begin(); + ODatabaseExport::TColumnVector::const_iterator aSrcEnd = pSrcColumns->end(); for(;aSrcIter != aSrcEnd && (*aSrcIter)->second != pSrcField;++aSrcIter) ; const sal_Int32 nPos = ::std::distance(pSrcColumns->begin(),aSrcIter); - // sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pLeftEntry); + // sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pLeftEntry); if(m_CTRL_LEFT.GetCheckButtonState(pLeftEntry) == SV_BUTTON_CHECKED) { OFieldDescription* pDestField = static_cast<OFieldDescription*>(pRightEntry->GetUserData()); DBG_ASSERT(pDestField,"OWizNameMatching: OColumn can not be null!"); - const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); - ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); - ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end(); + const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); + ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); + ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end(); for(;aDestIter != aDestEnd && (*aDestIter)->second != pDestField;++aDestIter) ; OSL_ENSURE((nPos) < static_cast<sal_Int32>(m_pParent->m_vColumnPos.size()),"m_pParent->m_vColumnPos: Illegal index for vector"); - m_pParent->m_vColumnPos[nPos].first = ++nParamPos; + m_pParent->m_vColumnPos[nPos].first = ++nParamPos; m_pParent->m_vColumnPos[nPos].second = ::std::distance(pDestColumns->begin(),aDestIter) + 1; sal_Bool bNotConvert = sal_True; TOTypeInfoSP pTypeInfo = m_pParent->convertType((*aDestIter)->second->getSpecialTypeInfo(),bNotConvert); @@ -212,7 +212,7 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton ) SvLBoxEntry* pEntry = m_CTRL_LEFT.FirstSelected(); if ( pEntry ) { - sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); + sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); if(pButton == &m_ibColumn_up && nPos) --nPos; else if(pButton == &m_ibColumn_down) @@ -222,13 +222,13 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton ) m_CTRL_LEFT.GetModel()->Move(pEntry,NULL,nPos); m_CTRL_LEFT.ModelHasMoved(pEntry); - long nThumbPos = m_CTRL_LEFT.GetVScroll()->GetThumbPos(); - long nVisibleSize = m_CTRL_LEFT.GetVScroll()->GetVisibleSize(); + long nThumbPos = m_CTRL_LEFT.GetVScroll()->GetThumbPos(); + long nVisibleSize = m_CTRL_LEFT.GetVScroll()->GetVisibleSize(); if(pButton == &m_ibColumn_down && (nThumbPos+nVisibleSize+1) < nPos) { m_CTRL_LEFT.GetVScroll()->DoScrollAction(SCROLL_LINEDOWN); - // m_CTRL_LEFT.MakeVisible(pEntry,sal_True); + // m_CTRL_LEFT.MakeVisible(pEntry,sal_True); } TableListClickHdl(&m_CTRL_LEFT); @@ -243,7 +243,7 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) SvLBoxEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); if ( pEntry ) { - sal_Int32 nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); + sal_Int32 nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); if(pButton == &m_ibColumn_up_right && nPos) --nPos; else if(pButton == &m_ibColumn_down_right) @@ -252,8 +252,8 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) m_CTRL_RIGHT.ModelIsMoving(pEntry,NULL,nPos); m_CTRL_RIGHT.GetModel()->Move(pEntry,NULL,nPos); m_CTRL_RIGHT.ModelHasMoved(pEntry); - long nThumbPos = m_CTRL_RIGHT.GetVScroll()->GetThumbPos(); - long nVisibleSize = m_CTRL_RIGHT.GetVScroll()->GetVisibleSize(); + long nThumbPos = m_CTRL_RIGHT.GetVScroll()->GetThumbPos(); + long nVisibleSize = m_CTRL_RIGHT.GetVScroll()->GetVisibleSize(); if(pButton == &m_ibColumn_down_right && (nThumbPos+nVisibleSize+1) < nPos) m_CTRL_RIGHT.GetVScroll()->DoScrollAction(SCROLL_LINEDOWN); @@ -267,7 +267,7 @@ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ ) SvLBoxEntry* pEntry = m_CTRL_LEFT.FirstSelected(); if(pEntry) { - ULONG nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); + ULONG nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); SvLBoxEntry* pOldEntry = m_CTRL_RIGHT.FirstSelected(); if(pOldEntry && nPos != m_CTRL_RIGHT.GetModel()->GetAbsPos(pOldEntry)) { @@ -301,7 +301,7 @@ IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/ SvLBoxEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); if(pEntry) { - ULONG nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); + ULONG nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); SvLBoxEntry* pOldEntry = m_CTRL_LEFT.FirstSelected(); if(pOldEntry && nPos != m_CTRL_LEFT.GetModel()->GetAbsPos(pOldEntry)) { diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index efc94d56524b..ea928c91e742 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; //======================================================================== // OWizTypeSelectControl @@ -107,7 +107,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) sal_uInt16 nPos = aListBox.GetEntryPos( String( pCurFieldDescr->GetName() ) ); pCurFieldDescr = static_cast< OFieldDescription* >( aListBox.GetEntryData( nPos ) ); - OSL_ENSURE( pCurFieldDescr, "OWizTypeSelectControl::CellModified: Columnname/type not found in the listbox!" ); + OSL_ENSURE( pCurFieldDescr, "OWizTypeSelectControl::CellModified: Columnname/type not found in the listbox!" ); if ( !pCurFieldDescr ) return; setCurrentFieldDescData( pCurFieldDescr ); @@ -117,7 +117,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) const OPropColumnEditCtrl* pColumnName = getColumnCtrl(); if ( pColumnName ) sNewName = pColumnName->GetText(); - + switch(nColId) { case FIELD_PRPOERTY_COLUMNNAME: @@ -139,10 +139,10 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) bDoubleName = sNewName.equalsIgnoreAsciiCase(pWiz->getPrimaryKeyName()); } - else + else bDoubleName = ((aListBox.GetEntryPos(String(sNewName)) != LISTBOX_ENTRY_NOTFOUND) - || ( pWiz->shouldCreatePrimaryKey() - && pWiz->getPrimaryKeyName() == sNewName) ); + || ( pWiz->shouldCreatePrimaryKey() + && pWiz->getPrimaryKeyName() == sNewName) ); if ( bDoubleName ) { @@ -176,7 +176,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) aListBox.RemoveEntry(nPos); aListBox.InsertEntry(pCurFieldDescr->GetName(),nPos); aListBox.SetEntryData(nPos,pCurFieldDescr); - + pWiz->replaceColumn(nPos,pCurFieldDescr,sOldName); } break; @@ -184,7 +184,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) saveCurrentFieldDescData(); } // ----------------------------------------------------------------------------- -::com::sun::star::lang::Locale OWizTypeSelectControl::GetLocale() const +::com::sun::star::lang::Locale OWizTypeSelectControl::GetLocale() const { return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->GetLocale(); } @@ -194,12 +194,12 @@ Reference< XNumberFormatter > OWizTypeSelectControl::GetFormatter() const return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->GetFormatter(); } // ----------------------------------------------------------------------------- -TOTypeInfoSP OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos) +TOTypeInfoSP OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos) { return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->getDestTypeInfo(_nPos); } // ----------------------------------------------------------------------------- -const OTypeInfoMap* OWizTypeSelectControl::getTypeInfo() const +const OTypeInfoMap* OWizTypeSelectControl::getTypeInfo() const { return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->getDestTypeInfo(); } diff --git a/dbaccess/source/ui/misc/WizardPages.hrc b/dbaccess/source/ui/misc/WizardPages.hrc index 224071b529ec..e1c2dd3326b6 100644 --- a/dbaccess/source/ui/misc/WizardPages.hrc +++ b/dbaccess/source/ui/misc/WizardPages.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,53 +28,53 @@ #define DBAUI_WIZARD_PAGES_HRC -#define LB_ORG_COLUMN_NAMES 1 -#define LB_NEW_COLUMN_NAMES 2 +#define LB_ORG_COLUMN_NAMES 1 +#define LB_NEW_COLUMN_NAMES 2 #define IB_COLUMN_RH 1 #define IB_COLUMN_LH 2 #define IB_COLUMNS_RH 3 #define IB_COLUMNS_LH 4 -#define PB_AUTO 5 -#define PB_OK 6 -#define PB_CANCEL 7 -#define PB_HELP 8 -#define PB_NEXT 9 -#define PB_PREV 10 -#define PB_UNDO 11 +#define PB_AUTO 5 +#define PB_OK 6 +#define PB_CANCEL 7 +#define PB_HELP 8 +#define PB_NEXT 9 +#define PB_PREV 10 +#define PB_UNDO 11 #define IB_COLUMN_UP 12 #define IB_COLUMN_DOWN 13 #define IB_COLUMN_UP_RIGHT 14 #define IB_COLUMN_DOWN_RIGHT 15 -#define PB_ALL 16 -#define PB_NONE 17 +#define PB_ALL 16 +#define PB_NONE 17 -#define ET_AUTO 1 -#define ET_TABLENAME 2 -#define ET_KEYNAME 3 +#define ET_AUTO 1 +#define ET_TABLENAME 2 +#define ET_KEYNAME 3 -#define FT_AUTO 1 -#define FT_TABLE_LEFT 2 -#define FT_TABLE_RIGHT 3 -#define FT_TABLENAME 4 -#define FT_KEYNAME 5 +#define FT_AUTO 1 +#define FT_TABLE_LEFT 2 +#define FT_TABLE_RIGHT 3 +#define FT_TABLENAME 4 +#define FT_KEYNAME 5 #define FL_COLUMN_SELECT 1 #define FL_COLUMN_NAME 2 #define FL_AUTO_TYPE 3 #define FL_OPTIONS 5 -#define RB_DEFDATA 1 -#define RB_DEF 2 -#define RB_VIEW 3 -#define RB_APPENDDATA 4 -#define CB_PRIMARY_COLUMN 5 +#define RB_DEFDATA 1 +#define RB_DEF 2 +#define RB_VIEW 3 +#define RB_APPENDDATA 4 +#define CB_PRIMARY_COLUMN 5 #define CB_USEHEADERLINE 6 -#define CONTROL_CONTAINER 1 +#define CONTROL_CONTAINER 1 // controls -#define CTRL_LEFT 1 -#define CTRL_RIGHT 2 +#define CTRL_LEFT 1 +#define CTRL_RIGHT 2 #endif // DBAUI_WIZARD_PAGES_HRC diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src index 9871c3f7d810..7afd2888cba1 100644 --- a/dbaccess/source/ui/misc/WizardPages.src +++ b/dbaccess/source/ui/misc/WizardPages.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,13 +37,13 @@ #define WINDOW_SIZE_X 276 -#define WINDOW_SIZE_Y 185 +#define WINDOW_SIZE_Y 185 -#define WINDOW_BORDER_X 12 -#define WINDOW_BORDER_Y 14 +#define WINDOW_BORDER_X 12 +#define WINDOW_BORDER_Y 14 -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 String STR_WIZ_COLUMN_SELECT_TITEL { @@ -62,7 +62,7 @@ String STR_WIZ_PKEY_ALREADY_DEFINED String STR_WIZ_NAME_MATCHING_TITEL { - Text [ en-US ] = "Assign columns" ; + Text [ en-US ] = "Assign columns" ; }; ModalDialog WIZ_RTFCOPYTABLE @@ -71,40 +71,40 @@ ModalDialog WIZ_RTFCOPYTABLE Text [ en-US ] = "Copy RTF Table" ; - OutputSize = TRUE ; - SVLook = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE; + OutputSize = TRUE ; + SVLook = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + Hide = TRUE; HelpButton PB_HELP { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "~Help"; }; CancelButton PB_CANCEL { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "~Cancel"; }; PushButton PB_PREV { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "< ~Back"; }; PushButton PB_NEXT { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "~Next>"; }; OKButton PB_OK { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "C~reate"; }; @@ -115,36 +115,36 @@ ModalDialog WIZ_RTFCOPYTABLE //================================================================== TabPage TAB_WIZ_COLUMN_SELECT { - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; - HelpId = HID_TAB_WIZ_COLUMN_SELECT; - Hide = TRUE; + HelpId = HID_TAB_WIZ_COLUMN_SELECT; + Hide = TRUE; FixedLine FL_COLUMN_SELECT { - Pos = MAP_APPFONT ( 6 , 3 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ; Text [ en-US ] = "Existing columns" ; }; MultiListBox LB_ORG_COLUMN_NAMES { - Border = TRUE ; - Pos = MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ; + Border = TRUE ; + Pos = MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ; Size = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ; - TabStop = TRUE ; + TabStop = TRUE ; HScroll = TRUE; VScroll = TRUE; - AutoHScroll = TRUE; - SimpleMode = TRUE; - Sort = FALSE; + AutoHScroll = TRUE; + SimpleMode = TRUE; + Sort = FALSE; }; ImageButton IB_COLUMN_RH { Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 25 ) ; - Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + Size = MAP_APPFONT ( 20 , 14 ) ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -162,8 +162,8 @@ TabPage TAB_WIZ_COLUMN_SELECT ImageButton IB_COLUMNS_RH { Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 45 ) ; - Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE; + Size = MAP_APPFONT ( 20 , 14 ) ; + TabStop = TRUE; DefButton = TRUE; ButtonImage = Image { @@ -182,8 +182,8 @@ TabPage TAB_WIZ_COLUMN_SELECT ImageButton IB_COLUMN_LH { Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 65) ; - Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + Size = MAP_APPFONT ( 20 , 14 ) ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -201,8 +201,8 @@ TabPage TAB_WIZ_COLUMN_SELECT ImageButton IB_COLUMNS_LH { Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 85) ; - Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + Size = MAP_APPFONT ( 20 , 14 ) ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -220,15 +220,15 @@ TabPage TAB_WIZ_COLUMN_SELECT MultiListBox LB_NEW_COLUMN_NAMES { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( WINDOW_BORDER_X + 157, WINDOW_BORDER_Y) ; Size = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ; - TabStop = TRUE ; + TabStop = TRUE ; HScroll = TRUE; VScroll = TRUE; - AutoHScroll = TRUE; - SimpleMode = TRUE; - Sort = FALSE; + AutoHScroll = TRUE; + SimpleMode = TRUE; + Sort = FALSE; }; }; @@ -237,42 +237,42 @@ TabPage TAB_WIZ_COLUMN_SELECT //================================================================== TabPage TAB_WIZ_TYPE_SELECT { - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; - HelpId = HID_TAB_WIZ_TYPE_SELECT; - Hide = TRUE; + HelpId = HID_TAB_WIZ_TYPE_SELECT; + Hide = TRUE; MultiListBox LB_NEW_COLUMN_NAMES { - Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 87 , WINDOW_SIZE_Y - 12 ) ; - TabStop = TRUE ; + Border = TRUE ; + Pos = MAP_APPFONT ( 6 , 6 ) ; + Size = MAP_APPFONT ( 87 , WINDOW_SIZE_Y - 12 ) ; + TabStop = TRUE ; HScroll = TRUE; VScroll = TRUE; - AutoHScroll = TRUE; - SimpleMode = TRUE; + AutoHScroll = TRUE; + SimpleMode = TRUE; }; FixedLine FL_COLUMN_NAME { - Pos = MAP_APPFONT ( 99 , 3 ) ; + Pos = MAP_APPFONT ( 99 , 3 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 105, 8 ) ; Text [ en-US ] = "Column information" ; }; TabPage CONTROL_CONTAINER { - Pos = MAP_APPFONT ( 102 , WINDOW_BORDER_Y ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 111, WINDOW_SIZE_Y - WINDOW_BORDER_Y - 67 ); + Pos = MAP_APPFONT ( 102 , WINDOW_BORDER_Y ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 111, WINDOW_SIZE_Y - WINDOW_BORDER_Y - 67 ); SVLook = TRUE; DialogControl = TRUE; }; FixedLine FL_AUTO_TYPE { - Pos = MAP_APPFONT ( 99 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 41 ) ; + Pos = MAP_APPFONT ( 99 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 41 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 105, 8 ) ; Text [ en-US ] = "Automatic type recognition" ; }; @@ -286,18 +286,18 @@ TabPage TAB_WIZ_TYPE_SELECT NumericField ET_AUTO { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 151 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 29) ; - Size = MAP_APPFONT ( 40 , 12 ) ; - TabStop = TRUE ; + Size = MAP_APPFONT ( 40 , 12 ) ; + TabStop = TRUE ; }; PushButton PB_AUTO { Pos = MAP_APPFONT ( WINDOW_SIZE_X - 62 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 30 ) ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; - TabStop = TRUE ; - Text = "~Auto" ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Text = "~Auto" ; }; }; @@ -307,9 +307,9 @@ Menu RID_SBA_RTF_PKEYPOPUP { MenuItem { - Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - Checkable = TRUE ; + Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + Checkable = TRUE ; Text [ en-US ] = "Primary Key" ; }; }; @@ -319,42 +319,42 @@ Menu RID_SBA_RTF_PKEYPOPUP //================================================================== TabPage TAB_WIZ_NAME_MATCHING { - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; - Hide = TRUE; + Hide = TRUE; FixedText FT_TABLE_LEFT { - Pos = MAP_APPFONT ( 52 , 6 ) ; - Size = MAP_APPFONT ( 75 , 20) ; + Pos = MAP_APPFONT ( 52 , 6 ) ; + Size = MAP_APPFONT ( 75 , 20) ; Text [ en-US ] = "Source table: \n"; }; FixedText FT_TABLE_RIGHT { Pos = MAP_APPFONT ( 144, 6 ) ; - Size = MAP_APPFONT ( 75 , 20) ; + Size = MAP_APPFONT ( 75 , 20) ; Text [ en-US ] = "Destination table: \n"; }; Control CTRL_LEFT { - Border = TRUE; - Pos = MAP_APPFONT ( 52, 28) ; + Border = TRUE; + Pos = MAP_APPFONT ( 52, 28) ; Size = MAP_APPFONT ( 82 , WINDOW_SIZE_Y - 34 ) ; - TabStop = TRUE; - HelpId = HID_TAB_NAMEMATCHING_COLS_AVAIL; + TabStop = TRUE; + HelpId = HID_TAB_NAMEMATCHING_COLS_AVAIL; /*DialogControl = TRUE;*/ }; Control CTRL_RIGHT { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 144, 28) ; Size = MAP_APPFONT ( 82 , WINDOW_SIZE_Y - 34 ) ; - TabStop = TRUE; - HelpId = HID_TAB_NAMEMATCHING_COLS_ASSIGN; + TabStop = TRUE; + HelpId = HID_TAB_NAMEMATCHING_COLS_ASSIGN; /*DialogControl = TRUE;*/ }; @@ -362,7 +362,7 @@ TabPage TAB_WIZ_NAME_MATCHING { Pos = MAP_APPFONT ( 19 , 45 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; - TabStop = TRUE; + TabStop = TRUE; DefButton = TRUE; ButtonImage = Image { @@ -382,7 +382,7 @@ TabPage TAB_WIZ_NAME_MATCHING { Pos = MAP_APPFONT ( 19 , 63 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; - TabStop = TRUE; + TabStop = TRUE; ButtonImage = Image { ImageBitmap = Bitmap @@ -401,7 +401,7 @@ TabPage TAB_WIZ_NAME_MATCHING { Pos = MAP_APPFONT ( WINDOW_SIZE_X - 33, 45 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; - TabStop = TRUE; + TabStop = TRUE; DefButton = TRUE; ButtonImage = Image { @@ -421,7 +421,7 @@ TabPage TAB_WIZ_NAME_MATCHING { Pos = MAP_APPFONT ( WINDOW_SIZE_X - 33, 63) ; Size = MAP_APPFONT ( 14 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -440,26 +440,26 @@ TabPage TAB_WIZ_NAME_MATCHING PushButton PB_ALL { Pos = MAP_APPFONT ( 6, 83) ; - Size = MAP_APPFONT ( 40 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~All" ; + Size = MAP_APPFONT ( 40 , 14 ) ; + TabStop = TRUE ; + Text [ en-US ] = "~All" ; }; PushButton PB_NONE { Pos = MAP_APPFONT ( 6, 103) ; - Size = MAP_APPFONT ( 40 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Non~e" ; + Size = MAP_APPFONT ( 40 , 14 ) ; + TabStop = TRUE ; + Text [ en-US ] = "Non~e" ; }; }; TabPage TAB_WIZ_COPYTABLE { - SVLook = TRUE ; + SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ; - HelpId = HID_TAB_WIZ_COPYTABLE; - Hide = TRUE; + HelpId = HID_TAB_WIZ_COPYTABLE; + Hide = TRUE; FixedText FT_TABLENAME { @@ -470,11 +470,11 @@ TabPage TAB_WIZ_COPYTABLE Edit ET_TABLENAME { - HelpId = HID_TAB_WIZ_TABLENAME_EDIT; - Border = TRUE ; + HelpId = HID_TAB_WIZ_TABLENAME_EDIT; + Border = TRUE ; Pos = MAP_APPFONT ( 80 , 9) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 92 , 12 ) ; - TabStop = TRUE ; + TabStop = TRUE ; }; FixedLine FL_OPTIONS @@ -486,41 +486,41 @@ TabPage TAB_WIZ_COPYTABLE RadioButton RB_DEFDATA { Pos = MAP_APPFONT ( 12 , 35 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; + Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "De~finition and data" ; }; RadioButton RB_DEF { Pos = MAP_APPFONT ( 12, 49 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; + Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "Def~inition" ; }; RadioButton RB_VIEW { Pos = MAP_APPFONT ( 12, 63 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; + Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "A~s table view"; }; RadioButton RB_APPENDDATA { Pos = MAP_APPFONT ( 12, 77 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; + Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "Append ~data" ; }; CheckBox CB_USEHEADERLINE { Pos = MAP_APPFONT ( 12, 93 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 18, 10 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 18, 10 ) ; Text [ en-US ] = "Use first ~line as column names" ; }; CheckBox CB_PRIMARY_COLUMN { Pos = MAP_APPFONT ( 12, 107 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Crea~te primary key"; }; FixedText FT_KEYNAME @@ -533,9 +533,9 @@ TabPage TAB_WIZ_COPYTABLE Edit ET_KEYNAME { Pos = MAP_APPFONT ( 80, 120 ) ; - Size = MAP_APPFONT ( 65 , 12 ) ; - TabStop = TRUE ; - Border = TRUE ; + Size = MAP_APPFONT ( 65 , 12 ) ; + TabStop = TRUE ; + Border = TRUE ; }; }; diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index 5d866839748e..80823313b782 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 2ce044be43c9..ff3ee96f3555 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,7 +156,7 @@ namespace dbaui } //------------------------------------------------------------------------- - const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator++() + const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator++() { DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::end(), "OCharsetDisplay::ExtendedCharsetIterator::operator++ : invalid position!"); if ( m_aPosition != m_pContainer->OCharsetDisplay_Base::end() ) @@ -165,7 +165,7 @@ namespace dbaui } //------------------------------------------------------------------------- - const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator--() + const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator--() { DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::begin(), "OCharsetDisplay::ExtendedCharsetIterator::operator-- : invalid position!"); if ( m_aPosition != m_pContainer->OCharsetDisplay_Base::begin() ) @@ -180,7 +180,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 23a336d76266..39a5027b9082 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -183,7 +183,7 @@ namespace dbaui Reference< XWindow2 > xWindow( _rxFrame->getContainerWindow(), UNO_QUERY_THROW ); bIsActive = xWindow->isActive(); } - + } catch( const Exception& ) { @@ -325,38 +325,38 @@ namespace dbaui { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowClosing( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowClosed( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowMinimized( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowNormalized( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowActivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { impl_checkDisposed_throw(); lcl_updateActive_nothrow( *m_pData, true ); } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowDeactivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 9e0e5d352cc4..f95e0db8f212 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ namespace dbaui //= DatabaseObjectView //====================================================================== DatabaseObjectView::DatabaseObjectView( const Reference< XMultiServiceFactory >& _rxORB, - const Reference< XDatabaseDocumentUI >& _rxApplication, + const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame, const ::rtl::OUString& _rComponentURL ) :m_xORB ( _rxORB ) @@ -143,7 +143,7 @@ namespace dbaui aProp.Name = ::rtl::OUString::createFromAscii("TopWindow"); aProp.Value <<= sal_True; lArgs[nArg++] <<= aProp; - + m_xFrameLoader.set(xFact->createInstanceWithArguments(lArgs), UNO_QUERY_THROW); // everything we load can be considered a "top level document", so set the respective bit at the window. @@ -330,7 +330,7 @@ namespace dbaui i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_UPDATE_TABLENAME, sTable ); } } - + //====================================================================== //= RelationDesigner //====================================================================== @@ -340,7 +340,7 @@ namespace dbaui { } // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index abd0aceb9433..3d7bd63d5881 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,7 +139,7 @@ namespace dbaui try { if (bPwdRequired && !sPassword.getLength()) - { // password required, but empty -> connect using an interaction handler + { // password required, but empty -> connect using an interaction handler Reference< XCompletedConnection > xConnectionCompletion( _xDataSource, UNO_QUERY_THROW ); Reference< XModel > xModel( getDataSourceOrModel( _xDataSource ), UNO_QUERY_THROW ); @@ -229,7 +229,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/dbumiscres.hrc b/dbaccess/source/ui/misc/dbumiscres.hrc index 81b72e5dda87..9a415c47aad4 100644 --- a/dbaccess/source/ui/misc/dbumiscres.hrc +++ b/dbaccess/source/ui/misc/dbumiscres.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,32 +31,32 @@ //======================================================================== // string ids (relative to other resources, that's why not unique) -#define STR_MYSQL_ODBC 1 -#define STR_MYSQL_JDBC 2 -#define STR_ADABAS 3 -#define STR_ORACLE_JDBC 4 -#define STR_JDBC 5 -#define STR_ODBC 6 -#define STR_DBASE 7 -#define STR_MSACCESS 8 +#define STR_MYSQL_ODBC 1 +#define STR_MYSQL_JDBC 2 +#define STR_ADABAS 3 +#define STR_ORACLE_JDBC 4 +#define STR_JDBC 5 +#define STR_ODBC 6 +#define STR_DBASE 7 +#define STR_MSACCESS 8 #define STR_MSACCESS2007 9 -#define STR_ADO 10 -#define STR_FLAT 11 -#define STR_CALC 12 -#define STR_MOZILLA 13 -#define STR_LDAP 14 -#define STR_OUTLOOK 15 -#define STR_OUTLOOKEXP 16 -#define STR_EVOLUTION 17 -#define STR_EVOLUTION_GROUPWISE 18 -#define STR_EVOLUTION_LDAP 19 -#define STR_KAB 20 -#define STR_MACAB 21 +#define STR_ADO 10 +#define STR_FLAT 11 +#define STR_CALC 12 +#define STR_MOZILLA 13 +#define STR_LDAP 14 +#define STR_OUTLOOK 15 +#define STR_OUTLOOKEXP 16 +#define STR_EVOLUTION 17 +#define STR_EVOLUTION_GROUPWISE 18 +#define STR_EVOLUTION_LDAP 19 +#define STR_KAB 20 +#define STR_MACAB 21 #define STR_EMBEDDED_HSQLDB 22 -#define STR_THUNDERBIRD 23 -#define STR_MYSQL_NATIVE 24 - -#define STR_END STR_MYSQL_NATIVE + 1 - -#endif // _DBU_MISCRES_HRC_ +#define STR_THUNDERBIRD 23 +#define STR_MYSQL_NATIVE 24 + +#define STR_END STR_MYSQL_NATIVE + 1 + +#endif // _DBU_MISCRES_HRC_ diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src index 552a076147d5..8deda3fde2ae 100644 --- a/dbaccess/source/ui/misc/dbumiscres.src +++ b/dbaccess/source/ui/misc/dbumiscres.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,12 +66,12 @@ String STR_BUTTON_TEXT_ALL String STR_UNDO_COLON { - Text [ en-US ] = "Undo:"; + Text [ en-US ] = "Undo:"; }; String STR_REDO_COLON { - Text [ en-US ] = "Redo:"; + Text [ en-US ] = "Redo:"; }; String STR_UNKNOWN_TYPE_FOUND diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index bac5dfbaa5f6..40e21ba74e1a 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index 8bb505e5332f..f65d3c04b8d7 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,7 +115,7 @@ namespace dbaui { FeatureSet aCurrentSet; const ::comphelper::NamedValueCollection aCurrentFeatures( aDriverConfig.getFeatures( *pattern ).getNamedValues() ); - + const FeatureMapping* pFeatureMapping = lcl_getFeatureMappings(); while ( pFeatureMapping->pAsciiFeatureName ) { diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 8147e2bd242a..f3a9af1112bb 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index 137f9eeb696e..ddead23b0bb4 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,10 +65,10 @@ namespace dbaui } //------------------------------------------------------------------ -// OIndexCollection::OIndexCollection(const Reference< XNameAccess >& _rxIndexes) -// { -// implConstructFrom(_rxIndexes); -// } +// OIndexCollection::OIndexCollection(const Reference< XNameAccess >& _rxIndexes) +// { +// implConstructFrom(_rxIndexes); +// } //------------------------------------------------------------------ const OIndexCollection& OIndexCollection::operator=(const OIndexCollection& _rSource) @@ -190,7 +190,7 @@ namespace dbaui xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName)); // the fields - for ( ConstIndexFieldsIterator aFieldLoop = _rPos->aFields.begin(); + for ( ConstIndexFieldsIterator aFieldLoop = _rPos->aFields.begin(); aFieldLoop != _rPos->aFields.end(); ++aFieldLoop ) @@ -213,7 +213,7 @@ namespace dbaui _rPos->clearModified(); } catch(SQLException&) - { // allowed to pass + { // allowed to pass throw; } catch( const Exception& ) @@ -239,7 +239,7 @@ namespace dbaui xDropIndex->dropByName(_rPos->getOriginalName()); } catch(SQLException&) - { // allowed to pass + { // allowed to pass throw; } catch( const Exception& ) @@ -350,7 +350,7 @@ namespace dbaui _rPos->flagAsCommitted(GrantIndexAccess()); } catch(SQLException&) - { // allowed to pass + { // allowed to pass throw; } catch( const Exception& ) @@ -364,10 +364,10 @@ namespace dbaui { OSL_ENSURE(end() == find(_rName), "OIndexCollection::insert: invalid new name!"); String tmpName; - OIndex aNewIndex(tmpName); // the empty string indicates the index is a new one + OIndex aNewIndex(tmpName); // the empty string indicates the index is a new one aNewIndex.sName = _rName; m_aIndexes.push_back(aNewIndex); - return m_aIndexes.end() - 1; // the last element is the new one ... + return m_aIndexes.end() - 1; // the last element is the new one ... } //------------------------------------------------------------------ @@ -402,7 +402,7 @@ namespace dbaui } //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 8d470332158e..58e920c88493 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -123,7 +123,7 @@ namespace dbaui //================================================================== //= OLinkedDocumentsAccess //================================================================== - DBG_NAME(OLinkedDocumentsAccess) + DBG_NAME(OLinkedDocumentsAccess) //------------------------------------------------------------------ OLinkedDocumentsAccess::OLinkedDocumentsAccess( Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, const Reference< XMultiServiceFactory >& _rxORB, const Reference< XNameAccess >& _rxContainer, @@ -135,14 +135,14 @@ namespace dbaui ,m_pDialogParent(_pDialogParent) ,m_sDataSourceName(_sDataSourceName) { - DBG_CTOR(OLinkedDocumentsAccess,NULL); + DBG_CTOR(OLinkedDocumentsAccess,NULL); OSL_ENSURE(m_xORB.is(), "OLinkedDocumentsAccess::OLinkedDocumentsAccess: invalid service factory!"); OSL_ENSURE(m_pDialogParent, "OLinkedDocumentsAccess::OLinkedDocumentsAccess: really need a dialog parent!"); } //------------------------------------------------------------------ OLinkedDocumentsAccess::~OLinkedDocumentsAccess() { - DBG_DTOR(OLinkedDocumentsAccess,NULL); + DBG_DTOR(OLinkedDocumentsAccess,NULL); } //------------------------------------------------------------------ Reference< XComponent> OLinkedDocumentsAccess::impl_open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, @@ -180,7 +180,7 @@ namespace dbaui aArguments.put( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); try - { + { Reference<XHierarchicalNameContainer> xHier(m_xDocumentContainer,UNO_QUERY); if ( xHier.is() && xHier->hasByHierarchicalName(_rLinkName) ) { @@ -191,7 +191,7 @@ namespace dbaui xRet = xComponentLoader->loadComponentFromURL( _rLinkName, ::rtl::OUString(), 0, aArguments.getPropertyValues() ); } - catch(Exception& e) + catch(Exception& e) { (void)e; throw; @@ -218,7 +218,7 @@ namespace dbaui } aArgs.put( "DocumentUI", m_xDocumentUI ); - + Reference< XJobExecutor > xWizard; { WaitObject aWaitCursor( m_pDialogParent ); @@ -251,7 +251,7 @@ namespace dbaui void OLinkedDocumentsAccess::newTableWithPilot() { impl_newWithPilot( "com.sun.star.wizards.table.CallTableWizard", -1, ::rtl::OUString() ); - } + } //------------------------------------------------------------------ void OLinkedDocumentsAccess::newQueryWithPilot() { @@ -298,8 +298,8 @@ namespace dbaui // load the document as template Reference< XComponent > xNewDocument; try - { // get the desktop object - + { // get the desktop object + Reference<XMultiServiceFactory> xORB(m_xDocumentContainer,UNO_QUERY); if ( xORB.is() ) { @@ -347,10 +347,10 @@ namespace dbaui //------------------------------------------------------------------ Reference< XComponent > OLinkedDocumentsAccess::open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs ) - { + { dbtools::SQLExceptionInfo aInfo; Reference< XComponent > xRet; - try + try { xRet = impl_open( _rLinkName, _xDefinition, _eOpenMode, _rAdditionalArgs ); if ( !xRet.is() ) @@ -366,7 +366,7 @@ namespace dbaui return xRet; } catch (com::sun::star::io::WrongFormatException e) - { + { com::sun::star::sdbc::SQLException aSQLException; aSQLException.Message = e.Message; aSQLException.Context = e.Context; @@ -379,9 +379,9 @@ namespace dbaui String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); - aInfo.prepend(sMessage); + aInfo.prepend(sMessage); } - catch(Exception& e) + catch(Exception& e) { Any aAny = ::cppu::getCaughtException(); com::sun::star::sdbc::SQLException a; @@ -391,10 +391,10 @@ namespace dbaui aSQLException.Message = e.Message; aSQLException.Context = e.Context; aInfo = dbtools::SQLExceptionInfo(aSQLException); - + // more like a hack, insert an empty message aInfo.prepend(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \n"))); - + String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); aInfo.prepend(sMessage); @@ -406,10 +406,10 @@ namespace dbaui } return xRet; } - + //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index 3e8457361222..070bc53f85f9 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,10 @@ #include <svl/solar.hrc> #include <tools/debug.hxx> -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ +#define ENTER_MOD_METHOD() \ + ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() - + //......................................................................... namespace dbaui { @@ -51,7 +51,7 @@ namespace dbaui */ class OModuleImpl { - ResMgr* m_pRessources; + ResMgr* m_pRessources; public: /// ctor @@ -59,7 +59,7 @@ public: ~OModuleImpl(); /// get the manager for the ressources of the module - ResMgr* getResManager(); + ResMgr* getResManager(); }; DBG_NAME(OModuleImpl) @@ -81,7 +81,7 @@ OModuleImpl::~OModuleImpl() } //------------------------------------------------------------------------- -ResMgr* OModuleImpl::getResManager() +ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -97,11 +97,11 @@ ResMgr* OModuleImpl::getResManager() //========================================================================= //= OModule //========================================================================= -::osl::Mutex OModule::s_aMutex; -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = NULL; +::osl::Mutex OModule::s_aMutex; +sal_Int32 OModule::s_nClients = 0; +OModuleImpl* OModule::s_pImpl = NULL; //------------------------------------------------------------------------- -ResMgr* OModule::getResManager() +ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); @@ -134,7 +134,7 @@ void OModule::ensureImpl() } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx index 817b4a68aee8..e10d48634d44 100644 --- a/dbaccess/source/ui/misc/propertysetitem.cxx +++ b/dbaccess/source/ui/misc/propertysetitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index fc65cb18d670..d28ac662bc20 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index d6cc403765bf..aa2c7ed5de07 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,14 +149,14 @@ namespace dbaui SharedConnection m_xConnection; ::dbtools::DatabaseMetaData m_aSdbMetaData; // </properties> - ::rtl::OUString m_sDataSourceName; // the data source we're working for + ::rtl::OUString m_sDataSourceName; // the data source we're working for DataSourceHolder m_aDataSource; Reference< XModel > m_xDocument; - Reference< XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + Reference< XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier sal_Int32 m_nDocStartNumber; - sal_Bool m_bSuspended; // is true when the controller was already suspended - sal_Bool m_bEditable; // is the control readonly or not - sal_Bool m_bModified; // is the data modified + sal_Bool m_bSuspended; // is true when the controller was already suspended + sal_Bool m_bEditable; // is the control readonly or not + sal_Bool m_bModified; // is the data modified bool m_bNotAttached; OSingleDocumentControllerImpl( ::osl::Mutex& i_rMutex ) @@ -242,7 +242,7 @@ namespace dbaui return OSingleDocumentController_Base::queryInterface( _rType ); } - + //-------------------------------------------------------------------- Sequence< Type > SAL_CALL OSingleDocumentController::getTypes( ) throw (RuntimeException) { @@ -260,7 +260,7 @@ namespace dbaui } return aTypes; } - + //-------------------------------------------------------------------- void OSingleDocumentController::initializeConnection( const Reference< XConnection >& _rxForeignConn ) { @@ -394,9 +394,9 @@ namespace dbaui if ( _rSource.Source == getConnection() ) { if ( !m_pImpl->m_bSuspended // when already suspended then we don't have to reconnect - && !getBroadcastHelper().bInDispose - && !getBroadcastHelper().bDisposed - && isConnected() + && !getBroadcastHelper().bInDispose + && !getBroadcastHelper().bDisposed + && isConnected() ) { losingConnection(); @@ -450,7 +450,7 @@ namespace dbaui if ( !bSuspend && !isConnected() ) reconnect(sal_True); - + return sal_True; } @@ -549,12 +549,12 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString OSingleDocumentController::getDataSourceName() const - { + { ::rtl::OUString sName; Reference< XPropertySet > xDataSourceProps( m_pImpl->m_aDataSource.getDataSourceProps() ); if ( xDataSourceProps.is() ) xDataSourceProps->getPropertyValue(PROPERTY_NAME) >>= sName; - return sName; + return sName; } // ----------------------------------------------------------------------------- void OSingleDocumentController::connectionLostMessage() const @@ -566,13 +566,13 @@ namespace dbaui pWin = VCLUnoHelper::GetWindow(xWindow); if ( !pWin ) pWin = getView()->Window::GetParent(); - + InfoBox(pWin, aMessage).Execute(); } // ----------------------------------------------------------------------------- - const Reference< XConnection >& OSingleDocumentController::getConnection() const - { - return m_pImpl->m_xConnection; + const Reference< XConnection >& OSingleDocumentController::getConnection() const + { + return m_pImpl->m_xConnection; } // ----------------------------------------------------------------------------- @@ -606,7 +606,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - Reference< XDatabaseMetaData > OSingleDocumentController::getMetaData( ) const + Reference< XDatabaseMetaData > OSingleDocumentController::getMetaData( ) const { Reference< XDatabaseMetaData > xMeta; try @@ -658,7 +658,7 @@ namespace dbaui ::osl::MutexGuard aGuard( getMutex() ); if ( m_bExternalTitle ) return impl_getTitleHelper_throw()->getTitle (); - + ::rtl::OUStringBuffer sTitle; Reference< XTitle > xTitle(getPrivateModel(),UNO_QUERY); if ( xTitle.is() ) @@ -674,7 +674,7 @@ namespace dbaui // sTitle.appendAscii(" : "); // sTitle.append(nCurrentView); //} - + return sTitle.makeStringAndClear(); } // ----------------------------------------------------------------------------- @@ -745,7 +745,7 @@ namespace dbaui } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 655dce15c4e8..d1ad52675cd0 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ SfxPoolItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 8ea14059692c..e014d6e8e45d 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,8 +109,8 @@ extern "C" void SAL_CALL createRegistryInfo_DBU() //--------------------------------------------------------------------------------------- extern "C" DBACCESS_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_DBU(); diff --git a/dbaccess/source/ui/querydesign/ConnectionData.hxx b/dbaccess/source/ui/querydesign/ConnectionData.hxx index 67a768e79f40..72764da1317b 100644 --- a/dbaccess/source/ui/querydesign/ConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/ConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,13 +32,13 @@ namespace dbaui { //================================================================== - // ConnData ---------->* ConnLineData - // ^1 ^1 - // | | - // Conn ---------->* ConnLine + // ConnData ---------->* ConnLineData + // ^1 ^1 + // | | + // Conn ---------->* ConnLine //================================================================== - + } #endif // DBAUI_CONNECTIONDATA_HXX @@ -54,7 +54,7 @@ DECLARE_LIST( OConnectionLineList, OConnectionLine* ); DECLARE_LIST( OTableConnectionDataList, OTableConnectionData* ); //================================================================== -const USHORT MAX_CONN_COUNT = 2; +const USHORT MAX_CONN_COUNT = 2; class SbaJoinTabWin; class SbaJoinTabWinCont; diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 4c119ca15c78..04018dec54d0 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ const long HIT_SENSITIVE_RADIUS = 5; namespace { /** calcRect creates a new rectangle with the given points - @param _rBase the base point - @param _aVector the vector which will be added + @param _rBase the base point + @param _aVector the vector which will be added */ inline Rectangle calcRect(const Point& _rBase,const Point& _aVector) { @@ -57,9 +57,9 @@ namespace } // ----------------------------------------------------------------------------- /** GetTextPos calculate the rectangle for the connection to be drawn - @param _pWin the table window where to draw it - @param _aConnPos the connection point - @param _aDescrLinePos the description line pos + @param _pWin the table window where to draw it + @param _aConnPos the connection point + @param _aDescrLinePos the description line pos */ Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos) { @@ -88,10 +88,10 @@ namespace } // ----------------------------------------------------------------------------- /** calcPointsYValue calculate the points Y value in relation to the listbox entry - @param _pWin the corresponding window - @param _pEntry the source or dest entry - @param _rNewConPos (in/out) the connection pos - @param _rNewDescrPos (in/out) the description pos + @param _pWin the corresponding window + @param _pEntry the source or dest entry + @param _rNewConPos (in/out) the connection pos + @param _rNewDescrPos (in/out) the description pos */ void calcPointsYValue(const OTableWindow* _pWin,SvLBoxEntry* _pEntry,Point& _rNewConPos,Point& _rNewDescrPos) { @@ -254,20 +254,20 @@ BOOL OConnectionLine::RecalcLine() aSourceCenter.X() = pSourceWin->GetPosPixel().X() + (long)( 0.5*pSourceWin->GetSizePixel().Width() ); aDestCenter.X() = pDestWin->GetPosPixel().X() + (long)( 0.5*pDestWin->GetSizePixel().Width() ); - const OTableWindow* pFirstWin = pDestWin; - const OTableWindow* pSecondWin = pSourceWin; - Point* pFirstConPos = &m_aDestConnPos; - Point* pFirstDescrPos = &m_aDestDescrLinePos; - Point* pSecondConPos = &m_aSourceConnPos; - Point* pSecondDescrPos = &m_aSourceDescrLinePos; + const OTableWindow* pFirstWin = pDestWin; + const OTableWindow* pSecondWin = pSourceWin; + Point* pFirstConPos = &m_aDestConnPos; + Point* pFirstDescrPos = &m_aDestDescrLinePos; + Point* pSecondConPos = &m_aSourceConnPos; + Point* pSecondDescrPos = &m_aSourceDescrLinePos; if( aDestCenter.X() > aSourceCenter.X() ) { - pFirstWin = pSourceWin; - pSecondWin = pDestWin; - pFirstConPos = &m_aSourceConnPos; - pFirstDescrPos = &m_aSourceDescrLinePos; - pSecondConPos = &m_aDestConnPos; - pSecondDescrPos = &m_aDestDescrLinePos; + pFirstWin = pSourceWin; + pSecondWin = pDestWin; + pFirstConPos = &m_aSourceConnPos; + pFirstDescrPos = &m_aSourceDescrLinePos; + pSecondConPos = &m_aDestConnPos; + pSecondDescrPos = &m_aDestDescrLinePos; } if ( pFirstWin == pSecondWin && pSourceEntry != pDestEntry ) @@ -279,7 +279,7 @@ BOOL OConnectionLine::RecalcLine() ////////////////////////////////////////////////////////////////////// // aSourceConnPosY bestimmen calcPointsYValue(pSourceWin,pSourceEntry,m_aSourceConnPos,m_aSourceDescrLinePos); - + ////////////////////////////////////////////////////////////////////// // aDestConnPosY bestimmen calcPointsYValue(pDestWin,pDestEntry,m_aDestConnPos,m_aDestDescrLinePos); @@ -337,7 +337,7 @@ double dist_Euklid(const Point &p1, const Point& p2,const Point& pM, Point& q) double l = (v.X() * w.Y() - v.Y() * w.X()) / a; double a2 = w.X()*v.X()+w.Y()*v.Y(); a = a2 / (a * a); - q.X() = long(p1.X() + a * v.X()); + q.X() = long(p1.X() + a * v.X()); q.Y() = long(p1.Y() + a * v.Y()); return l; } @@ -361,14 +361,14 @@ bool OConnectionLine::CheckHit( const Point& rMousePos ) const return false; } // ----------------------------------------------------------------------------- -Rectangle OConnectionLine::GetSourceTextPos() const -{ - return GetTextPos(m_pTabConn->GetSourceWin(),m_aSourceConnPos,m_aSourceDescrLinePos); +Rectangle OConnectionLine::GetSourceTextPos() const +{ + return GetTextPos(m_pTabConn->GetSourceWin(),m_aSourceConnPos,m_aSourceDescrLinePos); } // ----------------------------------------------------------------------------- -Rectangle OConnectionLine::GetDestTextPos() const -{ - return GetTextPos(m_pTabConn->GetDestWin(),m_aDestConnPos,m_aDestDescrLinePos); +Rectangle OConnectionLine::GetDestTextPos() const +{ + return GetTextPos(m_pTabConn->GetDestWin(),m_aDestConnPos,m_aDestDescrLinePos); } // ----------------------------------------------------------------------------- Point OConnectionLine::getMidPoint() const diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 8f532687e72c..ba68d702ef41 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; - // using namespace ::com::sun::star::awt; + // using namespace ::com::sun::star::awt; using namespace ::com::sun::star; OConnectionLineAccess::OConnectionLineAccess(OTableConnection* _pLine) - : VCLXAccessibleComponent(_pLine->GetComponentInterface().is() ? _pLine->GetWindowPeer() : NULL) + : VCLXAccessibleComponent(_pLine->GetComponentInterface().is() ? _pLine->GetWindowPeer() : NULL) ,m_pLine(_pLine) { } @@ -206,7 +206,7 @@ namespace dbaui aSeq[0] = m_pLine->GetSourceWin()->GetAccessible(); aSeq[1] = m_pLine->GetDestWin()->GetAccessible(); } - + return AccessibleRelation(AccessibleRelationType::CONTROLLED_BY,aSeq); } // ----------------------------------------------------------------------------- @@ -232,7 +232,7 @@ namespace dbaui DBG_DTOR(OTableConnection,NULL); ////////////////////////////////////////////////////////////////////// // clear vector - clearLineData(); + clearLineData(); } // ----------------------------------------------------------------------------- sal_Bool OConnectionLineAccess::isEditable() const diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx index 49360b0959b5..9140d6effec2 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ namespace dbaui //------------------------------------------------------------------------- bool operator==(const OConnectionLineData& lhs, const OConnectionLineData& rhs) { - return (lhs.m_aSourceFieldName == rhs.m_aSourceFieldName) + return (lhs.m_aSourceFieldName == rhs.m_aSourceFieldName) && (lhs.m_aDestFieldName == rhs.m_aDestFieldName); } } diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 155aac4c27da..beb41dee8ca2 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 3f3059967447..77b31a8a4fd9 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include "precompiled_dbaccess.hxx" #include <sfx2/sfxsids.hrc> #include "dbu_qry.hrc" -#include "browserids.hxx" +#include "browserids.hxx" #include <comphelper/types.hxx> #include "dbustrings.hrc" #include <connectivity/dbtools.hxx> @@ -175,12 +175,12 @@ OJoinController::OJoinController(const Reference< XMultiServiceFactory >& _rM) :OJoinController_BASE(_rM) ,m_pAddTableDialog(NULL) { - DBG_CTOR(OJoinController,NULL); + DBG_CTOR(OJoinController,NULL); } // ----------------------------------------------------------------------------- OJoinController::~OJoinController() { - DBG_DTOR(OJoinController,NULL); + DBG_DTOR(OJoinController,NULL); } // ----------------------------------------------------------------------------- @@ -291,7 +291,7 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& return; case RET_NO: reset(); - setModified(sal_False); // and we are not modified yet + setModified(sal_False); // and we are not modified yet break; default: break; diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 85c5a9eb9120..17ad8bd84b50 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include <comphelper/extract.hxx> #include "UITools.hxx" #include "JoinTableView.hxx" -// #include <com/sun/star/util/URL.hdl> +// #include <com/sun/star/util/URL.hdl> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -87,7 +87,7 @@ void OJoinDesignView::Construct() m_pScrollWindow->setTableView(m_pTableView); m_pScrollWindow->Show(); m_pTableView->Show(); - + SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); ODataView::Construct(); @@ -95,7 +95,7 @@ void OJoinDesignView::Construct() // ----------------------------------------------------------------------------- void OJoinDesignView::initialize() { - // getAddTableDialog()->Update(); + // getAddTableDialog()->Update(); } // ------------------------------------------------------------------------- void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground) diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 75d69afa5b09..b984201492e9 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ namespace dbaui sal_Bool OJoinExchObj::isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID) { DataFlavorExVector::const_iterator aCheckEnd = _rFormats.end(); - for ( DataFlavorExVector::const_iterator aCheck = _rFormats.begin(); + for ( DataFlavorExVector::const_iterator aCheck = _rFormats.begin(); aCheck != aCheckEnd; ++aCheck ) @@ -174,6 +174,6 @@ namespace dbaui } -} // namespace dbaui +} // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 60099ed9999d..1437a57c4d59 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,14 +64,14 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -#define LINE_SIZE 50 +#define LINE_SIZE 50 //////////////////////////////////////////////////////////////// // Konstanten fuer das Fensterlayout -#define TABWIN_SPACING_X 17 -#define TABWIN_SPACING_Y 17 +#define TABWIN_SPACING_X 17 +#define TABWIN_SPACING_Y 17 -#define TABWIN_WIDTH_STD 120 -#define TABWIN_HEIGHT_STD 120 +#define TABWIN_WIDTH_STD 120 +#define TABWIN_HEIGHT_STD 120 DBG_NAME(OScrollWindowHelper) OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent) @@ -105,7 +105,7 @@ OScrollWindowHelper::~OScrollWindowHelper() DBG_DTOR(OScrollWindowHelper,NULL); ::std::auto_ptr<Window> aTemp(m_pCornerWindow); m_pCornerWindow = NULL; - m_pTableView = NULL; + m_pTableView = NULL; } // ----------------------------------------------------------------------------- @@ -207,7 +207,7 @@ OJoinTableView::~OJoinTableView() } ////////////////////////////////////////////////////////////////////// // Listen loeschen - clearLayoutInformation(); + clearLayoutInformation(); } //------------------------------------------------------------------------------ IMPL_LINK( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar ) @@ -274,7 +274,7 @@ bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,sal_Bool _bDelet modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, makeAny(_pConn->GetAccessible()), Any()); if ( _bDelete ) @@ -359,7 +359,7 @@ void OJoinTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rt modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(pNewTabWin->GetAccessible())); } @@ -384,7 +384,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) { OTableConnection* pTabConn = (*aIter); if( - ( pData == pTabConn->GetData()->getReferencingTable()) || + ( pData == pTabConn->GetData()->getReferencingTable()) || ( pData == pTabConn->GetData()->getReferencedTable()) ) { @@ -400,7 +400,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) if ( bRemove ) { if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, makeAny(pTabWin->GetAccessible()),Any() ); @@ -444,7 +444,7 @@ namespace long nOldThumbPos = pBar->GetThumbPos(); long nNewThumbPos = nOldThumbPos + nDelta; if( nNewThumbPos < 0 ) - nNewThumbPos = 0;// bRet = FALSE; + nNewThumbPos = 0;// bRet = FALSE; else if( nNewThumbPos > pBar->GetRangeMax() ) nNewThumbPos = pBar->GetRangeMax();// bRet = FALSE; @@ -466,7 +466,7 @@ namespace Point aUpperLeft = _rPoint; // normalize with respect to visibility aUpperLeft -= _pView->GetScrollOffset(); - // aUpperLeft.Y() -= _pView->GetScrollOffset().Y(); + // aUpperLeft.Y() -= _pView->GetScrollOffset().Y(); Point aLowerRight(aUpperLeft.X() + _rSize.Width(), aUpperLeft.Y() + _rSize.Height()); // data about ourself @@ -485,7 +485,7 @@ namespace _nScrollX = aLowerRight.X() - aSize.Width() + TABWIN_SPACING_X; // ensure the visibility of the left border (higher priority) - // if ( (aUpperLeft.X() - _nScrollX) < 0 ) + // if ( (aUpperLeft.X() - _nScrollX) < 0 ) if ( aUpperLeft.X() < 0 ) _nScrollX = aUpperLeft.X() - TABWIN_SPACING_X; } @@ -496,7 +496,7 @@ namespace if ( aLowerRight.Y() > aSize.Height() ) _nScrollY = aLowerRight.Y() - aSize.Height() + TABWIN_SPACING_Y; // upper border - // if ( (aUpperLeft.Y() - _nScrollY) < 0 ) + // if ( (aUpperLeft.Y() - _nScrollY) < 0 ) if ( aUpperLeft.Y() < 0 ) _nScrollY = aUpperLeft.Y() - TABWIN_SPACING_Y; } @@ -534,7 +534,7 @@ void OJoinTableView::EnsureVisible(const OTableWindow* _pWin) { // data about the tab win TTableWindowData::value_type pData = _pWin->GetData(); - // Point aUpperLeft = pData->GetPosition(); + // Point aUpperLeft = pData->GetPosition(); EnsureVisible( pData->GetPosition() , pData->GetSize()); Invalidate(INVALIDATE_NOCHILDREN); } @@ -1051,14 +1051,14 @@ void OJoinTableView::DrawConnections( const Rectangle& rRect ) //------------------------------------------------------------------------------ ::std::vector<OTableConnection*>::const_iterator OJoinTableView::getTableConnections(const OTableWindow* _pFromWin) const { - return ::std::find_if( m_vTableConnection.begin(), + return ::std::find_if( m_vTableConnection.begin(), m_vTableConnection.end(), ::std::bind2nd(::std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); } // ----------------------------------------------------------------------------- sal_Int32 OJoinTableView::getConnectionCount(const OTableWindow* _pFromWin) const { - return ::std::count_if( m_vTableConnection.begin(), + return ::std::count_if( m_vTableConnection.begin(), m_vTableConnection.end(), ::std::bind2nd(::std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); } @@ -1083,8 +1083,8 @@ void OJoinTableView::ClearAll() RemoveConnection( *aIter ,sal_True); m_vTableConnection.clear(); - m_pLastFocusTabWin = NULL; - m_pSelectedConn = NULL; + m_pLastFocusTabWin = NULL; + m_pSelectedConn = NULL; // scroll to the upper left ScrollPane(-GetScrollOffset().X(), TRUE, TRUE); @@ -1229,8 +1229,8 @@ BOOL OJoinTableView::IsAddAllowed() } // nicht wenn keine Joins moeglich -// if (!GetDatabase()->IsCapable(SDB_CAP_JOIN) && nMax <= GetTabWinCount()) -// return FALSE; +// if (!GetDatabase()->IsCapable(SDB_CAP_JOIN) && nMax <= GetTabWinCount()) +// return FALSE; return TRUE; } @@ -1316,14 +1316,14 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab { OTableConnection* pData = *aIter; - if ( ( (pData->GetSourceWin() == pLhs) - && ( (pData->GetDestWin() == pRhs) - || (NULL == pRhs) + if ( ( (pData->GetSourceWin() == pLhs) + && ( (pData->GetDestWin() == pRhs) + || (NULL == pRhs) ) ) - || ( (pData->GetSourceWin() == pRhs) - && ( (pData->GetDestWin() == pLhs) - || (NULL == pLhs) + || ( (pData->GetSourceWin() == pRhs) + && ( (pData->GetDestWin() == pLhs) + || (NULL == pLhs) ) ) ) @@ -1381,7 +1381,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) // no tab wins -> no conns -> no traveling break; - const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); if (!pKeyEvent->GetKeyCode().IsMod1()) { switch (pKeyEvent->GetKeyCode().GetCode()) @@ -1403,7 +1403,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) OTableConnection* pNextConn = NULL; if (aIter != m_aTableMap.end()) - { // there is a currently active tab win + { // there is a currently active tab win // check if there is an "overflow" and we should select a conn instead of a win if (!m_vTableConnection.empty()) { @@ -1441,7 +1441,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) } } else - { // no active tab win -> travel the connections + { // no active tab win -> travel the connections // find the currently selected conn within the conn list sal_Int32 i(0); for ( ::std::vector<OTableConnection*>::iterator connectionIter = m_vTableConnection.begin(); @@ -1467,7 +1467,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) // there is a currently active conn pNextConn = m_vTableConnection[(i + (bForward ? 1 : m_vTableConnection.size() - 1)) % m_vTableConnection.size()]; else - { // no tab win selected, no conn selected + { // no tab win selected, no conn selected if (!m_vTableConnection.empty()) pNextConn = m_vTableConnection[bForward ? 0 : m_vTableConnection.size() - 1]; else if (!m_aTableMap.empty()) @@ -1634,8 +1634,8 @@ void OJoinTableView::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ // ----------------------------------------------------------------------------- void OJoinTableView::clearLayoutInformation() { - m_pLastFocusTabWin = NULL; - m_pSelectedConn = NULL; + m_pLastFocusTabWin = NULL; + m_pSelectedConn = NULL; ////////////////////////////////////////////////////////////////////// // Listen loeschen OTableWindowMapIterator aIter = m_aTableMap.begin(); @@ -1705,7 +1705,7 @@ void OJoinTableView::addConnection(OTableConnection* _pConnection,sal_Bool _bAdd modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(_pConnection->GetAccessible())); } diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx index 4bba1b75eaaa..3720e53a2326 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,13 +82,13 @@ sal_Bool OQueryTableConnection::operator==(const OQueryTableConnection& rCompare OQueryTableConnectionData* pCompData = static_cast<OQueryTableConnectionData*>(rCompare.GetData().get()); // Connections werden als gleich angesehen, wenn sie in Source-/Dest-Fenstername und Source-/Dest-FieldIndex uebereinstimmen ... - return ( ( (pMyData->getReferencedTable() == pCompData->getReferencedTable()) && + return ( ( (pMyData->getReferencedTable() == pCompData->getReferencedTable()) && (pMyData->getReferencingTable() == pCompData->getReferencingTable()) && (pMyData->GetFieldIndex(JTCS_TO) == pCompData->GetFieldIndex(JTCS_TO)) && (pMyData->GetFieldIndex(JTCS_FROM) == pCompData->GetFieldIndex(JTCS_FROM)) ) - || // ... oder diese Uebereinstimmung ueber Kreuz besteht - ( (pMyData->getReferencingTable() == pCompData->getReferencedTable()) && + || // ... oder diese Uebereinstimmung ueber Kreuz besteht + ( (pMyData->getReferencingTable() == pCompData->getReferencedTable()) && (pMyData->getReferencedTable() == pCompData->getReferencingTable()) && (pMyData->GetFieldIndex(JTCS_TO) == pCompData->GetFieldIndex(JTCS_FROM)) && (pMyData->GetFieldIndex(JTCS_FROM) == pCompData->GetFieldIndex(JTCS_TO)) diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx index a2402acab43b..9e49ded4088a 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace dbaui class OQueryTableView; class OQueryTableConnection : public OTableConnection { - sal_Bool m_bVisited; // is true if the conn was already visited through the join algorithm + sal_Bool m_bVisited; // is true if the conn was already visited through the join algorithm public: OQueryTableConnection(OQueryTableView* pContainer, const TTableConnectionData::value_type& pTabConnData); OQueryTableConnection(const OQueryTableConnection& rConn); @@ -47,10 +47,10 @@ namespace dbaui OQueryTableConnection& operator=(const OQueryTableConnection& rConn); sal_Bool operator==(const OQueryTableConnection& rCompare); - inline ::rtl::OUString GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); } + inline ::rtl::OUString GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); } - inline sal_Bool IsVisited() const { return m_bVisited; } - inline void SetVisited(sal_Bool bVisited) { m_bVisited = bVisited; } + inline sal_Bool IsVisited() const { return m_bVisited; } + inline void SetVisited(sal_Bool bVisited) { m_bVisited = bVisited; } }; } diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx index a15714a299cc..40111be03592 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,8 +156,8 @@ void OQueryTableConnectionData::InitFromDrag(const OTableFieldDescRef& rDragLeft } // ----------------------------------------------------------------------------- OTableConnectionData* OQueryTableConnectionData::NewInstance() const -{ - return new OQueryTableConnectionData(); +{ + return new OQueryTableConnectionData(); } // ----------------------------------------------------------------------------- BOOL OQueryTableConnectionData::Update() diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index f7d2173907b1..061541663229 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,13 +37,13 @@ namespace dbaui { class OQueryTableConnectionData : public OTableConnectionData { - sal_Int32 m_nFromEntryIndex; - sal_Int32 m_nDestEntryIndex; - EJoinType m_eJoinType; + sal_Int32 m_nFromEntryIndex; + sal_Int32 m_nDestEntryIndex; + EJoinType m_eJoinType; bool m_bNatural; - ETableFieldType m_eFromType; - ETableFieldType m_eDestType; + ETableFieldType m_eFromType; + ETableFieldType m_eDestType; protected: // fuer das Anlegen und Duplizieren von Lines vom eigenen Typ @@ -61,25 +61,25 @@ namespace dbaui virtual void CopyFrom(const OTableConnectionData& rSource); virtual OTableConnectionData* NewInstance() const; - + /** Update create a new connection @return true if successful */ virtual BOOL Update(); - ::rtl::OUString GetAliasName(EConnectionSide nWhich) const; + ::rtl::OUString GetAliasName(EConnectionSide nWhich) const; - sal_Int32 GetFieldIndex(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_nDestEntryIndex : m_nFromEntryIndex; } - void SetFieldIndex(EConnectionSide nWhich, sal_Int32 nVal) { if (nWhich==JTCS_TO) m_nDestEntryIndex=nVal; else m_nFromEntryIndex=nVal; } + sal_Int32 GetFieldIndex(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_nDestEntryIndex : m_nFromEntryIndex; } + void SetFieldIndex(EConnectionSide nWhich, sal_Int32 nVal) { if (nWhich==JTCS_TO) m_nDestEntryIndex=nVal; else m_nFromEntryIndex=nVal; } - ETableFieldType GetFieldType(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_eDestType : m_eFromType; } - void SetFieldType(EConnectionSide nWhich, ETableFieldType eType) { if (nWhich==JTCS_TO) m_eDestType=eType; else m_eFromType=eType; } + ETableFieldType GetFieldType(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_eDestType : m_eFromType; } + void SetFieldType(EConnectionSide nWhich, ETableFieldType eType) { if (nWhich==JTCS_TO) m_eDestType=eType; else m_eFromType=eType; } - void InitFromDrag(const OTableFieldDescRef& rDragLeft, const OTableFieldDescRef& rDragRight); + void InitFromDrag(const OTableFieldDescRef& rDragLeft, const OTableFieldDescRef& rDragRight); - EJoinType GetJoinType() const { return m_eJoinType; }; - void SetJoinType(const EJoinType& eJT) { m_eJoinType = eJT; }; + EJoinType GetJoinType() const { return m_eJoinType; }; + void SetJoinType(const EJoinType& eJT) { m_eJoinType = eJT; }; inline void setNatural(bool _bNatural) { m_bNatural = _bNatural; } inline bool isNatural() const { return m_bNatural; } diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 45135346cde9..4700ebfff613 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,9 +124,9 @@ sal_Bool OQueryTableWindow::Init() m_aTitle.SetText( pWinData->GetWinName() ); m_aTitle.Show(); - // sal_Bool bSuccess(sal_True); + // sal_Bool bSuccess(sal_True); if (!bSuccess) - { // es soll nur ein Dummy-Window aufgemacht werden ... + { // es soll nur ein Dummy-Window aufgemacht werden ... DBG_ASSERT(GetAliasName().getLength(), "OQueryTableWindow::Init : kein Alias- UND kein Tabellenname geht nicht !"); // .. aber das braucht wenigstens einen Alias diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index deaad8621808..b1fe23703c4a 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,52 +38,52 @@ namespace dbaui //================================================================== class OQueryTableWindow : public OTableWindow { - sal_Int32 m_nAliasNum; - ::rtl::OUString m_strInitialAlias; + sal_Int32 m_nAliasNum; + ::rtl::OUString m_strInitialAlias; public: OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL ); virtual ~OQueryTableWindow(); - ::rtl::OUString GetAliasName() const - { - return static_cast<OQueryTableWindowData*>(GetData().get())->GetAliasName(); + ::rtl::OUString GetAliasName() const + { + return static_cast<OQueryTableWindowData*>(GetData().get())->GetAliasName(); } - void SetAliasName(const ::rtl::OUString& strNewAlias) - { - static_cast<OQueryTableWindowData*>(GetData().get())->SetAliasName(strNewAlias); + void SetAliasName(const ::rtl::OUString& strNewAlias) + { + static_cast<OQueryTableWindowData*>(GetData().get())->SetAliasName(strNewAlias); } // spaeter Constructor, die Basisklasse ERZEUGT beim ersten Aufruf die Listbox - virtual BOOL Init(); + virtual BOOL Init(); - inline sal_Int32 GetAliasNum() const { return m_nAliasNum; } + inline sal_Int32 GetAliasNum() const { return m_nAliasNum; } - BOOL ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo); - BOOL ExistsAVisitedConn() const; + BOOL ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo); + BOOL ExistsAVisitedConn() const; - virtual ::rtl::OUString GetName() const { return GetWinName(); } + virtual ::rtl::OUString GetName() const { return GetWinName(); } protected: - virtual void KeyInput( const KeyEvent& rEvt ); + virtual void KeyInput( const KeyEvent& rEvt ); - virtual void OnEntryDoubleClicked(SvLBoxEntry* pEntry); + virtual void OnEntryDoubleClicked(SvLBoxEntry* pEntry); // wird aus dem DoubleClickHdl der ListBox heraus aufgerufen /** delete the user data with the equal type as created within createUserData - @param _pUserData + @param _pUserData The user data store in the listbox entries. Created with a call to createUserData. _pUserData may be <NULL/>. */ virtual void deleteUserData(void*& _pUserData); /** creates user information that will be append at the ListBoxentry - @param _xColumn + @param _xColumn The corresponding column, can be <NULL/>. - @param _bPrimaryKey + @param _bPrimaryKey <TRUE/> when the column belongs to the primary key @return the user data which will be append at the listbox entry, may be <NULL/> */ - virtual void* createUserData(const ::com::sun::star::uno::Reference< + virtual void* createUserData(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bPrimaryKey); }; diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx index 5fc047a9fbcf..142f8badde70 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index 9a54e738a764..da13c287b1ed 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/Query.hrc b/dbaccess/source/ui/querydesign/Query.hrc index 6fb9bb9ac5d0..d529b048d3a7 100644 --- a/dbaccess/source/ui/querydesign/Query.hrc +++ b/dbaccess/source/ui/querydesign/Query.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,8 +27,8 @@ #ifndef DBAUI_QUERY_HRC #define DBAUI_QUERY_HRC -#define IMG_PRIMARY_KEY 1 -#define IMG_FOREIGN_KEY 2 +#define IMG_PRIMARY_KEY 1 +#define IMG_FOREIGN_KEY 2 #endif // DBAUI_QUERY_HRC diff --git a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx index c0ef7d5ef1ef..c847b8c56d6d 100644 --- a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index 6cccdbcf9c34..c94bc1e390d3 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,23 +38,23 @@ namespace dbaui // ================================================================================================ // OQueryDesignFieldUndoAct - Basisklasse fuer Undos in der Feldauflistung im Abfrageentwurf - + class OQueryDesignFieldUndoAct : public OCommentUndoAction { protected: - OSelectionBrowseBox* pOwner; - USHORT m_nColumnPostion; + OSelectionBrowseBox* pOwner; + USHORT m_nColumnPostion; - virtual void Undo() = 0; - virtual void Redo() = 0; + virtual void Undo() = 0; + virtual void Redo() = 0; public: OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID); virtual ~OQueryDesignFieldUndoAct(); - inline void SetColumnPosition(USHORT _nColumnPostion) - { - m_nColumnPostion = _nColumnPostion; + inline void SetColumnPosition(USHORT _nColumnPostion) + { + m_nColumnPostion = _nColumnPostion; OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!"); OSL_ENSURE(m_nColumnPostion < pOwner->GetColumnCount(),"Position outside the column count!"); } @@ -66,16 +66,16 @@ namespace dbaui class OTabFieldCellModifiedUndoAct : public OQueryDesignFieldUndoAct { protected: - String m_strNextCellContents; - sal_Int32 m_nCellIndex; + String m_strNextCellContents; + sal_Int32 m_nCellIndex; public: - OTabFieldCellModifiedUndoAct(OSelectionBrowseBox* pSelBrwBox) - : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_MODIFY_CELL) + OTabFieldCellModifiedUndoAct(OSelectionBrowseBox* pSelBrwBox) + : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_MODIFY_CELL) ,m_nCellIndex(BROWSER_INVALIDID){ } - inline void SetCellContents(const String& str) { m_strNextCellContents = str; } - inline void SetCellIndex(sal_Int32 nIndex) { m_nCellIndex = nIndex; } + inline void SetCellContents(const String& str) { m_strNextCellContents = str; } + inline void SetCellIndex(sal_Int32 nIndex) { m_nCellIndex = nIndex; } virtual void Undo(); virtual void Redo() { Undo(); } @@ -87,7 +87,7 @@ namespace dbaui class OTabFieldSizedUndoAct : public OQueryDesignFieldUndoAct { protected: - long m_nNextWidth; + long m_nNextWidth; public: OTabFieldSizedUndoAct(OSelectionBrowseBox* pSelBrwBox) : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_SIZE_COLUMN), m_nNextWidth(0) { } @@ -104,7 +104,7 @@ namespace dbaui class OTabFieldUndoAct : public OQueryDesignFieldUndoAct { protected: - OTableFieldDescRef pDescr; // geloeschte Spaltenbeschreibung + OTableFieldDescRef pDescr; // geloeschte Spaltenbeschreibung public: OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { } @@ -145,8 +145,8 @@ namespace dbaui { protected: virtual void Undo(); - virtual void Redo() - { + virtual void Redo() + { Undo(); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx index 557a94c14204..21f37bb16407 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace dbaui class OQueryDesignUndoAction : public OCommentUndoAction { protected: - OJoinTableView* m_pOwner; // in diesem Container spielt sich alles ab + OJoinTableView* m_pOwner; // in diesem Container spielt sich alles ab public: OQueryDesignUndoAction(OJoinTableView* pOwner, USHORT nCommentID) : OCommentUndoAction(nCommentID), m_pOwner(pOwner) { } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 60e71a4a8e7d..27a3c9c1c38a 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ +#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e1) || \ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e2))) @@ -87,14 +87,14 @@ namespace static const ::rtl::OUString C_OR = ::rtl::OUString::createFromAscii(" OR "); // forward declarations - sal_Bool InsertJoin( const OQueryDesignView* _pView, + sal_Bool InsertJoin( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode *pNode); SqlParseError InstallFields(OQueryDesignView* _pView, const ::connectivity::OSQLParseNode* pNode, OJoinTableView::OTableWindowMap* pTabList ); - SqlParseError GetGroupCriteria( OQueryDesignView* _pView, + SqlParseError GetGroupCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pSelectRoot ); @@ -103,7 +103,7 @@ namespace const ::connectivity::OSQLParseNode* pSelectRoot, sal_uInt16& rLevel ); - SqlParseError GetOrderCriteria( OQueryDesignView* _pView, + SqlParseError GetOrderCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pParseRoot ); @@ -161,12 +161,12 @@ namespace Reference<XNameAccess> xReferencedTableColumns(aInfoData->getReferencedTable()->getColumns()); Sequence< ::rtl::OUString> aSeq = aInfoData->getReferencingTable()->getColumns()->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( xReferencedTableColumns->hasByName(*pIter) ) aInfoData->AppendConnLine(*pIter,*pIter); - } + } } catch( const Exception& ) { @@ -193,7 +193,7 @@ namespace pConn->GetData()->AppendConnLine( aSourceFieldName,aDestFieldName); pConn->UpdateLineList(); // Modified-Flag - // SetModified(); + // SetModified(); // und neu zeichnen pConn->RecalcLines(); // fuer das unten folgende Invalidate muss ich dieser neuen Connection erst mal die Moeglichkeit geben, @@ -202,13 +202,13 @@ namespace } } //------------------------------------------------------------------------------ - ::rtl::OUString ParseCondition( OQueryController& rController + ::rtl::OUString ParseCondition( OQueryController& rController ,const ::connectivity::OSQLParseNode* pCondition ,const ::rtl::OUString _sDecimal ,const ::com::sun::star::lang::Locale& _rLocale ,sal_uInt32 _nStartIndex) { - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; Reference< XConnection> xConnection = rController.getConnection(); if ( xConnection.is() ) { @@ -237,8 +237,8 @@ namespace if ( SQL_ISRULE( pParseNode, qualified_join ) || SQL_ISRULE( pParseNode, joined_table ) || SQL_ISRULE( pParseNode, cross_union ) ) pJoinNode = pParseNode; - else if( SQL_ISRULE(pParseNode,table_ref) - && pParseNode->count() == 4 ) // '{' SQL_TOKEN_OJ joined_table '}' + else if( SQL_ISRULE(pParseNode,table_ref) + && pParseNode->count() == 4 ) // '{' SQL_TOKEN_OJ joined_table '}' pJoinNode = pParseNode->getChild(2); if ( pJoinNode ) @@ -258,7 +258,7 @@ namespace /** FillDragInfo fills the field description out of the table */ //------------------------------------------------------------------------------ - SqlParseError FillDragInfo( const OQueryDesignView* _pView, + SqlParseError FillDragInfo( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode* pColumnRef, OTableFieldDescRef& _rDragInfo) { @@ -273,7 +273,7 @@ namespace if ( aTableRange.getLength() ) { - OQueryTableWindow* pSTW = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( aTableRange ); + OQueryTableWindow* pSTW = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( aTableRange ); bErg = (pSTW && pSTW->ExistsField( aColumnName, _rDragInfo ) ); } if ( !bErg ) @@ -303,7 +303,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoinCriteria( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoinCriteria( const Reference< XConnection>& _xConnection, OConnectionLineDataVec* pLineDataList, OQueryTableConnectionData* pData) { @@ -340,12 +340,12 @@ namespace } //------------------------------------------------------------------------------ /** JoinCycle looks for a join cycle and append it to the string - @param _xConnection the connection - @param _pEntryConn the table connection which holds the data - @param _pEntryTabTo the corresponding table window - @param _rJoin the String which will contain the resulting string + @param _xConnection the connection + @param _pEntryConn the table connection which holds the data + @param _pEntryTabTo the corresponding table window + @param _rJoin the String which will contain the resulting string */ - void JoinCycle( const Reference< XConnection>& _xConnection, + void JoinCycle( const Reference< XConnection>& _xConnection, OQueryTableConnection* _pEntryConn, const OQueryTableWindow* _pEntryTabTo, ::rtl::OUString& _rJoin ) @@ -368,14 +368,14 @@ namespace } } //------------------------------------------------------------------------------ - ::rtl::OUString BuildTable( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildTable( const Reference< XConnection>& _xConnection, const OQueryTableWindow* pEntryTab, bool _bForce = false ) { ::rtl::OUString aDBName(pEntryTab->GetComposedName()); - // Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); + // Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); if( _xConnection.is() ) { try @@ -404,7 +404,7 @@ namespace return aDBName; } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, const ::rtl::OUString& rLh, const ::rtl::OUString& rRh, OQueryTableConnectionData* pData) @@ -444,7 +444,7 @@ namespace return aErg; } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, OQueryTableWindow* pLh, OQueryTableWindow* pRh, OQueryTableConnectionData* pData @@ -454,7 +454,7 @@ namespace return BuildJoin(_xConnection,BuildTable(_xConnection,pLh,bForce),BuildTable(_xConnection,pRh,bForce),pData); } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, const ::rtl::OUString &rLh, OQueryTableWindow* pRh, OQueryTableConnectionData* pData @@ -463,7 +463,7 @@ namespace return BuildJoin(_xConnection,rLh,BuildTable(_xConnection,pRh),pData); } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, OQueryTableWindow* pLh, const ::rtl::OUString &rRh, OQueryTableConnectionData* pData @@ -472,7 +472,7 @@ namespace return BuildJoin(_xConnection,BuildTable(_xConnection,pLh),rRh,pData); } //------------------------------------------------------------------------------ - void GetNextJoin( const Reference< XConnection>& _xConnection, + void GetNextJoin( const Reference< XConnection>& _xConnection, OQueryTableConnection* pEntryConn, OQueryTableWindow* pEntryTabTo, ::rtl::OUString &aJoin) @@ -481,7 +481,7 @@ namespace if ( pEntryConnData->GetJoinType() == INNER_JOIN && !pEntryConnData->isNatural() ) return; - // Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); + // Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); if(!aJoin.getLength()) { @@ -536,20 +536,20 @@ namespace } } //------------------------------------------------------------------------------ - SqlParseError InsertJoinConnection( const OQueryDesignView* _pView, + SqlParseError InsertJoinConnection( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode *pNode, const EJoinType& _eJoinType, const ::connectivity::OSQLParseNode *pLeftTable, const ::connectivity::OSQLParseNode *pRightTable) { SqlParseError eErrorCode = eOk; - if (pNode->count() == 3 && // Ausdruck is geklammert + if (pNode->count() == 3 && // Ausdruck is geklammert SQL_ISPUNCTUATION(pNode->getChild(0),"(") && SQL_ISPUNCTUATION(pNode->getChild(2),")")) { eErrorCode = InsertJoinConnection(_pView,pNode->getChild(1), _eJoinType,pLeftTable,pRightTable); } - else if (SQL_ISRULEOR2(pNode,search_condition,boolean_term) && // AND/OR-Verknuepfung: + else if (SQL_ISRULEOR2(pNode,search_condition,boolean_term) && // AND/OR-Verknuepfung: pNode->count() == 3) { // nur AND Verknüpfung zulassen @@ -579,8 +579,8 @@ namespace if ( pLeftTable ) { - OQueryTableWindow* pLeftWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pLeftTable->getByRule(OSQLParseNode::table_ref) )); - // OQueryTableWindow* pRightWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pRightTable->getByRule(OSQLParseNode::table_ref) )); + OQueryTableWindow* pLeftWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pLeftTable->getByRule(OSQLParseNode::table_ref) )); + // OQueryTableWindow* pRightWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pRightTable->getByRule(OSQLParseNode::table_ref) )); if ( pLeftWindow == aDragLeft->GetTabWindow() ) insertConnection(_pView,_eJoinType,aDragLeft,aDragRight); else @@ -594,14 +594,14 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - sal_Bool GetInnerJoinCriteria( const OQueryDesignView* _pView, + sal_Bool GetInnerJoinCriteria( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode *pCondition) { return InsertJoinConnection(_pView,pCondition, INNER_JOIN,NULL,NULL) != eOk; } //------------------------------------------------------------------------------ - ::rtl::OUString GenerateSelectList( const OQueryDesignView* _pView, - OTableFields& _rFieldList, + ::rtl::OUString GenerateSelectList( const OQueryDesignView* _pView, + OTableFields& _rFieldList, sal_Bool bAlias) { Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); @@ -656,7 +656,7 @@ namespace { // we have to look if we have alias.* here but before we have to check if the column doesn't already exist String sTemp = rFieldName; - OTableFieldDescRef aInfo = new OTableFieldDesc(); + OTableFieldDescRef aInfo = new OTableFieldDesc(); OJoinTableView::OTableWindowMap::iterator tableIter = pTabList->begin(); OJoinTableView::OTableWindowMap::iterator tableEnd = pTabList->end(); sal_Bool bFound = sal_False; @@ -689,9 +689,9 @@ namespace aTmpStr = aTmpStr2; } - if (rFieldAlias.getLength() && - (rFieldName.toChar() != '*' || - pEntryField->isNumericOrAggreateFunction() || + if (rFieldAlias.getLength() && + (rFieldName.toChar() != '*' || + pEntryField->isNumericOrAggreateFunction() || pEntryField->isOtherFunction())) { aTmpStr.append(s_sAs); @@ -711,14 +711,14 @@ namespace return aFieldListStr.makeStringAndClear(); } //------------------------------------------------------------------------------ - sal_Bool GenerateCriterias( OQueryDesignView* _pView, + sal_Bool GenerateCriterias( OQueryDesignView* _pView, ::rtl::OUStringBuffer& rRetStr, ::rtl::OUStringBuffer& rHavingStr, OTableFields& _rFieldList, sal_Bool bMulti ) { // * darf keine Filter enthalten : habe ich die entsprechende Warnung schon angezeigt ? - sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS ** + sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS ** ::rtl::OUString aFieldName,aCriteria,aWhereStr,aHavingStr,aWork/*,aOrderStr*/; // Zeilenweise werden die Ausdr"ucke mit AND verknuepft @@ -744,7 +744,7 @@ namespace for(aIter = _rFieldList.begin();aIter != aEnd;++aIter) { - OTableFieldDescRef pEntryField = *aIter; + OTableFieldDescRef pEntryField = *aIter; aFieldName = pEntryField->GetField(); if (!aFieldName.getLength()) @@ -773,8 +773,8 @@ namespace if ( pEntryField->isAggreateFunction() || pEntryField->IsGroupBy() ) { - if (!aHavingStr.getLength()) // noch keine Kriterien - aHavingStr += ::rtl::OUString('('); // Klammern + if (!aHavingStr.getLength()) // noch keine Kriterien + aHavingStr += ::rtl::OUString('('); // Klammern else aHavingStr += C_AND; @@ -782,9 +782,9 @@ namespace { OSL_ENSURE(pEntryField->GetFunction().getLength(),"No function name for aggregate given!"); aHavingStr += pEntryField->GetFunction(); - aHavingStr += ::rtl::OUString('('); // Klammern + aHavingStr += ::rtl::OUString('('); // Klammern aHavingStr += aWork; - aHavingStr += ::rtl::OUString(')'); // Klammern + aHavingStr += ::rtl::OUString(')'); // Klammern } else aHavingStr += aWork; @@ -798,10 +798,10 @@ namespace if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*'))) pParseNode->replaceNodeValue(pEntryField->GetAlias(),aFieldName); ::rtl::OUString sHavingStr = aHavingStr; - + sal_uInt32 nCount = pParseNode->count(); for( sal_uInt32 node = 1 ; node < nCount ; ++node) - pParseNode->getChild(node)->parseNodeToStr( sHavingStr, + pParseNode->getChild(node)->parseNodeToStr( sHavingStr, xConnection, &rContext, sal_False, @@ -813,8 +813,8 @@ namespace } else { - if ( !aWhereStr.getLength() ) // noch keine Kriterien - aWhereStr += ::rtl::OUString('('); // Klammern + if ( !aWhereStr.getLength() ) // noch keine Kriterien + aWhereStr += ::rtl::OUString('('); // Klammern else aWhereStr += C_AND; @@ -829,7 +829,7 @@ namespace if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*'))) pParseNode->replaceNodeValue(pEntryField->GetAlias(),aFieldName); ::rtl::OUString aWhere = aWhereStr; - pParseNode->parseNodeToStr( aWhere, + pParseNode->parseNodeToStr( aWhere, xConnection, &rContext, sal_False, @@ -847,8 +847,8 @@ namespace // nur einmal für jedes Feld else if ( !i && pEntryField->isCondition() ) { - if (!aWhereStr.getLength()) // noch keine Kriterien - aWhereStr += ::rtl::OUString('('); // Klammern + if (!aWhereStr.getLength()) // noch keine Kriterien + aWhereStr += ::rtl::OUString('('); // Klammern else aWhereStr += C_AND; aWhereStr += pEntryField->GetField(); @@ -856,28 +856,28 @@ namespace } if (aWhereStr.getLength()) { - aWhereStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig - if (rRetStr.getLength()) // schon Feldbedingungen ? + aWhereStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig + if (rRetStr.getLength()) // schon Feldbedingungen ? rRetStr.append(C_OR); - else // Klammern auf fuer 'OR' Zweig + else // Klammern auf fuer 'OR' Zweig rRetStr.append(sal_Unicode('(')); rRetStr.append(aWhereStr); } if (aHavingStr.getLength()) { - aHavingStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig - if (rHavingStr.getLength()) // schon Feldbedingungen ? + aHavingStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig + if (rHavingStr.getLength()) // schon Feldbedingungen ? rHavingStr.append(C_OR); - else // Klammern auf fuer 'OR' Zweig + else // Klammern auf fuer 'OR' Zweig rHavingStr.append(sal_Unicode('(')); rHavingStr.append(aHavingStr); } } if (rRetStr.getLength()) - rRetStr.append(sal_Unicode(')')); // Klammern zu fuer 'OR' Zweig + rRetStr.append(sal_Unicode(')')); // Klammern zu fuer 'OR' Zweig if (rHavingStr.getLength()) - rHavingStr.append(sal_Unicode(')')); // Klammern zu fuer 'OR' Zweig + rHavingStr.append(sal_Unicode(')')); // Klammern zu fuer 'OR' Zweig } catch(SQLException&) { @@ -886,7 +886,7 @@ namespace return sal_True; } //------------------------------------------------------------------------------ - SqlParseError GenerateOrder( OQueryDesignView* _pView, + SqlParseError GenerateOrder( OQueryDesignView* _pView, OTableFields& _rFieldList, sal_Bool bMulti, ::rtl::OUString& _rsRet) @@ -906,12 +906,12 @@ namespace Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString(); // * darf keine Filter enthalten : habe ich die entsprechende Warnung schon angezeigt ? - sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS ** + sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS ** OTableFields::iterator aIter = _rFieldList.begin(); OTableFields::iterator aEnd = _rFieldList.end(); for(;aIter != aEnd;++aIter) { - OTableFieldDescRef pEntryField = *aIter; + OTableFieldDescRef pEntryField = *aIter; EOrderDir eOrder = pEntryField->GetOrderDir(); // nur wenn eine Sortierung und ein Tabellenname vorhanden ist-> erzeugen @@ -1024,9 +1024,9 @@ namespace } } //------------------------------------------------------------------------------ - ::rtl::OUString GenerateFromClause( const Reference< XConnection>& _xConnection, - const OQueryTableView::OTableWindowMap* pTabList, - const ::std::vector<OTableConnection*>* pConnList + ::rtl::OUString GenerateFromClause( const Reference< XConnection>& _xConnection, + const OQueryTableView::OTableWindowMap* pTabList, + const ::std::vector<OTableConnection*>* pConnList ) { @@ -1169,7 +1169,7 @@ namespace OTableFields::iterator aEnd = _rFieldList.end(); for(;aIter != aEnd;++aIter) { - OTableFieldDescRef pEntryField = *aIter; + OTableFieldDescRef pEntryField = *aIter; if ( pEntryField->IsGroupBy() ) { DBG_ASSERT(pEntryField->GetField().getLength(),"Kein FieldName vorhanden!;-("); @@ -1189,7 +1189,7 @@ namespace if (pParseNode.get()) { ::rtl::OUString sGroupBy; - pParseNode->getChild(0)->parseNodeToStr( sGroupBy, + pParseNode->getChild(0)->parseNodeToStr( sGroupBy, xConnection, &rController.getParser().getContext(), sal_False, @@ -1229,7 +1229,7 @@ namespace sal_Bool bHaving = sal_False, bool bAddOrOnOneLine = false); // ----------------------------------------------------------------------------- - SqlParseError GetSelectionCriteria( OQueryDesignView* _pView, + SqlParseError GetSelectionCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pNode, sal_uInt16& rLevel ) @@ -1265,7 +1265,7 @@ namespace GetInnerJoinCriteria(_pView,pNodeTmp); // now simplify again, join are checked in ComparisonPredicate ::connectivity::OSQLParseNode::absorptions(pNodeTmp); - pNodeTmp = pNode->getChild(1); + pNodeTmp = pNode->getChild(1); // it could happen that pCondition is not more valid eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pNodeTmp, rLevel); @@ -1273,7 +1273,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - SqlParseError GetANDCriteria( OQueryDesignView* _pView, + SqlParseError GetANDCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode * pCondition, sal_uInt16& nLevel, @@ -1348,14 +1348,14 @@ namespace return bRet; } //-------------------------------------------------------------------------------------------------- - SqlParseError GetANDCriteria( OQueryDesignView* _pView, + SqlParseError GetANDCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode * pCondition, sal_uInt16& nLevel, sal_Bool bHaving, bool bAddOrOnOneLine) { - const ::com::sun::star::lang::Locale aLocale = _pView->getLocale(); + const ::com::sun::star::lang::Locale aLocale = _pView->getLocale(); const ::rtl::OUString sDecimal = _pView->getDecimalSeparator(); // ich werde ein paar Mal einen gecasteten Pointer auf meinen ::com::sun::star::sdbcx::Container brauchen @@ -1371,7 +1371,7 @@ namespace if ( SQL_ISRULE( pSearchCondition, search_condition) ) // we have a or { _pSelectionBrw->DuplicateConditionLevel( nLevel); - eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition->getChild(0), nLevel,bHaving,bMustAddOrOnOneLine ); + eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition->getChild(0), nLevel,bHaving,bMustAddOrOnOneLine ); ++nLevel; eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition->getChild(2), nLevel,bHaving,bMustAddOrOnOneLine ); } @@ -1396,7 +1396,7 @@ namespace if (SQL_ISRULE(pValueExp, column_ref ) ) { ::rtl::OUString aColumnName; - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; Reference< XConnection> xConnection = rController.getConnection(); if ( xConnection.is() ) { @@ -1409,7 +1409,7 @@ namespace static_cast<sal_Char>(sDecimal.toChar()), &rController.getParser().getContext()); - pValueExp->parseNodeToPredicateStr( aColumnName, + pValueExp->parseNodeToPredicateStr( aColumnName, xConnection, rController.getNumberFormatter(), aLocale, @@ -1429,12 +1429,12 @@ namespace _pSelectionBrw->AddCondition(aDragLeft, aCondition, nLevel,bAddOrOnOneLine); } } - else if(SQL_ISRULEOR2(pValueExp,general_set_fct ,set_fct_spec) || - SQL_ISRULEOR2(pValueExp,position_exp,extract_exp) || - SQL_ISRULEOR2(pValueExp,fold,char_substring_fct) || + else if(SQL_ISRULEOR2(pValueExp,general_set_fct ,set_fct_spec) || + SQL_ISRULEOR2(pValueExp,position_exp,extract_exp) || + SQL_ISRULEOR2(pValueExp,fold,char_substring_fct) || SQL_ISRULEOR2(pValueExp,length_exp,char_value_fct)) { - AddFunctionCondition( _pView, + AddFunctionCondition( _pView, _pSelectionBrw, pCondition, nLevel, @@ -1448,12 +1448,12 @@ namespace _pView->getController().appendError( sError ); } } - else if( SQL_ISRULEOR2(pCondition,test_for_null,in_predicate) - || SQL_ISRULEOR2(pCondition,all_or_any_predicate,between_predicate)) + else if( SQL_ISRULEOR2(pCondition,test_for_null,in_predicate) + || SQL_ISRULEOR2(pCondition,all_or_any_predicate,between_predicate)) { if ( SQL_ISRULEOR2(pCondition->getChild(0), set_fct_spec , general_set_fct ) ) { - AddFunctionCondition( _pView, + AddFunctionCondition( _pView, _pSelectionBrw, pCondition, nLevel, @@ -1464,7 +1464,7 @@ namespace { // parse condition ::rtl::OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1); - OTableFieldDescRef aDragLeft = new OTableFieldDesc(); + OTableFieldDescRef aDragLeft = new OTableFieldDesc(); if ( eOk == ( eErrorCode = FillDragInfo(_pView,pCondition->getChild(0),aDragLeft)) ) { if ( bHaving ) @@ -1475,7 +1475,7 @@ namespace else { // Funktions-Bedingung parsen - ::rtl::OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1); + ::rtl::OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1); Reference< XConnection> xConnection = rController.getConnection(); Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); // the international doesn't matter I have a string @@ -1499,7 +1499,7 @@ namespace else if( SQL_ISRULEOR2(pCondition,existence_test,unique_test) ) { // Funktions-Bedingung parsen - ::rtl::OUString aCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,0); + ::rtl::OUString aCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,0); OTableFieldDescRef aDragLeft = new OTableFieldDesc(); aDragLeft->SetField(aCondition); @@ -1525,11 +1525,11 @@ namespace OSQLParseNode* pFunction = pCondition->getChild(0); - OSL_ENSURE(SQL_ISRULEOR2(pFunction,general_set_fct ,set_fct_spec) || - SQL_ISRULEOR2(pFunction,position_exp,extract_exp) || - SQL_ISRULEOR2(pFunction,fold,char_substring_fct) || + OSL_ENSURE(SQL_ISRULEOR2(pFunction,general_set_fct ,set_fct_spec) || + SQL_ISRULEOR2(pFunction,position_exp,extract_exp) || + SQL_ISRULEOR2(pFunction,fold,char_substring_fct) || SQL_ISRULEOR2(pFunction,length_exp,char_value_fct),"Illegal call!"); - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; OTableFieldDescRef aDragLeft = new OTableFieldDesc(); ::rtl::OUString aColumnName; @@ -1544,18 +1544,18 @@ namespace static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), &rController.getParser().getContext()); - pFunction->parseNodeToStr( aColumnName, + pFunction->parseNodeToStr( aColumnName, xConnection, &rController.getParser().getContext(), sal_True, sal_True); // quote is to true because we need quoted elements inside the function // i75557 //pFunction->parseNodeToPredicateStr(aColumnName, - // xConnection, - // rController.getNumberFormatter(), - // _pView->getLocale(), - // static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), - // &rController.getParser().getContext()); + // xConnection, + // rController.getNumberFormatter(), + // _pView->getLocale(), + // static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), + // &rController.getParser().getContext()); // don't display the column name aCondition = aCondition.copy(aColumnName.getLength()); aCondition = aCondition.trim(); @@ -1587,7 +1587,7 @@ namespace && SQL_ISRULE(pParamNode,num_value_exp) ) { ::rtl::OUString sParameterValue; - pParamNode->parseNodeToStr( sParameterValue, + pParamNode->parseNodeToStr( sParameterValue, xConnection, &rController.getParser().getContext()); nFunctionType |= FKT_NUMERIC; @@ -1618,7 +1618,7 @@ namespace OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode * pCondition, const sal_uInt16 nLevel, - sal_Bool bHaving + sal_Bool bHaving ,bool bAddOrOnOneLine) { SqlParseError eErrorCode = eOk; @@ -1628,7 +1628,7 @@ namespace if ( SQL_ISRULE(pCondition->getChild(0), column_ref ) || SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref) ) { - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; OTableFieldDescRef aDragLeft = new OTableFieldDesc(); if ( SQL_ISRULE(pCondition->getChild(0), column_ref ) && SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref ) ) @@ -1726,7 +1726,7 @@ namespace } // else ??? - + if( eOk == ( eErrorCode = FillDragInfo(_pView,pCondition->getChild(nPos),aDragLeft))) { if(bHaving) @@ -1736,7 +1736,7 @@ namespace } else if( SQL_ISRULEOR2(pCondition->getChild(0), set_fct_spec , general_set_fct ) ) { - AddFunctionCondition( _pView, + AddFunctionCondition( _pView, _pSelectionBrw, pCondition, nLevel, @@ -1833,21 +1833,21 @@ namespace _raInfo->SetTable(::rtl::OUString()); _raInfo->SetAlias(::rtl::OUString()); _raInfo->SetField(aColumnName); - _raInfo->SetFieldAlias(aColumnAlias); // nyi : hier ein fortlaufendes Expr_1, Expr_2 ... + _raInfo->SetFieldAlias(aColumnAlias); // nyi : hier ein fortlaufendes Expr_1, Expr_2 ... _raInfo->SetFunctionType(FKT_OTHER); } } //----------------------------------------------------------------------------- - sal_Bool checkJoinConditions( const OQueryDesignView* _pView, + sal_Bool checkJoinConditions( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode* _pNode ) { const ::connectivity::OSQLParseNode* pJoinNode = NULL; sal_Bool bRet = sal_True; if (SQL_ISRULE(_pNode,qualified_join)) pJoinNode = _pNode; - else if (SQL_ISRULE(_pNode,table_ref) - && _pNode->count() == 3 - && SQL_ISPUNCTUATION(_pNode->getChild(0),"(") + else if (SQL_ISRULE(_pNode,table_ref) + && _pNode->count() == 3 + && SQL_ISPUNCTUATION(_pNode->getChild(0),"(") && SQL_ISPUNCTUATION(_pNode->getChild(2),")") ) // '(' joined_table ')' pJoinNode = _pNode->getChild(1); else if (! ( SQL_ISRULE(_pNode, table_ref) && _pNode->count() == 2) ) // table_node table_primary_as_range_column @@ -1894,7 +1894,7 @@ namespace } else { - if (SQL_ISRULE(pJoinType,join_type)) // eine Ebene tiefer + if (SQL_ISRULE(pJoinType,join_type)) // eine Ebene tiefer pJoinType = pJoinType->getChild(0); if (SQL_ISTOKEN(pJoinType->getChild(0),LEFT)) @@ -1921,8 +1921,8 @@ namespace if ( eJoinType == CROSS_JOIN || bNatural ) { - OQueryTableWindow* pLeftWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pNode->getChild(0)) ); - OQueryTableWindow* pRightWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pRightTableRef) ); + OQueryTableWindow* pLeftWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pNode->getChild(0)) ); + OQueryTableWindow* pRightWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pRightTableRef) ); OSL_ENSURE(pLeftWindow && pRightWindow,"Table Windows could not be found!"); if ( !pLeftWindow || !pRightWindow ) return sal_False; @@ -1939,7 +1939,7 @@ namespace insertConnection(_pView,eJoinType,aDragLeft,aDragRight,bNatural); } - + return sal_True; } @@ -2048,7 +2048,7 @@ namespace } // find the existent window for this alias - OQueryTableWindow* pExistentWin = pTableView->FindTable( sAlias ); + OQueryTableWindow* pExistentWin = pTableView->FindTable( sAlias ); if ( !pExistentWin ) { pTableView->AddTabWin( sComposedName, sAlias, sal_False ); // don't create data here @@ -2068,8 +2068,8 @@ namespace OJoinTableView::OTableWindowMap::iterator aIterTableEnd = aTableMap.end(); for(;aIterTableMap != aIterTableEnd;++aIterTableMap) { - if(aMap.find(aIterTableMap->second->GetComposedName()) == aMap.end() && - aMap.find(aIterTableMap->first) == aMap.end()) + if(aMap.find(aIterTableMap->second->GetComposedName()) == aMap.end() && + aMap.find(aIterTableMap->first) == aMap.end()) pTableView->RemoveTabWin(aIterTableMap->second); } @@ -2118,7 +2118,7 @@ namespace <TRUE/> when columns could be inserted otherwise <FALSE/> */ //------------------------------------------------------------------------------ - SqlParseError fillSelectSubList( OQueryDesignView* _pView, + SqlParseError fillSelectSubList( OQueryDesignView* _pView, OJoinTableView::OTableWindowMap* _pTabList) { SqlParseError eErrorCode = eOk; @@ -2129,7 +2129,7 @@ namespace for(;aIter != aEnd && eOk == eErrorCode ;++aIter) { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second); - OTableFieldDescRef aInfo = new OTableFieldDesc(); + OTableFieldDescRef aInfo = new OTableFieldDesc(); if (pTabWin->ExistsField( sAsterix, aInfo )) { eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField); @@ -2147,7 +2147,7 @@ namespace return eNoSelectStatement; ::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2); // selection - sal_Bool bFirstField = sal_True; // bei der Initialisierung muß auf alle Faelle das erste Feld neu aktiviert werden + sal_Bool bFirstField = sal_True; // bei der Initialisierung muß auf alle Faelle das erste Feld neu aktiviert werden SqlParseError eErrorCode = eOk; @@ -2181,7 +2181,7 @@ namespace pColumnRef = pColumnRef->getChild(0); OTableFieldDescRef aInfo = new OTableFieldDesc(); - if ( pColumnRef->count() == 3 && + if ( pColumnRef->count() == 3 && SQL_ISPUNCTUATION(pColumnRef->getChild(0),"(") && SQL_ISPUNCTUATION(pColumnRef->getChild(2),")") ) @@ -2193,9 +2193,9 @@ namespace eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField); bFirstField = sal_False; } - else if(SQL_ISRULEOR2(pColumnRef,general_set_fct ,set_fct_spec) || - SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) || - SQL_ISRULEOR2(pColumnRef,fold,char_substring_fct) || + else if(SQL_ISRULEOR2(pColumnRef,general_set_fct ,set_fct_spec) || + SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) || + SQL_ISRULEOR2(pColumnRef,fold,char_substring_fct) || SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct)) { ::rtl::OUString aColumns; @@ -2205,11 +2205,11 @@ namespace _pView->getLocale(), static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), &rController.getParser().getContext()); - //pColumnRef->parseNodeToStr( aColumns, - // xConnection, - // &rController.getParser().getContext(), - // sal_True, - // sal_True); // quote is to true because we need quoted elements inside the function + //pColumnRef->parseNodeToStr( aColumns, + // xConnection, + // &rController.getParser().getContext(), + // sal_True, + // sal_True); // quote is to true because we need quoted elements inside the function sal_Int32 nFunctionType = FKT_NONE; ::connectivity::OSQLParseNode* pParamRef = NULL; @@ -2217,8 +2217,8 @@ namespace if ( nColumnRefPos >= 0 && static_cast<sal_uInt32>(nColumnRefPos) < pColumnRef->count() ) pParamRef = pColumnRef->getChild(nColumnRefPos); - if ( SQL_ISRULE(pColumnRef,general_set_fct) - && SQL_ISRULE(pParamRef,column_ref) ) + if ( SQL_ISRULE(pColumnRef,general_set_fct) + && SQL_ISRULE(pParamRef,column_ref) ) { // Parameter auf Columnref pr"ufen InsertColumnRef(_pView,pParamRef,aColumnName,aColumnAlias,aTableRange,aInfo,pTabList); @@ -2244,11 +2244,11 @@ namespace { ::rtl::OUString sFieldName = aColumns; if ( pParamRef ) - { // we got an aggregate function but without column name inside + { // we got an aggregate function but without column name inside // so we set the whole argument of the function as field name nFunctionType |= FKT_NUMERIC; sFieldName = ::rtl::OUString(); - pParamRef->parseNodeToStr( sFieldName, + pParamRef->parseNodeToStr( sFieldName, xConnection, &rController.getParser().getContext(), sal_True, @@ -2279,10 +2279,10 @@ namespace eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField); bFirstField = sal_False; } - else //if(SQL_ISRULE(pColumnRef,num_value_exp) || SQL_ISRULE(pColumnRef,term)) + else //if(SQL_ISRULE(pColumnRef,num_value_exp) || SQL_ISRULE(pColumnRef,term)) { ::rtl::OUString aColumns; - pColumnRef->parseNodeToStr( aColumns, + pColumnRef->parseNodeToStr( aColumns, xConnection, &rController.getParser().getContext(), sal_True, @@ -2323,7 +2323,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - SqlParseError GetOrderCriteria( OQueryDesignView* _pView, + SqlParseError GetOrderCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pParseRoot ) { @@ -2339,13 +2339,13 @@ namespace for( sal_uInt32 i=0 ; i<pNode->count() ; i++ ) { eOrderDir = ORDER_ASC; - ::connectivity::OSQLParseNode* pChild = pNode->getChild( i ); + ::connectivity::OSQLParseNode* pChild = pNode->getChild( i ); if (SQL_ISTOKEN( pChild->getChild(1), DESC ) ) eOrderDir = ORDER_DESC; ::connectivity::OSQLParseNode* pArgument = pChild->getChild(0); - + if(SQL_ISRULE(pArgument,column_ref)) { if( eOk == FillDragInfo(_pView,pArgument,aDragLeft)) @@ -2373,7 +2373,7 @@ namespace _pSelectionBrw->AddOrder( aDragLeft, eOrderDir, i ); else if( SQL_ISRULE(pArgument, set_fct_spec ) ) { - + Reference< XConnection> xConnection = rController.getConnection(); if(xConnection.is()) { @@ -2400,7 +2400,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - SqlParseError GetHavingCriteria( OQueryDesignView* _pView, + SqlParseError GetHavingCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pSelectRoot, sal_uInt16& rLevel ) @@ -2411,7 +2411,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - SqlParseError GetGroupCriteria( OQueryDesignView* _pView, + SqlParseError GetGroupCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pSelectRoot ) { @@ -2441,12 +2441,12 @@ namespace _pSelectionBrw->AddGroupBy( aDragInfo, i ); } else if( SQL_ISRULE(pArgument, set_fct_spec ) ) - { + { Reference< XConnection> xConnection = rController.getConnection(); if(xConnection.is()) { ::rtl::OUString sGroupByExpression; - pArgument->parseNodeToStr( sGroupByExpression, + pArgument->parseNodeToStr( sGroupByExpression, xConnection, &rController.getParser().getContext(), sal_True, @@ -2521,7 +2521,7 @@ namespace // end of anonymouse namespace DBG_NAME(OQueryDesignView) -OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent, +OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent, OQueryController& _rController, const Reference< XMultiServiceFactory >& _rFactory) :OQueryView( _pParent, _rController, _rFactory ) @@ -2603,8 +2603,8 @@ void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) sal_Int32 nSplitPos = static_cast<OQueryController&>(getController()).getSplitPos(); if ( 0 != aPlaygroundSize.Height() ) { - if ( ( -1 == nSplitPos ) - || ( nSplitPos >= aPlaygroundSize.Height() ) + if ( ( -1 == nSplitPos ) + || ( nSplitPos >= aPlaygroundSize.Height() ) ) { // let the selection browse box determine an optimal size @@ -2618,7 +2618,7 @@ void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) } if ( !m_bInSplitHandler ) - { // the resize is triggered by something else than the split handler + { // the resize is triggered by something else than the split handler // our main focus is to try to preserve the size of the selectionbrowse box Size aSelBoxSize = m_pSelectionBox->GetSizePixel(); if ( aSelBoxSize.Height() ) @@ -2639,8 +2639,8 @@ void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) } // normalize the split pos - Point aSplitPos = Point( _rPlayground.Left(), nSplitPos ); - Size aSplitSize = Size( _rPlayground.GetSize().Width(), m_aSplitter.GetSizePixel().Height() ); + Point aSplitPos = Point( _rPlayground.Left(), nSplitPos ); + Size aSplitSize = Size( _rPlayground.GetSize().Width(), m_aSplitter.GetSizePixel().Height() ); if( ( aSplitPos.Y() + aSplitSize.Height() ) > ( aPlaygroundSize.Height() )) aSplitPos.Y() = aPlaygroundSize.Height() - aSplitSize.Height(); @@ -2742,7 +2742,7 @@ void OQueryDesignView::TableDeleted(const ::rtl::OUString& rAliasName) { // Nachricht, dass Tabelle aus dem Fenster gel"oscht wurde DeleteFields(rAliasName); - static_cast<OQueryController&>(getController()).InvalidateFeature(ID_BROWSER_ADDTABLE); // view nochmal bescheid sagen + static_cast<OQueryController&>(getController()).InvalidateFeature(ID_BROWSER_ADDTABLE); // view nochmal bescheid sagen } //------------------------------------------------------------------------------ void OQueryDesignView::DeleteFields( const ::rtl::OUString& rAliasName ) @@ -2861,24 +2861,24 @@ sal_Bool OQueryDesignView::checkStatement() OTableFieldDescRef pEntryField = *aIter; if ( pEntryField->GetField().getLength() && pEntryField->IsVisible() ) ++nFieldcount; - else if (pEntryField->GetField().getLength() && - !pEntryField->HasCriteria() && - pEntryField->isNoneFunction() && - pEntryField->GetOrderDir() == ORDER_NONE && + else if (pEntryField->GetField().getLength() && + !pEntryField->HasCriteria() && + pEntryField->isNoneFunction() && + pEntryField->GetOrderDir() == ORDER_NONE && !pEntryField->IsGroupBy() && !pEntryField->GetFunction().getLength() ) rUnUsedFields.push_back(pEntryField); } - if ( !nFieldcount ) // keine Felder sichtbar also zur"uck + if ( !nFieldcount ) // keine Felder sichtbar also zur"uck { rUnUsedFields = rFieldList; return ::rtl::OUString(); } OQueryTableView::OTableWindowMap* pTabList = m_pTableView->GetTabWinMap(); - sal_uInt32 nTabcount = pTabList->size(); + sal_uInt32 nTabcount = pTabList->size(); - ::rtl::OUString aFieldListStr(GenerateSelectList(this,rFieldList,nTabcount>1)); + ::rtl::OUString aFieldListStr(GenerateSelectList(this,rFieldList,nTabcount>1)); if( !aFieldListStr.getLength() ) return ::rtl::OUString(); // Ausnahmebehandlung, wenn keine Felder angegeben worden sind @@ -2887,7 +2887,7 @@ sal_Bool OQueryDesignView::checkStatement() // und eine Errormeldung erzeugt // ----------------- Tabellenliste aufbauen ---------------------- - const ::std::vector<OTableConnection*>* pConnList = m_pTableView->getTableConnections(); + const ::std::vector<OTableConnection*>* pConnList = m_pTableView->getTableConnections(); Reference< XConnection> xConnection = rController.getConnection(); ::rtl::OUString aTableListStr(GenerateFromClause(xConnection,pTabList,pConnList)); DBG_ASSERT(aTableListStr.getLength(), "OQueryDesignView::getStatement() : unerwartet : habe Felder, aber keine Tabellen !"); @@ -3029,7 +3029,7 @@ void OQueryDesignView::SaveUIConfig() { OQueryController& rCtrl = static_cast<OQueryController&>(getController()); rCtrl.SaveTabWinsPosSize( m_pTableView->GetTabWinMap(), m_pScrollWindow->GetHScrollBar()->GetThumbPos(), m_pScrollWindow->GetVScrollBar()->GetThumbPos() ); - // rCtrl.SaveTabFieldsWidth( m_pSelectionBox ); + // rCtrl.SaveTabFieldsWidth( m_pSelectionBox ); rCtrl.setVisibleRows( m_pSelectionBox->GetNoneVisibleRows() ); if ( m_aSplitter.GetSplitPosPixel() != 0 ) rCtrl.setSplitPos( m_aSplitter.GetSplitPosPixel() ); @@ -3091,7 +3091,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE } Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); - parse::OParseColumn* pColumn = new parse::OParseColumn( pEntry->GetField(), + parse::OParseColumn* pColumn = new parse::OParseColumn( pEntry->GetField(), ::rtl::OUString(), ::rtl::OUString(), ::rtl::OUString(), @@ -3116,7 +3116,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE } } - OSQLParseNode* pParseNode = rParser.predicateTree( _rsErrorMessage, + OSQLParseNode* pParseNode = rParser.predicateTree( _rsErrorMessage, sTest, static_cast<OQueryController&>(getController()).getNumberFormatter(), _rxColumn); diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx index fb662a8b7438..c402bd70c466 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx index 692bd3946fda..73b1a6671e4b 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace dbaui class OTableWindow; class OJoinMoveTabWinUndoAct : public OQueryDesignUndoAction { - Point m_ptNextPosition; - OTableWindow* m_pTabWin; + Point m_ptNextPosition; + OTableWindow* m_pTabWin; protected: void TogglePosition(); @@ -50,8 +50,8 @@ namespace dbaui public: OJoinMoveTabWinUndoAct(OJoinTableView* pOwner, const Point& ptOriginalPosition, OTableWindow* pTabWin); - virtual void Undo() { TogglePosition(); } - virtual void Redo() { TogglePosition(); } + virtual void Undo() { TogglePosition(); } + virtual void Redo() { TogglePosition(); } }; // ------------------------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx index 11a2fc0412de..83bbafa6affc 100644 --- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ namespace dbaui class OTableWindow; class OJoinSizeTabWinUndoAct : public OQueryDesignUndoAction { - Point m_ptNextPosition; - Size m_szNextSize; - OTableWindow* m_pTabWin; + Point m_ptNextPosition; + Size m_szNextSize; + OTableWindow* m_pTabWin; protected: inline void ToggleSizePosition(); @@ -52,8 +52,8 @@ namespace dbaui // hier sind physische, nicht logische Koordinaten // (im Gegensatz zur QueryMoveTabWinUndoAct) - virtual void Undo() { ToggleSizePosition(); } - virtual void Redo() { ToggleSizePosition(); } + virtual void Undo() { ToggleSizePosition(); } + virtual void Redo() { ToggleSizePosition(); } }; //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx index 93775a1be43e..7e11cddc796a 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ OQueryTabConnUndoAction::~OQueryTabConnUndoAction() { DBG_DTOR(OQueryTabConnUndoAction,NULL); if (m_bOwnerOfConn) - { // ich besitze die Connection -> loeschen + { // ich besitze die Connection -> loeschen m_pOwner->DeselectConn(m_pConnection); delete m_pConnection; } @@ -59,80 +59,80 @@ OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, USHORT DBG_CTOR(OQueryTabConnUndoAction,NULL); } // ----------------------------------------------------------------------------- -OQueryAddTabConnUndoAction::OQueryAddTabConnUndoAction(OQueryTableView* pOwner) - : OQueryTabConnUndoAction(pOwner, STR_QUERY_UNDO_INSERTCONNECTION) -{ +OQueryAddTabConnUndoAction::OQueryAddTabConnUndoAction(OQueryTableView* pOwner) + : OQueryTabConnUndoAction(pOwner, STR_QUERY_UNDO_INSERTCONNECTION) +{ } // ----------------------------------------------------------------------------- -void OQueryAddTabConnUndoAction::Undo() -{ - static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); - SetOwnership(TRUE); +void OQueryAddTabConnUndoAction::Undo() +{ + static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); + SetOwnership(TRUE); } // ----------------------------------------------------------------------------- -void OQueryAddTabConnUndoAction::Redo() -{ - static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); - SetOwnership(FALSE); +void OQueryAddTabConnUndoAction::Redo() +{ + static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); + SetOwnership(FALSE); } // ----------------------------------------------------------------------------- -OQueryDelTabConnUndoAction::OQueryDelTabConnUndoAction(OQueryTableView* pOwner) - : OQueryTabConnUndoAction(pOwner, STR_QUERY_UNDO_REMOVECONNECTION) -{ +OQueryDelTabConnUndoAction::OQueryDelTabConnUndoAction(OQueryTableView* pOwner) + : OQueryTabConnUndoAction(pOwner, STR_QUERY_UNDO_REMOVECONNECTION) +{ } // ----------------------------------------------------------------------------- -void OQueryDelTabConnUndoAction::Undo() -{ - static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); - SetOwnership(FALSE); +void OQueryDelTabConnUndoAction::Undo() +{ + static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); + SetOwnership(FALSE); } // ----------------------------------------------------------------------------- -void OQueryDelTabConnUndoAction::Redo() -{ - static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); - SetOwnership(TRUE); +void OQueryDelTabConnUndoAction::Redo() +{ + static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); + SetOwnership(TRUE); } // ----------------------------------------------------------------------------- -OQueryTabWinShowUndoAct::OQueryTabWinShowUndoAct(OQueryTableView* pOwner) - : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINSHOW) -{ +OQueryTabWinShowUndoAct::OQueryTabWinShowUndoAct(OQueryTableView* pOwner) + : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINSHOW) +{ } // ----------------------------------------------------------------------------- OQueryTabWinShowUndoAct::~OQueryTabWinShowUndoAct() { } // ----------------------------------------------------------------------------- -void OQueryTabWinShowUndoAct::Undo() -{ - static_cast<OQueryTableView*>(m_pOwner)->HideTabWin(m_pTabWin, this); - SetOwnership(TRUE); +void OQueryTabWinShowUndoAct::Undo() +{ + static_cast<OQueryTableView*>(m_pOwner)->HideTabWin(m_pTabWin, this); + SetOwnership(TRUE); } // ----------------------------------------------------------------------------- -void OQueryTabWinShowUndoAct::Redo() -{ - static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin(m_pTabWin, this,sal_True); - SetOwnership(FALSE); +void OQueryTabWinShowUndoAct::Redo() +{ + static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin(m_pTabWin, this,sal_True); + SetOwnership(FALSE); } // ----------------------------------------------------------------------------- -OQueryTabWinDelUndoAct::OQueryTabWinDelUndoAct(OQueryTableView* pOwner) - : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINDELETE) -{ +OQueryTabWinDelUndoAct::OQueryTabWinDelUndoAct(OQueryTableView* pOwner) + : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINDELETE) +{ } // ----------------------------------------------------------------------------- OQueryTabWinDelUndoAct::~OQueryTabWinDelUndoAct() { } // ----------------------------------------------------------------------------- -void OQueryTabWinDelUndoAct::Undo() -{ - static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin( m_pTabWin, this,sal_True ); - SetOwnership(FALSE); +void OQueryTabWinDelUndoAct::Undo() +{ + static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin( m_pTabWin, this,sal_True ); + SetOwnership(FALSE); } // ----------------------------------------------------------------------------- -void OQueryTabWinDelUndoAct::Redo() -{ - static_cast<OQueryTableView*>(m_pOwner)->HideTabWin( m_pTabWin, this ); - SetOwnership(TRUE); +void OQueryTabWinDelUndoAct::Redo() +{ + static_cast<OQueryTableView*>(m_pOwner)->HideTabWin( m_pTabWin, this ); + SetOwnership(TRUE); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx index 42a2e738bc53..3dcfa4cacfa6 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ namespace dbaui class OQueryTabConnUndoAction : public OQueryDesignUndoAction { protected: - OQueryTableConnection* m_pConnection; - BOOL m_bOwnerOfConn; + OQueryTableConnection* m_pConnection; + BOOL m_bOwnerOfConn; // bin ich alleiniger Eigentuemer der Connection ? (aendert sich mit jedem Redo oder Undo) public: diff --git a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx index f5988bd65786..0a64becdcd55 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ namespace dbaui OQueryTabWinShowUndoAct(OQueryTableView* pOwner); ~OQueryTabWinShowUndoAct(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ================================================================================================ @@ -55,8 +55,8 @@ namespace dbaui OQueryTabWinDelUndoAct(OQueryTableView* pOwner); ~OQueryTabWinDelUndoAct(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; } #endif // DBAUI_QUERYTABWINSHOWUNDOACT_HXX diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx index 953cab5fa552..21c4d3aad0f4 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,23 +39,23 @@ using namespace dbaui; -DBG_NAME(OQueryDesignFieldUndoAct) -OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) +DBG_NAME(OQueryDesignFieldUndoAct) +OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OCommentUndoAction(nCommentID) , pOwner(pSelBrwBox) - , m_nColumnPostion(BROWSER_INVALIDID) -{ + , m_nColumnPostion(BROWSER_INVALIDID) +{ DBG_CTOR(OQueryDesignFieldUndoAct,NULL); } // ----------------------------------------------------------------------------- -OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct() -{ +OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct() +{ DBG_DTOR(OQueryDesignFieldUndoAct,NULL); - pOwner = NULL; + pOwner = NULL; } // ----------------------------------------------------------------------------- -DBG_NAME(OQueryTabWinUndoAct ) +DBG_NAME(OQueryTabWinUndoAct ) // ------------------------------------------------------------------------------------------------ OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, USHORT nCommentID) :OQueryDesignUndoAction(pOwner, nCommentID) @@ -66,9 +66,9 @@ OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, USHORT nCommen //============================================================================== OQueryTabWinUndoAct::~OQueryTabWinUndoAct() { - DBG_DTOR(OQueryTabWinUndoAct ,NULL); + DBG_DTOR(OQueryTabWinUndoAct ,NULL); if (m_bOwnerOfObjects) - { // wenn ich der alleinige Owner des Fenster bin, muss ich dafuer sorgen, dass es geloescht wird + { // wenn ich der alleinige Owner des Fenster bin, muss ich dafuer sorgen, dass es geloescht wird OSL_ENSURE(m_pTabWin != NULL, "OQueryTabWinUndoAct::~OQueryTabWinUndoAct() : m_pTabWin sollte nicht NULL sein"); OSL_ENSURE(!m_pTabWin->IsVisible(), "OQueryTabWinUndoAct::~OQueryTabWinUndoAct() : *m_pTabWin sollte nicht sichtbar sein"); @@ -118,8 +118,8 @@ void OTabFieldSizedUndoAct::Undo() pOwner->LeaveUndoMode(); } // ----------------------------------------------------------------------------- -void OTabFieldMovedUndoAct::Undo() -{ +void OTabFieldMovedUndoAct::Undo() +{ pOwner->EnterUndoMode(); OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!"); if ( m_nColumnPostion != BROWSER_INVALIDID ) @@ -127,7 +127,7 @@ void OTabFieldMovedUndoAct::Undo() sal_uInt16 nId = pDescr->GetColumnId(); USHORT nOldPos = pOwner->GetColumnPos(nId); pOwner->SetColumnPos(nId,m_nColumnPostion); - pOwner->ColumnMoved(nId,FALSE); + pOwner->ColumnMoved(nId,FALSE); m_nColumnPostion = nOldPos; } pOwner->LeaveUndoMode(); diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index 1fa0df1f3a01..e1e055ce272a 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ namespace dbaui { protected: ::std::vector<OTableConnection*> m_vTableConnection; - OQueryTableWindow* m_pTabWin; - BOOL m_bOwnerOfObjects; + OQueryTableWindow* m_pTabWin; + BOOL m_bOwnerOfObjects; // bin ich alleiniger Eigentuemer der verwalteten Objekte ? (aendert sich mit jedem Redo oder Undo) public: @@ -67,18 +67,18 @@ namespace dbaui // anschliessend sollte das SetOwnership aufgerufen werden // Zugriff auf die verwalteten Connections - USHORT ConnCount() { return (USHORT)m_vTableConnection.size(); } + USHORT ConnCount() { return (USHORT)m_vTableConnection.size(); } - ::std::vector<OTableConnection*>* GetTabConnList() { return &m_vTableConnection; } + ::std::vector<OTableConnection*>* GetTabConnList() { return &m_vTableConnection; } void InsertConnection( OTableConnection* pConnection ) { m_vTableConnection.push_back(pConnection); } - void RemoveConnection( OTableConnection* pConnection ) - { + void RemoveConnection( OTableConnection* pConnection ) + { m_vTableConnection.erase(::std::remove(m_vTableConnection.begin(),m_vTableConnection.end(),pConnection),m_vTableConnection.end()); } }; - + } #endif // DBAUI_QUERYTABWINUNDOACT_HXX diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index b4b0506950ca..faef87de1c7d 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::accessibility; //------------------------------------------------------------------------------ -namespace +namespace { // ----------------------------------------------------------------------------- sal_Bool isColumnInKeyType(const Reference<XIndexAccess>& _rxKeys,const ::rtl::OUString& _rColumnName,sal_Int32 _nKeyType) @@ -109,13 +109,13 @@ namespace } // ----------------------------------------------------------------------------- /** appends a new TabAdd Undo action at controller - @param _pView the view which we use - @param _pUndoAction the undo action which should be added - @param _pConnection the connection for which the undo action should be appended - @param _bOwner is the undo action the owner + @param _pView the view which we use + @param _pUndoAction the undo action which should be added + @param _pConnection the connection for which the undo action should be appended + @param _bOwner is the undo action the owner */ // ----------------------------------------------------------------------------- - void addUndoAction( OQueryTableView* _pView, + void addUndoAction( OQueryTableView* _pView, OQueryTabConnUndoAction* _pUndoAction, OQueryTableConnection* _pConnection, sal_Bool _bOwner = sal_False) @@ -126,10 +126,10 @@ namespace } // ----------------------------------------------------------------------------- /** openJoinDialog opens the join dialog with this connection data - @param _pView the view which we use - @param _pConnectionData the connection data + @param _pView the view which we use + @param _pConnectionData the connection data - @return true when OK was pressed otherwise false + @return true when OK was pressed otherwise false */ sal_Bool openJoinDialog(OQueryTableView* _pView,const TTableConnectionData::value_type& _pConnectionData,BOOL _bSelectableTables) { @@ -147,9 +147,9 @@ namespace } // ----------------------------------------------------------------------------- /** connectionModified adds an undo action for the modified connection and forces an redraw - @param _pView the view which we use - @param _pConnection the connection which was modified - @param _bAddUndo true when an undo action should be appended + @param _pView the view which we use + @param _pConnection the connection which was modified + @param _bAddUndo true when an undo action should be appended */ void connectionModified(OQueryTableView* _pView, OTableConnection* _pConnection, @@ -160,7 +160,7 @@ namespace // add an undo action if ( _bAddUndo ) - addUndoAction( _pView, + addUndoAction( _pView, new OQueryAddTabConnUndoAction(_pView), static_cast< OQueryTableConnection*>(_pConnection)); // redraw @@ -180,7 +180,7 @@ namespace // nothing to do if one of both denotes a query return; - // we found a table in our view where we can insert some connections + // we found a table in our view where we can insert some connections // the key columns have a property called RelatedColumn // OQueryTableConnectionData aufbauen OQueryTableConnectionData* pNewConnData = new OQueryTableConnectionData( _rSource.GetData(), _rDest.GetData() ); @@ -214,7 +214,7 @@ namespace else OSL_ENSURE(0,"Column not found!"); } - // get the position inside the tabe + // get the position inside the tabe Reference<XNameAccess> xRefColumns = _rDest.GetOriginalColumns(); if(xRefColumns.is()) { @@ -293,7 +293,7 @@ void OQueryTableView::ReSync() TTableWindowData::reverse_iterator aIter = pTabWinDataList->rbegin(); // Fenster kreieren und einfuegen - + for(;aIter != pTabWinDataList->rend();++aIter) { OQueryTableWindowData* pData = static_cast<OQueryTableWindowData*>(aIter->get()); @@ -314,7 +314,7 @@ void OQueryTableView::ReSync() continue; } - (*GetTabWinMap())[pData->GetAliasName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe + (*GetTabWinMap())[pData->GetAliasName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe // wenn in den Daten keine Position oder Groesse steht -> Default if (!pData->HasPosition() && !pData->HasSize()) SetDefaultTabWinPosSize(pTabWin); @@ -325,7 +325,7 @@ void OQueryTableView::ReSync() // Verbindungen einfuegen TTableConnectionData* pTabConnDataList = m_pView->getController().getTableConnectionData(); TTableConnectionData::reverse_iterator aConIter = pTabConnDataList->rbegin(); - + for(;aConIter != pTabConnDataList->rend();++aConIter) { OQueryTableConnectionData* pTabConnData = static_cast<OQueryTableConnectionData*>(aConIter->get()); @@ -337,7 +337,7 @@ void OQueryTableView::ReSync() bInvalid = bInvalid && ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) - { // nein -> Pech gehabt, die Connection faellt weg + { // nein -> Pech gehabt, die Connection faellt weg pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter) ,pTabConnDataList->end()); continue; } @@ -369,9 +369,9 @@ void OQueryTableView::NotifyTabConnection(const OQueryTableConnection& rNewConn, DBG_CHKTHIS(OQueryTableView,NULL); // erst mal schauen, ob ich diese Connection schon habe OQueryTableConnection* pTabConn = NULL; - const ::std::vector<OTableConnection*>* pConnections = getTableConnections(); + const ::std::vector<OTableConnection*>* pConnections = getTableConnections(); ::std::vector<OTableConnection*>::const_iterator aEnd = pConnections->end(); - ::std::vector<OTableConnection*>::const_iterator aIter = ::std::find( pConnections->begin(), + ::std::vector<OTableConnection*>::const_iterator aIter = ::std::find( pConnections->begin(), aEnd, static_cast<const OTableConnection*>(&rNewConn) ); @@ -427,8 +427,8 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl: ::rtl::OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents(xMetaData, _rTableName, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); ::rtl::OUString sRealName(sSchema); @@ -444,7 +444,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl: } } // ----------------------------------------------------------------------------- -// find the table which has a foreign key with this referencedTable name +// find the table which has a foreign key with this referencedTable name Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKeys,const ::rtl::OUString& _rReferencedTable) { if(!_rxKeys.is()) @@ -505,12 +505,12 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r // Neue UndoAction OQueryTabWinShowUndoAct* pUndoAction = new OQueryTabWinShowUndoAct(this); - pUndoAction->SetTabWin(pNewTabWin); // Fenster + pUndoAction->SetTabWin(pNewTabWin); // Fenster sal_Bool bSuccess = ShowTabWin(pNewTabWin, pUndoAction,bAppend); if(!bSuccess) { // reset table window - pUndoAction->SetTabWin(NULL); + pUndoAction->SetTabWin(NULL); pUndoAction->SetOwnership(sal_False); delete pUndoAction; @@ -523,7 +523,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r { modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(pNewTabWin->GetAccessible()) ); @@ -558,7 +558,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r switch ( nKeyType ) { case KeyType::FOREIGN: - { // our new table has a foreign key + { // our new table has a foreign key // so look if the referenced table is already in our list xProp->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= aReferencedTable; OSL_ENSURE(aReferencedTable.getLength(),"Foreign key without referencedTableName"); @@ -634,8 +634,8 @@ void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJ OQueryTableWindow* pDestWin = static_cast< OQueryTableWindow*>(jxdDest.pListBox->GetTabWin()); String aSourceFieldName, aDestFieldName; - aSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); - aDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry); + aSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); + aDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry); OTableConnection* pConn = GetTabConn(pSourceWin,pDestWin,true); if ( !pConn ) @@ -644,8 +644,8 @@ void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJ OQueryTableConnectionData* pNewConnectionData = new OQueryTableConnectionData(pSourceWin->GetData(), pDestWin->GetData()); TTableConnectionData::value_type aNewConnectionData(pNewConnectionData); - sal_uInt32 nSourceFieldIndex, nDestFieldIndex; - ETableFieldType eSourceFieldType, eDestFieldType; + sal_uInt32 nSourceFieldIndex, nDestFieldIndex; + ETableFieldType eSourceFieldType, eDestFieldType; // Namen/Position/Typ der beiden betroffenen Felder besorgen ... // Source @@ -704,8 +704,8 @@ void OQueryTableView::createNewConnection() if( openJoinDialog(this,pData,TRUE) ) { OTableWindowMap* pMap = GetTabWinMap(); - OQueryTableWindow* pSourceWin = static_cast< OQueryTableWindow*>((*pMap)[pData->getReferencingTable()->GetWinName()]); - OQueryTableWindow* pDestWin = static_cast< OQueryTableWindow*>((*pMap)[pData->getReferencedTable()->GetWinName()]); + OQueryTableWindow* pSourceWin = static_cast< OQueryTableWindow*>((*pMap)[pData->getReferencingTable()->GetWinName()]); + OQueryTableWindow* pDestWin = static_cast< OQueryTableWindow*>((*pMap)[pData->getReferencedTable()->GetWinName()]); // first we have to look if the this connection already exists OTableConnection* pConn = GetTabConn(pSourceWin,pDestWin,true); sal_Bool bNew = sal_True; @@ -735,7 +735,7 @@ bool OQueryTableView::RemoveConnection( OTableConnection* _pConnection,sal_Bool bool bRet = OJoinTableView::RemoveConnection( _pConnection,sal_False); // add undo action - addUndoAction( this, + addUndoAction( this, new OQueryDelTabConnUndoAction(this), static_cast< OQueryTableConnection*>(_pConnection), sal_True); @@ -810,9 +810,9 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin) modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, makeAny(pTabWin->GetAccessible()), - Any() + Any() ); } @@ -820,7 +820,7 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin) void OQueryTableView::EnsureVisible(const OTableWindow* pWin) { DBG_CHKTHIS(OQueryTableView,NULL); - + Invalidate(INVALIDATE_NOCHILDREN); OJoinTableView::EnsureVisible(pWin); } @@ -830,10 +830,10 @@ void OQueryTableView::GetConnection(OQueryTableConnection* pConn) { DBG_CHKTHIS(OQueryTableView,NULL); // bei mir und dem Dokument einfuegen - + addConnection( pConn ); // invalidieren (damit es neu gezeichnet wird) - // pConn->Invalidate(); + // pConn->Invalidate(); } //------------------------------------------------------------------------ @@ -868,7 +868,7 @@ void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc break; } - pTabWin->Hide(); // nicht zerstoeren, steht im Undo!! + pTabWin->Hide(); // nicht zerstoeren, steht im Undo!! // die Daten zum TabWin muessen auch aus meiner Verantwortung entlassen werden TTableWindowData* pTabWinDataList = m_pView->getController().getTableWindowData(); @@ -964,8 +964,8 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn addConnection(*aIter); // add all connections from the undo action // each connection should invalidated inside addConnection so we don't need this here any longer -// if ( !pOwnList->empty() ) -// InvalidateConnections(); +// if ( !pOwnList->empty() ) +// InvalidateConnections(); pTableCon->clear(); // und die Daten des Fensters ebenfalls in Liste (des Docs) @@ -992,7 +992,7 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn // damit habe ich das Doc natuerlich modifiziert if(!m_pView->getController().isReadOnly()) m_pView->getController().setModified( sal_True ); - + m_pView->getController().InvalidateFeature(SID_BROWSER_CLEAR_QUERY); return bSuccess; diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index cd2e92a4d2cd..5644e889505e 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,14 +62,14 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent) m_pEdit->SaveValue(); m_pEdit->SetPosPixel( Point( 0, 0 ) ); m_pEdit->Show(); - // m_pEdit->GrabFocus(); + // m_pEdit->GrabFocus(); } // ----------------------------------------------------------------------------- OQueryTextView::~OQueryTextView() { DBG_DTOR(OQueryTextView,NULL); ::std::auto_ptr<Window> aTemp(m_pEdit); - m_pEdit = NULL; + m_pEdit = NULL; } // ----------------------------------------------------------------------------- void OQueryTextView::GetFocus() diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 792d283ee8a3..7fee959e767d 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ using namespace ::com::sun::star::lang; DBG_NAME(OQueryViewSwitch) OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory) : m_bAddTableDialogWasVisible(sal_False) -{ +{ DBG_CTOR(OQueryViewSwitch,NULL); - - m_pTextView = new OQueryTextView(_pParent); - m_pDesignView = new OQueryDesignView( _pParent, _rController, _rFactory ); + + m_pTextView = new OQueryTextView(_pParent); + m_pDesignView = new OQueryDesignView( _pParent, _rController, _rFactory ); } // ----------------------------------------------------------------------------- OQueryViewSwitch::~OQueryViewSwitch() @@ -63,7 +63,7 @@ OQueryViewSwitch::~OQueryViewSwitch() { ::std::auto_ptr<Window> aTemp(m_pDesignView); m_pDesignView = NULL; - } + } } // ------------------------------------------------------------------------- void OQueryViewSwitch::Construct() @@ -82,7 +82,7 @@ void OQueryViewSwitch::resizeDocumentView(Rectangle& _rPlayground) { m_pTextView->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() ); m_pDesignView->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() ); - + // just for completeness: there is no space left, we occupied it all ... _rPlayground.SetPos( _rPlayground.BottomRight() ); _rPlayground.SetSize( Size( 0, 0 ) ); @@ -266,8 +266,8 @@ bool OQueryViewSwitch::impl_postViewSwitch( const bool i_bGraphicalDesign, const { if ( i_bSuccess ) { - m_pTextView->Show ( !i_bGraphicalDesign ); - m_pDesignView->Show ( i_bGraphicalDesign ); + m_pTextView->Show ( !i_bGraphicalDesign ); + m_pDesignView->Show ( i_bGraphicalDesign ); OAddTableDlg* pAddTabDialog( getAddTableDialog() ); if ( pAddTabDialog ) if ( i_bGraphicalDesign && m_bAddTableDialogWasVisible ) @@ -296,12 +296,12 @@ OAddTableDlg* OQueryViewSwitch::getAddTableDialog() // ----------------------------------------------------------------------------- sal_Bool OQueryViewSwitch::isSlotEnabled(sal_Int32 _nSlotId) { - return m_pDesignView->isSlotEnabled(_nSlotId); + return m_pDesignView->isSlotEnabled(_nSlotId); } // ----------------------------------------------------------------------------- void OQueryViewSwitch::setSlotEnabled(sal_Int32 _nSlotId,sal_Bool _bEnable) { - m_pDesignView->setSlotEnabled(_nSlotId,_bEnable); + m_pDesignView->setSlotEnabled(_nSlotId,_bEnable); } // ----------------------------------------------------------------------------- void OQueryViewSwitch::SaveUIConfig() @@ -317,9 +317,9 @@ void OQueryViewSwitch::SetPosSizePixel( Point _rPt,Size _rSize) m_pTextView->SetPosSizePixel( _rPt,_rSize); } // ----------------------------------------------------------------------------- -Reference< XMultiServiceFactory > OQueryViewSwitch::getORB() const -{ - return m_pDesignView->getORB(); +Reference< XMultiServiceFactory > OQueryViewSwitch::getORB() const +{ + return m_pDesignView->getORB(); } // ----------------------------------------------------------------------------- bool OQueryViewSwitch::reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) @@ -337,7 +337,7 @@ bool OQueryViewSwitch::reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) void OQueryViewSwitch::setNoneVisbleRow(sal_Int32 _nRows) { if(m_pDesignView) - m_pDesignView->setNoneVisbleRow(_nRows); + m_pDesignView->setNoneVisbleRow(_nRows); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 9ff9b6133430..6b10e23a4340 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,13 +65,13 @@ using namespace ::com::sun::star::accessibility; const String g_strOne = String::CreateFromAscii("1"); const String g_strZero = String::CreateFromAscii("0"); -#define DEFAULT_QUERY_COLS 20 -#define DEFAULT_SIZE GetTextWidth(g_strZero) * 30 -#define CHECKBOX_SIZE 10 -#define HANDLE_ID 0 -#define HANDLE_COLUMN_WITDH 70 +#define DEFAULT_QUERY_COLS 20 +#define DEFAULT_SIZE GetTextWidth(g_strZero) * 30 +#define CHECKBOX_SIZE 10 +#define HANDLE_ID 0 +#define HANDLE_COLUMN_WITDH 70 -#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ +#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e1) || \ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e2))) @@ -86,8 +86,8 @@ namespace { String sName = _sFieldName; xub_StrLen nTokenCount = sName.GetTokenCount('.'); - if ( (nTokenCount == 2 && sName.GetToken(1,'.').GetChar(0) == '*' ) - || (nTokenCount == 3 && sName.GetToken(2,'.').GetChar(0) == '*' ) ) + if ( (nTokenCount == 2 && sName.GetToken(1,'.').GetChar(0) == '*' ) + || (nTokenCount == 3 && sName.GetToken(2,'.').GetChar(0) == '*' ) ) { bAsterix = sal_True; } @@ -116,7 +116,7 @@ namespace DBG_NAME(OSelectionBrowseBox) //------------------------------------------------------------------------------ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) - :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION | BROWSER_HIDESELECT | + :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION | BROWSER_HIDESELECT | BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL ) ,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS)) ,m_nVisibleCount(0) @@ -130,18 +130,18 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) DBG_CTOR(OSelectionBrowseBox,NULL); SetHelpId(HID_CTL_QRYDGNCRIT); - m_nMode = BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT - | BROWSER_KEEPSELECTION | BROWSER_HIDECURSOR - | BROWSER_HLINESFULL | BROWSER_VLINESFULL - | BROWSER_HEADERBAR_NEW ; + m_nMode = BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT + | BROWSER_KEEPSELECTION | BROWSER_HIDECURSOR + | BROWSER_HLINESFULL | BROWSER_VLINESFULL + | BROWSER_HEADERBAR_NEW ; - m_pTextCell = new Edit(&GetDataWindow(), 0); - // m_pTextCell->EnableSpecialCheck(sal_False); - m_pVisibleCell = new CheckBoxControl(&GetDataWindow()); - m_pTableCell = new ListBoxControl(&GetDataWindow()); m_pTableCell->SetDropDownLineCount( 20 ); - m_pFieldCell = new ComboBoxControl(&GetDataWindow()); m_pFieldCell->SetDropDownLineCount( 20 ); - m_pOrderCell = new ListBoxControl(&GetDataWindow()); - m_pFunctionCell = new ListBoxControl(&GetDataWindow()); m_pFunctionCell->SetDropDownLineCount( 20 ); + m_pTextCell = new Edit(&GetDataWindow(), 0); + // m_pTextCell->EnableSpecialCheck(sal_False); + m_pVisibleCell = new CheckBoxControl(&GetDataWindow()); + m_pTableCell = new ListBoxControl(&GetDataWindow()); m_pTableCell->SetDropDownLineCount( 20 ); + m_pFieldCell = new ComboBoxControl(&GetDataWindow()); m_pFieldCell->SetDropDownLineCount( 20 ); + m_pOrderCell = new ListBoxControl(&GetDataWindow()); + m_pFunctionCell = new ListBoxControl(&GetDataWindow()); m_pFunctionCell->SetDropDownLineCount( 20 ); m_pVisibleCell->SetHelpId(HID_QRYDGN_ROW_VISIBLE); m_pTableCell->SetHelpId(HID_QRYDGN_ROW_TABLE); @@ -153,8 +153,8 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) // TriState der ::com::sun::star::form::CheckBox abschalten m_pVisibleCell->GetBox().EnableTriState( sal_False ); -// m_pEmptyEntry = new OTableFieldDesc(); -// m_pEmptyEntry->SetColWidth(DEFAULT_SIZE); +// m_pEmptyEntry = new OTableFieldDesc(); +// m_pEmptyEntry->SetColWidth(DEFAULT_SIZE); Font aTitleFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE,Window::GetSettings().GetLanguage(),DEFAULTFONT_FLAGS_ONLYONE); aTitleFont.SetSize(Size(0, 6)); @@ -180,7 +180,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) OSelectionBrowseBox::~OSelectionBrowseBox() { DBG_DTOR(OSelectionBrowseBox,NULL); - + delete m_pTextCell; delete m_pVisibleCell; delete m_pFieldCell; @@ -208,23 +208,23 @@ void OSelectionBrowseBox::initialize() ,IParseContext::KEY_FUSION ,IParseContext::KEY_INTERSECTION }; - + String sGroup = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount() - 1); m_aFunctionStrings = m_aFunctionStrings.GetToken(0); - + for (size_t i = 0; i < SAL_N_ELEMENTS(eFunctions); ++i) { m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); m_aFunctionStrings += String(ByteString(rContext.getIntlKeywordAscii(eFunctions[i])),RTL_TEXTENCODING_UTF8); - + } // for (sal_Int32 i = 0; i < SAL_N_ELEMENTS(eFunctions) ; ++i) m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); m_aFunctionStrings += sGroup; - + // Diese Funktionen stehen nur unter CORE zur Verfügung if ( lcl_SupportsCoreSQLGrammar(xConnection) ) { - xub_StrLen nCount = m_aFunctionStrings.GetTokenCount(); + xub_StrLen nCount = m_aFunctionStrings.GetTokenCount(); for (xub_StrLen nIdx = 0; nIdx < nCount; nIdx++) m_pFunctionCell->InsertEntry(m_aFunctionStrings.GetToken(nIdx)); } @@ -273,7 +273,7 @@ namespace public: OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent); }; - OSelectionBrwBoxHeader::OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent) + OSelectionBrwBoxHeader::OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent) : ::svt::EditBrowserHeader(pParent,WB_BUTTONSTYLE|WB_DRAG) ,m_pBrowseBox(pParent) { @@ -334,7 +334,7 @@ void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo ) OTabFieldMovedUndoAct* pUndoAct = new OTabFieldMovedUndoAct(this); pUndoAct->SetColumnPosition( nOldPos + 1); pUndoAct->SetTabFieldDescr(pOldEntry); - + getDesignView()->getController().addUndoActionAndInvalidate(pUndoAct); } // if ( !m_bInUndoMode && _bCreateUndo ) } @@ -355,8 +355,8 @@ void OSelectionBrowseBox::Init() SetHeaderBar(pNewHeaderBar); SetMode(m_nMode); - - Font aFont( GetDataWindow().GetFont() ); + + Font aFont( GetDataWindow().GetFont() ); aFont.SetWeight( WEIGHT_NORMAL ); GetDataWindow().SetFont( aFont ); @@ -384,9 +384,9 @@ void OSelectionBrowseBox::Init() { Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); m_nMaxColumns = xMetaData.is() ? xMetaData->getMaxColumnsInSelect() : 0; - + } - else + else m_nMaxColumns = 0; } catch(const SQLException&) @@ -405,7 +405,7 @@ void OSelectionBrowseBox::PreFill() if (GetCurRow() != 0) GoToRow(0); - + static_cast< OQueryController& >( getDesignView()->getController() ).clearFields(); DeactivateCell(); @@ -419,7 +419,7 @@ void OSelectionBrowseBox::ClearAll() { DBG_CHKTHIS(OSelectionBrowseBox,NULL); SetUpdateMode(sal_False); - + OTableFields::reverse_iterator aIter = getFields().rbegin(); for ( ;aIter != getFields().rend(); ++aIter ) { @@ -514,7 +514,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon aField.AppendAscii(".*"); } m_pFieldCell->SetText(aField); - } break; + } break; case BROW_TABLE_ROW: { m_pTableCell->Clear(); @@ -537,7 +537,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon m_pTableCell->SelectEntry(String(ModuleRes(STR_QUERY_NOTABLE))); } } - } break; + } break; case BROW_VIS_ROW: { m_pVisibleCell->GetBox().Check(pEntry->IsVisible()); @@ -557,7 +557,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon OQueryDesignView* paDView = getDesignView(); InfoBox(paDView, aMessage).Execute(); } - } break; + } break; case BROW_ORDER_ROW: m_pOrderCell->SelectEntryPos( sal::static_int_cast< USHORT >(pEntry->GetOrderDir())); @@ -571,7 +571,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon break; default: { - sal_uInt16 nIdx = sal_uInt16(nCellIndex - BROW_CRIT1_ROW); + sal_uInt16 nIdx = sal_uInt16(nCellIndex - BROW_CRIT1_ROW); setTextCellContext(pEntry,pEntry->GetCriteria( nIdx ),HID_QRYDGN_ROW_CRIT); } } @@ -624,7 +624,7 @@ sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName, sal_Bool bError = sal_False; ::comphelper::UStringMixEqual bCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); // check if the table name is the same - if ( _sTableRange.getLength() && (bCase(_pEntry->GetTable(),_sTableRange) || bCase(_pEntry->GetAlias(),_sTableRange)) ) + if ( _sTableRange.getLength() && (bCase(_pEntry->GetTable(),_sTableRange) || bCase(_pEntry->GetAlias(),_sTableRange)) ) { // a table was already inserted and the tables contains that column name if ( !_pEntry->GetTabWindow() ) @@ -681,7 +681,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes clearEntryFunctionField(_sFieldName,_pEntry,_bListAction,_pEntry->GetColumnId()); return bError; } - + Reference<XConnection> xConnection( rController.getConnection() ); Reference< XDatabaseMetaData > xMetaData; if ( xConnection.is() ) @@ -713,7 +713,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), _sFieldName ); else sSql += _sFieldName; - + if ( _pEntry->isAggreateFunction() ) { DBG_ASSERT(_pEntry->GetFunction().getLength(),"Functionname darf hier nicht leer sein! ;-("); @@ -752,8 +752,8 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes { _pEntry->SetField(_sFieldName); clearEntryFunctionField(_sFieldName,_pEntry,_bListAction,_pEntry->GetColumnId()); - } // travel through the select column parse node - else + } // travel through the select column parse node + else { ::comphelper::UStringMixEqual bCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); @@ -791,7 +791,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes } ::connectivity::OSQLParseNode* pColumnRef = pChild->getChild(0); - if ( + if ( pColumnRef->count() == 3 && SQL_ISPUNCTUATION(pColumnRef->getChild(0),"(") && SQL_ISPUNCTUATION(pColumnRef->getChild(2),")") @@ -851,24 +851,24 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes } else OSL_ENSURE(0,"Unsupported function inserted!"); - + } else { // so we first clear the function field clearEntryFunctionField(_sFieldName,aSelEntry,_bListAction,nColumnId); ::rtl::OUString sFunction; - pColumnRef->parseNodeToStr( sFunction, + pColumnRef->parseNodeToStr( sFunction, xConnection, &rController.getParser().getContext(), sal_True, sal_True); // quote is to true because we need quoted elements inside the function getDesignView()->fillFunctionInfo(pColumnRef,sFunction,aSelEntry); - + if( SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) || SQL_ISRULEOR2(pColumnRef,fold,char_substring_fct) || - SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) ) + SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) ) // a calculation has been found ( can be calc and function ) { // now parse the whole statement @@ -882,7 +882,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes aSelEntry->SetFunctionType(nNewFunctionType); aSelEntry->SetField(sParameters); } - else + else { aSelEntry->SetFieldAlias(sColumnAlias); if ( SQL_ISRULE(pColumnRef,set_fct_spec) ) @@ -898,11 +898,11 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes aSelEntry->SetFunctionType(FKT_NUMERIC | FKT_OTHER); } } - + aSelEntry->SetAlias(::rtl::OUString()); notifyTableFieldChanged(sOldAlias,aSelEntry->GetAlias(),_bListAction, nColumnId); } - + } if ( i > 0 && !InsertField(aSelEntry,BROWSER_INVALIDID,sal_True,sal_False).is() ) // may we have to append more than one field { // the field could not be isnerted @@ -928,8 +928,8 @@ sal_Bool OSelectionBrowseBox::SaveModified() pEntry = getEntry(nCurrentColumnPos - 1); sal_Bool bWasEmpty = pEntry.is() ? pEntry->IsEmpty() : sal_False; - sal_Bool bError = sal_False; - sal_Bool bListAction = sal_False; + sal_Bool bError = sal_False; + sal_Bool bListAction = sal_False; if (pEntry.is() && Controller().Is() && Controller()->IsModified()) { @@ -943,9 +943,9 @@ sal_Bool OSelectionBrowseBox::SaveModified() { sal_Bool bOldValue = m_pVisibleCell->GetBox().GetSavedValue() != STATE_NOCHECK; strOldCellContents = bOldValue ? g_strOne : g_strZero; - sNewValue = !bOldValue ? g_strOne : g_strZero; + sNewValue = !bOldValue ? g_strOne : g_strZero; } - if((m_bOrderByUnRelated || pEntry->GetOrderDir() == ORDER_NONE) && + if((m_bOrderByUnRelated || pEntry->GetOrderDir() == ORDER_NONE) && (m_bGroupByUnRelated || !pEntry->IsGroupBy())) { pEntry->SetVisible(m_pVisibleCell->GetBox().IsChecked()); @@ -968,7 +968,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() pNewEntry->SetColumnId( pEntry->GetColumnId() ); ::std::replace(getFields().begin(),getFields().end(),pEntry,pNewEntry); sal_uInt16 nCol = GetCurColumnId(); - for (int i = 0; i < m_nVisibleCount; i++) // Spalte neu zeichnen + for (int i = 0; i < m_nVisibleCount; i++) // Spalte neu zeichnen RowModified(i,nCol); } else @@ -1021,7 +1021,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() if ( m_pTableCell->GetSelectEntryPos() != 0 ) { pEntry->SetAlias(aAliasName); - // we have to set the table name as well as the table window + // we have to set the table name as well as the table window OJoinTableView::OTableWindowMap* pTabWinList = getDesignView()->getTableView()->GetTabWinMap(); if (pTabWinList) { @@ -1044,8 +1044,8 @@ sal_Bool OSelectionBrowseBox::SaveModified() pEntry->SetTabWindow(NULL); } sNewValue = pEntry->GetAlias(); - - } break; + + } break; case BROW_ORDER_ROW: { @@ -1061,7 +1061,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() RowModified(GetBrowseRow(BROW_VIS_ROW), GetCurColumnId()); } sNewValue = String::CreateFromInt32((sal_uInt16)pEntry->GetOrderDir()); - } break; + } break; case BROW_COLUMNALIAS_ROW: strOldCellContents = pEntry->GetFieldAlias(); @@ -1073,14 +1073,14 @@ sal_Bool OSelectionBrowseBox::SaveModified() strOldCellContents = pEntry->GetFunction(); sal_uInt16 nPos = m_pFunctionCell->GetSelectEntryPos(); // Diese Funktionen stehen nur unter CORE zur Verfügung - String sFunctionName = m_pFunctionCell->GetEntry(nPos); - String sGroupFunctionName = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1); + String sFunctionName = m_pFunctionCell->GetEntry(nPos); + String sGroupFunctionName = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1); sal_Bool bGroupBy = sal_False; if ( sGroupFunctionName.Equals(sFunctionName) ) // check if the function name is GROUP { bGroupBy = sal_True; - - if ( !m_bGroupByUnRelated && !pEntry->IsVisible() ) + + if ( !m_bGroupByUnRelated && !pEntry->IsVisible() ) { // we have to change the visblie flag, so we must append also an undo action pEntry->SetVisible(sal_True); @@ -1103,9 +1103,9 @@ sal_Bool OSelectionBrowseBox::SaveModified() pEntry->SetFunction(String()); pEntry->SetFunctionType(pEntry->GetFunctionType() & ~FKT_AGGREGATE ); } - + pEntry->SetGroupBy(bGroupBy); - + sNewValue = sFunctionName; } break; @@ -1115,7 +1115,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() if(!xConnection.is()) break; - sal_uInt16 nIdx = sal_uInt16(nRow - BROW_CRIT1_ROW); + sal_uInt16 nIdx = sal_uInt16(nRow - BROW_CRIT1_ROW); String aText = m_pTextCell->GetText(); aText.EraseLeadingChars(); @@ -1125,12 +1125,12 @@ sal_Bool OSelectionBrowseBox::SaveModified() ::rtl::OUString aErrorMsg; Reference<XPropertySet> xColumn; OSQLParseNode* pParseNode = getDesignView()->getPredicateTreeFromEntry(pEntry,aText,aErrorMsg,xColumn); - + if (pParseNode) { pParseNode->parseNodeToPredicateStr(aCrit, xConnection, - static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), + static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), xColumn, getDesignView()->getLocale(), static_cast<sal_Char>(getDesignView()->getDecimalSeparator().toChar()), @@ -1138,7 +1138,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() delete pParseNode; } else - { + { if(xColumn.is()) { sal_Int32 nType = 0; @@ -1161,16 +1161,16 @@ sal_Bool OSelectionBrowseBox::SaveModified() ; } ::connectivity::OSQLParser& rParser = static_cast<OQueryController&>(getDesignView()->getController()).getParser(); - pParseNode = rParser.predicateTree(aErrorMsg, - aText, - static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), + pParseNode = rParser.predicateTree(aErrorMsg, + aText, + static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), xColumn); if (pParseNode) { - pParseNode->parseNodeToPredicateStr(aCrit, + pParseNode->parseNodeToPredicateStr(aCrit, xConnection, - static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), - xColumn, + static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), + xColumn, getDesignView()->getLocale(), static_cast<sal_Char>(getDesignView()->getDecimalSeparator().toChar()), &(static_cast<OQueryController&>(getDesignView()->getController()).getParser().getContext())); @@ -1194,7 +1194,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() bError = sal_True; } } - // } + // } } strOldCellContents = pEntry->GetCriteria(nIdx); pEntry->SetCriteria(nIdx, aCrit); @@ -1219,7 +1219,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() { // und noch die Undo-Action fuer das Ganze appendUndoAction(strOldCellContents,sNewValue,nRow); - + } } @@ -1284,7 +1284,7 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& r DBG_CHKTHIS(OSelectionBrowseBox,NULL); Rectangle aRect(rRect); aRect.TopLeft().Y() -= 2; - String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); + String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); // ab BROW_CRIT2_ROW werden alle Zeilen mit "oder" angegeben xub_StrLen nToken = (xub_StrLen) (m_nSeekRow >= GetBrowseRow(BROW_CRIT2_ROW)) @@ -1338,7 +1338,7 @@ void OSelectionBrowseBox::RemoveField(sal_uInt16 nColumnId ) OSL_ENSURE(getFields().size() > sal_uInt16(nPos-1),"ID is to great!"); OTableFieldDescRef pDesc = getEntry((sal_uInt32)(nPos - 1)) ; - pDesc->SetColWidth( (sal_uInt16)GetColumnWidth(nColumnId) ); // hat er sich vorher leider nicht gemerkt + pDesc->SetColWidth( (sal_uInt16)GetColumnWidth(nColumnId) ); // hat er sich vorher leider nicht gemerkt // UndoAction erzeugen if ( !m_bInUndoMode ) @@ -1410,7 +1410,7 @@ void OSelectionBrowseBox::KeyInput( const KeyEvent& rEvt ) DBG_CHKTHIS(OSelectionBrowseBox,NULL); if (IsColumnSelected(GetCurColumnId())) { - if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows + if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows !rEvt.GetKeyCode().IsShift() && !rEvt.GetKeyCode().IsMod1()) { @@ -1427,7 +1427,7 @@ sal_Int8 OSelectionBrowseBox::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); sal_Int8 nDropAction = DND_ACTION_NONE; - if ( rEvt.GetRow() >= -1 ) + if ( rEvt.GetRow() >= -1 ) { if ( IsEditing() ) { @@ -1478,7 +1478,7 @@ OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt) getFields().push_back(pEmptyEntry); USHORT nColumnId = sal::static_int_cast< USHORT >(getFields().size()); pEmptyEntry->SetColumnId( nColumnId ); - + InsertDataColumn( nColumnId , String(), DEFAULT_SIZE, HIB_STDSTYLE, HEADERBAR_APPEND); } @@ -1545,7 +1545,7 @@ Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId ) ////////////////////////////////////////////////////////////////////// // Dann wird die linke Seite angepasst - Rectangle aFieldRect(GetCellRect( 0, nColId )); // used instead of GetFieldRectPixel + Rectangle aFieldRect(GetCellRect( 0, nColId )); // used instead of GetFieldRectPixel aInvalidRect.Left() = aFieldRect.Left(); return aInvalidRect; @@ -1567,9 +1567,9 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu // remember the column id of the current positon USHORT nColumnId = GetColumnId(_nColumnPostion); // Wenn zu klein oder zu gross, auf Ende der Liste setzen - if ((_nColumnPostion == BROWSER_INVALIDID) || (_nColumnPostion >= getFields().size())) // Anhaengen des Feldes + if ((_nColumnPostion == BROWSER_INVALIDID) || (_nColumnPostion >= getFields().size())) // Anhaengen des Feldes { - if (FindFirstFreeCol(_nColumnPostion) == NULL) // keine freie Column mehr + if (FindFirstFreeCol(_nColumnPostion) == NULL) // keine freie Column mehr { AppendNewCol(1); _nColumnPostion = sal::static_int_cast< USHORT >( @@ -1581,7 +1581,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu pEntry->SetColumnId( nColumnId ); getFields()[ _nColumnPostion - 1] = pEntry; } - + // check if the column ids are identical, if not we have to move if ( pEntry->GetColumnId() != nColumnId ) { @@ -1731,7 +1731,7 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt const Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); const ::comphelper::UStringMixEqual bCase(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers()); //sal_Bool bAppend = sal_False; - + OTableFields& rFields = getFields(); OTableFields::iterator aIter = rFields.begin(); OTableFields::iterator aEnd = rFields.end(); @@ -1740,11 +1740,11 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt pEntry = *aIter; OSL_ENSURE(pEntry.is(),"OTableFieldDescRef was null!"); - const ::rtl::OUString aField = pEntry->GetField(); - const ::rtl::OUString aAlias = pEntry->GetAlias(); + const ::rtl::OUString aField = pEntry->GetField(); + const ::rtl::OUString aAlias = pEntry->GetAlias(); - if (bCase(aField,rInfo->GetField()) && - bCase(aAlias,rInfo->GetAlias()) && + if (bCase(aField,rInfo->GetField()) && + bCase(aAlias,rInfo->GetAlias()) && pEntry->GetFunctionType() == rInfo->GetFunctionType() && pEntry->GetFunction() == rInfo->GetFunction()) { @@ -1764,7 +1764,7 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt break; } } - + } } @@ -1820,20 +1820,20 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S for(;aIter != aEnd;++aIter) { OTableFieldDescRef pEntry = *aIter; - const ::rtl::OUString aField = pEntry->GetField(); - const ::rtl::OUString aAlias = pEntry->GetAlias(); + const ::rtl::OUString aField = pEntry->GetField(); + const ::rtl::OUString aAlias = pEntry->GetAlias(); - if (bCase(aField,rInfo->GetField()) && - bCase(aAlias,rInfo->GetAlias()) && + if (bCase(aField,rInfo->GetField()) && + bCase(aAlias,rInfo->GetAlias()) && pEntry->GetFunctionType() == rInfo->GetFunctionType() && - pEntry->GetFunction() == rInfo->GetFunction() && + pEntry->GetFunction() == rInfo->GetFunction() && pEntry->IsGroupBy() == rInfo->IsGroupBy() ) { if ( pEntry->isNumericOrAggreateFunction() && rInfo->IsGroupBy() ) pEntry->SetGroupBy(sal_False); else { -// pEntry->SetGroupBy(rInfo->IsGroupBy()); +// pEntry->SetGroupBy(rInfo->IsGroupBy()); if(!m_bGroupByUnRelated && pEntry->IsGroupBy()) pEntry->SetVisible(sal_True); } @@ -1914,10 +1914,10 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef& rInfo, const EOrde for(;aIter != aEnd;++aIter) { pEntry = *aIter; - ::rtl::OUString aField = pEntry->GetField(); - ::rtl::OUString aAlias = pEntry->GetAlias(); + ::rtl::OUString aField = pEntry->GetField(); + ::rtl::OUString aAlias = pEntry->GetAlias(); - if (bCase(aField,rInfo->GetField()) && + if (bCase(aField,rInfo->GetField()) && bCase(aAlias,rInfo->GetAlias())) { sal_uInt32 nPos = aIter - rFields.begin(); @@ -1972,12 +1972,12 @@ void OSelectionBrowseBox::CellModified() { case BROW_VIS_ROW: { - OTableFieldDescRef pEntry = getEntry(GetColumnPos(GetCurColumnId()) - 1); + OTableFieldDescRef pEntry = getEntry(GetColumnPos(GetCurColumnId()) - 1); sal_uInt16 nIdx = m_pOrderCell->GetSelectEntryPos(); - if(!m_bOrderByUnRelated && nIdx > 0 && - nIdx != sal_uInt16(-1) && - !pEntry->IsEmpty() && + if(!m_bOrderByUnRelated && nIdx > 0 && + nIdx != sal_uInt16(-1) && + !pEntry->IsEmpty() && pEntry->GetOrderDir() != ORDER_NONE) { m_pVisibleCell->GetBox().Check(); @@ -2008,7 +2008,7 @@ Size OSelectionBrowseBox::CalcOptimalSize( const Size& _rAvailable ) Size aReturn( _rAvailable.Width(), GetTitleHeight() ); aReturn.Height() += ( m_nVisibleCount ? m_nVisibleCount : 15 ) * GetDataRowHeight(); - aReturn.Height() += 40; // just some space + aReturn.Height() += 40; // just some space return aReturn; } @@ -2025,7 +2025,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt) if (!rEvt.IsMouseEvent()) { - if ( 1 == GetSelectColumnCount() ) + if ( 1 == GetSelectColumnCount() ) { sal_uInt16 nSelId = GetColumnId( sal::static_int_cast< USHORT >( @@ -2233,7 +2233,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const case BROW_FIELD_ROW: { String aField = pEntry->GetField(); - if (aField.GetChar(0) == '*') // * durch alias.* ersetzen + if (aField.GetChar(0) == '*') // * durch alias.* ersetzen { aField = pEntry->GetAlias(); if(aField.Len()) @@ -2241,7 +2241,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const aField += '*'; } aText = aField; - } break; + } break; case BROW_ORDER_ROW: if (pEntry->GetOrderDir() != ORDER_NONE) aText = String(ModuleRes(STR_QUERY_SORTTEXT) ).GetToken(sal::static_int_cast< USHORT >(pEntry->GetOrderDir())); @@ -2339,7 +2339,7 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,Strin String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); - // DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross"); + // DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross"); if ( GetCurColumnId() == nColId && !m_bInUndoMode ) SaveModified(); @@ -2375,7 +2375,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S OTableFieldDescRef pEntry = getEntry(nPos - 1); DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::SetCellContents : invalid column id, prepare for GPF ... "); - + switch (nRow) { case BROW_VIS_ROW: @@ -2391,7 +2391,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S { sal_uInt16 nIdx = (sal_uInt16)strNewText.ToInt32(); pEntry->SetOrderDir(EOrderDir(nIdx)); - } break; + } break; case BROW_COLUMNALIAS_ROW: pEntry->SetFieldAlias(strNewText); break; @@ -2406,8 +2406,8 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S pEntry->SetFunctionType(nFunctionType); if ( pEntry->IsGroupBy() && !sGroupFunctionName.EqualsIgnoreCaseAscii(strNewText) ) pEntry->SetGroupBy(sal_False); - - + + if ( sGroupFunctionName.EqualsIgnoreCaseAscii(strNewText) ) pEntry->SetGroupBy(sal_True); else if ( strNewText.Len() ) @@ -2415,7 +2415,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S nFunctionType |= FKT_AGGREGATE; pEntry->SetFunctionType(nFunctionType); } - } break; + } break; default: pEntry->SetCriteria(sal_uInt16(nRow - BROW_CRIT1_ROW), strNewText); } @@ -2632,7 +2632,7 @@ void OSelectionBrowseBox::stopTimer() { m_bStopTimer = sal_True; if (m_timerInvalidate.IsActive()) - m_timerInvalidate.Stop(); + m_timerInvalidate.Stop(); } // ----------------------------------------------------------------------------- void OSelectionBrowseBox::startTimer() @@ -2661,7 +2661,7 @@ void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,c m_pTextCell->ClearModifyFlag(); if (!m_pTextCell->HasFocus()) m_pTextCell->GrabFocus(); - + enableControl(_rEntry,m_pTextCell); if (m_pTextCell->GetHelpId() != _nHelpId) @@ -2712,7 +2712,7 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) // ----------------------------------------------------------------------------- ::rtl::OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const { - String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); + String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); // ab BROW_CRIT2_ROW werden alle Zeilen mit "oder" angegeben xub_StrLen nToken = (xub_StrLen) (_nRow >= GetBrowseRow(BROW_CRIT2_ROW)) @@ -2721,7 +2721,7 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) return ::rtl::OUString(aLabel.GetToken(nToken)); } // ----------------------------------------------------------------------------- -::rtl::OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const +::rtl::OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const { ::rtl::OUString sRetText; switch( _eObjType ) diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 4ecb2e8e0245..5fa263b85f13 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,151 +42,151 @@ namespace connectivity } namespace dbaui -{ +{ //================================================================== -#define SIZ_NONE 0 -#define SIZ_TOP 1 -#define SIZ_BOTTOM 2 -#define SIZ_LEFT 4 -#define SIZ_RIGHT 8 - -#define BROW_FIELD_ROW 0 -#define BROW_COLUMNALIAS_ROW 1 -#define BROW_TABLE_ROW 2 -#define BROW_ORDER_ROW 3 -#define BROW_VIS_ROW 4 -#define BROW_FUNCTION_ROW 5 -#define BROW_CRIT1_ROW 6 -#define BROW_CRIT2_ROW 7 -#define BROW_CRIT3_ROW 8 -#define BROW_CRIT4_ROW 9 -#define BROW_CRIT5_ROW 10 -#define BROW_CRIT6_ROW 11 -#define BROW_ROW_CNT 12 +#define SIZ_NONE 0 +#define SIZ_TOP 1 +#define SIZ_BOTTOM 2 +#define SIZ_LEFT 4 +#define SIZ_RIGHT 8 + +#define BROW_FIELD_ROW 0 +#define BROW_COLUMNALIAS_ROW 1 +#define BROW_TABLE_ROW 2 +#define BROW_ORDER_ROW 3 +#define BROW_VIS_ROW 4 +#define BROW_FUNCTION_ROW 5 +#define BROW_CRIT1_ROW 6 +#define BROW_CRIT2_ROW 7 +#define BROW_CRIT3_ROW 8 +#define BROW_CRIT4_ROW 9 +#define BROW_CRIT5_ROW 10 +#define BROW_CRIT6_ROW 11 +#define BROW_ROW_CNT 12 //================================================================== class OQueryDesignView; class OSelectionBrowseBox : public ::svt::EditBrowseBox { friend class OQueryDesignView; - ::std::vector<bool> m_bVisibleRow; // an Pos steht die RowId - Timer m_timerInvalidate; - - long m_nSeekRow; - BrowserMode m_nMode; // Merken des BrowseModes - Edit* m_pTextCell; - ::svt::CheckBoxControl* m_pVisibleCell; - ::svt::ComboBoxControl* m_pFieldCell; - ::svt::ListBoxControl* m_pFunctionCell; - ::svt::ListBoxControl* m_pTableCell; - ::svt::ListBoxControl* m_pOrderCell; - - OTableFieldDescRef m_pEmptyEntry; // default entry in the list may reference more than once - - sal_Int32 m_nMaxColumns; // maximale Anzahl der Spalten in einem Select-Statement - - String m_aFunctionStrings; - sal_uInt16 m_nVisibleCount; // Anzahl der max sichtbaren Zeilen - sal_Bool m_bOrderByUnRelated; - sal_Bool m_bGroupByUnRelated; - sal_Bool m_bStopTimer; - sal_Bool m_bWasEditing; - sal_Bool m_bDisableErrorBox; - sal_Bool m_bInUndoMode; + ::std::vector<bool> m_bVisibleRow; // an Pos steht die RowId + Timer m_timerInvalidate; + + long m_nSeekRow; + BrowserMode m_nMode; // Merken des BrowseModes + Edit* m_pTextCell; + ::svt::CheckBoxControl* m_pVisibleCell; + ::svt::ComboBoxControl* m_pFieldCell; + ::svt::ListBoxControl* m_pFunctionCell; + ::svt::ListBoxControl* m_pTableCell; + ::svt::ListBoxControl* m_pOrderCell; + + OTableFieldDescRef m_pEmptyEntry; // default entry in the list may reference more than once + + sal_Int32 m_nMaxColumns; // maximale Anzahl der Spalten in einem Select-Statement + + String m_aFunctionStrings; + sal_uInt16 m_nVisibleCount; // Anzahl der max sichtbaren Zeilen + sal_Bool m_bOrderByUnRelated; + sal_Bool m_bGroupByUnRelated; + sal_Bool m_bStopTimer; + sal_Bool m_bWasEditing; + sal_Bool m_bDisableErrorBox; + sal_Bool m_bInUndoMode; DECL_LINK(OnInvalidateTimer, void*); - public: OSelectionBrowseBox( Window* pParent ); + public: OSelectionBrowseBox( Window* pParent ); ~OSelectionBrowseBox(); - void initialize(); - OTableFieldDescRef InsertField( const OJoinExchangeData& jxdSource, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True ); - OTableFieldDescRef InsertField( const OTableFieldDescRef& rInfo, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True ); - void InsertColumn( OTableFieldDescRef pEntry, USHORT& _nColumnPostion ); - void RemoveColumn( USHORT _nColumnId ); - void DeleteFields( const String& rAliasName ); + void initialize(); + OTableFieldDescRef InsertField( const OJoinExchangeData& jxdSource, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True ); + OTableFieldDescRef InsertField( const OTableFieldDescRef& rInfo, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True ); + void InsertColumn( OTableFieldDescRef pEntry, USHORT& _nColumnPostion ); + void RemoveColumn( USHORT _nColumnId ); + void DeleteFields( const String& rAliasName ); bool HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const; // AddGroupBy:: F"ugt ein Feld mit Funktion == Grupierung. Falls das Feld schon vorhanden ist und ein Aggregate Funktion // benutzt, wird das Flag nicht gesetzt - void AddGroupBy( const OTableFieldDescRef& rInfo,sal_uInt32 _nCurrentPos); - void AddCondition( const OTableFieldDescRef& rInfo, + void AddGroupBy( const OTableFieldDescRef& rInfo,sal_uInt32 _nCurrentPos); + void AddCondition( const OTableFieldDescRef& rInfo, const String& rValue, const sal_uInt16 nLevel, bool _bAddOrOnOneLine ); - void DuplicateConditionLevel( const sal_uInt16 nLevel); - void AddOrder(const OTableFieldDescRef& rInfo, const EOrderDir eDir, sal_uInt32 _nCurrentPos); - void ClearAll(); - OTableFieldDescRef AppendNewCol( sal_uInt16 nCnt=1 ); - sal_Bool Save(); - OQueryDesignView* getDesignView(); - OQueryDesignView* getDesignView() const; - sal_uInt16 FieldsCount(); - - void SetColWidth(sal_uInt16 nColId, long lNewWidth); + void DuplicateConditionLevel( const sal_uInt16 nLevel); + void AddOrder(const OTableFieldDescRef& rInfo, const EOrderDir eDir, sal_uInt32 _nCurrentPos); + void ClearAll(); + OTableFieldDescRef AppendNewCol( sal_uInt16 nCnt=1 ); + sal_Bool Save(); + OQueryDesignView* getDesignView(); + OQueryDesignView* getDesignView() const; + sal_uInt16 FieldsCount(); + + void SetColWidth(sal_uInt16 nColId, long lNewWidth); // beachtet im Gegensatz zum SetColumnWidth der Basisklasse auch eine eventuell aktive Zelle in dieser Spalte - String GetCellContents(sal_Int32 nCellIndex, USHORT nColId); - void SetCellContents(sal_Int32 nCellIndex, USHORT nColId, const String& strNewText); + String GetCellContents(sal_Int32 nCellIndex, USHORT nColId); + void SetCellContents(sal_Int32 nCellIndex, USHORT nColId, const String& strNewText); // Zelleninhalt (als String formatiert) setzen/liefern - sal_Int32 GetNoneVisibleRows() const; - void SetNoneVisbleRow(long nRows); - sal_Bool IsRowVisible(sal_uInt16 _nWhich) const; - void SetRowVisible(sal_uInt16 _nWhich, sal_Bool _bVis); + sal_Int32 GetNoneVisibleRows() const; + void SetNoneVisbleRow(long nRows); + sal_Bool IsRowVisible(sal_uInt16 _nWhich) const; + void SetRowVisible(sal_uInt16 _nWhich, sal_Bool _bVis); - void SetReadOnly(sal_Bool bRO); + void SetReadOnly(sal_Bool bRO); // calculate an optimal size. Basically, this takes into account the number of visible rows. - Size CalcOptimalSize( const Size& _rAvailable ); + Size CalcOptimalSize( const Size& _rAvailable ); // can the current content be cut - sal_Bool isPasteAllowed(); - sal_Bool isCutAllowed(); - sal_Bool isCopyAllowed(); - void cut(); - void paste(); - void copy(); - - virtual void GetFocus(); - virtual void DeactivateCell(sal_Bool bUpdate = sal_True); - virtual void ColumnMoved( USHORT nColId ) { ColumnMoved(nColId,TRUE); } - void ColumnMoved( USHORT nColId,BOOL _bCreateUndo); - - void Fill(); - void PreFill(); - + sal_Bool isPasteAllowed(); + sal_Bool isCutAllowed(); + sal_Bool isCopyAllowed(); + void cut(); + void paste(); + void copy(); + + virtual void GetFocus(); + virtual void DeactivateCell(sal_Bool bUpdate = sal_True); + virtual void ColumnMoved( USHORT nColId ) { ColumnMoved(nColId,TRUE); } + void ColumnMoved( USHORT nColId,BOOL _bCreateUndo); + + void Fill(); + void PreFill(); + /** Disables the generation of undo actions */ - inline void EnterUndoMode() { m_bInUndoMode = sal_True; } + inline void EnterUndoMode() { m_bInUndoMode = sal_True; } /** Enables the generation of undo actions */ - inline void LeaveUndoMode() { m_bInUndoMode = sal_False; } + inline void LeaveUndoMode() { m_bInUndoMode = sal_False; } /** GetCellText returns the text at the given position - @param _nRow + @param _nRow the number of the row - @param _nColId + @param _nColId the ID of the column @return the text out of the cell */ - virtual String GetCellText(long _nRow, USHORT _nColId) const; + virtual String GetCellText(long _nRow, USHORT _nColId) const; /** returns the description of the row. - @param _nRow + @param _nRow The row number. - @return - The header text of the specified row. + @return + The header text of the specified row. */ - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; - /** return the name of the specified object. - @param eObjType + /** return the name of the specified object. + @param eObjType The type to ask for - @param _nPosition + @param _nPosition The position of a tablecell (index position), header bar colum/row cell - @return - The name of the specified object. + @return + The name of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; // IAccessibleTableProvider /** Creates the accessible object of a data table cell. @@ -194,102 +194,102 @@ namespace dbaui @param nColumnId The column ID of the cell. @return The XAccessible interface of the specified cell. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ); - + protected: - virtual sal_Bool SeekRow( long nRow ); + virtual sal_Bool SeekRow( long nRow ); - virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, + virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const; + virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; - virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); - virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); - virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ); - virtual void KeyInput( const KeyEvent& rEvt ); - virtual void Command(const CommandEvent& rEvt); - virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); - - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); - virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); - virtual void CellModified(); - virtual sal_Bool SaveModified(); - virtual void Init(); - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const; - virtual void ColumnResized( sal_uInt16 nColId ); - - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); - - virtual sal_uInt16 GetDefaultColumnWidth(const String& rName) const; + virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); + virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); + virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ); + virtual void KeyInput( const KeyEvent& rEvt ); + virtual void Command(const CommandEvent& rEvt); + virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); + + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); + virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); + virtual void CellModified(); + virtual sal_Bool SaveModified(); + virtual void Init(); + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const; + virtual void ColumnResized( sal_uInt16 nColId ); + + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); + + virtual sal_uInt16 GetDefaultColumnWidth(const String& rName) const; // if you want to have an own header ... - virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent); + virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent); - void stopTimer(); - void startTimer(); + void stopTimer(); + void startTimer(); private: - OTableFieldDescRef FindFirstFreeCol(USHORT& _rColumnPosition); + OTableFieldDescRef FindFirstFreeCol(USHORT& _rColumnPosition); // rCol enthaelt die Nummer (in pOTableFieldDescList) der ersten Spalte, die von sich sagt, dass sie leer ist // wenn es keine solche gibt, ist rCol undefiniert und der Rueckgabewert NULL - void CheckFreeColumns(USHORT& _rColumnPosition); + void CheckFreeColumns(USHORT& _rColumnPosition); // testet, ob es noch freie Spalten gibt, wenn nicht, wird ein neuer Packen angefuegt // rCol enthaelt die Nummer der ersten freien Spalte (in pOTableFieldDescList) - void RemoveField( sal_uInt16 nId ); - Rectangle GetInvalidRect( sal_uInt16 nColId ); - long GetRealRow(long nRow) const; - long GetBrowseRow(long nRowId) const; - sal_Bool GetFunctionName(sal_uInt32 _nFunctionTokenId,String& rFkt); - void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow,sal_Bool& _bListAction); - void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow); - OTableFields& getFields() const; - void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); - void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId); - void invalidateUndoRedo(); + void RemoveField( sal_uInt16 nId ); + Rectangle GetInvalidRect( sal_uInt16 nColId ); + long GetRealRow(long nRow) const; + long GetBrowseRow(long nRowId) const; + sal_Bool GetFunctionName(sal_uInt32 _nFunctionTokenId,String& rFkt); + void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow,sal_Bool& _bListAction); + void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow); + OTableFields& getFields() const; + void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); + void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId); + void invalidateUndoRedo(); OTableFieldDescRef getEntry(OTableFields::size_type _nPos); - void adjustSelectionMode( sal_Bool _bClickedOntoHeader, sal_Bool _bClickedOntoHandleCol ); + void adjustSelectionMode( sal_Bool _bClickedOntoHeader, sal_Bool _bClickedOntoHandleCol ); /** save the filed change in save modified - @param _sFieldName + @param _sFieldName The field name inserted by the user. - @param _pEntry + @param _pEntry The entry which will contain the nescessary entries. - @param _bListAction + @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> @return <TRUE/> if an error occured otherwise <FALSE/> */ - sal_Bool saveField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction); + sal_Bool saveField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction); /** sets the table window at the _pEntry - @param _pEntry + @param _pEntry The entry where the window should be set. - @param _sTableName + @param _sTableName The table name to search for. - @return + @return <TRUE/> if the table name was set otherwise <FALSE/> */ - sal_Bool fillEntryTable(OTableFieldDescRef& _pEntry,const ::rtl::OUString& _sTableName); + sal_Bool fillEntryTable(OTableFieldDescRef& _pEntry,const ::rtl::OUString& _sTableName); /** uses the parse node to fill all information into the field - @param _pColumnRef + @param _pColumnRef The parse node used to fill the info into the field. - @param _xMetaData + @param _xMetaData Use to parse the node to a string. - @param _pEntry + @param _pEntry The entry which will contain the nescessary entries. - @param _bListAction + @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> @return <TRUE/> if an error occured otherwise <FALSE/> */ - sal_Bool fillColumnRef( const ::connectivity::OSQLParseNode* _pColumnRef, + sal_Bool fillColumnRef( const ::connectivity::OSQLParseNode* _pColumnRef, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, OTableFieldDescRef& _pEntry, sal_Bool& _bListAction); - sal_Bool fillColumnRef( const ::rtl::OUString& _sColumnName, + sal_Bool fillColumnRef( const ::rtl::OUString& _sColumnName, const ::rtl::OUString& _sTableRange, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, OTableFieldDescRef& _pEntry, @@ -297,41 +297,41 @@ namespace dbaui /** append an undo action for the table field - @param _sOldAlias + @param _sOldAlias The old table alias. - @param _sAlias + @param _sAlias The new alias name. - @param _bListAction + @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> */ - void notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,USHORT _nColumnId); + void notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,USHORT _nColumnId); /** append an undo action for the function field - @param _sOldFunctionName + @param _sOldFunctionName The old value. - @param _sFunctionName + @param _sFunctionName The new function name. - @param _bListAction + @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> */ - void notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,USHORT _nColumnId); + void notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,USHORT _nColumnId); /** clears the function fields of the submitted entry if it doesn't match the SQL standard and append an undo action. E.q. AGGREGATE functions are only valid when the field name isn't an asterix - @param _sFieldName + @param _sFieldName The field name. - @param _pEntry + @param _pEntry The entry to be cleared - @param _bListAction + @param _bListAction When <TRUE/> an list action will be created. */ - void clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,USHORT _nColumnId); + void clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,USHORT _nColumnId); /** remove or insert the necessary function types - @param _pEntry + @param _pEntry The currently edited entry. */ - void setFunctionCell(OTableFieldDescRef& _pEntry); + void setFunctionCell(OTableFieldDescRef& _pEntry); private: using ::svt::EditBrowseBox::AcceptDrop; diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index 964b54d00f25..8909fad0fd76 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -181,7 +181,7 @@ namespace dbaui //------------------------------------------------------------------------ BOOL OTableConnection::CheckHit( const Point& rMousePos ) const - { + { ////////////////////////////////////////////////////////////////////// // check if the point hit our line ::std::vector<OConnectionLine*>::const_iterator aIter = ::std::find_if(m_vConnLine.begin(), diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index f097c35eb6f1..27d4f7300c8f 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ OTableConnectionData::~OTableConnectionData() DBG_DTOR(OTableConnectionData,NULL); // LineDataList loeschen OConnectionLineDataVec().swap(m_vConnLineData); - //ResetConnLines(FALSE); + //ResetConnLines(FALSE); } //------------------------------------------------------------------------ @@ -101,7 +101,7 @@ OTableConnectionData& OTableConnectionData::operator=( const OTableConnectionDat // und kopieren OConnectionLineDataVec* pLineData = const_cast<OTableConnectionData*>(&rConnData)->GetConnLineDataList(); - + OConnectionLineDataVec::const_iterator aIter = pLineData->begin(); OConnectionLineDataVec::const_iterator aEnd = pLineData->end(); for(;aIter != aEnd;++aIter) @@ -168,9 +168,9 @@ OConnectionLineDataRef OTableConnectionData::CreateLineDataObj( const OConnectio return new OConnectionLineData( rConnLineData ); } // ----------------------------------------------------------------------------- -OTableConnectionData* OTableConnectionData::NewInstance() const -{ - return new OTableConnectionData(); +OTableConnectionData* OTableConnectionData::NewInstance() const +{ + return new OTableConnectionData(); } // ----------------------------------------------------------------------------- void OTableConnectionData::normalizeLines() diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 8edf83464b96..c318eb88c61d 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ OTableFieldDesc::OTableFieldDesc(const ::rtl::OUString& rT, const ::rtl::OUStrin ,m_bVisible(sal_False) { DBG_CTOR(OTableFieldDesc,NULL); - SetField( rF ); SetTable( rT ); + SetField( rF ); SetTable( rT ); } //------------------------------------------------------------------------------ @@ -93,10 +93,10 @@ OTableFieldDesc& OTableFieldDesc::operator=( const OTableFieldDesc& rRS ) m_aCriteria = rRS.GetCriteria(); m_aTableName = rRS.GetTable(); - m_aAliasName = rRS.GetAlias(); // table range - m_aFieldName = rRS.GetField(); // column - m_aFieldAlias = rRS.GetFieldAlias(); // column alias - m_aFunctionName = rRS.GetFunction(); // Funktionsname + m_aAliasName = rRS.GetAlias(); // table range + m_aFieldName = rRS.GetField(); // column + m_aFieldAlias = rRS.GetFieldAlias(); // column alias + m_aFunctionName = rRS.GetFunction(); // Funktionsname m_pTabWindow = rRS.GetTabWindow(); m_eDataType = rRS.GetDataType(); m_eFunctionType = rRS.GetFunctionType(); @@ -115,14 +115,14 @@ sal_Bool OTableFieldDesc::operator==( const OTableFieldDesc& rDesc ) { DBG_CHKTHIS(OTableFieldDesc,NULL); - return ( m_eOrderDir != rDesc.GetOrderDir() || - m_eDataType != rDesc.GetDataType() || - m_aAliasName != rDesc.GetAlias() || - m_aFunctionName != rDesc.GetFunction() || - m_aFieldName != rDesc.GetField() || - m_aTableName != rDesc.GetTable() || - m_bGroupBy != rDesc.IsGroupBy() || - m_aCriteria != rDesc.GetCriteria() || + return ( m_eOrderDir != rDesc.GetOrderDir() || + m_eDataType != rDesc.GetDataType() || + m_aAliasName != rDesc.GetAlias() || + m_aFunctionName != rDesc.GetFunction() || + m_aFieldName != rDesc.GetField() || + m_aTableName != rDesc.GetTable() || + m_bGroupBy != rDesc.IsGroupBy() || + m_aCriteria != rDesc.GetCriteria() || m_bVisible != rDesc.IsVisible() ); } diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx index 7ef432c32bd8..d86ab904c7d2 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx index 090d71735665..e3191777f7f7 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,17 +36,17 @@ namespace dbaui class OTableFieldInfo { private: - ETableFieldType m_eFieldType; - sal_Int32 m_eDataType; + ETableFieldType m_eFieldType; + sal_Int32 m_eDataType; public: OTableFieldInfo(); ~OTableFieldInfo(); - inline ETableFieldType GetKeyType() const { return m_eFieldType; } - inline void SetKey(ETableFieldType bKey=TAB_NORMAL_FIELD) { m_eFieldType = bKey; } - inline sal_Int32 GetDataType() const { return m_eDataType; } - inline void SetDataType(sal_Int32 eTyp) { m_eDataType = eTyp; } + inline ETableFieldType GetKeyType() const { return m_eFieldType; } + inline void SetKey(ETableFieldType bKey=TAB_NORMAL_FIELD) { m_eFieldType = bKey; } + inline sal_Int32 GetDataType() const { return m_eDataType; } + inline void SetDataType(sal_Int32 eTyp) { m_eDataType = eTyp; } }; } #endif // DBAUI_TABLEFIELDINFO_HXX diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 1c0dd80e93f8..3e44c65f5685 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,12 +67,12 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -#define TABWIN_SIZING_AREA 4 -#define LISTBOX_SCROLLING_AREA 6 -#define SCROLLING_TIMESPAN 500 +#define TABWIN_SIZING_AREA 4 +#define LISTBOX_SCROLLING_AREA 6 +#define SCROLLING_TIMESPAN 500 -#define TABWIN_WIDTH_MIN 90 -#define TABWIN_HEIGHT_MIN 80 +#define TABWIN_WIDTH_MIN 90 +#define TABWIN_HEIGHT_MIN 80 //======================================================================== // class OTableWindow @@ -124,7 +124,7 @@ OTableWindow::~OTableWindow() } // if (m_pListBox) if ( m_pContainerListener.is() ) m_pContainerListener->dispose(); - + m_pAccessible = NULL; } // ----------------------------------------------------------------------------- @@ -399,7 +399,7 @@ Rectangle OTableWindow::getSizingRect(const Point& _rPos,const Size& _rOutputSiz // ----------------------------------------------------------------------------- void OTableWindow::setSizingFlag(const Point& _rPos) { - Size aOutSize = GetOutputSizePixel(); + Size aOutSize = GetOutputSizePixel(); ////////////////////////////////////////////////////////////////////// // Flags anpassen, wenn Mauszeiger in sizingArea m_nSizingFlags = SIZING_NONE; @@ -425,9 +425,9 @@ void OTableWindow::MouseMove( const MouseEvent& rEvt ) if (pCont->getDesignView()->getController().isReadOnly()) return; - Point aPos = rEvt.GetPosPixel(); + Point aPos = rEvt.GetPosPixel(); setSizingFlag(aPos); - Pointer aPointer; + Pointer aPointer; ////////////////////////////////////////////////////////////////////// @@ -477,7 +477,7 @@ void OTableWindow::Resize() { ////////////////////////////////////////////////////////////////////// // Das Fenster darf nicht verschwinden, deshalb min. Groesse setzen - Size aOutSize = GetOutputSizePixel(); + Size aOutSize = GetOutputSizePixel(); aOutSize = Size(CalcZoom(aOutSize.Width()),CalcZoom(aOutSize.Height())); long nTitleHeight = CalcZoom( GetTextHeight() )+ CalcZoom( 4 ); @@ -657,7 +657,7 @@ long OTableWindow::PreNotify(NotifyEvent& rNEvt) if ( getDesignView()->getController().isReadOnly() ) break; - const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const KeyCode& rCode = pKeyEvent->GetKeyCode(); if ( rCode.IsMod1() ) { @@ -737,40 +737,40 @@ long OTableWindow::PreNotify(NotifyEvent& rNEvt) } else { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } else { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } resetSizingFlag(); } else { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } else { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } break; case EVENT_KEYUP: { - const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const KeyCode& rCode = pKeyEvent->GetKeyCode(); USHORT nKeyCode = rCode.GetCode(); if ( rCode.IsMod2() && nKeyCode != KEY_UP && nKeyCode != KEY_DOWN && nKeyCode != KEY_LEFT && nKeyCode != KEY_RIGHT ) { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } break; diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index aad8a07fa4cc..71a044fa24e1 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,11 +49,11 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; - // using namespace ::com::sun::star::awt; + // using namespace ::com::sun::star::awt; using namespace ::com::sun::star; OTableWindowAccess::OTableWindowAccess(OTableWindow* _pTable) - :VCLXAccessibleComponent(_pTable->GetComponentInterface().is() ? _pTable->GetWindowPeer() : NULL) + :VCLXAccessibleComponent(_pTable->GetComponentInterface().is() ? _pTable->GetWindowPeer() : NULL) ,m_pTable(_pTable) { } @@ -208,7 +208,7 @@ namespace dbaui } } return xReturn; - } + } // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL OTableWindowAccess::getRelationCount( ) throw (RuntimeException) @@ -238,8 +238,8 @@ namespace dbaui sal_Bool SAL_CALL OTableWindowAccess::containsRelation( sal_Int16 aRelationType ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - return AccessibleRelationType::CONTROLLER_FOR == aRelationType - && m_pTable && m_pTable->getTableView()->ExistsAConn(m_pTable); + return AccessibleRelationType::CONTROLLER_FOR == aRelationType + && m_pTable && m_pTable->getTableView()->ExistsAConn(m_pTable); } // ----------------------------------------------------------------------------- AccessibleRelation SAL_CALL OTableWindowAccess::getRelationByType( sal_Int16 aRelationType ) throw (RuntimeException) @@ -249,14 +249,14 @@ namespace dbaui { OJoinTableView* pView = m_pTable->getTableView(); const ::std::vector<OTableConnection*>* pConnectionList = pView->getTableConnections(); - + ::std::vector<OTableConnection*>::const_iterator aIter = pView->getTableConnections(m_pTable); ::std::vector<OTableConnection*>::const_iterator aEnd = pConnectionList->end(); ::std::vector< Reference<XInterface> > aRelations; aRelations.reserve(5); // just guessing for (; aIter != aEnd ; ++aIter ) aRelations.push_back(getParentChild(aIter - pConnectionList->begin())); - + Reference<XInterface> *pRelations = aRelations.empty() ? 0 : &aRelations[0]; Sequence< Reference<XInterface> > aSeq(pRelations, aRelations.size()); return AccessibleRelation(AccessibleRelationType::CONTROLLER_FOR,aSeq); diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index 6a9d63372a88..41457eaa3a54 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ void OTableWindowData::_disposing( const ::com::sun::star::lang::EventObject& /* // it doesn't matter which one was disposed m_xColumns.clear(); m_xKeys.clear(); - m_xTable.clear(); + m_xTable.clear(); } // ----------------------------------------------------------------------------- bool OTableWindowData::init(const Reference< XConnection >& _xConnection,bool _bAllowQueries) diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 936148c5ed93..e6f8965d9828 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,9 +44,9 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; -OJoinExchangeData::OJoinExchangeData(OTableWindowListBox* pBox) +OJoinExchangeData::OJoinExchangeData(OTableWindowListBox* pBox) : pListBox(pBox) - , pEntry(pBox->FirstSelected()) + , pEntry(pBox->FirstSelected()) { } const ULONG SCROLLING_TIMESPAN = 500; @@ -158,15 +158,15 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) { case EVENT_KEYINPUT: { - const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const KeyCode& rCode = pKeyEvent->GetKeyCode(); - + if (rCode.GetCode() != KEY_RETURN) { if(m_pTabWin) { bHandled = m_pTabWin->HandleKeyInput(*pKeyEvent); - // bHandled = TRUE; + // bHandled = TRUE; } break; } @@ -196,7 +196,7 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) ScrollOutputArea( -1 ); pEntry = GetEntry( m_aMousePos ); Select( pEntry, TRUE ); -// m_aScrollTimer.Start(); +// m_aScrollTimer.Start(); } return 0; @@ -214,7 +214,7 @@ IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ ) ScrollOutputArea( 1 ); pEntry = GetEntry( m_aMousePos ); Select( pEntry, TRUE ); -// m_aScrollTimer.Start(); +// m_aScrollTimer.Start(); } return 0; @@ -245,9 +245,9 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) // check the format if ( !OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_TABID) // this means that the first entry is to be draged && OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_JOIN) ) - { // don't drop into the window if it's the drag source itself - + { // don't drop into the window if it's the drag source itself + // remove the selection if the dragging operation is leaving the window if (_rEvt.mbLeaving) SelectAll(FALSE); @@ -335,9 +335,9 @@ sal_Int8 OTableWindowListBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { TransferableDataHelper aDropped(_rEvt.maDropEvent.Transferable); if ( OJoinExchObj::isFormatAvailable(aDropped.GetDataFlavorExVector())) - { // don't drop into the window if it's the drag source itself - m_aDropInfo.aSource = OJoinExchangeData(this); - m_aDropInfo.aDest = OJoinExchObj::GetSourceDescription(_rEvt.maDropEvent.Transferable); + { // don't drop into the window if it's the drag source itself + m_aDropInfo.aSource = OJoinExchangeData(this); + m_aDropInfo.aDest = OJoinExchObj::GetSourceDescription(_rEvt.maDropEvent.Transferable); if (m_nDropEvent) Application::RemoveUserEvent(m_nDropEvent); @@ -373,7 +373,7 @@ void OTableWindowListBox::GetFocus() else ShowFocusRect(FirstSelected()); } - SvTreeListBox::GetFocus(); + SvTreeListBox::GetFocus(); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 48e9865dd1ce..55b141b85e79 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) : OTableWindowTitle::~OTableWindowTitle() { DBG_DTOR(OTableWindowTitle,NULL); - m_pTabWin = NULL; + m_pTabWin = NULL; } //------------------------------------------------------------------------------ @@ -131,10 +131,10 @@ void OTableWindowTitle::Command( const CommandEvent& rEvt ) //------------------------------------------------------------------------------ //void OTableWindowTitle::Paint( const Rectangle& rRect ) //{ -// ////////////////////////////////////////////////////////////////////// -// // Ausgabe des Textes in der Titelzeile -// Rectangle aWinRect( Point(0,0), GetSizePixel() ); -// DrawText( aWinRect, GetText(), TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER|TEXT_DRAW_ENDELLIPSIS ); +// ////////////////////////////////////////////////////////////////////// +// // Ausgabe des Textes in der Titelzeile +// Rectangle aWinRect( Point(0,0), GetSizePixel() ); +// DrawText( aWinRect, GetText(), TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER|TEXT_DRAW_ENDELLIPSIS ); //} //------------------------------------------------------------------------------ @@ -149,7 +149,7 @@ void OTableWindowTitle::MouseButtonDown( const MouseEvent& rEvt ) { if( rEvt.IsLeft() ) { - if( rEvt.GetClicks() == 2) + if( rEvt.GetClicks() == 2) { Size aSize(GetTextWidth(GetText()) + 20, m_pTabWin->GetSizePixel().Height() - m_pTabWin->GetListBox()->GetSizePixel().Height()); diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index d8a2162e1d14..3dd1180d8704 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 56343b778e0a..1744e0602f36 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,14 +56,14 @@ namespace dbaui //= OQueryContainerWindow //===================================================================== DBG_NAME(OQueryContainerWindow) - OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory) + OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory) :ODataView( pParent, _rController, _rFactory ) ,m_pViewSwitch(NULL) ,m_pBeamer(NULL) { DBG_CTOR(OQueryContainerWindow,NULL); m_pViewSwitch = new OQueryViewSwitch( this, _rController, _rFactory ); - + m_pSplitter = new Splitter(this,WB_VSCROLL); m_pSplitter->Hide(); m_pSplitter->SetSplitHdl( LINK( this, OQueryContainerWindow, SplitHdl ) ); @@ -72,7 +72,7 @@ namespace dbaui // ----------------------------------------------------------------------------- OQueryContainerWindow::~OQueryContainerWindow() { - DBG_DTOR(OQueryContainerWindow,NULL); + DBG_DTOR(OQueryContainerWindow,NULL); { ::std::auto_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch); m_pViewSwitch = NULL; @@ -86,7 +86,7 @@ namespace dbaui m_xBeamer = NULL; if(xCloseable.is()) xCloseable->close(sal_False); // false - holds the owner ship of this frame - // m_xBeamer->setComponent(NULL,NULL); + // m_xBeamer->setComponent(NULL,NULL); } { ::std::auto_ptr<Window> aTemp(m_pSplitter); @@ -113,8 +113,8 @@ namespace dbaui if ( m_pBeamer && m_pBeamer->IsVisible() ) { // calc pos and size of the splitter - Point aSplitPos = m_pSplitter->GetPosPixel(); - Size aSplitSize = m_pSplitter->GetOutputSizePixel(); + Point aSplitPos = m_pSplitter->GetPosPixel(); + Size aSplitSize = m_pSplitter->GetOutputSizePixel(); aSplitSize.Width() = aPlayground.GetWidth(); if ( aSplitPos.Y() <= aPlayground.Top() ) @@ -125,7 +125,7 @@ namespace dbaui // set pos and size of the splitter m_pSplitter->SetPosSizePixel( aSplitPos, aSplitSize ); - m_pSplitter->SetDragRectPixel( aPlayground ); + m_pSplitter->SetDragRectPixel( aPlayground ); // set pos and size of the beamer Size aBeamerSize( aPlayground.GetWidth(), aSplitPos.Y() ); @@ -218,7 +218,7 @@ namespace dbaui { const ::rtl::OUString aLayoutManager( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )); Reference < XPropertySet > xLMPropSet(xPropSet->getPropertyValue( aLayoutManager ),UNO_QUERY); - + if ( xLMPropSet.is() ) { const ::rtl::OUString aAutomaticToolbars( RTL_CONSTASCII_USTRINGPARAM( "AutomaticToolbars" )); @@ -239,7 +239,7 @@ namespace dbaui Size aSize = GetOutputSizePixel(); Size aBeamer(aSize.Width(),sal_Int32(aSize.Height()*0.33)); - const long nFrameHeight = LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height(); + const long nFrameHeight = LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height(); Point aPos(0,aBeamer.Height()+nFrameHeight); m_pBeamer->SetPosSizePixel(Point(0,0),aBeamer); @@ -253,13 +253,13 @@ namespace dbaui m_pSplitter->Show(); Resize(); - } + } } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 82122c97aed1..66afd048ca76 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -188,7 +188,7 @@ namespace dbaui case SQL_NODE_COMPARISON: {rString+= ::rtl::OUString::createFromAscii("SQL_COMPARISON:"); - rString += _pNode->getTokenValue(); // haenge Nodevalue an + rString += _pNode->getTokenValue(); // haenge Nodevalue an // und beginne neu Zeile break;} @@ -217,12 +217,12 @@ namespace dbaui case SQL_NODE_PUNCTUATION: {rString += ::rtl::OUString::createFromAscii("SQL_PUNCTUATION:"); - rString += _pNode->getTokenValue(); // haenge Nodevalue an + rString += _pNode->getTokenValue(); // haenge Nodevalue an break;} case SQL_NODE_AMMSC: {rString += ::rtl::OUString::createFromAscii("SQL_AMMSC:"); - rString += _pNode->getTokenValue(); // haenge Nodevalue an + rString += _pNode->getTokenValue(); // haenge Nodevalue an break;} @@ -694,7 +694,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& if(m_bGraphicalDesign) InvalidateFeature(ID_BROWSER_ADDTABLE); } - // InvalidateFeature(ID_BROWSER_QUERY_EXECUTE); + // InvalidateFeature(ID_BROWSER_QUERY_EXECUTE); break; case SID_QUERY_VIEW_FUNCTIONS: case SID_QUERY_VIEW_TABLES: @@ -734,15 +734,15 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& break; case ID_QUERY_ZOOM_IN: { -// m_aZoom *= Fraction(1,10); -// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom); +// m_aZoom *= Fraction(1,10); +// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom); } break; case ID_QUERY_ZOOM_OUT: { -// if(m_aZoom != Fraction(1,1)) -// m_aZoom /= Fraction(1,10); -// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom); +// if(m_aZoom != Fraction(1,1)) +// m_aZoom /= Fraction(1,10); +// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom); } break; #if OSL_DEBUG_LEVEL > 1 @@ -783,7 +783,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& ::rtl::OUString sTemp; pNode->parseNodeToStr(sTemp,getConnection()); getContainer()->setStatement(sTemp); - + } } @@ -961,7 +961,7 @@ void OQueryController::impl_initialize() // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°° if ( !ensureConnected( sal_False ) ) - { // we have no connection so what else should we do + { // we have no connection so what else should we do m_bGraphicalDesign = sal_False; if ( editingView() ) { @@ -979,7 +979,7 @@ void OQueryController::impl_initialize() xViews = xViewsSup->getViews(); if ( !xViews.is() ) - { // we can't create views so we ask if the user wants to create a query instead + { // we can't create views so we ask if the user wants to create a query instead m_nCommandType = CommandType::QUERY; sal_Bool bClose = sal_False; { @@ -1037,7 +1037,7 @@ void OQueryController::impl_initialize() impl_showAutoSQLViewError( aError.get() ); } } - + getUndoMgr()->Clear(); if ( ( m_bGraphicalDesign ) @@ -1165,7 +1165,7 @@ void SAL_CALL OQueryController::disposing( const EventObject& Source ) throw(Run if ( getContainer() && Source.Source.is() ) { if ( Source.Source == m_aCurrentFrame.getFrame() ) - { // our frame is beeing disposed -> close the preview window (if we have one) + { // our frame is beeing disposed -> close the preview window (if we have one) Reference< XFrame > xPreviewFrame( getContainer()->getPreviewFrame() ); ::comphelper::disposeComponent( xPreviewFrame ); } @@ -1402,8 +1402,8 @@ sal_Bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElement m_sName = aDlg.getName(); if ( editingView() ) { - m_sUpdateCatalogName = aDlg.getCatalog(); - m_sUpdateSchemaName = aDlg.getSchema(); + m_sUpdateCatalogName = aDlg.getCatalog(); + m_sUpdateSchemaName = aDlg.getSchema(); } } } @@ -1560,7 +1560,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs) setModified( sal_False ); bSuccess = true; - + } catch( const SQLException& ) { diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index f7348dd25294..ca02d527d836 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ using namespace ::com::sun::star::sdbc; namespace dbaui { -class OJoinControl : public Window +class OJoinControl : public Window { public: - FixedLine aFL_Join; - FixedText aFT_Title; - ListBox aLB_JoinType; + FixedLine aFL_Join; + FixedText aFT_Title; + ListBox aLB_JoinType; CheckBox m_aCBNatural; OJoinControl(Window* _pParent,const ResId& _rResId); @@ -73,7 +73,7 @@ OJoinControl::OJoinControl(Window* _pParent,const ResId& _rResId) DBG_NAME(DlgQryJoin) DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, const TTableConnectionData::value_type& _pData, - OJoinTableView::OTableWindowMap* _pTableMap, + OJoinTableView::OTableWindowMap* _pTableMap, const Reference< XConnection >& _xConnection, BOOL _bAllowTableSelect) :ModalDialog( pParent, ModuleRes(DLG_QRY_JOIN) ) @@ -104,7 +104,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, m_pJoinControl->Show(); m_pJoinControl->m_aCBNatural.Check(static_cast<OQueryTableConnectionData*>(m_pConnData.get())->isNatural()); m_pTableControl->Show(); - + if( _bAllowTableSelect ) { m_pTableControl->Init( m_pConnData ); @@ -166,7 +166,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, m_pTableControl->NotifyCellChange(); m_pTableControl->enableRelation(!static_cast<OQueryTableConnectionData*>(m_pConnData.get())->isNatural() && eJoinType != CROSS_JOIN ); - } + } FreeResource(); } @@ -176,7 +176,7 @@ DlgQryJoin::~DlgQryJoin() { DBG_DTOR(DlgQryJoin,NULL); delete m_pJoinControl; - delete m_pTableControl; + delete m_pTableControl; } // ----------------------------------------------------------------------------- IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) @@ -184,14 +184,14 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) DBG_CHKTHIS(DlgQryJoin,NULL); if (m_pJoinControl->aLB_JoinType.GetSelectEntryPos() == m_pJoinControl->aLB_JoinType.GetSavedValue() ) return 1; - + m_pJoinControl->aLB_JoinType.SaveValue(); aML_HelpText.SetText(String()); m_pTableControl->enableRelation(true); - String sFirstWinName = m_pConnData->getReferencingTable()->GetWinName(); - String sSecondWinName = m_pConnData->getReferencedTable()->GetWinName(); + String sFirstWinName = m_pConnData->getReferencingTable()->GetWinName(); + String sSecondWinName = m_pConnData->getReferencedTable()->GetWinName(); const EJoinType eOldJoinType = eJoinType; USHORT nResId = 0; const USHORT nPos = m_pJoinControl->aLB_JoinType.GetSelectEntryPos(); @@ -203,7 +203,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) case ID_INNER_JOIN: nResId = STR_QUERY_INNER_JOIN; bAddHint = sal_False; - eJoinType = INNER_JOIN; + eJoinType = INNER_JOIN; break; case ID_LEFT_JOIN: nResId = STR_QUERY_LEFTRIGHT_JOIN; @@ -226,7 +226,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) { nResId = STR_QUERY_CROSS_JOIN; eJoinType = CROSS_JOIN; - + m_pConnData->ResetConnLines(); m_pTableControl->lateInit(); m_pJoinControl->m_aCBNatural.Check(FALSE); @@ -272,7 +272,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, /*pButton*/ ) { DBG_CHKTHIS(DlgQryJoin,NULL); - + m_pConnData->Update(); m_pOrigConnData->CopyFrom( *m_pConnData ); @@ -295,12 +295,12 @@ IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) Reference<XNameAccess> xReferencedTableColumns(m_pConnData->getReferencedTable()->getColumns()); Sequence< ::rtl::OUString> aSeq = m_pConnData->getReferencingTable()->getColumns()->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( xReferencedTableColumns->hasByName(*pIter) ) m_pConnData->AppendConnLine(*pIter,*pIter); - } + } } catch( const Exception& ) { @@ -309,7 +309,7 @@ IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) m_pTableControl->NotifyCellChange(); m_pTableControl->Invalidate(); } - + return 1; } // ----------------------------------------------------------------------------- @@ -367,7 +367,7 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType) break; } } - + LBChangeHdl(&m_pJoinControl->aLB_JoinType); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/querydlg.hrc b/dbaccess/source/ui/querydesign/querydlg.hrc index 0112fe1ffa56..f5acfd0d5266 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hrc +++ b/dbaccess/source/ui/querydesign/querydlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,18 +33,18 @@ #endif #define FL_JOIN 1 -#define FT_LISTBOXTITLE 2 +#define FT_LISTBOXTITLE 2 -#define LB_JOINTYPE 1 +#define LB_JOINTYPE 1 -#define GB_FIELDS 1 +#define GB_FIELDS 1 #define CB_NATURAL 1 -#define PB_OK 1 -#define PB_CANCEL 2 -#define PB_HELP 3 -#define ML_HELPTEXT 4 +#define PB_OK 1 +#define PB_CANCEL 2 +#define PB_HELP 3 +#define ML_HELPTEXT 4 #define WND_JOIN_CONTROL 1 #define WND_CONTROL 2 diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 2e0b331fb13e..f18fde0309d7 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,23 +46,23 @@ namespace dbaui class OTableListBoxControl; class OQueryTableView; class OJoinControl; - class DlgQryJoin : public ModalDialog + class DlgQryJoin : public ModalDialog ,public IRelationControlInterface { protected: - FixedText aML_HelpText; - OKButton aPB_OK; - CancelButton aPB_CANCEL; - HelpButton aPB_HELP; + FixedText aML_HelpText; + OKButton aPB_OK; + CancelButton aPB_CANCEL; + HelpButton aPB_HELP; OJoinControl* m_pJoinControl; - OTableListBoxControl* m_pTableControl; - OJoinTableView::OTableWindowMap* m_pTableMap; + OTableListBoxControl* m_pTableControl; + OJoinTableView::OTableWindowMap* m_pTableMap; OQueryTableView* m_pTableView; - EJoinType eJoinType; - TTableConnectionData::value_type m_pConnData; // enth"alt linke und rechte Tabelle - TTableConnectionData::value_type m_pOrigConnData; + EJoinType eJoinType; + TTableConnectionData::value_type m_pConnData; // enth"alt linke und rechte Tabelle + TTableConnectionData::value_type m_pOrigConnData; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; @@ -71,13 +71,13 @@ namespace dbaui DECL_LINK( NaturalToggleHdl, CheckBox* ); /** setJoinType enables and set the new join type - @param _eNewJoinType the new jointype + @param _eNewJoinType the new jointype */ void setJoinType(EJoinType _eNewJoinType); public: - DlgQryJoin( OQueryTableView * pParent, + DlgQryJoin( OQueryTableView * pParent, const TTableConnectionData::value_type& pData, - OJoinTableView::OTableWindowMap* _pTableMap, + OJoinTableView::OTableWindowMap* _pTableMap, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, BOOL _bAllowTableSelect); virtual ~DlgQryJoin(); @@ -89,14 +89,14 @@ namespace dbaui virtual TTableConnectionData::value_type getConnectionData() const; /** setValid set the valid inside, can be used for OK buttons - @param _bValid true when the using control allows an update + @param _bValid true when the using control allows an update */ virtual void setValid(sal_Bool _bValid); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() { return m_xConnection; } /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists - @param _pConnectionData the connection which exists between the new tables + @param _pConnectionData the connection which exists between the new tables */ virtual void notifyConnectionChange(); }; diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src index 687df3159186..30bc059c412a 100644 --- a/dbaccess/source/ui/querydesign/querydlg.src +++ b/dbaccess/source/ui/querydesign/querydlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ ModalDialog DLG_QRY_JOIN Size = MAP_APPFONT ( 90 , 60 ) ; HelpId = HID_DLG_QRY_JOINTYPE ; - DropDown = TRUE; - DDExtraWidth = TRUE; + DropDown = TRUE; + DDExtraWidth = TRUE; StringList [ en-US ] = { < "Inner join" ; ID_INNER_JOIN; > ; @@ -137,7 +137,7 @@ ModalDialog DLG_QRY_JOIN Size = MAP_APPFONT ( 179 , 49 ) ; UniqueId = HID_DLG_QRY_HELPTEXT ; SVLook = TRUE; - WordBreak = TRUE; + WordBreak = TRUE; }; OKButton PB_OK diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx index dea455795484..ea7c76ba32a7 100644 --- a/dbaccess/source/ui/querydesign/queryview.cxx +++ b/dbaccess/source/ui/querydesign/queryview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index 9cc6a42b4fe8..a0f3f422fe53 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ using namespace dbaui; //======================================================================== DBG_NAME(ORelationTableConnection) //------------------------------------------------------------------------ -ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContainer, +ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContainer, const TTableConnectionData::value_type& pTabConnData ) :OTableConnection( pContainer, pTabConnData ) { @@ -91,8 +91,8 @@ void ORelationTableConnection::Draw( const Rectangle& rRect ) const OConnectionLine* pTopLine = NULL; const ::std::vector<OConnectionLine*>* pConnLineList = GetConnLineList(); - ::std::vector<OConnectionLine*>::const_iterator aIter = pConnLineList->begin(); - ::std::vector<OConnectionLine*>::const_iterator aEnd = pConnLineList->end(); + ::std::vector<OConnectionLine*>::const_iterator aIter = pConnLineList->begin(); + ::std::vector<OConnectionLine*>::const_iterator aEnd = pConnLineList->end(); for(;aIter != aEnd;++aIter) { if( (*aIter)->IsValid() ) diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx index c9be2d46cc9e..73793dcff2e1 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace dbaui ORelationTableConnection& operator=( const ORelationTableConnection& rConn ); - virtual void Draw( const Rectangle& rRect ); + virtual void Draw( const Rectangle& rRect ); using OTableConnection::Draw; }; } diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index db145f75664f..86a1dcdef3d6 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowDa { DBG_CTOR(ORelationTableConnectionData,NULL); m_aConnName = rConnName; - + if ( m_aConnName.Len() ) SetCardinality(); } @@ -178,13 +178,13 @@ void ORelationTableConnectionData::SetCardinality() BOOL ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const { // check if Table has the primary key column dependig on _eEConnectionSide - USHORT nPrimKeysCount = 0, - nValidLinesCount = 0; + USHORT nPrimKeysCount = 0, + nValidLinesCount = 0; const Reference< XNameAccess> xKeyColumns = dbtools::getPrimaryKeyColumns_throw(i_xTable); if ( xKeyColumns.is() ) { Sequence< ::rtl::OUString> aKeyColumns = xKeyColumns->getElementNames(); - const ::rtl::OUString* pKeyIter = aKeyColumns.getConstArray(); + const ::rtl::OUString* pKeyIter = aKeyColumns.getConstArray(); const ::rtl::OUString* pKeyEnd = pKeyIter + aKeyColumns.getLength(); for(;pKeyIter != pKeyEnd;++pKeyIter) @@ -260,14 +260,14 @@ namespace dbaui //------------------------------------------------------------------------- bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs) { - bool bEqual = (lhs.m_nUpdateRules == rhs.m_nUpdateRules) + bool bEqual = (lhs.m_nUpdateRules == rhs.m_nUpdateRules) && (lhs.m_nDeleteRules == rhs.m_nDeleteRules) && (lhs.m_nCardinality == rhs.m_nCardinality) && (lhs.getReferencingTable() == rhs.getReferencingTable()) && (lhs.getReferencedTable() == rhs.getReferencedTable()) && (lhs.m_aConnName == rhs.m_aConnName) && (lhs.m_vConnLineData.size() == rhs.m_vConnLineData.size()); - + if ( bEqual ) { std::vector< OConnectionLineDataRef >::const_iterator aIter = lhs.m_vConnLineData.begin(); @@ -297,7 +297,7 @@ BOOL ORelationTableConnectionData::Update() // reassign the keys because the orientaion could be changed Reference<XPropertySet> xTableProp(getReferencingTable()->getTable()); Reference< XIndexAccess> xKeys ( getReferencingTable()->getKeys()); - + if ( !xKeys.is() ) return FALSE; //////////////////////////////////////////////////////////// @@ -348,7 +348,7 @@ BOOL ORelationTableConnectionData::Update() } } } - + if ( xColumns->hasElements() ) xAppend->appendByDescriptor(xKey); } @@ -384,14 +384,14 @@ xKey.clear(); for ( ; pIter != pEnd ; ++pIter ) { xColumn.set(xColumns->getByName(*pIter),UNO_QUERY_THROW); - xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; - xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn; + xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; + xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn; OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin(); OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end(); for(;aIter != aEnd;++aIter) { - if( (*aIter)->GetSourceFieldName() == sName + if( (*aIter)->GetSourceFieldName() == sName && (*aIter)->GetDestFieldName() == sRelatedColumn ) { break; @@ -411,8 +411,8 @@ xKey.clear(); } } catch(Exception&) - { - } + { + } } } xKey.clear(); @@ -424,7 +424,7 @@ xKey.clear(); ::dbtools::throwGenericSQLException(sError,NULL); } -// OSL_ENSURE(xKey.is(),"No key found have insertion!"); +// OSL_ENSURE(xKey.is(),"No key found have insertion!"); // The fields the relation marks may not be the same as our LineDatas mark after the relation has been updated if ( xColSup.is() ) @@ -446,8 +446,8 @@ xKey.clear(); { OConnectionLineDataRef pNewData = CreateLineDataObj(); - xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; - xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn; + xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; + xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn; pNewData->SetSourceFieldName(sName); pNewData->SetDestFieldName(sRelatedColumn); diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index 12c7b51e5b42..e1b11aa9af61 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,14 +35,14 @@ namespace dbaui class ORelationTableWindow : public OTableWindow { public: - ORelationTableWindow( Window* pParent,const TTableWindowData::value_type& pTabWinData) + ORelationTableWindow( Window* pParent,const TTableWindowData::value_type& pTabWinData) : OTableWindow(pParent, pTabWinData) {} - + /** returns the name which should be used when displaying join or relations @return The composed name or the window name. */ - virtual ::rtl::OUString GetName() const { return GetComposedName(); } + virtual ::rtl::OUString GetName() const { return GetComposedName(); } }; } #endif //DBAUI_RELTABLEWINDOW_HXX diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 43400cb2c6a9..bd4269f413af 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <sfx2/sfxsids.hrc> #include "dbu_rel.hrc" #include <vcl/svapp.hxx> -#include "browserids.hxx" +#include "browserids.hxx" #include <comphelper/types.hxx> #include "dbustrings.hrc" #include <connectivity/dbtools.hxx> @@ -96,8 +96,8 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::util; -// using namespace ::com::sun::star::sdbcx; -// using namespace ::connectivity; +// using namespace ::com::sun::star::sdbcx; +// using namespace ::connectivity; using namespace ::dbtools; using namespace ::dbaui; using namespace ::comphelper; @@ -133,7 +133,7 @@ Reference< XInterface > SAL_CALL ORelationController::Create(const Reference<XMu } DBG_NAME(ORelationController); // ----------------------------------------------------------------------------- -ORelationController::ORelationController(const Reference< XMultiServiceFactory >& _rM) +ORelationController::ORelationController(const Reference< XMultiServiceFactory >& _rM) : OJoinController(_rM) ,m_nThreadEvent(0) ,m_bRelationsPossible(sal_True) @@ -182,7 +182,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue else { // now we save the layout information - // create the output stream + // create the output stream try { if ( haveDataSource() && getDataSource()->getPropertySetInfo()->hasPropertyByName(PROPERTY_LAYOUTINFORMATION) ) @@ -218,7 +218,7 @@ void ORelationController::impl_initialize() {// check if this database supports relations setEditable(sal_False); - m_bRelationsPossible = sal_False; + m_bRelationsPossible = sal_False; { String sTitle(ModuleRes(STR_RELATIONDESIGN)); sTitle.Erase(0,3); @@ -251,7 +251,7 @@ void ORelationController::impl_initialize() { DBG_UNHANDLED_EXCEPTION(); } - + } // ----------------------------------------------------------------------------- ::rtl::OUString ORelationController::getPrivateTitle( ) const @@ -295,17 +295,17 @@ namespace const Sequence< ::rtl::OUString> m_aTableList; ORelationController* m_pParent; const Reference< XDatabaseMetaData> m_xMetaData; - const Reference< XNameAccess > m_xTables; + const Reference< XNameAccess > m_xTables; const sal_Int32 m_nStartIndex; const sal_Int32 m_nEndIndex; - + public: RelationLoader(ORelationController* _pParent ,const Reference< XDatabaseMetaData>& _xMetaData ,const Reference< XNameAccess >& _xTables ,const Sequence< ::rtl::OUString>& _aTableList ,const sal_Int32 _nStartIndex - ,const sal_Int32 _nEndIndex) + ,const sal_Int32 _nEndIndex) :m_aTableData(_xMetaData.is() && _xMetaData->supportsMixedCaseQuotedIdentifiers()) ,m_aTableList(_aTableList) ,m_pParent(_pParent) @@ -320,8 +320,8 @@ namespace virtual void SAL_CALL run(); virtual void SAL_CALL onTerminated(); protected: - virtual ~RelationLoader(){} - + virtual ~RelationLoader(){} + void loadTableData(const Any& _aTable); }; @@ -333,8 +333,8 @@ namespace ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, *pIter, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); Any aCatalog; @@ -377,14 +377,14 @@ namespace TTableWindowData::value_type pReferencingTable = aFind->second; Reference<XIndexAccess> xKeys = pReferencingTable->getKeys(); const Reference<XKeysSupplier> xKeySup(xTableProp,UNO_QUERY); - + if ( !xKeys.is() && xKeySup.is() ) { xKeys = xKeySup->getKeys(); } - + if ( xKeys.is() ) - { + { Reference<XPropertySet> xKey; const sal_Int32 nCount = xKeys->getCount(); for(sal_Int32 i = 0 ; i < nCount ; ++i) @@ -423,10 +423,10 @@ namespace // insert columns const Reference<XColumnsSupplier> xColsSup(xKey,UNO_QUERY); OSL_ENSURE(xColsSup.is(),"Key is no XColumnsSupplier!"); - const Reference<XNameAccess> xColumns = xColsSup->getColumns(); - const Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const Reference<XNameAccess> xColumns = xColsSup->getColumns(); + const Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); ::rtl::OUString sColumnName,sRelatedName; for(sal_uInt16 j=0;pIter != pEnd;++pIter,++j) { @@ -434,18 +434,18 @@ namespace OSL_ENSURE(xPropSet.is(),"Invalid column found in KeyColumns!"); if ( xPropSet.is() ) { - xPropSet->getPropertyValue(PROPERTY_NAME) >>= sColumnName; - xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedName; + xPropSet->getPropertyValue(PROPERTY_NAME) >>= sColumnName; + xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedName; } pTabConnData->SetConnLine( j, sColumnName, sRelatedName ); } ////////////////////////////////////////////////////////////////////// // Update/Del-Flags setzen - sal_Int32 nUpdateRule = 0; - sal_Int32 nDeleteRule = 0; + sal_Int32 nUpdateRule = 0; + sal_Int32 nDeleteRule = 0; xKey->getPropertyValue(PROPERTY_UPDATERULE) >>= nUpdateRule; xKey->getPropertyValue(PROPERTY_DELETERULE) >>= nDeleteRule; - + pTabConnData->SetUpdateRules( nUpdateRule ); pTabConnData->SetDeleteRules( nDeleteRule ); @@ -493,11 +493,11 @@ IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ ) ::osl::MutexGuard aGuard( getMutex() ); try { - getView()->initialize(); // show the windows and fill with our informations + getView()->initialize(); // show the windows and fill with our informations getView()->Invalidate(INVALIDATE_NOERASE); - getUndoMgr()->Clear(); // clear all undo redo things - setModified(sal_False); // and we are not modified yet - + getUndoMgr()->Clear(); // clear all undo redo things + setModified(sal_False); // and we are not modified yet + if(m_vTableData.empty()) Execute(ID_BROWSER_ADDTABLE,Sequence<PropertyValue>()); } @@ -551,7 +551,7 @@ void ORelationController::loadData() catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); - } + } } // ----------------------------------------------------------------------------- TTableWindowData::value_type ORelationController::existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 4030abfb46a2..ea775a8b822e 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ ORelationDesignView::~ORelationDesignView() // ------------------------------------------------------------------------- void ORelationDesignView::Construct() { - m_pTableView = new ORelationTableView(m_pScrollWindow,this); + m_pTableView = new ORelationTableView(m_pScrollWindow,this); OJoinDesignView::Construct(); } // ----------------------------------------------------------------------------- @@ -79,7 +79,7 @@ void ORelationDesignView::initialize() m_pTableView->clearLayoutInformation(); m_pTableView->ReSync(); - OJoinDesignView::initialize(); + OJoinDesignView::initialize(); } // ----------------------------------------------------------------------------- long ORelationDesignView::PreNotify( NotifyEvent& rNEvt ) @@ -93,7 +93,7 @@ long ORelationDesignView::PreNotify( NotifyEvent& rNEvt ) nDone = 1L; } } - if(!nDone) + if(!nDone) nDone = OJoinDesignView::PreNotify(rNEvt); return nDone; } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index d608ee531d25..ed62b881b849 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pV , ::comphelper::OContainerListener(m_aMutex) ,m_pExistingConnection(NULL) ,m_bInRemove(false) - + { DBG_CTOR(ORelationTableView,NULL); SetHelpId(HID_CTL_RELATIONTAB); @@ -152,7 +152,7 @@ void ORelationTableView::ReSync() continue; } - (*GetTabWinMap())[pData->GetComposedName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe + (*GetTabWinMap())[pData->GetComposedName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe // wenn in den Daten keine Position oder Groesse steht -> Default if (!pData->HasPosition() && !pData->HasSize()) SetDefaultTabWinPosSize(pTabWin); @@ -176,12 +176,12 @@ void ORelationTableView::ReSync() bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) - { // nein -> Pech gehabt, die Connection faellt weg + { // nein -> Pech gehabt, die Connection faellt weg pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() ); continue; } } // if ( !arrInvalidTables.empty() ) - + addConnection( new ORelationTableConnection(this, *aConIter), sal_False ); // don't add the data again } @@ -218,7 +218,7 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const } // insert table connection into view - TTableConnectionData::value_type pTabConnData(new ORelationTableConnectionData(pSourceWin->GetData(), + TTableConnectionData::value_type pTabConnData(new ORelationTableConnectionData(pSourceWin->GetData(), pDestWin->GetData())); // die Namen der betroffenen Felder @@ -343,7 +343,7 @@ void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ////////////////////////////////////////////////////////////////// // Neue Datenstruktur in DocShell eintragen TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName )); - pNewTabWinData->ShowAll(FALSE); + pNewTabWinData->ShowAll(FALSE); ////////////////////////////////////////////////////////////////// // Neues Fenster in Fensterliste eintragen @@ -360,7 +360,7 @@ void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(pNewTabWin->GetAccessible())); } @@ -378,7 +378,7 @@ void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin ) { m_pView->getController().getUndoMgr()->Clear(); OJoinTableView::RemoveTabWin( pTabWin ); - + m_pView->getController().InvalidateFeature(SID_RELATION_ADD_RELATION); m_pView->getController().InvalidateFeature(ID_BROWSER_UNDO); m_pView->getController().InvalidateFeature(ID_BROWSER_REDO); @@ -389,14 +389,14 @@ void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin ) //{ // class OReleationAskDialog : public ButtonDialog // { -// FixedImage m_aInfoImage; -// FixedText m_aTitle; -// FixedText m_aMessage; +// FixedImage m_aInfoImage; +// FixedText m_aTitle; +// FixedText m_aMessage; // public: // OReleationDialog(Window* _pParent) : ButtonDialog(_pParent,WB_HORZ | WB_STDDIALOG) // ,m_aInfoImage(this) // ,m_aTitle(this,WB_WORDBREAK | WB_LEFT) -// ,m_aMessage(this,WB_WORDBREAK | WB_LEFT) +// ,m_aMessage(this,WB_WORDBREAK | WB_LEFT) // { // m_aMessage.SetText(ModuleRes(STR_QUERY_REL_EDIT_RELATION)); // m_aMessage.Show(); @@ -458,7 +458,7 @@ bool ORelationTableView::allowQueries() const // ----------------------------------------------------------------------------- void ORelationTableView::_elementInserted( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException) { - + } // ----------------------------------------------------------------------------- void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) @@ -472,7 +472,7 @@ void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEve { m_pView->getController().getUndoMgr()->Clear(); OJoinTableView::RemoveTabWin( pTableWindow ); - + m_pView->getController().InvalidateFeature(SID_RELATION_ADD_RELATION); m_pView->getController().InvalidateFeature(ID_BROWSER_UNDO); m_pView->getController().InvalidateFeature(ID_BROWSER_REDO); diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src index e3c555debd79..0a5f3e00f137 100644 --- a/dbaccess/source/ui/relationdesign/relation.src +++ b/dbaccess/source/ui/relationdesign/relation.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 22756f48a909..05384fdd44c7 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl() //------------------------------------------------------------------------------ //short OFieldDescGenWin::GetFormatCategory(OFieldDescription* pFieldDescr) //{ -// return m_pFieldControl->GetFormatCategory(pFieldDescr); +// return m_pFieldControl->GetFormatCategory(pFieldDescr); //} //------------------------------------------------------------------------------ void OFieldDescGenWin::SaveData( OFieldDescription* pFieldDescr ) diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index 87cbbe9fb928..366fd36fb666 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace dbaui ,public IClipboardTest { - OTableFieldControl *m_pFieldControl; + OTableFieldControl *m_pFieldControl; protected: virtual void Resize(); @@ -62,7 +62,7 @@ namespace dbaui #if OSL_DEBUG_LEVEL > 0 OTableEditorCtrl* GetEditorCtrl(); #endif - // short GetFormatCategory(OFieldDescription* pFieldDescr); + // short GetFormatCategory(OFieldDescription* pFieldDescr); // liefert zum am Feld eingestellten Format einen der CAT_xxx-Werte (CAT_NUMBER, CAT_DATE ...) String BoolStringPersistent(const String& rUIString) const; @@ -78,7 +78,7 @@ namespace dbaui virtual void cut(); virtual void paste(); - inline OTableFieldControl* getFieldControl() const { return m_pFieldControl; } + inline OTableFieldControl* getFieldControl() const { return m_pFieldControl; } }; } #endif // DBAUI_TABLEFIELDDESCGENPAGE_HXX diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 0f7ef63d5d94..f4cf44643ac7 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,10 +39,10 @@ #include "UITools.hxx" #include <com/sun/star/util/NumberFormat.hpp> -#define DEFAULT_VARCHAR_PRECSION 50 -#define DEFAULT_OTHER_PRECSION 16 -#define DEFAULT_NUMERIC_PRECSION 5 -#define DEFAULT_NUMERIC_SCALE 0 +#define DEFAULT_VARCHAR_PRECSION 50 +#define DEFAULT_OTHER_PRECSION 16 +#define DEFAULT_NUMERIC_PRECSION 5 +#define DEFAULT_NUMERIC_SCALE 0 using namespace dbaui; @@ -235,7 +235,7 @@ void OFieldDescription::FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bF nPrec = GetPrecision(); break; } - + if ( _pType->nPrecision ) SetPrecision(::std::min<sal_Int32>(nPrec ? nPrec : DEFAULT_NUMERIC_PRECSION,_pType->nPrecision)); if ( _pType->nMaximumScale ) @@ -487,7 +487,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetName() const +::rtl::OUString OFieldDescription::GetName() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_NAME) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_NAME)); @@ -495,7 +495,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sName; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetDescription() const +::rtl::OUString OFieldDescription::GetDescription() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_DESCRIPTION) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_DESCRIPTION)); @@ -503,7 +503,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sDescription; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetHelpText() const +::rtl::OUString OFieldDescription::GetHelpText() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_HELPTEXT) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_HELPTEXT)); @@ -511,7 +511,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sHelpText; } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Any OFieldDescription::GetControlDefault() const +::com::sun::star::uno::Any OFieldDescription::GetControlDefault() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_CONTROLDEFAULT) ) return m_xDest->getPropertyValue(PROPERTY_CONTROLDEFAULT); @@ -519,7 +519,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_aControlDefault; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetAutoIncrementValue() const +::rtl::OUString OFieldDescription::GetAutoIncrementValue() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_AUTOINCREMENTCREATION) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_AUTOINCREMENTCREATION)); @@ -527,7 +527,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sAutoIncrementValue; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetType() const +sal_Int32 OFieldDescription::GetType() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_TYPE) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_TYPE)); @@ -535,7 +535,7 @@ sal_Int32 OFieldDescription::GetType() const return m_pType.get() ? m_pType->nType : m_nType; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetTypeName() const +::rtl::OUString OFieldDescription::GetTypeName() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_TYPENAME) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_TYPENAME)); @@ -543,7 +543,7 @@ sal_Int32 OFieldDescription::GetType() const return m_pType.get() ? m_pType->aTypeName : m_sTypeName; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetPrecision() const +sal_Int32 OFieldDescription::GetPrecision() const { sal_Int32 nPrec = m_nPrecision; if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_PRECISION) ) @@ -563,11 +563,11 @@ sal_Int32 OFieldDescription::GetPrecision() const break; } // switch ( pTypeInfo->nType ) } - + return nPrec; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetScale() const +sal_Int32 OFieldDescription::GetScale() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_SCALE) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_SCALE)); @@ -575,7 +575,7 @@ sal_Int32 OFieldDescription::GetScale() const return m_nScale; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetIsNullable() const +sal_Int32 OFieldDescription::GetIsNullable() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISNULLABLE) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_ISNULLABLE)); @@ -583,7 +583,7 @@ sal_Int32 OFieldDescription::GetIsNullable() const return m_nIsNullable; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetFormatKey() const +sal_Int32 OFieldDescription::GetFormatKey() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_FORMATKEY) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_FORMATKEY)); @@ -591,7 +591,7 @@ sal_Int32 OFieldDescription::GetFormatKey() const return m_nFormatKey; } // ----------------------------------------------------------------------------- -SvxCellHorJustify OFieldDescription::GetHorJustify() const +SvxCellHorJustify OFieldDescription::GetHorJustify() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ALIGN) ) return ::dbaui::mapTextJustify(::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_ALIGN))); @@ -599,12 +599,12 @@ SvxCellHorJustify OFieldDescription::GetHorJustify() const return m_eHorJustify; } // ----------------------------------------------------------------------------- -TOTypeInfoSP OFieldDescription::getTypeInfo() const +TOTypeInfoSP OFieldDescription::getTypeInfo() const { return m_pType; } // ----------------------------------------------------------------------------- -TOTypeInfoSP OFieldDescription::getSpecialTypeInfo() const +TOTypeInfoSP OFieldDescription::getSpecialTypeInfo() const { TOTypeInfoSP pSpecialType( new OTypeInfo() ); *pSpecialType = *m_pType; @@ -613,7 +613,7 @@ TOTypeInfoSP OFieldDescription::getSpecialTypeInfo() const return pSpecialType; } // ----------------------------------------------------------------------------- -sal_Bool OFieldDescription::IsAutoIncrement() const +sal_Bool OFieldDescription::IsAutoIncrement() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISAUTOINCREMENT) ) return ::cppu::any2bool(m_xDest->getPropertyValue(PROPERTY_ISAUTOINCREMENT)); @@ -621,17 +621,17 @@ sal_Bool OFieldDescription::IsAutoIncrement() const return m_bIsAutoIncrement; } // ----------------------------------------------------------------------------- -sal_Bool OFieldDescription::IsPrimaryKey() const +sal_Bool OFieldDescription::IsPrimaryKey() const { return m_bIsPrimaryKey; } // ----------------------------------------------------------------------------- -sal_Bool OFieldDescription::IsCurrency() const +sal_Bool OFieldDescription::IsCurrency() const { return m_bIsCurrency; } // ----------------------------------------------------------------------------- -sal_Bool OFieldDescription::IsNullable() const +sal_Bool OFieldDescription::IsNullable() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISNULLABLE) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_ISNULLABLE)) == ::com::sun::star::sdbc::ColumnValue::NULLABLE; diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 06bd03125f51..86c5dc6cf035 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,29 +76,29 @@ namespace dbaui } //============================================================================== -// TYPEINIT1(OTableEditorCtrl, DBView); +// TYPEINIT1(OTableEditorCtrl, DBView); DBG_NAME(OTableEditorCtrl) //============================================================================== -#define HANDLE_ID 0 +#define HANDLE_ID 0 // default Spaltenbreiten -#define FIELDNAME_WIDTH 100 -#define FIELDTYPE_WIDTH 150 -#define FIELDDESCR_WIDTH 300 +#define FIELDNAME_WIDTH 100 +#define FIELDTYPE_WIDTH 150 +#define FIELDDESCR_WIDTH 300 // Maximale Eingabelaenge im Beschreibungsfeld -#define MAX_DESCR_LEN 256 +#define MAX_DESCR_LEN 256 -#define CONTROL_SPACING_X 18 // 6 -#define CONTROL_SPACING_Y 5 -#define CONTROL_HEIGHT 20 -#define CONTROL_WIDTH_1 140 // 100 -#define CONTROL_WIDTH_2 100 // 60 -#define CONTROL_WIDTH_3 250 -#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) +#define CONTROL_SPACING_X 18 // 6 +#define CONTROL_SPACING_Y 5 +#define CONTROL_HEIGHT 20 +#define CONTROL_WIDTH_1 140 // 100 +#define CONTROL_WIDTH_2 100 // 60 +#define CONTROL_WIDTH_3 250 +#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) //================================================================== @@ -242,13 +242,13 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead ) ////////////////////////////////////////////////////////////////////// // ::com::sun::star::beans::Property Controls disablen -// if (pDescrWin) -// pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly()); +// if (pDescrWin) +// pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly()); ////////////////////////////////////////////////////////////////////// // Cursor des Browsers anpassen BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | - BROWSER_HLINESFULL | BROWSER_VLINESFULL|BROWSER_AUTOSIZE_LASTCOL); + BROWSER_HLINESFULL | BROWSER_VLINESFULL|BROWSER_AUTOSIZE_LASTCOL); if( !bReadOnly ) nMode |= BROWSER_HIDECURSOR; SetMode(nMode); @@ -274,7 +274,7 @@ void OTableEditorCtrl::InitCellController() nMaxTextLen = ((xub_StrLen)xMetaData.is() ? static_cast<xub_StrLen>(xMetaData->getMaxColumnNameLength()) : 0); if( nMaxTextLen == 0 ) - nMaxTextLen = EDIT_NOLIMIT; + nMaxTextLen = EDIT_NOLIMIT; sExtraNameChars = xMetaData.is() ? xMetaData->getExtraNameCharacters() : ::rtl::OUString(); } @@ -402,8 +402,8 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, if (rDev.IsClipRegion()) rDev.SetClipRegion(); -// rDev.DrawText(rRect.TopLeft(), aText); -// rDev.SetClipRegion( ); +// rDev.DrawText(rRect.TopLeft(), aText); +// rDev.SetClipRegion( ); } //------------------------------------------------------------------------------ @@ -413,8 +413,8 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) ////////////////////////////////////////////////////////////////////// // Wenn EditorCtrl ReadOnly ist, darf nicht editiert werden Reference<XPropertySet> xTable = GetView()->getController().getTable(); - if (IsReadOnly() || ( xTable.is() && - xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && + if (IsReadOnly() || ( xTable.is() && + xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) return NULL; @@ -436,12 +436,12 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) case HELP_TEXT: if (pActFieldDescr && (pActFieldDescr->GetName().getLength() != 0)) return new EditCellController( pHelpTextCell ); - else + else return NULL; case COLUMN_DESCRIPTION: if (pActFieldDescr && (pActFieldDescr->GetName().getLength() != 0)) return new EditCellController( pDescrCell ); - else + else return NULL; default: return NULL; @@ -474,7 +474,7 @@ void OTableEditorCtrl::InitController(CellControllerRef&, long nRow, sal_uInt16 pTypeCell->Clear(); if( !pActFieldDescr ) break; - + const OTypeInfoMap* pTypeInfo = GetView()->getController().getTypeInfo(); OTypeInfoMap::const_iterator aIter = pTypeInfo->begin(); OTypeInfoMap::const_iterator aEnd = pTypeInfo->end(); @@ -660,7 +660,7 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId) pHelpTextCell->SetText(String()); pHelpTextCell->ClearModifyFlag(); } - else + else pActFieldDescr->SetHelpText( pHelpTextCell->GetText() ); break; } @@ -832,7 +832,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) GetUndoManager()->AddUndoAction(new OTableEditorTypeSelUndoAct(this, GetCurRow(), nColId, GetFieldDescr(GetCurRow())->getTypeInfo())); resetType(); } - + SaveData(nRow,nColId); // SaveData could create a undo action as well GetUndoManager()->LeaveListAction(); @@ -840,7 +840,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) CellControllerRef xController(Controller()); if(xController.Is()) xController->SetModified(); - + ////////////////////////////////////////////////////////////////////// // Das ModifyFlag setzen GetView()->getController().setModified( sal_True ); @@ -1011,7 +1011,7 @@ void OTableEditorCtrl::DeleteRows() ////////////////////////////////////////////////////////////////////// // Undo-Action erzeugen GetUndoManager()->AddUndoAction( new OTableEditorDelUndoAct(this) ); - + ////////////////////////////////////////////////////////////////////// // Alle markierten Zeilen loeschen @@ -1151,7 +1151,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s OFieldDescription* pFieldDescr = GetFieldDescr( nRow ); if( !pFieldDescr && nColId != FIELD_TYPE) return; - + String sValue; ////////////////////////////////////////////////////////////////////// // Einzelne Felder setzen @@ -1191,7 +1191,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s break; case FIELD_PROPERTY_NUMTYPE: - // pFieldDescr->SetNumType( _rNewData ); + // pFieldDescr->SetNumType( _rNewData ); OSL_ENSURE(sal_False, "OTableEditorCtrl::SetCellData: invalid column!"); break; @@ -1276,7 +1276,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) case FIELD_PROPERTY_NUMTYPE: OSL_ENSURE(sal_False, "OTableEditorCtrl::GetCellData: invalid column!"); - // return pFieldDescr->GetNumType(); + // return pFieldDescr->GetNumType(); case FIELD_PROPERTY_AUTOINC: sValue = pFieldDescr->IsAutoIncrement() ? strYes : strNo; @@ -1335,7 +1335,7 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow ) sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); - sal_Bool bIsCutAllowed = (GetView()->getController().isAddAllowed() && GetView()->getController().isDropAllowed()) || + sal_Bool bIsCutAllowed = (GetView()->getController().isAddAllowed() && GetView()->getController().isDropAllowed()) || GetView()->getController().isAlterAllowed(); if(bIsCutAllowed) @@ -1357,14 +1357,14 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow ) default: bIsCutAllowed = sal_False; break; - } + } } -// Reference<XPropertySet> xTable = GetView()->getController().getTable(); -// if( !IsCopyAllowed(nRow) || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) -// return sal_False; +// Reference<XPropertySet> xTable = GetView()->getController().getTable(); +// if( !IsCopyAllowed(nRow) || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) +// return sal_False; - // return bCutAllowed && IsDeleteAllowed( nRow ); + // return bCutAllowed && IsDeleteAllowed( nRow ); return bIsCutAllowed; } @@ -1400,7 +1400,7 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ ) bIsCopyAllowed = sal_True; } - + return bIsCopyAllowed; } @@ -1597,7 +1597,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) Point aMenuPos( rEvt.GetMousePosPixel() ); if (!rEvt.IsMouseEvent()) { - if ( 1 == GetSelectColumnCount() ) + if ( 1 == GetSelectColumnCount() ) { sal_uInt16 nSelId = GetColumnId( sal::static_int_cast< USHORT >( @@ -1606,7 +1606,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) aMenuPos = aColRect.TopCenter(); } - else if ( GetSelectRowCount() > 0 ) + else if ( GetSelectRowCount() > 0 ) { ::Rectangle aColRect( GetFieldRectPixel( FirstSelectedRow(), HANDLE_ID, sal_True ) ); @@ -1629,9 +1629,9 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) if ( HANDLE_ID != nColId ) { if ( nRow < 0 && nColId != BROWSER_INVALIDID ) - { // hit the header + { // hit the header if ( 3 != nColId ) - { // 3 would mean the last column, and this last column is auto-sized + { // 3 would mean the last column, and this last column is auto-sized if ( !IsColumnSelected( nColId ) ) SelectColumnId( nColId ); @@ -1724,16 +1724,16 @@ IMPL_LINK( OTableEditorCtrl, DelayedPaste, void*, /*EMPTYTAG*/ ) nPastePosition = GetSelectRowCount() ? FirstSelectedRow() : GetCurRow(); if (!IsInsertNewAllowed(nPastePosition)) - { // kein Einfuegen erlaubt, sondern nur anhaengen, also testen, ob hinter der PastePosition noch + { // kein Einfuegen erlaubt, sondern nur anhaengen, also testen, ob hinter der PastePosition noch // belegte Zeilen erscheinen - sal_Int32 nFreeFromPos; // ab da nur freie Zeilen + sal_Int32 nFreeFromPos; // ab da nur freie Zeilen ::std::vector< ::boost::shared_ptr<OTableRow> >::reverse_iterator aIter = m_pRowList->rbegin(); for(nFreeFromPos = m_pRowList->size(); aIter != m_pRowList->rend() && (!(*aIter) || !(*aIter)->GetActFieldDescr() || !(*aIter)->GetActFieldDescr()->GetName().getLength()); --nFreeFromPos, ++aIter) ; - if (nPastePosition < nFreeFromPos) // es gibt mindestens eine belegte hinter PastePosition -> ganz nach hinten + if (nPastePosition < nFreeFromPos) // es gibt mindestens eine belegte hinter PastePosition -> ganz nach hinten nPastePosition = nFreeFromPos; } @@ -1768,7 +1768,7 @@ IMPL_LINK( OTableEditorCtrl, DelayedInsNewRows, void*, /*EMPTYTAG*/ ) return 0; } // ----------------------------------------------------------------------------- -void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc, +void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc, MultiSelection& _rMultiSel, sal_Int32 _nPos, sal_Bool _bSet, @@ -1954,7 +1954,7 @@ long OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt ) else m_eChildFocus = ROW; } - + return OTableRowView::PreNotify(rNEvt); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 1d154ee5be0d..69d611c4ddad 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,25 +52,25 @@ namespace dbaui NONE }; - ::std::vector< ::boost::shared_ptr<OTableRow> > m_aUndoList; - ::std::vector< ::boost::shared_ptr<OTableRow> >* m_pRowList; - - OSQLNameEdit* pNameCell; - ::svt::ListBoxControl* pTypeCell; - Edit* pHelpTextCell; - Edit* pDescrCell; - OTableFieldDescWin* pDescrWin; // properties of one column + ::std::vector< ::boost::shared_ptr<OTableRow> > m_aUndoList; + ::std::vector< ::boost::shared_ptr<OTableRow> >* m_pRowList; + OSQLNameEdit* pNameCell; + ::svt::ListBoxControl* pTypeCell; + Edit* pHelpTextCell; + Edit* pDescrCell; + OTableFieldDescWin* pDescrWin; // properties of one column + ::boost::shared_ptr<OTableRow> pActRow; - ULONG nIndexEvent; - ULONG nCutEvent; - ULONG nPasteEvent; - ULONG nDeleteEvent; - ULONG nInsNewRowsEvent; - ULONG nInvalidateTypeEvent; - ULONG nEntryNotFoundEvent; - ChildFocusState m_eChildFocus; + ULONG nIndexEvent; + ULONG nCutEvent; + ULONG nPasteEvent; + ULONG nDeleteEvent; + ULONG nInsNewRowsEvent; + ULONG nInvalidateTypeEvent; + ULONG nEntryNotFoundEvent; + ChildFocusState m_eChildFocus; long nOldDataPos; @@ -81,7 +81,7 @@ namespace dbaui class ClipboardInvalidator { private: - AutoTimer m_aInvalidateTimer; + AutoTimer m_aInvalidateTimer; OTableEditorCtrl* m_pOwner; public: @@ -93,7 +93,7 @@ namespace dbaui }; friend class OTableEditorCtrl::ClipboardInvalidator; - ClipboardInvalidator m_aInvalidate; + ClipboardInvalidator m_aInvalidate; protected: virtual void Command( const CommandEvent& rEvt ); @@ -108,7 +108,7 @@ namespace dbaui virtual void InitController(::svt::CellControllerRef& rController, long nRow, USHORT nCol); virtual void CellModified(); - virtual BOOL SaveModified(); // wird aufgerufen vor einem Zellenwechsel + virtual BOOL SaveModified(); // wird aufgerufen vor einem Zellenwechsel // return FALSE, verhindert Zellenwechsel virtual void Undo(); virtual void Redo(); @@ -124,26 +124,26 @@ namespace dbaui virtual sal_Bool IsInsertNewAllowed( long nRow ); virtual sal_Bool IsDeleteAllowed( long nRow ); - void ClearModified(); + void ClearModified(); - void SetPrimaryKey( BOOL bSet ); - BOOL IsPrimaryKey(); + void SetPrimaryKey( BOOL bSet ); + BOOL IsPrimaryKey(); DECL_LINK(ControlPreNotifyHdl, NotifyEvent*); public: - // TYPEINFO(); + // TYPEINFO(); OTableEditorCtrl(Window* pParentWin); - virtual ~OTableEditorCtrl(); - virtual BOOL CursorMoving(long nNewRow, USHORT nNewCol); - virtual void UpdateAll(); + virtual ~OTableEditorCtrl(); + virtual BOOL CursorMoving(long nNewRow, USHORT nNewCol); + virtual void UpdateAll(); SfxUndoManager* GetUndoManager() const; + + void SetDescrWin( OTableFieldDescWin* pWin ){ pDescrWin = pWin; if (pDescrWin && pActRow) pDescrWin->DisplayData(pActRow->GetActFieldDescr()); } + BOOL SaveCurRow(); + void SwitchType( const TOTypeInfoSP& _pType ); - void SetDescrWin( OTableFieldDescWin* pWin ){ pDescrWin = pWin; if (pDescrWin && pActRow) pDescrWin->DisplayData(pActRow->GetActFieldDescr()); } - BOOL SaveCurRow(); - void SwitchType( const TOTypeInfoSP& _pType ); - - void DisplayData( long nRow, BOOL bGrabFocus = TRUE ); + void DisplayData( long nRow, BOOL bGrabFocus = TRUE ); // erzwingt das Anzeigen der genannten Zeile (selbst wenn es eigentlich schon die aktuelle ist) virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ); @@ -158,7 +158,7 @@ namespace dbaui ::boost::shared_ptr<OTableRow> GetActRow(){ return pActRow; } void CellModified( long nRow, sal_uInt16 nColId ); - void SetReadOnly( BOOL bRead=TRUE ); + void SetReadOnly( BOOL bRead=TRUE ); virtual void Init(); virtual void DeactivateCell(sal_Bool bUpdate = sal_True); @@ -170,7 +170,7 @@ namespace dbaui OFieldDescription* GetFieldDescr( long nRow ); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); // IClipboardTest virtual sal_Bool isCutAllowed() { return IsCutAllowed(); } @@ -194,16 +194,16 @@ namespace dbaui INT32 HasFieldName( const String& rFieldName ); String GenerateName( const String& rName ); BOOL SetDataPtr( long nRow ); - + BOOL SaveData(long nRow, USHORT nColumnId); /** AdjustFieldDescription set the needed values for the description - @param _pFieldDesc the field description where to set the values - @param _rMultiSel contains the postions which changed for undo/redo - @param _nPos the current position - @param _bSet should a key be set - @param _bPrimaryKey which value should the pkey have + @param _pFieldDesc the field description where to set the values + @param _rMultiSel contains the postions which changed for undo/redo + @param _nPos the current position + @param _bSet should a key be set + @param _bPrimaryKey which value should the pkey have */ - void AdjustFieldDescription( OFieldDescription* _pFieldDesc, + void AdjustFieldDescription( OFieldDescription* _pFieldDesc, MultiSelection& _rMultiSel, sal_Int32 _nPos, sal_Bool _bSet, diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 3336906c21aa..702d2c677b02 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include "TableRow.hxx" #include "TypeInfo.hxx" #include "UITools.hxx" -#include "browserids.hxx" +#include "browserids.hxx" #include "dbu_reghelper.hxx" #include "dbu_tbl.hrc" #include "dbustrings.hrc" @@ -110,7 +110,7 @@ using namespace ::dbaui; using namespace ::comphelper; // Anzahl Spalten beim Neuanlegen -#define NEWCOLS 128 +#define NEWCOLS 128 namespace { @@ -127,7 +127,7 @@ namespace //------------------------------------------------------------------------------ struct OTableRowCompare : public ::std::binary_function< ::boost::shared_ptr<OTableRow> , ::rtl::OUString, bool> { - bool operator() (const ::boost::shared_ptr<OTableRow> lhs, const ::rtl::OUString& rhs) const + bool operator() (const ::boost::shared_ptr<OTableRow> lhs, const ::rtl::OUString& rhs) const { OFieldDescription* pField = lhs->GetActFieldDescr(); return pField && pField->GetName() == rhs; @@ -245,7 +245,7 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = aIter != m_vRowList.end(); } break; - + case ID_BROWSER_CUT: aReturn.bEnabled = isEditable() && m_aCurrentFrame.isActive() && getView() && static_cast<OTableDesignView*>(getView())->isCutAllowed(); break; @@ -257,10 +257,10 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const break; case SID_INDEXDESIGN: aReturn.bEnabled = - ( ( ((!m_bNew && impl_isModified()) || impl_isModified()) - || Reference< XIndexesSupplier >(m_xTable, UNO_QUERY).is() + ( ( ((!m_bNew && impl_isModified()) || impl_isModified()) + || Reference< XIndexesSupplier >(m_xTable, UNO_QUERY).is() ) - && isConnected() + && isConnected() ); if ( aReturn.bEnabled ) { @@ -360,7 +360,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) m_sName = aDlg.getName(); sCatalog = aDlg.getCatalog(); - sSchema = aDlg.getSchema(); + sSchema = aDlg.getSchema(); } // did we get a name @@ -414,10 +414,10 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) assignTable(); if(!m_xTable.is()) // correct name and try again - { + { // it can be that someone inserted new data for us m_sName = ::dbtools::composeTableName( getConnection()->getMetaData(), xTable, ::dbtools::eInDataManipulation, false, false, false ); - assignTable(); + assignTable(); } // now check if our datasource has set a tablefilter and if append the new table name to it ::dbaui::appendToFilter(getConnection(),m_sName,getORB(),getView()); // we are not interessted in the return value @@ -436,17 +436,17 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) } reSyncRows(); } - catch(const SQLContext& e) - { - aInfo = SQLExceptionInfo(e); + catch(const SQLContext& e) + { + aInfo = SQLExceptionInfo(e); } catch(const SQLWarning& e) - { - aInfo = SQLExceptionInfo(e); + { + aInfo = SQLExceptionInfo(e); } catch(const SQLException& e) - { - aInfo = SQLExceptionInfo(e); + { + aInfo = SQLExceptionInfo(e); } catch(const ElementExistException& ) { @@ -475,7 +475,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) stopTableListening(); m_xTable = NULL; } - // reload(); // a error occured so we have to reload + // reload(); // a error occured so we have to reload } return ! (aInfo.isValid() || bError); } @@ -496,8 +496,8 @@ void OTableController::doEditIndexes() OSL_ENSURE(!m_bNew && !isModified(), "OTableController::doEditIndexes: what the hell did doSaveDoc do?"); } - Reference< XNameAccess > xIndexes; // will be the keys of the table - Sequence< ::rtl::OUString > aFieldNames; // will be the column names of the table + Reference< XNameAccess > xIndexes; // will be the keys of the table + Sequence< ::rtl::OUString > aFieldNames; // will be the column names of the table try { // get the keys @@ -555,10 +555,10 @@ void OTableController::impl_initialize() { DBG_UNHANDLED_EXCEPTION(); } - + try { - ::dbaui::fillTypeInfo(getConnection(),m_sTypeNames,m_aTypeInfo,m_aTypeInfoIndex); // fill the needed type information + ::dbaui::fillTypeInfo(getConnection(),m_sTypeNames,m_aTypeInfo,m_aTypeInfoIndex); // fill the needed type information } catch(const SQLException&) { @@ -567,10 +567,10 @@ void OTableController::impl_initialize() } try { - loadData(); // fill the column information form the table - getView()->initialize(); // show the windows and fill with our informations - getUndoMgr()->Clear(); // clear all undo redo things - setModified(sal_False); // and we are not modified yet + loadData(); // fill the column information form the table + getView()->initialize(); // show the windows and fill with our informations + getUndoMgr()->Clear(); // clear all undo redo things + setModified(sal_False); // and we are not modified yet } catch( const Exception& ) { @@ -582,8 +582,8 @@ sal_Bool OTableController::Construct(Window* pParent) { setView( * new OTableDesignView( pParent, getORB(), *this ) ); OTableController_BASE::Construct(pParent); -// m_pView->Construct(); -// m_pView->Show(); +// m_pView->Construct(); +// m_pView->Show(); return sal_True; } // ----------------------------------------------------------------------------- @@ -681,10 +681,10 @@ void OTableController::impl_onModifyChanged() void SAL_CALL OTableController::disposing( const EventObject& _rSource ) throw(RuntimeException) { if ( _rSource.Source == m_xTable ) - { // some deleted our table so we have a new one + { // some deleted our table so we have a new one stopTableListening(); - m_xTable = NULL; - m_bNew = sal_True; + m_xTable = NULL; + m_bNew = sal_True; setModified(sal_True); } else @@ -716,18 +716,18 @@ void OTableController::losingConnection( ) xComponent->removeEventListener(xEvtL); } stopTableListening(); - m_xTable = NULL; + m_xTable = NULL; assignTable(); if(!m_xTable.is()) { - m_bNew = sal_True; + m_bNew = sal_True; setModified(sal_True); } InvalidateAll(); } // ----------------------------------------------------------------------------- -TOTypeInfoSP OTableController::getTypeInfoByType(sal_Int32 _nDataType) const -{ +TOTypeInfoSP OTableController::getTypeInfoByType(sal_Int32 _nDataType) const +{ return queryTypeInfoByType(_nDataType,m_aTypeInfo); } // ----------------------------------------------------------------------------- @@ -754,7 +754,7 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_ OFieldDescription* pField = (*aIter)->GetActFieldDescr(); if ( !pField || (!_bNew && (*aIter)->IsReadOnly() && !_bKeyColumns) ) continue; - + Reference<XPropertySet> xColumn; if(pField->IsPrimaryKey() || !_bKeyColumns) xColumn = xColumnFactory->createDataDescriptor(); @@ -778,7 +778,7 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_ { OSL_ENSURE(sal_False, "OTableController::appendColumns: invalid field name!"); } - + } } } @@ -854,47 +854,47 @@ void OTableController::loadData() // Bei Drop darf keine Zeile editierbar sein. // Bei Add duerfen nur die leeren Zeilen editierbar sein. // Bei Add und Drop koennen alle Zeilen editiert werden. - // sal_Bool bReadOldRow = xMetaData->supportsAlterTableWithAddColumn() && xMetaData->supportsAlterTableWithDropColumn(); + // sal_Bool bReadOldRow = xMetaData->supportsAlterTableWithAddColumn() && xMetaData->supportsAlterTableWithDropColumn(); sal_Bool bIsAlterAllowed = isAlterAllowed(); Sequence< ::rtl::OUString> aColumns = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aColumns.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); + const ::rtl::OUString* pIter = aColumns.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xColumn; xColumns->getByName(*pIter) >>= xColumn; - sal_Int32 nType = 0; - sal_Int32 nScale = 0; - sal_Int32 nPrecision = 0; - sal_Int32 nNullable = 0; - sal_Int32 nFormatKey = 0; - sal_Int32 nAlign = 0; + sal_Int32 nType = 0; + sal_Int32 nScale = 0; + sal_Int32 nPrecision = 0; + sal_Int32 nNullable = 0; + sal_Int32 nFormatKey = 0; + sal_Int32 nAlign = 0; sal_Bool bIsAutoIncrement = false, bIsCurrency = false; ::rtl::OUString sName,sDescription,sTypeName,sHelpText; Any aControlDefault; // get the properties from the column - xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; - xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; - xColumn->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullable; - xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bIsAutoIncrement; - xColumn->getPropertyValue(PROPERTY_ISCURRENCY) >>= bIsCurrency; - xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; - xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; - xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; - xColumn->getPropertyValue(PROPERTY_DESCRIPTION) >>= sDescription; + xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; + xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; + xColumn->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullable; + xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bIsAutoIncrement; + xColumn->getPropertyValue(PROPERTY_ISCURRENCY) >>= bIsCurrency; + xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; + xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; + xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; + xColumn->getPropertyValue(PROPERTY_DESCRIPTION) >>= sDescription; if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_HELPTEXT)) - xColumn->getPropertyValue(PROPERTY_HELPTEXT) >>= sHelpText; - + xColumn->getPropertyValue(PROPERTY_HELPTEXT) >>= sHelpText; + if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_CONTROLDEFAULT)) aControlDefault = xColumn->getPropertyValue(PROPERTY_CONTROLDEFAULT); if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_FORMATKEY)) - xColumn->getPropertyValue(PROPERTY_FORMATKEY) >>= nFormatKey; + xColumn->getPropertyValue(PROPERTY_FORMATKEY) >>= nFormatKey; if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_ALIGN)) - xColumn->getPropertyValue(PROPERTY_ALIGN) >>= nAlign; + xColumn->getPropertyValue(PROPERTY_ALIGN) >>= nAlign; pTabEdRow.reset(new OTableRow()); pTabEdRow->SetReadOnly(!bIsAlterAllowed); @@ -912,7 +912,7 @@ void OTableController::loadData() { pActFieldDescr->SetName(sName); pActFieldDescr->SetFormatKey(nFormatKey); - // pActFieldDescr->SetPrimaryKey(pPrimary->GetValue()); + // pActFieldDescr->SetPrimaryKey(pPrimary->GetValue()); pActFieldDescr->SetDescription(sDescription); pActFieldDescr->SetHelpText(sHelpText); pActFieldDescr->SetAutoIncrement(bIsAutoIncrement); @@ -929,12 +929,12 @@ void OTableController::loadData() m_vRowList.push_back( pTabEdRow); } // fill the primary key information - Reference<XNameAccess> xKeyColumns = getKeyColumns(); + Reference<XNameAccess> xKeyColumns = getKeyColumns(); if(xKeyColumns.is()) { Sequence< ::rtl::OUString> aKeyColumns = xKeyColumns->getElementNames(); - const ::rtl::OUString* pKeyBegin = aKeyColumns.getConstArray(); - const ::rtl::OUString* pKeyEnd = pKeyBegin + aKeyColumns.getLength(); + const ::rtl::OUString* pKeyBegin = aKeyColumns.getConstArray(); + const ::rtl::OUString* pKeyEnd = pKeyBegin + aKeyColumns.getLength(); for(;pKeyBegin != pKeyEnd;++pKeyBegin) { @@ -951,7 +951,7 @@ void OTableController::loadData() } } } - + ////////////////////////////////////////////////////////////////////// // Leere Zeilen fuellen @@ -1053,11 +1053,11 @@ void OTableController::alterColumns() OSL_ENSURE(xColumns.is(),"No columns"); if ( !xColumns.is() ) return; - Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY); // can be null + Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY); // can be null sal_Int32 nColumnCount = xIdxColumns->getCount(); - Reference<XDrop> xDrop(xColumns,UNO_QUERY); // can be null - Reference<XAppend> xAppend(xColumns,UNO_QUERY); // can be null + Reference<XDrop> xDrop(xColumns,UNO_QUERY); // can be null + Reference<XAppend> xAppend(xColumns,UNO_QUERY); // can be null Reference<XDataDescriptorFactory> xColumnFactory(xColumns,UNO_QUERY); // can be null sal_Bool bReload = sal_False; // refresh the data @@ -1081,24 +1081,24 @@ void OTableController::alterColumns() aColumns[pField->GetName()] = sal_True; continue; } - + Reference<XPropertySet> xColumn; if ( xColumns->hasByName(pField->GetName()) ) { aColumns[pField->GetName()] = sal_True; xColumns->getByName(pField->GetName()) >>= xColumn; OSL_ENSURE(xColumn.is(),"Column is null!"); - + sal_Int32 nType=0,nPrecision=0,nScale=0,nNullable=0; sal_Bool bAutoIncrement = false; ::rtl::OUString sTypeName,sDescription; - xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; - xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; - xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; - xColumn->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullable; + xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; + xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; + xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; + xColumn->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullable; xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement; - xColumn->getPropertyValue(PROPERTY_DESCRIPTION) >>= sDescription; + xColumn->getPropertyValue(PROPERTY_DESCRIPTION) >>= sDescription; try { xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; } catch( const Exception& ) @@ -1110,15 +1110,15 @@ void OTableController::alterColumns() // Normally, sdbcx::Column objects are expected to have a TypeName property } - // xColumn->getPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(pField->IsCurrency())); + // xColumn->getPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(pField->IsCurrency())); // check if something changed - if((nType != pField->GetType() || + if((nType != pField->GetType() || sTypeName != pField->GetTypeName() || - (nPrecision != pField->GetPrecision() && nPrecision ) || - nScale != pField->GetScale() || - nNullable != pField->GetIsNullable() || - sDescription != pField->GetDescription() || - bAutoIncrement != pField->IsAutoIncrement())&& + (nPrecision != pField->GetPrecision() && nPrecision ) || + nScale != pField->GetScale() || + nNullable != pField->GetIsNullable() || + sDescription != pField->GetDescription() || + bAutoIncrement != pField->IsAutoIncrement())&& xColumnFactory.is()) { Reference<XPropertySet> xNewColumn; @@ -1167,8 +1167,8 @@ void OTableController::alterColumns() xColumns->getByName(pField->GetName()) >>= xColumn; bReload = sal_True; } - - + + } else if(xColumnFactory.is() && xAlter.is() && nPos < nColumnCount) { // we can't find the column so we could try it with the index before we drop and append a new column @@ -1179,7 +1179,7 @@ void OTableController::alterColumns() ::dbaui::setColumnProperties(xNewColumn,pField); xAlter->alterColumnByIndex(nPos,xNewColumn); if(xColumns->hasByName(pField->GetName())) - { // ask for the append by name + { // ask for the append by name aColumns[pField->GetName()] = sal_True; xColumns->getByName(pField->GetName()) >>= xColumn; if(xColumn.is()) @@ -1217,7 +1217,7 @@ void OTableController::alterColumns() } // for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos) // alter column settings aIter = m_vRowList.begin(); - + // first look for columns where something other than the name changed for(nPos = 0;aIter != aEnd;++aIter,++nPos) { @@ -1230,7 +1230,7 @@ void OTableController::alterColumns() aColumns[pField->GetName()] = sal_True; continue; } - + Reference<XPropertySet> xColumn; if ( xColumns->hasByName(pField->GetName()) ) { @@ -1238,7 +1238,7 @@ void OTableController::alterColumns() Reference<XPropertySetInfo> xInfo = xColumn->getPropertySetInfo(); if ( xInfo->hasPropertyByName(PROPERTY_HELPTEXT) ) xColumn->setPropertyValue(PROPERTY_HELPTEXT,makeAny(pField->GetHelpText())); - + if(xInfo->hasPropertyByName(PROPERTY_CONTROLDEFAULT)) xColumn->setPropertyValue(PROPERTY_CONTROLDEFAULT,pField->GetControlDefault()); if(xInfo->hasPropertyByName(PROPERTY_FORMATKEY)) @@ -1248,7 +1248,7 @@ void OTableController::alterColumns() } // if ( xColumns->hasByName(pField->GetName()) ) } // second drop all columns which could be found by name - Reference<XNameAccess> xKeyColumns = getKeyColumns(); + Reference<XNameAccess> xKeyColumns = getKeyColumns(); // now we have to look for the columns who could be deleted if ( xDrop.is() ) { @@ -1315,7 +1315,7 @@ void OTableController::alterColumns() ::dbaui::setColumnProperties(xColumn,pField); xAppend->appendByDescriptor(xColumn); if(xColumns->hasByName(pField->GetName())) - { // ask for the append by name + { // ask for the append by name aColumns[pField->GetName()] = sal_True; xColumns->getByName(pField->GetName()) >>= xColumn; if(xColumn.is()) @@ -1329,7 +1329,7 @@ void OTableController::alterColumns() } } - + // check if we have to do something with the primary key sal_Bool bNeedDropKey = sal_False; sal_Bool bNeedAppendKey = sal_False; @@ -1342,25 +1342,25 @@ void OTableController::alterColumns() OFieldDescription* pField = (*aIter)->GetActFieldDescr(); if ( !pField ) continue; - - if ( pField->IsPrimaryKey() - && !xKeyColumns->hasByName( pField->GetName() ) + + if ( pField->IsPrimaryKey() + && !xKeyColumns->hasByName( pField->GetName() ) ) - { // new primary key column inserted which isn't already in the columns selection + { // new primary key column inserted which isn't already in the columns selection bNeedDropKey = bNeedAppendKey = sal_True; break; } - else if ( !pField->IsPrimaryKey() - && xKeyColumns->hasByName( pField->GetName() ) + else if ( !pField->IsPrimaryKey() + && xKeyColumns->hasByName( pField->GetName() ) ) - { // found a column which currently is in the primary key, but is marked not to be anymore + { // found a column which currently is in the primary key, but is marked not to be anymore bNeedDropKey = bNeedAppendKey = sal_True; break; } } } else - { // no primary key available so we check if we should create one + { // no primary key available so we check if we should create one bNeedAppendKey = sal_True; } @@ -1406,17 +1406,17 @@ void OTableController::dropPrimaryKey() } } } - catch(const SQLContext& e) - { - aInfo = SQLExceptionInfo(e); + catch(const SQLContext& e) + { + aInfo = SQLExceptionInfo(e); } catch(const SQLWarning& e) - { - aInfo = SQLExceptionInfo(e); + { + aInfo = SQLExceptionInfo(e); } catch(const SQLException& e) - { - aInfo = SQLExceptionInfo(e); + { + aInfo = SQLExceptionInfo(e); } catch( const Exception& ) { @@ -1426,7 +1426,7 @@ void OTableController::dropPrimaryKey() showError(aInfo); } // ----------------------------------------------------------------------------- -void OTableController::assignTable() +void OTableController::assignTable() { ::rtl::OUString sComposedName; // get the table @@ -1440,7 +1440,7 @@ void OTableController::assignTable() OSL_ENSURE(xNameAccess.is(),"no nameaccess for the queries!"); Reference<XPropertySet> xProp; - if(xNameAccess->hasByName(m_sName) && ::cppu::extractInterface(xProp,xNameAccess->getByName(m_sName)) && xProp.is()) + if(xNameAccess->hasByName(m_sName) && ::cppu::extractInterface(xProp,xNameAccess->getByName(m_sName)) && xProp.is()) { m_xTable = xProp; startTableListening(); @@ -1456,7 +1456,7 @@ void OTableController::assignTable() // be notified when the table is in disposing InvalidateAll(); } - } + } } //updateTitle(); } @@ -1506,8 +1506,8 @@ sal_Bool OTableController::isAlterAllowed() const // ----------------------------------------------------------------------------- void OTableController::reSyncRows() { - sal_Bool bAlterAllowed = isAlterAllowed(); - sal_Bool bAddAllowed = isAddAllowed(); + sal_Bool bAlterAllowed = isAlterAllowed(); + sal_Bool bAddAllowed = isAddAllowed(); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end(); for(;aIter != aEnd;++aIter) @@ -1518,12 +1518,12 @@ void OTableController::reSyncRows() (*aIter)->SetReadOnly(!bAlterAllowed); else (*aIter)->SetReadOnly(!bAddAllowed); - + } - static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our informations + static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our informations - getUndoMgr()->Clear(); // clear all undo redo things - setModified(sal_False); // and we are not modified yet + getUndoMgr()->Clear(); // clear all undo redo things + setModified(sal_False); // and we are not modified yet } // ----------------------------------------------------------------------------- ::rtl::OUString OTableController::createUniqueName(const ::rtl::OUString& _rName) @@ -1551,7 +1551,7 @@ void OTableController::reSyncRows() { ::rtl::OUString sTitle; try - { + { // get the table if ( m_sName.getLength() && getConnection().is() ) { @@ -1576,10 +1576,10 @@ void OTableController::reSyncRows() // ----------------------------------------------------------------------------- void OTableController::reload() { - loadData(); // fill the column information form the table - static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our informations - getUndoMgr()->Clear(); // clear all undo redo things - setModified(sal_False); // and we are not modified yet + loadData(); // fill the column information form the table + static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our informations + getUndoMgr()->Clear(); // clear all undo redo things + setModified(sal_False); // and we are not modified yet static_cast<OTableDesignView*>(getView())->Invalidate(); } // ----------------------------------------------------------------------------- @@ -1602,7 +1602,7 @@ sal_Int32 OTableController::getFirstEmptyRowPosition() ::boost::shared_ptr<OTableRow> pTabEdRow(new OTableRow()); pTabEdRow->SetReadOnly(bReadRow); nRet = m_vRowList.size(); - m_vRowList.push_back( pTabEdRow); + m_vRowList.push_back( pTabEdRow); } return nRet; } diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 97de4f457d62..826f65c032b2 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,8 +75,8 @@ void OTableRowView::Init() { EditBrowseBox::Init(); -// SetMapMode( MapMode(MAP_TWIP) ); -// GetDataWindow().SetMapMode( GetMapMode() ); +// SetMapMode( MapMode(MAP_TWIP) ); +// GetDataWindow().SetMapMode( GetMapMode() ); Font aFont( GetDataWindow().GetFont() ); aFont.SetWeight( WEIGHT_NORMAL ); @@ -103,7 +103,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt ) { if (IsDeleteAllowed(0)) { - if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows + if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows !rEvt.GetKeyCode().IsShift() && !rEvt.GetKeyCode().IsMod1()) { diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 7279c1ec1fca..8b44d4e8fe13 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include "dbaccess_helpid.hrc" #include <memory> using namespace dbaui; -#define STANDARD_MARGIN 6 +#define STANDARD_MARGIN 6 //================================================================== // class OTableDesignHelpBar //================================================================== diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 66b5d8c621f3..e42d31b59595 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD ImplInitSettings( sal_True, sal_True, sal_True ); ////////////////////////////////////////////////////////////////////// // Childs erzeugen - m_pEditorCtrl = new OTableEditorCtrl( this); + m_pEditorCtrl = new OTableEditorCtrl( this); m_pFieldDescWin = new OTableFieldDescWin( this ); m_pFieldDescWin->SetHelpId(HID_TAB_DESIGN_DESCWIN); @@ -80,7 +80,7 @@ OTableBorderWindow::~OTableBorderWindow() { ////////////////////////////////////////////////////////////////////// // Childs zerstoeren - // ::dbaui::notifySystemWindow(this,m_pFieldDescWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); + // ::dbaui::notifySystemWindow(this,m_pFieldDescWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); m_pEditorCtrl->Hide(); m_pFieldDescWin->Hide(); @@ -103,9 +103,9 @@ void OTableBorderWindow::Resize() ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); - long nSplitPos = m_aHorzSplitter.GetSplitPosPixel(); + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); + long nSplitPos = m_aHorzSplitter.GetSplitPosPixel(); ////////////////////////////////////////////////////////////////////// // Verschiebebereich Splitter mittleres Drittel des Outputs @@ -124,7 +124,7 @@ void OTableBorderWindow::Resize() // Fenster setzen m_pEditorCtrl->SetPosSizePixel( Point(0, 0), Size(nOutputWidth , nSplitPos) ); - m_pFieldDescWin->SetPosSizePixel( Point(0, nSplitPos+nSplitterHeight), + m_pFieldDescWin->SetPosSizePixel( Point(0, nSplitPos+nSplitterHeight), Size(nOutputWidth, nOutputHeight-nSplitPos-nSplitterHeight) ); } //------------------------------------------------------------------------------ @@ -148,7 +148,7 @@ void OTableBorderWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, if ( IsControlFont() ) aFont.Merge( GetControlFont() ); SetPointFont( aFont ); -// Set/*Zoomed*/PointFont( aFont ); +// Set/*Zoomed*/PointFont( aFont ); } if ( bFont || bForeground ) @@ -213,7 +213,7 @@ OTableDesignView::OTableDesignView( Window* pParent, } m_pWin = new OTableBorderWindow(this); - m_pWin->Show(); + m_pWin->Show(); } //------------------------------------------------------------------------------ @@ -234,10 +234,10 @@ void OTableDesignView::initialize() GetEditorCtrl()->Init(); GetDescWin()->Init(); // first call after the editctrl has been set - + GetEditorCtrl()->Show(); GetDescWin()->Show(); - + GetEditorCtrl()->DisplayData(0); } //------------------------------------------------------------------------------ @@ -290,7 +290,7 @@ long OTableDesignView::PreNotify( NotifyEvent& rNEvt ) m_eChildFocus = NONE; break; } - + return bHandled ? 1L : ODataView::PreNotify(rNEvt); } // ----------------------------------------------------------------------------- @@ -302,7 +302,7 @@ IClipboardTest* OTableDesignView::getActiveChild() const case DESCRIPTION: pTest = GetDescWin(); break; - case EDITOR: + case EDITOR: pTest = GetEditorCtrl(); break; case NONE: @@ -332,21 +332,21 @@ sal_Bool OTableDesignView::isPasteAllowed() void OTableDesignView::copy() { IClipboardTest* pTest = getActiveChild(); - if ( pTest ) + if ( pTest ) pTest->copy(); } // ----------------------------------------------------------------------------- void OTableDesignView::cut() { IClipboardTest* pTest = getActiveChild(); - if ( pTest ) + if ( pTest ) pTest->cut(); } // ----------------------------------------------------------------------------- void OTableDesignView::paste() { IClipboardTest* pTest = getActiveChild(); - if ( pTest ) + if ( pTest ) pTest->paste(); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 14ef3955eebe..8c3492ef7699 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace dbaui; -OTableFieldControl::OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar) +OTableFieldControl::OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar) { } //------------------------------------------------------------------ @@ -122,7 +122,7 @@ void OTableFieldControl::SetModified(BOOL bModified) return xCon->getMetaData(); } // ----------------------------------------------------------------------------- -Reference< XNumberFormatter > OTableFieldControl::GetFormatter() const +Reference< XNumberFormatter > OTableFieldControl::GetFormatter() const { return GetCtrl()->GetView()->getController().getNumberFormatter(); } @@ -132,7 +132,7 @@ TOTypeInfoSP OTableFieldControl::getTypeInfo(sal_Int32 _nPos) return GetCtrl()->GetView()->getController().getTypeInfo(_nPos); } // ----------------------------------------------------------------------------- -const OTypeInfoMap* OTableFieldControl::getTypeInfo() const +const OTypeInfoMap* OTableFieldControl::getTypeInfo() const { return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController().getTypeInfo(); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index a45d2928889c..d34d77a5fa8b 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,22 +39,22 @@ namespace dbaui //================================================================== class OTableFieldControl : public OFieldDescControl { - OTableEditorCtrl* GetCtrl() const; + OTableEditorCtrl* GetCtrl() const; protected: - virtual void ActivateAggregate( EControlType eType ); - virtual void DeactivateAggregate( EControlType eType ); + virtual void ActivateAggregate( EControlType eType ); + virtual void DeactivateAggregate( EControlType eType ); // Sind von den abgeleiteten Klassen zu impl. - virtual void CellModified(long nRow, USHORT nColId ); - virtual BOOL IsReadOnly(); - virtual void SetModified(BOOL bModified); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; - - virtual ::com::sun::star::lang::Locale GetLocale() const; + virtual void CellModified(long nRow, USHORT nColId ); + virtual BOOL IsReadOnly(); + virtual void SetModified(BOOL bModified); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; + + virtual ::com::sun::star::lang::Locale GetLocale() const; - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); - virtual const OTypeInfoMap* getTypeInfo() const; - virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); + virtual const OTypeInfoMap* getTypeInfo() const; + virtual sal_Bool isAutoIncrementValueEnabled() const; + virtual ::rtl::OUString getAutoIncrementValue() const; public: OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index c6e810353794..d5dab9793443 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,21 +40,21 @@ #include "moduledbu.hxx" #include <memory> -#define STANDARD_MARGIN 6 -#define DETAILS_HEADER_HEIGHT 25 -#define CONTROL_SPACING_X 18 // 6 -#define CONTROL_SPACING_Y 5 -#define CONTROL_HEIGHT 20 -#define CONTROL_WIDTH_1 140 // 100 -#define CONTROL_WIDTH_2 100 // 60 -#define CONTROL_WIDTH_3 250 -#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) -#define DETAILS_OPT_PAGE_WIDTH (CONTROL_WIDTH_1 + CONTROL_SPACING_X + CONTROL_WIDTH_4 + 50) -#define DETAILS_OPT_PAGE_HEIGHT ((CONTROL_HEIGHT + CONTROL_SPACING_Y) * 5) -#define DETAILS_MIN_HELP_WIDTH 100 -#define DETAILS_OPT_HELP_WIDTH 200 -#define DETAILS_MIN_HELP_HEIGHT 50 -#define DETAILS_OPT_HELP_HEIGHT 100 +#define STANDARD_MARGIN 6 +#define DETAILS_HEADER_HEIGHT 25 +#define CONTROL_SPACING_X 18 // 6 +#define CONTROL_SPACING_Y 5 +#define CONTROL_HEIGHT 20 +#define CONTROL_WIDTH_1 140 // 100 +#define CONTROL_WIDTH_2 100 // 60 +#define CONTROL_WIDTH_3 250 +#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) +#define DETAILS_OPT_PAGE_WIDTH (CONTROL_WIDTH_1 + CONTROL_SPACING_X + CONTROL_WIDTH_4 + 50) +#define DETAILS_OPT_PAGE_HEIGHT ((CONTROL_HEIGHT + CONTROL_SPACING_Y) * 5) +#define DETAILS_MIN_HELP_WIDTH 100 +#define DETAILS_OPT_HELP_WIDTH 200 +#define DETAILS_MIN_HELP_HEIGHT 50 +#define DETAILS_OPT_HELP_HEIGHT 100 using namespace dbaui; @@ -69,7 +69,7 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent) DBG_CTOR(OTableFieldDescWin,NULL); ////////////////////////////////////////////////////////////////////// // Header - m_pHeader = new FixedText( this, WB_CENTER | WB_INFO ); // | WB_3DLOOK + m_pHeader = new FixedText( this, WB_CENTER | WB_INFO ); // | WB_3DLOOK m_pHeader->SetText( String(ModuleRes(STR_TAB_PROPERTIES)) ); m_pHeader->Show(); @@ -173,11 +173,11 @@ void OTableFieldDescWin::Resize() // passen beide nebeneinander (Rand + Page + Rand + Help) ? if (STANDARD_MARGIN + DETAILS_OPT_PAGE_WIDTH + STANDARD_MARGIN + DETAILS_MIN_HELP_WIDTH <= nOutputWidth) - { // ja -> dann ist die Frage, ob man der Hilfe ihre Optimal-Breite geben kann + { // ja -> dann ist die Frage, ob man der Hilfe ihre Optimal-Breite geben kann nHelpWidth = DETAILS_OPT_HELP_WIDTH; nPageWidth = nOutputWidth - nHelpWidth - STANDARD_MARGIN - STANDARD_MARGIN; if (nPageWidth < DETAILS_OPT_PAGE_WIDTH) - { // dann doch lieber die Hilfe von ihrer optimalen in Richtung auf die minimale Groesse + { // dann doch lieber die Hilfe von ihrer optimalen in Richtung auf die minimale Groesse long nTransfer = DETAILS_OPT_PAGE_WIDTH - nPageWidth; nPageWidth += nTransfer; nHelpWidth -= nTransfer; @@ -189,26 +189,26 @@ void OTableFieldDescWin::Resize() nPageHeight = nOutputHeight - STANDARD_MARGIN - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN; } else - { // nebeneinander geht nicht, also untereinander (Rand + Header + Page + Help) + { // nebeneinander geht nicht, also untereinander (Rand + Header + Page + Help) if (STANDARD_MARGIN + DETAILS_HEADER_HEIGHT + DETAILS_OPT_PAGE_HEIGHT + DETAILS_MIN_HELP_HEIGHT <= nOutputHeight) - { // es reicht zumindest, um beide untereinander (Page optimal, Help minimal) unterzubringen + { // es reicht zumindest, um beide untereinander (Page optimal, Help minimal) unterzubringen nHelpHeight = DETAILS_OPT_HELP_HEIGHT; nPageHeight = nOutputHeight - nHelpHeight - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN; if (nPageHeight < DETAILS_OPT_PAGE_HEIGHT) - { // wie oben : Page optimal, Hilfe soviel wie eben bleibt (das ist groesser/gleich ihrem Minimum) + { // wie oben : Page optimal, Hilfe soviel wie eben bleibt (das ist groesser/gleich ihrem Minimum) long nTransfer = DETAILS_OPT_PAGE_HEIGHT - nPageHeight; nPageHeight += nTransfer; nHelpHeight -= nTransfer; } nHelpY = nOutputHeight - nHelpHeight; // und ueber die ganze Breite - nHelpX = 0; // ohne Margin, da das HelpCtrl einen eigenen hat - nHelpWidth = nOutputWidth; // dito + nHelpX = 0; // ohne Margin, da das HelpCtrl einen eigenen hat + nHelpWidth = nOutputWidth; // dito nPageWidth = nOutputWidth - STANDARD_MARGIN - STANDARD_MARGIN; } else - { // dummerweise reicht es nicht mal, um Page optimal und Help minimal zu zeigen - nHelpX = nHelpY = nHelpWidth = nHelpHeight = 0; // -> kein Help-Fenster + { // dummerweise reicht es nicht mal, um Page optimal und Help minimal zu zeigen + nHelpX = nHelpY = nHelpWidth = nHelpHeight = 0; // -> kein Help-Fenster nPageWidth = nOutputWidth - STANDARD_MARGIN - STANDARD_MARGIN; nPageHeight = nOutputHeight - STANDARD_MARGIN - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN; } @@ -216,20 +216,20 @@ void OTableFieldDescWin::Resize() m_pHeader->SetPosSizePixel( Point(0, STANDARD_MARGIN), Size(nOutputWidth, 15) ); - getGenPage()->SetPosSizePixel(Point ( STANDARD_MARGIN, + getGenPage()->SetPosSizePixel(Point ( STANDARD_MARGIN, STANDARD_MARGIN + DETAILS_HEADER_HEIGHT ), - Size ( nPageWidth, + Size ( nPageWidth, nPageHeight ) ); if (nHelpHeight) { m_pHelpBar->Show(); - m_pHelpBar->SetPosSizePixel(Point ( nHelpX, + m_pHelpBar->SetPosSizePixel(Point ( nHelpX, nHelpY ), - Size ( nHelpWidth, + Size ( nHelpWidth, nHelpHeight ) ); @@ -249,7 +249,7 @@ IClipboardTest* OTableFieldDescWin::getActiveChild() const case DESCRIPTION: pTest = getGenPage(); break; - default: + default: pTest = getHelpBar(); break; } @@ -290,15 +290,15 @@ void OTableFieldDescWin::paste() } // ----------------------------------------------------------------------------- void OTableFieldDescWin::GetFocus() -{ +{ if ( getGenPage() ) - getGenPage()->GetFocus(); + getGenPage()->GetFocus(); } // ----------------------------------------------------------------------------- void OTableFieldDescWin::LoseFocus() -{ +{ if ( getGenPage() ) - getGenPage()->LoseFocus(); + getGenPage()->LoseFocus(); } // ----------------------------------------------------------------------------- long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) @@ -313,7 +313,7 @@ long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) m_eChildFocus = HELP; break; } - + return bHandled ? 1L : TabPage::PreNotify(rNEvt); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index aa2a05482211..0ecd0de11032 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,10 +51,10 @@ namespace dbaui NONE }; private: - OTableDesignHelpBar* m_pHelpBar; - OFieldDescGenWin* m_pGenPage; - FixedText* m_pHeader; - ChildFocusState m_eChildFocus; + OTableDesignHelpBar* m_pHelpBar; + OFieldDescGenWin* m_pGenPage; + FixedText* m_pHeader; + ChildFocusState m_eChildFocus; IClipboardTest* getActiveChild() const; @@ -82,11 +82,11 @@ namespace dbaui String GetControlText( USHORT nControlId ) { return m_pGenPage->GetControlText(nControlId); } - // short GetFormatCategory(OFieldDescription* pFieldDescr) { return m_pGenPage ? m_pGenPage->GetFormatCategory(pFieldDescr) : -1; } + // short GetFormatCategory(OFieldDescription* pFieldDescr) { return m_pGenPage ? m_pGenPage->GetFormatCategory(pFieldDescr) : -1; } // liefert zum am Feld eingestellten Format einen der CAT_xxx-Werte (CAT_NUMBER, CAT_DATE ...) - String BoolStringPersistent(const String& rUIString) const { return m_pGenPage->BoolStringPersistent(rUIString); } - String BoolStringUI(const String& rPersistentString) const { return m_pGenPage->BoolStringUI(rPersistentString); } + String BoolStringPersistent(const String& rUIString) const { return m_pGenPage->BoolStringPersistent(rUIString); } + String BoolStringUI(const String& rPersistentString) const { return m_pGenPage->BoolStringUI(rPersistentString); } // IClipboardTest virtual sal_Bool isCutAllowed(); @@ -99,7 +99,7 @@ namespace dbaui virtual void paste(); inline OFieldDescGenWin* getGenPage() const { return m_pGenPage; } - inline OTableDesignHelpBar* getHelpBar() const { return m_pHelpBar; } + inline OTableDesignHelpBar* getHelpBar() const { return m_pHelpBar; } }; } diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 84c5f293a125..568e7c39f94e 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,14 +44,14 @@ using namespace ::com::sun::star::beans; //======================================================================== DBG_NAME(OTableRow) //------------------------------------------------------------------------------ -OTableRow::OTableRow() +OTableRow::OTableRow() :m_pActFieldDescr( NULL ) ,m_nPos( -1 ) ,m_bReadOnly( false ) ,m_bOwnsDescriptions(false) { DBG_CTOR(OTableRow,NULL); -} +} //------------------------------------------------------------------------------ OTableRow::OTableRow(const Reference< XPropertySet >& xAffectedCol) :m_pActFieldDescr( NULL ) @@ -84,7 +84,7 @@ OTableRow::~OTableRow() { DBG_DTOR(OTableRow,NULL); if(m_bOwnsDescriptions) - delete m_pActFieldDescr; + delete m_pActFieldDescr; } //------------------------------------------------------------------------------ @@ -140,7 +140,7 @@ namespace dbaui _rStr << sal_Int32(1); _rStr << nValue; } - else + else { _rStr << sal_Int32(2); _rStr.WriteByteString(::comphelper::getString(aValue)); @@ -168,13 +168,13 @@ namespace dbaui sal_Int32 nValue = 0; _rStr >> nValue; if ( nValue ) - { + { OFieldDescription* pFieldDesc = new OFieldDescription(); _rRow.m_pActFieldDescr = pFieldDesc; String sValue; _rStr.ReadByteString(sValue); pFieldDesc->SetName(sValue); - + _rStr.ReadByteString(sValue); pFieldDesc->SetDescription(sValue); _rStr.ReadByteString(sValue); @@ -199,7 +199,7 @@ namespace dbaui pFieldDesc->SetControlDefault(aControlDefault); - + _rStr >> nValue; pFieldDesc->SetTypeValue(nValue); diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index 516fcaf0fac4..6eabff95fc9e 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index 5d7e1da08c81..98bb3157a3df 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -241,7 +241,7 @@ OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) : OTableEditorDelUndoAct::~OTableEditorDelUndoAct() { DBG_DTOR(OTableEditorDelUndoAct,NULL); - m_aDeletedRows.clear(); + m_aDeletedRows.clear(); } //------------------------------------------------------------------------- @@ -252,7 +252,7 @@ void OTableEditorDelUndoAct::Undo() ULONG nPos; ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end(); - + ::boost::shared_ptr<OTableRow> pNewOrigRow; ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); @@ -294,9 +294,9 @@ void OTableEditorDelUndoAct::Redo() // class OTableEditorInsUndoAct //============================================================================== DBG_NAME(OTableEditorInsUndoAct); -OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, +OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition , - const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows) + const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows) :OTableEditorUndoAct( pOwner,STR_TABED_UNDO_ROWINSERTED ) ,m_vInsertedRows(_vInsertedRows) ,m_nInsPos( nInsertPosition ) @@ -308,7 +308,7 @@ OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, OTableEditorInsUndoAct::~OTableEditorInsUndoAct() { DBG_DTOR(OTableEditorInsUndoAct,NULL); - m_vInsertedRows.clear(); + m_vInsertedRows.clear(); } //------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index ff744b2f0d57..5f096d87ae92 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ namespace dbaui protected: OTableRowView* m_pTabDgnCtrl; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableDesignUndoAct( OTableRowView* pOwner ,USHORT nCommentID); @@ -72,13 +72,13 @@ namespace dbaui class OTableDesignCellUndoAct : public OTableDesignUndoAct { protected: - USHORT m_nCol; - long m_nRow; - ::com::sun::star::uno::Any m_sOldText; - ::com::sun::star::uno::Any m_sNewText; + USHORT m_nCol; + long m_nRow; + ::com::sun::star::uno::Any m_sOldText; + ::com::sun::star::uno::Any m_sNewText; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, USHORT nColumn ); @@ -90,13 +90,13 @@ namespace dbaui class OTableEditorTypeSelUndoAct : public OTableEditorUndoAct { protected: - USHORT m_nCol; - long m_nRow; - TOTypeInfoSP m_pOldType; - TOTypeInfoSP m_pNewType; + USHORT m_nCol; + long m_nRow; + TOTypeInfoSP m_pOldType; + TOTypeInfoSP m_pNewType; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, USHORT nColumn, const TOTypeInfoSP& _pOldType ); @@ -107,10 +107,10 @@ namespace dbaui class OTableEditorDelUndoAct : public OTableEditorUndoAct { protected: - ::std::vector< ::boost::shared_ptr<OTableRow> > m_aDeletedRows; + ::std::vector< ::boost::shared_ptr<OTableRow> > m_aDeletedRows; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableEditorDelUndoAct( OTableEditorCtrl* pOwner ); @@ -121,14 +121,14 @@ namespace dbaui class OTableEditorInsUndoAct : public OTableEditorUndoAct { protected: - ::std::vector< ::boost::shared_ptr<OTableRow> > m_vInsertedRows; - long m_nInsPos; + ::std::vector< ::boost::shared_ptr<OTableRow> > m_vInsertedRows; + long m_nInsPos; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); - OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, + OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows); virtual ~OTableEditorInsUndoAct(); @@ -141,8 +141,8 @@ namespace dbaui long m_nInsPos; long m_nInsRows; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows ); @@ -153,13 +153,13 @@ namespace dbaui class OPrimKeyUndoAct : public OTableEditorUndoAct { protected: - MultiSelection m_aDelKeys, + MultiSelection m_aDelKeys, m_aInsKeys; - BOOL m_bActPrimKeySet; + BOOL m_bActPrimKeySet; OTableEditorCtrl* m_pEditorCtrl; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OPrimKeyUndoAct( OTableEditorCtrl* pOwner, MultiSelection aDeletedKeys, MultiSelection aInsertedKeys ); diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src index e2a73292ec8d..974dd5602d40 100644 --- a/dbaccess/source/ui/tabledesign/table.src +++ b/dbaccess/source/ui/tabledesign/table.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,12 +44,12 @@ #include "toolbox.hrc" #endif -#define MN_EDIT 20 -#define MN_VIEW 21 -#define MN_EXTRA 22 -#define MN_INDEX 23 -#define MN_WIN 30 -#define MN_HELP 31 +#define MN_EDIT 20 +#define MN_VIEW 21 +#define MN_EXTRA 22 +#define MN_INDEX 23 +#define MN_WIN 30 +#define MN_HELP 31 String STR_TABLEDESIGN_DBFIELDTYPES { diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx index d138782392da..3b7daaf065b1 100644 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,14 +116,14 @@ Reference<XPropertySetInfo> SAL_CALL OAdabasSettingsDialog::getPropertySetInfo( return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* OAdabasSettingsDialog::createDialog(Window* _pParent) +Dialog* OAdabasSettingsDialog::createDialog(Window* _pParent) { OAdabasStatPageDlg* pDlg = new OAdabasStatPageDlg(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx index f102ba02c39d..1a82443f43b0 100644 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ADABASSETTINGSDLG_HXX diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index ce30b85d57cc..ba04a306ddbf 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ namespace dbaui virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //========================================================================= @@ -144,14 +144,14 @@ namespace dbaui return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ - Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent) + Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent) { AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog() diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index c98e3ffa6d21..77a4c50e60db 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ OColumnControl::OColumnControl(const Reference<XMultiServiceFactory>& _rxFactory // ----------------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO2_STATIC(OColumnControl,SERVICE_CONTROLDEFAULT,"com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl") // ----------------------------------------------------------------------------- -::rtl::OUString OColumnControl::GetComponentServiceName() +::rtl::OUString OColumnControl::GetComponentServiceName() { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ColumnDescriptorControl")); } @@ -83,7 +83,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit UnoControlComponentInfos aComponentInfos(maComponentInfos); Reference< XGraphics > xGraphics( mxGraphics ); Reference< XView > xV(getPeer(), UNO_QUERY); - Reference< XWindow > xW(getPeer(), UNO_QUERY); + Reference< XWindow > xW(getPeer(), UNO_QUERY); aGuard.clear(); @@ -101,7 +101,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit pPeer->setColumn(xColumn); sal_Int32 nWidth = 50; xProp->getPropertyValue(PROPERTY_EDIT_WIDTH) >>= nWidth; - pPeer->setEditWidth(nWidth); + pPeer->setEditWidth(nWidth); } if (aComponentInfos.bVisible) @@ -136,7 +136,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit } } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 08ef5e8f5fe5..c2add8b72b5a 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,14 +33,14 @@ namespace dbaui { - class OColumnControl : public UnoControl + class OColumnControl : public UnoControl { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; public: OColumnControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); // UnoControl - virtual ::rtl::OUString GetComponentServiceName(); + virtual ::rtl::OUString GetComponentServiceName(); // XServiceInfo DECLARE_SERVICE_INFO_STATIC(); @@ -49,7 +49,7 @@ namespace dbaui virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent) throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_COLUMNCONTROL_HXX diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 6957f4c8e300..3700fc1c0897 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ OColumnControlModel::OColumnControlModel(const Reference<XMultiServiceFactory>& ,m_nWidth(50) { DBG_CTOR(OColumnControlModel,NULL); - registerProperties(); + registerProperties(); } // ----------------------------------------------------------------------------- OColumnControlModel::OColumnControlModel(const OColumnControlModel* _pSource,const Reference<XMultiServiceFactory>& _rxFactory) @@ -96,7 +96,7 @@ OColumnControlModel::~OColumnControlModel() { acquire(); dispose(); - } + } } // ----------------------------------------------------------------------------- void OColumnControlModel::registerProperties() @@ -105,8 +105,8 @@ void OColumnControlModel::registerProperties() &m_xConnection, ::getCppuType( &m_xConnection ) ); Any a; a <<= m_xColumn; -// registerMayBeVoidProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND| PropertyAttribute::MAYBEVOID, -// &a, ::getCppuType( &m_xColumn ) ); +// registerMayBeVoidProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND| PropertyAttribute::MAYBEVOID, +// &a, ::getCppuType( &m_xColumn ) ); registerProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND, &m_xColumn, ::getCppuType( &m_xColumn ) ); @@ -125,7 +125,7 @@ void OColumnControlModel::registerProperties() //------------------------------------------------------------------------------ Reference< XCloneable > SAL_CALL OColumnControlModel::createClone( ) throw (RuntimeException) { - return new OColumnControlModel( this, getORB() ); + return new OColumnControlModel( this, getORB() ); } //------------------------------------------------------------------------------ IMPLEMENT_TYPEPROVIDER2(OColumnControlModel,OColumnControlModel_BASE,comphelper::OPropertyContainer) @@ -134,7 +134,7 @@ IMPLEMENT_SERVICE_INFO2_STATIC(OColumnControlModel,"com.sun.star.comp.dbu.OColum IMPLEMENT_FORWARD_REFCOUNT( OColumnControlModel, OColumnControlModel_BASE ) //------------------------------------------------------------------------------ Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType ) throw (RuntimeException) -{ +{ return OColumnControlModel_BASE::queryInterface( _rType ); } // ----------------------------------------------------------------------------- @@ -164,7 +164,7 @@ void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStrea } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index 734933a35dc0..79ba39b0021d 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ namespace dbaui //================================================================== // OColumnControlModel //================================================================== -typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::awt::XControlModel - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::util::XCloneable - , ::com::sun::star::io::XPersistObject - > OColumnControlModel_BASE; - +typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::awt::XControlModel + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::util::XCloneable + , ::com::sun::star::io::XPersistObject + > OColumnControlModel_BASE; + class OColumnControlModel; class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper @@ -64,13 +64,13 @@ class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; // [properties] - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xColumn; - ::rtl::OUString m_sDefaultControl; - ::com::sun::star::uno::Any m_aTabStop; - sal_Bool m_bEnable; - sal_Int16 m_nBorder; - sal_Int32 m_nWidth; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xColumn; + ::rtl::OUString m_sDefaultControl; + ::com::sun::star::uno::Any m_aTabStop; + sal_Bool m_bEnable; + sal_Int16 m_nBorder; + sal_Int32 m_nWidth; // [properties] inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> getORB() const { return m_xORB; } @@ -108,7 +108,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_COLUMNMODEL_HXX diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index faf090402297..4212a8ef1e7d 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,20 +82,20 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) } if ( _xColumn.is() ) { - sal_Int32 nType = 0; - sal_Int32 nScale = 0; - sal_Int32 nPrecision = 0; + sal_Int32 nType = 0; + sal_Int32 nScale = 0; + sal_Int32 nPrecision = 0; sal_Bool bAutoIncrement = sal_False; ::rtl::OUString sTypeName; try { // get the properties from the column - _xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; - _xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; - _xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; - _xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; - _xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement; + _xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; + _xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; + _xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; + _xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; + _xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement; } catch(Exception) { @@ -159,7 +159,7 @@ Any OColumnPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( Run return aProp; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index e469e4997083..34473a1be915 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ namespace dbaui { //......................................................................... class OFieldDescription; - class OColumnPeer : public VCLXWindow + class OColumnPeer : public VCLXWindow { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; - OFieldDescription* m_pActFieldDescr; + OFieldDescription* m_pActFieldDescr; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xColumn; public: @@ -56,7 +56,7 @@ namespace dbaui virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif //DBAUI_COLUMNPEER_HXX diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index ef214bf1a8d0..fb94ea4fdbfa 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,14 +115,14 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo() thr return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) +Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) { ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index d34ed1b61c9b..8f7ea65ca1bc 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBTYPEWIZDLG_HXX diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 6d5a2fb5ecd9..4d0e6b1c1452 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ using namespace dbaui; namespace css = ::com::sun::star; - + extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup() { static OMultiInstanceAutoRegistration< ODBTypeWizDialogSetup > aAutoRegistration; @@ -130,7 +130,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo( return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent) +Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent) { return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(), m_aInitialSelection); } @@ -146,7 +146,7 @@ void ODBTypeWizDialogSetup::executedDialog(sal_Int16 _nExecutionResult) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index 2b91f9566992..3214b1ef34cb 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,12 +73,12 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); virtual void executedDialog(sal_Int16 _nExecutionResult); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBTYPEWIZDLG_HXX diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 4f0cc4d0196d..6ccc0100b6ec 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,14 +116,14 @@ Reference<XPropertySetInfo> SAL_CALL OTableFilterDialog::getPropertySetInfo() t return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* OTableFilterDialog::createDialog(Window* _pParent) +Dialog* OTableFilterDialog::createDialog(Window* _pParent) { OTableSubscriptionDialog* pDlg = new OTableSubscriptionDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 3168c4d98751..76ef653f3488 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_TABLEFILTERDLG_HXX diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index e30a06037b50..92d97a18d691 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,14 +116,14 @@ Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo() return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* OUserSettingsDialog::createDialog(Window* _pParent) +Dialog* OUserSettingsDialog::createDialog(Window* _pParent) { OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection,m_xActiveConnection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index e46d1505ac6c..18cd0b775ed4 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_USERSETTINGSDLG_HXX diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index fd751e807c40..baf429393fd2 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,9 +116,9 @@ Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetI return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) +Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) { - + ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory()); // the initial selection @@ -129,7 +129,7 @@ Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 3b0fc5d8c367..a7727997887b 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ADMINDLG_HXX diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index f816faf95777..45a7dba5a391 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,11 +53,11 @@ namespace dbaui { //......................................................................... -#define PROPERTY_ID_QUERYCOMPOSER 100 -#define PROPERTY_ID_ROWSET 101 +#define PROPERTY_ID_QUERYCOMPOSER 100 +#define PROPERTY_ID_ROWSET 101 - IMPLEMENT_CONSTASCII_USTRING( PROPERTY_QUERYCOMPOSER, "QueryComposer" ); - IMPLEMENT_CONSTASCII_USTRING( PROPERTY_ROWSET, "RowSet" ); + IMPLEMENT_CONSTASCII_USTRING( PROPERTY_QUERYCOMPOSER, "QueryComposer" ); + IMPLEMENT_CONSTASCII_USTRING( PROPERTY_ROWSET, "RowSet" ); using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -86,7 +86,7 @@ namespace dbaui //--------------------------------------------------------------------- ComposerDialog::~ComposerDialog() { - + DBG_DTOR(ComposerDialog,NULL); } @@ -97,7 +97,7 @@ namespace dbaui IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ComposerDialog ) //--------------------------------------------------------------------- - Dialog* ComposerDialog::createDialog(Window* _pParent) + Dialog* ComposerDialog::createDialog(Window* _pParent) { // obtain all the objects needed for the dialog Reference< XConnection > xConnection; @@ -204,7 +204,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index acc82ae93cf2..3439291739b2 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 65315cd0e738..083acbf6725a 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -202,7 +202,7 @@ namespace dbaui ~CopyTableWizard(); // OGenericUnoDialog overridables - virtual Dialog* createDialog( Window* _pParent ); + virtual Dialog* createDialog( Window* _pParent ); virtual void executedDialog( sal_Int16 _nExecutionResult ); private: @@ -286,7 +286,7 @@ namespace dbaui All errors are handled with the InteractionHandler associated with the data source, if there is one. Else, they will be silenced (but asserted in non-product builds). - + @param _rxDataSourceDescriptor the data access descriptor describing the data source whose connection should be obtained. Must not be <NULL/>. @@ -1249,7 +1249,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou // otherwise we don't get the correct value when only the 2nd source column was selected continue; } - + if ( bAutoIncrement && bInsertAutoIncrement ) { xStatementParams->setInt( 1, nRowCount ); @@ -1279,7 +1279,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou case DataType::DECIMAL: case DataType::NUMERIC: aTransfer.transferComplexValue( &XRow::getString, &XParameters::setString ); - break; + break; case DataType::BIGINT: aTransfer.transferValue( &XRow::getLong, &XParameters::setLong ); @@ -1307,7 +1307,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou case DataType::TIMESTAMP: aTransfer.transferComplexValue( &XRow::getTimestamp, &XParameters::setTimestamp ); break; - + case DataType::BOOLEAN: aTransfer.transferValue( &XRow::getBoolean, &XParameters::setBoolean ); break; @@ -1512,7 +1512,7 @@ void CopyTableWizard::impl_doCopy_nothrow() sSql.appendAscii(" ) ( "); sSql.append( m_pSourceObject->getSelectStatement()); sSql.appendAscii(" )"); - + return sSql.makeStringAndClear(); } //------------------------------------------------------------------------- @@ -1584,7 +1584,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) } //------------------------------------------------------------------------------ -Dialog* CopyTableWizard::createDialog( Window* _pParent ) +Dialog* CopyTableWizard::createDialog( Window* _pParent ) { OSL_PRECOND( isInitialized(), "CopyTableWizard::createDialog: not initialized!" ); // this should have been prevented in ::execute already diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src index fc6d00804607..c153b79d1a59 100644 --- a/dbaccess/source/ui/uno/copytablewizard.src +++ b/dbaccess/source/ui/uno/copytablewizard.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 390f339384f7..bb4bff9b6318 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -268,7 +268,7 @@ namespace dbaui // fragen, ob gespeichert werden soll nRet = ExecuteQuerySaveDocument(NULL,_rDocuRequest.Name); } - + if ( RET_CANCEL == nRet ) { if (-1 != nAbortPos) @@ -278,7 +278,7 @@ namespace dbaui else if ( RET_YES == nRet ) { sal_Int32 nDocuPos = getContinuation(SUPPLY_DOCUMENTSAVE, _rContinuations); - + if (-1 != nDocuPos) { Reference< XInteractionDocumentSave > xCallback(_rContinuations[nDocuPos], UNO_QUERY); @@ -383,7 +383,7 @@ namespace dbaui IMPLEMENT_SERVICE_INFO1_STATIC( LegacyInteractionHandler, "com.sun.star.comp.dbaccess.LegacyInteractionHandler", "com.sun.star.sdb.InteractionHandler" ); //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 09d6ef37ac11..9dcc520c82d6 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,9 +56,9 @@ namespace dbaui //========================================================================= //= BasicInteractionHandler //========================================================================= - typedef ::cppu::WeakImplHelper2 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::task::XInteractionHandler2 - > BasicInteractionHandler_Base; + typedef ::cppu::WeakImplHelper2 < ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::task::XInteractionHandler2 + > BasicInteractionHandler_Base; /** implements an <type scope="com.sun.star.task">XInteractionHandler</type> for database related interaction requests. <p/> @@ -95,17 +95,17 @@ namespace dbaui impl_handle_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_Request ); /// handle SQLExceptions (and derived classes) - void implHandle( + void implHandle( const ::dbtools::SQLExceptionInfo& _rSqlInfo, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); /// handle parameter requests - void implHandle( + void implHandle( const ::com::sun::star::sdb::ParametersRequest& _rParamRequest, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); /// handle document save requests - void implHandle( + void implHandle( const ::com::sun::star::sdb::DocumentSaveRequest& _rParamRequest, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); @@ -124,7 +124,7 @@ namespace dbaui SUPPLY_DOCUMENTSAVE }; /** check if a given continuation sequence contains a given continuation type<p/> - @return the index within <arg>_rContinuations</arg> of the first occurence of a continuation + @return the index within <arg>_rContinuations</arg> of the first occurence of a continuation of the requested type, -1 of no such continuation exists */ sal_Int32 getContinuation( @@ -180,7 +180,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_INTERACTION_HXX_ diff --git a/dbaccess/source/ui/uno/dbinteraction.src b/dbaccess/source/ui/uno/dbinteraction.src index 3d4c33d8a06d..67f72b20fed8 100644 --- a/dbaccess/source/ui/uno/dbinteraction.src +++ b/dbaccess/source/ui/uno/dbinteraction.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 23658530be71..83431b50efd7 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -193,7 +193,7 @@ namespace dbaui } //--------------------------------------------------------------------- - Dialog* OTextConnectionSettingsDialog::createDialog(Window* _pParent) + Dialog* OTextConnectionSettingsDialog::createDialog(Window* _pParent) { return new TextConnectionSettingsDialog( _pParent, *m_pDatasourceItems ); } @@ -217,7 +217,7 @@ namespace dbaui OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); } } - + //-------------------------------------------------------------------- sal_Bool SAL_CALL OTextConnectionSettingsDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw(IllegalArgumentException) { @@ -238,7 +238,7 @@ namespace dbaui return bModified; } - + //-------------------------------------------------------------------- void SAL_CALL OTextConnectionSettingsDialog::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 998b79a136ad..a40d38181328 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ DBG_NAME(ODirectSQLDialog) //--------------------------------------------------------------------- ODirectSQLDialog::~ODirectSQLDialog() { - + DBG_DTOR(ODirectSQLDialog,NULL); } @@ -88,12 +88,12 @@ DBG_NAME(ODirectSQLDialog) IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ODirectSQLDialog ) //--------------------------------------------------------------------- - Dialog* ODirectSQLDialog::createDialog(Window* _pParent) + Dialog* ODirectSQLDialog::createDialog(Window* _pParent) { // obtain all the objects needed for the dialog Reference< XConnection > xConnection = m_xActiveConnection; if ( !xConnection.is() ) - { + { try { // the connection the row set is working with @@ -132,7 +132,7 @@ DBG_NAME(ODirectSQLDialog) ODirectSQLDialog_BASE::implInitialize(_rValue); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 1f7dde873282..652c774b71b5 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ namespace dbaui //= ODirectSQLDialog //===================================================================== class ODirectSQLDialog; - typedef ::svt::OGenericUnoDialog ODirectSQLDialog_BASE; - typedef ::comphelper::OPropertyArrayUsageHelper< ODirectSQLDialog > ODirectSQLDialog_PBASE; + typedef ::svt::OGenericUnoDialog ODirectSQLDialog_BASE; + typedef ::comphelper::OPropertyArrayUsageHelper< ODirectSQLDialog > ODirectSQLDialog_PBASE; class ODirectSQLDialog :public ODirectSQLDialog_BASE @@ -69,12 +69,12 @@ namespace dbaui protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); virtual void implInitialize(const com::sun::star::uno::Any& _rValue); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_UNODIRECTSQL_HXX diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index c48a2e54a250..8ede6217e125 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ #include <vcl/svapp.hxx> // --- -#define THISREF() static_cast< XServiceInfo* >(this) +#define THISREF() static_cast< XServiceInfo* >(this) //......................................................................... namespace dbaui @@ -119,7 +119,7 @@ void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 1396cbcf6495..d7084a98b287 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -150,7 +150,7 @@ Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo() th } //------------------------------------------------------------------------------ -Dialog* OSQLMessageDialog::createDialog(Window* _pParent) +Dialog* OSQLMessageDialog::createDialog(Window* _pParent) { if ( m_aException.hasValue() ) return new OSQLMessageBox( _pParent, SQLExceptionInfo( m_aException ), WB_OK | WB_DEF_OK, m_sHelpURL ); @@ -160,7 +160,7 @@ Dialog* OSQLMessageDialog::createDialog(Window* _pParent) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |