diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
141 files changed, 3096 insertions, 3096 deletions
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_ |