diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:03:11 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:03:11 +0200 |
| commit | 3b74383b37a9504e632a4dfeb9929941c1febd87 (patch) | |
| tree | 960b32cda2755f988d0d34e568f1019ad2bce0d2 | |
| parent | aa20084bd041208841d5ad3ca50b1e963eb5986e (diff) | |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit a62bc9e4ff6f4ec47300a12ab30e4a6beea0ba85 (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:41 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit 8bce2b8399c917989cf9072c61947b9854c4d353
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:20 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit 7351e5dc8e24e51af5af5c17798f26e00626711c
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date: Sat Jan 15 05:39:40 2011 +0100
i#116187: report left/right page margin setting ignored on Unix 64 bit
(cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a)
reportdesign/source/ui/report/ReportController.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit aa3b692805e5581d6f770f5a59b3563423dd3f9d
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Fri Jan 14 11:24:43 2011 -0500
Remove the Registration... menu item which we don't want. (fdo#33112)
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit e97e6fd2a34584fbf1c974e6663f7e2b06a83d49
Author: Noel Power <noel.power@novell.com>
Date: Wed Jan 12 11:09:51 2011 +0000
fix for fdo#32742#
reportdesign/source/ui/inspection/metadata.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9673a66350edf8bdb3a9af74df7eb3ed0cd7042f
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit 8f7887da80732abf15538fe4efe8571ad32e8715
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:06 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: base_libreoffice-3.3.1.1
split repo tag: base_libreoffice-3.3.1.2
1017 files changed, 16174 insertions, 16175 deletions
diff --git a/dbaccess/inc/AsyncronousLink.hxx b/dbaccess/inc/AsyncronousLink.hxx index 93faab850163..36334a8684d3 100644 --- a/dbaccess/inc/AsyncronousLink.hxx +++ b/dbaccess/inc/AsyncronousLink.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace dbaui protected: ::osl::Mutex m_aEventSafety; ::osl::Mutex m_aDestructionSafety; - ULONG m_nEventId; + ULONG m_nEventId; public: /** constructs the object - @param _rHandler The link to be called asyncronously + @param _rHandler The link to be called asyncronously */ OAsyncronousLink( const Link& _rHandler ); virtual ~OAsyncronousLink(); diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index 962782ea5e18..81a358175c88 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,43 +52,43 @@ namespace dbaui { public: /** executes the given command without checking if it is allowed - @param _rCommand the URL of the command + @param _rCommand the URL of the command */ virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** executes the given command only when it is allowed - @param _rCommand + @param _rCommand the URL of the command */ virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** executes the given command without checking if it is allowed - @param _nCommandId - the id of the command URL + @param _nCommandId + the id of the command URL */ virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** executes the given command only when it is allowed - @param _nCommandId - the id of the command URL + @param _nCommandId + the id of the command URL */ virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** checks if the given Command is enabled - @param _nCommandId - the id of the command URL - - @return + @param _nCommandId + the id of the command URL + + @return <TRUE/> if the command is allowed, otherwise <FALSE/>. */ virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const = 0; /** checks if the given Command is enabled - @param _rCompleteCommandURL + @param _rCompleteCommandURL the URL of the command - - @return + + @return <TRUE/> if the command is allowed, otherwise <FALSE/>. */ virtual sal_Bool isCommandEnabled( const ::rtl::OUString& _rCompleteCommandURL ) const = 0; @@ -108,13 +108,13 @@ namespace dbaui registerCommandURL( const ::rtl::OUString& _rCompleteCommandURL ) = 0; /** notifyHiContrastChanged will be called when the hicontrast mode changed. - @param _bHiContrast + @param _bHiContrast <TRUE/> when in hicontrast mode. */ virtual void notifyHiContrastChanged() = 0; /** checks if the selected data source is read only - @return + @return <TRUE/> if read only, otherwise <FALSE/> */ virtual sal_Bool isDataSourceReadOnly() const = 0; diff --git a/dbaccess/inc/IEnvironment.hxx b/dbaccess/inc/IEnvironment.hxx index 64ad54844912..3033623e76c2 100644 --- a/dbaccess/inc/IEnvironment.hxx +++ b/dbaccess/inc/IEnvironment.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/inc/IReference.hxx b/dbaccess/inc/IReference.hxx index 01534f6063e0..bd2e45927bd1 100644 --- a/dbaccess/inc/IReference.hxx +++ b/dbaccess/inc/IReference.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,6 +41,6 @@ namespace dbaui }; } #endif // DBAUI_IREFERENCE_HXX - + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx index e95e40a0f4a1..49d41b74959e 100644 --- a/dbaccess/inc/ToolBoxHelper.hxx +++ b/dbaccess/inc/ToolBoxHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,41 +43,41 @@ namespace dbaui { class DBACCESS_DLLPUBLIC OToolBoxHelper { - sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode - sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps - ToolBox* m_pToolBox; // our toolbox (may be NULL) + sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode + sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps + ToolBox* m_pToolBox; // our toolbox (may be NULL) public: OToolBoxHelper(); virtual ~OToolBoxHelper(); /** will be called when the controls need to be resized. - @param _rDiff + @param _rDiff Contains the difference of the old and new toolbox size. */ virtual void resizeControls(const Size& _rDiff) = 0; /** will be called when the image list is needed. - @param _eSymbolsSize + @param _eSymbolsSize <svtools/imgdef.hxx> - @param _bHiContast + @param _bHiContast <TRUE/> when in high contrast mode. */ virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const = 0; /** only the member will be set, derived classes can overload this function and do what need to be done. - @param _pTB + @param _pTB The new ToolBox. @attention Must be called after a FreeResource() call. */ - virtual void setToolBox(ToolBox* _pTB); + virtual void setToolBox(ToolBox* _pTB); - inline ToolBox* getToolBox() const { return m_pToolBox; } + inline ToolBox* getToolBox() const { return m_pToolBox; } /** checks if the toolbox needs a new imagelist. */ void checkImageList(); - + inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; } protected: DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*); diff --git a/dbaccess/inc/controllerframe.hxx b/dbaccess/inc/controllerframe.hxx index 19daaebb3d69..7fb7bd7c3895 100644 --- a/dbaccess/inc/controllerframe.hxx +++ b/dbaccess/inc/controllerframe.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/inc/dataview.hxx b/dbaccess/inc/dataview.hxx index e3026f15ce56..ac3e56211426 100644 --- a/dbaccess/inc/dataview.hxx +++ b/dbaccess/inc/dataview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,19 +40,19 @@ class SvtMiscOptions; namespace dbaui { class IController; - class DBACCESS_DLLPUBLIC ODataView : public Window + class DBACCESS_DLLPUBLIC ODataView : public Window { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the service factory to work with + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the service factory to work with protected: - IController& m_rController; // the controller in where we resides in - FixedLine* m_pSeparator; // our separator above the toolbox (may be NULL) + IController& m_rController; // the controller in where we resides in + FixedLine* m_pSeparator; // our separator above the toolbox (may be NULL) ::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel; public: - ODataView( Window* pParent, + ODataView( Window* pParent, IController& _rController, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& , + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& , WinBits nStyle = 0 ); virtual ~ODataView(); @@ -71,8 +71,8 @@ namespace dbaui */ virtual void resizeControls(const Size& /*_rDiff*/) { Resize(); } - void enableSeparator( const sal_Bool _bEnable = sal_True ); - sal_Bool isSeparatorEnabled() const { return NULL != m_pSeparator; } + void enableSeparator( const sal_Bool _bEnable = sal_True ); + sal_Bool isSeparatorEnabled() const { return NULL != m_pSeparator; } ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xServiceFactory;} diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 22d1ceb11368..0dcf6d624a00 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,324 +29,324 @@ #define _DBA_DBACCESS_HELPID_HRC_ #ifndef _SOLAR_HRC -#include <svl/solar.hrc> // HID_DBACCESS_START +#include <svl/solar.hrc> // HID_DBACCESS_START #endif -#define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9) - -#define HID_DLG_FILTERCRIT (HID_DBACCESS_START + 15) -#define HID_DLG_ORDERCRIT (HID_DBACCESS_START + 16) - -#define HID_DATABROWSE_HEADER (HID_DBACCESS_START + 17) -#define HID_CTL_TABBROWSER (HID_DBACCESS_START + 18) -#define UID_DATABROWSE_DATAWINDOW (HID_DBACCESS_START + 19) -#define HID_CTL_TREEVIEW (HID_DBACCESS_START + 20) -#define UID_CTL_CONTENT (HID_DBACCESS_START + 21) -#define HID_TLB_TABBROWSER (HID_DBACCESS_START + 22) -#define HID_TLB_TREELISTBOX (HID_DBACCESS_START + 23) -#define HID_DSADMIN_DIALOG (HID_DBACCESS_START + 24) - - -#define HID_DSADMIN_TABCONTROL (HID_DBACCESS_START + 27) -#define HID_DSADMIN_PAGE_GENERAL (HID_DBACCESS_START + 28) -#define HID_DSADMIN_PAGE_DBASE (HID_DBACCESS_START + 29) -#define HID_DSADMIN_PAGE_JDBC (HID_DBACCESS_START + 30) -#define HID_DSADMIN_PAGE_ODBC (HID_DBACCESS_START + 31) -#define HID_DSADMIN_PAGE_ADABAS (HID_DBACCESS_START + 32) -#define HID_DSADMIN_PAGE_TEXT (HID_DBACCESS_START + 33) -#define HID_DSADMIN_TABLE_SUBSCRIPTION (HID_DBACCESS_START + 34) -#define HID_DSADMIN_DSACTIONS_NEWDS (HID_DBACCESS_START + 35) -#define HID_DSADMIN_DSACTIONS_DELETEDS (HID_DBACCESS_START + 36) -#define HID_DSADMIN_DSACTIONS_RESTOREDS (HID_DBACCESS_START + 37) -#define HID_DSADMIN_DSNAME (HID_DBACCESS_START + 38) -#define HID_DSADMIN_DSTYPE (HID_DBACCESS_START + 39) -#define HID_DSADMIN_URL_GENERAL (HID_DBACCESS_START + 40) -#define HID_DSADMIN_BROWSECONN (HID_DBACCESS_START + 41) -#define HID_DSADMIN_LOGINTIMEOUT_NUMBER (HID_DBACCESS_START + 42) -#define HID_DSADMIN_LOGINTIMEOUT_UNIT (HID_DBACCESS_START + 43) -#define HID_DSADMIN_SHOWDELETED (HID_DBACCESS_START + 44) -#define HID_DSADMIN_ALLOWLONG (HID_DBACCESS_START + 45) -#define HID_DSADMIN_DBASE_INDICIES (HID_DBACCESS_START + 46) -#define HID_DSADMIN_DRIVERCLASS (HID_DBACCESS_START + 47) -#define HID_DSADMIN_ODBC_OPTIONS (HID_DBACCESS_START + 48) -#define HID_DSADMIN_TEXT_HEADER (HID_DBACCESS_START + 49) -#define HID_DSADMIN_FIELD_SEPARATOR (HID_DBACCESS_START + 50) -#define HID_DSADMIN_TEXT_SEPARATOR (HID_DBACCESS_START + 51) -#define HID_DSADMIN_DECIMAL_SEPARATOR (HID_DBACCESS_START + 52) -#define HID_DSADMIN_THOUSANDS_SEPARATOR (HID_DBACCESS_START + 53) -#define HID_DSADMIN_EXTENSION (HID_DBACCESS_START + 54) -#define HID_DSADMIN_ALL_TABLES (HID_DBACCESS_START + 55) -#define HID_DSADMIN_NO_TABLES (HID_DBACCESS_START + 56) -#define HID_DSADMIN_SELECT_TABLES (HID_DBACCESS_START + 57) -#define HID_DSADMIN_TABLE_SELECTOR (HID_DBACCESS_START + 58) -#define HID_DSADMIN_SUPPRESS_VERSIONCL (HID_DBACCESS_START + 59) - -#define HID_GENERIC_SQL_ERROR (HID_DBACCESS_START + 60) - -#define HID_BROWSER_COLUMNFORMAT (HID_DBACCESS_START + 61) -#define HID_BROWSER_COLUMNWIDTH (HID_DBACCESS_START + 62) -#define HID_BROWSER_TABLEFORMAT (HID_DBACCESS_START + 63) -#define HID_BROWSER_ROWHEIGHT (HID_DBACCESS_START + 64) +#define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9) + +#define HID_DLG_FILTERCRIT (HID_DBACCESS_START + 15) +#define HID_DLG_ORDERCRIT (HID_DBACCESS_START + 16) + +#define HID_DATABROWSE_HEADER (HID_DBACCESS_START + 17) +#define HID_CTL_TABBROWSER (HID_DBACCESS_START + 18) +#define UID_DATABROWSE_DATAWINDOW (HID_DBACCESS_START + 19) +#define HID_CTL_TREEVIEW (HID_DBACCESS_START + 20) +#define UID_CTL_CONTENT (HID_DBACCESS_START + 21) +#define HID_TLB_TABBROWSER (HID_DBACCESS_START + 22) +#define HID_TLB_TREELISTBOX (HID_DBACCESS_START + 23) +#define HID_DSADMIN_DIALOG (HID_DBACCESS_START + 24) + + +#define HID_DSADMIN_TABCONTROL (HID_DBACCESS_START + 27) +#define HID_DSADMIN_PAGE_GENERAL (HID_DBACCESS_START + 28) +#define HID_DSADMIN_PAGE_DBASE (HID_DBACCESS_START + 29) +#define HID_DSADMIN_PAGE_JDBC (HID_DBACCESS_START + 30) +#define HID_DSADMIN_PAGE_ODBC (HID_DBACCESS_START + 31) +#define HID_DSADMIN_PAGE_ADABAS (HID_DBACCESS_START + 32) +#define HID_DSADMIN_PAGE_TEXT (HID_DBACCESS_START + 33) +#define HID_DSADMIN_TABLE_SUBSCRIPTION (HID_DBACCESS_START + 34) +#define HID_DSADMIN_DSACTIONS_NEWDS (HID_DBACCESS_START + 35) +#define HID_DSADMIN_DSACTIONS_DELETEDS (HID_DBACCESS_START + 36) +#define HID_DSADMIN_DSACTIONS_RESTOREDS (HID_DBACCESS_START + 37) +#define HID_DSADMIN_DSNAME (HID_DBACCESS_START + 38) +#define HID_DSADMIN_DSTYPE (HID_DBACCESS_START + 39) +#define HID_DSADMIN_URL_GENERAL (HID_DBACCESS_START + 40) +#define HID_DSADMIN_BROWSECONN (HID_DBACCESS_START + 41) +#define HID_DSADMIN_LOGINTIMEOUT_NUMBER (HID_DBACCESS_START + 42) +#define HID_DSADMIN_LOGINTIMEOUT_UNIT (HID_DBACCESS_START + 43) +#define HID_DSADMIN_SHOWDELETED (HID_DBACCESS_START + 44) +#define HID_DSADMIN_ALLOWLONG (HID_DBACCESS_START + 45) +#define HID_DSADMIN_DBASE_INDICIES (HID_DBACCESS_START + 46) +#define HID_DSADMIN_DRIVERCLASS (HID_DBACCESS_START + 47) +#define HID_DSADMIN_ODBC_OPTIONS (HID_DBACCESS_START + 48) +#define HID_DSADMIN_TEXT_HEADER (HID_DBACCESS_START + 49) +#define HID_DSADMIN_FIELD_SEPARATOR (HID_DBACCESS_START + 50) +#define HID_DSADMIN_TEXT_SEPARATOR (HID_DBACCESS_START + 51) +#define HID_DSADMIN_DECIMAL_SEPARATOR (HID_DBACCESS_START + 52) +#define HID_DSADMIN_THOUSANDS_SEPARATOR (HID_DBACCESS_START + 53) +#define HID_DSADMIN_EXTENSION (HID_DBACCESS_START + 54) +#define HID_DSADMIN_ALL_TABLES (HID_DBACCESS_START + 55) +#define HID_DSADMIN_NO_TABLES (HID_DBACCESS_START + 56) +#define HID_DSADMIN_SELECT_TABLES (HID_DBACCESS_START + 57) +#define HID_DSADMIN_TABLE_SELECTOR (HID_DBACCESS_START + 58) +#define HID_DSADMIN_SUPPRESS_VERSIONCL (HID_DBACCESS_START + 59) + +#define HID_GENERIC_SQL_ERROR (HID_DBACCESS_START + 60) + +#define HID_BROWSER_COLUMNFORMAT (HID_DBACCESS_START + 61) +#define HID_BROWSER_COLUMNWIDTH (HID_DBACCESS_START + 62) +#define HID_BROWSER_TABLEFORMAT (HID_DBACCESS_START + 63) +#define HID_BROWSER_ROWHEIGHT (HID_DBACCESS_START + 64) #define HID_BROWSER_EDIT_DATABASE (HID_DBACCESS_START + 65) -#define HID_BROWSER_CLOSECONN (HID_DBACCESS_START + 66) -#define HID_BROWSER_REFRESHCONN (HID_DBACCESS_START + 67) - -#define HID_DLG_ROWHEIGHT (HID_DBACCESS_START + 68) -#define HID_DLG_COLWIDTH (HID_DBACCESS_START + 69) - - -#define HID_TLB_QUERYDESIGN (HID_DBACCESS_START + 70) -#define HID_CTL_QRYSQLEDIT (HID_DBACCESS_START + 71) -#define HID_DSADMIN_SPECIAL_MESSAGE (HID_DBACCESS_START + 72) - -#define HID_BROWSER_QUERY_CREATE_TEXT (HID_DBACCESS_START + 73) - -#define HID_DLG_ERROR (HID_DBACCESS_START + 74) -#define HID_DLG_TEXT (HID_DBACCESS_START + 75) -#define UID_SQLERROR_BUTTONMORE (HID_DBACCESS_START + 76) -#define HID_DLG_SAVE_AS (HID_DBACCESS_START + 77) - -#define HID_BROWSER_QUERY_EDIT (HID_DBACCESS_START + 78) -#define HID_BROWSER_QUERY_DELETE (HID_DBACCESS_START + 79) - -#define HID_DSADMIN_USER_ADO (HID_DBACCESS_START + 80) -#define HID_DSADMIN_PWDREC_ADO (HID_DBACCESS_START + 81) -#define HID_DSADMIN_CONNURL_ADOPAGE (HID_DBACCESS_START + 82) -#define HID_DSADMIN_PAGE_ADO (HID_DBACCESS_START + 83) - - -#define HID_JOINSH_ADDTAB_CLOSE (HID_DBACCESS_START + 84) -#define HID_JOINSH_ADDTAB_TABLELIST (HID_DBACCESS_START + 85) -#define HID_CTL_QRYDGNTAB (HID_DBACCESS_START + 86) -#define HID_DLG_QRY_JOIN (HID_DBACCESS_START + 87) -#define HID_DLG_QRY_JOINTYPE (HID_DBACCESS_START + 88) -#define HID_JOINSH_ADDTAB_QUERYLIST (HID_DBACCESS_START + 89) -#define HID_DLG_QRY_HELPTEXT (HID_DBACCESS_START + 92) - -#define HID_CTL_QRYDGNCRIT (HID_DBACCESS_START + 93) -#define HID_QRYDGN_ROW_VISIBLE (HID_DBACCESS_START + 94) -#define HID_QRYDGN_ROW_TABLE (HID_DBACCESS_START + 95) -#define HID_QRYDGN_ROW_FIELD (HID_DBACCESS_START + 96) -#define HID_QRYDGN_ROW_ORDER (HID_DBACCESS_START + 97) -#define HID_QRYDGN_ROW_FUNCTION (HID_DBACCESS_START + 98) -#define HID_QRYDGN_ROW_ALIAS (HID_DBACCESS_START + 99) -#define HID_QRYDGN_ROW_CRIT (HID_DBACCESS_START + 100) - -#define HID_QUERY_FUNCTION (HID_DBACCESS_START + 101) -#define HID_QUERY_TABLENAME (HID_DBACCESS_START + 102) -#define HID_QUERY_ALIASNAME (HID_DBACCESS_START + 103) -#define HID_QUERY_DISTINCT (HID_DBACCESS_START + 104) - -#define HID_BROWSER_QUERY_CREATE_DESIGN (HID_DBACCESS_START + 105) - -#define HID_DSADMIN_QUERIES (HID_DBACCESS_START + 106) -#define HID_DSADMIN_QUERIES_NEW (HID_DBACCESS_START + 107) -#define HID_DSADMIN_QUERIES_EDIT (HID_DBACCESS_START + 108) -#define HID_DSADMIN_QUERIES_DELETE (HID_DBACCESS_START + 109) -#define HID_DSADMIN_QUERYADMINISTRATION (HID_DBACCESS_START + 110) - - -#define HID_TAB_DESIGN_TABLE_DESC (HID_DBACCESS_START + 111) -#define HID_TAB_DESIGN_FIELDCONTROL (HID_DBACCESS_START + 112) -#define HID_TABLE_DESIGN_HELP_WINDOW (HID_DBACCESS_START + 113) -#define HID_TAB_DESIGN_DESCWIN (HID_DBACCESS_START + 114) -#define HID_TAB_DESIGN_TABLE_PROPS (HID_DBACCESS_START + 115) -#define HID_TABDESIGN_BACKGROUND (HID_DBACCESS_START + 116) -#define HID_CTL_TABLEEDIT (HID_DBACCESS_START + 117) -#define HID_TABDESIGN_NAMECELL (HID_DBACCESS_START + 118) -#define HID_TABDESIGN_TYPECELL (HID_DBACCESS_START + 119) -#define HID_TABDESIGN_COMMENTCELL (HID_DBACCESS_START + 120) -#define SID_TABLEDESIGN_INSERTROWS (HID_DBACCESS_START + 121) -#define SID_TABLEDESIGN_TABED_PRIMARYKEY (HID_DBACCESS_START + 122) -#define HID_TLB_TABLEDESIGN (HID_DBACCESS_START + 123) -#define HID_TAB_DESIGN_HELP_TEXT_FRAME (HID_DBACCESS_START + 124) -#define HID_TABLE_DESIGN_TABPAGE_GENERAL (HID_DBACCESS_START + 125) -#define HID_TAB_ENT_DEFAULT (HID_DBACCESS_START + 126) -#define HID_TAB_ENT_FORMAT_SAMPLE (HID_DBACCESS_START + 127) -#define HID_TAB_ENT_FORMAT (HID_DBACCESS_START + 128) -#define HID_TAB_ENT_BOOL_DEFAULT (HID_DBACCESS_START + 129) -#define HID_TAB_ENT_REQUIRED (HID_DBACCESS_START + 130) -#define HID_TAB_ENT_AUTOINCREMENT (HID_DBACCESS_START + 131) -#define HID_TAB_ENT_TEXT_LEN (HID_DBACCESS_START + 132) -#define HID_TAB_ENT_TYPE (HID_DBACCESS_START + 133) -#define HID_TAB_ENT_COLUMNNAME (HID_DBACCESS_START + 134) -#define HID_TAB_ENT_NUMTYP (HID_DBACCESS_START + 135) -#define HID_TAB_ENT_LEN (HID_DBACCESS_START + 136) -#define HID_TAB_ENT_SCALE (HID_DBACCESS_START + 137) -#define HID_BROWSER_TABLE_CREATE_DESIGN (HID_DBACCESS_START + 138) -#define HID_BROWSER_TABLE_EDIT (HID_DBACCESS_START + 139) -#define HID_BROWSER_TABLE_DELETE (HID_DBACCESS_START + 140) -#define HID_SQLERROR_EXCHAIN_ERRORS (HID_DBACCESS_START + 141) -#define HID_SQLERROR_EXCHAIN_TEXT (HID_DBACCESS_START + 142) -#define HID_TAB_WIZ_COLUMN_SELECT (HID_DBACCESS_START + 146) -#define HID_TAB_WIZ_TYPE_SELECT (HID_DBACCESS_START + 147) -#define HID_TAB_NAMEMATCHING_COLS_AVAIL (HID_DBACCESS_START + 148) -#define HID_TAB_NAMEMATCHING_COLS_ASSIGN (HID_DBACCESS_START + 149) -#define HID_TAB_WIZ_COPYTABLE (HID_DBACCESS_START + 150) -#define HID_TAB_WIZ_TABLENAME_EDIT (HID_DBACCESS_START + 151) -#define HID_CTL_RELATIONTAB (HID_DBACCESS_START + 152) -#define HID_TLB_RELATIONDESIGN (HID_DBACCESS_START + 153) -#define HID_RELATIONDIALOG_LEFTFIELDCELL (HID_DBACCESS_START + 154) -#define HID_RELATIONDIALOG_RIGHTFIELDCELL (HID_DBACCESS_START + 155) -#define HID_RELDLG_KEYFIELDS (HID_DBACCESS_START + 156) -#define HID_BROWSER_RELATION_DESIGN (HID_DBACCESS_START + 157) -#define HID_TABLE_DESIGN_NO_CONNECTION (HID_DBACCESS_START + 158) -#define HID_DSADMIN_CREATEDATABASE (HID_DBACCESS_START + 159) -#define HID_BROWSER_COLUMNINFO (HID_DBACCESS_START + 160) -#define HID_DSADMIN_USECATALOG (HID_DBACCESS_START + 161) -#define HID_BROWSER_VIEW_CREATE_DESIGN (HID_DBACCESS_START + 162) -#define HID_DSADMIN_DOCUMENTS (HID_DBACCESS_START + 166) -#define HID_DSADMIN_DOCUMENTLINKS (HID_DBACCESS_START + 167) -#define HID_DSADMIN_FILTER_EXPLANATION (HID_DBACCESS_START + 168) -#define HID_CONFIRM_DROP_BUTTON_ALL (HID_DBACCESS_START + 169) -#define HID_DSBROWSER_BOOKMARK_SELECTED (HID_DBACCESS_START + 170) -#define HID_DSADMIN_TABLE_TOOLBOX (HID_DBACCESS_START + 171) -#define HID_DSADMIN_QUERY_TOOLBOX (HID_DBACCESS_START + 172) -#define HID_DSADMIN_BOOKMARK_TOOLBOX (HID_DBACCESS_START + 173) -#define HID_DSADMIN_PAGE_LDAP (HID_DBACCESS_START + 174) -#define HID_DSADMIN_LDAP_HOSTNAME (HID_DBACCESS_START + 175) -#define HID_DSADMIN_LDAP_BASEDN (HID_DBACCESS_START + 176) -#define HID_DSADMIN_LDAP_PORTNUMBER (HID_DBACCESS_START + 177) -#define HID_DSBROWSER_BOOKMARKSELECTED (HID_DBACCESS_START + 178) -#define HID_DSBROWSER_DISCONNECTING (HID_DBACCESS_START + 179) -#define HID_TAB_PAGE_USERADMIN (HID_DBACCESS_START + 180) -#define HID_TAB_PAGE_PBUSER (HID_DBACCESS_START + 181) -#define HID_TAB_PAGE_PBCHGPWD (HID_DBACCESS_START + 182) -#define HID_TAB_PAGE_PBUSERDELETE (HID_DBACCESS_START + 183) -#define HID_TAB_PAGE_TBLGRANTS (HID_DBACCESS_START + 184) -#define HID_TAB_PAGE_LBUSER (HID_DBACCESS_START + 185) -#define HID_DSBROWSER_DIRECTSQL (HID_DBACCESS_START + 186) -#define HID_DSADMIN_LDAP_ROWCOUNT (HID_DBACCESS_START + 187) -#define HID_BROWSER_QUERY_EDITSQL (HID_DBACCESS_START + 189) -#define HID_DSADMIN_PAGE_MOZILLA (HID_DBACCESS_START + 190) -#define HID_DSADMIN_MOZILLA_PROFILE_NAME (HID_DBACCESS_START + 191) -#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME (HID_DBACCESS_START + 192) -#define HID_BROWSER_OPEN_DOCUMENT (HID_DBACCESS_START + 193) -#define HID_BROWSER_EDIT_DOCUMENT (HID_DBACCESS_START + 194) -#define HID_BROWSER_BEW_DOCUMENT (HID_DBACCESS_START + 195) -#define HID_DLG_PASSWORD (HID_DBACCESS_START + 196) - -#define HID_DLGIDX_NEWINDEX (HID_DBACCESS_START + 197) -#define HID_DLGIDX_DROPINDEX (HID_DBACCESS_START + 198) -#define HID_DLGIDX_RENAMEINDEX (HID_DBACCESS_START + 199) -#define HID_DLGIDX_SAVEINDEX (HID_DBACCESS_START + 200) -#define HID_DLGIDX_RESETINDEX (HID_DBACCESS_START + 201) -#define HID_DLGIDX_INDEXLIST (HID_DBACCESS_START + 202) -#define UID_DLGINDEX_INDEXDETAILS_BACK (HID_DBACCESS_START + 203) -#define UID_DLGINDEX_INDEXDETAILS_MAIN (HID_DBACCESS_START + 204) -#define HID_DLGINDEX_INDEXDETAILS_FIELD (HID_DBACCESS_START + 205) -#define HID_DLGINDEX_INDEXDETAILS_SORTORDER (HID_DBACCESS_START + 206) - -#define HID_DOCLINKEDIT_URL (HID_DBACCESS_START + 207) -#define HID_QUERY_SQLMODE (HID_DBACCESS_START + 208) - -#define HID_BROWSER_REFRESH_REBUILDVIEW (HID_DBACCESS_START + 209) -#define HID_BROWSER_RENAME_ENTRY (HID_DBACCESS_START + 210) - -#define HID_QUERY_EDIT_JOINCONNECTION (HID_DBACCESS_START + 211) - -#define HID_DLG_QRY_WINDOW_CONTROL (HID_DBACCESS_START + 212) -#define HID_DLG_QRY_LEFT_TABLE (HID_DBACCESS_START + 213) -#define HID_DLG_QRY_RIGHT_TABLE (HID_DBACCESS_START + 214) - -#define HID_DLG_REL_CASC_DEL (HID_DBACCESS_START + 215) -#define HID_DLG_REL_NO_CASC_DEL (HID_DBACCESS_START + 216) -#define HID_DLG_REL_CASC_DEL_NULL (HID_DBACCESS_START + 217) -#define HID_DLG_REL_CASC_DEL_DEFAULT (HID_DBACCESS_START + 218) - -#define HID_DLG_REL_CASC_UPD (HID_DBACCESS_START + 219) -#define HID_DLG_REL_NO_CASC_UPD (HID_DBACCESS_START + 220) -#define HID_DLG_REL_CASC_UPD_NULL (HID_DBACCESS_START + 221) -#define HID_DLG_REL_CASC_UPD_DEFAULT (HID_DBACCESS_START + 222) -#define HID_BROWSER_SAVE_RECORD (HID_DBACCESS_START + 223) -#define HID_BROWSER_UNDO_RECORD (HID_DBACCESS_START + 224) - -#define HID_DSADMIN_SQL92CHECK (HID_DBACCESS_START + 225) -#define HID_DSADMIN_AUTOINCREMENTVALUE (HID_DBACCESS_START + 226) -#define HID_DOCUMENT_CREATE_REPWIZ (HID_DBACCESS_START + 227) -#define HID_TAB_AUTOINCREMENTVALUE (HID_DBACCESS_START + 228) -#define HID_DSADMIN_RETRIEVE_AUTO (HID_DBACCESS_START + 229) -#define HID_DSADMIN_AUTORETRIEVEENABLED (HID_DBACCESS_START + 230) - -#define HID_DSADMIN_PAGE_MYSQL_ODBC (HID_DBACCESS_START + 231) -#define HID_TAB_PAGE_TABLEPRIVILEGES (HID_DBACCESS_START + 232) - -#define HID_DSADMIN_PAGE_USERDRIVER (HID_DBACCESS_START + 233) -#define HID_DSADMIN_USER_DEFINED (HID_DBACCESS_START + 234) -#define HID_DSADMIN_USERDEF_OPTIONS (HID_DBACCESS_START + 235) -#define HID_DSADMIN_CHARSET_USERDEF (HID_DBACCESS_START + 236) -#define HID_DSADMIN_USER_LDAP (HID_DBACCESS_START + 237) -#define HID_DSADMIN_PWDREC_LDAP (HID_DBACCESS_START + 238) -#define HID_DSADMIN_USESSL_LDAP (HID_DBACCESS_START + 239) -#define HID_BROWSER_QUERY_WIZARD (HID_DBACCESS_START + 237) - -#define HID_DLG_RENAME (HID_DBACCESS_START + 237) - -#define HID_DSADMIN_PAGE_MYSQL_JDBC (HID_DBACCESS_START + 238) - -#define HID_DSADMIN_DBASE_PATH (HID_DBACCESS_START + 239) -#define HID_DSADMIN_MYSQL_DATABASE (HID_DBACCESS_START + 240) -#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE (HID_DBACCESS_START + 241) -#define HID_DSADMIN_ODBC_DATASOURCE (HID_DBACCESS_START + 242) -#define HID_DSADMIN_ADABAS_DATABASE (HID_DBACCESS_START + 243) -#define HID_DSADMIN_MSACCESS_MDB_FILE (HID_DBACCESS_START + 244) -#define HID_DSADMIN_PAGE_MSACCESS (HID_DBACCESS_START + 245) -#define HID_DSADMIN_FLAT_PATH (HID_DBACCESS_START + 246) -#define HID_DSADMIN_CALC_PATH (HID_DBACCESS_START + 247) -#define HID_DSADMIN_ADVANCED (HID_DBACCESS_START + 248) -#define HID_DSADMIN_BOOLEANCOMPARISON (HID_DBACCESS_START + 249) -#define HID_DSADMIN_ORACLE_DATABASE (HID_DBACCESS_START + 250) - -#define UID_APP_VIEW (HID_DBACCESS_START + 251) -#define HID_APP_TABLE_TREE (HID_DBACCESS_START + 252) -#define HID_APP_FORM_TREE (HID_DBACCESS_START + 253) -#define HID_APP_QUERY_TREE (HID_DBACCESS_START + 254) -#define HID_APP_REPORT_TREE (HID_DBACCESS_START + 255) -#define UID_APP_DETAIL_VIEW (HID_DBACCESS_START + 256) -#define UID_APP_VIEW_VERT_SPLIT (HID_DBACCESS_START + 257) -#define UID_APP_VIEW_BORDER_WIN (HID_DBACCESS_START + 258) -#define HID_APP_CREATION_LIST (HID_DBACCESS_START + 259) -#define UID_APP_SWAP_VIEW (HID_DBACCESS_START + 260) -#define UID_DLG_TABLE_FILTER (HID_DBACCESS_START + 261) -#define HID_APP_SWAP_ICONCONTROL (HID_DBACCESS_START + 262) - -#define HID_DSADMIN_APPENDTABLEALIAS (HID_DBACCESS_START + 263) -#define HID_DSADMIN_PARAMETERNAMESUBST (HID_DBACCESS_START + 264) -#define HID_DSADMIN_IGNOREDRIVER_PRIV (HID_DBACCESS_START + 265) -#define HID_DSADMIN_HOSTNAME (HID_DBACCESS_START + 266) -#define HID_DSADMIN_PORTNUMBER (HID_DBACCESS_START + 267) - -#define HID_APP_HELP_TEXT (HID_DBACCESS_START + 268) -#define HID_EXPLORERDLG_COLLECTION (HID_DBACCESS_START + 269) -#define UID_APP_DATABASE_VIEW (HID_DBACCESS_START + 270) -#define UID_APP_TASKS_VIEW (HID_DBACCESS_START + 271) -#define UID_APP_CONTAINER_VIEW (HID_DBACCESS_START + 272) -#define UID_APP_TASKS_WINDOW (HID_DBACCESS_START + 273) -#define HID_APP_DESCRIPTION_TEXT (HID_DBACCESS_START + 274) -#define UID_APP_DETAILPAGE_HELPER (HID_DBACCESS_START + 275) -#define HID_APP_VIEW_PREVIEW_CB (HID_DBACCESS_START + 276) -#define HID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 277) -#define HID_APP_VIEW_PREVIEW_2 (HID_DBACCESS_START + 278) -#define HID_TABDESIGN_HELPTEXT (HID_DBACCESS_START + 279) -#define UID_APP_VIEW_HORZ_SPLIT (HID_DBACCESS_START + 280) -#define UID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 281) -#define HID_APP_VIEW_PREVIEW_3 (HID_DBACCESS_START + 282) - -#define HID_DSADMIN_TYPE_DIALOG (HID_DBACCESS_START + 283) -#define HID_DSADMIN_ENABLEOUTERJOIN (HID_DBACCESS_START + 284) -#define HID_DSADMIN_ADABASADMIN (HID_DBACCESS_START + 285) -#define HID_DSADMIN_USERADMIN (HID_DBACCESS_START + 286) - -#define HID_DBWIZ_PREVIOUS (HID_DBACCESS_START + 287) -#define HID_DBWIZ_NEXT (HID_DBACCESS_START + 288) -#define HID_DBWIZ_CANCEL (HID_DBACCESS_START + 289) -#define HID_DBWIZ_FINISH (HID_DBACCESS_START + 290) -#define UID_DBWIZ_HELP (HID_DBACCESS_START + 291) - -#define HID_DSADMIN_CATALOG (HID_DBACCESS_START + 292) -#define HID_DSADMIN_SCHEMA (HID_DBACCESS_START + 293) +#define HID_BROWSER_CLOSECONN (HID_DBACCESS_START + 66) +#define HID_BROWSER_REFRESHCONN (HID_DBACCESS_START + 67) + +#define HID_DLG_ROWHEIGHT (HID_DBACCESS_START + 68) +#define HID_DLG_COLWIDTH (HID_DBACCESS_START + 69) + + +#define HID_TLB_QUERYDESIGN (HID_DBACCESS_START + 70) +#define HID_CTL_QRYSQLEDIT (HID_DBACCESS_START + 71) +#define HID_DSADMIN_SPECIAL_MESSAGE (HID_DBACCESS_START + 72) + +#define HID_BROWSER_QUERY_CREATE_TEXT (HID_DBACCESS_START + 73) + +#define HID_DLG_ERROR (HID_DBACCESS_START + 74) +#define HID_DLG_TEXT (HID_DBACCESS_START + 75) +#define UID_SQLERROR_BUTTONMORE (HID_DBACCESS_START + 76) +#define HID_DLG_SAVE_AS (HID_DBACCESS_START + 77) + +#define HID_BROWSER_QUERY_EDIT (HID_DBACCESS_START + 78) +#define HID_BROWSER_QUERY_DELETE (HID_DBACCESS_START + 79) + +#define HID_DSADMIN_USER_ADO (HID_DBACCESS_START + 80) +#define HID_DSADMIN_PWDREC_ADO (HID_DBACCESS_START + 81) +#define HID_DSADMIN_CONNURL_ADOPAGE (HID_DBACCESS_START + 82) +#define HID_DSADMIN_PAGE_ADO (HID_DBACCESS_START + 83) + + +#define HID_JOINSH_ADDTAB_CLOSE (HID_DBACCESS_START + 84) +#define HID_JOINSH_ADDTAB_TABLELIST (HID_DBACCESS_START + 85) +#define HID_CTL_QRYDGNTAB (HID_DBACCESS_START + 86) +#define HID_DLG_QRY_JOIN (HID_DBACCESS_START + 87) +#define HID_DLG_QRY_JOINTYPE (HID_DBACCESS_START + 88) +#define HID_JOINSH_ADDTAB_QUERYLIST (HID_DBACCESS_START + 89) +#define HID_DLG_QRY_HELPTEXT (HID_DBACCESS_START + 92) + +#define HID_CTL_QRYDGNCRIT (HID_DBACCESS_START + 93) +#define HID_QRYDGN_ROW_VISIBLE (HID_DBACCESS_START + 94) +#define HID_QRYDGN_ROW_TABLE (HID_DBACCESS_START + 95) +#define HID_QRYDGN_ROW_FIELD (HID_DBACCESS_START + 96) +#define HID_QRYDGN_ROW_ORDER (HID_DBACCESS_START + 97) +#define HID_QRYDGN_ROW_FUNCTION (HID_DBACCESS_START + 98) +#define HID_QRYDGN_ROW_ALIAS (HID_DBACCESS_START + 99) +#define HID_QRYDGN_ROW_CRIT (HID_DBACCESS_START + 100) + +#define HID_QUERY_FUNCTION (HID_DBACCESS_START + 101) +#define HID_QUERY_TABLENAME (HID_DBACCESS_START + 102) +#define HID_QUERY_ALIASNAME (HID_DBACCESS_START + 103) +#define HID_QUERY_DISTINCT (HID_DBACCESS_START + 104) + +#define HID_BROWSER_QUERY_CREATE_DESIGN (HID_DBACCESS_START + 105) + +#define HID_DSADMIN_QUERIES (HID_DBACCESS_START + 106) +#define HID_DSADMIN_QUERIES_NEW (HID_DBACCESS_START + 107) +#define HID_DSADMIN_QUERIES_EDIT (HID_DBACCESS_START + 108) +#define HID_DSADMIN_QUERIES_DELETE (HID_DBACCESS_START + 109) +#define HID_DSADMIN_QUERYADMINISTRATION (HID_DBACCESS_START + 110) + + +#define HID_TAB_DESIGN_TABLE_DESC (HID_DBACCESS_START + 111) +#define HID_TAB_DESIGN_FIELDCONTROL (HID_DBACCESS_START + 112) +#define HID_TABLE_DESIGN_HELP_WINDOW (HID_DBACCESS_START + 113) +#define HID_TAB_DESIGN_DESCWIN (HID_DBACCESS_START + 114) +#define HID_TAB_DESIGN_TABLE_PROPS (HID_DBACCESS_START + 115) +#define HID_TABDESIGN_BACKGROUND (HID_DBACCESS_START + 116) +#define HID_CTL_TABLEEDIT (HID_DBACCESS_START + 117) +#define HID_TABDESIGN_NAMECELL (HID_DBACCESS_START + 118) +#define HID_TABDESIGN_TYPECELL (HID_DBACCESS_START + 119) +#define HID_TABDESIGN_COMMENTCELL (HID_DBACCESS_START + 120) +#define SID_TABLEDESIGN_INSERTROWS (HID_DBACCESS_START + 121) +#define SID_TABLEDESIGN_TABED_PRIMARYKEY (HID_DBACCESS_START + 122) +#define HID_TLB_TABLEDESIGN (HID_DBACCESS_START + 123) +#define HID_TAB_DESIGN_HELP_TEXT_FRAME (HID_DBACCESS_START + 124) +#define HID_TABLE_DESIGN_TABPAGE_GENERAL (HID_DBACCESS_START + 125) +#define HID_TAB_ENT_DEFAULT (HID_DBACCESS_START + 126) +#define HID_TAB_ENT_FORMAT_SAMPLE (HID_DBACCESS_START + 127) +#define HID_TAB_ENT_FORMAT (HID_DBACCESS_START + 128) +#define HID_TAB_ENT_BOOL_DEFAULT (HID_DBACCESS_START + 129) +#define HID_TAB_ENT_REQUIRED (HID_DBACCESS_START + 130) +#define HID_TAB_ENT_AUTOINCREMENT (HID_DBACCESS_START + 131) +#define HID_TAB_ENT_TEXT_LEN (HID_DBACCESS_START + 132) +#define HID_TAB_ENT_TYPE (HID_DBACCESS_START + 133) +#define HID_TAB_ENT_COLUMNNAME (HID_DBACCESS_START + 134) +#define HID_TAB_ENT_NUMTYP (HID_DBACCESS_START + 135) +#define HID_TAB_ENT_LEN (HID_DBACCESS_START + 136) +#define HID_TAB_ENT_SCALE (HID_DBACCESS_START + 137) +#define HID_BROWSER_TABLE_CREATE_DESIGN (HID_DBACCESS_START + 138) +#define HID_BROWSER_TABLE_EDIT (HID_DBACCESS_START + 139) +#define HID_BROWSER_TABLE_DELETE (HID_DBACCESS_START + 140) +#define HID_SQLERROR_EXCHAIN_ERRORS (HID_DBACCESS_START + 141) +#define HID_SQLERROR_EXCHAIN_TEXT (HID_DBACCESS_START + 142) +#define HID_TAB_WIZ_COLUMN_SELECT (HID_DBACCESS_START + 146) +#define HID_TAB_WIZ_TYPE_SELECT (HID_DBACCESS_START + 147) +#define HID_TAB_NAMEMATCHING_COLS_AVAIL (HID_DBACCESS_START + 148) +#define HID_TAB_NAMEMATCHING_COLS_ASSIGN (HID_DBACCESS_START + 149) +#define HID_TAB_WIZ_COPYTABLE (HID_DBACCESS_START + 150) +#define HID_TAB_WIZ_TABLENAME_EDIT (HID_DBACCESS_START + 151) +#define HID_CTL_RELATIONTAB (HID_DBACCESS_START + 152) +#define HID_TLB_RELATIONDESIGN (HID_DBACCESS_START + 153) +#define HID_RELATIONDIALOG_LEFTFIELDCELL (HID_DBACCESS_START + 154) +#define HID_RELATIONDIALOG_RIGHTFIELDCELL (HID_DBACCESS_START + 155) +#define HID_RELDLG_KEYFIELDS (HID_DBACCESS_START + 156) +#define HID_BROWSER_RELATION_DESIGN (HID_DBACCESS_START + 157) +#define HID_TABLE_DESIGN_NO_CONNECTION (HID_DBACCESS_START + 158) +#define HID_DSADMIN_CREATEDATABASE (HID_DBACCESS_START + 159) +#define HID_BROWSER_COLUMNINFO (HID_DBACCESS_START + 160) +#define HID_DSADMIN_USECATALOG (HID_DBACCESS_START + 161) +#define HID_BROWSER_VIEW_CREATE_DESIGN (HID_DBACCESS_START + 162) +#define HID_DSADMIN_DOCUMENTS (HID_DBACCESS_START + 166) +#define HID_DSADMIN_DOCUMENTLINKS (HID_DBACCESS_START + 167) +#define HID_DSADMIN_FILTER_EXPLANATION (HID_DBACCESS_START + 168) +#define HID_CONFIRM_DROP_BUTTON_ALL (HID_DBACCESS_START + 169) +#define HID_DSBROWSER_BOOKMARK_SELECTED (HID_DBACCESS_START + 170) +#define HID_DSADMIN_TABLE_TOOLBOX (HID_DBACCESS_START + 171) +#define HID_DSADMIN_QUERY_TOOLBOX (HID_DBACCESS_START + 172) +#define HID_DSADMIN_BOOKMARK_TOOLBOX (HID_DBACCESS_START + 173) +#define HID_DSADMIN_PAGE_LDAP (HID_DBACCESS_START + 174) +#define HID_DSADMIN_LDAP_HOSTNAME (HID_DBACCESS_START + 175) +#define HID_DSADMIN_LDAP_BASEDN (HID_DBACCESS_START + 176) +#define HID_DSADMIN_LDAP_PORTNUMBER (HID_DBACCESS_START + 177) +#define HID_DSBROWSER_BOOKMARKSELECTED (HID_DBACCESS_START + 178) +#define HID_DSBROWSER_DISCONNECTING (HID_DBACCESS_START + 179) +#define HID_TAB_PAGE_USERADMIN (HID_DBACCESS_START + 180) +#define HID_TAB_PAGE_PBUSER (HID_DBACCESS_START + 181) +#define HID_TAB_PAGE_PBCHGPWD (HID_DBACCESS_START + 182) +#define HID_TAB_PAGE_PBUSERDELETE (HID_DBACCESS_START + 183) +#define HID_TAB_PAGE_TBLGRANTS (HID_DBACCESS_START + 184) +#define HID_TAB_PAGE_LBUSER (HID_DBACCESS_START + 185) +#define HID_DSBROWSER_DIRECTSQL (HID_DBACCESS_START + 186) +#define HID_DSADMIN_LDAP_ROWCOUNT (HID_DBACCESS_START + 187) +#define HID_BROWSER_QUERY_EDITSQL (HID_DBACCESS_START + 189) +#define HID_DSADMIN_PAGE_MOZILLA (HID_DBACCESS_START + 190) +#define HID_DSADMIN_MOZILLA_PROFILE_NAME (HID_DBACCESS_START + 191) +#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME (HID_DBACCESS_START + 192) +#define HID_BROWSER_OPEN_DOCUMENT (HID_DBACCESS_START + 193) +#define HID_BROWSER_EDIT_DOCUMENT (HID_DBACCESS_START + 194) +#define HID_BROWSER_BEW_DOCUMENT (HID_DBACCESS_START + 195) +#define HID_DLG_PASSWORD (HID_DBACCESS_START + 196) + +#define HID_DLGIDX_NEWINDEX (HID_DBACCESS_START + 197) +#define HID_DLGIDX_DROPINDEX (HID_DBACCESS_START + 198) +#define HID_DLGIDX_RENAMEINDEX (HID_DBACCESS_START + 199) +#define HID_DLGIDX_SAVEINDEX (HID_DBACCESS_START + 200) +#define HID_DLGIDX_RESETINDEX (HID_DBACCESS_START + 201) +#define HID_DLGIDX_INDEXLIST (HID_DBACCESS_START + 202) +#define UID_DLGINDEX_INDEXDETAILS_BACK (HID_DBACCESS_START + 203) +#define UID_DLGINDEX_INDEXDETAILS_MAIN (HID_DBACCESS_START + 204) +#define HID_DLGINDEX_INDEXDETAILS_FIELD (HID_DBACCESS_START + 205) +#define HID_DLGINDEX_INDEXDETAILS_SORTORDER (HID_DBACCESS_START + 206) + +#define HID_DOCLINKEDIT_URL (HID_DBACCESS_START + 207) +#define HID_QUERY_SQLMODE (HID_DBACCESS_START + 208) + +#define HID_BROWSER_REFRESH_REBUILDVIEW (HID_DBACCESS_START + 209) +#define HID_BROWSER_RENAME_ENTRY (HID_DBACCESS_START + 210) + +#define HID_QUERY_EDIT_JOINCONNECTION (HID_DBACCESS_START + 211) + +#define HID_DLG_QRY_WINDOW_CONTROL (HID_DBACCESS_START + 212) +#define HID_DLG_QRY_LEFT_TABLE (HID_DBACCESS_START + 213) +#define HID_DLG_QRY_RIGHT_TABLE (HID_DBACCESS_START + 214) + +#define HID_DLG_REL_CASC_DEL (HID_DBACCESS_START + 215) +#define HID_DLG_REL_NO_CASC_DEL (HID_DBACCESS_START + 216) +#define HID_DLG_REL_CASC_DEL_NULL (HID_DBACCESS_START + 217) +#define HID_DLG_REL_CASC_DEL_DEFAULT (HID_DBACCESS_START + 218) + +#define HID_DLG_REL_CASC_UPD (HID_DBACCESS_START + 219) +#define HID_DLG_REL_NO_CASC_UPD (HID_DBACCESS_START + 220) +#define HID_DLG_REL_CASC_UPD_NULL (HID_DBACCESS_START + 221) +#define HID_DLG_REL_CASC_UPD_DEFAULT (HID_DBACCESS_START + 222) +#define HID_BROWSER_SAVE_RECORD (HID_DBACCESS_START + 223) +#define HID_BROWSER_UNDO_RECORD (HID_DBACCESS_START + 224) + +#define HID_DSADMIN_SQL92CHECK (HID_DBACCESS_START + 225) +#define HID_DSADMIN_AUTOINCREMENTVALUE (HID_DBACCESS_START + 226) +#define HID_DOCUMENT_CREATE_REPWIZ (HID_DBACCESS_START + 227) +#define HID_TAB_AUTOINCREMENTVALUE (HID_DBACCESS_START + 228) +#define HID_DSADMIN_RETRIEVE_AUTO (HID_DBACCESS_START + 229) +#define HID_DSADMIN_AUTORETRIEVEENABLED (HID_DBACCESS_START + 230) + +#define HID_DSADMIN_PAGE_MYSQL_ODBC (HID_DBACCESS_START + 231) +#define HID_TAB_PAGE_TABLEPRIVILEGES (HID_DBACCESS_START + 232) + +#define HID_DSADMIN_PAGE_USERDRIVER (HID_DBACCESS_START + 233) +#define HID_DSADMIN_USER_DEFINED (HID_DBACCESS_START + 234) +#define HID_DSADMIN_USERDEF_OPTIONS (HID_DBACCESS_START + 235) +#define HID_DSADMIN_CHARSET_USERDEF (HID_DBACCESS_START + 236) +#define HID_DSADMIN_USER_LDAP (HID_DBACCESS_START + 237) +#define HID_DSADMIN_PWDREC_LDAP (HID_DBACCESS_START + 238) +#define HID_DSADMIN_USESSL_LDAP (HID_DBACCESS_START + 239) +#define HID_BROWSER_QUERY_WIZARD (HID_DBACCESS_START + 237) + +#define HID_DLG_RENAME (HID_DBACCESS_START + 237) + +#define HID_DSADMIN_PAGE_MYSQL_JDBC (HID_DBACCESS_START + 238) + +#define HID_DSADMIN_DBASE_PATH (HID_DBACCESS_START + 239) +#define HID_DSADMIN_MYSQL_DATABASE (HID_DBACCESS_START + 240) +#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE (HID_DBACCESS_START + 241) +#define HID_DSADMIN_ODBC_DATASOURCE (HID_DBACCESS_START + 242) +#define HID_DSADMIN_ADABAS_DATABASE (HID_DBACCESS_START + 243) +#define HID_DSADMIN_MSACCESS_MDB_FILE (HID_DBACCESS_START + 244) +#define HID_DSADMIN_PAGE_MSACCESS (HID_DBACCESS_START + 245) +#define HID_DSADMIN_FLAT_PATH (HID_DBACCESS_START + 246) +#define HID_DSADMIN_CALC_PATH (HID_DBACCESS_START + 247) +#define HID_DSADMIN_ADVANCED (HID_DBACCESS_START + 248) +#define HID_DSADMIN_BOOLEANCOMPARISON (HID_DBACCESS_START + 249) +#define HID_DSADMIN_ORACLE_DATABASE (HID_DBACCESS_START + 250) + +#define UID_APP_VIEW (HID_DBACCESS_START + 251) +#define HID_APP_TABLE_TREE (HID_DBACCESS_START + 252) +#define HID_APP_FORM_TREE (HID_DBACCESS_START + 253) +#define HID_APP_QUERY_TREE (HID_DBACCESS_START + 254) +#define HID_APP_REPORT_TREE (HID_DBACCESS_START + 255) +#define UID_APP_DETAIL_VIEW (HID_DBACCESS_START + 256) +#define UID_APP_VIEW_VERT_SPLIT (HID_DBACCESS_START + 257) +#define UID_APP_VIEW_BORDER_WIN (HID_DBACCESS_START + 258) +#define HID_APP_CREATION_LIST (HID_DBACCESS_START + 259) +#define UID_APP_SWAP_VIEW (HID_DBACCESS_START + 260) +#define UID_DLG_TABLE_FILTER (HID_DBACCESS_START + 261) +#define HID_APP_SWAP_ICONCONTROL (HID_DBACCESS_START + 262) + +#define HID_DSADMIN_APPENDTABLEALIAS (HID_DBACCESS_START + 263) +#define HID_DSADMIN_PARAMETERNAMESUBST (HID_DBACCESS_START + 264) +#define HID_DSADMIN_IGNOREDRIVER_PRIV (HID_DBACCESS_START + 265) +#define HID_DSADMIN_HOSTNAME (HID_DBACCESS_START + 266) +#define HID_DSADMIN_PORTNUMBER (HID_DBACCESS_START + 267) + +#define HID_APP_HELP_TEXT (HID_DBACCESS_START + 268) +#define HID_EXPLORERDLG_COLLECTION (HID_DBACCESS_START + 269) +#define UID_APP_DATABASE_VIEW (HID_DBACCESS_START + 270) +#define UID_APP_TASKS_VIEW (HID_DBACCESS_START + 271) +#define UID_APP_CONTAINER_VIEW (HID_DBACCESS_START + 272) +#define UID_APP_TASKS_WINDOW (HID_DBACCESS_START + 273) +#define HID_APP_DESCRIPTION_TEXT (HID_DBACCESS_START + 274) +#define UID_APP_DETAILPAGE_HELPER (HID_DBACCESS_START + 275) +#define HID_APP_VIEW_PREVIEW_CB (HID_DBACCESS_START + 276) +#define HID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 277) +#define HID_APP_VIEW_PREVIEW_2 (HID_DBACCESS_START + 278) +#define HID_TABDESIGN_HELPTEXT (HID_DBACCESS_START + 279) +#define UID_APP_VIEW_HORZ_SPLIT (HID_DBACCESS_START + 280) +#define UID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 281) +#define HID_APP_VIEW_PREVIEW_3 (HID_DBACCESS_START + 282) + +#define HID_DSADMIN_TYPE_DIALOG (HID_DBACCESS_START + 283) +#define HID_DSADMIN_ENABLEOUTERJOIN (HID_DBACCESS_START + 284) +#define HID_DSADMIN_ADABASADMIN (HID_DBACCESS_START + 285) +#define HID_DSADMIN_USERADMIN (HID_DBACCESS_START + 286) + +#define HID_DBWIZ_PREVIOUS (HID_DBACCESS_START + 287) +#define HID_DBWIZ_NEXT (HID_DBACCESS_START + 288) +#define HID_DBWIZ_CANCEL (HID_DBACCESS_START + 289) +#define HID_DBWIZ_FINISH (HID_DBACCESS_START + 290) +#define UID_DBWIZ_HELP (HID_DBACCESS_START + 291) + +#define HID_DSADMIN_CATALOG (HID_DBACCESS_START + 292) +#define HID_DSADMIN_SCHEMA (HID_DBACCESS_START + 293) #define HID_DSADMIN_IGNOREINDEXAPPENDIX (HID_DBACCESS_START + 294) -#define HID_DSADMIN_DOSLINEENDS (HID_DBACCESS_START + 295) +#define HID_DSADMIN_DOSLINEENDS (HID_DBACCESS_START + 295) #define HID_BROWSER_ADMINISTRATE (HID_DBACCESS_START + 296) @@ -354,116 +354,116 @@ #define HID_DSADMIN_CHECK_REQUIRED_FIELDS (HID_DBACCESS_START + 298) #define HID_DSADMIN_ESCAPE_DATETIME (HID_DBACCESS_START + 299) -#define HID_PAGE_DBWIZARD_GENERALPAGE (HID_DBACCESS_START + 300) -#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE (HID_DBACCESS_START + 301) -#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE (HID_DBACCESS_START + 302) +#define HID_PAGE_DBWIZARD_GENERALPAGE (HID_DBACCESS_START + 300) +#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE (HID_DBACCESS_START + 301) +#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE (HID_DBACCESS_START + 302) -#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION (HID_DBACCESS_START + 304) -#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION (HID_DBACCESS_START + 305) +#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION (HID_DBACCESS_START + 304) +#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION (HID_DBACCESS_START + 305) -#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES (HID_DBACCESS_START + 307) -#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES (HID_DBACCESS_START + 308) -#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES (HID_DBACCESS_START + 309) -#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION (HID_DBACCESS_START + 310) +#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES (HID_DBACCESS_START + 307) +#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES (HID_DBACCESS_START + 308) +#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES (HID_DBACCESS_START + 309) +#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION (HID_DBACCESS_START + 310) -#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE (HID_DBACCESS_START + 311) -#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE (HID_DBACCESS_START + 312) -#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR (HID_DBACCESS_START + 313) -#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR (HID_DBACCESS_START + 314) -#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR (HID_DBACCESS_START + 315) -#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR (HID_DBACCESS_START + 316) +#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE (HID_DBACCESS_START + 311) +#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE (HID_DBACCESS_START + 312) +#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR (HID_DBACCESS_START + 313) +#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR (HID_DBACCESS_START + 314) +#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR (HID_DBACCESS_START + 315) +#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR (HID_DBACCESS_START + 316) -#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION (HID_DBACCESS_START + 317) -#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION (HID_DBACCESS_START + 318) +#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION (HID_DBACCESS_START + 317) +#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION (HID_DBACCESS_START + 318) -#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER (HID_DBACCESS_START + 319) -#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN (HID_DBACCESS_START + 320) -#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER (HID_DBACCESS_START + 321) -#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL (HID_DBACCESS_START + 322) -#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION (HID_DBACCESS_START + 323) +#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER (HID_DBACCESS_START + 319) +#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN (HID_DBACCESS_START + 320) +#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER (HID_DBACCESS_START + 321) +#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL (HID_DBACCESS_START + 322) +#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION (HID_DBACCESS_START + 323) -#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME (HID_DBACCESS_START + 326) -#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME (HID_DBACCESS_START + 327) +#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME (HID_DBACCESS_START + 326) +#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME (HID_DBACCESS_START + 327) -#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC (HID_DBACCESS_START + 329) -#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC (HID_DBACCESS_START + 330) +#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC (HID_DBACCESS_START + 329) +#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC (HID_DBACCESS_START + 330) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME (HID_DBACCESS_START + 333) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER (HID_DBACCESS_START + 334) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT (HID_DBACCESS_START + 335) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS (HID_DBACCESS_START + 336) -#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS (HID_DBACCESS_START + 337) +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME (HID_DBACCESS_START + 333) +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER (HID_DBACCESS_START + 334) +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT (HID_DBACCESS_START + 335) +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS (HID_DBACCESS_START + 336) +#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS (HID_DBACCESS_START + 337) -#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL (HID_DBACCESS_START + 340) -#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL (HID_DBACCESS_START + 341) +#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL (HID_DBACCESS_START + 340) +#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL (HID_DBACCESS_START + 341) -#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS (HID_DBACCESS_START + 342) -#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS (HID_DBACCESS_START + 343) +#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS (HID_DBACCESS_START + 342) +#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS (HID_DBACCESS_START + 343) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME (HID_DBACCESS_START + 344) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER (HID_DBACCESS_START + 345) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT (HID_DBACCESS_START + 346) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS (HID_DBACCESS_START + 347) -#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS (HID_DBACCESS_START + 348) +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME (HID_DBACCESS_START + 344) +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER (HID_DBACCESS_START + 345) +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT (HID_DBACCESS_START + 346) +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS (HID_DBACCESS_START + 347) +#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS (HID_DBACCESS_START + 348) -#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL (HID_DBACCESS_START + 349) -#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL (HID_DBACCESS_START + 350) -#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION (HID_DBACCESS_START + 351) +#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL (HID_DBACCESS_START + 349) +#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL (HID_DBACCESS_START + 350) +#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION (HID_DBACCESS_START + 351) -#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 355) -#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 356) +#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 355) +#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 356) -#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH (HID_DBACCESS_START + 359) -#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH (HID_DBACCESS_START + 360) -#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED (HID_DBACCESS_START + 361) +#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH (HID_DBACCESS_START + 359) +#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH (HID_DBACCESS_START + 360) +#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED (HID_DBACCESS_START + 361) -#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED (HID_DBACCESS_START + 365) -#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME (HID_DBACCESS_START + 366) -#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION (HID_DBACCESS_START + 367) +#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED (HID_DBACCESS_START + 365) +#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME (HID_DBACCESS_START + 366) +#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION (HID_DBACCESS_START + 367) -#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE (HID_DBACCESS_START + 373) +#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE (HID_DBACCESS_START + 373) #define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE (HID_DBACCESS_START + 374) -#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD (HID_DBACCESS_START + 375) -#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS (HID_DBACCESS_START + 376) +#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD (HID_DBACCESS_START + 375) +#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS (HID_DBACCESS_START + 376) -#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE (HID_DBACCESS_START + 377) -#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE (HID_DBACCESS_START + 378) +#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE (HID_DBACCESS_START + 377) +#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE (HID_DBACCESS_START + 378) #define HID_INDEX_DIALOG_ACTION_TB (HID_DBACCESS_START + 379) -#define HID_DLG_DATABASE_WIZARD (HID_DBACCESS_START + 380) +#define HID_DLG_DATABASE_WIZARD (HID_DBACCESS_START + 380) -#define HID_EXTENSION_NOT_PRESENT_DLG ( HID_DBACCESS_START + 381) -#define HID_DLG_QRY_JOIN_CONTROL ( HID_DBACCESS_START + 382) -#define HID_DSADMIN_IGNORECURRENCY ( HID_DBACCESS_START + 383) +#define HID_EXTENSION_NOT_PRESENT_DLG ( HID_DBACCESS_START + 381) +#define HID_DLG_QRY_JOIN_CONTROL ( HID_DBACCESS_START + 382) +#define HID_DSADMIN_IGNORECURRENCY ( HID_DBACCESS_START + 383) #define HID_MACRO_MIGRATION_BACKUP_LOCATION ( HID_DBACCESS_START + 384) #define HID_DSADMIN_PRIMARY_KEY_SUPPORT ( HID_DBACCESS_START + 385) // this one below have hid in number space HID_SBA_START -#define HID_DLG_ADABAS_NEWDB (HID_SBA_START + 0) -#define HID_DLG_ADABAS_DBNAME (HID_SBA_START + 1) -#define HID_DLG_ADABAS_SYSUSR (HID_SBA_START + 2) -#define HID_DLG_ADABAS_SYSPWD (HID_SBA_START + 3) -#define HID_DLG_ADABAS_CONUSR (HID_SBA_START + 4) -#define HID_DLG_ADABAS_CONPWD (HID_SBA_START + 5) -#define HID_DLG_ADABAS_DATADEVSPACE_SIZE (HID_SBA_START + 6) -#define HID_DLG_ADABAS_CACHE_SIZE (HID_SBA_START + 7) -#define HID_DLG_ADABAS_USR (HID_SBA_START + 8) -#define HID_DLG_ADABAS_DOMAINPWD (HID_SBA_START + 9) -#define HID_DLG_ADABAS_RESTORE (HID_SBA_START + 10) -#define HID_DLG_ADABAS_PBRESTORE (HID_SBA_START + 11) -#define HID_DLG_ADABAS_SYSDEVSPACE (HID_SBA_START + 12) -#define HID_DLG_ADABAS_PBSYSDEVSPACE (HID_SBA_START + 13) -#define HID_DLG_ADABAS_TRANSACTIONLOG (HID_SBA_START + 14) -#define HID_DLG_ADABAS_PBTRANSACTIONLOG (HID_SBA_START + 15) -#define HID_DLG_ADABAS_DATADEVSPACE (HID_SBA_START + 16) -#define HID_DLG_ADABAS_PBDATADEVSPACE (HID_SBA_START + 18) -#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE (HID_SBA_START + 19) -#define HID_DLG_ADABAS_CON_PWD (HID_SBA_START + 20) -#define HID_DLG_ADABAS_SYS_PWD (HID_SBA_START + 21) -#define HID_DLG_ADABAS_DOMAIN_PWD (HID_SBA_START + 22) +#define HID_DLG_ADABAS_NEWDB (HID_SBA_START + 0) +#define HID_DLG_ADABAS_DBNAME (HID_SBA_START + 1) +#define HID_DLG_ADABAS_SYSUSR (HID_SBA_START + 2) +#define HID_DLG_ADABAS_SYSPWD (HID_SBA_START + 3) +#define HID_DLG_ADABAS_CONUSR (HID_SBA_START + 4) +#define HID_DLG_ADABAS_CONPWD (HID_SBA_START + 5) +#define HID_DLG_ADABAS_DATADEVSPACE_SIZE (HID_SBA_START + 6) +#define HID_DLG_ADABAS_CACHE_SIZE (HID_SBA_START + 7) +#define HID_DLG_ADABAS_USR (HID_SBA_START + 8) +#define HID_DLG_ADABAS_DOMAINPWD (HID_SBA_START + 9) +#define HID_DLG_ADABAS_RESTORE (HID_SBA_START + 10) +#define HID_DLG_ADABAS_PBRESTORE (HID_SBA_START + 11) +#define HID_DLG_ADABAS_SYSDEVSPACE (HID_SBA_START + 12) +#define HID_DLG_ADABAS_PBSYSDEVSPACE (HID_SBA_START + 13) +#define HID_DLG_ADABAS_TRANSACTIONLOG (HID_SBA_START + 14) +#define HID_DLG_ADABAS_PBTRANSACTIONLOG (HID_SBA_START + 15) +#define HID_DLG_ADABAS_DATADEVSPACE (HID_SBA_START + 16) +#define HID_DLG_ADABAS_PBDATADEVSPACE (HID_SBA_START + 18) +#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE (HID_SBA_START + 19) +#define HID_DLG_ADABAS_CON_PWD (HID_SBA_START + 20) +#define HID_DLG_ADABAS_SYS_PWD (HID_SBA_START + 21) +#define HID_DLG_ADABAS_DOMAIN_PWD (HID_SBA_START + 22) //end of HID_SBA_START // don't forget to update the file util/hidother.src diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc index c273a67edcbd..6ecd68d05f53 100644 --- a/dbaccess/inc/dbaccess_slotid.hrc +++ b/dbaccess/inc/dbaccess_slotid.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,82 +32,82 @@ #include <sfx2/sfxsids.hrc> #endif -#define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 ) -#define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 ) -#define SID_DB_NEW ( SID_DBACCESS_START + 2 ) -#define SID_DB_APP_DISABLE_PREVIEW ( SID_DBACCESS_START + 3 ) -#define SID_DB_APP_DSCONNECTION_TYPE ( SID_DBACCESS_START + 4 ) -#define SID_DB_APP_DSADVANCED_SETTINGS ( SID_DBACCESS_START + 5 ) +#define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 ) +#define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 ) +#define SID_DB_NEW ( SID_DBACCESS_START + 2 ) +#define SID_DB_APP_DISABLE_PREVIEW ( SID_DBACCESS_START + 3 ) +#define SID_DB_APP_DSCONNECTION_TYPE ( SID_DBACCESS_START + 4 ) +#define SID_DB_APP_DSADVANCED_SETTINGS ( SID_DBACCESS_START + 5 ) // free -#define SID_DB_APP_VIEW_DOCINFO_PREVIEW ( SID_DBACCESS_START + 7 ) -#define SID_DB_APP_VIEW_DOC_PREVIEW ( SID_DBACCESS_START + 8 ) -#define SID_DB_APP_VIEW_TABLES ( SID_DBACCESS_START + 9 ) -#define SID_DB_APP_VIEW_QUERIES ( SID_DBACCESS_START + 10 ) -#define SID_DB_APP_DSIMPORT ( SID_DBACCESS_START + 11 ) -#define SID_DB_APP_VIEW_FORMS ( SID_DBACCESS_START + 12 ) -#define SID_DB_APP_DSRELDESIGN ( SID_DBACCESS_START + 13 ) -#define SID_DB_APP_DSUSERADMIN ( SID_DBACCESS_START + 14 ) -#define SID_DB_APP_TABLEFILTER ( SID_DBACCESS_START + 15 ) -#define SID_DB_APP_CLOSECONNECTION ( SID_DBACCESS_START + 16 ) -#define SID_DB_APP_DSPROPS ( SID_DBACCESS_START + 17 ) -#define SID_DB_APP_DBADMIN ( SID_DBACCESS_START + 18 ) -#define SID_APP_NEW_REPORT_PRE_SEL ( SID_DBACCESS_START + 19 ) -#define SID_DB_APP_CONVERTTOVIEW ( SID_DBACCESS_START + 20 ) -#define SID_DB_APP_REFRESH_TABLES ( SID_DBACCESS_START + 21 ) -#define SID_DB_APP_VIEW_REPORTS ( SID_DBACCESS_START + 22 ) -#define SID_DB_APP_DSEXPORT ( SID_DBACCESS_START + 23 ) +#define SID_DB_APP_VIEW_DOCINFO_PREVIEW ( SID_DBACCESS_START + 7 ) +#define SID_DB_APP_VIEW_DOC_PREVIEW ( SID_DBACCESS_START + 8 ) +#define SID_DB_APP_VIEW_TABLES ( SID_DBACCESS_START + 9 ) +#define SID_DB_APP_VIEW_QUERIES ( SID_DBACCESS_START + 10 ) +#define SID_DB_APP_DSIMPORT ( SID_DBACCESS_START + 11 ) +#define SID_DB_APP_VIEW_FORMS ( SID_DBACCESS_START + 12 ) +#define SID_DB_APP_DSRELDESIGN ( SID_DBACCESS_START + 13 ) +#define SID_DB_APP_DSUSERADMIN ( SID_DBACCESS_START + 14 ) +#define SID_DB_APP_TABLEFILTER ( SID_DBACCESS_START + 15 ) +#define SID_DB_APP_CLOSECONNECTION ( SID_DBACCESS_START + 16 ) +#define SID_DB_APP_DSPROPS ( SID_DBACCESS_START + 17 ) +#define SID_DB_APP_DBADMIN ( SID_DBACCESS_START + 18 ) +#define SID_APP_NEW_REPORT_PRE_SEL ( SID_DBACCESS_START + 19 ) +#define SID_DB_APP_CONVERTTOVIEW ( SID_DBACCESS_START + 20 ) +#define SID_DB_APP_REFRESH_TABLES ( SID_DBACCESS_START + 21 ) +#define SID_DB_APP_VIEW_REPORTS ( SID_DBACCESS_START + 22 ) +#define SID_DB_APP_DSEXPORT ( SID_DBACCESS_START + 23 ) -#define SID_DB_APP_TABLE_DELETE ( SID_DBACCESS_START + 24 ) -#define SID_DB_APP_TABLE_RENAME ( SID_DBACCESS_START + 25 ) -#define SID_DB_APP_TABLE_EDIT ( SID_DBACCESS_START + 26 ) -#define SID_DB_APP_TABLE_OPEN ( SID_DBACCESS_START + 27 ) +#define SID_DB_APP_TABLE_DELETE ( SID_DBACCESS_START + 24 ) +#define SID_DB_APP_TABLE_RENAME ( SID_DBACCESS_START + 25 ) +#define SID_DB_APP_TABLE_EDIT ( SID_DBACCESS_START + 26 ) +#define SID_DB_APP_TABLE_OPEN ( SID_DBACCESS_START + 27 ) -#define SID_DB_APP_QUERY_DELETE ( SID_DBACCESS_START + 28 ) -#define SID_DB_APP_QUERY_RENAME ( SID_DBACCESS_START + 29 ) -#define SID_DB_APP_QUERY_EDIT ( SID_DBACCESS_START + 30 ) -#define SID_DB_APP_QUERY_OPEN ( SID_DBACCESS_START + 31 ) +#define SID_DB_APP_QUERY_DELETE ( SID_DBACCESS_START + 28 ) +#define SID_DB_APP_QUERY_RENAME ( SID_DBACCESS_START + 29 ) +#define SID_DB_APP_QUERY_EDIT ( SID_DBACCESS_START + 30 ) +#define SID_DB_APP_QUERY_OPEN ( SID_DBACCESS_START + 31 ) -#define SID_DB_APP_FORM_DELETE ( SID_DBACCESS_START + 32 ) -#define SID_DB_APP_FORM_RENAME ( SID_DBACCESS_START + 33 ) -#define SID_DB_APP_FORM_EDIT ( SID_DBACCESS_START + 34 ) -#define SID_DB_APP_FORM_OPEN ( SID_DBACCESS_START + 35 ) +#define SID_DB_APP_FORM_DELETE ( SID_DBACCESS_START + 32 ) +#define SID_DB_APP_FORM_RENAME ( SID_DBACCESS_START + 33 ) +#define SID_DB_APP_FORM_EDIT ( SID_DBACCESS_START + 34 ) +#define SID_DB_APP_FORM_OPEN ( SID_DBACCESS_START + 35 ) -#define SID_DB_APP_REPORT_DELETE ( SID_DBACCESS_START + 36 ) -#define SID_DB_APP_REPORT_RENAME ( SID_DBACCESS_START + 37 ) -#define SID_DB_APP_REPORT_EDIT ( SID_DBACCESS_START + 38 ) -#define SID_DB_APP_REPORT_OPEN ( SID_DBACCESS_START + 39 ) +#define SID_DB_APP_REPORT_DELETE ( SID_DBACCESS_START + 36 ) +#define SID_DB_APP_REPORT_RENAME ( SID_DBACCESS_START + 37 ) +#define SID_DB_APP_REPORT_EDIT ( SID_DBACCESS_START + 38 ) +#define SID_DB_APP_REPORT_OPEN ( SID_DBACCESS_START + 39 ) -#define SID_DB_APP_DELETE ( SID_DBACCESS_START + 40 ) -#define SID_DB_APP_RENAME ( SID_DBACCESS_START + 41 ) -#define SID_DB_APP_EDIT ( SID_DBACCESS_START + 42 ) -#define SID_DB_APP_OPEN ( SID_DBACCESS_START + 43 ) +#define SID_DB_APP_DELETE ( SID_DBACCESS_START + 40 ) +#define SID_DB_APP_RENAME ( SID_DBACCESS_START + 41 ) +#define SID_DB_APP_EDIT ( SID_DBACCESS_START + 42 ) +#define SID_DB_APP_OPEN ( SID_DBACCESS_START + 43 ) -#define SID_BROWSER_CLEAR_QUERY ( SID_DBACCESS_START + 44 ) -#define SID_RELATION_ADD_RELATION ( SID_DBACCESS_START + 45 ) -#define SID_QUERY_VIEW_FUNCTIONS ( SID_DBACCESS_START + 46 ) -#define SID_QUERY_VIEW_TABLES ( SID_DBACCESS_START + 47 ) -#define SID_QUERY_VIEW_ALIASES ( SID_DBACCESS_START + 48 ) -#define SID_QUERY_DISTINCT_VALUES ( SID_DBACCESS_START + 49 ) -#define SID_FORM_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 50 ) -#define SID_REPORT_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 51 ) -#define SID_DB_QUERY_PREVIEW ( SID_DBACCESS_START + 52 ) -#define SID_APP_NEW_FOLDER ( SID_DBACCESS_START + 53 ) -#define SID_APP_NEW_FORM ( SID_DBACCESS_START + 54 ) -#define SID_DB_APP_PASTE_SPECIAL ( SID_DBACCESS_START + 55 ) +#define SID_BROWSER_CLEAR_QUERY ( SID_DBACCESS_START + 44 ) +#define SID_RELATION_ADD_RELATION ( SID_DBACCESS_START + 45 ) +#define SID_QUERY_VIEW_FUNCTIONS ( SID_DBACCESS_START + 46 ) +#define SID_QUERY_VIEW_TABLES ( SID_DBACCESS_START + 47 ) +#define SID_QUERY_VIEW_ALIASES ( SID_DBACCESS_START + 48 ) +#define SID_QUERY_DISTINCT_VALUES ( SID_DBACCESS_START + 49 ) +#define SID_FORM_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 50 ) +#define SID_REPORT_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 51 ) +#define SID_DB_QUERY_PREVIEW ( SID_DBACCESS_START + 52 ) +#define SID_APP_NEW_FOLDER ( SID_DBACCESS_START + 53 ) +#define SID_APP_NEW_FORM ( SID_DBACCESS_START + 54 ) +#define SID_DB_APP_PASTE_SPECIAL ( SID_DBACCESS_START + 55 ) // status information -#define SID_DB_APP_STATUS_TYPE ( SID_DBACCESS_START + 57 ) -#define SID_DB_APP_STATUS_DBNAME ( SID_DBACCESS_START + 58 ) -#define SID_DB_APP_STATUS_USERNAME ( SID_DBACCESS_START + 59 ) -#define SID_DB_APP_STATUS_HOSTNAME ( SID_DBACCESS_START + 60 ) +#define SID_DB_APP_STATUS_TYPE ( SID_DBACCESS_START + 57 ) +#define SID_DB_APP_STATUS_DBNAME ( SID_DBACCESS_START + 58 ) +#define SID_DB_APP_STATUS_USERNAME ( SID_DBACCESS_START + 59 ) +#define SID_DB_APP_STATUS_HOSTNAME ( SID_DBACCESS_START + 60 ) -#define SID_DB_APP_SENDREPORTASMAIL ( SID_DBACCESS_START + 61 ) -#define SID_DB_APP_SENDREPORTTOWRITER ( SID_DBACCESS_START + 62 ) -#define SID_DB_FORM_NEW_PILOT ( SID_DBACCESS_START + 63 ) -#define SID_DB_NEW_VIEW_SQL ( SID_DBACCESS_START + 64 ) -#define SID_APP_NEW_REPORT ( SID_DBACCESS_START + 65 ) +#define SID_DB_APP_SENDREPORTASMAIL ( SID_DBACCESS_START + 61 ) +#define SID_DB_APP_SENDREPORTTOWRITER ( SID_DBACCESS_START + 62 ) +#define SID_DB_FORM_NEW_PILOT ( SID_DBACCESS_START + 63 ) +#define SID_DB_NEW_VIEW_SQL ( SID_DBACCESS_START + 64 ) +#define SID_APP_NEW_REPORT ( SID_DBACCESS_START + 65 ) -#define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 ) +#define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 ) #endif // _DBACCESS_SLOTID_HRC_ diff --git a/dbaccess/inc/dbaccessdllapi.h b/dbaccess/inc/dbaccessdllapi.h index 7365d0c4c84f..5b28a894fe22 100644 --- a/dbaccess/inc/dbaccessdllapi.h +++ b/dbaccess/inc/dbaccessdllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,18 +28,18 @@ #ifndef INCLUDED_DBACCESSDLLAPI_H #define INCLUDED_DBACCESSDLLAPI_H - + #ifndef _SAL_TYPES_H_ #include "sal/types.h" #endif - + #if defined(DBACCESS_DLLIMPLEMENTATION) #define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define DBACCESS_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_DBACCESSDLLAPI_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index 510e554e93f6..d31229fbc04f 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,7 +132,7 @@ namespace dbaui */ struct FeatureState { - sal_Bool bEnabled; + sal_Bool bEnabled; optional< bool > bChecked; optional< bool > bInvisible; @@ -173,8 +173,8 @@ namespace dbaui { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; - sal_Int32 nId; - sal_Bool bForceBroadcast; + sal_Int32 nId; + sal_Bool bForceBroadcast; }; // .................................................................... @@ -214,15 +214,15 @@ namespace dbaui ,public IController { private: - SupportedFeatures m_aSupportedFeatures; + SupportedFeatures m_aSupportedFeatures; ::comphelper::NamedValueCollection m_aInitParameters; ::std::auto_ptr< OGenericUnoController_Data > m_pData; - ODataView* m_pView; // our (VCL) "main window" + ODataView* m_pView; // our (VCL) "main window" -#ifdef DBG_UTIL +#ifdef DBG_UTIL bool m_bDescribingSupportedFeatures; #endif @@ -231,8 +231,8 @@ namespace dbaui // attributes struct DispatchTarget { - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; DispatchTarget() { } DispatchTarget(const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xRef) : aURL(rURL), xListener(xRef) { } @@ -243,32 +243,32 @@ namespace dbaui FeatureListeners m_aFeaturesToInvalidate; - ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque - StateCache m_aStateCache; // save the current status of feature state - Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes - OAsyncronousLink m_aAsyncInvalidateAll; - OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed + ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque + StateCache m_aStateCache; // save the current status of feature state + Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes + OAsyncronousLink m_aAsyncInvalidateAll; + OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; ControllerFrame m_aCurrentFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; // for intercepting dispatches - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; // dito - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDatabaseContext; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; // for intercepting dispatches + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; // dito + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDatabaseContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > m_xTitleHelper; - sal_Bool m_bPreview; - sal_Bool m_bReadOnly; - - sal_Bool m_bCurrentlyModified : 1; - sal_Bool m_bExternalTitle : 1; + sal_Bool m_bPreview; + sal_Bool m_bReadOnly; + sal_Bool m_bCurrentlyModified : 1; + sal_Bool m_bExternalTitle : 1; + // ---------------------------------------------------------------- // attribute access - ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } - ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } + ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } + ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } // ---------------------------------------------------------------- // methods @@ -278,13 +278,13 @@ namespace dbaui /** open the help agent for the given help id. - @param _nHelpId + @param _nHelpId The help id to dispatch. */ void openHelpAgent(sal_Int32 _nHelpId); /** open the help agent for the given help url. - @param _pHelpStringURL + @param _pHelpStringURL The help url to dispatch. */ void openHelpAgent( const rtl::OUString& _suHelpStringURL ); @@ -300,22 +300,22 @@ namespace dbaui void closeTask(); // if getMenu returns a non empty string than this will be dispatched at the frame - virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); + virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); /** called when our menu has been loaded into our frame, can be used to load sub toolbars @param _xLayoutManager The layout manager. */ - virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); + virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); // 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); /** describes a feature supported by the controller @@ -337,7 +337,7 @@ namespace dbaui ); /** returns <TRUE/> if the feature is supported, otherwise <FALSE/> - @param _nId + @param _nId The ID of the feature. */ sal_Bool isFeatureSupported( sal_Int32 _nId ); @@ -435,7 +435,7 @@ namespace dbaui virtual sal_Bool Construct(Window* pParent); /** get the layout manager - @param _xFrame + @param _xFrame The frame to ask for the layout manager. @return The layout manager of the frame, can be <NULL/> if the frame isn't initialized. @@ -483,9 +483,9 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame(void) throw( ::com::sun::star::uno::RuntimeException ); // ::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); - virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); + 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); + virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException); @@ -504,7 +504,7 @@ namespace dbaui virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException); // ::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 ); // lang::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/inc/pch/precompiled_dbaccess.cxx b/dbaccess/inc/pch/precompiled_dbaccess.cxx index 0fe2c43d1189..a5a4e8af7fa8 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.cxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index daa7a324ab60..dc926527e617 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx index 75e146ec2a05..7b61d7fad3db 100644 --- a/dbaccess/inc/singledoccontroller.hxx +++ b/dbaccess/inc/singledoccontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,22 +74,22 @@ namespace dbaui ::std::auto_ptr<OSingleDocumentControllerImpl> m_pImpl; protected: - SfxUndoManager m_aUndoManager; + SfxUndoManager m_aUndoManager; private: /** forces usage of a connection which we do not own <p>To be used from within XInitialization::initialize, resp. impl_initialize, only.</p> */ - void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); + void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); protected: // OGenericUnoController - initialization virtual void impl_initialize(); // 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 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const; @@ -98,8 +98,8 @@ namespace dbaui public: - sal_Bool isReadOnly() const; - sal_Bool isEditable() const; + sal_Bool isReadOnly() const; + sal_Bool isEditable() const; void setEditable(sal_Bool _bEditable); // need for undo's and redo's @@ -107,13 +107,13 @@ namespace dbaui /** addUndoActionAndInvalidate adds an undo action to the undoManager, additionally invalidates the UNDO and REDO slot - @param pAction the undo action to add + @param pAction the undo action to add */ void addUndoActionAndInvalidate(SfxUndoAction *pAction); // ---------------------------------------------------------------- // asking for connection-related stuff - - sal_Bool isConnected() const; + + sal_Bool isConnected() const; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > getMetaData( ) const; @@ -123,7 +123,7 @@ namespace dbaui ::rtl::OUString getDataSourceName() const; const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& getDataSource() const; - sal_Bool haveDataSource() const; + sal_Bool haveDataSource() const; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getDatabaseDocument() const; @@ -171,7 +171,7 @@ namespace dbaui /** returns the number formatter */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const; // ::com::sun::star::frame::XController virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); @@ -197,7 +197,7 @@ namespace dbaui virtual void disconnect(); virtual void reconnect( sal_Bool _bUI ); - sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } + sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } /** called when our connection is beeing disposed <p>The default implementation does a reconnect</p> @@ -215,7 +215,7 @@ namespace dbaui virtual void SAL_CALL disposing(); // 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); @@ -228,7 +228,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBAUI_SINGLEDOCCONTROLLER_HXX diff --git a/dbaccess/prj/dbu.xml b/dbaccess/prj/dbu.xml index 2acdaf9c75a6..097fa06244aa 100644 --- a/dbaccess/prj/dbu.xml +++ b/dbaccess/prj/dbu.xml @@ -110,7 +110,7 @@ <status value="final"/> <supported-service>com.sun.star.accessibility.Accessible</supported-service> <supported-service>com.sun.star.accessibility.AccessibleContext</supported-service> - </component-description> + </component-description> <component-description> <author>Ocke Janssen</author> <name>com.sun.star.comp.dbu.OColumnControl</name> diff --git a/dbaccess/qa/complex/dbaccess/ApplicationController.java b/dbaccess/qa/complex/dbaccess/ApplicationController.java index 4c964e82dc06..33a62821a2b8 100644 --- a/dbaccess/qa/complex/dbaccess/ApplicationController.java +++ b/dbaccess/qa/complex/dbaccess/ApplicationController.java @@ -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/qa/complex/dbaccess/Beamer.java b/dbaccess/qa/complex/dbaccess/Beamer.java index 909bf39d1707..797b5bca6cae 100644 --- a/dbaccess/qa/complex/dbaccess/Beamer.java +++ b/dbaccess/qa/complex/dbaccess/Beamer.java @@ -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 @@ -162,7 +162,7 @@ public class Beamer extends complexlib.ComplexTestCase new PropertyValue("CommandType", 0, Integer.valueOf(CommandType.TABLE), PropertyState.DIRECT_VALUE), new PropertyValue("Command", 0, "biblio", PropertyState.DIRECT_VALUE) }; - + final XFrame beamer = frame.findFrame("_beamer", 0); assure(beamer != null); final XEnumerationAccess evtBc = (XEnumerationAccess) UnoRuntime.queryInterface(XEnumerationAccess.class, getORB().createInstance("com.sun.star.frame.GlobalEventBroadcaster")); diff --git a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java index 3bba8fa45001..f9f65268ff9c 100644 --- a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java +++ b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java @@ -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/qa/complex/dbaccess/CopyTableInterActionHandler.java b/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java index 53527e356f78..5967086df53b 100755 --- a/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java @@ -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/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java index 7c3db7f6020d..9bb102e28677 100755 --- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java @@ -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 @@ -100,7 +100,7 @@ public class CopyTableWizard extends CRMBasedTestCase } // -------------------------------------------------------------------------------------------------------- - + class CopyThread implements Runnable { @@ -141,7 +141,7 @@ public class CopyTableWizard extends CRMBasedTestCase } public void copyTableDbase() throws Exception, IOException, java.lang.Exception - { + { copyTable(source,dest); } public void copyTable(final DatabaseApplication sourceDb,final DatabaseApplication destDb) throws Exception, IOException, java.lang.Exception diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java index f74d5af8d8f0..69a9fdd82d60 100644 --- a/dbaccess/qa/complex/dbaccess/DataSource.java +++ b/dbaccess/qa/complex/dbaccess/DataSource.java @@ -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/qa/complex/dbaccess/DatabaseApplication.java b/dbaccess/qa/complex/dbaccess/DatabaseApplication.java index d6bfa804eafa..b9aaac35c222 100755 --- a/dbaccess/qa/complex/dbaccess/DatabaseApplication.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseApplication.java @@ -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/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java index 02fb820f3fd4..20ae862075f9 100644 --- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java @@ -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/qa/complex/dbaccess/FileHelper.java b/dbaccess/qa/complex/dbaccess/FileHelper.java index f72dc0ff7ca3..f9c2b0a40f58 100644 --- a/dbaccess/qa/complex/dbaccess/FileHelper.java +++ b/dbaccess/qa/complex/dbaccess/FileHelper.java @@ -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/qa/complex/dbaccess/Parser.java b/dbaccess/qa/complex/dbaccess/Parser.java index 2b1b9342edcb..9616a645af24 100644 --- a/dbaccess/qa/complex/dbaccess/Parser.java +++ b/dbaccess/qa/complex/dbaccess/Parser.java @@ -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/qa/complex/dbaccess/PropertyBag.java b/dbaccess/qa/complex/dbaccess/PropertyBag.java index c686be886bba..911ac557e455 100644 --- a/dbaccess/qa/complex/dbaccess/PropertyBag.java +++ b/dbaccess/qa/complex/dbaccess/PropertyBag.java @@ -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/qa/complex/dbaccess/Query.java b/dbaccess/qa/complex/dbaccess/Query.java index 81a651fd5696..d93d5c3377e6 100644 --- a/dbaccess/qa/complex/dbaccess/Query.java +++ b/dbaccess/qa/complex/dbaccess/Query.java @@ -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/qa/complex/dbaccess/QueryInQuery.java b/dbaccess/qa/complex/dbaccess/QueryInQuery.java index 002d0395b791..cd25209347de 100644 --- a/dbaccess/qa/complex/dbaccess/QueryInQuery.java +++ b/dbaccess/qa/complex/dbaccess/QueryInQuery.java @@ -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/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java index 5a13f6724d1f..ecf66e8306a2 100644 --- a/dbaccess/qa/complex/dbaccess/RowSet.java +++ b/dbaccess/qa/complex/dbaccess/RowSet.java @@ -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/qa/complex/dbaccess/RowSetEventListener.java b/dbaccess/qa/complex/dbaccess/RowSetEventListener.java index c4569986a5d7..b0901d9790bb 100644 --- a/dbaccess/qa/complex/dbaccess/RowSetEventListener.java +++ b/dbaccess/qa/complex/dbaccess/RowSetEventListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,11 +43,11 @@ public class RowSetEventListener implements XRowSetApproveListener,XRowSetListen public static final int IS_MODIFIED = 5; public static final int IS_NEW = 6; public static final int ROW_COUNT = 7; - public static final int IS_ROW_COUNT_FINAL = 8; - + public static final int IS_ROW_COUNT_FINAL = 8; + int callPos = 1; int calling []; - + RowSetEventListener(){ calling = new int [9]; clearCalling(); diff --git a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java index bb3636100849..6eb0525b9ffa 100755 --- a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java +++ b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java @@ -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 @@ -128,7 +128,7 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase realValue.equals(_attributeValue)); log.println(" (results in " + (String) m_composer.getQuery() + ")"); } - + /** tests setCommand of the composer */ public void testSetCommand() @@ -140,11 +140,11 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase final String table = "SELECT * FROM \"customers\""; m_composer.setCommand("customers",CommandType.TABLE); assure("setCommand/getQuery TABLE inconsistent", m_composer.getQuery().equals(table)); - + m_database.getDatabase().getDataSource().createQuery("set command test", "SELECT * FROM \"orders for customer\" \"a\", \"customers\" \"b\" WHERE \"a\".\"Product Name\" = \"b\".\"Name\""); m_composer.setCommand("set command test",CommandType.QUERY); assure("setCommand/getQuery QUERY inconsistent", m_composer.getQuery().equals(m_database.getDatabase().getDataSource().getQueryDefinition("set command test").getCommand())); - + final String sql = "SELECT * FROM \"orders for customer\" WHERE \"Product Name\" = 'test'"; m_composer.setCommand(sql,CommandType.COMMAND); assure("setCommand/getQuery COMMAND inconsistent", m_composer.getQuery().equals(sql)); @@ -166,7 +166,7 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase final String simpleQuery2 = "SELECT * FROM \"customers\" WHERE \"Name\" = 'oranges'"; m_composer.setElementaryQuery(simpleQuery2); assure("setElementaryQuery/getQuery inconsistent", m_composer.getQuery().equals(simpleQuery2)); - + log.println("check setQuery"); final String simpleQuery = "SELECT * FROM \"customers\""; m_composer.setQuery(simpleQuery); diff --git a/dbaccess/qa/complex/dbaccess/TestCase.java b/dbaccess/qa/complex/dbaccess/TestCase.java index b8dae3f6f350..c66efeb0af91 100644 --- a/dbaccess/qa/complex/dbaccess/TestCase.java +++ b/dbaccess/qa/complex/dbaccess/TestCase.java @@ -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 @@ -77,7 +77,7 @@ public abstract class TestCase extends complexlib.ComplexTestCase // -------------------------------------------------------------------------------------------------------- /** returns the URL of a temporary file which can be used during the test. - * + * * The file will be deleted when the process exits * @return the URL of a temporary file */ diff --git a/dbaccess/qa/complex/dbaccess/UISettings.java b/dbaccess/qa/complex/dbaccess/UISettings.java index fc772b158f5f..6ae8fa5f0506 100644 --- a/dbaccess/qa/complex/dbaccess/UISettings.java +++ b/dbaccess/qa/complex/dbaccess/UISettings.java @@ -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/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index 5a88c248befd..412c2d7bd28a 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -43,11 +43,11 @@ using namespace ::dbtools; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdb; +// using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -// using namespace ::cppu; +// using namespace ::cppu; using namespace ::osl; void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) @@ -133,7 +133,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::updateRow" ); - // OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable); + // OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable); Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY); if(!xUpdRow.is()) ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this ); diff --git a/dbaccess/source/core/api/CIndexColumn.hxx b/dbaccess/source/core/api/CIndexColumn.hxx index 2ac731919703..3bd08da3d7a6 100644 --- a/dbaccess/source/core/api/CIndexColumn.hxx +++ b/dbaccess/source/core/api/CIndexColumn.hxx @@ -38,18 +38,18 @@ namespace connectivity class OIndexColumn : public OAdabasColumn { protected: - sal_Bool m_IsAscending; + sal_Bool m_IsAscending; public: OIndexColumn(); - OIndexColumn( sal_Bool _IsAscending, + OIndexColumn( sal_Bool _IsAscending, const ::rtl::OUString& _Name, const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); virtual void construct(); }; diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 883ec1b7b1b2..41a5cd81c8ab 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::beans; namespace dbaccess { -ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos, +ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos, const Reference< XDatabaseMetaData >& _rxDBMeta, const ::rtl::OUString& _rDescription, const ::rtl::OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue ) :ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, _rDescription, i_sLabel,_rColumnValue ) { diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx index 2d6fe45a4006..f2c84a3b22ac 100644 --- a/dbaccess/source/core/api/CRowSetColumn.hxx +++ b/dbaccess/source/core/api/CRowSetColumn.hxx @@ -41,7 +41,7 @@ namespace dbaccess { public: - ORowSetColumn( const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData, + ORowSetColumn( const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData, const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow, sal_Int32 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta, diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index c31cc17b6ec2..56e66d864db7 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -42,7 +42,7 @@ using namespace comphelper; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -52,7 +52,7 @@ using namespace osl; DBG_NAME(ORowSetDataColumn) -ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& _xMetaData, +ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, const Reference < XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, @@ -256,10 +256,10 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName void SAL_CALL ORowSetDataColumns::disposing(void) { - // clear_NoDispose(); + // clear_NoDispose(); ORowSetDataColumns_BASE::disposing(); m_aColumns = NULL; - // m_aColumns.clear(); + // m_aColumns.clear(); } void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector) diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx index 8cf0aa5f2c95..477328ef88bc 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.hxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx @@ -41,17 +41,17 @@ namespace dbaccess class ORowSetDataColumn; typedef ::comphelper::OPropertyArrayUsageHelper<ORowSetDataColumn> ORowSetDataColumn_PROP; - class ORowSetDataColumn : public ODataColumn, + class ORowSetDataColumn : public ODataColumn, public OColumnSettings, public ORowSetDataColumn_PROP { protected: - ORowSetCacheIterator m_aColumnValue; - ::com::sun::star::uno::Any m_aOldValue; + ORowSetCacheIterator m_aColumnValue; + ::com::sun::star::uno::Any m_aOldValue; ::rtl::OUString m_sLabel; - ::rtl::OUString m_aDescription; // description - ORowSetBase* m_pRowSet; + ::rtl::OUString m_aDescription; // description + ORowSetBase* m_pRowSet; virtual ~ORowSetDataColumn(); public: diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 2ebed10c0479..56b045987ab3 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -61,12 +61,12 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdb; +// using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; -// using namespace ::cppu; +// using namespace ::cppu; using namespace ::osl; DBG_NAME(OCacheSet) @@ -91,7 +91,7 @@ OCacheSet::OCacheSet() return sQuote; } -void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/) +void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::construct" ); OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet"); @@ -229,7 +229,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow if(xIndexSup.is()) xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY); - // Reference<XColumnsSupplier> + // Reference<XColumnsSupplier> Reference<XPropertySet> xIndexColsSup; Reference<XNameAccess> xIndexColumns; ::std::vector< Reference<XNameAccess> > aAllIndexColumns; @@ -238,7 +238,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow for(sal_Int32 j=0;j<xIndexes->getCount();++j) { xIndexColsSup.set(xIndexes->getByIndex(j),UNO_QUERY); - if( xIndexColsSup.is() + if( xIndexColsSup.is() && comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE)) && !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX)) ) @@ -251,7 +251,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,")); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); sal_Int32 nCheckCount = 1; // index for the orginal values sal_Int32 i = 1; @@ -357,7 +357,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); // list all cloumns that should be set - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); // use keys and indexes for excat postioning @@ -369,7 +369,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti if(xIndexSup.is()) xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY); - // Reference<XColumnsSupplier> + // Reference<XColumnsSupplier> Reference<XPropertySet> xIndexColsSup; Reference<XNameAccess> xIndexColumns; ::std::vector< Reference<XNameAccess> > aAllIndexColumns; @@ -378,7 +378,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti for(sal_Int32 j=0;j<xIndexes->getCount();++j) { xIndexColsSup.set(xIndexes->getByIndex(j),UNO_QUERY); - if( xIndexColsSup.is() + if( xIndexColsSup.is() && comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE)) && !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX)) ) diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 42f5d290edd5..078bdb83741d 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -52,19 +52,19 @@ namespace dbaccess class OCacheSet : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRow> { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xDriverSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xDriverRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xSetMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xDriverSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xDriverRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xSetMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Sequence<sal_Bool> m_aNullable; - ::com::sun::star::uno::Sequence<sal_Bool> m_aSignedFlags; - ::com::sun::star::uno::Sequence<sal_Int32> m_aColumnTypes; - ORowSetRow m_aInsertRow; - ::rtl::OUString m_aComposedTableName; - sal_Bool m_bInserted; - sal_Bool m_bUpdated; - sal_Bool m_bDeleted; + ::com::sun::star::uno::Sequence<sal_Bool> m_aNullable; + ::com::sun::star::uno::Sequence<sal_Bool> m_aSignedFlags; + ::com::sun::star::uno::Sequence<sal_Int32> m_aColumnTypes; + ORowSetRow m_aInsertRow; + ::rtl::OUString m_aComposedTableName; + sal_Bool m_bInserted; + sal_Bool m_bUpdated; + sal_Bool m_bDeleted; OCacheSet(); virtual ~OCacheSet(); diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 4befdc824b03..757e44a8d80b 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -65,7 +65,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard // for them ::rtl::OUString* pTableFilters = _rTableFilter.getArray(); - ::rtl::OUString* pEnd = pTableFilters + _rTableFilter.getLength(); + ::rtl::OUString* pEnd = pTableFilters + _rTableFilter.getLength(); sal_Int32 nShiftPos = 0; for (sal_Int32 i=0; pEnd != pTableFilters; ++pTableFilters,++i) { @@ -98,8 +98,8 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std bool bFilterMatch = ::std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd; // the table is allowed to "pass" if we had no filters at all or any of the non-wildcard filters matches if (!bFilterMatch && !_rWCSearch.empty()) - { // or if one of the wildcrad expression matches - for ( ::std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin(); + { // or if one of the wildcrad expression matches + for ( ::std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin(); aLoop != _rWCSearch.end() && !bFilterMatch; ++aLoop ) @@ -255,7 +255,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std ::osl::Mutex& _rMutex, const Reference< XConnection >& _xCon, sal_Bool _bCase, - IRefreshListener* _pRefreshListener, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) :OCollection(_rParent,_bCase,_rMutex,::std::vector< ::rtl::OUString>()) @@ -311,7 +311,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std { // build sorted versions of the filter sequences, so the visibility decision is faster Sequence< ::rtl::OUString > aTableFilter(_rTableFilter); - sal_Int32 nTableFilterLen = aTableFilter.getLength(); + sal_Int32 nTableFilterLen = aTableFilter.getLength(); // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard // for them @@ -371,9 +371,9 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std ::rtl::OUString sCatalog, sSchema, sName, sType; while ( xTables->next() ) { - sCatalog = xCurrentRow->getString(1); - sSchema = xCurrentRow->getString(2); - sName = xCurrentRow->getString(3); + sCatalog = xCurrentRow->getString(1); + sSchema = xCurrentRow->getString(2); + sName = xCurrentRow->getString(3); sType = xCurrentRow->getString(4); aUnfilteredTables.push_back( TableInfo( sCatalog, sSchema, sName, sType ) ); @@ -401,11 +401,11 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std if ( m_xMasterContainer.is() ) removeMasterContainerListener(); - m_xMasterContainer = NULL; - m_xMetaData = NULL; + m_xMasterContainer = NULL; + m_xMetaData = NULL; m_pWarningsContainer = NULL; - m_pRefreshListener = NULL; - m_bConstructed = sal_False; + m_pRefreshListener = NULL; + m_bConstructed = sal_False; } void OFilteredContainer::impl_refresh() throw(RuntimeException) diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index f88024bc9b7a..ec24c9cbac15 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -53,7 +53,7 @@ namespace dbaccess typedef connectivity::sdbcx::OCollection OPrivateColumns_Base; class OPrivateColumns : public OPrivateColumns_Base { - ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; + ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} @@ -88,7 +88,7 @@ namespace dbaccess //========================================================================== class OPrivateTables : public OPrivateTables_BASE { - OSQLTables m_aTables; + OSQLTables m_aTables; protected: virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} @@ -97,7 +97,7 @@ namespace dbaccess return NULL; } public: - OPrivateTables( const OSQLTables& _rTables, + OPrivateTables( const OSQLTables& _rTables, sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 0d4c3147efb6..17ec5dfacdba 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -89,7 +89,7 @@ namespace for(sal_Int32 j = 0 ; j < nCount ; ++j) { xIndexColsSup.set(_xIndexes->getByIndex(j),UNO_QUERY); - if( xIndexColsSup.is() + if( xIndexColsSup.is() && comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE)) && !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX)) ) @@ -102,7 +102,7 @@ DBG_NAME(OKeySet) OKeySet::OKeySet(const connectivity::OSQLTable& _xTable, const Reference< XIndexAccess>& _xTableKeys, - const ::rtl::OUString& _rUpdateTableName, // this can be the alias or the full qualified name + const ::rtl::OUString& _rUpdateTableName, // this can be the alias or the full qualified name const Reference< XSingleSelectQueryAnalyzer >& _xComposer, const ORowSetValueVector& _aParameterValueForCache) :m_aParameterValueForCache(_aParameterValueForCache) @@ -156,7 +156,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, { // first ask the database itself for the best columns which can be used Sequence< ::rtl::OUString> aBestColumnNames; - Reference<XNameAccess> xKeyColumns = getPrimaryKeyColumns_throw(i_aTable); + Reference<XNameAccess> xKeyColumns = getPrimaryKeyColumns_throw(i_aTable); if ( xKeyColumns.is() ) aBestColumnNames = xKeyColumns->getElementNames(); @@ -220,7 +220,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, ::rtl::OUStringBuffer OKeySet::createKeyFilter() { static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - const ::rtl::OUString aQuote = getIdentifierQuoteString(); + const ::rtl::OUString aQuote = getIdentifierQuoteString(); ::rtl::OUStringBuffer aFilter; static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -246,13 +246,13 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O OCacheSet::construct(_xDriverSet,i_sRowSetFilter); initColumns(); - Reference<XNameAccess> xKeyColumns = getKeyColumns(); + Reference<XNameAccess> xKeyColumns = getKeyColumns(); Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData(); Reference<XColumnsSupplier> xQueryColSup(m_xComposer,UNO_QUERY); const Reference<XNameAccess> xQueryColumns = xQueryColSup->getColumns(); findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns,m_pKeyColumnNames); - // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first + // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first // without extra varaible to be set m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair<sal_Int32,Reference<XRow> >(0,NULL)))); m_aKeyIter = m_aKeyMap.begin(); @@ -269,11 +269,11 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O if ( aSeq.getLength() > 1 ) // special handling for join { static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - const ::rtl::OUString aQuote = getIdentifierQuoteString(); + const ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( *pIter != m_sUpdateTableName ) @@ -401,7 +401,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); // list all cloumns that should be set - const ::rtl::OUString aQuote = getIdentifierQuoteString(); + const ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); static ::rtl::OUString aOr(RTL_CONSTASCII_USTRINGPARAM(" OR ")); static ::rtl::OUString aEqual(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -424,8 +424,8 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows aCondition.setLength(aCondition.getLength()-5); const ::rtl::OUString sCon( aCondition.makeStringAndClear() ); - const Any* pBegin = rows.getConstArray(); - const Any* pEnd = pBegin + rows.getLength(); + const Any* pBegin = rows.getConstArray(); + const Any* pEnd = pBegin + rows.getLength(); Sequence< Any > aKeys; for(;pBegin != pEnd;++pBegin) @@ -440,7 +440,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear())); Reference< XParameters > xParameter(xPrep,UNO_QUERY); - pBegin = rows.getConstArray(); + pBegin = rows.getConstArray(); sal_Int32 i=1; for(;pBegin != pEnd;++pBegin) { @@ -489,7 +489,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" SET "))); // list all cloumns that should be set static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM(" = ?,")); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -950,7 +950,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); // list all cloumns that should be set - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); // use keys and indexes for excat postioning @@ -961,7 +961,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit if ( xIndexSup.is() ) xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY); - // Reference<XColumnsSupplier> + // Reference<XColumnsSupplier> ::std::vector< Reference<XNameAccess> > aAllIndexColumns; lcl_fillIndexColumns(xIndexes,aAllIndexColumns); @@ -1573,11 +1573,11 @@ void getColumnPositions(const Reference<XNameAccess>& _rxQueryColumns, { // get the real name of the columns Sequence< ::rtl::OUString> aSelNames(_rxQueryColumns->getElementNames()); - const ::rtl::OUString* pSelIter = aSelNames.getConstArray(); - const ::rtl::OUString* pSelEnd = pSelIter + aSelNames.getLength(); + const ::rtl::OUString* pSelIter = aSelNames.getConstArray(); + const ::rtl::OUString* pSelEnd = pSelIter + aSelNames.getLength(); - const ::rtl::OUString* pTblColumnIter = _aColumnNames.getConstArray(); - const ::rtl::OUString* pTblColumnEnd = pTblColumnIter + _aColumnNames.getLength(); + const ::rtl::OUString* pTblColumnIter = _aColumnNames.getConstArray(); + const ::rtl::OUString* pTblColumnEnd = pTblColumnIter + _aColumnNames.getLength(); ::comphelper::UStringMixLess aTmp(o_rColumnNames.key_comp()); @@ -1589,17 +1589,17 @@ void getColumnPositions(const Reference<XNameAccess>& _rxQueryColumns, ::rtl::OUString sRealName,sTableName; OSL_ENSURE(xQueryColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME),"Property REALNAME not available!"); OSL_ENSURE(xQueryColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_TABLENAME),"Property TABLENAME not available!"); - xQueryColumnProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; - xQueryColumnProp->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; + xQueryColumnProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xQueryColumnProp->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; for(;pTblColumnIter != pTblColumnEnd;++pTblColumnIter) { if(bCase(sRealName,*pTblColumnIter) && bCase(_rsUpdateTableName,sTableName) && o_rColumnNames.find(*pTblColumnIter) == o_rColumnNames.end()) { sal_Int32 nType = 0; - xQueryColumnProp->getPropertyValue(PROPERTY_TYPE) >>= nType; + xQueryColumnProp->getPropertyValue(PROPERTY_TYPE) >>= nType; sal_Int32 nScale = 0; - xQueryColumnProp->getPropertyValue(PROPERTY_SCALE) >>= nScale; + xQueryColumnProp->getPropertyValue(PROPERTY_SCALE) >>= nScale; ::rtl::OUString sColumnDefault; if ( xQueryColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_DEFAULTVALUE) ) xQueryColumnProp->getPropertyValue(PROPERTY_DEFAULTVALUE) >>= sColumnDefault; diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 3ee20477f63a..a439fb22e1d1 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -85,10 +85,10 @@ namespace dbaccess class OKeySet : public OCacheSet { protected: - OKeySetMatrix m_aKeyMap; - OKeySetMatrix::iterator m_aKeyIter; + OKeySetMatrix m_aKeyMap; + OKeySetMatrix::iterator m_aKeyIter; - ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones + ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching ORowSetValueVector m_aParameterValueForCache; @@ -96,22 +96,22 @@ namespace dbaccess ::std::auto_ptr<SelectColumnsMetaData> m_pColumnNames; // contains all column names ::std::auto_ptr<SelectColumnsMetaData> m_pParameterNames; // contains all parameter names ::std::auto_ptr<SelectColumnsMetaData> m_pForeignColumnNames; // contains all column names of the rest - connectivity::OSQLTable m_xTable; // reference to our table + connectivity::OSQLTable m_xTable; // reference to our table ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xTableKeys; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer; - ::rtl::OUString m_sUpdateTableName; - ::std::vector< ::rtl::OUString > m_aFilterColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer; + ::rtl::OUString m_sUpdateTableName; + ::std::vector< ::rtl::OUString > m_aFilterColumns; sal_Bool m_bRowCountFinal; /** getComposedTableName return the composed table name for the query - @param _sCatalog the catalogname may be empty - @param _sSchema the schemaname may be empty - @param _sTable the tablename + @param _sCatalog the catalogname may be empty + @param _sSchema the schemaname may be empty + @param _sTable the tablename @return the composed name */ diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 9433df191294..3609068d794b 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -140,7 +140,7 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: m_pKeyColumnNames->insert(pKeyColumNames->begin(),pKeyColumNames->end()); } - // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first + // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first // without extra variable to be set m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair<sal_Int32,Reference<XRow> >(0,NULL)))); m_aKeyIter = m_aKeyMap.begin(); @@ -188,7 +188,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow throw SQLException(); // list all cloumns that should be set static ::rtl::OUString s_sPara(RTL_CONSTASCII_USTRINGPARAM(" = ?")); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -276,7 +276,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn TSQLStatements aParameter; TSQLStatements aKeyConditions; ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -385,7 +385,7 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); static const ::rtl::OUString s_sAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); ::rtl::OUString aColumnName; ::rtl::OUStringBuffer sKeyCondition,sIndexCondition; ::std::vector<sal_Int32> aIndexColumnPositions; @@ -662,7 +662,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const TSQLStatements aSql; TSQLStatements aKeyConditions; ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index 3dc4ad4f0e73..6fcefad8d1e6 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -48,8 +48,8 @@ namespace dbaccess // is used when the source supports keys class OptimisticSet : public OKeySet { - ::connectivity::OSQLParser m_aSqlParser; - ::connectivity::OSQLParseTreeIterator m_aSqlIterator; + ::connectivity::OSQLParser m_aSqlParser; + ::connectivity::OSQLParseTreeIterator m_aSqlIterator; ::std::map<sal_Int32,sal_Int32> m_aJoinedColumns; ::std::map<sal_Int32,sal_Int32> m_aJoinedKeyColumns; @@ -58,9 +58,9 @@ namespace dbaccess /** getComposedTableName return the composed table name for the query - @param _sCatalog the catalogname may be empty - @param _sSchema the schemaname may be empty - @param _sTable the tablename + @param _sCatalog the catalogname may be empty + @param _sSchema the schemaname may be empty + @param _sTable the tablename @return the composed name */ diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index d035d1480648..6339b8df52f3 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -109,28 +109,28 @@ extern "C" void SAL_CALL createRegistryInfo_ORowSet() static ::dba::OAutoRegistration< ORowSet > aAutoRegistration; } -#define NOTIFY_LISTERNERS_CHECK(_rListeners,T,method) \ +#define NOTIFY_LISTERNERS_CHECK(_rListeners,T,method) \ Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \ \ - const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ + const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \ \ - _rGuard.clear(); \ - sal_Bool bCheck = sal_True; \ - while( pxInt > pxIntBegin && bCheck ) \ - { \ - try \ - { \ - while( pxInt > pxIntBegin && bCheck ) \ - { \ - --pxInt; \ - bCheck = static_cast< T* >( pxInt->get() )->method(aEvt); \ - } \ - } \ - catch( RuntimeException& ) \ - { \ - } \ - } \ + _rGuard.clear(); \ + sal_Bool bCheck = sal_True; \ + while( pxInt > pxIntBegin && bCheck ) \ + { \ + try \ + { \ + while( pxInt > pxIntBegin && bCheck ) \ + { \ + --pxInt; \ + bCheck = static_cast< T* >( pxInt->get() )->method(aEvt); \ + } \ + } \ + catch( RuntimeException& ) \ + { \ + } \ + } \ _rGuard.reset(); @@ -175,52 +175,52 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::lang::XMultiServiceFactory m_pMySelf = this; m_aActiveConnection <<= m_xActiveConnection; - sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; - sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; - sal_Int32 nBT = PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; + sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; + sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; + sal_Int32 nBT = PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; m_aPrematureParamValues.get().resize( 0 ); // sdb.RowSet Properties - registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); - registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType()); - registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType()); - registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType()); - registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType()); - registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(reinterpret_cast< Reference< XSingleSelectQueryComposer >* >(NULL))); + registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); + registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType()); + registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType()); + registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType()); + registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType()); + registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(reinterpret_cast< Reference< XSingleSelectQueryComposer >* >(NULL))); // sdbcx.ResultSet Properties - registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType()); - registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType()); + registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType()); + registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType()); // sdbc.ResultSet Properties - registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); // sdbc.RowSet Properties - registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL))); - registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() ); - registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) ); - registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - - registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL))); + registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() ); + registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) ); + registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + + registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); // ??? registerProperty(PROPERTY_CHANGE_NOTIFICATION_ENABLED, PROPERTY_ID_PROPCHANGE_NOTIFY, PropertyAttribute::BOUND, &m_bPropChangeNotifyEnabled, ::getBooleanCppuType()); @@ -288,7 +288,7 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c } } -// typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_Prop; +// typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_Prop; void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) { switch(nHandle) @@ -330,7 +330,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const setActiveConnection(xNewConnection, sal_False); } - m_bOwnConnection = sal_False; + m_bOwnConnection = sal_False; m_bRebuildConnOnExecute = sal_False; break; @@ -361,7 +361,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const // yes -> the next execute needs to rebuild our connection because of this new property m_bRebuildConnOnExecute = sal_True; else - { // no -> drop our active connection (if we have one) as it doesn't correspond to this new property value anymore + { // no -> drop our active connection (if we have one) as it doesn't correspond to this new property value anymore Reference< XConnection > xNewConn; Any aNewConn; aNewConn <<= xNewConn; @@ -573,7 +573,7 @@ void ORowSet::freeResources( bool _bComplete ) // the columns must be disposed before the querycomposer is disposed because // their owner can be the composer TDataColumns().swap(m_aDataColumns);// clear and resize capacity - m_xColumns = NULL; + m_xColumns = NULL; if ( m_pColumns ) m_pColumns->disposing(); // dispose the composer to avoid that everbody knows that the querycomposer is eol @@ -591,14 +591,14 @@ void ORowSet::freeResources( bool _bComplete ) impl_resetTables_nothrow(); - m_xStatement = NULL; - m_xTypeMap = NULL; + m_xStatement = NULL; + m_xTypeMap = NULL; - m_aBookmark = Any(); - m_bBeforeFirst = sal_True; - m_bAfterLast = sal_False; - m_bNew = sal_False; - m_bModified = sal_False; + m_aBookmark = Any(); + m_bBeforeFirst = sal_True; + m_bAfterLast = sal_False; + m_bNew = sal_False; + m_bModified = sal_False; m_bLastKnownRowCountFinal = sal_False; m_nLastKnownRowCount = 0; if ( m_aOldRow.is() ) @@ -849,7 +849,7 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw } if (!::dbtools::implUpdateObject(this, columnIndex, aNewValue)) - { // there is no other updateXXX call which can handle the value in x + { // there is no other updateXXX call which can handle the value in x ORowSetValueVector::Vector& rRow = ((*m_aCurrentRow)->get()); ORowSetNotifier aNotify(this,rRow); m_pCache->updateObject(columnIndex,aNewValue,rRow,aNotify.getChangedColumns()); @@ -963,8 +963,8 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException) if ( !aBookmarks.empty() ) aEvt.Bookmarks = Sequence<Any>(&(*aBookmarks.begin()),aBookmarks.size()); aEvt.Rows += aBookmarks.size(); - m_aBookmark = m_pCache->getBookmark(); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aBookmark = m_pCache->getBookmark(); + m_aCurrentRow = m_pCache->m_aMatrixIter; if ( m_pCache->m_aMatrixIter != m_pCache->getEnd() && (*m_pCache->m_aMatrixIter).is() ) { if ( m_pCache->isResultSetChanged() ) @@ -1072,8 +1072,8 @@ void ORowSet::implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( SQL m_pCache->cancelRowUpdates(); - m_aBookmark = m_pCache->getBookmark(); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aBookmark = m_pCache->getBookmark(); + m_aCurrentRow = m_pCache->m_aMatrixIter; m_aCurrentRow.setBookmark(m_aBookmark); // notification order @@ -1304,7 +1304,7 @@ const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex) checkCache(); if ( m_pCache && isInsertRow() ) - return ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex]; + return ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex]; return getValue(columnIndex); } @@ -1779,8 +1779,8 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi // do we need a new statement if ( m_bCommandFacetsDirty ) { - m_xStatement = NULL; - m_xComposer = NULL; + m_xStatement = NULL; + m_xComposer = NULL; Reference< XResultSet > xResultSet( impl_prepareAndExecute_throw() ); @@ -1804,14 +1804,14 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi m_pCache->m_nPrivileges = Privilege::SELECT; } m_pCache->setMaxRowSize(m_nFetchSize); - m_aCurrentRow = m_pCache->createIterator(this); + m_aCurrentRow = m_pCache->createIterator(this); m_aOldRow = m_pCache->registerOldRow(); } // get the locale - // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager(); + // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager(); Locale aLocale = SvtSysLocale().GetLocaleData().getLocale(); - // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale; + // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale; // get the numberformatTypes OSL_ENSURE(m_xActiveConnection.is(),"No ActiveConnection"); @@ -1856,7 +1856,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi } sName = sAlias; } - ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(), + ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(), this, this, i+1, @@ -1960,7 +1960,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi { xColumn->getPropertyValue(PROPERTY_LABEL) >>= sParseLabel; } - ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(), + ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(), this, this, i, @@ -2366,9 +2366,9 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw() } ::rtl::OUString aCatalog,aSchema,aTable; - xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME) >>= aCatalog; - xQuery->getPropertyValue(PROPERTY_UPDATE_SCHEMANAME) >>= aSchema; - xQuery->getPropertyValue(PROPERTY_UPDATE_TABLENAME) >>= aTable; + xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME) >>= aCatalog; + xQuery->getPropertyValue(PROPERTY_UPDATE_SCHEMANAME) >>= aSchema; + xQuery->getPropertyValue(PROPERTY_UPDATE_TABLENAME) >>= aTable; if(aTable.getLength()) m_aUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), aCatalog, aSchema, aTable, sal_False, ::dbtools::eInDataManipulation ); } @@ -2584,7 +2584,7 @@ void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Refer void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException) { if ( !::dbtools::implSetObject( this, parameterIndex, x ) ) - { // there is no other setXXX call which can handle the value in x + { // there is no other setXXX call which can handle the value in x throw SQLException(); } } @@ -2739,16 +2739,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo { DBG_CTOR(ORowSetClone, NULL); - m_nResultSetType = rParent.m_nResultSetType; + m_nResultSetType = rParent.m_nResultSetType; m_nResultSetConcurrency = ResultSetConcurrency::READ_ONLY; - m_pMySelf = this; - m_bClone = sal_True; - m_bBeforeFirst = rParent.m_bBeforeFirst; - m_bAfterLast = rParent.m_bAfterLast; - m_pCache = rParent.m_pCache; - m_aBookmark = rParent.m_aBookmark; - m_aCurrentRow = m_pCache->createIterator(this); - m_xNumberFormatTypes = rParent.m_xNumberFormatTypes; + m_pMySelf = this; + m_bClone = sal_True; + m_bBeforeFirst = rParent.m_bBeforeFirst; + m_bAfterLast = rParent.m_bAfterLast; + m_pCache = rParent.m_pCache; + m_aBookmark = rParent.m_aBookmark; + m_aCurrentRow = m_pCache->createIterator(this); + m_xNumberFormatTypes = rParent.m_xNumberFormatTypes; m_aOldRow = m_pCache->registerOldRow(); @@ -2756,16 +2756,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo ::std::vector< ::rtl::OUString> aNames; ::rtl::OUString aDescription; - // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager(); - // Locale aLocale; - // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale; + // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager(); + // Locale aLocale; + // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale; Locale aLocale = SvtSysLocale().GetLocaleData().getLocale(); if ( rParent.m_pColumns ) { Sequence< ::rtl::OUString> aSeq = rParent.m_pColumns->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pIter = aSeq.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); aColumns->get().reserve(aSeq.getLength()+1); for(sal_Int32 i=1;pIter != pEnd ;++pIter,++i) { @@ -2776,7 +2776,7 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo ::rtl::OUString sParseLabel; xColumn->getPropertyValue(PROPERTY_LABEL) >>= sParseLabel; - ORowSetColumn* pColumn = new ORowSetColumn( rParent.getMetaData(), + ORowSetColumn* pColumn = new ORowSetColumn( rParent.getMetaData(), this, i, rParent.m_xActiveConnection->getMetaData(), @@ -2807,16 +2807,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo m_pColumns = new ORowSetDataColumns(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(), aColumns,*this,m_aMutex,aNames); - sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; + sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; // sdb.RowSet Properties - // registerProperty(PROPERTY_CURSORNAME, PROPERTY_ID_CURSORNAME, PropertyAttribute::READONLY, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); - registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType()); + // registerProperty(PROPERTY_CURSORNAME, PROPERTY_ID_CURSORNAME, PropertyAttribute::READONLY, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); + registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType()); } ORowSetClone::~ORowSetClone() @@ -2874,8 +2874,8 @@ void ORowSetClone::disposing() MutexGuard aGuard( m_aMutex ); ORowSetBase::disposing(); - m_pParent = NULL; - m_pMutex = &m_aMutex; // this must be done here because someone could hold a ref to us and try to do something + m_pParent = NULL; + m_pMutex = &m_aMutex; // this must be done here because someone could hold a ref to us and try to do something OSubComponent::disposing(); } diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index b686bc65a0e5..5047acd9a775 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -60,38 +60,38 @@ namespace dbaccess { - typedef ::cppu::WeakAggComponentImplHelper12 < ::com::sun::star::sdb::XResultSetAccess - , ::com::sun::star::sdb::XRowSetApproveBroadcaster - , ::com::sun::star::sdb::XRowsChangeBroadcaster - , ::com::sun::star::sdbcx::XDeleteRows - , ::com::sun::star::sdbc::XParameters - , ::com::sun::star::lang::XEventListener - , ::com::sun::star::sdbc::XResultSetUpdate - , ::com::sun::star::sdbc::XRowUpdate - , ::com::sun::star::util::XCancellable - , ::com::sun::star::sdb::XCompletedExecution - , ::com::sun::star::sdb::XParametersSupplier - , ::com::sun::star::sdbc::XWarningsSupplier - > ORowSet_BASE1; + typedef ::cppu::WeakAggComponentImplHelper12 < ::com::sun::star::sdb::XResultSetAccess + , ::com::sun::star::sdb::XRowSetApproveBroadcaster + , ::com::sun::star::sdb::XRowsChangeBroadcaster + , ::com::sun::star::sdbcx::XDeleteRows + , ::com::sun::star::sdbc::XParameters + , ::com::sun::star::lang::XEventListener + , ::com::sun::star::sdbc::XResultSetUpdate + , ::com::sun::star::sdbc::XRowUpdate + , ::com::sun::star::util::XCancellable + , ::com::sun::star::sdb::XCompletedExecution + , ::com::sun::star::sdb::XParametersSupplier + , ::com::sun::star::sdbc::XWarningsSupplier + > ORowSet_BASE1; class OTableContainer; - class ORowSet : public comphelper::OBaseMutex + class ORowSet : public comphelper::OBaseMutex , public ORowSet_BASE1 , public ORowSetBase , public ::comphelper::OPropertyArrayUsageHelper<ORowSet> { friend class ORowSetClone; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOldConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; - ::com::sun::star::uno::Any m_aActiveConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTypeMap; - ::com::sun::star::uno::Any m_aTypeMap; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; // the columns from a table or query + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOldConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; + ::com::sun::star::uno::Any m_aActiveConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTypeMap; + ::com::sun::star::uno::Any m_aTypeMap; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; // the columns from a table or query - connectivity::OWeakRefArray m_aClones; + connectivity::OWeakRefArray m_aClones; /** our parameters as XPropertySet instances and ORowSetValue instances */ ::dbtools::param::ParametersContainerRef m_pParameters; @@ -103,49 +103,49 @@ namespace dbaccess ::std::bit_vector m_aParametersSet; ::std::bit_vector m_aReadOnlyDataColumns; - ::cppu::OInterfaceContainerHelper m_aRowsetListeners; - ::cppu::OInterfaceContainerHelper m_aApproveListeners; - ::cppu::OInterfaceContainerHelper m_aRowsChangeListener; + ::cppu::OInterfaceContainerHelper m_aRowsetListeners; + ::cppu::OInterfaceContainerHelper m_aApproveListeners; + ::cppu::OInterfaceContainerHelper m_aRowsChangeListener; ::dbtools::WarningsContainer m_aWarnings; - OTableContainer* m_pTables; - - rtl::OUString m_aCommand; - rtl::OUString m_aDataSourceName; - rtl::OUString m_aURL; - rtl::OUString m_aUser; - rtl::OUString m_aPassword; - rtl::OUString m_aFilter; - rtl::OUString m_aHavingClause; - rtl::OUString m_aGroupBy; - rtl::OUString m_aOrder; - rtl::OUString m_aActiveCommand; - rtl::OUString m_aCursorName; - rtl::OUString m_aUpdateCatalogName; // is set by a query - rtl::OUString m_aUpdateSchemaName; // is set by a query - rtl::OUString m_aUpdateTableName; // is set by a query - - sal_Int32 m_nFetchDirection; - sal_Int32 m_nFetchSize; - sal_Int32 m_nMaxFieldSize; - sal_Int32 m_nMaxRows; - sal_Int32 m_nQueryTimeOut; - sal_Int32 m_nCommandType; - sal_Int32 m_nTransactionIsolation; - sal_Int32 m_nPrivileges; + OTableContainer* m_pTables; + + rtl::OUString m_aCommand; + rtl::OUString m_aDataSourceName; + rtl::OUString m_aURL; + rtl::OUString m_aUser; + rtl::OUString m_aPassword; + rtl::OUString m_aFilter; + rtl::OUString m_aHavingClause; + rtl::OUString m_aGroupBy; + rtl::OUString m_aOrder; + rtl::OUString m_aActiveCommand; + rtl::OUString m_aCursorName; + rtl::OUString m_aUpdateCatalogName; // is set by a query + rtl::OUString m_aUpdateSchemaName; // is set by a query + rtl::OUString m_aUpdateTableName; // is set by a query + + sal_Int32 m_nFetchDirection; + sal_Int32 m_nFetchSize; + sal_Int32 m_nMaxFieldSize; + sal_Int32 m_nMaxRows; + sal_Int32 m_nQueryTimeOut; + sal_Int32 m_nCommandType; + sal_Int32 m_nTransactionIsolation; + sal_Int32 m_nPrivileges; sal_Int32 m_nLastKnownRowCount; oslInterlockedCount m_nInAppend; sal_Bool m_bLastKnownRowCountFinal; - sal_Bool m_bUseEscapeProcessing ; - sal_Bool m_bApplyFilter ; - sal_Bool m_bCommandFacetsDirty; // any of the facets which define the active command is dirty - sal_Bool m_bModified ; - sal_Bool m_bRebuildConnOnExecute ; - sal_Bool m_bIsBookmarable ; - sal_Bool m_bNew ; - sal_Bool m_bCanUpdateInsertedRows; - sal_Bool m_bOwnConnection; + sal_Bool m_bUseEscapeProcessing ; + sal_Bool m_bApplyFilter ; + sal_Bool m_bCommandFacetsDirty; // any of the facets which define the active command is dirty + sal_Bool m_bModified ; + sal_Bool m_bRebuildConnOnExecute ; + sal_Bool m_bIsBookmarable ; + sal_Bool m_bNew ; + sal_Bool m_bCanUpdateInsertedRows; + sal_Bool m_bOwnConnection; sal_Bool m_bPropChangeNotifyEnabled; private: @@ -246,10 +246,10 @@ namespace dbaccess virtual void notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard); virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard); - virtual void doCancelModification( ); - virtual sal_Bool isModification( ); - virtual sal_Bool isModified( ); - virtual sal_Bool isNew( ); + virtual void doCancelModification( ); + virtual sal_Bool isModification( ); + virtual sal_Bool isModified( ); + virtual sal_Bool isNew( ); virtual sal_Bool isPropertyChangeNotificationEnabled() const; virtual ~ORowSet(); @@ -411,14 +411,14 @@ namespace dbaccess protected: /** implement the <method>execute</method>, without calling the approve listeners and without building a new connection - @param _rClearForNotification mutex to clear before doing the final notifications + @param _rClearForNotification mutex to clear before doing the final notifications */ - void execute_NoApprove_NoNewConn(::osl::ResettableMutexGuard& _rClearForNotification); + void execute_NoApprove_NoNewConn(::osl::ResettableMutexGuard& _rClearForNotification); /** call the RowSetApproveListeners<p/> throws an RowSetVetoException if one of the listeners vetoed */ - void approveExecution() throw (::com::sun::star::sdb::RowSetVetoException, ::com::sun::star::uno::RuntimeException); + void approveExecution() throw (::com::sun::star::sdb::RowSetVetoException, ::com::sun::star::uno::RuntimeException); /// set m_xActiveConnection, fire a PropertyChangeEvent if necessary, do the event listener handling etc void setActiveConnection( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxNewConn, sal_Bool _bFireEvent = sal_True ); @@ -473,17 +473,17 @@ namespace dbaccess ,public ::comphelper::OPropertyArrayUsageHelper < ORowSetClone > { protected: - ORowSet* m_pParent; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nFetchSize; - sal_Bool m_bIsBookmarable; + ORowSet* m_pParent; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nFetchSize; + sal_Bool m_bIsBookmarable; protected: // the clone can not insert anything - virtual void doCancelModification( ); - virtual sal_Bool isModification( ); - virtual sal_Bool isModified( ); - virtual sal_Bool isNew( ); + virtual void doCancelModification( ); + virtual sal_Bool isModification( ); + virtual sal_Bool isModified( ); + virtual sal_Bool isNew( ); virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); public: diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index f27dc80b5a64..efb3320a5616 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -115,7 +115,7 @@ ORowSetBase::ORowSetBase( const ::comphelper::ComponentContext& _rContext, ::cpp RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::ORowSetBase" ); DBG_CTOR(ORowSetBase,NULL); - sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; + sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; sal_Int32 nInitialRowCountValue = 0; sal_Bool bInitialRowCountFinalValue( sal_False ); @@ -254,7 +254,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) { // currentrow is null when the clone moves the window positionCache( MOVE_NONE_REFRESH_ONLY ); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getValue: we don't stand on a valid row! Row is null."); bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is() ); @@ -395,7 +395,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS if ( !bValidCurrentRow ) { positionCache( MOVE_NONE_REFRESH_ONLY ); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getBinaryStream: we don't stand on a valid row! Row is null."); bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is() ); @@ -844,7 +844,7 @@ void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException) DBG_TRACE2("DBACCESS ORowSetBase::afterLast() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); } -sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor, +sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor, ::std::mem_fun_t<sal_Bool,ORowSetCache>& _aMovementFunctor) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::move" ); @@ -877,7 +877,7 @@ sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& setCurrentRow( bMoved, sal_True, aOldValues, aGuard ); } else - { // first goes wrong so there is no row + { // first goes wrong so there is no row movementFailed(); } @@ -1106,15 +1106,15 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::setCurrentRow" ); DBG_TRACE2("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); - m_bBeforeFirst = m_pCache->isBeforeFirst(); - m_bAfterLast = m_pCache->isAfterLast(); + m_bBeforeFirst = m_pCache->isBeforeFirst(); + m_bAfterLast = m_pCache->isAfterLast(); //m_pCache->resetInsertRow(sal_True); if(!(m_bBeforeFirst || m_bAfterLast)) { - m_aBookmark = m_pCache->getBookmark(); + m_aBookmark = m_pCache->getBookmark(); OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!"); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is null!"); m_aCurrentRow.setBookmark(m_aBookmark); OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd(),"Position of matrix iterator isn't valid!"); @@ -1129,7 +1129,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR sal_Int32 nNewRow = m_pCache->getRow(); #endif OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new postion"); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!"); #if OSL_DEBUG_LEVEL > 0 ORowSetRow rRow = (*m_aCurrentRow); @@ -1140,15 +1140,15 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR if ( _bMoved && m_aCurrentRow.isNull() ) { positionCache( MOVE_NONE_REFRESH_ONLY ); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!"); } } else { m_aOldRow->clearRow(); - m_aCurrentRow = m_pCache->getEnd(); - m_aBookmark = Any(); + m_aCurrentRow = m_pCache->getEnd(); + m_aBookmark = Any(); m_aCurrentRow.setBookmark(m_aBookmark); } @@ -1401,10 +1401,10 @@ void ORowSetBase::movementFailed() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::movementFailed" ); DBG_TRACE2("DBACCESS ORowSetBase::movementFailed() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); m_aOldRow->clearRow(); - m_aCurrentRow = m_pCache->getEnd(); - m_bBeforeFirst = m_pCache->isBeforeFirst(); - m_bAfterLast = m_pCache->isAfterLast(); - m_aBookmark = Any(); + m_aCurrentRow = m_pCache->getEnd(); + m_bBeforeFirst = m_pCache->isBeforeFirst(); + m_bAfterLast = m_pCache->isAfterLast(); + m_aBookmark = Any(); m_aCurrentRow.setBookmark(m_aBookmark); OSL_ENSURE(m_bBeforeFirst || m_bAfterLast,"BeforeFirst or AfterLast is wrong!"); DBG_TRACE2("DBACCESS ORowSetBase::movementFailed() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); @@ -1416,7 +1416,7 @@ ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew) OSL_ENSURE(m_aOldRow.is(),"RowSetRowHElper isn't valid!"); ORowSetRow aOldValues; if ( !_bWasNew && m_aOldRow->getRow().is() ) - aOldValues = new ORowSetValueVector( *(m_aOldRow->getRow())); // remember the old values + aOldValues = new ORowSetValueVector( *(m_aOldRow->getRow())); // remember the old values return aOldValues; } @@ -1459,8 +1459,8 @@ void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos ) if ( compareBookmarks( _rBookmark, m_aBookmark ) == 0 ) { m_aOldRow->clearRow(); - m_aCurrentRow = m_pCache->getEnd(); - m_aBookmark = Any(); + m_aCurrentRow = m_pCache->getEnd(); + m_aBookmark = Any(); m_aCurrentRow.setBookmark( m_aBookmark ); } } @@ -1496,8 +1496,8 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet ) OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This wil crash." ); // remember the "inserted" and "modified" state for later firing - m_bWasNew = m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ); - m_bWasModified = m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ); + m_bWasNew = m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ); + m_bWasModified = m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ); // if the row set is on the insert row, then we need to cancel this if ( m_pRowSet->isModification( ORowSetBase::GrantNotifierAccess() ) ) @@ -1530,13 +1530,13 @@ void ORowSetNotifier::fire() // we're not interested in firing changes FALSE->TRUE, only TRUE->FALSE. // (the former would be quite pathological, e.g. after a failed movement) - if ( m_bWasModified - && ( m_bWasModified != m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ) ) + if ( m_bWasModified + && ( m_bWasModified != m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ) ) ) m_pRowSet->fireProperty( PROPERTY_ID_ISMODIFIED, sal_False, sal_True, ORowSetBase::GrantNotifierAccess() ); - if ( m_bWasNew - && ( m_bWasNew != m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ) ) + if ( m_bWasNew + && ( m_bWasNew != m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ) ) ) m_pRowSet->fireProperty( PROPERTY_ID_ISNEW, sal_False, sal_True, ORowSetBase::GrantNotifierAccess() ); @@ -1570,6 +1570,6 @@ void ORowSetNotifier::firePropertyChange() m_pRowSet->fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False, ORowSetBase::GrantNotifierAccess()); } } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 58e2765d3aea..516d461123b3 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -64,7 +64,7 @@ namespace dbaccess { class OEmptyCollection; - typedef ::cppu::ImplHelper10< ::com::sun::star::sdbcx::XRowLocate, + typedef ::cppu::ImplHelper10< ::com::sun::star::sdbcx::XRowLocate, ::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::sdbc::XWarningsSupplier, @@ -85,38 +85,38 @@ namespace dbaccess { OModuleClient m_aModuleClient; protected: - typedef ::std::vector<ORowSetDataColumn*> TDataColumns; - ::osl::Mutex* m_pMutex; // this the mutex form the rowset itself - ::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes + typedef ::std::vector<ORowSetDataColumn*> TDataColumns; + ::osl::Mutex* m_pMutex; // this the mutex form the rowset itself + ::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes // we need a extra mutex for columns to prevend deadlock when setting new values // for a row m_aColumnsMutex; - ::com::sun::star::uno::Any m_aBookmark; - ORowSetCacheIterator m_aCurrentRow; // contains the actual fetched row - TORowSetOldRowHelperRef m_aOldRow; - TDataColumns m_aDataColumns; // holds the columns as m_pColumns but know the implementation class - connectivity::ORowSetValue m_aEmptyValue; // only for error case + ::com::sun::star::uno::Any m_aBookmark; + ORowSetCacheIterator m_aCurrentRow; // contains the actual fetched row + TORowSetOldRowHelperRef m_aOldRow; + TDataColumns m_aDataColumns; // holds the columns as m_pColumns but know the implementation class + connectivity::ORowSetValue m_aEmptyValue; // only for error case - ::cppu::OWeakObject* m_pMySelf; // set by derived classes - ORowSetCache* m_pCache; // the cache is used by the rowset and his clone (shared) - ORowSetDataColumns* m_pColumns; // represent the select columns - ::cppu::OBroadcastHelper& m_rBHelper; // must be set from the derived classes + ::cppu::OWeakObject* m_pMySelf; // set by derived classes + ORowSetCache* m_pCache; // the cache is used by the rowset and his clone (shared) + ORowSetDataColumns* m_pColumns; // represent the select columns + ::cppu::OBroadcastHelper& m_rBHelper; // must be set from the derived classes // is used when the formatkey for database types is set - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes> m_xNumberFormatTypes; - OEmptyCollection* m_pEmptyCollection; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes> m_xNumberFormatTypes; + OEmptyCollection* m_pEmptyCollection; ::comphelper::ComponentContext m_aContext; ::connectivity::SQLError m_aErrors; - sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull() - sal_Int32 m_nDeletedPosition; // is set only when a row was deleted - sal_Int32 m_nResultSetType; // fetch property + sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull() + sal_Int32 m_nDeletedPosition; // is set only when a row was deleted + sal_Int32 m_nResultSetType; // fetch property sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bClone; // I'm clone or not - sal_Bool m_bIgnoreResult ; - sal_Bool m_bBeforeFirst : 1; - sal_Bool m_bAfterLast : 1; + sal_Bool m_bClone; // I'm clone or not + sal_Bool m_bIgnoreResult ; + sal_Bool m_bBeforeFirst : 1; + sal_Bool m_bAfterLast : 1; protected: ORowSetBase( @@ -141,14 +141,14 @@ namespace dbaccess virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard); // cancel the insertion, if necessary (means if we're on the insert row) - virtual void doCancelModification( ) = 0; + virtual void doCancelModification( ) = 0; // return <TRUE/> if and only if we're using the insert row (means: we're updating _or_ inserting) - virtual sal_Bool isModification( ) = 0; + virtual sal_Bool isModification( ) = 0; // return <TRUE/> if and only if the current row is modified // TODO: isn't this the same as isModification? - virtual sal_Bool isModified( ) = 0; + virtual sal_Bool isModified( ) = 0; // return <TRUE/> if and only if the current row is the insert row - virtual sal_Bool isNew( ) = 0; + virtual sal_Bool isNew( ) = 0; // return <TRUE/> if the property change notification should be fired // upon property change. virtual sal_Bool isPropertyChangeNotificationEnabled() const; @@ -202,14 +202,14 @@ namespace dbaccess ORowSetRow getOldRow(sal_Bool _bWasNew); /** move the cache the postion defined by the member functor - @param _aCheckFunctor + @param _aCheckFunctor Return <TRUE/> when we already stand on the row we want to. - @param _aMovementFunctor + @param _aMovementFunctor The mehtod used to move. @return <TRUE/> if movement was successful. */ - sal_Bool SAL_CALL move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor, + sal_Bool SAL_CALL move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor, ::std::mem_fun_t<sal_Bool,ORowSetCache>& _aMovementFunctor); /** same meaning as isFirst. Only need by mem_fun @@ -341,22 +341,22 @@ namespace dbaccess struct GrantNotifierAccess { friend class ORowSetNotifier; private: GrantNotifierAccess () { } }; // cancel the insertion, if necessary (means if we're on the insert row) - inline void doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); } - inline sal_Bool isModification( const GrantNotifierAccess& ) { return isModification(); } - inline sal_Bool isModified( const GrantNotifierAccess& ) { return isModified(); } - inline sal_Bool isNew( const GrantNotifierAccess& ) { return isNew(); } - inline sal_Bool isInsertRow() { return isNew() || isModified(); } - inline void fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld, const GrantNotifierAccess& ) + inline void doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); } + inline sal_Bool isModification( const GrantNotifierAccess& ) { return isModification(); } + inline sal_Bool isModified( const GrantNotifierAccess& ) { return isModified(); } + inline sal_Bool isNew( const GrantNotifierAccess& ) { return isNew(); } + inline sal_Bool isInsertRow() { return isNew() || isModified(); } + inline void fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld, const GrantNotifierAccess& ) { fireProperty( _nProperty, _bNew, _bOld ); } - inline void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& ) + inline void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& ) { firePropertyChange(_nPos,_rNewValue); } using ::comphelper::OPropertyStateContainer::getFastPropertyValue; - ::osl::Mutex* getMutex() const { return m_pMutex; } + ::osl::Mutex* getMutex() const { return m_pMutex; } }; // ======================================================================== @@ -369,14 +369,14 @@ namespace dbaccess { private: ::std::auto_ptr<ORowSetNotifierImpl> m_pImpl; - ORowSetBase* m_pRowSet; + ORowSetBase* m_pRowSet; // not aquired! This is not necessary because this class here is to be used on the stack within // a method of ORowSetBase (or derivees) - sal_Bool m_bWasNew; - sal_Bool m_bWasModified; + sal_Bool m_bWasNew; + sal_Bool m_bWasModified; #ifdef DBG_UTIL - sal_Bool m_bNotifyCalled; + sal_Bool m_bNotifyCalled; #endif public: @@ -403,7 +403,7 @@ namespace dbaccess @see ORowSetBase::notifyCancelInsert */ - void fire(); + void fire(); /** notifies value change events and notifies IsModified @param i_aChangedColumns the index of the changed value columns diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 3710a0e0c108..6ff4fdaa584c 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,8 +86,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, const ::comphelper::ComponentContext& _rContext, const ::rtl::OUString& _rUpdateTableName, - sal_Bool& _bModified, - sal_Bool& _bNew, + sal_Bool& _bModified, + sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, const ::rtl::OUString& i_sRowSetFilter) :m_xSet(_xRs) @@ -170,7 +170,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!"); Reference<XNameAccess> xTables = xTabSup->getTables(); Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames(); - if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet ) + if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet ) {// here we have a join or union and nobody told us which table to update, so we update them all m_nPrivileges = Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE; OptimisticSet* pCursor = new OptimisticSet(m_aContext,xConnection,_xAnalyzer,_aParameterValueForCache); @@ -279,8 +279,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); SelectColumnsMetaData aColumnNames(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers() ? true : false); Reference<XColumnsSupplier> xColSup(_xAnalyzer,UNO_QUERY); - Reference<XNameAccess> xSelColumns = xColSup->getColumns(); - Reference<XNameAccess> xColumns = m_aUpdateTable->getColumns(); + Reference<XNameAccess> xSelColumns = xColSup->getColumns(); + Reference<XNameAccess> xColumns = m_aUpdateTable->getColumns(); ::dbaccess::getColumnPositions(xSelColumns,xColumns->getElementNames(),aUpdateTableName,aColumnNames); // check privileges @@ -288,8 +288,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, sal_Bool bNoInsert = sal_False; Sequence< ::rtl::OUString> aNames(xColumns->getElementNames()); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xColumn(xColumns->getByName(*pIter),UNO_QUERY); @@ -362,9 +362,9 @@ ORowSetCache::~ORowSetCache() m_pInsertMatrix->clear(); delete m_pInsertMatrix; } - m_xSet = WeakReference< XResultSet>(); - m_xMetaData = NULL; - m_aUpdateTable = NULL; + m_xSet = WeakReference< XResultSet>(); + m_xMetaData = NULL; + m_aUpdateTable = NULL; DBG_DTOR(ORowSetCache,NULL); } @@ -383,7 +383,7 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize) m_aMatrixEnd = m_pMatrix->end(); m_pInsertMatrix = new ORowSetMatrix(1); // a little bit overkill but ??? :-) - m_aInsertRow = m_pInsertMatrix->end(); + m_aInsertRow = m_pInsertMatrix->end(); } else { @@ -416,7 +416,7 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize) // now adjust their positions because a resize invalid all iterators ::std::vector<sal_Int32>::const_iterator aIter = aPositions.begin(); ::std::map<sal_Int32,sal_Bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin(); - for( aCacheIter = m_aCacheIterators.begin(); + for( aCacheIter = m_aCacheIterators.begin(); aPosChangeIter != aCacheIterToChange.end(); ++aPosChangeIter,++aCacheIter) { @@ -480,7 +480,7 @@ sal_Bool ORowSetCache::moveToBookmark( const Any& bookmark ) if ( m_pCacheSet->moveToBookmark(bookmark) ) { m_bBeforeFirst = sal_False; - m_nPosition = m_pCacheSet->getRow(); + m_nPosition = m_pCacheSet->getRow(); checkPositionFlags(); @@ -512,7 +512,7 @@ sal_Bool ORowSetCache::moveRelativeToBookmark( const Any& bookmark, sal_Int32 ro { m_nPosition = m_pCacheSet->getRow() + rows; absolute(m_nPosition); - // for(sal_Int32 i=0;i<rows && m_aMatrixIter != m_pMatrix->end();++i,++m_aMatrixIter) ; + // for(sal_Int32 i=0;i<rows && m_aMatrixIter != m_pMatrix->end();++i,++m_aMatrixIter) ; bRet = m_aMatrixIter != m_pMatrix->end() && (*m_aMatrixIter).is(); } @@ -592,7 +592,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x ,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,::std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -649,7 +649,7 @@ sal_Bool ORowSetCache::next( ) sal_Bool ORowSetCache::isBeforeFirst( ) { - // return !m_nPosition; + // return !m_nPosition; return m_bBeforeFirst; } @@ -668,7 +668,7 @@ sal_Bool ORowSetCache::isFirst( ) sal_Bool ORowSetCache::isLast( ) { - // return m_bRowCountFinal ? (m_nPosition==m_nRowCount) : m_pCacheSet->isLast(); + // return m_bRowCountFinal ? (m_nPosition==m_nRowCount) : m_pCacheSet->isLast(); return m_nPosition == m_nRowCount; } @@ -679,9 +679,9 @@ sal_Bool ORowSetCache::beforeFirst( ) if(!m_bBeforeFirst) { - m_bAfterLast = sal_False; - m_nPosition = 0; - m_bBeforeFirst = sal_True; + m_bAfterLast = sal_False; + m_nPosition = 0; + m_bBeforeFirst = sal_True; m_pCacheSet->beforeFirst(); moveWindow(); m_aMatrixIter = m_pMatrix->end(); @@ -729,7 +729,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos m_pCacheSet->fillValueRow(*aIter,i); } else - { // there are no more rows found so we can fetch some before start + { // there are no more rows found so we can fetch some before start if(!m_bRowCountFinal) { @@ -764,7 +764,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos } bCheck = m_pCacheSet->next(); } - // m_nStartPos = _nNewStartPos; + // m_nStartPos = _nNewStartPos; // we have to read one row forward to enshure that we know when we are on last row // but only when we don't know it already if(!m_bRowCountFinal) @@ -788,17 +788,17 @@ sal_Bool ORowSetCache::moveWindow() sal_Bool bRet = sal_True; sal_Int32 nDiff = (sal_Int32)(m_nFetchSize*0.5 -0.5); - sal_Int32 nNewStartPos = (m_nPosition - nDiff); - // sal_Int32 nNewEndPos = (m_nPosition+m_nFetchSize*0.5); - sal_Int32 nNewEndPos = nNewStartPos + m_nFetchSize; + sal_Int32 nNewStartPos = (m_nPosition - nDiff); + // sal_Int32 nNewEndPos = (m_nPosition+m_nFetchSize*0.5); + sal_Int32 nNewEndPos = nNewStartPos + m_nFetchSize; if ( m_nPosition <= m_nStartPos ) - { // the window is behind the new start pos + { // the window is behind the new start pos if(!m_nStartPos) return sal_False; // the new position should be the nPos - nFetchSize/2 if ( nNewEndPos > m_nStartPos ) - { // but the two regions are overlapping + { // but the two regions are overlapping // fill the rows behind the new end ORowSetMatrix::iterator aEnd; // the iterator we need for rotate @@ -808,7 +808,7 @@ sal_Bool ORowSetCache::moveWindow() if ( nNewStartPos < 1 ) { bCheck = m_pCacheSet->first(); - // aEnd = m_pMatrix->begin() + (sal_Int32)(m_nFetchSize*0.5); + // aEnd = m_pMatrix->begin() + (sal_Int32)(m_nFetchSize*0.5); OSL_ENSURE((nNewEndPos - m_nStartPos - nNewStartPos) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!"); aEnd = m_pMatrix->begin() + (nNewEndPos - m_nStartPos - nNewStartPos); aIter = aEnd; @@ -830,7 +830,7 @@ sal_Bool ORowSetCache::moveWindow() ::std::rotate(m_pMatrix->begin(),aEnd,m_pMatrix->end()); // now correct the iterator in our iterator vector - // rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment + // rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment ptrdiff_t nNewDist = aEnd - m_pMatrix->begin(); ptrdiff_t nOffSet = m_pMatrix->end() - aEnd; ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin(); @@ -899,10 +899,10 @@ sal_Bool ORowSetCache::moveWindow() } } else if(m_nPosition > m_nStartPos) - { // the new start pos is above the startpos of the window + { // the new start pos is above the startpos of the window if(m_nPosition <= (m_nStartPos+m_nFetchSize)) - { // position in window + { // position in window OSL_ENSURE((m_nPosition - m_nStartPos -1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!"); m_aMatrixIter = calcPosition(); if(!m_aMatrixIter->is()) @@ -933,7 +933,7 @@ sal_Bool ORowSetCache::moveWindow() } } else if(nNewStartPos < (m_nStartPos+m_nFetchSize)) - { // position behind window but the region is overlapping + { // position behind window but the region is overlapping // the rows from begin() to (begin + nNewStartPos - m_nStartPos) can be refilled with the new rows // the rows behind this can be reused ORowSetMatrix::iterator aIter = m_pMatrix->begin(); @@ -944,9 +944,9 @@ sal_Bool ORowSetCache::moveWindow() sal_Bool bCheck = m_pCacheSet->absolute(nPos); bCheck = fill(aIter,aEnd,nPos,bCheck); // refill the region wew don't need anymore -// // we know that this is the current maximal rowcount here -// if ( !m_bRowCountFinal && bCheck ) -// m_nRowCount = std::max(nPos,m_nRowCount); +// // we know that this is the current maximal rowcount here +// if ( !m_bRowCountFinal && bCheck ) +// m_nRowCount = std::max(nPos,m_nRowCount); // we have to read one row forward to enshure that we know when we are on last row // but only when we don't know it already sal_Bool bOk = sal_True; @@ -954,7 +954,7 @@ sal_Bool ORowSetCache::moveWindow() bOk = m_pCacheSet->next(); // bind end to front if(bCheck) - { // rotate the end to the front + { // rotate the end to the front ::std::rotate(m_pMatrix->begin(),aIter,m_pMatrix->end()); // now correct the iterator in our iterator vector rotateCacheIterator( (sal_Int16)( aIter - m_pMatrix->begin() ) ); @@ -963,30 +963,30 @@ sal_Bool ORowSetCache::moveWindow() if(!bOk) { m_pCacheSet->previous(); // because we stand after the last row - m_nRowCount = nPos; // here we have the row count + m_nRowCount = nPos; // here we have the row count m_bRowCountFinal = sal_True; } else if(!m_bRowCountFinal) m_nRowCount = std::max(++nPos,m_nRowCount); } else - { // the end was reached before end() so we can set the start before nNewStartPos + { // the end was reached before end() so we can set the start before nNewStartPos m_nStartPos += (aIter - m_pMatrix->begin()); - // m_nStartPos = (aIter - m_pMatrix->begin()); + // m_nStartPos = (aIter - m_pMatrix->begin()); ::std::rotate(m_pMatrix->begin(),aIter,m_pMatrix->end()); // now correct the iterator in our iterator vector rotateCacheIterator( (sal_Int16)( aIter - m_pMatrix->begin() ) ); if ( !m_bRowCountFinal ) { - m_pCacheSet->previous(); // because we stand after the last row - m_nRowCount = std::max(m_nRowCount,--nPos); // here we have the row count + m_pCacheSet->previous(); // because we stand after the last row + m_nRowCount = std::max(m_nRowCount,--nPos); // here we have the row count OSL_ENSURE(nPos == m_pCacheSet->getRow(),"nPos isn't valid!"); m_bRowCountFinal = sal_True; } // TODO check - // m_nStartPos = (nNewStartPos+m_nRowCount) - m_nFetchSize ; + // m_nStartPos = (nNewStartPos+m_nRowCount) - m_nFetchSize ; if(m_nStartPos < 0) m_nStartPos = 0; } @@ -995,8 +995,8 @@ sal_Bool ORowSetCache::moveWindow() { aIter = m_pMatrix->begin(); - nPos = m_nStartPos; - bCheck = m_pCacheSet->absolute(m_nStartPos); + nPos = m_nStartPos; + bCheck = m_pCacheSet->absolute(m_nStartPos); for(; !aIter->is() && bCheck;++aIter) { OSL_ENSURE(aIter != m_pMatrix->end(),"Invalid iterator"); @@ -1029,10 +1029,10 @@ sal_Bool ORowSetCache::first( ) sal_Bool bRet = m_pCacheSet->first(); if(bRet) { - m_bBeforeFirst = m_bAfterLast = sal_False; - m_nPosition = 1; + m_bBeforeFirst = m_bAfterLast = sal_False; + m_nPosition = 1; moveWindow(); - m_aMatrixIter = m_pMatrix->begin(); + m_aMatrixIter = m_pMatrix->begin(); } else { @@ -1105,8 +1105,8 @@ sal_Bool ORowSetCache::absolute( sal_Int32 row ) } else { - m_bBeforeFirst = sal_False; - m_bAfterLast = m_nPosition > m_nRowCount; + m_bBeforeFirst = sal_False; + m_bAfterLast = m_nPosition > m_nRowCount; moveWindow(); OSL_ENSURE(((m_nPosition - m_nStartPos) - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!"); m_aMatrixIter = calcPosition(); @@ -1119,7 +1119,7 @@ sal_Bool ORowSetCache::absolute( sal_Int32 row ) { m_nPosition = row; // the position flags - m_bBeforeFirst = sal_False; + m_bBeforeFirst = sal_False; checkPositionFlags(); if(!m_bAfterLast) @@ -1260,13 +1260,13 @@ void ORowSetCache::resetInsertRow(sal_Bool _bClearInsertRow) { if ( _bClearInsertRow ) clearInsertRow(); - m_bNew = sal_False; + m_bNew = sal_False; m_bModified = sal_False; } void ORowSetCache::cancelRowModification() { - // clear the insertrow references -> implies that the current row of the rowset changes as well + // clear the insertrow references -> implies that the current row of the rowset changes as well ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin(); ORowSetCacheMap::iterator aCacheEnd = m_aCacheIterators.end(); for(;aCacheIter != aCacheEnd;++aCacheIter) @@ -1290,7 +1290,7 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector m_pCacheSet->updateRow(*_rUpdateRow,*m_aMatrixIter,m_aUpdateTable); // refetch the whole row (*m_aMatrixIter) = NULL; - + if ( moveToBookmark(aBookmark) ) { // update the cached values @@ -1313,7 +1313,7 @@ bool ORowSetCache::deleteRow( ) if(isAfterLast() || isBeforeFirst()) throw SQLException(DBACORE_RESSTRING(RID_STR_NO_DELETEROW),NULL,SQLSTATE_GENERAL,1000,Any() ); - // m_pCacheSet->absolute(m_nPosition); + // m_pCacheSet->absolute(m_nPosition); m_pCacheSet->deleteRow(*m_aMatrixIter,m_aUpdateTable); if ( !m_pCacheSet->rowDeleted() ) return false; @@ -1321,13 +1321,13 @@ bool ORowSetCache::deleteRow( ) --m_nRowCount; OSL_ENSURE(((m_nPosition - m_nStartPos) - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!"); ORowSetMatrix::iterator aPos = calcPosition(); - (*aPos) = NULL; + (*aPos) = NULL; ORowSetMatrix::iterator aEnd = m_pMatrix->end(); for(++aPos;aPos != aEnd && aPos->is();++aPos) { *(aPos-1) = *aPos; - (*aPos) = NULL; + (*aPos) = NULL; } m_aMatrixIter = m_pMatrix->end(); @@ -1355,8 +1355,8 @@ void ORowSetCache::cancelRowUpdates( ) void ORowSetCache::moveToInsertRow( ) { - m_bNew = sal_True; - m_bUpdated = m_bAfterLast = sal_False; + m_bNew = sal_True; + m_bUpdated = m_bAfterLast = sal_False; m_aInsertRow = m_pInsertMatrix->begin(); if(!m_aInsertRow->is()) @@ -1445,7 +1445,7 @@ void ORowSetCache::checkPositionFlags() { if(m_bRowCountFinal) { - m_bAfterLast = m_nPosition > m_nRowCount; + m_bAfterLast = m_nPosition > m_nRowCount; if(m_bAfterLast) m_nPosition = 0;//m_nRowCount; } @@ -1460,13 +1460,13 @@ void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex) sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sUpdateTableName) { sal_Bool bOk = sal_False; - if (pNode->count() == 3 && // Ausdruck is geklammert + if (pNode->count() == 3 && // Ausdruck is geklammert SQL_ISPUNCTUATION(pNode->getChild(0),"(") && SQL_ISPUNCTUATION(pNode->getChild(2),")")) { bOk = checkInnerJoin(pNode->getChild(1),_xConnection,_sUpdateTableName); } - else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) && // AND/OR-Verknuepfung: + else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) && // AND/OR-Verknuepfung: pNode->count() == 3) { // nur AND Verknüpfung zulassen @@ -1515,15 +1515,15 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, OSQLParseNode* pJoin = pTableRefCommalist->getByRule(::connectivity::OSQLParseNode::qualified_join); if(pJoin) { // we are only intereseted in qualified joins like RIGHT or LEFT - OSQLParseNode* pJoinType = pJoin->getChild(1); - OSQLParseNode* pOuterType = NULL; + OSQLParseNode* pJoinType = pJoin->getChild(1); + OSQLParseNode* pOuterType = NULL; if(SQL_ISRULE(pJoinType,join_type) && pJoinType->count() == 2) pOuterType = pJoinType->getChild(0); else if(SQL_ISRULE(pJoinType,outer_join_type)) pOuterType = pJoinType; - sal_Bool bCheck = sal_False; - sal_Bool bLeftSide = sal_False; + sal_Bool bCheck = sal_False; + sal_Bool bLeftSide = sal_False; if(pOuterType) { // found outer join bLeftSide = SQL_ISTOKEN(pOuterType->getChild(0),LEFT); @@ -1572,7 +1572,7 @@ void ORowSetCache::clearInsertRow() } } -ORowSetMatrix::iterator ORowSetCache::calcPosition() const +ORowSetMatrix::iterator ORowSetCache::calcPosition() const { sal_Int32 nValue = (m_nPosition - m_nStartPos) - 1; CHECK_MATRIX_POS(nValue); @@ -1666,7 +1666,7 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_ break; } } - + if ( aIter == m_pMatrix->end() ) { m_pCacheSet->fillMissingValues(io_aRow); diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index dedf04ead36b..db9678c29824 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -70,45 +70,45 @@ namespace dbaccess friend class ORowSetClone; friend class ORowSetCacheIterator; - typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows; + typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows; ::std::map<sal_Int32,sal_Int32> m_aKeyColumns; //the set can be static, bookmarkable or keyset - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; // must be before m_aInsertRow + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; // must be before m_aInsertRow ::comphelper::ComponentContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xCacheSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xCacheSet; - OCacheSet* m_pCacheSet; // is a bookmarkable, keyset or static resultset - ORowSetMatrix* m_pMatrix; // represent the table struct - ORowSetMatrix::iterator m_aMatrixIter; // represent a row of the table - ORowSetMatrix::iterator m_aMatrixEnd; // present the row behind the last row of the table - ORowSetCacheMap m_aCacheIterators; - TOldRowSetRows m_aOldRows; + OCacheSet* m_pCacheSet; // is a bookmarkable, keyset or static resultset + ORowSetMatrix* m_pMatrix; // represent the table struct + ORowSetMatrix::iterator m_aMatrixIter; // represent a row of the table + ORowSetMatrix::iterator m_aMatrixEnd; // present the row behind the last row of the table + ORowSetCacheMap m_aCacheIterators; + TOldRowSetRows m_aOldRows; - ORowSetMatrix* m_pInsertMatrix; // represent the rows which should be inserted normally this is only one - ORowSetMatrix::iterator m_aInsertRow; // represent a insert row + ORowSetMatrix* m_pInsertMatrix; // represent the rows which should be inserted normally this is only one + ORowSetMatrix::iterator m_aInsertRow; // represent a insert row - // ORowSetRow m_aInsertRow; // present the row that should be inserted - sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull() + // ORowSetRow m_aInsertRow; // present the row that should be inserted + sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull() - connectivity::OSQLTable m_aUpdateTable; // used for updates/deletes and inserts + connectivity::OSQLTable m_aUpdateTable; // used for updates/deletes and inserts - sal_Int32 m_nFetchSize; - sal_Int32 m_nRowCount; - sal_Int32 m_nPrivileges; - sal_Int32 m_nPosition; // 0 means beforefirst + sal_Int32 m_nFetchSize; + sal_Int32 m_nRowCount; + sal_Int32 m_nPrivileges; + sal_Int32 m_nPosition; // 0 means beforefirst - sal_Int32 m_nStartPos; // start pos of the window zero based - sal_Int32 m_nEndPos; // end pos of the window zero based + sal_Int32 m_nStartPos; // start pos of the window zero based + sal_Int32 m_nEndPos; // end pos of the window zero based - sal_Bool m_bRowCountFinal ; - sal_Bool m_bBeforeFirst ; - sal_Bool m_bAfterLast ; - sal_Bool m_bUpdated ; - sal_Bool& m_bModified ; // points to the rowset member m_bModified - sal_Bool& m_bNew ; // points to the rowset member m_bNew + sal_Bool m_bRowCountFinal ; + sal_Bool m_bBeforeFirst ; + sal_Bool m_bAfterLast ; + sal_Bool m_bUpdated ; + sal_Bool& m_bModified ; // points to the rowset member m_bModified + sal_Bool& m_bNew ; // points to the rowset member m_bNew sal_Bool fill(ORowSetMatrix::iterator& _aIter,const ORowSetMatrix::iterator& _aEnd,sal_Int32& _nPos,sal_Bool _bCheck); sal_Bool reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 nNewEndPos); @@ -132,7 +132,7 @@ namespace dbaccess // checks and set the flags isAfterLast isLast and position when afterlast is true void checkPositionFlags(); void checkUpdateConditions(sal_Int32 columnIndex); - sal_Bool checkJoin( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + sal_Bool checkJoin( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer, const ::rtl::OUString& _sUpdateTableName); sal_Bool checkInnerJoin(const ::connectivity::OSQLParseNode *pNode @@ -140,8 +140,8 @@ namespace dbaccess ,const ::rtl::OUString& _sUpdateTableName); // clears the insert row - void clearInsertRow(); - ORowSetMatrix::iterator calcPosition() const; + void clearInsertRow(); + ORowSetMatrix::iterator calcPosition() const; protected: ORowSetMatrix::iterator& getEnd() { return m_aMatrixEnd;} @@ -152,8 +152,8 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xAnalyzer, const ::comphelper::ComponentContext& _rContext, const ::rtl::OUString& _rUpdateTableName, - sal_Bool& _bModified, - sal_Bool& _bNew, + sal_Bool& _bModified, + sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, const ::rtl::OUString& i_sRowSetFilter); ~ORowSetCache(); diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx index 9f634d4bef0e..986a9bb5d7c1 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.cxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx @@ -53,7 +53,7 @@ ORowSetCacheIterator& ORowSetCacheIterator::operator =(const ORowSetCacheIterato return *this; m_pCache = _rRH.m_pCache; - m_aIter = _rRH.m_aIter; + m_aIter = _rRH.m_aIter; m_pRowSet = _rRH.m_pRowSet; return *this; @@ -117,7 +117,7 @@ bool ORowSetCacheIterator::operator ==(const ORowSetMatrix::iterator& _rRH) cons return m_aIter->second.aIterator == _rRH; } -void ORowSetCacheIterator::setBookmark(const ::com::sun::star::uno::Any& _rBookmark) +void ORowSetCacheIterator::setBookmark(const ::com::sun::star::uno::Any& _rBookmark) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::setBookmark" ); m_aIter->second.aBookmark = _rBookmark; diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index e6be14baaeb8..1387635d44a9 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -36,9 +36,9 @@ namespace dbaccess class ORowSetBase; typedef struct { - ORowSetMatrix::iterator aIterator; - ::com::sun::star::uno::Any aBookmark; - ORowSetBase* pRowSet; + ORowSetMatrix::iterator aIterator; + ::com::sun::star::uno::Any aBookmark; + ORowSetBase* pRowSet; } ORowSetCacheIterator_Helper; DECLARE_STL_STDKEY_MAP(sal_Int32,ORowSetCacheIterator_Helper,ORowSetCacheMap); @@ -47,9 +47,9 @@ namespace dbaccess class ORowSetCacheIterator { friend class ORowSetCache; - ORowSetCacheMap::iterator m_aIter; - ORowSetCache* m_pCache; - ORowSetBase* m_pRowSet; + ORowSetCacheMap::iterator m_aIter; + ORowSetCache* m_pCache; + ORowSetBase* m_pRowSet; protected: ORowSetCacheIterator(const ORowSetCacheMap::iterator& _rIter,ORowSetCache* _pCache,ORowSetBase* _pRowSet) : m_aIter(_rIter) @@ -77,9 +77,9 @@ namespace dbaccess bool operator !=(const ORowSetMatrix::iterator& _rRH) const; bool operator ==(const ORowSetMatrix::iterator& _rRH) const; - void setBookmark(const ::com::sun::star::uno::Any& _rBookmark); + void setBookmark(const ::com::sun::star::uno::Any& _rBookmark); ::com::sun::star::uno::Any getBookmark() const { return m_aIter->second.aBookmark; } - ::osl::Mutex* getMutex() const; + ::osl::Mutex* getMutex() const; ORowSetCacheMap::iterator getIter() const { return m_aIter; } }; diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index 9dfb0eb6a80f..88e53ea5f647 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -35,14 +35,14 @@ namespace dbaccess { - typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector; - typedef ::rtl::Reference< ORowSetValueVector > ORowSetRow; - typedef ::std::vector< ORowSetRow > ORowSetMatrix; + typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector; + typedef ::rtl::Reference< ORowSetValueVector > ORowSetRow; + typedef ::std::vector< ORowSetRow > ORowSetMatrix; class ORowSetOldRowHelper { - oslInterlockedCount m_refCount; - ORowSetRow m_aRow; + oslInterlockedCount m_refCount; + ORowSetRow m_aRow; ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH); ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh); @@ -67,7 +67,7 @@ namespace dbaccess inline void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; } }; - typedef ::rtl::Reference< ORowSetOldRowHelper > TORowSetOldRowHelperRef; + typedef ::rtl::Reference< ORowSetOldRowHelper > TORowSetOldRowHelperRef; class ORowSetValueCompare { diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index ec2ce273be59..1ab9fec8469f 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -90,19 +90,19 @@ namespace dbaccess { namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode; } -#define STR_SELECT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")) -#define STR_FROM ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")) -#define STR_WHERE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")) -#define STR_GROUP_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY ")) -#define STR_HAVING ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING ")) -#define STR_ORDER_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY ")) -#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND ")) -#define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" OR ")) -#define STR_LIKE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" LIKE ")) -#define STR_EQUAL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = ")) -#define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")) -#define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")) -#define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")) +#define STR_SELECT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")) +#define STR_FROM ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")) +#define STR_WHERE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")) +#define STR_GROUP_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY ")) +#define STR_HAVING ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING ")) +#define STR_ORDER_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY ")) +#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND ")) +#define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" OR ")) +#define STR_LIKE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" LIKE ")) +#define STR_EQUAL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = ")) +#define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")) +#define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")) +#define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")) namespace { @@ -316,8 +316,8 @@ void SAL_CALL OSingleSelectQueryComposer::disposing(void) resetIterator( m_aSqlIterator, true ); resetIterator( m_aAdditiveIterator, true ); - m_xConnectionTables = NULL; - m_xConnection = NULL; + m_xConnectionTables = NULL; + m_xConnection = NULL; clearCurrentCollections(); } @@ -496,7 +496,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< } ::rtl::OUString aName,aNewName; - column->getPropertyValue(PROPERTY_NAME) >>= aName; + column->getPropertyValue(PROPERTY_NAME) >>= aName; if ( !m_xMetaData->supportsOrderByUnrelated() && m_aCurrentColumns[SelectColumns] && !m_aCurrentColumns[SelectColumns]->hasByName(aName)) { @@ -507,7 +507,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< // filter anhaengen // select ohne where und order by aufbauen - ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString(); + ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString(); if ( m_aCurrentColumns[SelectColumns]->hasByName(aName) ) { Reference<XPropertySet> xColumn; @@ -517,10 +517,10 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< OSL_ENSURE(xColumn->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))),"Property FUNCTION not available!"); ::rtl::OUString sRealName,sTableName; - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; - xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; sal_Bool bFunction = sal_False; - xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))) >>= bFunction; + xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))) >>= bFunction; if ( sRealName == aName ) { if ( bFunction ) @@ -766,7 +766,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr ::std::vector< ::rtl::OUString> aNames; ::rtl::Reference< OSQLColumns> aSelectColumns; sal_Bool bCase = sal_True; - Reference< XNameAccess> xQueryColumns; + Reference< XNameAccess> xQueryColumns; if ( m_nCommandType == CommandType::QUERY ) { Reference<XColumnsSupplier> xSup(m_xConnectionQueries->getByName(m_sCommand),UNO_QUERY); @@ -883,7 +883,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr if ( aFind != aSelectColumns->get().end() ) { if ( aUsedSelectColumns.find( nFoundSelectColumnPos ) != aUsedSelectColumns.end() ) - { // we found a column name which exists twice + { // we found a column name which exists twice // so we start after the first found do { @@ -1042,9 +1042,9 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition, ::rtl::OUString aColumnName; - // pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar())); + // pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar())); pCondition->parseNodeToStr( aValue, m_xConnection, NULL ); - // pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar())); + // pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar())); pCondition->getChild(0)->parseNodeToStr( aColumnName, m_xConnection, NULL ); // don't display the column name @@ -1245,7 +1245,7 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon // Kriterium aItem.Handle = pCondition->getChild(1)->getNodeType(); - aValue = pCondition->getChild(1)->getTokenValue(); + aValue = pCondition->getChild(1)->getTokenValue(); for(i=0;i< pRhs->count();i++) pRhs->getChild(i)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); @@ -1304,14 +1304,14 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon if(m_pTables && m_pTables->getCount() > 1) { ::rtl::OUString aCatalog,aSchema,aTable,aComposedName,aColumnName; - column->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog; - column->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; - column->getPropertyValue(PROPERTY_TABLENAME) >>= aTable; - column->getPropertyValue(PROPERTY_NAME) >>= aColumnName; + column->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog; + column->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; + column->getPropertyValue(PROPERTY_TABLENAME) >>= aTable; + column->getPropertyValue(PROPERTY_NAME) >>= aColumnName; Sequence< ::rtl::OUString> aNames(m_pTables->getElementNames()); - const ::rtl::OUString* pBegin = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); + const ::rtl::OUString* pBegin = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); if(!aTable.getLength()) { // we don't found a table name, now we must search every table for this column @@ -1322,10 +1322,10 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon if(xColumnsSupp.is() && xColumnsSupp->getColumns()->hasByName(aColumnName)) { -// Reference<XPropertySet> xTableProp(xColumnsSupp,UNO_QUERY); -// xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog; -// xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; -// xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable; +// Reference<XPropertySet> xTableProp(xColumnsSupp,UNO_QUERY); +// xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog; +// xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; +// xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable; aTable = *pBegin; break; } @@ -1349,14 +1349,14 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon if(xTableProp.is()) { ::rtl::OUString aCatalog2,aSchema2,aTable2; - xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog2; - xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema2; - xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable2; + xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog2; + xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema2; + xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable2; if(aComp(aCatalog,aCatalog2) && aComp(aSchema,aSchema2) && aComp(aTable,aTable2)) { - aCatalog = aCatalog2; - aSchema = aSchema2; - aTable = aTable2; + aCatalog = aCatalog2; + aSchema = aSchema2; + aTable = aTable2; break; } } @@ -1559,7 +1559,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert column->getPropertyValue(PROPERTY_VALUE) >>= aValue; ::rtl::OUStringBuffer aSQL; - const ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString(); + const ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString(); getColumns(); if ( m_aCurrentColumns[SelectColumns] && m_aCurrentColumns[SelectColumns]->hasByName(aName) ) @@ -1571,8 +1571,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert OSL_ENSURE(xColumn->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction"))),"Property AggregateFunctionnot available!"); ::rtl::OUString sRealName,sTableName; - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; - xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; if(sTableName.indexOf('.',0) != -1) { ::rtl::OUString aCatlog,aSchema,aTable; @@ -1648,8 +1648,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert aSQL.appendAscii( "\'" ); } aSQL.appendAscii( "0x" ); - const sal_Int8* pBegin = aSeq.getConstArray(); - const sal_Int8* pEnd = pBegin + aSeq.getLength(); + const sal_Int8* pBegin = aSeq.getConstArray(); + const sal_Int8* pEnd = pBegin + aSeq.getLength(); for(;pBegin != pEnd;++pBegin) { aSQL.append( (sal_Int32)*pBegin, 16 ).getStr(); diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index 0093f673d2b9..1249dcfdbfaa 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -45,11 +45,11 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdb; +// using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -// using namespace ::cppu; +// using namespace ::cppu; using namespace ::osl; void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/) @@ -255,7 +255,7 @@ sal_Bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, Runt } if(row > (sal_Int32)m_aSet.size()) - m_aSetIter = m_aSet.end(); // check again + m_aSetIter = m_aSet.end(); // check again else m_aSetIter = m_aSet.begin() + row; } @@ -314,8 +314,8 @@ Sequence< sal_Int32 > SAL_CALL OStaticSet::deleteRows( const Sequence< Any >& ro { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::deleteRows" ); Sequence< sal_Int32 > aRet(rows.getLength()); - const Any* pBegin = rows.getConstArray(); - const Any* pEnd = pBegin + rows.getLength(); + const Any* pBegin = rows.getConstArray(); + const Any* pEnd = pBegin + rows.getLength(); for(sal_Int32 i=0;pBegin != pEnd; ++pBegin,++i) { deleteRow(*(m_aSet.begin() + comphelper::getINT32(*pBegin)),_xTable); diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx index d69dfca465ec..8b895015937f 100644 --- a/dbaccess/source/core/api/StaticSet.hxx +++ b/dbaccess/source/core/api/StaticSet.hxx @@ -37,9 +37,9 @@ namespace dbaccess // we use a snapshot class OStaticSet : public OCacheSet { - ORowSetMatrix m_aSet; + ORowSetMatrix m_aSet; ORowSetMatrix::iterator m_aSetIter; - sal_Bool m_bEnd; + sal_Bool m_bEnd; sal_Bool fetchRow(); void fillAllRows(); public: diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 4ed9dcdfcc65..7fed7d09cff3 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -120,9 +120,9 @@ void SAL_CALL ODBTableDecorator::disposing() OTableDescriptor_BASE::disposing(); MutexGuard aGuard(m_aMutex); - m_xTable = NULL; - m_xMetaData = NULL; - m_pTables = NULL; + m_xTable = NULL; + m_xMetaData = NULL; + m_pTables = NULL; m_xColumnDefinitions = NULL; m_xNumberFormats = NULL; if ( m_pColumns ) @@ -401,7 +401,7 @@ Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(Runti { aRet = m_xTable->queryInterface(rType); if(aRet.hasValue()) - { // now we know that our table supports this type so we return ourself + { // now we know that our table supports this type so we return ourself aRet = OTableDescriptor_BASE::queryInterface(rType); if(!aRet.hasValue()) aRet = ODataSettings::queryInterface(rType); @@ -427,9 +427,9 @@ void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) thro Reference<XRename> xRename(m_xTable,UNO_QUERY); if(xRename.is()) { -// ::rtl::OUString sOldName; -// Reference<XPropertySet> xProp(m_xTable,UNO_QUERY); -// xProp->getPropertyValue(PROPERTY_NAME) >>= sOldName; +// ::rtl::OUString sOldName; +// Reference<XPropertySet> xProp(m_xTable,UNO_QUERY); +// xProp->getPropertyValue(PROPERTY_NAME) >>= sOldName; xRename->rename(_rNewName); } else // not supported @@ -553,9 +553,9 @@ void ODBTableDecorator::fillPrivileges() const if ( m_nPrivileges == 0 ) // second chance { ::rtl::OUString sCatalog,sSchema,sName; - xProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; - xProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; - xProp->getPropertyValue(PROPERTY_NAME) >>= sName; + xProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; + xProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; + xProp->getPropertyValue(PROPERTY_NAME) >>= sName; m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),sCatalog,sSchema, sName); } } @@ -608,8 +608,8 @@ void ODBTableDecorator::refreshColumns() if(xNames.is()) { Sequence< ::rtl::OUString> aNames = xNames->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) aVector.push_back(*pIter); } @@ -625,7 +625,7 @@ void ODBTableDecorator::refreshColumns() OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions, m_xConnection, OContainerMediator::eColumns ); m_xColumnMediator = pMediator; pCol->setMediator( pMediator ); - m_pColumns = pCol; + m_pColumns = pCol; } else m_pColumns->reFill(aVector); diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index b1bd9a71056e..3634b2853af9 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -46,11 +46,11 @@ using namespace ::dbtools; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdb; +// using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -// using namespace ::cppu; +// using namespace ::cppu; using namespace ::osl; void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 9afc4b370cac..73a397eba635 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -317,9 +317,9 @@ Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeExcepti } else if(!m_pTable || (m_pTable && !m_pTable->isNew())) { - if(!m_bAddColumn && rType == getCppuType( (Reference<XAppend>*)0)) + if(!m_bAddColumn && rType == getCppuType( (Reference<XAppend>*)0)) return Any(); - if(!m_bDropColumn && rType == getCppuType( (Reference<XDrop>*)0)) + if(!m_bDropColumn && rType == getCppuType( (Reference<XDrop>*)0)) return Any(); } @@ -335,7 +335,7 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException) sal_Int32 nSize = 0; Type aAppendType = getCppuType( (Reference<XAppend>*)0); - Type aDropType = getCppuType( (Reference<XDrop>*)0); + Type aDropType = getCppuType( (Reference<XDrop>*)0); if(m_xDrvColumns.is()) { Reference<XTypeProvider> xTypes(m_xDrvColumns,UNO_QUERY); @@ -360,8 +360,8 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException) nSize = ((m_pTable && m_pTable->isNew()) ? 0 : ((m_bDropColumn ? (m_bAddColumn ? 0 : 1) : (m_bAddColumn ? 1 : 2)))); - bDropFound = (m_pTable && m_pTable->isNew()) || m_bDropColumn; - bAppendFound = (m_pTable && m_pTable->isNew()) || m_bAddColumn; + bDropFound = (m_pTable && m_pTable->isNew()) || m_bDropColumn; + bAppendFound = (m_pTable && m_pTable->isNew()) || m_bAddColumn; } Sequence< Type > aTypes(::comphelper::concatSequences(OColumns_BASE::getTypes(),TXChild::getTypes())); Sequence< Type > aRet(aTypes.getLength() - nSize); diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index fce607807650..40a0a047ab34 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -45,12 +45,12 @@ namespace dbaccess public ::com::sun::star::sdb::XColumnUpdate { protected: - ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow > m_xRow; - ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate; + ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow > m_xRow; + ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate; virtual ~ODataColumn(); public: - ODataColumn (const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData, + ODataColumn (const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData, const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow, const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index 134cd23a6956..085f99ecf7f1 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -93,22 +93,22 @@ void ODataSettings::registerPropertiesFor(ODataSettings_Base* _pItem) registerProperty(PROPERTY_TEXTRELIEF, PROPERTY_ID_TEXTRELIEF, PropertyAttribute::BOUND,&_pItem->m_nFontRelief, ::getCppuType(&_pItem->m_nFontRelief)); - registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&_pItem->m_aFont.Name, ::getCppuType(&_pItem->m_aFont.Name)); - registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Height, ::getCppuType(&_pItem->m_aFont.Height)); - registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.Width, ::getCppuType(&_pItem->m_aFont.Width)); - registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&_pItem->m_aFont.StyleName, ::getCppuType(&_pItem->m_aFont.StyleName)); - registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&_pItem->m_aFont.Family, ::getCppuType(&_pItem->m_aFont.Family)); - registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&_pItem->m_aFont.CharSet, ::getCppuType(&_pItem->m_aFont.CharSet)); - registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&_pItem->m_aFont.Pitch, ::getCppuType(&_pItem->m_aFont.Pitch)); - registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.CharacterWidth, ::getCppuType(&_pItem->m_aFont.CharacterWidth)); - registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Weight, ::getCppuType(&_pItem->m_aFont.Weight)); - registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&_pItem->m_aFont.Slant, ::getCppuType(&_pItem->m_aFont.Slant)); - registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&_pItem->m_aFont.Underline, ::getCppuType(&_pItem->m_aFont.Underline)); - registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&_pItem->m_aFont.Strikeout, ::getCppuType(&_pItem->m_aFont.Strikeout)); - registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&_pItem->m_aFont.Orientation, ::getCppuType(&_pItem->m_aFont.Orientation)); - registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&_pItem->m_aFont.Kerning, ::getCppuType(&_pItem->m_aFont.Kerning)); - registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&_pItem->m_aFont.WordLineMode, ::getCppuType(&_pItem->m_aFont.WordLineMode)); - registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&_pItem->m_aFont.Type, ::getCppuType(&_pItem->m_aFont.Type)); + registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&_pItem->m_aFont.Name, ::getCppuType(&_pItem->m_aFont.Name)); + registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Height, ::getCppuType(&_pItem->m_aFont.Height)); + registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.Width, ::getCppuType(&_pItem->m_aFont.Width)); + registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&_pItem->m_aFont.StyleName, ::getCppuType(&_pItem->m_aFont.StyleName)); + registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&_pItem->m_aFont.Family, ::getCppuType(&_pItem->m_aFont.Family)); + registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&_pItem->m_aFont.CharSet, ::getCppuType(&_pItem->m_aFont.CharSet)); + registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&_pItem->m_aFont.Pitch, ::getCppuType(&_pItem->m_aFont.Pitch)); + registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.CharacterWidth, ::getCppuType(&_pItem->m_aFont.CharacterWidth)); + registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Weight, ::getCppuType(&_pItem->m_aFont.Weight)); + registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&_pItem->m_aFont.Slant, ::getCppuType(&_pItem->m_aFont.Slant)); + registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&_pItem->m_aFont.Underline, ::getCppuType(&_pItem->m_aFont.Underline)); + registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&_pItem->m_aFont.Strikeout, ::getCppuType(&_pItem->m_aFont.Strikeout)); + registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&_pItem->m_aFont.Orientation, ::getCppuType(&_pItem->m_aFont.Orientation)); + registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&_pItem->m_aFont.Kerning, ::getCppuType(&_pItem->m_aFont.Kerning)); + registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&_pItem->m_aFont.WordLineMode, ::getCppuType(&_pItem->m_aFont.WordLineMode)); + registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&_pItem->m_aFont.Type, ::getCppuType(&_pItem->m_aFont.Type)); } ODataSettings::ODataSettings(OBroadcastHelper& _rBHelper,sal_Bool _bQuery) @@ -219,5 +219,5 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau } } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index 46d5de5615ef..c38443c0a4bf 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -58,10 +58,10 @@ using namespace ::comphelper; using namespace ::osl; using namespace dbaccess; -#define HAS_DESCRIPTION 0x00000001 -#define HAS_DEFAULTVALUE 0x00000002 -#define HAS_ROWVERSION 0x00000004 -#define HAS_AUTOINCREMENT_CREATION 0x00000008 +#define HAS_DESCRIPTION 0x00000001 +#define HAS_DEFAULTVALUE 0x00000002 +#define HAS_ROWVERSION 0x00000004 +#define HAS_AUTOINCREMENT_CREATION 0x00000008 //============================================================ //= OTableColumnDescriptor @@ -477,9 +477,9 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa DECL_PROP0_BOOL( ISAUTOINCREMENT ); DECL_PROP0_BOOL( ISCURRENCY ); DECL_PROP0( ISNULLABLE, sal_Int32 ); - DECL_PROP0( PRECISION, sal_Int32 ); - DECL_PROP0( SCALE, sal_Int32 ); - DECL_PROP0( TYPE, sal_Int32 ); + DECL_PROP0( PRECISION, sal_Int32 ); + DECL_PROP0( SCALE, sal_Int32 ); + DECL_PROP0( TYPE, sal_Int32 ); DECL_PROP0( TYPENAME, ::rtl::OUString ); if ( nId & HAS_AUTOINCREMENT_CREATION ) diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 30bd7b701d38..e4ec3ac83190 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -114,7 +114,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition } m_xCommandDefinition->addPropertyChangeListener(::rtl::OUString(), this); - // m_xCommandDefinition->addPropertyChangeListener(PROPERTY_NAME, this); + // m_xCommandDefinition->addPropertyChangeListener(PROPERTY_NAME, this); m_xCommandPropInfo = m_xCommandDefinition->getPropertySetInfo(); } DBG_ASSERT(m_xConnection.is(), "OQuery::OQuery : invalid connection !"); @@ -304,7 +304,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r if (getInfoHelper().fillPropertyMembersByHandle(&sAggPropName,&nAttr,_nHandle) && m_xCommandPropInfo.is() && m_xCommandPropInfo->hasPropertyByName(sAggPropName)) - { // the base class holds the property values itself, but we have to forward this to our CommandDefinition + { // the base class holds the property values itself, but we have to forward this to our CommandDefinition m_eDoingCurrently = SETTING_PROPERTIES; OAutoActionReset(this); @@ -316,7 +316,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r } } -Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(RuntimeException) { return createPropertySetInfo( getInfoHelper() ) ; } @@ -379,5 +379,5 @@ void OQuery::registerProperties() return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseQuery" ) ); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index c3fff9cc3cdd..ca5eeb64ea0b 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -52,16 +52,16 @@ namespace dbaccess //========================================================================== //= OQuery - an object implementing the sdb.Query service //========================================================================== -typedef ::cppu::ImplHelper3 < ::com::sun::star::sdbcx::XDataDescriptorFactory, +typedef ::cppu::ImplHelper3 < ::com::sun::star::sdbcx::XDataDescriptorFactory, ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::sdbcx::XRename - > OQuery_Base; + > OQuery_Base; class OQuery; class OColumn; -typedef ::comphelper::OPropertyArrayUsageHelper< OQuery > OQuery_ArrayHelperBase; +typedef ::comphelper::OPropertyArrayUsageHelper< OQuery > OQuery_ArrayHelperBase; -class OQuery :public OContentHelper +class OQuery :public OContentHelper ,public OQueryDescriptor_Base ,public OQuery_Base ,public OQuery_ArrayHelperBase @@ -73,26 +73,26 @@ public: typedef ::std::map< ::rtl::OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; protected: -// TNameColumnMap m_aColumnMap; // contains all columnnames to columns +// TNameColumnMap m_aColumnMap; // contains all columnnames to columns ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xCommandDefinition; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xCommandPropInfo; ::rtl::Reference< OContainerMediator > m_pColumnMediator; ::dbtools::IWarningsContainer* m_pWarnings; - sal_Bool m_bCaseSensitiv : 1; // assume case sensitivity of the column names ? + sal_Bool m_bCaseSensitiv : 1; // assume case sensitivity of the column names ? // possible actions on our "aggregate" enum AGGREGATE_ACTION { NONE, SETTING_PROPERTIES, FLUSHING }; - AGGREGATE_ACTION m_eDoingCurrently; + AGGREGATE_ACTION m_eDoingCurrently; // ------------------------------------------------------------------------ /** a class which automatically resets m_eDoingCurrently in it's destructor */ - class OAutoActionReset; // just for the following friend declaration + class OAutoActionReset; // just for the following friend declaration friend class OAutoActionReset; class OAutoActionReset { - OQuery* m_pActor; + OQuery* m_pActor; public: OAutoActionReset(OQuery* _pActor) : m_pActor(_pActor) { } ~OAutoActionReset() { m_pActor->m_eDoingCurrently = NONE; } @@ -103,7 +103,7 @@ protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; - ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); } + ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); } public: OQuery( @@ -144,8 +144,8 @@ public: public: // the caller is responsible for the lifetime! - void setWarningsContainer( ::dbtools::IWarningsContainer* _pWarnings ) { m_pWarnings = _pWarnings; } - ::dbtools::IWarningsContainer* getWarningsContainer( ) const { return m_pWarnings; } + void setWarningsContainer( ::dbtools::IWarningsContainer* _pWarnings ) { m_pWarnings = _pWarnings; } + ::dbtools::IWarningsContainer* getWarningsContainer( ) const { return m_pWarnings; } // XRename virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); @@ -165,7 +165,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREAPI_QUERY_HXX_ diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 12f83abf28fd..229ffa1914f5 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -92,7 +92,7 @@ OQueryContainer::OQueryContainer( m_pCommandsListener = new OContainerListener( *this, m_aMutex ); m_pCommandsListener->acquire(); - Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY_THROW ); + Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY_THROW ); xContainer->addContainerListener( m_pCommandsListener ); Reference< XContainerApproveBroadcaster > xContainerApprove( m_xCommandDefinitions, UNO_QUERY_THROW ); @@ -117,8 +117,8 @@ OQueryContainer::OQueryContainer( OQueryContainer::~OQueryContainer() { DBG_DTOR(OQueryContainer, NULL); - // dispose(); - // maybe we're already disposed, but this should be uncritical + // dispose(); + // maybe we're already disposed, but this should be uncritical } IMPLEMENT_FORWARD_XINTERFACE2( OQueryContainer,ODefinitionContainer,OQueryContainer_Base) @@ -135,7 +135,7 @@ void OQueryContainer::disposing() if ( m_pCommandsListener ) { - Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY ); + Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY ); xContainer->removeContainerListener( m_pCommandsListener ); Reference< XContainerApproveBroadcaster > xContainerApprove( m_xCommandDefinitions, UNO_QUERY ); xContainerApprove->removeContainerApproveListener( m_pCommandsListener ); @@ -145,8 +145,8 @@ void OQueryContainer::disposing() m_pCommandsListener = NULL; } - m_xCommandDefinitions = NULL; - m_xConnection = NULL; + m_xCommandDefinitions = NULL; + m_xConnection = NULL; } // XServiceInfo @@ -189,7 +189,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet // insert the basic object into the definition container { - m_eDoingCurrently = INSERTING; + m_eDoingCurrently = INSERTING; OAutoActionReset aAutoReset(this); m_xCommandDefinitions->insertByName(sNewObjectName, makeAny(xCommandDefinitionPart)); } @@ -316,7 +316,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const Contain void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw(::com::sun::star::uno::RuntimeException) { if (_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinitions, UNO_QUERY).get()) - { // our "master container" (with the command definitions) is beeing disposed + { // our "master container" (with the command definitions) is beeing disposed DBG_ERROR("OQueryContainer::disposing : nobody should dispose the CommandDefinition container before disposing my connection !"); dispose(); } @@ -326,7 +326,7 @@ void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObj // it's one of our documents .... Documents::iterator aIter = m_aDocumentMap.begin(); Documents::iterator aEnd = m_aDocumentMap.end(); - for (;aIter != aEnd;++aIter ) + for (;aIter != aEnd;++aIter ) { if ( xSource == aIter->second.get() ) { @@ -363,7 +363,7 @@ Reference< XContent > OQueryContainer::implCreateWrapper(const Reference< XConte xReturn = pNewObject; pNewObject->setWarningsContainer( m_pWarnings ); -// pNewObject->getColumns(); +// pNewObject->getColumns(); // Why? This is expensive. If you comment this in 'cause you really need it, be sure to run the // QueryInQuery test in dbaccess/qa/complex/dbaccess ... } @@ -415,5 +415,5 @@ Sequence< ::rtl::OUString > SAL_CALL OQueryContainer::getElementNames( ) throw( return m_xCommandDefinitions->getElementNames(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index b06a87abebcf..0fa808894d3c 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -128,7 +128,7 @@ Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo( ) DBG_NAME(OQueryDescriptor_Base); -OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf) +OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf) :m_bColumnsOutOfDate(sal_True) ,m_rMutex(_rMutex) { diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index 391df07351bb..58349c90967a 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -55,7 +55,7 @@ namespace dbaccess typedef ::cppu::ImplHelper3< ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XServiceInfo > OQueryDescriptor_BASE; + ::com::sun::star::lang::XServiceInfo > OQueryDescriptor_BASE; class OQueryDescriptor_Base :public OQueryDescriptor_BASE @@ -64,24 +64,24 @@ class OQueryDescriptor_Base ,public ::connectivity::sdbcx::IRefreshableColumns { private: - sal_Bool m_bColumnsOutOfDate : 1; // the columns have to be rebuild on the next getColumns ? - ::osl::Mutex& m_rMutex; + sal_Bool m_bColumnsOutOfDate : 1; // the columns have to be rebuild on the next getColumns ? + ::osl::Mutex& m_rMutex; protected: - OColumns* m_pColumns; // our column descriptions + OColumns* m_pColumns; // our column descriptions ::rtl::OUString m_sElementName; virtual ~OQueryDescriptor_Base(); - void setColumnsOutOfDate( sal_Bool _bOutOfDate = sal_True ); - sal_Bool isColumnsOutOfDate() const { return m_bColumnsOutOfDate; } + void setColumnsOutOfDate( sal_Bool _bOutOfDate = sal_True ); + sal_Bool isColumnsOutOfDate() const { return m_bColumnsOutOfDate; } - sal_Int32 getColumnCount() const { return m_pColumns ? m_pColumns->getCount() : 0; } - void clearColumns( ); + sal_Int32 getColumnCount() const { return m_pColumns ? m_pColumns->getCount() : 0; } + void clearColumns( ); - void implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ); + void implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ); public: - OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf); + OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf); /** constructs the object with a UNO QueryDescriptor. If you use this ctor, the resulting object won't have any column informations (the column container will be empty) */ @@ -102,7 +102,7 @@ public: protected: // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); @@ -152,7 +152,7 @@ public: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 89db5a7942a9..9a185bebc473 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -157,27 +157,27 @@ void OResultColumn::disposing() ::cppu::IPropertyArrayHelper* OResultColumn::createArrayHelper( ) const { BEGIN_PROPERTY_HELPER(21) - DECL_PROP1(CATALOGNAME, ::rtl::OUString, READONLY); - DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY); - DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY); - DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY); - DECL_PROP1_BOOL(ISCURRENCY, READONLY); - DECL_PROP1_BOOL(ISDEFINITELYWRITABLE, READONLY); - DECL_PROP1(ISNULLABLE, sal_Int32, READONLY); - DECL_PROP1_BOOL(ISREADONLY, READONLY); + DECL_PROP1(CATALOGNAME, ::rtl::OUString, READONLY); + DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY); + DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY); + DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY); + DECL_PROP1_BOOL(ISCURRENCY, READONLY); + DECL_PROP1_BOOL(ISDEFINITELYWRITABLE, READONLY); + DECL_PROP1(ISNULLABLE, sal_Int32, READONLY); + DECL_PROP1_BOOL(ISREADONLY, READONLY); DECL_PROP1_BOOL(ISROWVERSION, READONLY); - DECL_PROP1_BOOL(ISSEARCHABLE, READONLY); - DECL_PROP1_BOOL(ISSIGNED, READONLY); - DECL_PROP1_BOOL(ISWRITABLE, READONLY); - DECL_PROP1(LABEL, ::rtl::OUString, READONLY); - DECL_PROP1(NAME, ::rtl::OUString, READONLY); - DECL_PROP1(PRECISION, sal_Int32, READONLY); - DECL_PROP1(SCALE, sal_Int32, READONLY); - DECL_PROP1(SCHEMANAME, ::rtl::OUString, READONLY); - DECL_PROP1(SERVICENAME, ::rtl::OUString, READONLY); - DECL_PROP1(TABLENAME, ::rtl::OUString, READONLY); - DECL_PROP1(TYPE, sal_Int32, READONLY); - DECL_PROP1(TYPENAME, ::rtl::OUString, READONLY); + DECL_PROP1_BOOL(ISSEARCHABLE, READONLY); + DECL_PROP1_BOOL(ISSIGNED, READONLY); + DECL_PROP1_BOOL(ISWRITABLE, READONLY); + DECL_PROP1(LABEL, ::rtl::OUString, READONLY); + DECL_PROP1(NAME, ::rtl::OUString, READONLY); + DECL_PROP1(PRECISION, sal_Int32, READONLY); + DECL_PROP1(SCALE, sal_Int32, READONLY); + DECL_PROP1(SCHEMANAME, ::rtl::OUString, READONLY); + DECL_PROP1(SERVICENAME, ::rtl::OUString, READONLY); + DECL_PROP1(TABLENAME, ::rtl::OUString, READONLY); + DECL_PROP1(TYPE, sal_Int32, READONLY); + DECL_PROP1(TYPENAME, ::rtl::OUString, READONLY); END_PROPERTY_HELPER(); } @@ -302,12 +302,12 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const { sal_Bool bVal = sal_False; rValue.setValue(&bVal, getBooleanCppuType()); - } break; + } break; case PROPERTY_ID_ISREADONLY: { sal_Bool bVal = sal_True; rValue.setValue(&bVal, getBooleanCppuType()); - } break; + } break; case PROPERTY_ID_SCALE: case PROPERTY_ID_PRECISION: case PROPERTY_ID_DISPLAYSIZE: diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index a28854fcdf29..789a26f1c7c1 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -41,9 +41,9 @@ namespace dbaccess public ::comphelper::OPropertyArrayUsageHelper < OResultColumn > { protected: - ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xDBMetaData; - sal_Int32 m_nPos; + sal_Int32 m_nPos; ::com::sun::star::uno::Any m_aIsRowVersion; mutable ::boost::optional< sal_Bool > m_isSigned; mutable ::boost::optional< sal_Bool > m_isCurrency; diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 6d0669b874e7..f495088bd69b 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -230,12 +230,12 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::createArrayHelper" ); BEGIN_PROPERTY_HELPER(6) - DECL_PROP1(CURSORNAME, ::rtl::OUString, READONLY); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); - DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY); - DECL_PROP1(RESULTSETCONCURRENCY, sal_Int32, READONLY); - DECL_PROP1(RESULTSETTYPE, sal_Int32, READONLY); + DECL_PROP1(CURSORNAME, ::rtl::OUString, READONLY); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY); + DECL_PROP1(RESULTSETCONCURRENCY, sal_Int32, READONLY); + DECL_PROP1(RESULTSETTYPE, sal_Int32, READONLY); END_PROPERTY_HELPER(); } @@ -282,7 +282,7 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const { sal_Bool bVal = m_bIsBookmarkable; rValue.setValue(&bVal, getBooleanCppuType()); - } break; + } break; default: { // get the property name diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index dfc750bf51be..9bca1b5c58da 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -70,24 +70,24 @@ namespace dbaccess //************************************************************ // OResultSet //************************************************************ - class OResultSet : public comphelper::OBaseMutex, + class OResultSet : public comphelper::OBaseMutex, public OResultSetBase, public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper < OResultSet > { protected: - ONoWeakStatement m_aStatement; + ONoWeakStatement m_aStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xDelegatorResultSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xDelegatorResultSetUpdate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xDelegatorRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xDelegatorRowUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xDelegatorResultSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xDelegatorResultSetUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xDelegatorRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xDelegatorRowUpdate; ::dbtools::WarningsContainer m_aWarnings; - OColumns* m_pColumns; - sal_Int32 m_nResultSetType; - sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bIsBookmarkable : 1; + OColumns* m_pColumns; + sal_Int32 m_nResultSetType; + sal_Int32 m_nResultSetConcurrency; + sal_Bool m_bIsBookmarkable : 1; public: OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResultSet, diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index ebdc129d8c20..1b33f28b547f 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -200,15 +200,15 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::createArrayHelper" ); BEGIN_PROPERTY_HELPER(10) - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_PROP0_BOOL(ESCAPE_PROCESSING); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); - DECL_PROP0(MAXFIELDSIZE, sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); - DECL_PROP0(QUERYTIMEOUT, sal_Int32); - DECL_PROP0(RESULTSETCONCURRENCY, sal_Int32); - DECL_PROP0(RESULTSETTYPE, sal_Int32); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(MAXFIELDSIZE, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(QUERYTIMEOUT, sal_Int32); + DECL_PROP0(RESULTSETCONCURRENCY, sal_Int32); + DECL_PROP0(RESULTSETTYPE, sal_Int32); DECL_PROP0_BOOL(USEBOOKMARKS); END_PROPERTY_HELPER(); } diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 58194f3babfd..c25bdbec62ad 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -187,7 +187,7 @@ void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getFastPropertyValue" ); if ((PROPERTY_ID_PRIVILEGES == _nHandle) && (-1 == m_nPrivileges)) - { // somebody is asking for the privileges an we do not know them, yet + { // somebody is asking for the privileges an we do not know them, yet const_cast<ODBTable*>(this)->m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),m_CatalogName,m_SchemaName, m_Name); } @@ -235,22 +235,22 @@ void ODBTable::construct() registerProperty(PROPERTY_TEXTRELIEF, PROPERTY_ID_TEXTRELIEF, PropertyAttribute::BOUND, &m_nFontRelief, ::getCppuType(&m_nFontRelief)); - registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&m_aFont.Name, ::getCppuType(&m_aFont.Name)); - registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&m_aFont.Height, ::getCppuType(&m_aFont.Height)); - registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&m_aFont.Width, ::getCppuType(&m_aFont.Width)); - registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&m_aFont.StyleName, ::getCppuType(&m_aFont.StyleName)); - registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&m_aFont.Family, ::getCppuType(&m_aFont.Family)); - registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&m_aFont.CharSet, ::getCppuType(&m_aFont.CharSet)); - registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&m_aFont.Pitch, ::getCppuType(&m_aFont.Pitch)); - registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&m_aFont.CharacterWidth, ::getCppuType(&m_aFont.CharacterWidth)); - registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&m_aFont.Weight, ::getCppuType(&m_aFont.Weight)); - registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&m_aFont.Slant, ::getCppuType(&m_aFont.Slant)); - registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&m_aFont.Underline, ::getCppuType(&m_aFont.Underline)); - registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&m_aFont.Strikeout, ::getCppuType(&m_aFont.Strikeout)); - registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&m_aFont.Orientation, ::getCppuType(&m_aFont.Orientation)); - registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&m_aFont.Kerning, ::getCppuType(&m_aFont.Kerning)); - registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&m_aFont.WordLineMode, ::getCppuType(&m_aFont.WordLineMode)); - registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&m_aFont.Type, ::getCppuType(&m_aFont.Type)); + registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&m_aFont.Name, ::getCppuType(&m_aFont.Name)); + registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&m_aFont.Height, ::getCppuType(&m_aFont.Height)); + registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&m_aFont.Width, ::getCppuType(&m_aFont.Width)); + registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&m_aFont.StyleName, ::getCppuType(&m_aFont.StyleName)); + registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&m_aFont.Family, ::getCppuType(&m_aFont.Family)); + registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&m_aFont.CharSet, ::getCppuType(&m_aFont.CharSet)); + registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&m_aFont.Pitch, ::getCppuType(&m_aFont.Pitch)); + registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&m_aFont.CharacterWidth, ::getCppuType(&m_aFont.CharacterWidth)); + registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&m_aFont.Weight, ::getCppuType(&m_aFont.Weight)); + registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&m_aFont.Slant, ::getCppuType(&m_aFont.Slant)); + registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&m_aFont.Underline, ::getCppuType(&m_aFont.Underline)); + registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&m_aFont.Strikeout, ::getCppuType(&m_aFont.Strikeout)); + registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&m_aFont.Orientation, ::getCppuType(&m_aFont.Orientation)); + registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&m_aFont.Kerning, ::getCppuType(&m_aFont.Kerning)); + registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&m_aFont.WordLineMode, ::getCppuType(&m_aFont.WordLineMode)); + registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&m_aFont.Type, ::getCppuType(&m_aFont.Type)); refreshColumns(); } @@ -262,8 +262,8 @@ void ODBTable::construct() describeProperties(aProps); if(!_nId) { - Property* pIter = aProps.getArray(); - Property* pEnd = pIter + aProps.getLength(); + Property* pIter = aProps.getArray(); + Property* pEnd = pIter + aProps.getLength(); for(;pIter != pEnd;++pIter) { if (0 == pIter->Name.compareToAscii(PROPERTY_CATALOGNAME)) diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 827fbf2cf465..4b86763db667 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -87,7 +87,7 @@ namespace if ( xState.is() ) { const ::rtl::OUString* pIter = _aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + _aNames.getLength(); + const ::rtl::OUString* pEnd = pIter + _aNames.getLength(); for(;pIter != pEnd;++pIter) { try @@ -115,8 +115,8 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const Reference< XConnection >& _xCon, sal_Bool _bCase, - const Reference< XNameContainer >& _xTableDefinitions, - IRefreshListener* _pRefreshListener, + const Reference< XNameContainer >& _xTableDefinitions, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) :OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend) @@ -130,7 +130,7 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, OTableContainer::~OTableContainer() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::OTableContainer" ); - // dispose(); + // dispose(); DBG_DTOR(OTableContainer, NULL); } @@ -231,8 +231,8 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr Reference< XRow > xRow(xRes,UNO_QUERY); if(xRow.is()) { - sType = xRow->getString(4); - sDescription = xRow->getString(5); + sType = xRow->getString(4); + sDescription = xRow->getString(5); } } ::comphelper::disposeComponent(xRes); @@ -346,7 +346,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons Reference<XPropertySet> xProp = xFac->createDataDescriptor(); Sequence< ::rtl::OUString> aSeq = xNames->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( !xColumnDefinitions->hasByName(*pIter) ) @@ -362,7 +362,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons } } } - const static ::rtl::OUString s_pTableProps[] = { ::rtl::OUString(PROPERTY_FILTER), ::rtl::OUString(PROPERTY_ORDER) + const static ::rtl::OUString s_pTableProps[] = { ::rtl::OUString(PROPERTY_FILTER), ::rtl::OUString(PROPERTY_ORDER) , ::rtl::OUString(PROPERTY_APPLYFILTER), ::rtl::OUString(PROPERTY_FONT) , ::rtl::OUString(PROPERTY_ROW_HEIGHT), ::rtl::OUString(PROPERTY_TEXTCOLOR) , ::rtl::OUString(PROPERTY_TEXTLINECOLOR), ::rtl::OUString(PROPERTY_TEXTEMPHASIS) @@ -393,15 +393,15 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement if ( xTable.is() && m_xMetaData.is() ) { if( m_xMetaData.is() && m_xMetaData->supportsCatalogsInTableDefinitions() ) - xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; + xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; if( m_xMetaData.is() && m_xMetaData->supportsSchemasInTableDefinitions() ) - xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; - xTable->getPropertyValue(PROPERTY_NAME) >>= sTable; + xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; + xTable->getPropertyValue(PROPERTY_NAME) >>= sTable; sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); ::rtl::OUString sType; - xTable->getPropertyValue(PROPERTY_TYPE) >>= sType; + xTable->getPropertyValue(PROPERTY_TYPE) >>= sType; bIsView = sType.equalsIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))); } @@ -469,8 +469,8 @@ void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) th // create a new config entry { ::rtl::OUString sOldComposedName,sNewComposedName; - Event.ReplacedElement >>= sOldComposedName; - Event.Accessor >>= sNewComposedName; + Event.ReplacedElement >>= sOldComposedName; + Event.Accessor >>= sNewComposedName; renameObject(sOldComposedName,sNewComposedName); } @@ -481,7 +481,7 @@ void SAL_CALL OTableContainer::disposing() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::disposing" ); OFilteredContainer::disposing(); // say our listeners goobye - m_xTableDefinitions = NULL; + m_xTableDefinitions = NULL; m_pTableMediator = NULL; } diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 075bb806f095..465e451ace9b 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -78,7 +78,7 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent ,::osl::Mutex& _rMutex ,const Reference< XConnection >& _xCon ,sal_Bool _bCase - ,IRefreshListener* _pRefreshListener + ,IRefreshListener* _pRefreshListener ,::dbtools::IWarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) :OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend) @@ -89,7 +89,7 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent OViewContainer::~OViewContainer() { - // dispose(); + // dispose(); DBG_DTOR(OViewContainer, NULL); } @@ -196,9 +196,9 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN Reference<XPropertySet> xTable(getObject(_nPos),UNO_QUERY); if ( xTable.is() ) { - xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; - xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; - xTable->getPropertyValue(PROPERTY_NAME) >>= sTable; + xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; + xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; + xTable->getPropertyValue(PROPERTY_NAME) >>= sTable; sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); } diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 24b4716159ed..df7a85434a91 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -62,7 +62,7 @@ namespace dbaccess { /// helper class for column property change events which holds the OComponentDefinition weak -typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE; +typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE; class OColumnPropertyListener : public TColumnPropertyListener_BASE { OComponentDefinition* m_pComponent; @@ -121,7 +121,7 @@ void OComponentDefinition::registerProperties() } OComponentDefinition::OComponentDefinition(const Reference< XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTable) :OContentHelper(_xORB,_xParentContainer,_pImpl) @@ -138,7 +138,7 @@ OComponentDefinition::~OComponentDefinition() } -OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer +OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer ,const ::rtl::OUString& _rElementName ,const Reference< XMultiServiceFactory >& _xORB ,const TContentPtr& _pImpl @@ -297,5 +297,5 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS notifyDataSourceModified(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 0eba07a61dd4..6da15cd19fbb 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -66,8 +66,8 @@ namespace dbaccess Columns m_aColumns; public: - ::rtl::OUString m_sSchemaName; - ::rtl::OUString m_sCatalogName; + ::rtl::OUString m_sSchemaName; + ::rtl::OUString m_sCatalogName; public: OComponentDefinition_Impl(); @@ -93,7 +93,7 @@ class OColumnPropertyListener; //========================================================================= //= OComponentDefinition - a database "document" which describes a query //========================================================================= -class OComponentDefinition :public OContentHelper +class OComponentDefinition :public OContentHelper ,public ODataSettings ,public IColumnFactory ,public OComponentDefinition_BASE @@ -105,7 +105,7 @@ protected: ::std::auto_ptr< OColumns > m_pColumns; ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener> m_xColumnPropertyListener; - sal_Bool m_bTable; + sal_Bool m_bTable; virtual ~OComponentDefinition(); virtual void SAL_CALL disposing(); @@ -113,7 +113,7 @@ protected: protected: OComponentDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTable = sal_True); @@ -154,7 +154,7 @@ public: virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); @@ -176,7 +176,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // DBA_COREDATAACESS_COMPONENTDEFINITION_HXX diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index fb6bf98877fc..da4e3c271a69 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -72,7 +72,7 @@ OContentHelper_Impl::~OContentHelper_Impl() } OContentHelper::OContentHelper(const Reference< XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl) : OContentHelper_COMPBASE(m_aMutex) ,m_aContentListeners(m_aMutex) @@ -234,7 +234,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma Reference<XPropertySet> xProp(*this,UNO_QUERY); if ( xProp.is() ) aRet <<= xProp->getPropertySetInfo(); - // aRet <<= getPropertySetInfo(); // TODO + // aRet <<= getPropertySetInfo(); // TODO } else { @@ -349,7 +349,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue PropertyChangeEvent aEvent; aEvent.Source = static_cast< cppu::OWeakObject * >( this ); - aEvent.Further = sal_False; + aEvent.Further = sal_False; aEvent.PropertyHandle = -1; const PropertyValue* pValues = rValues.getConstArray(); @@ -433,7 +433,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue if ( nChanged > 0 ) { // @@@ Save changes. -// storeData(); +// storeData(); notifyDataSourceModified(); aGuard.clear(); @@ -638,7 +638,7 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN Sequence< PropertyChangeEvent > aChanges( 1 ); aChanges[0].Source = static_cast< cppu::OWeakObject * >( this ); - aChanges[0].Further = sal_False; + aChanges[0].Further = sal_False; aChanges[0].PropertyName = PROPERTY_NAME; aChanges[0].PropertyHandle = PROPERTY_ID_NAME; aChanges[0].OldValue <<= m_pImpl->m_aProps.aTitle; @@ -669,5 +669,5 @@ void OContentHelper::notifyDataSourceModified() ::dbaccess::notifyDataSourceModified(m_xParentContainer,sal_True); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 5d31055d2cc2..d3de75af3d53 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -1431,5 +1431,5 @@ ModelDependentComponent::~ModelDependentComponent() { } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index d18f820bff47..223654c38b85 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -192,8 +192,8 @@ public: private: OModuleClient m_aModuleClient; - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource > m_xDataSource; + ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource > m_xDataSource; DocumentStorageAccess* m_pStorageAccess; ::comphelper::SharedMutex m_aMutex; @@ -207,14 +207,14 @@ private: SharedStorage m_xDocumentStorage; ::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListener; - ODatabaseContext* m_pDBContext; + ODatabaseContext* m_pDBContext; DocumentEventsData m_aDocumentEvents; ::comphelper::NamedValueCollection m_aMediaDescriptor; /// the URL the document was loaded from - ::rtl::OUString m_sDocFileLocation; + ::rtl::OUString m_sDocFileLocation; - oslInterlockedCount m_refCount; + oslInterlockedCount m_refCount; /// do we have any object (forms/reports) which contains macros? ::boost::optional< EmbeddedMacros > m_aEmbeddedMacros; @@ -240,32 +240,32 @@ public: const ::comphelper::ComponentContext m_aContext; public: - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xCommandDefinitions; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xTableDefinitions; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xCommandDefinitions; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xTableDefinitions; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - ::rtl::OUString m_sConnectURL; - ::rtl::OUString m_sName; // transient, our creator has to tell us the title - ::rtl::OUString m_sUser; - ::rtl::OUString m_aPassword; // transient ! + ::rtl::OUString m_sConnectURL; + ::rtl::OUString m_sName; // transient, our creator has to tell us the title + ::rtl::OUString m_sUser; + ::rtl::OUString m_aPassword; // transient ! ::rtl::OUString m_sFailedPassword; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; sal_Int32 m_nLoginTimeout; - sal_Bool m_bReadOnly : 1; - sal_Bool m_bPasswordRequired : 1; - sal_Bool m_bSuppressVersionColumns : 1; - sal_Bool m_bModified : 1; - sal_Bool m_bDocumentReadOnly : 1; + sal_Bool m_bReadOnly : 1; + sal_Bool m_bPasswordRequired : 1; + sal_Bool m_bSuppressVersionColumns : 1; + sal_Bool m_bModified : 1; + sal_Bool m_bDocumentReadOnly : 1; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyAccess > m_xSettings; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; - OSharedConnectionManager* m_pSharedConnectionManager; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + OSharedConnectionManager* m_pSharedConnectionManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xSharedConnectionManager; - sal_uInt16 m_nControllerLockCount; + sal_uInt16 m_nControllerLockCount; void reset(); @@ -336,7 +336,7 @@ public: stripLoadArguments( const ::comphelper::NamedValueCollection& _rArguments ); // other stuff - void flushTables(); + void flushTables(); // disposes all elements in m_aStorages, and clears it void disposeStorages() SAL_THROW(()); @@ -636,7 +636,7 @@ public: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index 6c18633de23e..eaa2628648f2 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -38,7 +38,7 @@ namespace dbaccess using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -// using namespace ::com::sun::star::reflection; +// using namespace ::com::sun::star::reflection; using namespace connectivity; DBG_NAME(OSharedConnection) @@ -164,5 +164,5 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection return m_xConnection->getTypeMap(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index 5706d20ef5ae..4d21609d8d2c 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -54,9 +54,9 @@ namespace dbaccess //======================================================================================= typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::sdbc::XConnection > OSharedConnection_BASE; - typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2; + typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2; - class OSharedConnection : public ::comphelper::OBaseMutex + class OSharedConnection : public ::comphelper::OBaseMutex , public OSharedConnection_BASE , public OSharedConnection_BASE2 { @@ -137,7 +137,7 @@ namespace dbaccess IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection ); #endif -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CORE_SHARED_CONNECTION_HXX diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index a7d17634a81d..9caf1a583dc7 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -286,7 +286,7 @@ Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) thr Sequence< ::rtl::OUString > aNames(m_aBookmarks.size()); ::rtl::OUString* pNames = aNames.getArray(); ; - for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin(); + for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin(); aNameIter != m_aBookmarksIndexed.end(); ++pNames, ++aNameIter ) @@ -311,7 +311,7 @@ void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) // look for the name in the index access vector MapString2StringIterator aMapPos = m_aBookmarks.end(); - for ( MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin(); + for ( MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin(); aSearch != m_aBookmarksIndexed.end(); ++aSearch ) @@ -342,7 +342,7 @@ void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl:: MutexGuard aGuard(m_rMutex); OSL_ENSURE(m_aBookmarks.find(_rName) == m_aBookmarks.end(),"Bookmark already known!"); - m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first); + m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first); } void OBookmarkContainer::implReplace(const ::rtl::OUString& _rName, const ::rtl::OUString& _rNewLink) @@ -367,5 +367,5 @@ void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Pa throw NoSupportException(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index b41c70ae75e3..648d5654d114 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -47,17 +47,17 @@ namespace dbaccess { //========================================================================== -//= OBookmarkContainer - base class of collections of database definition -//= documents +//= OBookmarkContainer - base class of collections of database definition +//= documents //========================================================================== -typedef ::cppu::WeakImplHelper6 < +typedef ::cppu::WeakImplHelper6 < ::com::sun::star::container::XIndexAccess - , ::com::sun::star::container::XNameContainer - , ::com::sun::star::container::XEnumerationAccess - , ::com::sun::star::container::XContainer - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::container::XChild - > OBookmarkContainer_Base; + , ::com::sun::star::container::XNameContainer + , ::com::sun::star::container::XEnumerationAccess + , ::com::sun::star::container::XContainer + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::container::XChild + > OBookmarkContainer_Base; class OBookmarkContainer :public OBookmarkContainer_Base @@ -66,21 +66,21 @@ protected: DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString, MapString2String); DECLARE_STL_VECTOR(MapString2StringIterator, MapIteratorVector); - MapString2String m_aBookmarks; // the bookmarks itself - MapIteratorVector m_aBookmarksIndexed; // for index access to the + MapString2String m_aBookmarks; // the bookmarks itself + MapIteratorVector m_aBookmarksIndexed; // for index access to the protected: - ::cppu::OWeakObject& m_rParent; // for the ref counting + ::cppu::OWeakObject& m_rParent; // for the ref counting ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::osl::Mutex& m_rMutex; + ::osl::Mutex& m_rMutex; public: /** constructs the container.<BR> after the construction of the object the creator has to call <code>initialize</code>. - @param _rParent the parent object which is used for ref counting - @param _rMutex the parent's mutex object for access safety + @param _rParent the parent object which is used for ref counting + @param _rMutex the parent's mutex object for access safety */ OBookmarkContainer( ::cppu::OWeakObject& _rParent, @@ -135,26 +135,26 @@ public: /** tell the container to free all resources. After that it's in a state like after the construction, i.e. you may call <code>initialize</code> again (maybe with another configuration node). */ - virtual void dispose(); + virtual void dispose(); protected: - /** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and + /** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and not disposed (@see dispose) - @param _bIntendWriteAccess determines whether or not the caller intends to modify the configuration. + @param _bIntendWriteAccess determines whether or not the caller intends to modify the configuration. if sal_True and the configuration is readonly, a runtime exception with a description string is thrown. */ - void checkValid(sal_Bool _bIntendWriteAccess) const throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::DisposedException); + void checkValid(sal_Bool _bIntendWriteAccess) const throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::DisposedException); /** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e. if there is such an object which is not already loaded, it won't be loaded now. - @param _rName the object name to check - @return sal_True if there already exists such an object + @param _rName the object name to check + @return sal_True if there already exists such an object */ - inline sal_Bool checkExistence(const ::rtl::OUString& _rName); + inline sal_Bool checkExistence(const ::rtl::OUString& _rName); - void implAppend( + void implAppend( const ::rtl::OUString& _rName, const ::rtl::OUString& _rDocumentLocation ); @@ -167,12 +167,12 @@ protected: }; -inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName) +inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName) { return m_aBookmarks.find(_rName) != m_aBookmarks.end(); } -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_BOOKMARKCONTAINER_HXX_ diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index 695b952ca2f4..3394cd0f0ca4 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -53,7 +53,7 @@ namespace dbaccess DBG_NAME(OCommandContainer) OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTables ) @@ -97,5 +97,5 @@ Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exc return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseCommandDefinitionContainer" ) ); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index e1ff6b34357c..a425d7795dbe 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -44,7 +44,7 @@ namespace dbaccess typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XSingleServiceFactory > OCommandContainer_BASE; -class OCommandContainer : public ODefinitionContainer +class OCommandContainer : public ODefinitionContainer ,public OCommandContainer_BASE { sal_Bool m_bTables; @@ -54,7 +54,7 @@ public: */ OCommandContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTables ); @@ -77,7 +77,7 @@ protected: virtual ::rtl::OUString determineContentType() const; }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_ diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 8ab8abe30755..6cfd9231560f 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -98,7 +98,7 @@ OCommandDefinition::~OCommandDefinition() DBG_DTOR(OCommandDefinition, NULL); } -OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer +OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer ,const ::rtl::OUString& _rElementName ,const Reference< XMultiServiceFactory >& _xORB ,const TContentPtr& _pImpl) @@ -163,5 +163,5 @@ void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw } } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 30f22948cb62..b823c08f86d2 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -56,13 +56,13 @@ namespace dbaccess public: }; -typedef ::cppu::ImplHelper1 < ::com::sun::star::sdbcx::XRename - > OCommandDefinition_Base; +typedef ::cppu::ImplHelper1 < ::com::sun::star::sdbcx::XRename + > OCommandDefinition_Base; class OCommandDefinition; typedef ::comphelper::OPropertyArrayUsageHelper< OCommandDefinition > OCommandDefinition_PROP; -class OCommandDefinition :public OComponentDefinition +class OCommandDefinition :public OComponentDefinition ,public OCommandDefinition_Base ,public OCommandDefinition_PROP { @@ -70,7 +70,7 @@ protected: virtual ~OCommandDefinition(); OCommandDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ); @@ -114,7 +114,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_ diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 89840f11e2cb..490d0c47ffe0 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -560,7 +560,7 @@ Reference< XSQLQueryComposer > OConnection::createQueryComposer(void) throw( Ru MutexGuard aGuard(m_aMutex); checkDisposed(); - // Reference< XNumberFormatsSupplier > xSupplier = pParent->getNumberFormatsSupplier(); + // Reference< XNumberFormatsSupplier > xSupplier = pParent->getNumberFormatsSupplier(); Reference< XSQLQueryComposer > xComposer( new OQueryComposer( this ) ); m_aComposers.push_back(WeakReferenceHelper(xComposer)); return xComposer; @@ -588,11 +588,11 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed) getMasterTables(); if (m_xMasterTables.is() && m_xMasterTables->getTables().is()) - { // yes -> wrap them + { // yes -> wrap them m_pTables->construct(m_xMasterTables->getTables(),m_aTableFilter, m_aTableTypeFilter); } else - { // no -> use an own container + { // no -> use an own container m_pTables->construct(m_aTableFilter, m_aTableTypeFilter); } } @@ -890,5 +890,5 @@ Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< X return xReturn; } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 20488aa13e1c..2918d4f74192 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -86,7 +86,7 @@ class ODatabaseSource; //========================================================================== //= OConnection //========================================================================== -class OConnection :public ::comphelper::OBaseMutex +class OConnection :public ::comphelper::OBaseMutex ,public OSubComponent ,public ::connectivity::OConnectionWrapper ,public OConnection_Base @@ -95,16 +95,16 @@ class OConnection :public ::comphelper::OBaseMutex protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > m_xMasterTables; // just to avoid the recreation of the catalog - OWeakRefArray m_aStatements; + OWeakRefArray m_aStatements; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xQueries; - OWeakRefArray m_aComposers; + OWeakRefArray m_aComposers; // the filter as set on the parent data link at construction of the connection - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; ::comphelper::ComponentContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XConnectionTools > m_xConnectionTools; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XTableUIProvider > m_xTableUIProvider; @@ -114,13 +114,13 @@ protected: TSupportServices m_aSupportServices; - OTableContainer* m_pTables; - OViewContainer* m_pViews; + OTableContainer* m_pTables; + OViewContainer* m_pViews; ::dbtools::WarningsContainer m_aWarnings; oslInterlockedCount m_nInAppend; - sal_Bool m_bSupportsViews; // true when the getTableTypes return "VIEW" as type - sal_Bool m_bSupportsUsers; - sal_Bool m_bSupportsGroups; + sal_Bool m_bSupportsViews; // true when the getTableTypes return "VIEW" as type + sal_Bool m_bSupportsUsers; + sal_Bool m_bSupportsGroups; protected: virtual ~OConnection(); @@ -216,7 +216,7 @@ public: virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed); protected: - inline void checkDisposed() throw (::com::sun::star::lang::DisposedException) + inline void checkDisposed() throw (::com::sun::star::lang::DisposedException) { if ( rBHelper.bDisposed || !m_xConnection.is() ) throw ::com::sun::star::lang::DisposedException(); @@ -245,7 +245,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_CORE_CONNECTION_HXX_ diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 16d578588f0d..6fcf10a307d1 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -178,7 +178,7 @@ namespace dbaccess void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ ) throw (RuntimeException) { } - + void SAL_CALL DatabaseDocumentLoader::disposing( const lang::EventObject& /*Source*/ ) throw (RuntimeException) { } @@ -289,7 +289,7 @@ void ODatabaseContext::disposing() // dispose the data sources ObjectCache::iterator aEnd = m_aDatabaseObjects.end(); - for ( ObjectCache::iterator aIter = m_aDatabaseObjects.begin(); + for ( ObjectCache::iterator aIter = m_aDatabaseObjects.begin(); aIter != aEnd; ++aIter ) @@ -471,8 +471,8 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl const Property* pProperties = aProperties.getConstArray(); for ( sal_Int32 i=0; i<aProperties.getLength(); ++i, ++pProperties ) { - if ( ( ( pProperties->Attributes & PropertyAttribute::TRANSIENT) != 0 ) - && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 ) + if ( ( ( pProperties->Attributes & PropertyAttribute::TRANSIENT) != 0 ) + && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 ) ) { // found such a property @@ -643,19 +643,19 @@ Any ODatabaseContext::getByName(const rtl::OUString& _rName) throw( NoSuchElemen return makeAny( xExistent ); } catch (NoSuchElementException&) - { // let these exceptions through + { // let these exceptions through throw; } catch (WrappedTargetException&) - { // let these exceptions through + { // let these exceptions through throw; } catch (RuntimeException&) - { // let these exceptions through + { // let these exceptions through throw; } catch (Exception& e) - { // exceptions other than the speciafied ones -> wrap + { // exceptions other than the speciafied ones -> wrap Any aError = ::cppu::getCaughtException(); throw WrappedTargetException(_rName, *this, aError ); } @@ -766,5 +766,5 @@ void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForD _rBasicManager.SetGlobalUNOConstant( "ThisDatabaseDocument", makeAny( xDatabaseDocument ) ); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx index e7dbf9417e7e..71d5fb4ebc23 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.hxx +++ b/dbaccess/source/core/dataaccess/databasecontext.hxx @@ -75,15 +75,15 @@ class DatabaseDocumentLoader; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ODatabaseContext_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); -typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::container::XEnumerationAccess - , ::com::sun::star::container::XNameAccess - , ::com::sun::star::uno::XNamingService - , ::com::sun::star::container::XContainer - , ::com::sun::star::lang::XSingleServiceFactory - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::sdb::XDatabaseRegistrations - > DatabaseAccessContext_Base; +typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::container::XEnumerationAccess + , ::com::sun::star::container::XNameAccess + , ::com::sun::star::uno::XNamingService + , ::com::sun::star::container::XContainer + , ::com::sun::star::lang::XSingleServiceFactory + , ::com::sun::star::lang::XUnoTunnel + , ::com::sun::star::sdb::XDatabaseRegistrations + > DatabaseAccessContext_Base; class ODatabaseContext :public DatabaseAccessContext_Base ,public ::basic::BasicManagerCreationListener @@ -108,7 +108,7 @@ private: impl_createNewDataSource(); protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; ::comphelper::ComponentContext m_aContext; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > @@ -117,17 +117,17 @@ protected: m_xDatabaseRegistrations; DECLARE_STL_USTRINGACCESS_MAP( ODatabaseModelImpl*, ObjectCache ); - ObjectCache m_aDatabaseObjects; + ObjectCache m_aDatabaseObjects; DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >, PropertyCache ); - PropertyCache m_aDatasourceProperties; + PropertyCache m_aDatasourceProperties; // as we hold our data sources weak, we have to cache all properties on the data sources which are // transient but stored as long as the session lasts. The database context is the session (as it lives // as long as the session does), but the data sources may die before the session does, and then be // recreated afterwards. So it's our (the context's) responsibility to store the session-persistent // properties. - ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; DatabaseDocumentLoader* m_pDatabaseDocumentLoader; public: @@ -205,7 +205,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DATABASECONTEXT_HXX_ diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index f6dea5f99b3c..46a82018781f 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -164,7 +164,7 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument() static ::dba::OAutoRegistration< ODatabaseDocument > aAutoRegistration; } -ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& _pImpl ) +ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& _pImpl ) :ModelDependentComponent( _pImpl ) ,ODatabaseDocument_OfficeDocument( getMutex() ) ,m_aModifyListeners( getMutex() ) @@ -254,7 +254,7 @@ void SAL_CALL ODatabaseDocument::release( ) throw () ODatabaseDocument_OfficeDocument::release(); } -Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeException) +Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeException) { Sequence< Type > aTypes = ::comphelper::concatSequences( ODatabaseDocument_OfficeDocument::getTypes(), @@ -2088,5 +2088,5 @@ void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference return ::rtl::OUString();/*RTL_CONSTASCII_USTRINGPARAM(" : "));*/ } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index a032251f8efa..9659c033260c 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -166,11 +166,11 @@ typedef ::comphelper::WeakComponentImplHelper17 < ::com::sun::star::frame::XMo > ODatabaseDocument_OfficeDocument; typedef ::cppu::ImplHelper3< ::com::sun::star::frame::XTitle - , ::com::sun::star::frame::XTitleChangeBroadcaster - , ::com::sun::star::frame::XUntitledNumbers + , ::com::sun::star::frame::XTitleChangeBroadcaster + , ::com::sun::star::frame::XUntitledNumbers > ODatabaseDocument_Title; -class ODatabaseDocument :public ModelDependentComponent // ModelDependentComponent must be first! +class ODatabaseDocument :public ModelDependentComponent // ModelDependentComponent must be first! ,public ODatabaseDocument_OfficeDocument ,public ODatabaseDocument_Title { @@ -182,11 +182,11 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe }; DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers >,TNumberedController); - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; - ::cppu::OInterfaceContainerHelper m_aModifyListeners; - ::cppu::OInterfaceContainerHelper m_aCloseListener; - ::cppu::OInterfaceContainerHelper m_aStorageListeners; + ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::cppu::OInterfaceContainerHelper m_aCloseListener; + ::cppu::OInterfaceContainerHelper m_aStorageListeners; DocumentEvents* m_pEventContainer; ::rtl::Reference< DocumentEventExecutor > m_pEventExecutor; @@ -196,8 +196,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe Controllers m_aControllers; ViewMonitor m_aViewMonitor; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; ::com::sun::star::uno::WeakReference< ::com::sun::star::script::provider::XScriptProvider > m_xScriptProvider; /** @short such module manager is used to classify new opened documents. */ @@ -249,8 +249,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe /// write a single XML stream into the package void WriteThroughComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > & xComponent, /// the component we export - const sal_Char* pStreamName, /// the stream name - const sal_Char* pServiceName, /// service name of the component + const sal_Char* pStreamName, /// the stream name + const sal_Char* pServiceName, /// service name of the component const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> & rArguments, /// the argument (XInitialization) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc,/// output descriptor const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo @@ -268,11 +268,11 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe ) const; /** writes the content and settings - @param sURL + @param sURL The URL - @param lArguments + @param lArguments The media descriptor - @param _xStorageToSaveTo + @param _xStorageToSaveTo The storage which should be used for saving */ void impl_writeStorage_throw( @@ -318,7 +318,7 @@ public: SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); // 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); virtual void SAL_CALL acquire( ) throw (); virtual void SAL_CALL release( ) throw (); @@ -703,7 +703,7 @@ private: const ODatabaseDocument& m_document; }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 092432d7e487..4577ebb077e9 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -296,8 +296,8 @@ class OSharedConnectionManager : public OConnectionHelper_BASE // contains the currently used master connections typedef struct { - Reference< XConnection > xMasterConnection; - oslInterlockedCount nALiveCount; + Reference< XConnection > xMasterConnection; + oslInterlockedCount nALiveCount; } TConnectionHolder; // the less-compare functor, used for the stl::map @@ -312,13 +312,13 @@ class OSharedConnectionManager : public OConnectionHelper_BASE } }; - typedef ::std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections - typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections + typedef ::std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections + typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections - ::osl::Mutex m_aMutex; - TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest - TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map - Reference< XProxyFactory > m_xProxyFactory; + ::osl::Mutex m_aMutex; + TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest + TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map + Reference< XProxyFactory > m_xProxyFactory; protected: ~OSharedConnectionManager(); @@ -327,7 +327,7 @@ public: OSharedConnectionManager(const Reference< XMultiServiceFactory >& _rxServiceFactory); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException); - Reference<XConnection> getConnection( const rtl::OUString& url, + Reference<XConnection> getConnection( const rtl::OUString& url, const rtl::OUString& user, const rtl::OUString& password, const Sequence< PropertyValue >& _aInfo, @@ -364,7 +364,7 @@ void SAL_CALL OSharedConnectionManager::disposing( const ::com::sun::star::lang: } } -Reference<XConnection> OSharedConnectionManager::getConnection( const rtl::OUString& url, +Reference<XConnection> OSharedConnectionManager::getConnection( const rtl::OUString& url, const rtl::OUString& user, const rtl::OUString& password, const Sequence< PropertyValue >& _aInfo, @@ -375,15 +375,15 @@ Reference<XConnection> OSharedConnectionManager::getConnection( const rtl::OUStr Sequence< PropertyValue > aInfoCopy(_aInfo); sal_Int32 nPos = aInfoCopy.getLength(); aInfoCopy.realloc( nPos + 2 ); - aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter")); + aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter")); aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableFilter; - aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter")); + aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter")); aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableTypeFilter; // #22377# OJ ::rtl::OUString sUser = user; ::rtl::OUString sPassword = password; if ((0 == sUser.getLength()) && (0 == sPassword.getLength()) && (0 != _pDataSource->m_pImpl->m_sUser.getLength())) - { // ease the usage of this method. data source which are intended to have a user automatically + { // ease the usage of this method. data source which are intended to have a user automatically // fill in the user/password combination if the caller of this method does not specify otherwise // 86951 - 05/08/2001 - frank.schoenheit@germany.sun.com sUser = _pDataSource->m_pImpl->m_sUser; @@ -542,7 +542,7 @@ void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocume Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getTypes" ); - OTypeCollection aPropertyHelperTypes( ::getCppuType( (const Reference< XFastPropertySet > *)0 ), + OTypeCollection aPropertyHelperTypes( ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 ), ::getCppuType( (const Reference< XMultiPropertySet > *)0 )); @@ -662,7 +662,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O ::rtl::OUString sUser(_rUid); ::rtl::OUString sPwd(_rPwd); if ((0 == sUser.getLength()) && (0 == sPwd.getLength()) && (0 != m_pImpl->m_sUser.getLength())) - { // ease the usage of this method. data source which are intended to have a user automatically + { // ease the usage of this method. data source which are intended to have a user automatically // fill in the user/password combination if the caller of this method does not specify otherwise sUser = m_pImpl->m_sUser; if (0 != m_pImpl->m_aPassword.getLength()) @@ -770,19 +770,19 @@ Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() throw (Runt { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::createArrayHelper" ); BEGIN_PROPERTY_HELPER(13) - DECL_PROP1(INFO, Sequence< PropertyValue >, BOUND); - DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND); - DECL_PROP1_BOOL(ISREADONLY, READONLY); - DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND); - DECL_PROP1(NAME, ::rtl::OUString, READONLY); - DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); - DECL_PROP1(PASSWORD, ::rtl::OUString, TRANSIENT); + DECL_PROP1(INFO, Sequence< PropertyValue >, BOUND); + DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND); + DECL_PROP1_BOOL(ISREADONLY, READONLY); + DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND); + DECL_PROP1(NAME, ::rtl::OUString, READONLY); + DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); + DECL_PROP1(PASSWORD, ::rtl::OUString, TRANSIENT); DECL_PROP2_IFACE(SETTINGS, XPropertySet, BOUND, READONLY); - DECL_PROP1_BOOL(SUPPRESSVERSIONCL, BOUND); - DECL_PROP1(TABLEFILTER, Sequence< ::rtl::OUString >,BOUND); - DECL_PROP1(TABLETYPEFILTER, Sequence< ::rtl::OUString >,BOUND); - DECL_PROP1(URL, ::rtl::OUString, BOUND); - DECL_PROP1(USER, ::rtl::OUString, BOUND); + DECL_PROP1_BOOL(SUPPRESSVERSIONCL, BOUND); + DECL_PROP1(TABLEFILTER, Sequence< ::rtl::OUString >,BOUND); + DECL_PROP1(TABLETYPEFILTER, Sequence< ::rtl::OUString >,BOUND); + DECL_PROP1(URL, ::rtl::OUString, BOUND); + DECL_PROP1(USER, ::rtl::OUString, BOUND); END_PROPERTY_HELPER(); } @@ -823,7 +823,7 @@ sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & case PROPERTY_ID_URL: { bModified = ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_pImpl->m_sConnectURL); - } break; + } break; case PROPERTY_ID_INFO: { Sequence<PropertyValue> aValues; @@ -1124,7 +1124,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const sal_Bool bNewPasswordGiven = sal_False; if (m_pImpl->m_bPasswordRequired && (0 == sPassword.getLength())) - { // we need a password, but don't have one yet. + { // we need a password, but don't have one yet. // -> ask the user // build an interaction request @@ -1414,5 +1414,5 @@ Reference< XInterface > ODatabaseSource::getThis() const return *const_cast< ODatabaseSource* >( this ); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index 88cb631aac36..6bc9175101f6 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -96,8 +96,8 @@ class ODatabaseSource :public ModelDependentComponent // must be first private: using ODatabaseSource_Base::rBHelper; - OBookmarkContainer m_aBookmarks; - ::cppu::OInterfaceContainerHelper m_aFlushListeners; + OBookmarkContainer m_aBookmarks; + ::cppu::OInterfaceContainerHelper m_aFlushListeners; private: virtual ~ODatabaseSource(); @@ -231,7 +231,7 @@ protected: using ::cppu::OPropertySetHelper::getFastPropertyValue; }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index ef3c8af0a61b..0efce9c4aa11 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -103,7 +103,7 @@ ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr DBG_NAME(ODefinitionContainer) ODefinitionContainer::ODefinitionContainer( const Reference< XMultiServiceFactory >& _xORB - , const Reference< XInterface >& _xParentContainer + , const Reference< XInterface >& _xParentContainer , const TContentPtr& _pImpl , bool _bCheckSlash ) @@ -118,7 +118,7 @@ ODefinitionContainer::ODefinitionContainer( const Reference< XMultiServiceFact const ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); ODefinitionContainer_Impl::const_iterator aEnd = rDefinitions.end(); - for ( ODefinitionContainer_Impl::const_iterator aDefinition = rDefinitions.begin(); + for ( ODefinitionContainer_Impl::const_iterator aDefinition = rDefinitions.begin(); aDefinition != aEnd; ++aDefinition ) @@ -144,7 +144,7 @@ void SAL_CALL ODefinitionContainer::disposing() Documents::iterator aIter = m_aDocumentMap.begin(); Documents::iterator aEnd = m_aDocumentMap.end(); - for (; aIter != aEnd; ++aIter) + for (; aIter != aEnd; ++aIter) { Reference<XContent> xProp = aIter->second; if ( xProp.is() ) @@ -378,7 +378,7 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu Documents::iterator aPos = m_aDocuments[_nIndex]; Reference<XContent> xProp = aPos->second; if (!xProp.is()) - { // that's the first access to the object + { // that's the first access to the object // -> create it xProp = createObject(aPos->first); aPos->second = Documents::mapped_type(); @@ -404,7 +404,7 @@ Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& Reference< XContent > xProp = aMapPos->second; if (_bReadIfNeccessary && !xProp.is()) - { // the object has never been accessed before, so we have to read it now + { // the object has never been accessed before, so we have to read it now // (that's the expensive part) // create the object and insert it into the map @@ -423,7 +423,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) t Sequence< ::rtl::OUString > aNames(m_aDocumentMap.size()); ::rtl::OUString* pNames = aNames.getArray(); Documents::iterator aEnd = m_aDocumentMap.end(); - for ( Documents::iterator aNameIter = m_aDocumentMap.begin(); + for ( Documents::iterator aNameIter = m_aDocumentMap.begin(); aNameIter != aEnd; ++pNames, ++aNameIter ) @@ -448,7 +448,7 @@ void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) thr // it's one of our documents .... Documents::iterator aIter = m_aDocumentMap.begin(); Documents::iterator aEnd = m_aDocumentMap.end(); - for (;aIter != aEnd;++aIter ) + for (;aIter != aEnd;++aIter ) { if ( xSource == aIter->second.get() ) { diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 498882f5885e..8c59233ce28c 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -106,7 +106,7 @@ void SAL_CALL LocalNameApproval::approveElement( const ::rtl::OUString& _rName, DBG_NAME(ODocumentContainer) ODocumentContainer::ODocumentContainer(const Reference< XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl , sal_Bool _bFormsContainer ) @@ -484,7 +484,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com ////////////////////////////////////////////////////////////////// Sequence< ::rtl::OUString> aSeq = getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) removeByName(*pIter); @@ -752,7 +752,7 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName ) // do the removal implRemove(_rName); - // disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name + // disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers ); } @@ -780,5 +780,5 @@ void SAL_CALL ODocumentContainer::rename( const ::rtl::OUString& newName ) throw } } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index dafeef03fabf..ffcdff6c9c19 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -42,28 +42,28 @@ namespace dbaccess { -typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XComponentLoader - , ::com::sun::star::lang::XMultiServiceFactory - , ::com::sun::star::container::XHierarchicalNameContainer - , ::com::sun::star::container::XHierarchicalName - , ::com::sun::star::embed::XTransactedObject - > ODocumentContainer_Base; +typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XComponentLoader + , ::com::sun::star::lang::XMultiServiceFactory + , ::com::sun::star::container::XHierarchicalNameContainer + , ::com::sun::star::container::XHierarchicalName + , ::com::sun::star::embed::XTransactedObject + > ODocumentContainer_Base; //========================================================================== -//= ODocumentContainer - collections of database documents (reports/forms) +//= ODocumentContainer - collections of database documents (reports/forms) //========================================================================== -class ODocumentContainer : public ODefinitionContainer +class ODocumentContainer : public ODefinitionContainer , public ODocumentContainer_Base , public ::comphelper::OPropertyStateContainer , public ::comphelper::OPropertyArrayUsageHelper< ODocumentContainer > { - sal_Bool m_bFormsContainer; + sal_Bool m_bFormsContainer; public: /** constructs the container.<BR> */ ODocumentContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl , sal_Bool _bFormsContainer ); @@ -139,7 +139,7 @@ protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 305a01363177..4bd8c8edfc72 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -175,13 +175,13 @@ namespace dbaccess //================================================================== // OEmbedObjectHolder //================================================================== - typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener > TEmbedObjectHolder; - class OEmbedObjectHolder : public ::comphelper::OBaseMutex + typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener > TEmbedObjectHolder; + class OEmbedObjectHolder : public ::comphelper::OBaseMutex ,public TEmbedObjectHolder { Reference< XEmbeddedObject > m_xBroadCaster; - ODocumentDefinition* m_pDefinition; - bool m_bInStateChange; + ODocumentDefinition* m_pDefinition; + bool m_bInStateChange; bool m_bInChangingState; protected: virtual void SAL_CALL disposing(); @@ -362,14 +362,14 @@ namespace dbaccess //================================================================== class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave > { - ::rtl::OUString m_sName; - Reference<XContent> m_xParentContainer; + ::rtl::OUString m_sName; + Reference<XContent> m_xParentContainer; public: ODocumentSaveContinuation() { } - inline Reference<XContent> getContent() const { return m_xParentContainer; } - inline ::rtl::OUString getName() const { return m_sName; } + inline Reference<XContent> getContent() const { return m_xParentContainer; } + inline ::rtl::OUString getName() const { return m_sName; } // XInteractionDocumentSave virtual void SAL_CALL setName( const ::rtl::OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException); @@ -2207,5 +2207,5 @@ void NameChangeNotifier::impl_fireEvent_throw( const sal_Bool i_bVetoable ) m_rClearForNotify.reset(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index d7109efa2582..f74b6acf6815 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -58,7 +58,7 @@ namespace dbaccess class OEmbeddedClientHelper; //========================================================================== //= ODocumentDefinition - a database "document" which is simply a link to a real -//= document +//= document //========================================================================== typedef ::cppu::ImplHelper4 < ::com::sun::star::embed::XComponentSupplier @@ -73,16 +73,16 @@ class ODocumentDefinition ,public ::comphelper::OPropertyArrayUsageHelper< ODocumentDefinition > ,public ODocumentDefinition_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject> m_xEmbeddedObject; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener > m_xListener; + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject> m_xEmbeddedObject; + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener > m_xListener; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xLastKnownConnection; - OInterceptor* m_pInterceptor; - sal_Bool m_bForm; // <TRUE/> if it is a form - sal_Bool m_bOpenInDesign; - sal_Bool m_bInExecute; - sal_Bool m_bRemoveListener; - OEmbeddedClientHelper* m_pClientHelper; + OInterceptor* m_pInterceptor; + sal_Bool m_bForm; // <TRUE/> if it is a form + sal_Bool m_bOpenInDesign; + sal_Bool m_bInExecute; + sal_Bool m_bRemoveListener; + OEmbeddedClientHelper* m_pClientHelper; protected: virtual ~ODocumentDefinition(); @@ -294,7 +294,7 @@ private: ); /** loads the EmbeddedObject if not already loaded - @param _aClassID + @param _aClassID If set, it will be used to create the embedded object. */ void loadEmbeddedObject( @@ -334,7 +334,7 @@ private: /** searches for read-only flag in the args of the model and sets it to the given value, if the value was not found, it will be appended. - @param _bReadOnly + @param _bReadOnly If <TRUE/> the document will be switched to readonly mode */ void updateDocumentTitle(); @@ -379,7 +379,7 @@ private: void impl_fireEvent_throw( const sal_Bool i_bVetoable ); }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx index ee33fd145dff..dabd16a934fb 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx @@ -77,8 +77,8 @@ namespace dbaccess bool m_bInitialized; bool m_bDisposed; ::rtl::Reference< ::comphelper::AsyncEventNotifier > m_pEventBroadcaster; - ::cppu::OInterfaceContainerHelper m_aLegacyEventListeners; - ::cppu::OInterfaceContainerHelper m_aDocumentEventListeners; + ::cppu::OInterfaceContainerHelper m_aLegacyEventListeners; + ::cppu::OInterfaceContainerHelper m_aDocumentEventListeners; public: DocumentEventNotifier_Impl( ::cppu::OWeakObject& _rBroadcasterDocument, ::osl::Mutex& _rMutex ) diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 7fe1d9089bbc..1b950f2851be 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -57,12 +57,12 @@ using namespace ::com::sun::star::container; using namespace ::comphelper; using namespace ::cppu; -#define DISPATCH_SAVEAS 0 -#define DISPATCH_SAVE 1 -#define DISPATCH_CLOSEDOC 2 -#define DISPATCH_CLOSEWIN 3 -#define DISPATCH_CLOSEFRAME 4 -#define DISPATCH_RELOAD 5 +#define DISPATCH_SAVEAS 0 +#define DISPATCH_SAVE 1 +#define DISPATCH_CLOSEDOC 2 +#define DISPATCH_CLOSEWIN 3 +#define DISPATCH_CLOSEFRAME 4 +#define DISPATCH_RELOAD 5 // the OSL_ENSURE in CTOR has to be changed too, when adding new defines void SAL_CALL OInterceptor::dispose() @@ -98,12 +98,12 @@ OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder,sal_Bool _bAllo OSL_ENSURE(DISPATCH_RELOAD < m_aInterceptedURL.getLength(),"Illegal size."); - m_aInterceptedURL[DISPATCH_SAVEAS] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); - m_aInterceptedURL[DISPATCH_SAVE] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); - m_aInterceptedURL[DISPATCH_CLOSEDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); - m_aInterceptedURL[DISPATCH_CLOSEWIN] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); - m_aInterceptedURL[DISPATCH_CLOSEFRAME] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); - m_aInterceptedURL[DISPATCH_RELOAD] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Reload")); + m_aInterceptedURL[DISPATCH_SAVEAS] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); + m_aInterceptedURL[DISPATCH_SAVE] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); + m_aInterceptedURL[DISPATCH_CLOSEDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); + m_aInterceptedURL[DISPATCH_CLOSEWIN] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); + m_aInterceptedURL[DISPATCH_CLOSEFRAME] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); + m_aInterceptedURL[DISPATCH_RELOAD] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Reload")); } @@ -326,7 +326,7 @@ void SAL_CALL OInterceptor::removeStatusListener( //XInterceptorInfo -Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) +Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) { // now implemented as update return m_aInterceptedURL; @@ -340,7 +340,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,con { osl::MutexGuard aGuard(m_aMutex); const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( _URL.Complete == *pIter ) @@ -353,7 +353,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,con return Reference<XDispatch>(); } -Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence<DispatchDescriptor >& Requests ) throw ( RuntimeException ) +Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence<DispatchDescriptor >& Requests ) throw ( RuntimeException ) { Sequence< Reference< XDispatch > > aRet; osl::MutexGuard aGuard(m_aMutex); @@ -365,7 +365,7 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons for(sal_Int32 i = 0; i < Requests.getLength(); ++i) { const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( Requests[i].FeatureURL.Complete == *pIter ) @@ -383,15 +383,15 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons //XDispatchProviderInterceptor -Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException ) +Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException ) { osl::MutexGuard aGuard(m_aMutex); return m_xSlaveDispatchProvider; } void SAL_CALL -OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider ) - throw ( RuntimeException ) +OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider ) + throw ( RuntimeException ) { osl::MutexGuard aGuard(m_aMutex); m_xSlaveDispatchProvider = NewDispatchProvider; @@ -421,7 +421,7 @@ void SAL_CALL OInterceptor::setMasterDispatchProvider( void SAL_CALL OInterceptor::notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException) { osl::ResettableMutexGuard _rGuard(m_aMutex); - if ( m_pStatCL && Event.EventName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged")) ) + if ( m_pStatCL && Event.EventName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged")) ) { OInterfaceContainerHelper* pListener = m_pStatCL->getContainer(m_aInterceptedURL[DISPATCH_SAVE]); if ( pListener ) @@ -442,5 +442,5 @@ void SAL_CALL OInterceptor::disposing( const ::com::sun::star::lang::EventObject { } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index d1d4ffc27dd3..cb2cadc77c07 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -159,10 +159,10 @@ private: cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; PropertyChangeListenerContainer* m_pStatCL; - sal_Bool m_bAllowEditDoc; + sal_Bool m_bAllowEditDoc; }; -} // namespace dbaccess +} // namespace dbaccess #endif //DBA_INTERCEPT_HXX diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index 1a71fc0a3f65..93177d05b5fd 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -68,11 +68,11 @@ namespace dbaccess struct ResultListEntry { - rtl::OUString aId; - Reference< XContentIdentifier > xId; - ::rtl::Reference< OContentHelper > xContent; - Reference< XRow > xRow; - const ContentProperties& rData; + rtl::OUString aId; + Reference< XContentIdentifier > xId; + ::rtl::Reference< OContentHelper > xContent; + Reference< XRow > xRow; + const ContentProperties& rData; ResultListEntry( const ContentProperties& rEntry ) : rData( rEntry ) {} }; @@ -93,12 +93,12 @@ typedef std::vector< ResultListEntry* > ResultList; struct DataSupplier_Impl { - osl::Mutex m_aMutex; - ResultList m_aResults; - rtl::Reference< ODocumentContainer > m_xContent; - Reference< XMultiServiceFactory > m_xSMgr; - sal_Int32 m_nOpenMode; - sal_Bool m_bCountFinal; + osl::Mutex m_aMutex; + ResultList m_aResults; + rtl::Reference< ODocumentContainer > m_xContent; + Reference< XMultiServiceFactory > m_xSMgr; + sal_Int32 m_nOpenMode; + sal_Bool m_bCountFinal; DataSupplier_Impl( const Reference< XMultiServiceFactory >& rxSMgr, const rtl::Reference< ODocumentContainer >& rContent, @@ -266,7 +266,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) if ( nIndex < sal::static_int_cast< sal_uInt32 >( aSeq.getLength() ) ) { const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(pIter = pIter + nPos;pIter != pEnd;++pIter,++nPos) { m_pImpl->m_aResults.push_back( @@ -313,7 +313,7 @@ sal_uInt32 DataSupplier::totalCount() // @@@ Obtain data and put it into result list... Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) m_pImpl->m_aResults.push_back( new ResultListEntry( m_pImpl->m_xContent->getContent(*pIter)->getContentProperties() ) ); diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.cxx b/dbaccess/source/core/dataaccess/myucp_resultset.cxx index f2d5840f7c15..d59336d87527 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.cxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.cxx @@ -79,7 +79,7 @@ void DynamicResultSet::initStatic() m_xResultSet1 = new ::ucbhelper::ResultSet( m_xSMgr, m_aCommand.Properties, - new DataSupplier( m_xSMgr, + new DataSupplier( m_xSMgr, m_xContent, m_aCommand.Mode ), m_xEnv ); @@ -90,7 +90,7 @@ void DynamicResultSet::initDynamic() m_xResultSet1 = new ::ucbhelper::ResultSet( m_xSMgr, m_aCommand.Properties, - new DataSupplier( m_xSMgr, + new DataSupplier( m_xSMgr, m_xContent, m_aCommand.Mode ), m_xEnv ); diff --git a/dbaccess/source/core/inc/ContainerListener.hxx b/dbaccess/source/core/inc/ContainerListener.hxx index 878f13dae47b..6db609e9473f 100644 --- a/dbaccess/source/core/inc/ContainerListener.hxx +++ b/dbaccess/source/core/inc/ContainerListener.hxx @@ -82,7 +82,7 @@ namespace dbaccess virtual ~OContainerListener(); }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CONTAINERLISTENER_HXX diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 15b754e3607e..ffea0538ae3f 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -46,7 +46,7 @@ namespace dbaccess class OPropertyForward; - class OContainerMediator : public ::comphelper::OBaseMutex + class OContainerMediator : public ::comphelper::OBaseMutex ,public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > { public: @@ -59,9 +59,9 @@ namespace dbaccess private: typedef ::rtl::Reference< OPropertyForward > TPropertyForward; typedef ::std::map< ::rtl::OUString, TPropertyForward > PropertyForwardList; - PropertyForwardList m_aForwardList; + PropertyForwardList m_aForwardList; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xSettings; // can not be weak - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak + ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_aConnection; ContainerType m_eType; @@ -98,7 +98,7 @@ namespace dbaccess ); }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CONTAINERMEDIATOR_HXX diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 2d659f066b90..c2115a931155 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -56,13 +56,13 @@ namespace dbaccess class ODatabaseModelImpl; struct ContentProperties { - ::rtl::OUString aTitle; // Title + ::rtl::OUString aTitle; // Title ::boost::optional< ::rtl::OUString > aContentType; // ContentType (aka MediaType aka MimeType) sal_Bool bIsDocument; // IsDocument - sal_Bool bIsFolder; // IsFolder - sal_Bool bAsTemplate; // AsTemplate - ::rtl::OUString sPersistentName;// persistent name of the document + sal_Bool bIsFolder; // IsFolder + sal_Bool bAsTemplate; // AsTemplate + ::rtl::OUString sPersistentName;// persistent name of the document ContentProperties() :bIsDocument( sal_True ) @@ -78,30 +78,30 @@ namespace dbaccess OContentHelper_Impl(); virtual ~OContentHelper_Impl(); - ContentProperties m_aProps; - ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists + ContentProperties m_aProps; + ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists }; typedef ::boost::shared_ptr<OContentHelper_Impl> TContentPtr; - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, ::comphelper::UStringHash, ::comphelper::UStringEqual > PropertyChangeListenerContainer; - typedef ::comphelper::OBaseMutex OContentHelper_MBASE; - typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent - , ::com::sun::star::ucb::XCommandProcessor - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::beans::XPropertiesChangeNotifier - , ::com::sun::star::beans::XPropertyContainer - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::container::XChild - , ::com::sun::star::sdbcx::XRename - > OContentHelper_COMPBASE; - - class OContentHelper : public OContentHelper_MBASE + typedef ::comphelper::OBaseMutex OContentHelper_MBASE; + typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent + , ::com::sun::star::ucb::XCommandProcessor + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::beans::XPropertiesChangeNotifier + , ::com::sun::star::beans::XPropertyContainer + , ::com::sun::star::lang::XInitialization + , ::com::sun::star::lang::XUnoTunnel + , ::com::sun::star::container::XChild + , ::com::sun::star::sdbcx::XRename + > OContentHelper_COMPBASE; + + class OContentHelper : public OContentHelper_MBASE ,public OContentHelper_COMPBASE { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > @@ -116,14 +116,14 @@ namespace dbaccess void impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify = true); protected: - ::cppu::OInterfaceContainerHelper m_aContentListeners; - PropertyChangeListenerContainer m_aPropertyChangeListeners; + ::cppu::OInterfaceContainerHelper m_aContentListeners; + PropertyChangeListenerContainer m_aPropertyChangeListeners; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParentContainer; const ::comphelper::ComponentContext m_aContext; const ::connectivity::SQLError m_aErrorHelper; - TContentPtr m_pImpl; - sal_uInt32 m_nCommandId; + TContentPtr m_pImpl; + sal_uInt32 m_nCommandId; // helper virtual void SAL_CALL disposing(); @@ -142,13 +142,13 @@ namespace dbaccess public: OContentHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ); // com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // ::com::sun::star::lang::XServiceInfo virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); @@ -200,7 +200,7 @@ namespace dbaccess virtual ::rtl::OUString determineContentType() const = 0; }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CONTENTHELPER_HXX diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index eb6dba6f54b8..ecd3c4f13551 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -228,7 +228,7 @@ private: void impl_invalidateParameter_nothrow(); ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const; - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -256,9 +256,9 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeXMLConversion> m_xRangeConversion; ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> m_xHandler; // the object doin' most of the work - an SDB-rowset - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xAggregateSet; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_MasterFields; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_DetailFields; diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx index 561ef67778f9..8ba05a516253 100644 --- a/dbaccess/source/core/inc/FilteredContainer.hxx +++ b/dbaccess/source/core/inc/FilteredContainer.hxx @@ -45,17 +45,17 @@ namespace dbaccess class OFilteredContainer : public ::connectivity::sdbcx::OCollection { private: - mutable sal_Bool m_bConstructed; // late ctor called + mutable sal_Bool m_bConstructed; // late ctor called protected: ::dbtools::IWarningsContainer* m_pWarningsContainer; - IRefreshListener* m_pRefreshListener; + IRefreshListener* m_pRefreshListener; oslInterlockedCount& m_nInAppend; // holds the original container which where set in construct but they can be null - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMasterContainer; - ::com::sun::star::uno::WeakReference< ::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::container::XNameAccess > m_xMasterContainer; + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; /** returns a string denoting the only type of tables allowed in this container, or an empty string if there is no such restriction @@ -101,18 +101,18 @@ namespace dbaccess public: /** ctor of the container. The parent has to support the <type scope="com::sun::star::sdbc">XConnection</type> interface.<BR> - @param _rParent the object which acts as parent for the container. + @param _rParent the object which acts as parent for the container. all refcounting is rerouted to this object - @param _rMutex the access safety object of the parent - @param _rTableFilter restricts the visible tables by name - @param _rTableTypeFilter restricts the visible tables by type - @see construct + @param _rMutex the access safety object of the parent + @param _rTableFilter restricts the visible tables by name + @param _rTableTypeFilter restricts the visible tables by type + @see construct */ OFilteredContainer( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon, sal_Bool _bCase, - IRefreshListener* _pRefreshListener, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer, oslInterlockedCount& _nInAppend ); diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index 4a685b037be0..a3bb17da4fd1 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -43,8 +43,8 @@ namespace dbaccess // =================================================================== // = OPropertyForward // =================================================================== - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener - > OPropertyForward_Base; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener + > OPropertyForward_Base; class OPropertyForward :public ::comphelper::OBaseMutex ,public OPropertyForward_Base { @@ -52,8 +52,8 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDestContainer; - ::rtl::OUString m_sName; - sal_Bool m_bInInsert; + ::rtl::OUString m_sName; + sal_Bool m_bInInsert; protected: virtual ~OPropertyForward(); @@ -76,7 +76,7 @@ namespace dbaccess inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDefinition() const { return m_xDest; } }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_PROPERTYSETFORWARD_HXX diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx index 80e490c4a34c..b5fed70b8b9b 100644 --- a/dbaccess/source/core/inc/RefreshListener.hxx +++ b/dbaccess/source/core/inc/RefreshListener.hxx @@ -49,7 +49,7 @@ namespace dbaccess virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed) = 0; }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CORE_REFRESHLISTENER_HXX diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 305d3493d353..cad13ae113f4 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -53,16 +53,16 @@ namespace com { namespace sun { namespace star { namespace util { namespace dbaccess { - typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSingleSelectQueryComposer, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSingleSelectQueryComposer, ::com::sun::star::sdb::XParametersSupplier, ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::sdbcx::XTablesSupplier, - ::com::sun::star::lang::XServiceInfo > OSingleSelectQueryComposer_BASE; + ::com::sun::star::lang::XServiceInfo > OSingleSelectQueryComposer_BASE; class OPrivateColumns; class OPrivateTables; - class OSingleSelectQueryComposer : public ::comphelper::OMutexAndBroadcastHelper + class OSingleSelectQueryComposer : public ::comphelper::OMutexAndBroadcastHelper ,public OSubComponent ,public ::comphelper::OPropertyContainer ,public ::comphelper::OPropertyArrayUsageHelper < OSingleSelectQueryComposer > @@ -80,42 +80,42 @@ namespace dbaccess inline void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); } enum EColumnType { - SelectColumns = 0, - GroupByColumns = 1, - OrderColumns = 2, - ParameterColumns = 3 + SelectColumns = 0, + GroupByColumns = 1, + OrderColumns = 2, + ParameterColumns = 3 }; typedef ::std::const_mem_fun_t< const ::connectivity::OSQLParseNode*, ::connectivity::OSQLParseTreeIterator > TGetParseNode; - ::connectivity::OSQLParser m_aSqlParser; - ::connectivity::OSQLParseTreeIterator m_aSqlIterator; // the iterator for the complete statement - ::connectivity::OSQLParseTreeIterator m_aAdditiveIterator; // the iterator for the "additive statement" (means without the clauses of the elementary statement) - ::std::vector<OPrivateColumns*> m_aColumnsCollection; // used for columns and parameters of old queries - ::std::vector<OPrivateTables*> m_aTablesCollection; + ::connectivity::OSQLParser m_aSqlParser; + ::connectivity::OSQLParseTreeIterator m_aSqlIterator; // the iterator for the complete statement + ::connectivity::OSQLParseTreeIterator m_aAdditiveIterator; // the iterator for the "additive statement" (means without the clauses of the elementary statement) + ::std::vector<OPrivateColumns*> m_aColumnsCollection; // used for columns and parameters of old queries + ::std::vector<OPrivateTables*> m_aTablesCollection; ::std::vector< ::rtl::OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement - ::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::container::XNameAccess> m_xConnectionTables; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionQueries; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - ::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::container::XNameAccess> m_xConnectionTables; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionQueries; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; ::comphelper::ComponentContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; + ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; - ::std::vector<OPrivateColumns*> m_aCurrentColumns; - OPrivateTables* m_pTables; // currently used tables + ::std::vector<OPrivateColumns*> m_aCurrentColumns; + OPrivateTables* m_pTables; // currently used tables - ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having - ::rtl::OUString m_sDecimalSep; - ::rtl::OUString m_sCommand; - ::com::sun::star::lang::Locale m_aLocale; - sal_Int32 m_nBoolCompareMode; // how to compare bool values - sal_Int32 m_nCommandType; + ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having + ::rtl::OUString m_sDecimalSep; + ::rtl::OUString m_sCommand; + ::com::sun::star::lang::Locale m_aLocale; + sal_Int32 m_nBoolCompareMode; // how to compare bool values + sal_Int32 m_nCommandType; // <properties> - ::rtl::OUString m_sOrignal; + ::rtl::OUString m_sOrignal; // </properties> @@ -147,7 +147,7 @@ namespace dbaccess ,sal_Int32 filterOperator); /** getStructuredCondition returns the structured condition for the where or having clause - @param _aGetFunctor + @param _aGetFunctor A member function to get the correct parse node. @return @@ -164,9 +164,9 @@ namespace dbaccess inline bool implSetHavingClause(::rtl::OUString _sFilter) { setHavingClause(_sFilter); return true;} /** returns the part of the seelect statement - @param _ePart + @param _ePart Which part should be returned. - @param _bWithKeyword + @param _bWithKeyword If <TRUE/> the keyword will be added too. Otherwise not. @param _rIterator The iterator to use. @@ -196,7 +196,7 @@ namespace dbaccess virtual ~OSingleSelectQueryComposer(); public: - OSingleSelectQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTableSupplier, + OSingleSelectQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTableSupplier, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::comphelper::ComponentContext& _rContext); diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 659f667e0544..543081d8c2ce 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -51,7 +51,7 @@ namespace dbaccess { - typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbcx::XColumnsSupplier, + typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::sdbcx::XKeysSupplier, ::com::sun::star::container::XNamed, ::com::sun::star::lang::XServiceInfo, @@ -66,7 +66,7 @@ namespace dbaccess class ODBTableDecorator; typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTableDecorator > ODBTableDecorator_PROP; - class ODBTableDecorator :public comphelper::OBaseMutex + class ODBTableDecorator :public comphelper::OBaseMutex ,public OTableDescriptor_BASE ,public ODataSettings //ODataSettings_Base ,public IColumnFactory @@ -75,21 +75,21 @@ namespace dbaccess { void fillPrivileges() const; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xColumnMediator; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xColumnMediator; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; ::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::util::XNumberFormatsSupplier > m_xNumberFormats; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormats; // <properties> - mutable sal_Int32 m_nPrivileges; + mutable sal_Int32 m_nPrivileges; // </properties> - ::connectivity::sdbcx::OCollection* m_pColumns; - ::connectivity::sdbcx::OCollection* m_pTables; + ::connectivity::sdbcx::OCollection* m_pColumns; + ::connectivity::sdbcx::OCollection* m_pTables; // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); @@ -128,7 +128,7 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _rxNumberFormats, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumnDefinitions - ) throw(::com::sun::star::sdbc::SQLException); + ) throw(::com::sun::star::sdbc::SQLException); diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index a65e967cc4c4..72bd63ee5df6 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -70,11 +70,11 @@ namespace dbaccess //************************************************************ // OColumn //************************************************************ - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::lang::XServiceInfo, + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::container::XNamed > OColumnBase; - class OColumn :public comphelper::OBaseMutex + class OColumn :public comphelper::OBaseMutex ,public OColumnBase ,public ::comphelper::OPropertyContainer ,public IPropertyContainer // convenience for the derived class which also derive from OColumnSettings @@ -167,18 +167,18 @@ namespace dbaccess class OColumns : public OColumns_BASE ,public TXChild { - OContainerMediator* m_pMediator; + OContainerMediator* m_pMediator; protected: // comes from the driver can be null - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDrvColumns; - ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xParent; - IColumnFactory* m_pColFactoryImpl; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDrvColumns; + ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xParent; + IColumnFactory* m_pColFactoryImpl; ::connectivity::sdbcx::IRefreshableColumns* m_pRefreshColumns; - sal_Bool m_bInitialized : 1; - sal_Bool m_bAddColumn : 1; - sal_Bool m_bDropColumn : 1; + sal_Bool m_bInitialized : 1; + sal_Bool m_bAddColumn : 1; + sal_Bool m_bDropColumn : 1; virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); @@ -193,17 +193,17 @@ namespace dbaccess } /** flag which determines whether the container is filled or not */ - inline sal_Bool isInitialized() const { return m_bInitialized; } - inline void setInitialized() {m_bInitialized = sal_True;} - inline void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; } + inline sal_Bool isInitialized() const { return m_bInitialized; } + inline void setInitialized() {m_bInitialized = sal_True;} + inline void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; } public: /** constructs an empty container without configuration location. - @param rParent the parent object. This instance will be used for refcounting, so the parent + @param rParent the parent object. This instance will be used for refcounting, so the parent cannot die before the container does. - @param _rMutex the mutex of the parent. - @param _bCaseSensitive the initial case sensitivity flag - @see setCaseSensitive + @param _rMutex the mutex of the parent. + @param _bCaseSensitive the initial case sensitivity flag + @see setCaseSensitive */ OColumns( ::cppu::OWeakObject& _rParent, diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx index c407b60820a8..0fb7d4362cdd 100644 --- a/dbaccess/source/core/inc/columnsettings.hxx +++ b/dbaccess/source/core/inc/columnsettings.hxx @@ -69,17 +69,17 @@ namespace dbaccess //==================================================================== class OColumnSettings { - // <properties> - ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void - ::com::sun::star::uno::Any m_aFormatKey; // sal_Int32 or void - ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void - ::com::sun::star::uno::Any m_aAlignment; // sal_Int32 (::com::sun::star::awt::TextAlign) or void - ::com::sun::star::uno::Any m_aHelpText; // the description of the column which is visible in the helptext of the column - ::com::sun::star::uno::Any m_aControlDefault; // the default value which should be displayed as by a control when moving to a new row + // <properties> + ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void + ::com::sun::star::uno::Any m_aFormatKey; // sal_Int32 or void + ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void + ::com::sun::star::uno::Any m_aAlignment; // sal_Int32 (::com::sun::star::awt::TextAlign) or void + ::com::sun::star::uno::Any m_aHelpText; // the description of the column which is visible in the helptext of the column + ::com::sun::star::uno::Any m_aControlDefault; // the default value which should be displayed as by a control when moving to a new row ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; - sal_Bool m_bHidden; - // </properties> + sal_Bool m_bHidden; + // </properties> protected: virtual ~OColumnSettings(); diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index 05b9ca849276..cc82cdc59295 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -37,7 +37,7 @@ namespace dbaccess //========================================================================== //= OCommandBase - a base class (in fact just a container for some members) -//= for classes implementing the sdb.CommandDefinition service +//= for classes implementing the sdb.CommandDefinition service //========================================================================== class OCommandBase { @@ -45,11 +45,11 @@ public: // need public access // <properties> ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; - ::rtl::OUString m_sCommand; - sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer - ::rtl::OUString m_sUpdateTableName; - ::rtl::OUString m_sUpdateSchemaName; - ::rtl::OUString m_sUpdateCatalogName; + ::rtl::OUString m_sCommand; + sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer + ::rtl::OUString m_sUpdateTableName; + ::rtl::OUString m_sUpdateSchemaName; + ::rtl::OUString m_sUpdateCatalogName; // </properties> protected: @@ -57,7 +57,7 @@ protected: }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_COMMANDBASE_HXX_ diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc index 05c8aebe0b26..77745302a602 100644 --- a/dbaccess/source/core/inc/core_resource.hrc +++ b/dbaccess/source/core/inc/core_resource.hrc @@ -32,44 +32,44 @@ #include <svl/solar.hrc> #endif -#define RID_CORE_STRINGS_START RID_DBACCESS_START +#define RID_CORE_STRINGS_START RID_DBACCESS_START //- String-IDs -#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 ) -#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 ) -#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 ) -#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 ) -#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 ) -#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 ) -#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 ) -#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 ) -#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 ) -#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 ) -#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 ) -#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 ) -#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 ) -#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 ) -#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 ) -#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 ) -#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 ) -#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 ) -#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 ) -#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 ) -#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 ) -#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 ) +#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 ) +#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) +#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 ) +#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 ) +#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 ) +#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 ) +#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 ) +#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 ) +#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 ) +#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 ) +#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 ) +#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 ) +#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 ) +#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 ) +#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 ) +#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 ) +#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 ) +#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 ) +#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 ) +#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 ) +#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 ) +#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 ) +#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 ) +#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 ) +#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 ) +#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 ) +#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 ) +#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 ) +#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 ) +#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 ) +#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 ) +#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 ) +#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 ) +#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 ) +#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 ) #define RID_STR_FILE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 35 ) #define RID_STR_TABLE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 36 ) #define RID_STR_CONFLICTING_NAMES ( RID_CORE_STRINGS_START + 37 ) @@ -83,27 +83,27 @@ #define RID_STR_NAME_NOT_FOUND ( RID_CORE_STRINGS_START + 45 ) #define RID_STR_QUERY_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 46 ) #define RID_STR_ERROR_WHILE_SAVING ( RID_CORE_STRINGS_START + 47 ) -#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 ) +#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 ) -#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 ) -#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 ) -#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 ) -#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 ) -#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 ) -#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 ) +#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 ) +#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 ) +#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 ) +#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 ) +#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 ) +#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 ) -#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 ) -#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 ) -#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 ) -#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 ) -#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 ) -#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 ) -#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 ) -#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 ) -#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 ) -#define RID_STR_NO_EMBEDDING ( RID_CORE_STRINGS_START + 64 ) -#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 ) -#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 ) +#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 ) +#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 ) +#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 ) +#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 ) +#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 ) +#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 ) +#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 ) +#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 ) +#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 ) +#define RID_STR_NO_EMBEDDING ( RID_CORE_STRINGS_START + 64 ) +#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 ) +#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 ) #define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 ) diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx index 42677cd5a72d..87d52e689e01 100644 --- a/dbaccess/source/core/inc/core_resource.hxx +++ b/dbaccess/source/core/inc/core_resource.hxx @@ -51,9 +51,9 @@ namespace dbaccess class ResourceManager { friend class OModuleClient; - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static ResMgr* m_pImpl; + static ::osl::Mutex s_aMutex; /// access safety + static sal_Int32 s_nClients; /// number of registered clients + static ResMgr* m_pImpl; private: // no instantiation allowed @@ -63,9 +63,9 @@ namespace dbaccess protected: static void ensureImplExists(); /// register a client for the module - static void registerClient(); + static void registerClient(); /// revoke a client for the module - static void revokeClient(); + static void revokeClient(); public: /** loads the string with the specified resource id @@ -117,8 +117,8 @@ namespace dbaccess class OModuleClient { public: - OModuleClient() { ResourceManager::registerClient(); } - ~OModuleClient() { ResourceManager::revokeClient(); } + OModuleClient() { ResourceManager::registerClient(); } + ~OModuleClient() { ResourceManager::revokeClient(); } }; } diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index cd2b4e715702..ed28b409a0a5 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -41,25 +41,25 @@ namespace dbaccess //========================================================================== //= ODataSettings_Base - a base class which implements the property member -//= for an object implementing the sdb::DataSettings -//= service -//= the properties have to to be registered when used +//= for an object implementing the sdb::DataSettings +//= service +//= the properties have to to be registered when used //========================================================================== class ODataSettings_Base { public: // <properties> - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sHavingClause; - ::rtl::OUString m_sGroupBy; - ::rtl::OUString m_sOrder; - sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member ! - ::com::sun::star::awt::FontDescriptor m_aFont; - ::com::sun::star::uno::Any m_aRowHeight; - ::com::sun::star::uno::Any m_aTextColor; - ::com::sun::star::uno::Any m_aTextLineColor; - sal_Int16 m_nFontEmphasis; - sal_Int16 m_nFontRelief; + ::rtl::OUString m_sFilter; + ::rtl::OUString m_sHavingClause; + ::rtl::OUString m_sGroupBy; + ::rtl::OUString m_sOrder; + sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member ! + ::com::sun::star::awt::FontDescriptor m_aFont; + ::com::sun::star::uno::Any m_aRowHeight; + ::com::sun::star::uno::Any m_aTextColor; + ::com::sun::star::uno::Any m_aTextLineColor; + sal_Int16 m_nFontEmphasis; + sal_Int16 m_nFontRelief; // </properties> protected: @@ -69,8 +69,8 @@ protected: }; //========================================================================== //= ODataSettings - a base class which implements the property handling -//= for an object implementing the sdb::DataSettings -//= service +//= for an object implementing the sdb::DataSettings +//= service //========================================================================== class ODataSettings : public ::comphelper::OPropertyStateContainer @@ -82,13 +82,13 @@ protected: virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const; /** register the properties from the param given. The parameter instance must be alive as long as tis object live. - @param _pItem + @param _pItem The database settings, can be <br>this</br> */ void registerPropertiesFor(ODataSettings_Base* _pItem); }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_DATASETTINGS_HXX_ diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc index a383ed4189d2..dbb4713c075a 100644 --- a/dbaccess/source/core/inc/dbamiscres.hrc +++ b/dbaccess/source/core/inc/dbamiscres.hrc @@ -30,32 +30,32 @@ //======================================================================== // string ids (relative to other resources, that's why not unique) -#define STR_MYSQL_ODBC 1 -#define STR_MYSQL_JDBC 2 -#define STR_ADABAS 3 -#define STR_ORACLE_JDBC 4 -#define STR_JDBC 5 -#define STR_ODBC 6 -#define STR_DBASE 7 -#define STR_MSACCESS 8 +#define STR_MYSQL_ODBC 1 +#define STR_MYSQL_JDBC 2 +#define STR_ADABAS 3 +#define STR_ORACLE_JDBC 4 +#define STR_JDBC 5 +#define STR_ODBC 6 +#define STR_DBASE 7 +#define STR_MSACCESS 8 #define STR_MSACCESS2007 9 -#define STR_ADO 10 -#define STR_FLAT 11 -#define STR_CALC 12 -#define STR_MOZILLA 13 -#define STR_LDAP 14 -#define STR_OUTLOOK 15 -#define STR_OUTLOOKEXP 16 -#define STR_EVOLUTION 17 -#define STR_EVOLUTION_GROUPWISE 18 -#define STR_EVOLUTION_LDAP 19 -#define STR_KAB 20 -#define STR_MACAB 21 +#define STR_ADO 10 +#define STR_FLAT 11 +#define STR_CALC 12 +#define STR_MOZILLA 13 +#define STR_LDAP 14 +#define STR_OUTLOOK 15 +#define STR_OUTLOOKEXP 16 +#define STR_EVOLUTION 17 +#define STR_EVOLUTION_GROUPWISE 18 +#define STR_EVOLUTION_LDAP 19 +#define STR_KAB 20 +#define STR_MACAB 21 #define STR_EMBEDDED_HSQLDB 22 -#define STR_THUNDERBIRD 23 -#define STR_MYSQL_NATIVE 24 +#define STR_THUNDERBIRD 23 +#define STR_MYSQL_NATIVE 24 -#define STR_END STR_MYSQL_NATIVE + 1 +#define STR_END STR_MYSQL_NATIVE + 1 #endif // _DBA_MISCRES_HRC_ diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index f98c633a5396..5ad7d716f311 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -49,7 +49,7 @@ namespace dbaccess //= OTableColumnDescriptor // ========================================================================= /** - * provides the properties for description. A descriptor could be used to create a new table column. + * provides the properties for description. A descriptor could be used to create a new table column. */ class OTableColumnDescriptor : public OColumn ,public OColumnSettings @@ -60,19 +60,19 @@ namespace dbaccess const bool m_bActAsDescriptor; protected: - // <properties> - rtl::OUString m_aTypeName; - rtl::OUString m_aDescription; - rtl::OUString m_aDefaultValue; - rtl::OUString m_aAutoIncrementValue; - sal_Int32 m_nType; - sal_Int32 m_nPrecision; - sal_Int32 m_nScale; - sal_Int32 m_nIsNullable; - sal_Bool m_bAutoIncrement; - sal_Bool m_bRowVersion; - sal_Bool m_bCurrency; - // </properties> + // <properties> + rtl::OUString m_aTypeName; + rtl::OUString m_aDescription; + rtl::OUString m_aDefaultValue; + rtl::OUString m_aAutoIncrementValue; + sal_Int32 m_nType; + sal_Int32 m_nPrecision; + sal_Int32 m_nScale; + sal_Int32 m_nIsNullable; + sal_Bool m_bAutoIncrement; + sal_Bool m_bRowVersion; + sal_Bool m_bCurrency; + // </properties> public: OTableColumnDescriptor( const bool _bActAsDescriptor ) @@ -194,8 +194,8 @@ namespace dbaccess // = OColumnWrapper // ========================================================================= /** - * describes all properties for a columns of a table. Only the view parts are provided - * directly, all the other parts are derived from a driver implementation + * describes all properties for a columns of a table. Only the view parts are provided + * directly, all the other parts are derived from a driver implementation */ class OColumnWrapper :public OColumn { @@ -204,7 +204,7 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAggregate; - sal_Int32 m_nColTypeID; + sal_Int32 m_nColTypeID; protected: OColumnWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rCol, const bool _bNameIsReadOnly ); @@ -240,7 +240,7 @@ namespace dbaccess // = OTableColumnDescriptorWrapper // ========================================================================= /** - * provides the properties for description. A descriptor could be used to create a new table column. + * provides the properties for description. A descriptor could be used to create a new table column. */ class OTableColumnDescriptorWrapper :public OColumnWrapper ,public OColumnSettings @@ -289,8 +289,8 @@ namespace dbaccess // = OTableColumnWrapper // ========================================================================= /** - * describes all properties for a columns of a table. Only the view parts are provided - * directly, all the other parts are derived from a driver implementation + * describes all properties for a columns of a table. Only the view parts are provided + * directly, all the other parts are derived from a driver implementation */ class OTableColumnWrapper :public OTableColumnDescriptorWrapper ,public ::comphelper::OIdPropertyArrayUsageHelper < OTableColumnWrapper > diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 72a5a9fbbfd7..478d2eefbc3c 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -85,8 +85,8 @@ private: }; //========================================================================== -//= ODefinitionContainer - base class of collections of database definition -//= documents +//= ODefinitionContainer - base class of collections of database definition +//= documents //========================================================================== typedef ::cppu::ImplHelper7 < ::com::sun::star::container::XIndexAccess , ::com::sun::star::container::XNameContainer @@ -124,15 +124,15 @@ private: protected: // we can't just hold a vector of XContentRefs, as after initialization they're all empty // cause we load them only on access - DocumentsIndexAccess m_aDocuments; // for a efficient index access - Documents m_aDocumentMap; // for a efficient name access + DocumentsIndexAccess m_aDocuments; // for a efficient index access + Documents m_aDocumentMap; // for a efficient name access ::cppu::OInterfaceContainerHelper m_aApproveListeners; ::cppu::OInterfaceContainerHelper m_aContainerListeners; - sal_Bool m_bInPropertyChange; + sal_Bool m_bInPropertyChange; bool m_bCheckSlash; protected: @@ -163,7 +163,7 @@ public: */ ODefinitionContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer , const TContentPtr& _pImpl , bool _bCheckSlash = true ); @@ -221,42 +221,42 @@ protected: virtual void SAL_CALL disposing(); /** create a object from it's persistent data within the configuration. To be overwritten by derived classes. - @param _rName the name the object has within the container - @return the newly created object or an empty reference if somthing went wrong + @param _rName the name the object has within the container + @return the newly created object or an empty reference if somthing went wrong */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName) = 0; /** get the object specified by the given name. If desired, the object will be read if not already done so.<BR> - @param _rName the object name - @param _bReadIfNeccessary if sal_True, the object will be created if necessary - @return the property set interface of the object. Usually the return value is not NULL, but + @param _rName the object name + @param _bReadIfNeccessary if sal_True, the object will be created if necessary + @return the property set interface of the object. Usually the return value is not NULL, but if so, then the object could not be read from the configuration - @throws NoSuchElementException if there is no object with the given name. - @see createObject + @throws NoSuchElementException if there is no object with the given name. + @see createObject */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implGetByName(const ::rtl::OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); /** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e. if there is such an object which is not already loaded, it won't be loaded now. - @param _rName the object name to check - @return sal_True if there already exists such an object + @param _rName the object name to check + @return sal_True if there already exists such an object */ - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); /** append a new object to the container. No plausibility checks are done, e.g. if the object is non-NULL or if the name is already used by another object or anything like this. This method is for derived classes which may support different methods to create and/or append objects, and don't want to deal with the internal structures of this class.<BR> The old component will not be disposed, this is the callers responsibility, too. - @param _rName the name of the new object - @param _rxNewObject the new object (not surprising, is it ?) - @see createConfigKey - @see implReplace - @see implRemove + @param _rName the name of the new object + @param _rxNewObject the new object (not surprising, is it ?) + @see createConfigKey + @see implReplace + @see implRemove */ - void implAppend( + void implAppend( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject ); @@ -265,9 +265,9 @@ protected: or not there exists an object with the given name. This is the responsibility of the caller.<BR> Additionally the node for the given object will be removed from the registry (including all sub nodes).<BR> The old component will not be disposed, this is the callers responsibility, too. - @param _rName the objects name - @see implReplace - @see implAppend + @param _rName the objects name + @see implReplace + @see implAppend */ void implRemove(const ::rtl::OUString& _rName); @@ -276,11 +276,11 @@ protected: Additionally all object-related informations within the registry will be deleted. The new object config node, where the caller may want to store the new objects information, is returned.<BR> The old component will not be disposed, this is the callers responsibility, too. - @param _rName the objects name - @param _rxNewObject the new object - @param _rNewObjectNode the configuration node where the new object may be stored - @see implAppend - @see implRemove + @param _rName the objects name + @param _rxNewObject the new object + @param _rNewObjectNode the configuration node where the new object may be stored + @see implAppend + @see implRemove */ void implReplace( const ::rtl::OUString& _rName, @@ -304,8 +304,8 @@ protected: } private: - void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); - void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); + void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); + void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); /** approve that the object given may be inserted into the container. Should be overloaded by derived classes, the default implementation just checks the object to be non-void. @@ -329,7 +329,7 @@ private: } }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_DEFINITIONCONTAINER_HXX_ diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index ff2337944a69..bdeb3391b48c 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -50,7 +50,7 @@ namespace dbaccess public ::com::sun::star::lang::XServiceInfo { protected: - OColumns* m_pColumns; + OColumns* m_pColumns; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > m_xAggregateAsParameters; public: diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index e98ec650b632..02b574f7b942 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -51,21 +51,21 @@ namespace com { namespace sun { namespace star { namespace util { namespace dbaccess { - typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSQLQueryComposer, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSQLQueryComposer, ::com::sun::star::sdb::XParametersSupplier, ::com::sun::star::sdbcx::XTablesSupplier, ::com::sun::star::sdbcx::XColumnsSupplier, - ::com::sun::star::lang::XServiceInfo > OQueryComposer_BASE; + ::com::sun::star::lang::XServiceInfo > OQueryComposer_BASE; class OPrivateColumns; class OPrivateTables; - class OQueryComposer : public ::comphelper::OBaseMutex, + class OQueryComposer : public ::comphelper::OBaseMutex, public OSubComponent, public OQueryComposer_BASE { - ::std::vector< ::rtl::OUString> m_aFilters; - ::std::vector< ::rtl::OUString> m_aOrders; + ::std::vector< ::rtl::OUString> m_aFilters; + ::std::vector< ::rtl::OUString> m_aOrders; ::rtl::OUString m_sOrgFilter; ::rtl::OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposer; @@ -76,7 +76,7 @@ namespace dbaccess virtual ~OQueryComposer(); public: - OQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ); + OQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ); // ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index 46fea061727f..fce10a545d90 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -77,7 +77,7 @@ namespace dbaccess class OQueryContainer; class OContainerListener; class OQuery; - class OQueryContainer : public ODefinitionContainer + class OQueryContainer : public ODefinitionContainer , public OQueryContainer_Base { protected: @@ -88,17 +88,17 @@ namespace dbaccess m_xConnection; // possible actions on our "aggregate" enum AGGREGATE_ACTION { NONE, INSERTING, FLUSHING }; - AGGREGATE_ACTION m_eDoingCurrently; + AGGREGATE_ACTION m_eDoingCurrently; OContainerListener* m_pCommandsListener; /** a class which automatically resets m_eDoingCurrently in it's destructor */ - class OAutoActionReset; // just for the following friend declaration + class OAutoActionReset; // just for the following friend declaration friend class OAutoActionReset; class OAutoActionReset { - OQueryContainer* m_pActor; + OQueryContainer* m_pActor; public: OAutoActionReset(OQueryContainer* _pActor) : m_pActor(_pActor) { } ~OAutoActionReset() { m_pActor->m_eDoingCurrently = NONE; } @@ -106,7 +106,7 @@ namespace dbaccess // ODefinitionContainer virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName); - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); // helper virtual void SAL_CALL disposing(); @@ -179,7 +179,7 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxCommandDesc); }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_QUERYCONTAINER_HXX_ diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx index 6c057018e325..ad484201b646 100644 --- a/dbaccess/source/core/inc/sdbcoretools.hxx +++ b/dbaccess/source/core/inc/sdbcoretools.hxx @@ -75,7 +75,7 @@ namespace dbaccess } -} // namespace dbaccess +} // namespace dbaccess #endif // DBACORE_SDBCORETOOLS_HXX diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index b609aaf71213..b0a0f458334c 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -49,7 +49,7 @@ //************************************************************ // OStatementBase //************************************************************ -class OStatementBase : public comphelper::OBaseMutex, +class OStatementBase : public comphelper::OBaseMutex, public OSubComponent, public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper < OStatementBase >, @@ -61,12 +61,12 @@ class OStatementBase : public comphelper::OBaseMutex, public ::com::sun::star::sdbc::XGeneratedResultSet { protected: - ::osl::Mutex m_aCancelMutex; + ::osl::Mutex m_aCancelMutex; - ::com::sun::star::uno::WeakReferenceHelper m_aResultSet; + ::com::sun::star::uno::WeakReferenceHelper m_aResultSet; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAggregateAsSet; ::com::sun::star::uno::Reference< ::com::sun::star::util::XCancellable > m_xAggregateAsCancellable; - sal_Bool m_bUseBookmarks; + sal_Bool m_bUseBookmarks; sal_Bool m_bEscapeProcessing; virtual ~OStatementBase(); diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 8c2d1eda7c14..c5262327dfb4 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -56,10 +56,10 @@ namespace dbaccess //========================================================================== class ODBTable; class OContainerMediator; - typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable > ODBTable_PROP; - typedef ::connectivity::OTableHelper OTable_Base; + typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable > ODBTable_PROP; + typedef ::connectivity::OTableHelper OTable_Base; - class ODBTable :public ODataSettings_Base + class ODBTable :public ODataSettings_Base ,public ODBTable_PROP ,public OTable_Base ,public IColumnFactory @@ -68,36 +68,36 @@ namespace dbaccess ::rtl::Reference< OContainerMediator > m_pColumnMediator; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDriverColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDriverColumns; // <properties> - sal_Int32 m_nPrivileges; + sal_Int32 m_nPrivileges; // </properties> virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual ::connectivity::sdbcx::OCollection* createColumns(const ::connectivity::TStringVector& _rNames); /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual ::connectivity::sdbcx::OCollection* createKeys(const ::connectivity::TStringVector& _rNames); /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual ::connectivity::sdbcx::OCollection* createIndexes(const ::connectivity::TStringVector& _rNames); @@ -106,13 +106,13 @@ namespace dbaccess virtual void SAL_CALL disposing(void); public: /** constructs a wrapper supporting the com.sun.star.sdb.Table service.<BR> - @param _rxConn the connection the table belongs to - @param _rxTable the table from the driver can be null - @param _rCatalog the name of the catalog the table belongs to. May be empty. - @param _rSchema the name of the schema the table belongs to. May be empty. - @param _rName the name of the table - @param _rType the type of the table, as supplied by the driver - @param _rDesc the description of the table, as supplied by the driver + @param _rxConn the connection the table belongs to + @param _rxTable the table from the driver can be null + @param _rCatalog the name of the catalog the table belongs to. May be empty. + @param _rSchema the name of the schema the table belongs to. May be empty. + @param _rName the name of the table + @param _rType the type of the table, as supplied by the driver + @param _rDesc the description of the table, as supplied by the driver */ ODBTable(connectivity::sdbcx::OCollection* _pTables ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn @@ -143,7 +143,7 @@ namespace dbaccess DECLARE_SERVICE_INFO(); // com::sun::star::beans::XPropertySet - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; // ::com::sun::star::sdbcx::XRename, diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index ab2eb7bfe293..577ab1bb8ab0 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -60,9 +60,9 @@ namespace dbaccess class OTableContainer : public OFilteredContainer, public OTableContainer_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xTableDefinitions; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xTableDefinitions; ::rtl::Reference< OContainerMediator > m_pTableMediator; - sal_Bool m_bInDrop; // set when we are in the drop method + sal_Bool m_bInDrop; // set when we are in the drop method // OFilteredContainer @@ -71,8 +71,8 @@ namespace dbaccess virtual ::rtl::OUString getTableTypeRestriction() const; // ::connectivity::sdbcx::OCollection - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); @@ -93,19 +93,19 @@ namespace dbaccess public: /** ctor of the container. The parent has to support the <type scope="com::sun::star::sdbc">XConnection</type> interface.<BR> - @param _rParent the object which acts as parent for the container. + @param _rParent the object which acts as parent for the container. all refcounting is rerouted to this object - @param _rMutex the access safety object of the parent - @param _rTableFilter restricts the visible tables by name - @param _rTableTypeFilter restricts the visible tables by type - @see construct + @param _rMutex the access safety object of the parent + @param _rTableFilter restricts the visible tables by name + @param _rTableTypeFilter restricts the visible tables by type + @see construct */ OTableContainer( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon, sal_Bool _bCase, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xTableDefinitions, - IRefreshListener* _pRefreshListener, + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xTableDefinitions, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer, oslInterlockedCount& _nInAppend ); diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx index f3cbcc4fd643..7efbf6586a57 100644 --- a/dbaccess/source/core/inc/userinformation.hxx +++ b/dbaccess/source/core/inc/userinformation.hxx @@ -35,12 +35,12 @@ class UserInformation { - ::com::sun::star::lang::Locale m_aUserLocale; + ::com::sun::star::lang::Locale m_aUserLocale; public: UserInformation(); - ::com::sun::star::lang::Locale getUserLanguage() const { return m_aUserLocale; } + ::com::sun::star::lang::Locale getUserLanguage() const { return m_aUserLocale; } }; #endif // _DBA_CORE_USERINFORMATION_HXX_ diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index 97e4f1393ca3..95836f7ab07f 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -63,18 +63,18 @@ namespace dbaccess public: /** ctor of the container. The parent has to support the <type scope="com::sun::star::sdbc">XConnection</type> interface.<BR> - @param _rParent the object which acts as parent for the container. + @param _rParent the object which acts as parent for the container. all refcounting is rerouted to this object - @param _rMutex the access safety object of the parent - @param _rTableFilter restricts the visible tables by name - @param _rTableTypeFilter restricts the visible tables by type - @see construct + @param _rMutex the access safety object of the parent + @param _rTableFilter restricts the visible tables by name + @param _rTableTypeFilter restricts the visible tables by type + @see construct */ OViewContainer( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon, sal_Bool _bCase, - IRefreshListener* _pRefreshListener, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer, oslInterlockedCount& _nInAppend ); @@ -99,8 +99,8 @@ namespace dbaccess virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // ::connectivity::sdbcx::OCollection - virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); + virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); diff --git a/dbaccess/source/core/misc/ContainerListener.cxx b/dbaccess/source/core/misc/ContainerListener.cxx index 79772386d185..83f7f2507ad8 100644 --- a/dbaccess/source/core/misc/ContainerListener.cxx +++ b/dbaccess/source/core/misc/ContainerListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ namespace dbaccess return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveInsertElement( _Event ); } - + //-------------------------------------------------------------------- Reference< XVeto > SAL_CALL OContainerListener::approveReplaceElement( const ContainerEvent& _Event ) throw (WrappedTargetException, RuntimeException) { @@ -74,7 +74,7 @@ namespace dbaccess return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveReplaceElement( _Event ); } - + //-------------------------------------------------------------------- Reference< XVeto > SAL_CALL OContainerListener::approveRemoveElement( const ContainerEvent& _Event ) throw (WrappedTargetException, RuntimeException) { @@ -84,7 +84,7 @@ namespace dbaccess return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveRemoveElement( _Event ); } - + //-------------------------------------------------------------------- void SAL_CALL OContainerListener::elementInserted( const ContainerEvent& _Event ) throw(RuntimeException) { @@ -94,7 +94,7 @@ namespace dbaccess dynamic_cast< XContainerListener& >( m_rDestination ).elementInserted( _Event ); } - + //-------------------------------------------------------------------- void SAL_CALL OContainerListener::elementRemoved( const ContainerEvent& _Event ) throw(RuntimeException) { @@ -104,7 +104,7 @@ namespace dbaccess dynamic_cast< XContainerListener& >( m_rDestination ).elementRemoved( _Event ); } - + //-------------------------------------------------------------------- void SAL_CALL OContainerListener::elementReplaced( const ContainerEvent& _Event ) throw(RuntimeException) { @@ -114,7 +114,7 @@ namespace dbaccess dynamic_cast< XContainerListener& >( m_rDestination ).elementReplaced( _Event ); } - + //-------------------------------------------------------------------- void SAL_CALL OContainerListener::disposing( const EventObject& _Source ) throw(RuntimeException) { diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index cd1dd3c2907c..82b5f8523ee0 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,15 +61,15 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain , m_aConnection( _rxConnection ) , m_eType( _eType ) { - DBG_CTOR(OContainerMediator,NULL); - + DBG_CTOR(OContainerMediator,NULL); + if ( _xSettings.is() && _xContainer.is() ) { osl_incrementInterlockedCount(&m_refCount); try { m_xContainer->addContainerListener(this); - Reference< XContainer > xContainer(_xSettings, UNO_QUERY); + Reference< XContainer > xContainer(_xSettings, UNO_QUERY); if ( xContainer.is() ) xContainer->addContainerListener(this); } @@ -88,7 +88,7 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain // ----------------------------------------------------------------------------- OContainerMediator::~OContainerMediator() { - DBG_DTOR(OContainerMediator,NULL); + DBG_DTOR(OContainerMediator,NULL); acquire(); impl_cleanup_nothrow(); } @@ -98,7 +98,7 @@ void OContainerMediator::impl_cleanup_nothrow() { try { - Reference< XContainer > xContainer( m_xSettings, UNO_QUERY ); + Reference< XContainer > xContainer( m_xSettings, UNO_QUERY ); if ( xContainer.is() ) xContainer->removeContainerListener( this ); m_xSettings.clear(); @@ -118,7 +118,7 @@ void OContainerMediator::impl_cleanup_nothrow() // ----------------------------------------------------------------------------- void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException) -{ +{ ::osl::MutexGuard aGuard(m_aMutex); if ( _rEvent.Source == m_xSettings && m_xSettings.is() ) { @@ -162,7 +162,7 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent { ::rtl::OUString sElementName; _rEvent.ReplacedElement >>= sElementName; - + PropertyForwardList::iterator aFind = m_aForwardList.find(sElementName); if ( aFind != m_aForwardList.end() ) { @@ -191,7 +191,7 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - + impl_cleanup_nothrow(); } @@ -258,7 +258,7 @@ void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, co } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index bb1fc1cf59b2..c9fac4862bb0 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -357,12 +357,12 @@ void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< } uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException) -{ +{ return m_xComplexDescriptionAccess->getRowDescriptions(); } uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException) -{ +{ return m_xComplexDescriptionAccess->getColumnDescriptions(); } @@ -789,7 +789,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat while( xRes->next() && (!m_RowLimit || nRowCount < m_RowLimit) ) { ++nRowCount; - + aValue.fill( aColumns[0].nResultSetPosition, aColumns[0].nDataType, xRow ); aRowLabels.push_back( aValue.getString() ); @@ -831,7 +831,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat ::std::vector< double > aRow; const sal_Int32 nSize = SAL_N_ELEMENTS(fDefaultData); for (size_t j = 0; j < (aColumns.size()-1); ++j,++k) - { + { if ( k >= nSize ) k = 0; aRow.push_back(fDefaultData[k]); @@ -839,7 +839,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat aDataValues.push_back(aRow); } } - + uno::Reference< chart::XChartDataArray> xData(m_xInternal,uno::UNO_QUERY); xData->setRowDescriptions(uno::Sequence< ::rtl::OUString >(&(*aRowLabels.begin()),aRowLabels.size())); diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 9940b3990562..3c5557b47401 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ namespace dbaccess using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::lang; - DBG_NAME(OPropertyForward) + DBG_NAME(OPropertyForward) //------------------------------------------------------------------------ OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer, @@ -62,7 +62,7 @@ namespace dbaccess ,m_sName( _sName ) ,m_bInInsert( sal_False ) { - DBG_CTOR(OPropertyForward,NULL); + DBG_CTOR(OPropertyForward,NULL); osl_incrementInterlockedCount(&m_refCount); try @@ -87,7 +87,7 @@ namespace dbaccess // ----------------------------------------------------------------------------- OPropertyForward::~OPropertyForward() { - DBG_DTOR(OPropertyForward,NULL); + DBG_DTOR(OPropertyForward,NULL); } // ----------------------------------------------------------------------------- @@ -169,7 +169,7 @@ namespace dbaccess } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index 281fb4902a6b..db763f853dd2 100644 --- a/dbaccess/source/core/misc/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ void OSubComponent::release() throw ( ) } OSL_ENSURE( m_refCount == 1, "OSubComponent::release: invalid ref count (before dispose)!" ); - + // First dispose dispose(); diff --git a/dbaccess/source/core/misc/dbastrings.cxx b/dbaccess/source/core/misc/dbastrings.cxx index f8f53df0e866..479baa1df3ff 100644 --- a/dbaccess/source/core/misc/dbastrings.cxx +++ b/dbaccess/source/core/misc/dbastrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 39c29c4f4925..4ba3437ca095 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,8 +59,8 @@ namespace dbaccess { if ( _sUrl.GetTokenCount(':') >= 2 ) { - _sHostname = _sUrl.GetToken(0,':'); - _nPortNumber = _sUrl.GetToken(1,':').ToInt32(); + _sHostname = _sUrl.GetToken(0,':'); + _nPortNumber = _sUrl.GetToken(1,':').ToInt32(); } } } @@ -121,7 +121,7 @@ String ODsnTypeCollection::cutPrefix(const ::rtl::OUString& _sURL) const sOldPattern = *aIter; } } - + return sRet; } @@ -146,7 +146,7 @@ String ODsnTypeCollection::getPrefix(const ::rtl::OUString& _sURL) const sOldPattern = *aIter; } } - + return sRet; } @@ -214,14 +214,14 @@ String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUStrin // ----------------------------------------------------------------------------- bool ODsnTypeCollection::isShowPropertiesEnabled( const ::rtl::OUString& _sURL ) const { - return !( _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlook",sizeof("sdbc:address:outlook")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlookexp",sizeof("sdbc:address:outlookexp")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:mozilla:",sizeof("sdbc:address:mozilla:")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:kab",sizeof("sdbc:address:kab")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:local",sizeof("sdbc:address:evolution:local")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:groupwise",sizeof("sdbc:address:evolution:groupwise")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:ldap",sizeof("sdbc:address:evolution:ldap")-1) + return !( _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlook",sizeof("sdbc:address:outlook")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlookexp",sizeof("sdbc:address:outlookexp")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:mozilla:",sizeof("sdbc:address:mozilla:")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:kab",sizeof("sdbc:address:kab")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:local",sizeof("sdbc:address:evolution:local")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:groupwise",sizeof("sdbc:address:evolution:groupwise")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:ldap",sizeof("sdbc:address:evolution:ldap")-1) || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:macab",sizeof("sdbc:address:macab")-1) ); } // ----------------------------------------------------------------------------- @@ -329,7 +329,7 @@ bool ODsnTypeCollection::isEmbeddedDatabase( const ::rtl::OUString& _sURL ) cons if ( aInstalled.hasByName("EmbeddedDatabases/DefaultEmbeddedDatabase/Value") ) { static const ::rtl::OUString s_sValue(RTL_CONSTASCII_USTRINGPARAM("EmbeddedDatabases/DefaultEmbeddedDatabase/Value")); - + aInstalled.getNodeValue(s_sValue) >>= sEmbeddedDatabaseURL; if ( sEmbeddedDatabaseURL.getLength() ) aInstalled.getNodeValue(s_sValue + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEmbeddedDatabaseURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/URL"))) >>= sEmbeddedDatabaseURL; @@ -550,7 +550,7 @@ sal_Int32 ODsnTypeCollection::getIndexOf(const ::rtl::OUString& _sURL) const sOldPattern = *aIter; } } - + return nRet; } // ----------------------------------------------------------------------------- @@ -603,7 +603,7 @@ String ODsnTypeCollection::TypeIterator::getDisplayName() const return m_pContainer->m_aDsnPrefixes[m_nPosition]; } //------------------------------------------------------------------------- -const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator++() +const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator++() { DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size(), "ODsnTypeCollection::TypeIterator::operator++ : invalid position!"); if (m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size()) @@ -612,7 +612,7 @@ const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operat } //------------------------------------------------------------------------- -const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator--() +const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator--() { DBG_ASSERT(m_nPosition >= 0, "ODsnTypeCollection::TypeIterator::operator-- : invalid position!"); if (m_nPosition >= 0) @@ -627,7 +627,7 @@ bool operator==(const ODsnTypeCollection::TypeIterator& lhs, const ODsnTypeColle } //......................................................................... -} // namespace dbaccess +} // namespace dbaccess //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/module_dba.cxx b/dbaccess/source/core/misc/module_dba.cxx index c5653e6c02b0..1c4472f129ab 100644 --- a/dbaccess/source/core/misc/module_dba.cxx +++ b/dbaccess/source/core/misc/module_dba.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx index 3773680fe891..06ba682469b5 100644 --- a/dbaccess/source/core/misc/objectnameapproval.cxx +++ b/dbaccess/source/core/misc/objectnameapproval.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index a7f21ee4a3cf..01cdab86f7db 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -171,7 +171,7 @@ namespace dbaccess } } // tools::stor //......................................................................... -} // namespace dbaccess +} // namespace dbaccess //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 189e4f1e36e4..2b6255e13cbf 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace dba{ ::cppu::ImplementationEntry entries[] = { { &::dbaccess::DatabaseDataProvider::Create, &::dbaccess::DatabaseDataProvider::getImplementationName_Static, &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } @@ -86,8 +86,8 @@ extern "C" void SAL_CALL createRegistryInfo_DBA() //--------------------------------------------------------------------------------------- extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_DBA(); diff --git a/dbaccess/source/core/misc/userinformation.cxx b/dbaccess/source/core/misc/userinformation.cxx index 27ea6bb51f8b..679236c69d66 100644 --- a/dbaccess/source/core/misc/userinformation.cxx +++ b/dbaccess/source/core/misc/userinformation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx index ead0b705b3d6..80ec1e3fa2b3 100644 --- a/dbaccess/source/core/misc/veto.cxx +++ b/dbaccess/source/core/misc/veto.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ namespace dbaccess { return m_sReason; } - + //-------------------------------------------------------------------- Any SAL_CALL Veto::getDetails() throw (RuntimeException) { diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index f1e897764457..231f77f0e8cc 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 8ef984f585ee..37abcf3fb444 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx index 1101ce0cd0cc..ad241cacff64 100644 --- a/dbaccess/source/core/recovery/settingsimport.hxx +++ b/dbaccess/source/core/recovery/settingsimport.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx index 7c5589f864f6..4a7f9e603d45 100644 --- a/dbaccess/source/core/recovery/storagestream.cxx +++ b/dbaccess/source/core/recovery/storagestream.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index 4f724a93e906..efe9846f4aac 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx index b034b95b60a3..77b6d53dd005 100644 --- a/dbaccess/source/core/recovery/storagetextstream.cxx +++ b/dbaccess/source/core/recovery/storagetextstream.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index 5283687ce163..91d7592f4c90 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index 3e65d79387e7..860f7729879e 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index d14d9b62bc12..92be6dad3d68 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx index 48debe206c73..6c169c7ce113 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.cxx +++ b/dbaccess/source/core/recovery/subcomponentloader.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -165,14 +165,14 @@ namespace dbaccess // not interested in (void)i_rEvent; } - + //-------------------------------------------------------------------- void SAL_CALL SubComponentLoader::windowMoved( const WindowEvent& i_rEvent ) throw (RuntimeException) { // not interested in (void)i_rEvent; } - + //-------------------------------------------------------------------- void SAL_CALL SubComponentLoader::windowShown( const EventObject& i_rEvent ) throw (RuntimeException) { @@ -181,7 +181,7 @@ namespace dbaccess lcl_onWindowShown_nothrow( *m_pData ); m_pData->xAppComponentWindow->removeWindowListener( this ); } - + //-------------------------------------------------------------------- void SAL_CALL SubComponentLoader::windowHidden( const EventObject& i_rEvent ) throw (RuntimeException) { diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx index 30922c9d71d9..190ad0b4aea3 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.hxx +++ b/dbaccess/source/core/recovery/subcomponentloader.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index c579e014e657..32d213dbc151 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -322,12 +322,12 @@ namespace dbaccess void SAL_CALL SettingsDocumentHandler::startDocument( ) throw (SAXException, RuntimeException) { } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::endDocument( ) throw (SAXException, RuntimeException) { } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::startElement( const ::rtl::OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException) { @@ -359,7 +359,7 @@ namespace dbaccess m_aStates.push( pNewState ); } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::endElement( const ::rtl::OUString& i_Name ) throw (SAXException, RuntimeException) { @@ -370,7 +370,7 @@ namespace dbaccess pCurrentState->endElement(); m_aStates.pop(); } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::characters( const ::rtl::OUString& i_Chars ) throw (SAXException, RuntimeException) { @@ -379,14 +379,14 @@ namespace dbaccess ::rtl::Reference< SettingsImport > pCurrentState( m_aStates.top() ); pCurrentState->characters( i_Chars ); } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException) { // ignore them - that's why they're called "ignorable" (void)aWhitespaces; } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::processingInstruction( const ::rtl::OUString& i_Target, const ::rtl::OUString& i_Data ) throw (SAXException, RuntimeException) { @@ -394,7 +394,7 @@ namespace dbaccess (void)i_Target; (void)i_Data; } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) throw (SAXException, RuntimeException) { diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx index cb5519cf5c77..6ddd121c3a82 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index 75dd161c09a9..77446b78ab76 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index d197fe66eb20..123aeb11873a 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ namespace dbaccess //================================================================== //= ResourceManager //================================================================== - ::osl::Mutex ResourceManager::s_aMutex; - sal_Int32 ResourceManager::s_nClients = 0; + ::osl::Mutex ResourceManager::s_aMutex; + sal_Int32 ResourceManager::s_nClients = 0; ResMgr* ResourceManager::m_pImpl = NULL; //------------------------------------------------------------------ diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src index dc7023ca6fba..bd20da391edd 100644 --- a/dbaccess/source/core/resource/strings.src +++ b/dbaccess/source/core/resource/strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ String RID_STR_DATASOURCE_NOT_STORED }; String RID_STR_ONLY_QUERY { - Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed."; + Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed."; }; String RID_STR_NO_VALUE_CHANGED { diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx index 3fc0d952cf40..7db2de70aeb9 100644 --- a/dbaccess/source/ext/adabas/ANewDb.cxx +++ b/dbaccess/source/ext/adabas/ANewDb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,13 +56,13 @@ OAdabasCreateDialog::OAdabasCreateDialog(const Reference< XMultiServiceFactory > :OAdabasCreateDialogBase(_rxORB) ,m_pDialog(NULL) { - registerProperty(PROPERTY_CREATECATALOG, PROPERTY_ID_CREATECATALOG, PropertyAttribute::TRANSIENT,&m_xCreateCatalog, ::getCppuType(&m_xCreateCatalog)); - registerProperty(PROPERTY_DATABASENAME, PROPERTY_ID_DATABASENAME, PropertyAttribute::TRANSIENT,&m_sDatabaseName, ::getCppuType(&m_sDatabaseName)); - registerProperty(PROPERTY_CONTROL_USER, PROPERTY_ID_CONTROL_USER, PropertyAttribute::TRANSIENT,&m_sControlUser, ::getCppuType(&m_sControlUser)); - registerProperty(PROPERTY_CONTROL_PASSWORD, PROPERTY_ID_CONTROL_PASSWORD, PropertyAttribute::TRANSIENT,&m_sControlPassword, ::getCppuType(&m_sControlPassword)); - registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT,&m_sUser, ::getCppuType(&m_sUser)); - registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT,&m_sUserPassword, ::getCppuType(&m_sUserPassword)); - registerProperty(PROPERTY_CACHESIZE, PROPERTY_ID_CACHESIZE, PropertyAttribute::TRANSIENT,&m_nCacheSize, ::getCppuType(&m_nCacheSize)); + registerProperty(PROPERTY_CREATECATALOG, PROPERTY_ID_CREATECATALOG, PropertyAttribute::TRANSIENT,&m_xCreateCatalog, ::getCppuType(&m_xCreateCatalog)); + registerProperty(PROPERTY_DATABASENAME, PROPERTY_ID_DATABASENAME, PropertyAttribute::TRANSIENT,&m_sDatabaseName, ::getCppuType(&m_sDatabaseName)); + registerProperty(PROPERTY_CONTROL_USER, PROPERTY_ID_CONTROL_USER, PropertyAttribute::TRANSIENT,&m_sControlUser, ::getCppuType(&m_sControlUser)); + registerProperty(PROPERTY_CONTROL_PASSWORD, PROPERTY_ID_CONTROL_PASSWORD, PropertyAttribute::TRANSIENT,&m_sControlPassword, ::getCppuType(&m_sControlPassword)); + registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT,&m_sUser, ::getCppuType(&m_sUser)); + registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT,&m_sUserPassword, ::getCppuType(&m_sUserPassword)); + registerProperty(PROPERTY_CACHESIZE, PROPERTY_ID_CACHESIZE, PropertyAttribute::TRANSIENT,&m_nCacheSize, ::getCppuType(&m_nCacheSize)); } //------------------------------------------------------------------------- @@ -126,7 +126,7 @@ Reference<XPropertySetInfo> SAL_CALL OAdabasCreateDialog::getPropertySetInfo() } //------------------------------------------------------------------------------ -Dialog* OAdabasCreateDialog::createDialog(Window* _pParent) +Dialog* OAdabasCreateDialog::createDialog(Window* _pParent) { if(!m_xCreateCatalog.is()) throw SQLException(); @@ -138,12 +138,12 @@ void OAdabasCreateDialog::executedDialog(sal_Int16 _nExecutionResult) { if(m_pDialog && _nExecutionResult == RET_OK) { // fill the variables - m_sDatabaseName = m_pDialog->GetDatabaseName(); - m_sControlUser = m_pDialog->GetControlUser(); - m_sControlPassword = m_pDialog->GetControlPassword(); - m_sUser = m_pDialog->GetUser(); - m_sUserPassword = m_pDialog->GetUserPassword(); - m_nCacheSize = m_pDialog->GetCacheSize(); + m_sDatabaseName = m_pDialog->GetDatabaseName(); + m_sControlUser = m_pDialog->GetControlUser(); + m_sControlPassword = m_pDialog->GetControlPassword(); + m_sUser = m_pDialog->GetUser(); + m_sUserPassword = m_pDialog->GetUserPassword(); + m_nCacheSize = m_pDialog->GetCacheSize(); } } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ext/adabas/ANewDb.hxx b/dbaccess/source/ext/adabas/ANewDb.hxx index cf725930dd0a..f1f0087be4df 100644 --- a/dbaccess/source/ext/adabas/ANewDb.hxx +++ b/dbaccess/source/ext/adabas/ANewDb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +50,12 @@ namespace adabasui protected: OAdabasNewDbDlg* m_pDialog; // just to avoid a cast // <properties> - ::rtl::OUString m_sDatabaseName; - ::rtl::OUString m_sControlUser; - ::rtl::OUString m_sControlPassword; - ::rtl::OUString m_sUser; - ::rtl::OUString m_sUserPassword; - sal_Int32 m_nCacheSize; + ::rtl::OUString m_sDatabaseName; + ::rtl::OUString m_sControlUser; + ::rtl::OUString m_sControlPassword; + ::rtl::OUString m_sUser; + ::rtl::OUString m_sUserPassword; + sal_Int32 m_nCacheSize; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog; // </properties> @@ -85,11 +85,11 @@ namespace adabasui protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); virtual void executedDialog(sal_Int16 _nExecutionResult); }; //......................................................................... -} // namespace adabasui +} // namespace adabasui //......................................................................... #endif // ADABASUI_NEWDB_HXX diff --git a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx index be2c27acf9d9..046a3fb9f175 100644 --- a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx +++ b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 adabasui ,public OSQLNameChecker { public: - OSQLNameEdit(Window* _pParent,const ResId& _rRes) + OSQLNameEdit(Window* _pParent,const ResId& _rRes) : Edit(_pParent,_rRes) { } diff --git a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx index 4745568c69e8..ae6071d6ae1a 100644 --- a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx +++ b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,14 +40,14 @@ namespace adabasui ); } //------------------------------------------------------------------ - sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, + sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, const ::rtl::OUString& _sToCheck, ::rtl::OUString& _rsCorrected) { sal_Bool bCorrected = sal_False; - XubString sSavedValue = _sOldValue; - XubString sText = _sToCheck; - xub_StrLen nMatch = 0; + XubString sSavedValue = _sOldValue; + XubString sText = _sToCheck; + xub_StrLen nMatch = 0; for ( xub_StrLen i=nMatch;i < sText.Len(); ++i ) { if ( !isCharOk( sText.GetBuffer()[i]) ) diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx index cab3b7170bc2..943e60d4d96d 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,10 @@ #include <comphelper/sequence.hxx> #include <tools/debug.hxx> -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ +#define ENTER_MOD_METHOD() \ + ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() - + //......................................................................... namespace COMPMOD_NAMESPACE { @@ -56,9 +56,9 @@ namespace COMPMOD_NAMESPACE */ class OModuleImpl { - ResMgr* m_pRessources; - sal_Bool m_bInitialized; - ByteString m_sFilePrefix; + ResMgr* m_pRessources; + sal_Bool m_bInitialized; + ByteString m_sFilePrefix; public: /// ctor @@ -66,8 +66,8 @@ namespace COMPMOD_NAMESPACE ~OModuleImpl(); /// get the manager for the ressources of the module - ResMgr* getResManager(); - void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; } + ResMgr* getResManager(); + void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; } }; //------------------------------------------------------------------------- @@ -85,7 +85,7 @@ namespace COMPMOD_NAMESPACE } //------------------------------------------------------------------------- - ResMgr* OModuleImpl::getResManager() + ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! if (!m_pRessources && !m_bInitialized) @@ -95,10 +95,10 @@ namespace COMPMOD_NAMESPACE ByteString aMgrName = m_sFilePrefix; m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer()); - DBG_ASSERT(m_pRessources, + DBG_ASSERT(m_pRessources, (ByteString("OModuleImpl::getResManager: could not create the resource manager (file name: ") - += aMgrName - += ByteString(")!")).GetBuffer()); + += aMgrName + += ByteString(")!")).GetBuffer()); m_bInitialized = sal_True; } @@ -108,12 +108,12 @@ namespace COMPMOD_NAMESPACE //========================================================================= //= OModule //========================================================================= - ::osl::Mutex OModule::s_aMutex; - sal_Int32 OModule::s_nClients = 0; - OModuleImpl* OModule::s_pImpl = NULL; - ::rtl::OString OModule::s_sResPrefix; + ::osl::Mutex OModule::s_aMutex; + sal_Int32 OModule::s_nClients = 0; + OModuleImpl* OModule::s_pImpl = NULL; + ::rtl::OString OModule::s_sResPrefix; //------------------------------------------------------------------------- - ResMgr* OModule::getResManager() + ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); @@ -159,10 +159,10 @@ namespace COMPMOD_NAMESPACE //- registration helper //-------------------------------------------------------------------------- - Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL; - Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL; - Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL; - Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL; + Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL; + Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL; + Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL; + Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OModule::registerComponent( @@ -183,9 +183,9 @@ namespace COMPMOD_NAMESPACE OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModule::registerComponent : inconsistent state (the pointers (2)) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModule::registerComponent : inconsistent state !"); sal_Int32 nOldLen = s_pImplementationNames->getLength(); @@ -210,9 +210,9 @@ namespace COMPMOD_NAMESPACE } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModule::revokeComponent : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModule::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -252,9 +252,9 @@ namespace COMPMOD_NAMESPACE } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModule::writeComponentInfos : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModule::writeComponentInfos : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -301,9 +301,9 @@ namespace COMPMOD_NAMESPACE } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModule::getComponentFactory : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModule::getComponentFactory : inconsistent state !"); @@ -337,7 +337,7 @@ namespace COMPMOD_NAMESPACE //......................................................................... -} // namespace COMPMOD_NAMESPACE +} // namespace COMPMOD_NAMESPACE //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx index 8ac75326a56e..d0c93c5b0663 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,36 +76,36 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService protected: // resource administration - 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 ::rtl::OString s_sResPrefix; + 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 ::rtl::OString s_sResPrefix; // auto registration administration - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< ::rtl::OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* s_pSupportedServices; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pFactoryFunctionPointers; public: // cna be set as long as no resource has been accessed ... - static void setResourceFilePrefix(const ::rtl::OString& _rPrefix); + static void setResourceFilePrefix(const ::rtl::OString& _rPrefix); /// get the vcl res manager of the module - static ResMgr* getResManager(); + static ResMgr* getResManager(); /** register a component implementing a service with the given data. - @param _rImplementationName + @param _rImplementationName the implementation name of the component - @param _rServiceNames + @param _rServiceNames the services the component supports - @param _pCreateFunction + @param _pCreateFunction a function for creating an instance of the component - @param _pFactoryFunction + @param _pFactoryFunction a function for creating a factory for that component @see revokeComponent */ @@ -116,7 +116,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService FactoryInstantiation _pFactoryFunction); /** revoke the registration for the specified component - @param _rImplementationName + @param _rImplementationName the implementation name of the component */ static void revokeComponent( @@ -126,9 +126,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService <p>writes the registration information of all components which are currently registered into the specified registry.<p/> <p>Usually used from within component_writeInfo.<p/> - @param _rxServiceManager + @param _rxServiceManager the service manager - @param _rRootKey + @param _rRootKey the registry key under which the information will be stored @return sal_True if the registration of all implementations was successfull, sal_False otherwise @@ -139,9 +139,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService /** creates a Factory for the component with the given implementation name. <p>Usually used from within component_getFactory.<p/> - @param _rxServiceManager + @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory - @param _pImplementationName + @param _pImplementationName the implementation name of the component @return the XInterface access to a factory for the component @@ -153,9 +153,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService 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 @@ -167,13 +167,13 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService //========================================================================= //= OModuleResourceClient //========================================================================= - /** base class for objects which uses any global module-specific ressources + /** base class for objects which uses any global module-specific ressources */ class OModuleResourceClient { public: - OModuleResourceClient() { OModule::registerClient(); } - ~OModuleResourceClient() { OModule::revokeClient(); } + OModuleResourceClient() { OModule::registerClient(); } + ~OModuleResourceClient() { OModule::revokeClient(); } }; //========================================================================= @@ -272,7 +272,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService } //......................................................................... -} // namespace COMPMOD_NAMESPACE +} // namespace COMPMOD_NAMESPACE //......................................................................... #endif // _EXTENSIONS_COMPONENT_MODULE_HXX_ diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx index 5ba64ae9c5c7..d6833f01eaaa 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,11 +69,11 @@ namespace adabasui { class ODatabaseCreator : public ::osl::Thread { - Link m_aTerminateHandler; - Sequence< PropertyValue> m_aValues; - Reference<XCreateCatalog> m_xCreateCatalog; - Reference< XMultiServiceFactory > m_xORB; - Window* m_pErrorWindow; + Link m_aTerminateHandler; + Sequence< PropertyValue> m_aValues; + Reference<XCreateCatalog> m_xCreateCatalog; + Reference< XMultiServiceFactory > m_xORB; + Window* m_pErrorWindow; public: ODatabaseCreator(const Reference<XCreateCatalog>& _rxCreateCatalog ,Window* _pErrorWindow @@ -107,7 +107,7 @@ namespace adabasui catch(Exception&) { OSL_ASSERT(0); - // showError(::dbtools::SQLExceptionInfo(e),this,); + // showError(::dbtools::SQLExceptionInfo(e),this,); } } void SAL_CALL ODatabaseCreator::onTerminated() @@ -120,7 +120,7 @@ DBG_NAME( OAdabasNewDbDlg ) //======================================================================== OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, const Reference<XCreateCatalog>& _rxCreateCatalog, - const Reference< XMultiServiceFactory >& _rxORB, + const Reference< XMultiServiceFactory >& _rxORB, BOOL _bRestore) :ModalDialog( pParent, ModuleRes( DLG_ADABAS_NEWDB )) ,m_FT_DATABASENAME( this, ModuleRes( FT_DATABASENAME ) ) @@ -202,8 +202,8 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_ET_SYSUSR.SetText(String::CreateFromAscii("DUMMY")); m_BMP_SYS.Hide(); m_BMP_DOMAIN.Hide(); - m_ET_RESTORE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_ET_RESTORE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_RESTORE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_RESTORE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_ET_RESTORE.SetMaxTextLen(40); } else @@ -212,24 +212,24 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_ET_RESTORE.Hide(); m_PB_RESTORE.Hide(); - m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_ET_DOMAIN_USR.Enable(FALSE); } - m_ET_SYSDEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_ET_TRANSACTIONLOG.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_ET_DATADEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_SYSDEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_TRANSACTIONLOG.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_DATADEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_ET_SYSDEVSPACE.SetMaxTextLen(40); m_ET_TRANSACTIONLOG.SetMaxTextLen(40); m_ET_DATADEVSPACE.SetMaxTextLen(40); - m_NF_TRANSACTIONLOG_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_NF_DATADEVSPACE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_NF_TRANSACTIONLOG_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_NF_DATADEVSPACE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_NF_TRANSACTIONLOG_SIZE.SetMin(10); m_NF_DATADEVSPACE_SIZE.SetMin(10); @@ -249,19 +249,19 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_ET_DATABASENAME.SetMaxTextLen( 8 ); - m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); - m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); - m_PB_DOMAINPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); + m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); + m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); + m_PB_DOMAINPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); - m_PB_RESTORE.SetClickHdl( LINK(this,OAdabasNewDbDlg,LoadButtonClickHdl)); + m_PB_RESTORE.SetClickHdl( LINK(this,OAdabasNewDbDlg,LoadButtonClickHdl)); - m_PB_SYSDEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); - m_PB_TRANSACTIONLOG.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); - m_PB_DATADEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); + m_PB_SYSDEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); + m_PB_TRANSACTIONLOG.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); + m_PB_DATADEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); - m_BMP_CON.SetImage( ModuleRes(UNCHECK_RED) ); - m_BMP_SYS.SetImage( ModuleRes(UNCHECK_RED) ); - m_BMP_DOMAIN.SetImage( ModuleRes(UNCHECK_RED) ); + m_BMP_CON.SetImage( ModuleRes(UNCHECK_RED) ); + m_BMP_SYS.SetImage( ModuleRes(UNCHECK_RED) ); + m_BMP_DOMAIN.SetImage( ModuleRes(UNCHECK_RED) ); static String s_sRoot(RTL_CONSTASCII_USTRINGPARAM("DBROOT")); static String s_sConfig(RTL_CONSTASCII_USTRINGPARAM("DBCONFIG")); @@ -344,7 +344,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_PB_OK.SetClickHdl(LINK(this,OAdabasNewDbDlg,ImplOKHdl)); m_PB_OK.Enable(FALSE); - m_ET_DATABASENAME.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_DATABASENAME.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); } // ----------------------------------------------------------------------- @@ -378,11 +378,11 @@ IMPL_LINK(OAdabasNewDbDlg, OnNoAccessRights, void*, /*_pArg*/) // ----------------------------------------------------------------------- IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ ) { - m_SYSDEV_File = m_ET_SYSDEVSPACE.GetText(); + m_SYSDEV_File = m_ET_SYSDEVSPACE.GetText(); m_TRANSDEV_File = m_ET_TRANSACTIONLOG.GetText(); - m_DATADEV_File = m_ET_DATADEVSPACE.GetText(); + m_DATADEV_File = m_ET_DATADEVSPACE.GetText(); - m_Backup_File = m_ET_RESTORE.GetText(); + m_Backup_File = m_ET_RESTORE.GetText(); if(m_bRestore) { INetURLObject aURL; @@ -463,36 +463,36 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ ) sal_Int32 nPos = 0; Sequence< PropertyValue> aCreateArgs(m_bRestore ? 14 : 12); - aCreateArgs[nPos].Name = PROPERTY_CONTROL_USER; + aCreateArgs[nPos].Name = PROPERTY_CONTROL_USER; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_CONUSR.GetText().ToUpperAscii()); - aCreateArgs[nPos].Name = PROPERTY_CONTROL_PASSWORD; + aCreateArgs[nPos].Name = PROPERTY_CONTROL_PASSWORD; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ConPwd); - aCreateArgs[nPos].Name = PROPERTY_USER; + aCreateArgs[nPos].Name = PROPERTY_USER; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_SYSUSR.GetText().ToUpperAscii()); - aCreateArgs[nPos].Name = PROPERTY_PASSWORD; + aCreateArgs[nPos].Name = PROPERTY_PASSWORD; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_SysPwd); - aCreateArgs[nPos].Name = PROPERTY_DOMAINPASSWORD; + aCreateArgs[nPos].Name = PROPERTY_DOMAINPASSWORD; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_DomainPwd); - aCreateArgs[nPos].Name = PROPERTY_CACHESIZE; + aCreateArgs[nPos].Name = PROPERTY_CACHESIZE; aCreateArgs[nPos++].Value <<= ::rtl::OUString::valueOf(sal_Int32(m_NF_CACHE_SIZE.GetValue()*256)); - aCreateArgs[nPos].Name = PROPERTY_DATABASENAME; + aCreateArgs[nPos].Name = PROPERTY_DATABASENAME; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_DATABASENAME.GetText().ToUpperAscii()); - aCreateArgs[nPos].Name = PROPERTY_DATADEVSPACE; + aCreateArgs[nPos].Name = PROPERTY_DATADEVSPACE; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_DATADEV_File); - aCreateArgs[nPos].Name = PROPERTY_SYSDEVSPACE; + aCreateArgs[nPos].Name = PROPERTY_SYSDEVSPACE; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_SYSDEV_File); - aCreateArgs[nPos].Name = PROPERTY_TRANSACTION_LOG; + aCreateArgs[nPos].Name = PROPERTY_TRANSACTION_LOG; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_TRANSDEV_File); - aCreateArgs[nPos].Name = PROPERTY_DATADEVSIZE; + aCreateArgs[nPos].Name = PROPERTY_DATADEVSIZE; aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_DATADEVSPACE_SIZE.GetValue()*256); - aCreateArgs[nPos].Name = PROPERTY_LOGDEVSIZE; - aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_TRANSACTIONLOG_SIZE.GetValue()*256); + aCreateArgs[nPos].Name = PROPERTY_LOGDEVSIZE; + aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_TRANSACTIONLOG_SIZE.GetValue()*256); if(m_bRestore) { - aCreateArgs[nPos].Name = PROPERTY_RESTOREDATABASE; + aCreateArgs[nPos].Name = PROPERTY_RESTOREDATABASE; aCreateArgs[nPos++].Value <<= ::cppu::bool2any(sal_True); - aCreateArgs[nPos].Name = PROPERTY_BACKUPNAME; + aCreateArgs[nPos].Name = PROPERTY_BACKUPNAME; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_Backup_File); } @@ -574,8 +574,8 @@ IMPL_LINK( OAdabasNewDbDlg, LoadButtonClickHdl, Button *, /*pButton*/ ) //------------------------------------------------------------------------ IMPL_LINK( OAdabasNewDbDlg, ButtonClickHdl, Button *, pButton ) { - WinBits nBits(WB_3DLOOK|WB_STDMODAL|WB_SAVEAS); - ::sfx2::FileDialogHelper aFileDlg( static_cast<sal_uInt32>(nBits) ); // new FileDialog( this, nBits ); + WinBits nBits(WB_3DLOOK|WB_STDMODAL|WB_SAVEAS); + ::sfx2::FileDialogHelper aFileDlg( static_cast<sal_uInt32>(nBits) ); // new FileDialog( this, nBits ); String aPath; if(pButton == &m_PB_SYSDEVSPACE) diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hrc b/dbaccess/source/ext/adabas/AdabasNewDb.hrc index 30216a30e6b7..e38a808ae645 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.hrc +++ b/dbaccess/source/ext/adabas/AdabasNewDb.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,50 +29,50 @@ #define ADABASUI_ADABASNEWDB_HRC -#define PB_SYSDEVSPACE 1 -#define PB_TRANSACTIONLOG 2 -#define PB_DATADEVSPACE 3 -#define PB_DOMAINPWD 4 -#define PB_CONPWD 5 -#define PB_SYSPWD 6 -#define PB_OK 7 -#define PB_CANCEL 8 -#define PB_RESTORE 9 +#define PB_SYSDEVSPACE 1 +#define PB_TRANSACTIONLOG 2 +#define PB_DATADEVSPACE 3 +#define PB_DOMAINPWD 4 +#define PB_CONPWD 5 +#define PB_SYSPWD 6 +#define PB_OK 7 +#define PB_CANCEL 8 +#define PB_RESTORE 9 -#define NF_TRANSACTIONLOG_SIZE 1 -#define NF_DATADEVSPACE_SIZE 2 -#define NF_CACHE_SIZE 3 +#define NF_TRANSACTIONLOG_SIZE 1 +#define NF_DATADEVSPACE_SIZE 2 +#define NF_CACHE_SIZE 3 -#define ET_SYSUSR 1 -#define ET_DOMAIN_USR 2 -#define ET_CONUSR 3 -#define ET_SYSDEVSPACE 4 -#define ET_TRANSACTIONLOG 5 -#define ET_DATADEVSPACE 6 -#define ET_RESTORE 7 -#define ET_DATABASENAME 8 +#define ET_SYSUSR 1 +#define ET_DOMAIN_USR 2 +#define ET_CONUSR 3 +#define ET_SYSDEVSPACE 4 +#define ET_TRANSACTIONLOG 5 +#define ET_DATADEVSPACE 6 +#define ET_RESTORE 7 +#define ET_DATABASENAME 8 -#define FT_SYSUSR 1 -#define FT_DOMAIN_USR 2 -#define FT_TRANSACTIONLOG_SIZE 3 -#define FT_DATADEVSPACE_SIZE 4 -#define FT_CONUSR 6 -#define FT_SYSDEVSPACE 7 -#define FT_TRANSACTIONLOG 8 -#define FT_DATADEVSPACE 9 -#define FT_CACHE_SIZE 10 -#define FT_RESTORE 11 -#define FT_DATABASENAME 12 +#define FT_SYSUSR 1 +#define FT_DOMAIN_USR 2 +#define FT_TRANSACTIONLOG_SIZE 3 +#define FT_DATADEVSPACE_SIZE 4 +#define FT_CONUSR 6 +#define FT_SYSDEVSPACE 7 +#define FT_TRANSACTIONLOG 8 +#define FT_DATADEVSPACE 9 +#define FT_CACHE_SIZE 10 +#define FT_RESTORE 11 +#define FT_DATABASENAME 12 #define FL_USER 1 #define FL_DBSETTINGS 2 #define FL_END 3 -#define BMP_CON 1 -#define BMP_SYS 2 -#define BMP_DOMAIN 3 +#define BMP_CON 1 +#define BMP_SYS 2 +#define BMP_DOMAIN 3 -#define STR_BACKUPFILE_LOAD 1 +#define STR_BACKUPFILE_LOAD 1 #endif // ADABASUI_ADABASNEWDB_HRC diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx index 9ab36e88060c..a271c438ddb1 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,76 +53,76 @@ namespace adabasui class OAdabasNewDbDlg : public ModalDialog { private: - FixedText m_FT_DATABASENAME; - OSQLNameEdit m_ET_DATABASENAME; + FixedText m_FT_DATABASENAME; + OSQLNameEdit m_ET_DATABASENAME; FixedLine m_FL_USER; - FixedText m_FT_SYSUSR; - FixedText m_FT_CONUSR; - FixedText m_FT_DOMAIN_USR; + FixedText m_FT_SYSUSR; + FixedText m_FT_CONUSR; + FixedText m_FT_DOMAIN_USR; - OSQLNameEdit m_ET_SYSUSR; - PushButton m_PB_SYSPWD; - OSQLNameEdit m_ET_CONUSR; - PushButton m_PB_CONPWD; - OSQLNameEdit m_ET_DOMAIN_USR; - PushButton m_PB_DOMAINPWD; + OSQLNameEdit m_ET_SYSUSR; + PushButton m_PB_SYSPWD; + OSQLNameEdit m_ET_CONUSR; + PushButton m_PB_CONPWD; + OSQLNameEdit m_ET_DOMAIN_USR; + PushButton m_PB_DOMAINPWD; - FixedImage m_BMP_CON; - FixedImage m_BMP_SYS; - FixedImage m_BMP_DOMAIN; + FixedImage m_BMP_CON; + FixedImage m_BMP_SYS; + FixedImage m_BMP_DOMAIN; - FixedText m_FT_RESTORE; - Edit m_ET_RESTORE; - PushButton m_PB_RESTORE; + FixedText m_FT_RESTORE; + Edit m_ET_RESTORE; + PushButton m_PB_RESTORE; FixedLine m_FL_DBSETTINGS; - FixedText m_FT_SYSDEVSPACE; - FixedText m_FT_TRANSACTIONLOG; - FixedText m_FT_DATADEVSPACE; - Edit m_ET_SYSDEVSPACE; - PushButton m_PB_SYSDEVSPACE; - Edit m_ET_TRANSACTIONLOG; - PushButton m_PB_TRANSACTIONLOG; - Edit m_ET_DATADEVSPACE; - PushButton m_PB_DATADEVSPACE; - - FixedText m_FT_TRANSACTIONLOG_SIZE; - NumericField m_NF_TRANSACTIONLOG_SIZE; - FixedText m_FT_DATADEVSPACE_SIZE; - NumericField m_NF_DATADEVSPACE_SIZE; - FixedText m_FT_CACHE_SIZE; - NumericField m_NF_CACHE_SIZE; + FixedText m_FT_SYSDEVSPACE; + FixedText m_FT_TRANSACTIONLOG; + FixedText m_FT_DATADEVSPACE; + Edit m_ET_SYSDEVSPACE; + PushButton m_PB_SYSDEVSPACE; + Edit m_ET_TRANSACTIONLOG; + PushButton m_PB_TRANSACTIONLOG; + Edit m_ET_DATADEVSPACE; + PushButton m_PB_DATADEVSPACE; + + FixedText m_FT_TRANSACTIONLOG_SIZE; + NumericField m_NF_TRANSACTIONLOG_SIZE; + FixedText m_FT_DATADEVSPACE_SIZE; + NumericField m_NF_DATADEVSPACE_SIZE; + FixedText m_FT_CACHE_SIZE; + NumericField m_NF_CACHE_SIZE; FixedLine m_FL_END; - OKButton m_PB_OK; - CancelButton m_PB_CANCEL; - - String m_SYSDEV_File; - String m_TRANSDEV_File; - String m_DATADEV_File; - String m_Backup_File; - String m_ConPwd; - String m_SysPwd; - String m_DomainPwd; - String m_DBName; - String m_sDbWork; - String m_sDbConfig; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xORB; - BOOL m_bRestore; - INT8 m_nSetBitmap; - - ::std::auto_ptr<WaitObject> m_aCreatorWait; - ::std::auto_ptr<ODatabaseCreator> m_aCreatorThread; - - DECL_LINK( LoadButtonClickHdl, Button * ); - DECL_LINK( ButtonClickHdl, Button * ); - DECL_LINK( PwdClickHdl, Button * ); - DECL_LINK( ImplOKHdl, OKButton * ); - DECL_LINK( LoseFocusHdl, Edit * ); - DECL_LINK( TerminateHdl, void * ); + OKButton m_PB_OK; + CancelButton m_PB_CANCEL; + + String m_SYSDEV_File; + String m_TRANSDEV_File; + String m_DATADEV_File; + String m_Backup_File; + String m_ConPwd; + String m_SysPwd; + String m_DomainPwd; + String m_DBName; + String m_sDbWork; + String m_sDbConfig; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog; + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xORB; + BOOL m_bRestore; + INT8 m_nSetBitmap; + + ::std::auto_ptr<WaitObject> m_aCreatorWait; + ::std::auto_ptr<ODatabaseCreator> m_aCreatorThread; + + DECL_LINK( LoadButtonClickHdl, Button * ); + DECL_LINK( ButtonClickHdl, Button * ); + DECL_LINK( PwdClickHdl, Button * ); + DECL_LINK( ImplOKHdl, OKButton * ); + DECL_LINK( LoseFocusHdl, Edit * ); + DECL_LINK( TerminateHdl, void * ); void CheckBitmaps(); @@ -134,16 +134,16 @@ namespace adabasui public: OAdabasNewDbDlg(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog>& _rxCreateCatalog, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB, BOOL _bRestore=FALSE); virtual ~OAdabasNewDbDlg(); - ::rtl::OUString GetDatabaseName() const { return m_ET_DATABASENAME.GetText(); } - ::rtl::OUString GetControlUser() const { return m_ET_CONUSR.GetText(); } - ::rtl::OUString GetControlPassword() const { return m_ConPwd; } - ::rtl::OUString GetUser() const { return m_ET_SYSUSR.GetText(); } - ::rtl::OUString GetUserPassword() const { return m_SysPwd; } - sal_Int32 GetCacheSize() const { return static_cast<sal_Int32>(m_NF_CACHE_SIZE.GetValue()); } + ::rtl::OUString GetDatabaseName() const { return m_ET_DATABASENAME.GetText(); } + ::rtl::OUString GetControlUser() const { return m_ET_CONUSR.GetText(); } + ::rtl::OUString GetControlPassword() const { return m_ConPwd; } + ::rtl::OUString GetUser() const { return m_ET_SYSUSR.GetText(); } + ::rtl::OUString GetUserPassword() const { return m_SysPwd; } + sal_Int32 GetCacheSize() const { return static_cast<sal_Int32>(m_NF_CACHE_SIZE.GetValue()); } }; } #endif // adabasui_ADABAS_CREATEDB_HXX diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.src b/dbaccess/source/ext/adabas/AdabasNewDb.src index 33915b06266b..ae3cd2e2d24c 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.src +++ b/dbaccess/source/ext/adabas/AdabasNewDb.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,23 +33,23 @@ //================================================================== // NEWDB Admin //================================================================== -#define WIN_X 268 -#define WIN_Y 210 -#define MOVE_Y 21 +#define WIN_X 268 +#define WIN_Y 210 +#define MOVE_Y 21 #define ADJUST_X 45 ModalDialog DLG_ADABAS_NEWDB { - Moveable = TRUE ; - Closeable = TRUE ; - OutputSize = TRUE ; - SVLook = TRUE; - HelpID = HID_DLG_ADABAS_NEWDB ; - Size = MAP_APPFONT ( WIN_X , WIN_Y + MOVE_Y) ; + Moveable = TRUE ; + Closeable = TRUE ; + OutputSize = TRUE ; + SVLook = TRUE; + HelpID = HID_DLG_ADABAS_NEWDB ; + Size = MAP_APPFONT ( WIN_X , WIN_Y + MOVE_Y) ; FixedText FT_DATABASENAME { - Pos = MAP_APPFONT ( 12 , 6) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 6) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "Database ~name"; }; Edit ET_DATABASENAME @@ -58,50 +58,50 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 77 + ADJUST_X, 5) ; Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_DBNAME ; + HelpID = HID_DLG_ADABAS_DBNAME ; }; FixedLine FL_USER { - Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ; + Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ; Text[ en-US ] = "User settings"; }; FixedText FT_CONUSR { - Pos = MAP_APPFONT ( 12 , 31 + MOVE_Y) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 31 + MOVE_Y) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Control user"; }; FixedText FT_SYSUSR { - Pos = MAP_APPFONT ( 12 , 14 + MOVE_Y) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 14 + MOVE_Y) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Administrator"; }; FixedText FT_DOMAIN_USR { - Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Domain user"; }; Edit ET_SYSUSR { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; + Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_SYSUSR ; + HelpID = HID_DLG_ADABAS_SYSUSR ; }; PushButton PB_SYSPWD { Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_SYSPWD ; + HelpID = HID_DLG_ADABAS_SYSPWD ; Text[ en-US ] = "P~assword..."; }; @@ -109,87 +109,87 @@ ModalDialog DLG_ADABAS_NEWDB { Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 30 + MOVE_Y) ; - Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; + Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_CONUSR ; + HelpID = HID_DLG_ADABAS_CONUSR ; }; PushButton PB_CONPWD { Pos = MAP_APPFONT ( 188 , 30 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_CONPWD ; + HelpID = HID_DLG_ADABAS_CONPWD ; Text[ en-US ] = "~Password..."; }; Edit ET_DOMAIN_USR { Pos = MAP_APPFONT ( 77 + ADJUST_X, 47 + MOVE_Y) ; - Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; - Border = TRUE ; + Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; + Border = TRUE ; TabStop = TRUE ; ReadOnly= TRUE; - HelpID = HID_DLG_ADABAS_USR ; + HelpID = HID_DLG_ADABAS_USR ; Text = "adabas"; }; PushButton PB_DOMAINPWD { Pos = MAP_APPFONT ( 188 , 47 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_DOMAINPWD ; + HelpID = HID_DLG_ADABAS_DOMAINPWD ; Text[ en-US ] = "Passwo~rd..."; }; FixedImage BMP_CON { Pos = MAP_APPFONT ( 240 , 27 + MOVE_Y) ; - Size = MAP_APPFONT ( 20 , 20 ) ; - HelpID = HID_DLG_ADABAS_CON_PWD ; + Size = MAP_APPFONT ( 20 , 20 ) ; + HelpID = HID_DLG_ADABAS_CON_PWD ; }; FixedImage BMP_SYS { Pos = MAP_APPFONT ( 240 , 11 + MOVE_Y) ; - Size = MAP_APPFONT ( 20 , 20 ) ; - HelpID = HID_DLG_ADABAS_SYS_PWD ; + Size = MAP_APPFONT ( 20 , 20 ) ; + HelpID = HID_DLG_ADABAS_SYS_PWD ; }; FixedImage BMP_DOMAIN { Pos = MAP_APPFONT ( 240 , 44 + MOVE_Y) ; - Size = MAP_APPFONT ( 20 , 20 ) ; - HelpID = HID_DLG_ADABAS_DOMAIN_PWD ; + Size = MAP_APPFONT ( 20 , 20 ) ; + HelpID = HID_DLG_ADABAS_DOMAIN_PWD ; }; FixedText FT_RESTORE { - Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Backup file"; }; Edit ET_RESTORE { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; + Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_RESTORE ; + HelpID = HID_DLG_ADABAS_RESTORE ; }; PushButton PB_RESTORE { Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_PBRESTORE ; - Text[ en-US ] = "..."; + HelpID = HID_DLG_ADABAS_PBRESTORE ; + Text[ en-US ] = "..."; }; /* DEVSPACE positions */ FixedLine FL_DBSETTINGS { - Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ; + Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ; Text[ en-US ] = "Database settings"; }; @@ -217,37 +217,37 @@ ModalDialog DLG_ADABAS_NEWDB Edit ET_SYSDEVSPACE { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 81 + MOVE_Y) ; Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_SYSDEVSPACE ; + HelpID = HID_DLG_ADABAS_SYSDEVSPACE ; }; PushButton PB_SYSDEVSPACE { - Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y) ; - Size = MAP_APPFONT ( 12 , 12 ) ; + Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y) ; + Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ; - Text[ en-US ] = "..."; + HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ; + Text[ en-US ] = "..."; }; Edit ET_TRANSACTIONLOG { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 97 + MOVE_Y) ; Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ; + HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ; }; PushButton PB_TRANSACTIONLOG { - Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y) ; - Size = MAP_APPFONT ( 12 , 12 ) ; + Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y) ; + Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ; + HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ; Text[ en-US ] = "..."; }; @@ -255,18 +255,18 @@ ModalDialog DLG_ADABAS_NEWDB { Pos = MAP_APPFONT ( 77 + ADJUST_X, 114 + MOVE_Y) ; Size = MAP_APPFONT ( 161 - ADJUST_X, 12) ; - Border = TRUE ; + Border = TRUE ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_DATADEVSPACE ; + HelpID = HID_DLG_ADABAS_DATADEVSPACE ; }; PushButton PB_DATADEVSPACE { - Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ; - Size = MAP_APPFONT ( 12 , 12 ) ; + Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ; + Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ; + HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ; Text[ en-US ] = "..."; }; /* DEVSPACE sizes */ @@ -280,11 +280,11 @@ ModalDialog DLG_ADABAS_NEWDB { Pos = MAP_APPFONT ( 77 + ADJUST_X, 131 + MOVE_Y) ; Size = MAP_APPFONT ( 40 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; StrictFormat = TRUE; - HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ; + HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ; }; FixedText FT_DATADEVSPACE_SIZE { @@ -296,11 +296,11 @@ StrictFormat = TRUE; { Pos = MAP_APPFONT ( 77 + ADJUST_X, 148 + MOVE_Y) ; Size = MAP_APPFONT ( 40 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; StrictFormat = TRUE; - HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ; + HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ; }; FixedText FT_CACHE_SIZE { @@ -312,11 +312,11 @@ StrictFormat = TRUE; { Pos = MAP_APPFONT ( 77 + ADJUST_X, 165 + MOVE_Y) ; Size = MAP_APPFONT ( 40 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; StrictFormat = TRUE; - HelpID = HID_DLG_ADABAS_CACHE_SIZE ; + HelpID = HID_DLG_ADABAS_CACHE_SIZE ; }; FixedLine FL_END { @@ -325,21 +325,21 @@ StrictFormat = TRUE; }; OKButton PB_OK { - Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; + Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; }; CancelButton PB_CANCEL { - Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; + Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; }; String STR_BACKUPFILE_LOAD { - Text[ en-US ] = "Backup file information"; + Text[ en-US ] = "Backup file information"; }; Text[ en-US ] = "Create New Adabas D Database"; @@ -348,42 +348,42 @@ StrictFormat = TRUE; Image CHECK_GREEN { ImageBitmap = Bitmap { File = "nu07.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; + MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; Image UNCHECK_RED { ImageBitmap = Bitmap { File = "nu08.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; + MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; Image DEFAULT_BLUE { ImageBitmap = Bitmap { File = "nu09.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; + MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; /* Fehlermeldungen beim Erstellen einer Adabas DB */ String STR_ADABAS_NO_PARAM_SET { - Text[ en-US ] = "No entry could be written in the configuration file."; + Text[ en-US ] = "No entry could be written in the configuration file."; }; String STR_ADABAS_NO_DB_CREATED { - Text[ en-US ] = "An error occurred as the DB files were being created."; + Text[ en-US ] = "An error occurred as the DB files were being created."; }; String STR_ADABAS_NO_SYSTEM_TABLES { - Text[ en-US ] = "An error occurred as the system tables were being created."; + Text[ en-US ] = "An error occurred as the system tables were being created."; }; String STR_ADABAS_NO_BACKUP_FILE { - Text[ en-US ] = "The backup file entered does not exist."; + Text[ en-US ] = "The backup file entered does not exist."; }; InfoBox INFO_STR_MAX_FILE_LENGTH { - Message[ en-US ] = "The fully qualified file cannot be longer than \'#\' characters."; + Message[ en-US ] = "The fully qualified file cannot be longer than \'#\' characters."; }; String STR_NO_SAME_USER diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx index 62f7f87d183d..b530783cc4cb 100644 --- a/dbaccess/source/ext/adabas/Aservices.cxx +++ b/dbaccess/source/ext/adabas/Aservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui() extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_adabasui(); @@ -74,8 +74,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { return OModule::writeComponentInfos( static_cast<XMultiServiceFactory*>(pServiceManager), diff --git a/dbaccess/source/ext/adabas/Astringconstants.cxx b/dbaccess/source/ext/adabas/Astringconstants.cxx index 6fe34c212a00..4375af2eec1a 100644 --- a/dbaccess/source/ext/adabas/Astringconstants.cxx +++ b/dbaccess/source/ext/adabas/Astringconstants.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/adabas/Astringconstants.hrc b/dbaccess/source/ext/adabas/Astringconstants.hrc index 49697f556024..2a1bed02f850 100644 --- a/dbaccess/source/ext/adabas/Astringconstants.hrc +++ b/dbaccess/source/ext/adabas/Astringconstants.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 @@ -62,13 +62,13 @@ struct _ConstAsciiString_ //= property ids //============================================================ -#define PROPERTY_ID_CREATECATALOG 3 -#define PROPERTY_ID_DATABASENAME 4 -#define PROPERTY_ID_CONTROL_USER 5 -#define PROPERTY_ID_CONTROL_PASSWORD 6 -#define PROPERTY_ID_USER 7 -#define PROPERTY_ID_PASSWORD 8 -#define PROPERTY_ID_CACHESIZE 9 +#define PROPERTY_ID_CREATECATALOG 3 +#define PROPERTY_ID_DATABASENAME 4 +#define PROPERTY_ID_CONTROL_USER 5 +#define PROPERTY_ID_CONTROL_PASSWORD 6 +#define PROPERTY_ID_USER 7 +#define PROPERTY_ID_PASSWORD 8 +#define PROPERTY_ID_CACHESIZE 9 //============================================================ //= property names diff --git a/dbaccess/source/ext/adabas/adabasui_resource.hrc b/dbaccess/source/ext/adabas/adabasui_resource.hrc index b0b0e63e91c7..922a897bdbd2 100644 --- a/dbaccess/source/ext/adabas/adabasui_resource.hrc +++ b/dbaccess/source/ext/adabas/adabasui_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,60 +32,60 @@ #include <svl/solar.hrc> #endif -#define RID_DIALOG_START RID_DB_EXTENSIONS_START -#define RID_PAGE_START RID_DB_EXTENSIONS_START -#define RID_ERRORBOX_START RID_DB_EXTENSIONS_START -#define RID_QUERYBOX_START RID_DB_EXTENSIONS_START -#define RID_TOOLBOX_START RID_DB_EXTENSIONS_START -#define RID_BITMAP_START RID_DB_EXTENSIONS_START -#define RID_IMAGE_START RID_DB_EXTENSIONS_START -#define RID_IMAGELIST_START RID_DB_EXTENSIONS_START -#define RID_MENU_START RID_DB_EXTENSIONS_START -#define RID_STRING_START RID_DB_EXTENSIONS_START -#define RID_UNTYPED_START RID_DB_EXTENSIONS_START -#define RID_WARN_START RID_DB_EXTENSIONS_START +#define RID_DIALOG_START RID_DB_EXTENSIONS_START +#define RID_PAGE_START RID_DB_EXTENSIONS_START +#define RID_ERRORBOX_START RID_DB_EXTENSIONS_START +#define RID_QUERYBOX_START RID_DB_EXTENSIONS_START +#define RID_TOOLBOX_START RID_DB_EXTENSIONS_START +#define RID_BITMAP_START RID_DB_EXTENSIONS_START +#define RID_IMAGE_START RID_DB_EXTENSIONS_START +#define RID_IMAGELIST_START RID_DB_EXTENSIONS_START +#define RID_MENU_START RID_DB_EXTENSIONS_START +#define RID_STRING_START RID_DB_EXTENSIONS_START +#define RID_UNTYPED_START RID_DB_EXTENSIONS_START +#define RID_WARN_START RID_DB_EXTENSIONS_START //======================================================================== // dialog ids -#define DLG_ADABAS_NEWDB RID_DIALOG_START + 0 +#define DLG_ADABAS_NEWDB RID_DIALOG_START + 0 //======================================================================== // images -#define CHECK_GREEN RID_IMAGE_START + 0 -#define UNCHECK_RED RID_IMAGE_START + 1 -#define DEFAULT_BLUE RID_IMAGE_START + 2 +#define CHECK_GREEN RID_IMAGE_START + 0 +#define UNCHECK_RED RID_IMAGE_START + 1 +#define DEFAULT_BLUE RID_IMAGE_START + 2 //======================================================================== // warning boxes -#define INFO_STR_MAX_FILE_LENGTH RID_WARN_START + 0 +#define INFO_STR_MAX_FILE_LENGTH RID_WARN_START + 0 //======================================================================== // strings -#define STR_ADABAS_NO_BACKUP_FILE RID_STRING_START + 0 +#define STR_ADABAS_NO_BACKUP_FILE RID_STRING_START + 0 // -#define STR_NO_SAME_USER RID_STRING_START + 2 -#define STR_DEVSPACE_NO_FILE RID_STRING_START + 3 -#define STR_NO_PERMISSION RID_STRING_START + 4 -#define STR_FILE_OR_DIR_UNKNOWN RID_STRING_START + 5 -#define STR_STAT_WARNING RID_STRING_START + 6 +#define STR_NO_SAME_USER RID_STRING_START + 2 +#define STR_DEVSPACE_NO_FILE RID_STRING_START + 3 +#define STR_NO_PERMISSION RID_STRING_START + 4 +#define STR_FILE_OR_DIR_UNKNOWN RID_STRING_START + 5 +#define STR_STAT_WARNING RID_STRING_START + 6 // -#define STR_ADABAS_NO_PARAM_SET RID_STRING_START + 8 +#define STR_ADABAS_NO_PARAM_SET RID_STRING_START + 8 // // -#define STR_ADABAS_NO_DB_CREATED RID_STRING_START + 11 -#define STR_ADABAS_NO_SYSTEM_TABLES RID_STRING_START + 12 -#define STR_ERROR_IN_ADABAS_INSTALLATION RID_STRING_START + 13 -#define STR_ADABAS_CREATEFILES RID_STRING_START + 14 -#define STR_ADABAS_CREATEPARAM_FILE RID_STRING_START + 15 -#define STR_ADABAS_START_DATABASE RID_STRING_START + 16 -#define STR_ADABAS_DB_EXISTS RID_STRING_START + 17 -#define STR_ADABAS_NO_DEFAULTNAME RID_STRING_START + 18 -#define STR_ADABAS_NO_ACCESSRIGHTS RID_STRING_START + 19 -#define STR_ADABAS_CANNOT_CONVERT RID_STRING_START + 20 -#define STR_ADABAS_PASSWORD_ILLEGAL RID_STRING_START + 21 +#define STR_ADABAS_NO_DB_CREATED RID_STRING_START + 11 +#define STR_ADABAS_NO_SYSTEM_TABLES RID_STRING_START + 12 +#define STR_ERROR_IN_ADABAS_INSTALLATION RID_STRING_START + 13 +#define STR_ADABAS_CREATEFILES RID_STRING_START + 14 +#define STR_ADABAS_CREATEPARAM_FILE RID_STRING_START + 15 +#define STR_ADABAS_START_DATABASE RID_STRING_START + 16 +#define STR_ADABAS_DB_EXISTS RID_STRING_START + 17 +#define STR_ADABAS_NO_DEFAULTNAME RID_STRING_START + 18 +#define STR_ADABAS_NO_ACCESSRIGHTS RID_STRING_START + 19 +#define STR_ADABAS_CANNOT_CONVERT RID_STRING_START + 20 +#define STR_ADABAS_PASSWORD_ILLEGAL RID_STRING_START + 21 #endif // _ADABASUI_RESOURCE_HRC_ diff --git a/dbaccess/source/ext/adabas/adabasuistrings.cxx b/dbaccess/source/ext/adabas/adabasuistrings.cxx index cf1edccedc07..ec71721e7363 100644 --- a/dbaccess/source/ext/adabas/adabasuistrings.cxx +++ b/dbaccess/source/ext/adabas/adabasuistrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/adabas/adabasuistrings.hrc b/dbaccess/source/ext/adabas/adabasuistrings.hrc index 7ee5fd19275c..6ef536e99380 100644 --- a/dbaccess/source/ext/adabas/adabasuistrings.hrc +++ b/dbaccess/source/ext/adabas/adabasuistrings.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/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc index b0a76aa0907e..8ea3dc724cf9 100644 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ b/dbaccess/source/ext/macromigration/dbmm_global.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 @@ -74,13 +74,13 @@ #define STR_JAVA ( RID_DBMM_STRING_START + 9 ) #define STR_PYTHON ( RID_DBMM_STRING_START + 10 ) #define STR_DIALOG ( RID_DBMM_STRING_START + 11 ) -#define STR_MIGRATING_LIBS ( RID_DBMM_STRING_START + 12 ) +#define STR_MIGRATING_LIBS ( RID_DBMM_STRING_START + 12 ) #define STR_ERRORS ( RID_DBMM_STRING_START + 13 ) #define STR_WARNINGS ( RID_DBMM_STRING_START + 14 ) #define STR_EXCEPTION ( RID_DBMM_STRING_START + 15 ) #define STR_LIBRARY_TYPE_AND_NAME ( RID_DBMM_STRING_START + 16 ) -#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 ) -#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 ) -#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 ) +#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 ) +#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 ) +#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 ) #endif // DBACCESS_DBMM_GLOBAL_HRC diff --git a/dbaccess/source/ext/macromigration/dbmm_module.cxx b/dbaccess/source/ext/macromigration/dbmm_module.cxx index d133dc0fcae2..45553b7251ab 100644 --- a/dbaccess/source/ext/macromigration/dbmm_module.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_module.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/dbmm_module.hxx b/dbaccess/source/ext/macromigration/dbmm_module.hxx index 4e27f8c18401..8342a7aa8e57 100644 --- a/dbaccess/source/ext/macromigration/dbmm_module.hxx +++ b/dbaccess/source/ext/macromigration/dbmm_module.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index f1dd54aa312f..998db95203ae 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx index ee0c32b7eef7..988c4591bce7 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/dbmm_types.hxx b/dbaccess/source/ext/macromigration/dbmm_types.hxx index 13c02005b68c..6c65002390d2 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.hxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index 63670e88b323..1fe9c1616373 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx index 524aa981aac4..9575fd8c9974 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.hxx +++ b/dbaccess/source/ext/macromigration/docinteraction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ namespace dbmm /** requests a document password @param _rDocumentName the document name - @param _io_rPassword + @param _io_rPassword the initial password on method entry, the password as entered by the user on method leave @return <TRUE/> if and only if the user entered a password, and confirmed with OK, <FALSE/> diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc index ab6ea726868d..ac1a5c244e17 100644 --- a/dbaccess/source/ext/macromigration/macromigration.hrc +++ b/dbaccess/source/ext/macromigration/macromigration.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/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src index 9742dcdfec71..97cc72f5f30e 100644 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ b/dbaccess/source/ext/macromigration/macromigration.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -222,7 +222,7 @@ TabPage TP_MIGRATE }; FixedText FT_CURRENT_OBJECT - { + { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60, CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED ); Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ), FIXED_TEXT_HEIGHT ); @@ -238,7 +238,7 @@ TabPage TP_MIGRATE }; FixedText FT_CURRENT_PROGRESS - { + { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60, CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED ); Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ), FIXED_TEXT_HEIGHT ); diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 4054f67189c0..7070414cbd10 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,7 +134,7 @@ namespace dbmm bool bMigrationFailure; bool bMigrationSuccess; - MacroMigrationDialog_Data( + MacroMigrationDialog_Data( const ::comphelper::ComponentContext& _rContext, const Reference< XOfficeDatabaseDocument >& _rxDocument ) :aContext( _rContext ) diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index a4a6852909d0..156f52c1e80c 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ namespace dbmm // Dialog overridables virtual BOOL Close(); - virtual short Execute(); + virtual short Execute(); private: void impl_showCloseDocsError( bool _bShow ); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 54051841b9f5..cd4608b74ad5 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -336,7 +336,7 @@ namespace dbmm m_aChangesLabel.SetText( _bSuccessful ? m_aSuccessful : m_aUnsuccessful ); m_aChanges.SetText( _rSummary ); - // resize m_aChangesLabel and m_aChances as needed for the label text to fit + // resize m_aChangesLabel and m_aChances as needed for the label text to fit Rectangle aOriginalLabelSize( m_aChangesLabel.GetPosPixel(), m_aChangesLabel.GetSizePixel() ); // assume 3 lines, at most Rectangle aNewLabelSize( aOriginalLabelSize ); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index 93cfd04bf864..5b23e81059a3 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ namespace dbmm protected: FixedText m_aExplanation; FixedText m_aSaveAsLabel; - ::svt::OFileURLControl m_aSaveAsLocation; + ::svt::OFileURLControl m_aSaveAsLocation; PushButton m_aBrowseSaveAsLocation; FixedText m_aStartMigration; ::svx::DatabaseLocationInputController diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 9a03a8e4f63e..75dcfcadcad5 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,7 +108,7 @@ namespace dbmm ~MacroMigrationDialogService(); protected: - virtual Dialog* createDialog( Window* _pParent ); + virtual Dialog* createDialog( Window* _pParent ); virtual void destroyDialog(); private: @@ -147,7 +147,7 @@ namespace dbmm } //-------------------------------------------------------------------- - Dialog* MacroMigrationDialogService::createDialog( Window* _pParent ) + Dialog* MacroMigrationDialogService::createDialog( Window* _pParent ) { return new MacroMigrationDialog( _pParent, m_aContext, m_xDocument ); } diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index ec884adb3474..c3543358cacf 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1133,7 +1133,7 @@ namespace dbmm bool MigrationEngine_Impl::impl_handleDocument_nothrow( const SubDocument& _rDocument ) const { OSL_ENSURE( m_nCurrentDocumentID == -1, - "MigrationEngine_Impl::impl_handleDocument_nothrow: there already is a current document!"); + "MigrationEngine_Impl::impl_handleDocument_nothrow: there already is a current document!"); m_nCurrentDocumentID = m_rLogger.startedDocument( _rDocument.eType, _rDocument.sHierarchicalName ); // start the progress diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx index 8cecd2faac2b..986bba551f39 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.hxx +++ b/dbaccess/source/ext/macromigration/migrationengine.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx index aee93d10bdc6..d76a0b1bc36c 100644 --- a/dbaccess/source/ext/macromigration/migrationerror.hxx +++ b/dbaccess/source/ext/macromigration/migrationerror.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index d5b391532863..c9e917dbf79a 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx index 554b95763e95..1bcd0411c128 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.hxx +++ b/dbaccess/source/ext/macromigration/migrationlog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx index 9c1598a43855..44dbaf838e2c 100644 --- a/dbaccess/source/ext/macromigration/migrationprogress.hxx +++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx index a151edee2a58..f0580ed613d1 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.cxx +++ b/dbaccess/source/ext/macromigration/progresscapture.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,7 @@ namespace dbmm if ( !m_pData->bDisposed ) m_pData->rMasterProgress.startObject( m_pData->sObjectName, _rText, _nRange ); } - + //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::end( ) throw (RuntimeException) { @@ -108,7 +108,7 @@ namespace dbmm if ( !m_pData->bDisposed ) m_pData->rMasterProgress.endObject(); } - + //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::setText( const ::rtl::OUString& _rText ) throw (RuntimeException) { @@ -116,7 +116,7 @@ namespace dbmm if ( !m_pData->bDisposed ) m_pData->rMasterProgress.setObjectProgressText( _rText ); } - + //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::setValue( ::sal_Int32 _nValue ) throw (RuntimeException) { @@ -124,7 +124,7 @@ namespace dbmm if ( !m_pData->bDisposed ) m_pData->rMasterProgress.setObjectProgressValue( _nValue ); } - + //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::reset( ) throw (RuntimeException) { diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx index eb507e6d63c1..720c76a74c55 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.hxx +++ b/dbaccess/source/ext/macromigration/progresscapture.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index bed5f7f33b8f..a461eedae571 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.cxx +++ b/dbaccess/source/ext/macromigration/progressmixer.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx index dd52a72d134d..50506f931737 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.hxx +++ b/dbaccess/source/ext/macromigration/progressmixer.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx index 6ecaabac6981..cbf432500262 100644 --- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx +++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx index a6eb5b7b073b..75b23ccac7d7 100644 --- a/dbaccess/source/filter/migration/cfgimport.cxx +++ b/dbaccess/source/filter/migration/cfgimport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,21 +78,21 @@ extern "C" void SAL_CALL createRegistryInfo_OCfgImport( ) static ::dbacfg::OMultiInstanceAutoRegistration< ::dbacfg::OCfgImport > aAutoRegistration; } -#define DATASOURCES 1 -#define DATASOURCE 2 -#define DATASOURCESETTINGS 3 -#define TABLES 4 -#define QUERIES 5 -#define BOOKMARKS 6 -#define DATASOURCESETTING 7 -#define BOOKMARK 8 -#define QUERY 9 -#define TABLE 10 -#define DATASETTINGS 11 -#define COLUMNS 12 -#define COLUMN 13 -#define NO_PROP 14 -#define LOGINTIMEOUT 15 +#define DATASOURCES 1 +#define DATASOURCE 2 +#define DATASOURCESETTINGS 3 +#define TABLES 4 +#define QUERIES 5 +#define BOOKMARKS 6 +#define DATASOURCESETTING 7 +#define BOOKMARK 8 +#define QUERY 9 +#define TABLE 10 +#define DATASETTINGS 11 +#define COLUMNS 12 +#define COLUMN 13 +#define NO_PROP 14 +#define LOGINTIMEOUT 15 //-------------------------------------------------------------------------- using namespace dbacfg; @@ -297,20 +297,20 @@ void LoadTableFields(const Reference< XObjectInputStream>& _rxIn,Sequence<Proper // ----------------------------------------------------------------------------- void LoadTableFieldDesc(const Reference< XObjectInputStream>& _rxIn,PropertyValue& _rProperty) { - ::rtl::OUString aTableName; - ::rtl::OUString aAliasName; // table range - ::rtl::OUString aFieldName; // column - ::rtl::OUString aFieldAlias; // column alias - ::rtl::OUString aDatabaseName; // qualifier or catalog - ::rtl::OUString aFunctionName; // enth"alt den Funktionsnamen, nur wenn eFunctionType != FKT_NONE gesetzt - - sal_Int32 eDataType; - sal_Int32 eFunctionType; - sal_Int32 eFieldType; - sal_Int32 eOrderDir; - sal_Int32 nColWidth; - sal_Bool bGroupBy; - sal_Bool bVisible; + ::rtl::OUString aTableName; + ::rtl::OUString aAliasName; // table range + ::rtl::OUString aFieldName; // column + ::rtl::OUString aFieldAlias; // column alias + ::rtl::OUString aDatabaseName; // qualifier or catalog + ::rtl::OUString aFunctionName; // enth"alt den Funktionsnamen, nur wenn eFunctionType != FKT_NONE gesetzt + + sal_Int32 eDataType; + sal_Int32 eFunctionType; + sal_Int32 eFieldType; + sal_Int32 eOrderDir; + sal_Int32 nColWidth; + sal_Bool bGroupBy; + sal_Bool bVisible; OStreamSection aSection(_rxIn.get()); _rxIn >> aTableName; @@ -403,7 +403,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const : // get TypeName ::rtl::OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aMedDescr, sal_True ); const PropertyValue* pIter = aMedDescr.getConstArray(); - const PropertyValue* pEnd = pIter + aMedDescr.getLength(); + const PropertyValue* pEnd = pIter + aMedDescr.getLength(); for( ; pIter != pEnd && !pIter->Name.equalsAscii( "FilterName" ); ++pIter) ; if ( aTypeName.getLength() && pIter == pEnd ) @@ -461,7 +461,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const : Reference< XNameContainer> xControls(xForms->getByName(*elementNames),UNO_QUERY); Sequence< ::rtl::OUString> aControlSeq = xControls.is() ? xControls->getElementNames() : Sequence< ::rtl::OUString>(); const ::rtl::OUString* pControlIter = aControlSeq.getConstArray(); - const ::rtl::OUString* pControlEnd = pControlIter + aControlSeq.getLength(); + const ::rtl::OUString* pControlEnd = pControlIter + aControlSeq.getLength(); for(;pControlIter != pControlEnd && !bForm;++pControlIter) { Reference<XPropertySet> xProp(xControls->getByName(*pControlIter),UNO_QUERY); @@ -575,7 +575,7 @@ void OCfgImport::setProperties(sal_Int16 _eType) OSL_ENSURE(m_aProperties[_eType].getLength() == m_aValues[_eType].getLength(),"Count is not equal!"); try { - Reference< XMultiPropertySet > xFormMultiSet; + Reference< XMultiPropertySet > xFormMultiSet; if ( _eType == COLUMN ) xFormMultiSet.set(m_xCurrentColumn,UNO_QUERY); else if ( _eType == TABLE || _eType == QUERY ) @@ -961,7 +961,7 @@ void SAL_CALL OCfgImport::overrideProperty( { m_bPropertyMayBeVoid = sal_False; ::rtl::OUString sProp; - if ( aName == CONFIGKEY_DEFSET_FILTER ) sProp = PROPERTY_FILTER; + if ( aName == CONFIGKEY_DEFSET_FILTER ) sProp = PROPERTY_FILTER; else if ( aName == CONFIGKEY_DEFSET_FONT_NAME ) sProp = PROPERTY_FONTNAME; else if ( aName == CONFIGKEY_DEFSET_ORDER ) sProp = PROPERTY_ORDER; else if ( aName == CONFIGKEY_DEFSET_APPLYFILTER ) sProp = PROPERTY_APPLYFILTER; @@ -1110,7 +1110,7 @@ void SAL_CALL OCfgImport::setPropertyValue( Sequence< PropertyValue > aLayout; if ( aInputSequence.getLength() ) { - Reference< XInputStream> xInStreamHelper = new SequenceInputStream(aInputSequence);; // used for wrapping sequence to xinput + Reference< XInputStream> xInStreamHelper = new SequenceInputStream(aInputSequence);; // used for wrapping sequence to xinput Reference< XObjectInputStream> xInStream = Reference< XObjectInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.ObjectInputStream")),UNO_QUERY); Reference< XInputStream> xMarkInStream = Reference< XInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.MarkableInputStream")),UNO_QUERY); Reference< XActiveDataSink >(xMarkInStream,UNO_QUERY)->setInputStream(xInStreamHelper); diff --git a/dbaccess/source/filter/migration/cfgimport.hxx b/dbaccess/source/filter/migration/cfgimport.hxx index fcccadae42b0..dc558731e0e3 100644 --- a/dbaccess/source/filter/migration/cfgimport.hxx +++ b/dbaccess/source/filter/migration/cfgimport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,37 +52,37 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; -typedef ::cppu::WeakImplHelper4 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::task::XJob - , ::com::sun::star::configuration::backend::XLayerHandler - > OCfgImport_COMPBASE; +typedef ::cppu::WeakImplHelper4 < ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::lang::XInitialization + , ::com::sun::star::task::XJob + , ::com::sun::star::configuration::backend::XLayerHandler + > OCfgImport_COMPBASE; // ------------- // - OCfgImport - // ------------- class OCfgImport : public OCfgImport_COMPBASE { private: - typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; - typedef ::std::stack< TElementType > TElementStack; - typedef ::std::vector< PropertyValue > TDataSourceSettings; - - Reference< XMultiServiceFactory > m_xORB; - Reference< XMultiServiceFactory > m_xOldORB; - Reference< ::com::sun::star::configuration::backend::XLayer> m_xLayer; - Reference<XPropertySet> m_xCurrentDS; - Reference<XModel> m_xModel; - Reference<XPropertySet> m_xCurrentObject; /// can either be a query or a table - Reference<XPropertySet> m_xCurrentColumn; - ::std::map< sal_Int16 ,Sequence< ::rtl::OUString> > m_aProperties; + typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; + typedef ::std::stack< TElementType > TElementStack; + typedef ::std::vector< PropertyValue > TDataSourceSettings; + + Reference< XMultiServiceFactory > m_xORB; + Reference< XMultiServiceFactory > m_xOldORB; + Reference< ::com::sun::star::configuration::backend::XLayer> m_xLayer; + Reference<XPropertySet> m_xCurrentDS; + Reference<XModel> m_xModel; + Reference<XPropertySet> m_xCurrentObject; /// can either be a query or a table + Reference<XPropertySet> m_xCurrentColumn; + ::std::map< sal_Int16 ,Sequence< ::rtl::OUString> > m_aProperties; ::std::map< sal_Int16 ,Sequence< Any> > m_aValues; - ::rtl::OUString m_sCurrentDataSourceName; - ::rtl::OUString m_sBookmarkName; - ::rtl::OUString m_sDocumentLocation; + ::rtl::OUString m_sCurrentDataSourceName; + ::rtl::OUString m_sBookmarkName; + ::rtl::OUString m_sDocumentLocation; - TElementStack m_aStack; - TDataSourceSettings m_aDataSourceSettings; - sal_Bool m_bPropertyMayBeVoid; + TElementStack m_aStack; + TDataSourceSettings m_aDataSourceSettings; + sal_Bool m_bPropertyMayBeVoid; /** convert the old configuration settings into new database documents. */ @@ -92,9 +92,9 @@ private: void setProperties(sal_Int16 _eType); protected: - virtual ~OCfgImport() throw(); + virtual ~OCfgImport() throw(); public: - + OCfgImport( const Reference< XMultiServiceFactory >& _rxMSF ); @@ -109,88 +109,88 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLayerHandler - virtual void SAL_CALL startLayer() + virtual void SAL_CALL startLayer() throw(::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL endLayer() - throw( + virtual void SAL_CALL endLayer() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL overrideNode( - const rtl::OUString& aName, - sal_Int16 aAttributes, + virtual void SAL_CALL overrideNode( + const rtl::OUString& aName, + sal_Int16 aAttributes, sal_Bool bClear) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addOrReplaceNode( - const rtl::OUString& aName, - sal_Int16 aAttributes) - throw( + const rtl::OUString& aName, + sal_Int16 aAttributes) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addOrReplaceNodeFromTemplate( + virtual void SAL_CALL addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) + sal_Int16 aAttributes ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endNode() - throw( + virtual void SAL_CALL endNode() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL dropNode( - const rtl::OUString& aName ) - throw( + virtual void SAL_CALL dropNode( + const rtl::OUString& aName ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL overrideProperty( + virtual void SAL_CALL overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const Type& aType, - sal_Bool bClear ) - throw( + sal_Bool bClear ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValue( - const Any& aValue ) - throw( + virtual void SAL_CALL setPropertyValue( + const Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValueForLocale( + virtual void SAL_CALL setPropertyValueForLocale( const Any& aValue, - const rtl::OUString& aLocale ) - throw( + const rtl::OUString& aLocale ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endProperty() - throw( + virtual void SAL_CALL endProperty() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addProperty( + virtual void SAL_CALL addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const Type& aType ) - throw( + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addPropertyWithValue( + virtual void SAL_CALL addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, - const Any& aValue ) - throw( + const Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); }; diff --git a/dbaccess/source/filter/migration/cfgservices.cxx b/dbaccess/source/filter/migration/cfgservices.cxx index a5c256488ebc..a2591ff70040 100644 --- a/dbaccess/source/filter/migration/cfgservices.cxx +++ b/dbaccess/source/filter/migration/cfgservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ extern "C" void SAL_CALL createRegistryInfo_dbacfg() //--------------------------------------------------------------------------------------- extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_dbacfg(); @@ -74,8 +74,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { return ::dbacfg::OModuleRegistration::writeComponentInfos( static_cast<XMultiServiceFactory*>(pServiceManager), diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 715e58000ec2..c293c8405751 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,12 +115,12 @@ public: DBTypeDetection(const Reference< XMultiServiceFactory >&); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + ::rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods - static ::rtl::OUString getImplementationName_Static() throw( ) + static ::rtl::OUString getImplementationName_Static() throw( ) { return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBTypeDetection"); } @@ -213,8 +213,8 @@ Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMult sal_Bool SAL_CALL DBTypeDetection::supportsService(const ::rtl::OUString& ServiceName) throw( ) { Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pBegin = aSNL.getConstArray(); - const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); + const ::rtl::OUString * pBegin = aSNL.getConstArray(); + const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); for( ; pBegin != pEnd; ++pBegin) if( *pBegin == ServiceName ) return sal_True; @@ -245,9 +245,9 @@ class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader, XServiceIn { private: ::comphelper::ComponentContext m_aContext; - Reference< XFrameLoader > m_xMySelf; - ::rtl::OUString m_sCurrentURL; - ULONG m_nStartWizard; + Reference< XFrameLoader > m_xMySelf; + ::rtl::OUString m_sCurrentURL; + ULONG m_nStartWizard; DECL_LINK( OnStartTableWizard, void* ); public: @@ -255,12 +255,12 @@ public: ~DBContentLoader(); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + ::rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods - static ::rtl::OUString getImplementationName_Static() throw( ) + static ::rtl::OUString getImplementationName_Static() throw( ) { return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBContentLoader2"); } @@ -269,7 +269,7 @@ public: SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); // XLoader - virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL, + virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArgs, const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancel(void) throw(); @@ -312,8 +312,8 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult sal_Bool SAL_CALL DBContentLoader::supportsService(const ::rtl::OUString& ServiceName) throw( ) { Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pBegin = aSNL.getConstArray(); - const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); + const ::rtl::OUString * pBegin = aSNL.getConstArray(); + const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); for( ; pBegin != pEnd; ++pBegin) if( *pBegin == ServiceName ) return sal_True; diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index a84b69dfa43b..50c72a14e3c7 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( ::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin(); ::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end(); for ( ; i != aEnd ; ++i ) - { + { sal_Int16 nContextID = aPropMapper->GetEntryContextId(i->mnIndex); switch (nContextID) { @@ -73,7 +73,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( } } break; - } + } } } } diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx index 6d3da1fa34aa..5d7083794f74 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef DBA_XMLAUTOSTYLE_HXX +#ifndef DBA_XMLAUTOSTYLE_HXX #define DBA_XMLAUTOSTYLE_HXX #include <xmloff/maptype.hxx> #include <xmloff/xmlaustp.hxx> diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index ba826ebdc721..068538c55f4f 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -135,7 +135,7 @@ void OXMLColumn::EndElement() if ( m_aDefaultValue.hasValue() ) xProp->setPropertyValue(PROPERTY_CONTROLDEFAULT,m_aDefaultValue); - + Reference<XAppend> xAppend(m_xParentContainer,UNO_QUERY); if ( xAppend.is() ) xAppend->appendByDescriptor(xProp); @@ -167,7 +167,7 @@ void OXMLColumn::EndElement() } } } - + } } // if ( xFac.is() && m_sName.getLength() ) else if ( m_sCellStyleName.getLength() ) diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx index e417e0398825..583a0a7272b9 100644 --- a/dbaccess/source/filter/xml/xmlColumn.hxx +++ b/dbaccess/source/filter/xml/xmlColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace dbaxml ::rtl::OUString m_sCellStyleName; ::rtl::OUString m_sHelpMessage; ::com::sun::star::uno::Any m_aDefaultValue; - sal_Bool m_bHidden; + sal_Bool m_bHidden; ODBFilter& GetOwnImport(); public: diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index 2af3b4d9c102..f2cbf64875ee 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 1d950173b1b4..0aa1fde81fc9 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace dbaxml ::rtl::OUString m_sName; ::rtl::OUString m_sHREF; ::rtl::OUString m_sComponentServiceName; - sal_Bool m_bAsTemplate; + sal_Bool m_bAsTemplate; ODBFilter& GetOwnImport(); public: diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index 25ec65a48c7b..96b1db0595d4 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ SvXMLImportContext* OXMLConnectionData::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 2cf32047c99c..0dd3bd493634 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx index 5b0b6aeee3de..fad4a022760c 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index ea6be03655fb..ecae54328735 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index b2e87883a62b..cf6dcba35d7a 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -225,7 +225,7 @@ SvXMLImportContext* OXMLDataSource::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); const sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); switch( nToken ) diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index 87038f05ef30..1f95f9c14090 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index 5aac0f307824..150ee8142fcd 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,7 +138,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport aProperty.Name = INFO_CHARSET; aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("utf8")); rImport.addInfo(aProperty); - } + } } } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index 89f9dde6a242..56274429a590 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index 8e5f2652244f..cae75bf87158 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ DBG_NAME(OXMLDataSourceSetting) OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XAttributeList > & _xAttrList ,OXMLDataSourceSetting* _pContainer) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_pContainer(_pContainer) @@ -82,13 +82,13 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport static MapString2Type s_aTypeNameMap; if (!s_aTypeNameMap.size()) { - s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); - s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); + s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); + s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); } const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue); @@ -102,7 +102,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport break; } } - + } // ----------------------------------------------------------------------------- @@ -117,7 +117,7 @@ SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -167,7 +167,7 @@ void OXMLDataSourceSetting::addValue(const ::rtl::OUString& _sValue) if ( !m_bIsList ) m_aSetting.Value = aValue; - else + else { sal_Int32 nPos = m_aInfoSequence.getLength(); m_aInfoSequence.realloc(nPos+1); @@ -186,7 +186,7 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx Any aReturn; switch (_rExpectedType.getTypeClass()) { - case TypeClass_BOOLEAN: // sal_Bool + case TypeClass_BOOLEAN: // sal_Bool { bool bValue; #if OSL_DEBUG_LEVEL > 0 @@ -195,14 +195,14 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a boolean!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a boolean!")); aReturn <<= bValue; } break; - case TypeClass_SHORT: // sal_Int16 - case TypeClass_LONG: // sal_Int32 - { // it's a real int32/16 property + case TypeClass_SHORT: // sal_Int16 + case TypeClass_LONG: // sal_Int32 + { // it's a real int32/16 property sal_Int32 nValue(0); #if OSL_DEBUG_LEVEL > 0 sal_Bool bSuccess = @@ -210,8 +210,8 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into an integer!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into an integer!")); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; else @@ -232,8 +232,8 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a double!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a double!")); aReturn <<= (double)nValue; } break; diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index 4740a7834306..ccea90fe1a8a 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 dbaxml ::com::sun::star::beans::PropertyValue m_aSetting; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aInfoSequence; OXMLDataSourceSetting* m_pContainer; - ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently + ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently sal_Bool m_bIsList; ODBFilter& GetOwnImport(); @@ -64,7 +64,7 @@ namespace dbaxml /** adds value to property - @param _sValue + @param _sValue The value to add. */ void addValue(const ::rtl::OUString& _sValue); diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index 284971fd8a07..93547a4d3bcf 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx index 67d3f02e432d..9d14fc40ced6 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index 6bb928b2b541..8628ae065852 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx index ed70500fdca3..588ef668f985 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlDatabase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 73faf3a5a64a..b01f7b496039 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseDescriptionElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseDescriptionElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index 6a056412e57a..1f3224683cac 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 99e981a581d7..4a16889a1ac1 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -105,7 +105,7 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext( GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName ); break; - // case XML_TOK_QUERY_COLLECTION: + // case XML_TOK_QUERY_COLLECTION: case XML_TOK_COMPONENT_COLLECTION: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName ); diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 1a84dfa4c94e..98f415360829 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 dbaxml { private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + ::rtl::OUString m_sCollectionServiceName; + ::rtl::OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx index 2248050d09b3..c43ab6b0099d 100644 --- a/dbaccess/source/filter/xml/xmlEnums.hxx +++ b/dbaccess/source/filter/xml/xmlEnums.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,21 +51,21 @@ namespace dbaxml }; enum XMLDataSource { - XML_TOK_CONNECTION_RESOURCE, - XML_TOK_SUPPRESS_VERSION_COLUMNS, - XML_TOK_JAVA_DRIVER_CLASS, - XML_TOK_EXTENSION, - XML_TOK_IS_FIRST_ROW_HEADER_LINE, - XML_TOK_SHOW_DELETED, - XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED, - XML_TOK_SYSTEM_DRIVER_SETTINGS, - XML_TOK_ENABLE_SQL92_CHECK, - XML_TOK_APPEND_TABLE_ALIAS_NAME, - XML_TOK_PARAMETER_NAME_SUBSTITUTION, - XML_TOK_IGNORE_DRIVER_PRIVILEGES, - XML_TOK_BOOLEAN_COMPARISON_MODE, - XML_TOK_USE_CATALOG, - XML_TOK_BASE_DN, + XML_TOK_CONNECTION_RESOURCE, + XML_TOK_SUPPRESS_VERSION_COLUMNS, + XML_TOK_JAVA_DRIVER_CLASS, + XML_TOK_EXTENSION, + XML_TOK_IS_FIRST_ROW_HEADER_LINE, + XML_TOK_SHOW_DELETED, + XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED, + XML_TOK_SYSTEM_DRIVER_SETTINGS, + XML_TOK_ENABLE_SQL92_CHECK, + XML_TOK_APPEND_TABLE_ALIAS_NAME, + XML_TOK_PARAMETER_NAME_SUBSTITUTION, + XML_TOK_IGNORE_DRIVER_PRIVILEGES, + XML_TOK_BOOLEAN_COMPARISON_MODE, + XML_TOK_USE_CATALOG, + XML_TOK_BASE_DN, XML_TOK_MAX_ROW_COUNT, XML_TOK_LOGIN, XML_TOK_TABLE_FILTER, @@ -127,12 +127,12 @@ namespace dbaxml }; enum XMLComponent { - XML_TOK_HREF , - XML_TOK_TYPE , - XML_TOK_SHOW , + XML_TOK_HREF , + XML_TOK_TYPE , + XML_TOK_SHOW , XML_TOK_ACTUATE , XML_TOK_AS_TEMPLATE , - XML_TOK_COMPONENT_NAME + XML_TOK_COMPONENT_NAME }; enum XMLType { diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 40e2341cdecc..b299a6a5d578 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,12 +152,12 @@ namespace dbaxml { // possible types we can write (either because we recognize them directly or because we convert _rValue // into one of these types) - static const ::rtl::OUString s_sTypeBoolean (RTL_CONSTASCII_USTRINGPARAM("boolean")); - static const ::rtl::OUString s_sTypeShort (RTL_CONSTASCII_USTRINGPARAM("short")); - static const ::rtl::OUString s_sTypeInteger (RTL_CONSTASCII_USTRINGPARAM("int")); - static const ::rtl::OUString s_sTypeLong (RTL_CONSTASCII_USTRINGPARAM("long")); - static const ::rtl::OUString s_sTypeDouble (RTL_CONSTASCII_USTRINGPARAM("double")); - static const ::rtl::OUString s_sTypeString (RTL_CONSTASCII_USTRINGPARAM("string")); + static const ::rtl::OUString s_sTypeBoolean (RTL_CONSTASCII_USTRINGPARAM("boolean")); + static const ::rtl::OUString s_sTypeShort (RTL_CONSTASCII_USTRINGPARAM("short")); + static const ::rtl::OUString s_sTypeInteger (RTL_CONSTASCII_USTRINGPARAM("int")); + static const ::rtl::OUString s_sTypeLong (RTL_CONSTASCII_USTRINGPARAM("long")); + static const ::rtl::OUString s_sTypeDouble (RTL_CONSTASCII_USTRINGPARAM("double")); + static const ::rtl::OUString s_sTypeString (RTL_CONSTASCII_USTRINGPARAM("string")); // handle the type description switch (_rType.getTypeClass()) @@ -804,7 +804,7 @@ void ODBExport::exportSequence(const Sequence< ::rtl::OUString>& _aValue SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, _eTokenFilter, sal_True, sal_True); const ::rtl::OUString* pIter = _aValue.getConstArray(); - const ::rtl::OUString* pEnd = pIter + _aValue.getLength(); + const ::rtl::OUString* pEnd = pIter + _aValue.getLength(); for(;pIter != pEnd;++pIter) { SvXMLElementExport aDataSource(*this,XML_NAMESPACE_DB, _eTokenType, sal_True, sal_False); @@ -845,7 +845,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, sal_True, sal_True)); Sequence< ::rtl::OUString> aSeq = _xCollection->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xProp(_xCollection->getByName(*pIter),UNO_QUERY); @@ -1011,7 +1011,7 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup) SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, sal_True, sal_True); Sequence< ::rtl::OUString> aSeq = xNameAccess->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for( ; pIter != pEnd ; ++pIter) { Reference<XPropertySet> xProp(xNameAccess->getByName(*pIter),UNO_QUERY); @@ -1118,7 +1118,7 @@ void ODBExport::exportQueries(sal_Bool _bExportContext) Reference< XNameAccess > xCollection = xSup->getQueryDefinitions(); if ( xCollection.is() && xCollection->hasElements() ) { - ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc; + ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc; if ( _bExportContext ) pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportQuery) ); else @@ -1314,7 +1314,7 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps) aProps[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Queries")); Sequence< ::rtl::OUString> aSeq = xCollection->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); Sequence<PropertyValue> aQueries(aSeq.getLength()); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) @@ -1368,7 +1368,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps) switch (_rValue.getValueTypeClass()) { case TypeClass_STRING: - { // extract the string + { // extract the string ::rtl::OUString sCurrentValue; _rValue >>= sCurrentValue; aBuffer.append(sCurrentValue); @@ -1438,7 +1438,7 @@ void SAL_CALL ODBExport::setSourceDocument( const Reference< XComponent >& xDoc // ----------------------------------------------------------------------------- void ODBExport::_ExportFontDecls() { - GetFontAutoStylePool(); // make sure the pool is created + GetFontAutoStylePool(); // make sure the pool is created collectComponentStyles(); SvXMLExport::_ExportFontDecls(); } diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 7e957cf554a0..279ebc345655 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,86 +103,86 @@ class ODBExport : public SvXMLExport } }; - ::std::auto_ptr< TStringPair > m_aAutoIncrement; - ::std::auto_ptr< TDelimiter > m_aDelimiter; + ::std::auto_ptr< TStringPair > m_aAutoIncrement; + ::std::auto_ptr< TDelimiter > m_aDelimiter; ::std::vector< TypedPropertyValue > m_aDataSourceSettings; ::std::vector< XMLPropertyState > m_aCurrentPropertyStates; - TPropertyStyleMap m_aAutoStyleNames; - TPropertyStyleMap m_aCellAutoStyleNames; - TPropertyStyleMap m_aRowAutoStyleNames; + TPropertyStyleMap m_aAutoStyleNames; + TPropertyStyleMap m_aCellAutoStyleNames; + TPropertyStyleMap m_aRowAutoStyleNames; TTableColumnMap m_aTableDummyColumns; - ::rtl::OUString m_sCharSet; - UniReference < SvXMLExportPropertyMapper> m_xExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xColumnExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xCellExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xRowExportHelper; - - mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; - - Reference<XPropertySet> m_xDataSource; + ::rtl::OUString m_sCharSet; + UniReference < SvXMLExportPropertyMapper> m_xExportHelper; + UniReference < SvXMLExportPropertyMapper> m_xColumnExportHelper; + UniReference < SvXMLExportPropertyMapper> m_xCellExportHelper; + UniReference < SvXMLExportPropertyMapper> m_xRowExportHelper; + + mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; + + Reference<XPropertySet> m_xDataSource; ::dbaccess::ODsnTypeCollection m_aTypeCollection; sal_Bool m_bAllreadyFilled; - void exportDataSource(); + void exportDataSource(); void exportConnectionData(); void exportDriverSettings(const TSettingsMap& _aSettings); void exportApplicationConnectionSettings(const TSettingsMap& _aSettings); - void exportLogin(); - void exportSequence(const Sequence< ::rtl::OUString>& _aValue + void exportLogin(); + void exportSequence(const Sequence< ::rtl::OUString>& _aValue ,::xmloff::token::XMLTokenEnum _eTokenFilter ,::xmloff::token::XMLTokenEnum _eTokenType); - void exportDelimiter(); - void exportAutoIncrement(); - void exportCharSet(); - void exportDataSourceSettings(); - void exportForms(); - void exportReports(); - void exportQueries(sal_Bool _bExportContext); - void exportTables(sal_Bool _bExportContext); - void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt); + void exportDelimiter(); + void exportAutoIncrement(); + void exportCharSet(); + void exportDataSourceSettings(); + void exportForms(); + void exportReports(); + void exportQueries(sal_Bool _bExportContext); + void exportTables(sal_Bool _bExportContext); + void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt); void exportStyleName(const ::xmloff::token::XMLTokenEnum _eToken,const Reference<XPropertySet>& _xProp,SvXMLAttributeList& _rAtt,TPropertyStyleMap& _rMap); - void exportCollection(const Reference< XNameAccess >& _xCollection + void exportCollection(const Reference< XNameAccess >& _xCollection ,enum ::xmloff::token::XMLTokenEnum _eComponents ,enum ::xmloff::token::XMLTokenEnum _eSubComponents ,sal_Bool _bExportContext ,const ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >& _aMemFunc ); - void exportComponent(XPropertySet* _xProp); - void exportQuery(XPropertySet* _xProp); - void exportTable(XPropertySet* _xProp); - void exportFilter(XPropertySet* _xProp + void exportComponent(XPropertySet* _xProp); + void exportQuery(XPropertySet* _xProp); + void exportTable(XPropertySet* _xProp); + void exportFilter(XPropertySet* _xProp ,const ::rtl::OUString& _sProp ,enum ::xmloff::token::XMLTokenEnum _eStatementType); - void exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate); - void exportAutoStyle(XPropertySet* _xProp); - void exportColumns(const Reference<XColumnsSupplier>& _xColSup); + void exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate); + void exportAutoStyle(XPropertySet* _xProp); + void exportColumns(const Reference<XColumnsSupplier>& _xColSup); void collectComponentStyles(); - ::rtl::OUString implConvertAny(const Any& _rValue); + ::rtl::OUString implConvertAny(const Any& _rValue); UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; - + private: ODBExport(); protected: - virtual void _ExportStyles( BOOL bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportContent(); - virtual void _ExportMasterStyles(); - virtual void _ExportFontDecls(); - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); - virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); + virtual void _ExportStyles( BOOL bUsed ); + virtual void _ExportAutoStyles(); + virtual void _ExportContent(); + virtual void _ExportMasterStyles(); + virtual void _ExportFontDecls(); + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); + virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); - - virtual ~ODBExport(){}; -public: - + + virtual ~ODBExport(){}; +public: + ODBExport(const Reference< XMultiServiceFactory >& _rxMSF, sal_uInt16 nExportFlag = EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_PRETTY | EXPORT_FONTDECLS | EXPORT_SCRIPTS ); // XServiceInfo DECLARE_SERVICE_INFO_STATIC( ); diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index c4a9893f8493..605b0cbea13c 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index 9f58f4b0f03f..fc5767cff989 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index 99807b88a5b6..b5fa3c951224 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 { static SvXMLEnumMapEntry aDisplayMap[] = { - { XML_VISIBLE, sal_True }, - { XML_COLLAPSE, sal_False }, + { XML_VISIBLE, sal_True }, + { XML_COLLAPSE, sal_False }, { XML_TOKEN_INVALID, 0 } }; m_pDisplayHandler.reset(new XMLConstantsPropertyHandler(aDisplayMap, XML_TOKEN_INVALID )); @@ -83,42 +83,42 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 return pHandler; } // ----------------------------------------------------------------------------- -#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFVER_010} // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMapper() { static const XMLPropertyMapEntry s_aTableStylesProperties[] = { - //MAP_CONST( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ), - //MAP_CONST( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ), - //MAP_CONST( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), + //MAP_CONST( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ), + //MAP_CONST( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ), + //MAP_CONST( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - //MAP_CONST( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ), - //MAP_CONST( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), - //MAP_CONST( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), - //MAP_CONST( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), - //MAP_CONST( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ), - //MAP_CONST( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ), - //MAP_CONST( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ), + //MAP_CONST( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ), + //MAP_CONST( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), + //MAP_CONST( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), + //MAP_CONST( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), + //MAP_CONST( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ), + //MAP_CONST( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ), + //MAP_CONST( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ), // - //MAP_CONST( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ), - //MAP_CONST( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ), - //MAP_CONST( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ), - //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ), - //MAP_CONST( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ), - //MAP_CONST( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ), - //MAP_CONST( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE, 0 ), + //MAP_CONST( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ), + //MAP_CONST( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ), + //MAP_CONST( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ), + //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0), + //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0), + //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0), + //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0), + //MAP_CONST( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ), + //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ), + //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ), + //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ), + //MAP_CONST_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), + //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + //MAP_CONST( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ), + //MAP_CONST( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ), + //MAP_CONST( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE, 0 ), MAP_END() }; UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); @@ -127,12 +127,12 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMappe // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapper() { -#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010 } static const XMLPropertyMapEntry s_aColumnStylesProperties[] = { - MAP_CONST_COLUMN( PROPERTY_WIDTH, XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0), - MAP_CONST_COLUMN( PROPERTY_HIDDEN, XML_NAMESPACE_TABLE, XML_DISPLAY, XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_DB_ISVISIBLE ), - MAP_CONST_COLUMN( PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM, CTF_DB_NUMBERFORMAT), + MAP_CONST_COLUMN( PROPERTY_WIDTH, XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0), + MAP_CONST_COLUMN( PROPERTY_HIDDEN, XML_NAMESPACE_TABLE, XML_DISPLAY, XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_DB_ISVISIBLE ), + MAP_CONST_COLUMN( PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM, CTF_DB_NUMBERFORMAT), MAP_END() }; UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory(); @@ -141,40 +141,40 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapp // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper() { -#define MAP_CONST_CELL( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_TEXT_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_CELL( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_TEXT_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } static const XMLPropertyMapEntry s_aCellStylesProperties[] = { - MAP_CONST_CELL( PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN), - MAP_CONST_TEXT( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ), - MAP_CONST_TEXT( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ), - MAP_CONST_TEXT( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - - MAP_CONST_TEXT( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ), - MAP_CONST_TEXT( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ), + MAP_CONST_CELL( PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN), + MAP_CONST_TEXT( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ), + MAP_CONST_TEXT( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ), + MAP_CONST_TEXT( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ), - MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0), - MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0), - MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0), - MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0), - MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ), + MAP_CONST_TEXT( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_TEXT( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ), + + MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ), + MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0), + MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0), + MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0), + MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0), + MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ), MAP_END() }; UniReference < XMLPropertyHandlerFactory> xFac = new /*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory(); @@ -183,10 +183,10 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper() { -#define MAP_CONST_ROW( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_ROW( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010 } static const XMLPropertyMapEntry s_aStylesProperties[] = { - MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0), + MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0), MAP_END() }; UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory(); diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index fcc9ca8af74e..50c9d71682f4 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,21 +34,21 @@ #include <memory> -#define CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1) -#define CTF_DB_ISVISIBLE (XML_DB_CTF_START + 2) -#define CTF_DB_MASTERPAGENAME (XML_DB_CTF_START + 3) -#define CTF_DB_NUMBERFORMAT (XML_DB_CTF_START + 4) -#define CTF_DB_COLUMN_TEXT_ALIGN (XML_DB_CTF_START + 5) +#define CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1) +#define CTF_DB_ISVISIBLE (XML_DB_CTF_START + 2) +#define CTF_DB_MASTERPAGENAME (XML_DB_CTF_START + 3) +#define CTF_DB_NUMBERFORMAT (XML_DB_CTF_START + 4) +#define CTF_DB_COLUMN_TEXT_ALIGN (XML_DB_CTF_START + 5) -#define XML_DB_TYPE_EQUAL (XML_DB_TYPES_START + 1) +#define XML_DB_TYPE_EQUAL (XML_DB_TYPES_START + 1) namespace dbaxml { class OPropertyHandlerFactory : public ::xmloff::OControlPropertyHandlerFactory { protected: - mutable ::std::auto_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; - mutable ::std::auto_ptr<XMLPropertyHandler> m_pTextAlignHandler; + mutable ::std::auto_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; + mutable ::std::auto_ptr<XMLPropertyHandler> m_pTextAlignHandler; public: OPropertyHandlerFactory(); virtual ~OPropertyHandlerFactory(); diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index d132f7666151..3b3e31c1d576 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ DBG_NAME(OXMLHierarchyCollection) OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XAttributeList > & _xAttrList ,const Reference< XNameAccess >& _xParentContainer ,const ::rtl::OUString& _sCollectionServiceName ,const ::rtl::OUString& _sComponentServiceName) : @@ -140,13 +140,13 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { -// case XML_TOK_QUERY: -// pContext = new OXMLQuery( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer ); -// break; +// case XML_TOK_QUERY: +// pContext = new OXMLQuery( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer ); +// break; case XML_TOK_COMPONENT: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName ); @@ -155,7 +155,7 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext( GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLColumn( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_xTable); break; - // case XML_TOK_QUERY_COLLECTION: + // case XML_TOK_QUERY_COLLECTION: case XML_TOK_COMPONENT_COLLECTION: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName); diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index 3d87826a928d..8a85e14104bb 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 dbaxml ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sName; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + ::rtl::OUString m_sName; + ::rtl::OUString m_sCollectionServiceName; + ::rtl::OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx index 21d30473872b..487ec48c388a 100644 --- a/dbaccess/source/filter/xml/xmlLogin.cxx +++ b/dbaccess/source/filter/xml/xmlLogin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport, if ( !bUserFound ) { bUserFound = true; - PropertyValue aProperty; + PropertyValue aProperty; aProperty.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSystemUser")); aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False); rImport.addInfo(aProperty); diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index 6f2751eb300b..a6734a28ebf0 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index 6c35f416b5c2..8a024535fdf9 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ DBG_NAME(OXMLQuery) OXMLQuery::OXMLQuery( ODBFilter& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XAttributeList > & _xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ) : OXMLTable( rImport, nPrfx, _sLocalName,_xAttrList,_xParentContainer,SERVICE_SDB_COMMAND_DEFINITION ) @@ -136,7 +136,7 @@ void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp ) _xProp->setPropertyValue(PROPERTY_UPDATE_CATALOGNAME,makeAny(m_sCatalog)); if ( m_sSchema.getLength() ) _xProp->setPropertyValue(PROPERTY_UPDATE_SCHEMANAME,makeAny(m_sSchema)); - + const ODBFilter::TPropertyNameMap& rSettings = GetOwnImport().getQuerySettings(); ODBFilter::TPropertyNameMap::const_iterator aFind = rSettings.find(m_sName); if ( aFind != rSettings.end() ) diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index 4e4bfde87be0..9ac948c04be8 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 dbaxml { ::rtl::OUString m_sCommand; ::rtl::OUString m_sTable; - sal_Bool m_bEscapeProcessing; + sal_Bool m_bEscapeProcessing; protected: virtual void setProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xProp); public: diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx index 112524ddbe98..61ef570b06f7 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,7 +136,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport, sURL.append(sPortNumber); } } - else + else { sURL.append(sType); sURL.appendAscii(":"); diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index c94d2184f793..99349b1006e0 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index 67ea8c5bc77e..f0251878adad 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -290,7 +290,7 @@ Reference < XNameContainer > case XML_STYLE_FAMILY_TABLE_CELL: sServiceName = sCellStyleServiceName; break; - + } } return sServiceName; diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 16bea01cc12b..dc85ae5a8145 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 dbaxml class OTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString m_sDataStyleName; - ::rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; - SvXMLStylesContext* pStyles; - // std::vector<ScXMLMapContent> aMaps; - com::sun::star::uno::Any aConditionalFormat; - sal_Int32 m_nNumberFormat; - sal_Bool bConditionalFormatCreated : 1; - sal_Bool bParentSet : 1; + ::rtl::OUString m_sDataStyleName; + ::rtl::OUString sPageStyle; + const rtl::OUString sNumberFormat; + SvXMLStylesContext* pStyles; + // std::vector<ScXMLMapContent> aMaps; + com::sun::star::uno::Any aConditionalFormat; + sal_Int32 m_nNumberFormat; + sal_Bool bConditionalFormatCreated : 1; + sal_Bool bParentSet : 1; ODBFilter& GetOwnImport(); diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index a64a3ac40360..0f2beb18a17f 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ DBG_NAME(OXMLTable) OXMLTable::OXMLTable( ODBFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const uno::Reference< XAttributeList > & _xAttrList + ,const uno::Reference< XAttributeList > & _xAttrList ,const uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ,const ::rtl::OUString& _sServiceName ) @@ -126,7 +126,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext( const uno::Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetQueryElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetQueryElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -200,7 +200,7 @@ void OXMLTable::EndElement() if ( m_xTable.is() ) { setProperties(m_xTable); - + if ( m_sStyleName.getLength() ) { const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles(); @@ -213,7 +213,7 @@ void OXMLTable::EndElement() } } } - + xNameContainer->insertByName(m_sName,makeAny(m_xTable)); } } @@ -222,7 +222,7 @@ void OXMLTable::EndElement() OSL_ENSURE(0,"OXMLQuery::EndElement -> exception catched"); } } - + } // ----------------------------------------------------------------------------- void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/ diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index 925497ce92a8..68127045655d 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +38,8 @@ namespace dbaxml class OXMLTable : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; ::rtl::OUString m_sFilterStatement; ::rtl::OUString m_sOrderStatement; ::rtl::OUString m_sName; @@ -47,13 +47,13 @@ namespace dbaxml ::rtl::OUString m_sCatalog; ::rtl::OUString m_sStyleName; ::rtl::OUString m_sServiceName; - sal_Bool m_bApplyFilter; - sal_Bool m_bApplyOrder; - + sal_Bool m_bApplyFilter; + sal_Bool m_bApplyOrder; + ODBFilter& GetOwnImport(); - void fillAttributes( sal_uInt16 nPrfx + void fillAttributes( sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList , ::rtl::OUString& _rsCommand diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 4291c244a341..94915d046ce4 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ SvXMLImportContext* OXMLTableFilterList::CreateChildContext( else if ( IsXMLToken( rLocalName, XML_TABLE_TYPE ) ) pContext = new OXMLTableFilterPattern( GetImport(), nPrefix, rLocalName,sal_False,*this); else if ( IsXMLToken( rLocalName, XML_TABLE_INCLUDE_FILTER ) ) - pContext = new OXMLTableFilterList( GetImport(), nPrefix, rLocalName ); + pContext = new OXMLTableFilterList( GetImport(), nPrefix, rLocalName ); } if( !pContext ) diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index d288b23ae7d1..07162624cf5d 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ namespace dbaxml virtual void EndElement(); /** pushes a new TableFilterPattern to the list of patterns - @param _sTableFilterPattern + @param _sTableFilterPattern The new filter pattern. */ inline void pushTableFilterPattern(const ::rtl::OUString& _sTableFilterPattern) @@ -63,7 +63,7 @@ namespace dbaxml } /** pushes a new TableTypeFilter to the list of patterns - @param _sTypeFilter + @param _sTypeFilter The new type filter. */ inline void pushTableTypeFilter(const ::rtl::OUString& _sTypeFilter) diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx index 12ce89a823f1..b4c62f34b035 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx index 460d896ecc89..80452c8d6a96 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 dbaxml class OXMLTableFilterList; class OXMLTableFilterPattern : public SvXMLImportContext { - OXMLTableFilterList& m_rParent; - sal_Bool m_bNameFilter; + OXMLTableFilterList& m_rParent; + sal_Bool m_bNameFilter; public: - OXMLTableFilterPattern( SvXMLImport& rImport + OXMLTableFilterPattern( SvXMLImport& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& rLName ,sal_Bool _bNameFilter diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 25c48491af22..9805eda5dfe9 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -609,15 +609,15 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - { XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_DATABASE, XML_TOK_DOC_DATABASE }, - { XML_NAMESPACE_OOO, XML_DATABASE, XML_TOK_DOC_DATABASE }, - { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT }, + { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OFFICE, XML_DATABASE, XML_TOK_DOC_DATABASE }, + { XML_NAMESPACE_OOO, XML_DATABASE, XML_TOK_DOC_DATABASE }, + { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT }, XML_TOKEN_MAP_END }; m_pDocElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -631,13 +631,13 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_DATASOURCE, XML_TOK_DATASOURCE }, - { XML_NAMESPACE_DB, XML_FORMS, XML_TOK_FORMS}, - { XML_NAMESPACE_DB, XML_REPORTS, XML_TOK_REPORTS}, - { XML_NAMESPACE_DB, XML_QUERIES, XML_TOK_QUERIES}, - { XML_NAMESPACE_DB, XML_TABLES, XML_TOK_TABLES}, - { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATIONS, XML_TOK_TABLES}, - { XML_NAMESPACE_DB, XML_SCHEMA_DEFINITION, XML_TOK_SCHEMA_DEFINITION}, + { XML_NAMESPACE_DB, XML_DATASOURCE, XML_TOK_DATASOURCE }, + { XML_NAMESPACE_DB, XML_FORMS, XML_TOK_FORMS}, + { XML_NAMESPACE_DB, XML_REPORTS, XML_TOK_REPORTS}, + { XML_NAMESPACE_DB, XML_QUERIES, XML_TOK_QUERIES}, + { XML_NAMESPACE_DB, XML_TABLES, XML_TOK_TABLES}, + { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATIONS, XML_TOK_TABLES}, + { XML_NAMESPACE_DB, XML_SCHEMA_DEFINITION, XML_TOK_SCHEMA_DEFINITION}, XML_TOKEN_MAP_END }; m_pDatabaseElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -651,44 +651,44 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE}, - { XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS}, - { XML_NAMESPACE_DB, XML_JAVA_DRIVER_CLASS, XML_TOK_JAVA_DRIVER_CLASS}, - { XML_NAMESPACE_DB, XML_EXTENSION, XML_TOK_EXTENSION}, - { XML_NAMESPACE_DB, XML_IS_FIRST_ROW_HEADER_LINE, XML_TOK_IS_FIRST_ROW_HEADER_LINE}, - { XML_NAMESPACE_DB, XML_SHOW_DELETED, XML_TOK_SHOW_DELETED}, - { XML_NAMESPACE_DB, XML_IS_TABLE_NAME_LENGTH_LIMITED, XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED}, - { XML_NAMESPACE_DB, XML_SYSTEM_DRIVER_SETTINGS, XML_TOK_SYSTEM_DRIVER_SETTINGS}, - { XML_NAMESPACE_DB, XML_ENABLE_SQL92_CHECK, XML_TOK_ENABLE_SQL92_CHECK}, - { XML_NAMESPACE_DB, XML_APPEND_TABLE_ALIAS_NAME, XML_TOK_APPEND_TABLE_ALIAS_NAME}, - { XML_NAMESPACE_DB, XML_PARAMETER_NAME_SUBSTITUTION, XML_TOK_PARAMETER_NAME_SUBSTITUTION}, - { XML_NAMESPACE_DB, XML_IGNORE_DRIVER_PRIVILEGES, XML_TOK_IGNORE_DRIVER_PRIVILEGES}, - { XML_NAMESPACE_DB, XML_BOOLEAN_COMPARISON_MODE, XML_TOK_BOOLEAN_COMPARISON_MODE}, - { XML_NAMESPACE_DB, XML_USE_CATALOG, XML_TOK_USE_CATALOG}, - { XML_NAMESPACE_DB, XML_BASE_DN, XML_TOK_BASE_DN}, - { XML_NAMESPACE_DB, XML_MAX_ROW_COUNT, XML_TOK_MAX_ROW_COUNT}, - { XML_NAMESPACE_DB, XML_LOGIN, XML_TOK_LOGIN}, - { XML_NAMESPACE_DB, XML_TABLE_FILTER, XML_TOK_TABLE_FILTER}, - { XML_NAMESPACE_DB, XML_TABLE_TYPE_FILTER, XML_TOK_TABLE_TYPE_FILTER}, - { XML_NAMESPACE_DB, XML_AUTO_INCREMENT, XML_TOK_AUTO_INCREMENT}, - { XML_NAMESPACE_DB, XML_DELIMITER, XML_TOK_DELIMITER}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, XML_TOK_DATA_SOURCE_SETTINGS}, - { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET}, + { XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE}, + { XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS}, + { XML_NAMESPACE_DB, XML_JAVA_DRIVER_CLASS, XML_TOK_JAVA_DRIVER_CLASS}, + { XML_NAMESPACE_DB, XML_EXTENSION, XML_TOK_EXTENSION}, + { XML_NAMESPACE_DB, XML_IS_FIRST_ROW_HEADER_LINE, XML_TOK_IS_FIRST_ROW_HEADER_LINE}, + { XML_NAMESPACE_DB, XML_SHOW_DELETED, XML_TOK_SHOW_DELETED}, + { XML_NAMESPACE_DB, XML_IS_TABLE_NAME_LENGTH_LIMITED, XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED}, + { XML_NAMESPACE_DB, XML_SYSTEM_DRIVER_SETTINGS, XML_TOK_SYSTEM_DRIVER_SETTINGS}, + { XML_NAMESPACE_DB, XML_ENABLE_SQL92_CHECK, XML_TOK_ENABLE_SQL92_CHECK}, + { XML_NAMESPACE_DB, XML_APPEND_TABLE_ALIAS_NAME, XML_TOK_APPEND_TABLE_ALIAS_NAME}, + { XML_NAMESPACE_DB, XML_PARAMETER_NAME_SUBSTITUTION, XML_TOK_PARAMETER_NAME_SUBSTITUTION}, + { XML_NAMESPACE_DB, XML_IGNORE_DRIVER_PRIVILEGES, XML_TOK_IGNORE_DRIVER_PRIVILEGES}, + { XML_NAMESPACE_DB, XML_BOOLEAN_COMPARISON_MODE, XML_TOK_BOOLEAN_COMPARISON_MODE}, + { XML_NAMESPACE_DB, XML_USE_CATALOG, XML_TOK_USE_CATALOG}, + { XML_NAMESPACE_DB, XML_BASE_DN, XML_TOK_BASE_DN}, + { XML_NAMESPACE_DB, XML_MAX_ROW_COUNT, XML_TOK_MAX_ROW_COUNT}, + { XML_NAMESPACE_DB, XML_LOGIN, XML_TOK_LOGIN}, + { XML_NAMESPACE_DB, XML_TABLE_FILTER, XML_TOK_TABLE_FILTER}, + { XML_NAMESPACE_DB, XML_TABLE_TYPE_FILTER, XML_TOK_TABLE_TYPE_FILTER}, + { XML_NAMESPACE_DB, XML_AUTO_INCREMENT, XML_TOK_AUTO_INCREMENT}, + { XML_NAMESPACE_DB, XML_DELIMITER, XML_TOK_DELIMITER}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, XML_TOK_DATA_SOURCE_SETTINGS}, + { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET}, // db odf 12 - { XML_NAMESPACE_DB, XML_CONNECTION_DATA, XML_TOK_CONNECTION_DATA}, - { XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, XML_TOK_DATABASE_DESCRIPTION}, - { XML_NAMESPACE_DB, XML_COMPOUND_DATABASE, XML_TOK_COMPOUND_DATABASE}, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_DB_HREF}, - { XML_NAMESPACE_DB, XML_MEDIA_TYPE, XML_TOK_MEDIA_TYPE}, - { XML_NAMESPACE_DB, XML_TYPE, XML_TOK_DB_TYPE}, - { XML_NAMESPACE_DB, XML_HOSTNAME, XML_TOK_HOSTNAME}, - { XML_NAMESPACE_DB, XML_PORT, XML_TOK_PORT}, - { XML_NAMESPACE_DB, XML_LOCAL_SOCKET, XML_TOK_LOCAL_SOCKET}, - { XML_NAMESPACE_DB, XML_DATABASE_NAME, XML_TOK_DATABASE_NAME}, - { XML_NAMESPACE_DB, XML_DRIVER_SETTINGS, XML_TOK_DRIVER_SETTINGS}, - { XML_NAMESPACE_DB, XML_JAVA_CLASSPATH, XML_TOK_JAVA_CLASSPATH}, - { XML_NAMESPACE_DB, XML_CHARACTER_SET, XML_TOK_CHARACTER_SET}, - { XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS,XML_TOK_APPLICATION_CONNECTION_SETTINGS}, + { XML_NAMESPACE_DB, XML_CONNECTION_DATA, XML_TOK_CONNECTION_DATA}, + { XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, XML_TOK_DATABASE_DESCRIPTION}, + { XML_NAMESPACE_DB, XML_COMPOUND_DATABASE, XML_TOK_COMPOUND_DATABASE}, + { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_DB_HREF}, + { XML_NAMESPACE_DB, XML_MEDIA_TYPE, XML_TOK_MEDIA_TYPE}, + { XML_NAMESPACE_DB, XML_TYPE, XML_TOK_DB_TYPE}, + { XML_NAMESPACE_DB, XML_HOSTNAME, XML_TOK_HOSTNAME}, + { XML_NAMESPACE_DB, XML_PORT, XML_TOK_PORT}, + { XML_NAMESPACE_DB, XML_LOCAL_SOCKET, XML_TOK_LOCAL_SOCKET}, + { XML_NAMESPACE_DB, XML_DATABASE_NAME, XML_TOK_DATABASE_NAME}, + { XML_NAMESPACE_DB, XML_DRIVER_SETTINGS, XML_TOK_DRIVER_SETTINGS}, + { XML_NAMESPACE_DB, XML_JAVA_CLASSPATH, XML_TOK_JAVA_CLASSPATH}, + { XML_NAMESPACE_DB, XML_CHARACTER_SET, XML_TOK_CHARACTER_SET}, + { XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS,XML_TOK_APPLICATION_CONNECTION_SETTINGS}, XML_TOKEN_MAP_END }; m_pDataSourceElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -702,10 +702,10 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_USER_NAME, XML_TOK_USER_NAME}, - { XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED, XML_TOK_IS_PASSWORD_REQUIRED}, - { XML_NAMESPACE_DB, XML_USE_SYSTEM_USER, XML_TOK_USE_SYSTEM_USER}, - { XML_NAMESPACE_DB, XML_LOGIN_TIMEOUT, XML_TOK_LOGIN_TIMEOUT}, + { XML_NAMESPACE_DB, XML_USER_NAME, XML_TOK_USER_NAME}, + { XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED, XML_TOK_IS_PASSWORD_REQUIRED}, + { XML_NAMESPACE_DB, XML_USE_SYSTEM_USER, XML_TOK_USE_SYSTEM_USER}, + { XML_NAMESPACE_DB, XML_LOGIN_TIMEOUT, XML_TOK_LOGIN_TIMEOUT}, XML_TOKEN_MAP_END }; m_pLoginElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -719,8 +719,8 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, XML_TOK_FILE_BASED_DATABASE}, - { XML_NAMESPACE_DB, XML_SERVER_DATABASE, XML_TOK_SERVER_DATABASE}, + { XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, XML_TOK_FILE_BASED_DATABASE}, + { XML_NAMESPACE_DB, XML_SERVER_DATABASE, XML_TOK_SERVER_DATABASE}, XML_TOKEN_MAP_END }; m_pDatabaseDescriptionElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -734,19 +734,19 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT}, - { XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT, XML_TOK_ROW_RETRIEVING_STATEMENT}, - { XML_NAMESPACE_DB, XML_STRING, XML_TOK_STRING}, - { XML_NAMESPACE_DB, XML_FIELD, XML_TOK_FIELD}, - { XML_NAMESPACE_DB, XML_DECIMAL, XML_TOK_DECIMAL}, - { XML_NAMESPACE_DB, XML_THOUSAND, XML_TOK_THOUSAND}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, XML_TOK_DATA_SOURCE_SETTING}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, XML_TOK_DATA_SOURCE_SETTING_VALUE}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,XML_TOK_DATA_SOURCE_SETTING_IS_LIST}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, XML_TOK_DATA_SOURCE_SETTING_TYPE}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, XML_TOK_DATA_SOURCE_SETTING_NAME}, - { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET}, - { XML_NAMESPACE_DB, XML_ENCODING, XML_TOK_ENCODING}, + { XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT}, + { XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT, XML_TOK_ROW_RETRIEVING_STATEMENT}, + { XML_NAMESPACE_DB, XML_STRING, XML_TOK_STRING}, + { XML_NAMESPACE_DB, XML_FIELD, XML_TOK_FIELD}, + { XML_NAMESPACE_DB, XML_DECIMAL, XML_TOK_DECIMAL}, + { XML_NAMESPACE_DB, XML_THOUSAND, XML_TOK_THOUSAND}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, XML_TOK_DATA_SOURCE_SETTING}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, XML_TOK_DATA_SOURCE_SETTING_VALUE}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,XML_TOK_DATA_SOURCE_SETTING_IS_LIST}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, XML_TOK_DATA_SOURCE_SETTING_TYPE}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, XML_TOK_DATA_SOURCE_SETTING_NAME}, + { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET}, + { XML_NAMESPACE_DB, XML_ENCODING, XML_TOK_ENCODING}, XML_TOKEN_MAP_END }; m_pDataSourceInfoElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -760,13 +760,13 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_COMPONENT, XML_TOK_COMPONENT}, - { XML_NAMESPACE_DB, XML_COMPONENT_COLLECTION, XML_TOK_COMPONENT_COLLECTION}, - { XML_NAMESPACE_DB, XML_QUERY_COLLECTION, XML_TOK_QUERY_COLLECTION}, - { XML_NAMESPACE_DB, XML_QUERY, XML_TOK_QUERY}, - { XML_NAMESPACE_DB, XML_TABLE, XML_TOK_TABLE}, - { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATION, XML_TOK_TABLE}, - { XML_NAMESPACE_DB, XML_COLUMN, XML_TOK_COLUMN}, + { XML_NAMESPACE_DB, XML_COMPONENT, XML_TOK_COMPONENT}, + { XML_NAMESPACE_DB, XML_COMPONENT_COLLECTION, XML_TOK_COMPONENT_COLLECTION}, + { XML_NAMESPACE_DB, XML_QUERY_COLLECTION, XML_TOK_QUERY_COLLECTION}, + { XML_NAMESPACE_DB, XML_QUERY, XML_TOK_QUERY}, + { XML_NAMESPACE_DB, XML_TABLE, XML_TOK_TABLE}, + { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATION, XML_TOK_TABLE}, + { XML_NAMESPACE_DB, XML_COLUMN, XML_TOK_COLUMN}, XML_TOKEN_MAP_END }; m_pDocumentsElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -780,12 +780,12 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_HREF }, - { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_TYPE }, - { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_SHOW }, - { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_ACTUATE}, - { XML_NAMESPACE_DB, XML_AS_TEMPLATE, XML_TOK_AS_TEMPLATE }, - { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COMPONENT_NAME }, + { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_HREF }, + { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_TYPE }, + { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_SHOW }, + { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_ACTUATE}, + { XML_NAMESPACE_DB, XML_AS_TEMPLATE, XML_TOK_AS_TEMPLATE }, + { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COMPONENT_NAME }, XML_TOKEN_MAP_END }; m_pComponentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -799,17 +799,17 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_COMMAND, XML_TOK_COMMAND }, - { XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, - { XML_NAMESPACE_DB, XML_NAME, XML_TOK_QUERY_NAME }, - { XML_NAMESPACE_DB, XML_FILTER_STATEMENT, XML_TOK_FILTER_STATEMENT }, - { XML_NAMESPACE_DB, XML_ORDER_STATEMENT, XML_TOK_ORDER_STATEMENT }, - { XML_NAMESPACE_DB, XML_CATALOG_NAME, XML_TOK_CATALOG_NAME }, - { XML_NAMESPACE_DB, XML_SCHEMA_NAME, XML_TOK_SCHEMA_NAME }, - { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_STYLE_NAME}, - { XML_NAMESPACE_DB, XML_APPLY_FILTER, XML_TOK_APPLY_FILTER}, - { XML_NAMESPACE_DB, XML_APPLY_ORDER, XML_TOK_APPLY_ORDER}, - { XML_NAMESPACE_DB, XML_COLUMNS, XML_TOK_COLUMNS}, + { XML_NAMESPACE_DB, XML_COMMAND, XML_TOK_COMMAND }, + { XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, + { XML_NAMESPACE_DB, XML_NAME, XML_TOK_QUERY_NAME }, + { XML_NAMESPACE_DB, XML_FILTER_STATEMENT, XML_TOK_FILTER_STATEMENT }, + { XML_NAMESPACE_DB, XML_ORDER_STATEMENT, XML_TOK_ORDER_STATEMENT }, + { XML_NAMESPACE_DB, XML_CATALOG_NAME, XML_TOK_CATALOG_NAME }, + { XML_NAMESPACE_DB, XML_SCHEMA_NAME, XML_TOK_SCHEMA_NAME }, + { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_STYLE_NAME}, + { XML_NAMESPACE_DB, XML_APPLY_FILTER, XML_TOK_APPLY_FILTER}, + { XML_NAMESPACE_DB, XML_APPLY_ORDER, XML_TOK_APPLY_ORDER}, + { XML_NAMESPACE_DB, XML_COLUMNS, XML_TOK_COLUMNS}, XML_TOKEN_MAP_END }; m_pQueryElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -823,14 +823,14 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME }, - { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME }, - { XML_NAMESPACE_DB, XML_HELP_MESSAGE, XML_TOK_COLUMN_HELP_MESSAGE }, - { XML_NAMESPACE_DB, XML_VISIBILITY, XML_TOK_COLUMN_VISIBILITY }, - { XML_NAMESPACE_DB, XML_DEFAULT_VALUE, XML_TOK_COLUMN_DEFAULT_VALUE }, - { XML_NAMESPACE_DB, XML_TYPE_NAME, XML_TOK_COLUMN_TYPE_NAME }, - { XML_NAMESPACE_DB, XML_VISIBLE, XML_TOK_COLUMN_VISIBLE }, - { XML_NAMESPACE_DB, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_DEFAULT_CELL_STYLE_NAME }, + { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME }, + { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME }, + { XML_NAMESPACE_DB, XML_HELP_MESSAGE, XML_TOK_COLUMN_HELP_MESSAGE }, + { XML_NAMESPACE_DB, XML_VISIBILITY, XML_TOK_COLUMN_VISIBILITY }, + { XML_NAMESPACE_DB, XML_DEFAULT_VALUE, XML_TOK_COLUMN_DEFAULT_VALUE }, + { XML_NAMESPACE_DB, XML_TYPE_NAME, XML_TOK_COLUMN_TYPE_NAME }, + { XML_NAMESPACE_DB, XML_VISIBLE, XML_TOK_COLUMN_VISIBLE }, + { XML_NAMESPACE_DB, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_DEFAULT_CELL_STYLE_NAME }, XML_TOKEN_MAP_END }; m_pColumnElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index c4e2a16dc856..6a7488e0804e 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,35 +72,35 @@ public: DECLARE_STL_USTRINGACCESS_MAP(Sequence<PropertyValue>,TPropertyNameMap); typedef ::std::vector< ::com::sun::star::beans::PropertyValue> TInfoSequence; private: - TPropertyNameMap m_aQuerySettings; - TPropertyNameMap m_aTablesSettings; + TPropertyNameMap m_aQuerySettings; + TPropertyNameMap m_aTablesSettings; TInfoSequence m_aInfoSequence; - Reference< XComponent > m_xSrcDoc; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDataSourceElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pLoginElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDatabaseDescriptionElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDataSourceInfoElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocumentsElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pQueryElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnElemTokenMap; - - mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - Reference<XPropertySet> m_xDataSource; - sal_Int32 m_nPreviewMode; + Reference< XComponent > m_xSrcDoc; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pDataSourceElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pLoginElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pDatabaseDescriptionElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pDataSourceInfoElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocumentsElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pQueryElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnElemTokenMap; + + mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + Reference<XPropertySet> m_xDataSource; + sal_Int32 m_nPreviewMode; bool m_bNewFormat; - sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); + sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); /** fills the map with the Properties - @param _rValue + @param _rValue The Any where the sequence resists in. - @param _rMap + @param _rMap The map to fill. */ void fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap); @@ -115,9 +115,9 @@ protected: const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual ~ODBFilter() throw(); + virtual ~ODBFilter() throw(); public: - + ODBFilter( const Reference< XMultiServiceFactory >& _rxMSF ); // XFilter @@ -152,7 +152,7 @@ public: UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const; /** add a Info to the sequence which will be appened to the data source - @param _rInfo The property to append. + @param _rInfo The property to append. */ inline void addInfo(const ::com::sun::star::beans::PropertyValue& _rInfo) { diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 95464c7d6896..8836532b99b2 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,8 +70,8 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml() //--------------------------------------------------------------------------------------- extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_dbaxml(); @@ -84,8 +84,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { writeDBLoaderInfo2(pRegistryKey); return ::dbaxml::OModuleRegistration::writeComponentInfos( diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx index 743772cdc506..fc8a2a61221a 100644 --- a/dbaccess/source/inc/OAuthenticationContinuation.hxx +++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 dbaccess { //........................................................................ -class OOO_DLLPUBLIC_DBA OAuthenticationContinuation : +class OOO_DLLPUBLIC_DBA OAuthenticationContinuation : public comphelper::OInteraction< com::sun::star::ucb::XInteractionSupplyAuthentication > { sal_Bool m_bRemberPassword : 1; // remember the password for this session ? diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index f5e85f426877..85b73c382e12 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ DECLARE_STL_VECTOR(::com::sun::star::uno::WeakReferenceHelper, OWeakRefArray); //================================================================================== //= OSubComponent - a component which holds a hard ref to it's parent -//= and is been hold itself (by the parent) with a weak ref +//= and is been hold itself (by the parent) with a weak ref //================================================================================== class OSubComponent : public ::cppu::OComponentHelper { @@ -76,263 +76,263 @@ public: //---------------------------------------------------------------------------------- // (internal - not to be used outside - usually) -#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ - } \ - -#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return getImplementationName_Static(); \ - } \ - ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ - } \ - -#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ - const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ - for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) \ - if (pSupported->equals(_rServiceName)) \ - return sal_True; \ +#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::rtl::OUString::createFromAscii(implasciiname); \ + } \ + +#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ + ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return getImplementationName_Static(); \ + } \ + ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::rtl::OUString::createFromAscii(implasciiname); \ + } \ + +#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ + const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ + for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) \ + if (pSupported->equals(_rServiceName)) \ + return sal_True; \ \ - return sal_False; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - return getSupportedServiceNames_Static(); \ - } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - return getSupportedServiceNames_Static(); \ - } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ - SAL_CALL classname::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) \ - { \ - return static_cast< XServiceInfo* >(new classname(_rxORB)); \ - } \ + return sal_False; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + return getSupportedServiceNames_Static(); \ + } \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + return getSupportedServiceNames_Static(); \ + } \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ + SAL_CALL classname::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) \ + { \ + return static_cast< XServiceInfo* >(new classname(_rxORB)); \ + } \ //---------------------------------------------------------------------------------- // declare service info methods - no getImplementationName, so the class is abstract -#define DECLARE_SERVICE_INFO_ABSTRACT() \ - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ +#define DECLARE_SERVICE_INFO_ABSTRACT() \ + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ //---------------------------------------------------------------------------------- // declare service info methods -#define DECLARE_SERVICE_INFO() \ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - -#define DECLARE_SERVICE_INFO_STATIC() \ - DECLARE_SERVICE_INFO(); \ - static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ - 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 >&) \ +#define DECLARE_SERVICE_INFO() \ + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + +#define DECLARE_SERVICE_INFO_STATIC() \ + DECLARE_SERVICE_INFO(); \ + static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ + 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 >&) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ +#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ +#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ +#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) - + //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ +#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ +#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ +#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ +#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ //================================================================================== //= XTypeProvider helpers //-------------------------------------------------------------------------- -#define DECLARE_IMPLEMENTATION_ID( ) \ +#define DECLARE_IMPLEMENTATION_ID( ) \ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \ + static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \ //-------------------------------------------------------------------------- -#define DECLARE_GETTYPES( ) \ +#define DECLARE_GETTYPES( ) \ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); //-------------------------------------------------------------------------- -#define DECLARE_TYPEPROVIDER( ) \ - DECLARE_GETTYPES( ) \ +#define DECLARE_TYPEPROVIDER( ) \ + DECLARE_GETTYPES( ) \ DECLARE_IMPLEMENTATION_ID( ) //-------------------------------------------------------------------------- -#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \ -::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \ -{ \ - static ::cppu::OImplementationId* pId = 0; \ - if ( !pId ) \ - { \ - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ - if ( !pId ) \ - { \ - static ::cppu::OImplementationId aId; \ - pId = &aId; \ - } \ - } \ - return pId->getImplementationId(); \ +#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \ +::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \ +{ \ + static ::cppu::OImplementationId* pId = 0; \ + if ( !pId ) \ + { \ + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ + if ( !pId ) \ + { \ + static ::cppu::OImplementationId aId; \ + pId = &aId; \ + } \ + } \ + return pId->getImplementationId(); \ } \ -::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (::com::sun::star::uno::RuntimeException) \ -{ \ +::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (::com::sun::star::uno::RuntimeException) \ +{ \ return classname::getUnoTunnelImplementationId(); \ } //-------------------------------------------------------------------------- -#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::comphelper::concatSequences( \ - baseclass1::getTypes( ), \ - baseclass2::getTypes( ) \ - ); \ +#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::comphelper::concatSequences( \ + baseclass1::getTypes( ), \ + baseclass2::getTypes( ) \ + ); \ } //-------------------------------------------------------------------------- -#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::comphelper::concatSequences( \ - baseclass1::getTypes( ), \ - baseclass2::getTypes( ), \ - baseclass3::getTypes( ) \ - ); \ +#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::comphelper::concatSequences( \ + baseclass1::getTypes( ), \ + baseclass2::getTypes( ), \ + baseclass3::getTypes( ) \ + ); \ } //-------------------------------------------------------------------------- -#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ - IMPLEMENT_IMPLEMENTATION_ID( classname) \ +#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ + IMPLEMENT_IMPLEMENTATION_ID( classname) \ IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) //-------------------------------------------------------------------------- -#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \ - IMPLEMENT_IMPLEMENTATION_ID( classname) \ +#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \ + IMPLEMENT_IMPLEMENTATION_ID( classname) \ IMPLEMENT_GETTYPES3(classname, baseclass1, baseclass2, baseclass3 ) //================================================================================== //= helper for declaring/implementing classes based on the OPropertyContainer and an OPropertyArrayUsageHelper //---------------------------------------------------------------------------------- -#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \ - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \ +#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \ + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \ + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const - + //---------------------------------------------------------------------------------- -#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \ - { \ - Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); \ - return xInfo; \ - } \ - ::cppu::IPropertyArrayHelper& classname::getInfoHelper() \ - { \ - return *baseclass1::getArrayHelper(); \ - } \ - ::cppu::IPropertyArrayHelper* classname::createArrayHelper( ) const \ - { \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; \ - describeProperties(aProps); \ - return new ::cppu::OPropertyArrayHelper(aProps); \ +#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \ + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \ + { \ + Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); \ + return xInfo; \ + } \ + ::cppu::IPropertyArrayHelper& classname::getInfoHelper() \ + { \ + return *baseclass1::getArrayHelper(); \ + } \ + ::cppu::IPropertyArrayHelper* classname::createArrayHelper( ) const \ + { \ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; \ + describeProperties(aProps); \ + return new ::cppu::OPropertyArrayHelper(aProps); \ } //---------------------------------------------------------------------------------- -#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( classname ) \ +#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( classname ) \ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname, classname ) //================================================================================== //= helper for implementing the createArrayHelper //---------------------------------------------------------------------------------- -#define BEGIN_PROPERTY_SEQUENCE(count) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aDescriptor(count); \ - ::com::sun::star::beans::Property* pDesc = aDescriptor.getArray(); \ - sal_Int32 nPos = 0; \ +#define BEGIN_PROPERTY_SEQUENCE(count) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aDescriptor(count); \ + ::com::sun::star::beans::Property* pDesc = aDescriptor.getArray(); \ + sal_Int32 nPos = 0; \ //---------------------------------------------------------------------------------- -#define BEGIN_PROPERTY_HELPER(count) \ +#define BEGIN_PROPERTY_HELPER(count) \ BEGIN_PROPERTY_SEQUENCE(count) //---------------------------------------------------------------------------------- @@ -340,103 +340,103 @@ public: pDesc[nPos++] = ::com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cpputype, //---------------------------------------------------------------------------------- -#define DECL_PROP0(varname, type) \ +#define DECL_PROP0(varname, type) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) 0) //---------------------------------------------------------------------------------- -#define DECL_PROP0_BOOL(varname) \ +#define DECL_PROP0_BOOL(varname) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) 0) //---------------------------------------------------------------------------------- -#define DECL_PROP0_IFACE(varname, iface) \ +#define DECL_PROP0_IFACE(varname, iface) \ DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) 0) //---------------------------------------------------------------------------------- -#define DECL_PROP1(varname, type, attrib1) \ +#define DECL_PROP1(varname, type, attrib1) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- -#define DECL_PROP1_BOOL(varname, attrib1) \ +#define DECL_PROP1_BOOL(varname, attrib1) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- -#define DECL_PROP1_IFACE(varname, iface, attrib1) \ +#define DECL_PROP1_IFACE(varname, iface, attrib1) \ DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- -#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \ +#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \ DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- -#define DECL_PROP2(varname, type, attrib1, attrib2) \ +#define DECL_PROP2(varname, type, attrib1, attrib2) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- -#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \ +#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- -#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ +#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3) //---------------------------------------------------------------------------------- -#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \ +#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3) //---------------------------------------------------------------------------------- -#define END_PROPERTY_SEQUENCE() \ - OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \ +#define END_PROPERTY_SEQUENCE() \ + OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \ //---------------------------------------------------------------------------------- -#define END_PROPERTY_HELPER() \ - END_PROPERTY_SEQUENCE() \ +#define END_PROPERTY_HELPER() \ + END_PROPERTY_SEQUENCE() \ return new ::cppu::OPropertyArrayHelper(aDescriptor); -#define NOTIFY_LISTERNERS(_rListeners,T,method) \ +#define NOTIFY_LISTERNERS(_rListeners,T,method) \ Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \ \ - const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ + const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \ \ - _rGuard.clear(); \ - while( pxInt > pxIntBegin ) \ - { \ - try \ - { \ - while( pxInt > pxIntBegin ) \ - { \ - --pxInt; \ - static_cast< T* >( pxInt->get() )->method(aEvt); \ - } \ - } \ - catch( RuntimeException& ) \ - { \ - } \ - } \ + _rGuard.clear(); \ + while( pxInt > pxIntBegin ) \ + { \ + try \ + { \ + while( pxInt > pxIntBegin ) \ + { \ + --pxInt; \ + static_cast< T* >( pxInt->get() )->method(aEvt); \ + } \ + } \ + catch( RuntimeException& ) \ + { \ + } \ + } \ _rGuard.reset(); -#define NOTIFY_LISTERNERS1(_rListeners,T,method,arg1) \ +#define NOTIFY_LISTERNERS1(_rListeners,T,method,arg1) \ Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \ \ - const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ + const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \ \ - _rGuard.clear(); \ - while( pxInt > pxIntBegin ) \ - { \ - try \ - { \ - while( pxInt > pxIntBegin ) \ - { \ - --pxInt; \ - static_cast< T* >( pxInt->get() )->method(aEvt,arg1); \ - } \ - } \ - catch( RuntimeException& ) \ - { \ - } \ - } \ + _rGuard.clear(); \ + while( pxInt > pxIntBegin ) \ + { \ + try \ + { \ + while( pxInt > pxIntBegin ) \ + { \ + --pxInt; \ + static_cast< T* >( pxInt->get() )->method(aEvt,arg1); \ + } \ + } \ + catch( RuntimeException& ) \ + { \ + } \ + } \ _rGuard.reset(); //================================================================================== // miscellaneous -#define UNUSED(x) x; +#define UNUSED(x) x; #endif // _DBASHARED_APITOOLS_HXX_ diff --git a/dbaccess/source/inc/cfg_reghelper.hxx b/dbaccess/source/inc/cfg_reghelper.hxx index e7edf6004423..51fef4ea28e7 100644 --- a/dbaccess/source/inc/cfg_reghelper.hxx +++ b/dbaccess/source/inc/cfg_reghelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/inc/cfgstrings.hrc b/dbaccess/source/inc/cfgstrings.hrc index 82f46a60a96e..5364dca5acf0 100644 --- a/dbaccess/source/inc/cfgstrings.hrc +++ b/dbaccess/source/inc/cfgstrings.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/inc/constasciistring.hxx b/dbaccess/source/inc/constasciistring.hxx index 2179e2d7ffdd..3b86e19e209b 100644 --- a/dbaccess/source/inc/constasciistring.hxx +++ b/dbaccess/source/inc/constasciistring.hxx @@ -14,17 +14,17 @@ // string constants struct ConstAsciiString { - const sal_Char* ascii; - sal_Int32 length; + const sal_Char* ascii; + sal_Int32 length; - inline operator const ::rtl::OUString& () const; - inline operator const sal_Char* () const { return ascii; } + inline operator const ::rtl::OUString& () const; + inline operator const sal_Char* () const { return ascii; } inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength); inline ~ConstAsciiString(); private: - mutable ::rtl::OUString* ustring; + mutable ::rtl::OUString* ustring; }; //------------------------------------------------------------ diff --git a/dbaccess/source/inc/dbadllapi.hxx b/dbaccess/source/inc/dbadllapi.hxx index 9dfd5c3269fc..b505ae135949 100644 --- a/dbaccess/source/inc/dbadllapi.hxx +++ b/dbaccess/source/inc/dbadllapi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc index eb6b98d5bd8b..db629f1ce220 100644 --- a/dbaccess/source/inc/dbastrings.hrc +++ b/dbaccess/source/inc/dbastrings.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 @@ -41,7 +41,7 @@ namespace dbaccess //= SQLSTATE //============================================================ DECLARE_CONSTASCII_USTRING(SQLSTATE_GENERAL); - + //============================================================ //= Properties //============================================================ diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx index fa2b70c1bde0..f9ba053b3139 100644 --- a/dbaccess/source/inc/dbu_reghelper.hxx +++ b/dbaccess/source/inc/dbu_reghelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc index aeef19d752dd..9bd4325eedb8 100644 --- a/dbaccess/source/inc/dbustrings.hrc +++ b/dbaccess/source/inc/dbustrings.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 @@ -53,7 +53,7 @@ namespace dbaui //= service names //============================================================ DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG); - + //============================================================ //= other DBU relevant strings //============================================================ diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index b781c1b77316..e25809b12156 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,11 +69,11 @@ enum DATASOURCE_TYPE DST_KAB = 20, DST_MACAB = 21, DST_MSACCESS_2007 = 22, - DST_EMBEDDED_HSQLDB = 23, + DST_EMBEDDED_HSQLDB = 23, DST_MYSQL_NATIVE = 24, DST_MYSQL_NATIVE_DIRECT = 25, - DST_USERDEFINE1, /// first user defined driver + DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, DST_USERDEFINE3, DST_USERDEFINE4, @@ -85,18 +85,18 @@ enum DATASOURCE_TYPE DST_USERDEFINE10, - DST_UNKNOWN /// unrecognized type + DST_UNKNOWN /// unrecognized type }; #define PAGE_DBSETUPWIZARD_INTRO 0 -#define PAGE_DBSETUPWIZARD_DBASE 1 +#define PAGE_DBSETUPWIZARD_DBASE 1 #define PAGE_DBSETUPWIZARD_TEXT 2 #define PAGE_DBSETUPWIZARD_MSACCESS 3 #define PAGE_DBSETUPWIZARD_LDAP 4 #define PAGE_DBSETUPWIZARD_ADABAS 5 #define PAGE_DBSETUPWIZARD_MYSQL_INTRO 6 #define PAGE_DBSETUPWIZARD_MYSQL_JDBC 7 -#define PAGE_DBSETUPWIZARD_MYSQL_ODBC 8 +#define PAGE_DBSETUPWIZARD_MYSQL_ODBC 8 #define PAGE_DBSETUPWIZARD_ORACLE 9 #define PAGE_DBSETUPWIZARD_JDBC 10 #define PAGE_DBSETUPWIZARD_ADO 11 @@ -117,13 +117,13 @@ class OOO_DLLPUBLIC_DBA ODsnTypeCollection protected: DECLARE_STL_VECTOR(String, StringVector); - StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types - StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource + StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types + StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource ::connectivity::DriversConfig m_aDriverConfig; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; #ifdef DBG_UTIL - sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators + sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators #endif public: @@ -138,7 +138,7 @@ public: /// on a given string, cut the type prefix and return the result String cutPrefix(const ::rtl::OUString& _sURL) const; - + /// on a given string, return the type prefix String getPrefix(const ::rtl::OUString& _sURL) const; @@ -161,7 +161,7 @@ public: /// check if the given data source allows to show column description. sal_Bool supportsColumnDescription(const ::rtl::OUString& _sURL) const; - + // check if a Browse button may be shown to insert connection url sal_Bool supportsBrowsing(const ::rtl::OUString& _sURL) const; @@ -184,9 +184,9 @@ public: getDefaultDBSettings( const ::rtl::OUString& _sURL ) const; /// get access to the first element of the types collection - TypeIterator begin() const; + TypeIterator begin() const; /// get access to the (last + 1st) element of the types collection - TypeIterator end() const; + TypeIterator end() const; void fillPageIds(const ::rtl::OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const; @@ -210,32 +210,32 @@ class OOO_DLLPUBLIC_DBA ODsnTypeCollection::TypeIterator friend bool OOO_DLLPUBLIC_DBA operator!=(const TypeIterator& lhs, const TypeIterator& rhs) { return !(lhs == rhs); } protected: - const ODsnTypeCollection* m_pContainer; - sal_Int32 m_nPosition; + const ODsnTypeCollection* m_pContainer; + sal_Int32 m_nPosition; public: TypeIterator(const TypeIterator& _rSource); ~TypeIterator(); ::rtl::OUString getURLPrefix() const; - String getDisplayName() const; + String getDisplayName() const; /// prefix increment - const TypeIterator& operator++(); + const TypeIterator& operator++(); /// postfix increment - const TypeIterator operator++(int) { TypeIterator hold(*this); ++*this; return hold; } + const TypeIterator operator++(int) { TypeIterator hold(*this); ++*this; return hold; } /// prefix decrement - const TypeIterator& operator--(); + const TypeIterator& operator--(); /// postfix decrement - const TypeIterator operator--(int) { TypeIterator hold(*this); --*this; return hold; } + const TypeIterator operator--(int) { TypeIterator hold(*this); --*this; return hold; } protected: TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos = 0); }; //......................................................................... -} // namespace dbaccess +} // namespace dbaccess //......................................................................... #endif // _DBACCESS_DSNTYPES_HXX_ diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx index a68555add95a..e572d494eff7 100644 --- a/dbaccess/source/inc/flt_reghelper.hxx +++ b/dbaccess/source/inc/flt_reghelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx index dd02ed5226a3..f53e7da9518e 100644 --- a/dbaccess/source/inc/registrationhelper.hxx +++ b/dbaccess/source/inc/registrationhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,20 +35,20 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager, const ::rtl::OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, + const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, rtl_ModuleCount* _p ); //========================================================================== class OModuleRegistration { - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< ::rtl::OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* s_pSupportedServices; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pFactoryFunctionPointers; // no direct instantiation, only static members/methods @@ -56,10 +56,10 @@ class OModuleRegistration public: /** register a component implementing a service with the given data. - @param _rImplementationName the implementation name of the component - @param _rServiceNames the services the component supports - @param _pCreateFunction a function for creating an instance of the component - @param _pFactoryFunction a function for creating a factory for that component + @param _rImplementationName the implementation name of the component + @param _rServiceNames the services the component supports + @param _pCreateFunction a function for creating an instance of the component + @param _pFactoryFunction a function for creating a factory for that component @see revokeComponent */ static void registerComponent( @@ -69,25 +69,25 @@ public: FactoryInstantiation _pFactoryFunction); /** revoke the registration for the specified component - @param _rImplementationName the implementation name of the component + @param _rImplementationName the implementation name of the component */ static void revokeComponent( const ::rtl::OUString& _rImplementationName); /** writes the registration information of all components which are currently registered into the specified registry. Usually used from within component_writeInfo. - @param _rxServiceManager the service manager - @param _rRootKey the registry key under which the information will be stored - @return sal_True if the registration of all implementations was successfull, sal_False otherwise + @param _rxServiceManager the service manager + @param _rRootKey the registry key under which the information will be stored + @return sal_True if the registration of all implementations was successfull, sal_False otherwise */ static sal_Bool writeComponentInfos( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey); /** creates a Factory for the component with the given implementation name. Usually used from within component_getFactory. - @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory - @param _pImplementationName the implementation name of the component - @return the XInterface access to a factory for the component + @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory + @param _pImplementationName the implementation name of the component + @return the XInterface access to a factory for the component */ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( const ::rtl::OUString& _rImplementationName, diff --git a/dbaccess/source/inc/sdbtstrings.hrc b/dbaccess/source/inc/sdbtstrings.hrc index c4837f52bce1..b7490d4af078 100644 --- a/dbaccess/source/inc/sdbtstrings.hrc +++ b/dbaccess/source/inc/sdbtstrings.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/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc index 48fb8312839c..651600613647 100644 --- a/dbaccess/source/inc/stringconstants.hrc +++ b/dbaccess/source/inc/stringconstants.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 @@ -39,133 +39,133 @@ //============================================================ //= property ids //============================================================ -#define PROPERTY_ID_TITLE 1 -#define PROPERTY_ID_URL 2 -#define PROPERTY_ID_INFO 4 -#define PROPERTY_ID_ISPASSWORDREQUIRED 5 -#define PROPERTY_ID_TABLEFILTER 6 -#define PROPERTY_ID_NAME 7 -#define PROPERTY_ID_SCHEMANAME 8 -#define PROPERTY_ID_CATALOGNAME 9 -#define PROPERTY_ID_PRIVILEGES 10 -#define PROPERTY_ID_ESCAPE_PROCESSING 11 -#define PROPERTY_ID_COMMAND 12 -#define PROPERTY_ID_TYPE 13 -#define PROPERTY_ID_TYPENAME 14 -#define PROPERTY_ID_PRECISION 15 -#define PROPERTY_ID_SCALE 16 -#define PROPERTY_ID_ISNULLABLE 17 -#define PROPERTY_ID_ISAUTOINCREMENT 18 -#define PROPERTY_ID_ISROWVERSION 19 -#define PROPERTY_ID_DESCRIPTION 20 -#define PROPERTY_ID_DEFAULTVALUE 21 -#define PROPERTY_ID_NUMBERFORMAT 22 -#define PROPERTY_ID_QUERYTIMEOUT 23 -#define PROPERTY_ID_MAXFIELDSIZE 24 -#define PROPERTY_ID_MAXROWS 25 -#define PROPERTY_ID_CURSORNAME 26 -#define PROPERTY_ID_RESULTSETCONCURRENCY 27 -#define PROPERTY_ID_RESULTSETTYPE 28 -#define PROPERTY_ID_FETCHDIRECTION 29 -#define PROPERTY_ID_FETCHSIZE 30 -#define PROPERTY_ID_USEBOOKMARKS 31 -#define PROPERTY_ID_ISSEARCHABLE 32 -#define PROPERTY_ID_ISCURRENCY 33 -#define PROPERTY_ID_ISSIGNED 34 -#define PROPERTY_ID_DISPLAYSIZE 35 -#define PROPERTY_ID_LABEL 36 -#define PROPERTY_ID_ISREADONLY 37 -#define PROPERTY_ID_ISWRITABLE 38 -#define PROPERTY_ID_ISDEFINITELYWRITABLE 39 -#define PROPERTY_ID_VALUE 40 -#define PROPERTY_ID_TABLENAME 41 -#define PROPERTY_ID_ISCASESENSITIVE 42 -#define PROPERTY_ID_SERVICENAME 43 -#define PROPERTY_ID_ISBOOKMARKABLE 44 -#define PROPERTY_ID_CANUPDATEINSERTEDROWS 45 -#define PROPERTY_ID_ISSET 46 -#define PROPERTY_ID_ISOUTPARAMETER 47 -#define PROPERTY_ID_NUMBERFORMATSSUPPLIER 48 -#define PROPERTY_ID_ISCALCULATED 49 -#define PROPERTY_ID_DATASOURCENAME 50 -#define PROPERTY_ID_TRANSACTIONISOLATION 51 -#define PROPERTY_ID_TYPEMAP 52 -#define PROPERTY_ID_USER 53 -#define PROPERTY_ID_PASSWORD 54 +#define PROPERTY_ID_TITLE 1 +#define PROPERTY_ID_URL 2 +#define PROPERTY_ID_INFO 4 +#define PROPERTY_ID_ISPASSWORDREQUIRED 5 +#define PROPERTY_ID_TABLEFILTER 6 +#define PROPERTY_ID_NAME 7 +#define PROPERTY_ID_SCHEMANAME 8 +#define PROPERTY_ID_CATALOGNAME 9 +#define PROPERTY_ID_PRIVILEGES 10 +#define PROPERTY_ID_ESCAPE_PROCESSING 11 +#define PROPERTY_ID_COMMAND 12 +#define PROPERTY_ID_TYPE 13 +#define PROPERTY_ID_TYPENAME 14 +#define PROPERTY_ID_PRECISION 15 +#define PROPERTY_ID_SCALE 16 +#define PROPERTY_ID_ISNULLABLE 17 +#define PROPERTY_ID_ISAUTOINCREMENT 18 +#define PROPERTY_ID_ISROWVERSION 19 +#define PROPERTY_ID_DESCRIPTION 20 +#define PROPERTY_ID_DEFAULTVALUE 21 +#define PROPERTY_ID_NUMBERFORMAT 22 +#define PROPERTY_ID_QUERYTIMEOUT 23 +#define PROPERTY_ID_MAXFIELDSIZE 24 +#define PROPERTY_ID_MAXROWS 25 +#define PROPERTY_ID_CURSORNAME 26 +#define PROPERTY_ID_RESULTSETCONCURRENCY 27 +#define PROPERTY_ID_RESULTSETTYPE 28 +#define PROPERTY_ID_FETCHDIRECTION 29 +#define PROPERTY_ID_FETCHSIZE 30 +#define PROPERTY_ID_USEBOOKMARKS 31 +#define PROPERTY_ID_ISSEARCHABLE 32 +#define PROPERTY_ID_ISCURRENCY 33 +#define PROPERTY_ID_ISSIGNED 34 +#define PROPERTY_ID_DISPLAYSIZE 35 +#define PROPERTY_ID_LABEL 36 +#define PROPERTY_ID_ISREADONLY 37 +#define PROPERTY_ID_ISWRITABLE 38 +#define PROPERTY_ID_ISDEFINITELYWRITABLE 39 +#define PROPERTY_ID_VALUE 40 +#define PROPERTY_ID_TABLENAME 41 +#define PROPERTY_ID_ISCASESENSITIVE 42 +#define PROPERTY_ID_SERVICENAME 43 +#define PROPERTY_ID_ISBOOKMARKABLE 44 +#define PROPERTY_ID_CANUPDATEINSERTEDROWS 45 +#define PROPERTY_ID_ISSET 46 +#define PROPERTY_ID_ISOUTPARAMETER 47 +#define PROPERTY_ID_NUMBERFORMATSSUPPLIER 48 +#define PROPERTY_ID_ISCALCULATED 49 +#define PROPERTY_ID_DATASOURCENAME 50 +#define PROPERTY_ID_TRANSACTIONISOLATION 51 +#define PROPERTY_ID_TYPEMAP 52 +#define PROPERTY_ID_USER 53 +#define PROPERTY_ID_PASSWORD 54 #define PROPERTY_ID_COMMAND_TYPE 55 -#define PROPERTY_ID_ACTIVECOMMAND 56 -#define PROPERTY_ID_ACTIVE_CONNECTION 57 -#define PROPERTY_ID_FILTER 58 -#define PROPERTY_ID_APPLYFILTER 59 -#define PROPERTY_ID_ORDER 60 -#define PROPERTY_ID_ISMODIFIED 61 -#define PROPERTY_ID_ISNEW 62 -#define PROPERTY_ID_ROWCOUNT 63 -#define PROPERTY_ID_ISROWCOUNTFINAL 64 -#define PROPERTY_ID_HELPFILENAME 65 -#define PROPERTY_ID_REALNAME 66 -#define PROPERTY_ID_HIDDEN 67 -#define PROPERTY_ID_ALIGN 68 -#define PROPERTY_ID_WIDTH 69 -#define PROPERTY_ID_TABLETYPEFILTER 70 +#define PROPERTY_ID_ACTIVECOMMAND 56 +#define PROPERTY_ID_ACTIVE_CONNECTION 57 +#define PROPERTY_ID_FILTER 58 +#define PROPERTY_ID_APPLYFILTER 59 +#define PROPERTY_ID_ORDER 60 +#define PROPERTY_ID_ISMODIFIED 61 +#define PROPERTY_ID_ISNEW 62 +#define PROPERTY_ID_ROWCOUNT 63 +#define PROPERTY_ID_ISROWCOUNTFINAL 64 +#define PROPERTY_ID_HELPFILENAME 65 +#define PROPERTY_ID_REALNAME 66 +#define PROPERTY_ID_HIDDEN 67 +#define PROPERTY_ID_ALIGN 68 +#define PROPERTY_ID_WIDTH 69 +#define PROPERTY_ID_TABLETYPEFILTER 70 #define PROPERTY_ID_DATABASE_LOCATION 71 -#define PROPERTY_ID_FONT 72 -#define PROPERTY_ID_ROW_HEIGHT 73 -#define PROPERTY_ID_TEXTCOLOR 74 -#define PROPERTY_ID_UPDATE_TABLENAME 75 -#define PROPERTY_ID_UPDATE_SCHEMANAME 76 -#define PROPERTY_ID_UPDATE_CATALOGNAME 77 -#define PROPERTY_ID_CONTROLMODEL 78 -#define PROPERTY_ID_RELATIVEPOSITION 79 -#define PROPERTY_ID_ISASCENDING 80 -#define PROPERTY_ID_RELATEDCOLUMN 81 -#define PROPERTY_ID_ISUNIQUE 82 -#define PROPERTY_ID_ISPRIMARYKEYINDEX 83 -#define PROPERTY_ID_IGNORERESULT 84 -#define PROPERTY_ID_DELETERULE 85 -#define PROPERTY_ID_UPDATERULE 86 -#define PROPERTY_ID_REFERENCEDTABLE 87 -#define PROPERTY_ID_REFERENCEDCOLUMN 88 -#define PROPERTY_ID_PARENTWINDOW 89 -#define PROPERTY_ID_SQLEXCEPTION 90 -#define PROPERTY_ID_ISHIDDEN 91 -#define PROPERTY_ID_SUPPRESSVERSIONCL 92 -#define PROPERTY_ID_LAYOUTINFORMATION 93 -#define PROPERTY_ID_TEXTLINECOLOR 94 -#define PROPERTY_ID_TEXTEMPHASIS 95 -#define PROPERTY_ID_TEXTRELIEF 96 -#define PROPERTY_ID_HELPTEXT 97 -#define PROPERTY_ID_CONTROLDEFAULT 98 -#define PROPERTY_ID_AUTOINCREMENTCREATION 99 -#define PROPERTY_ID_SPECIAL_OPTIONS 100 -#define PROPERTY_ID_FONTCHARWIDTH 101 -#define PROPERTY_ID_FONTCHARSET 102 -#define PROPERTY_ID_FONTFAMILY 103 -#define PROPERTY_ID_FONTHEIGHT 104 -#define PROPERTY_ID_FONTKERNING 105 -#define PROPERTY_ID_FONTNAME 106 -#define PROPERTY_ID_FONTORIENTATION 107 -#define PROPERTY_ID_FONTPITCH 108 -#define PROPERTY_ID_FONTSLANT 109 -#define PROPERTY_ID_FONTSTRIKEOUT 110 -#define PROPERTY_ID_FONTSTYLENAME 111 -#define PROPERTY_ID_FONTUNDERLINE 112 -#define PROPERTY_ID_FONTWEIGHT 113 -#define PROPERTY_ID_FONTWIDTH 114 -#define PROPERTY_ID_FONTWORDLINEMODE 115 -#define PROPERTY_ID_FONTTYPE 116 -#define PROPERTY_ID_PERSISTENT_NAME 117 -#define PROPERTY_ID_ORIGINAL 118 -#define PROPERTY_ID_TABSTOP 119 -#define PROPERTY_ID_DEFAULTCONTROL 120 -#define PROPERTY_ID_ENABLED 121 -#define PROPERTY_ID_BORDER 122 -#define PROPERTY_ID_COLUMN 123 -#define PROPERTY_ID_AS_TEMPLATE 124 -#define PROPERTY_ID_IS_FORM 125 -#define PROPERTY_ID_HAVING_CLAUSE 126 -#define PROPERTY_ID_GROUP_BY 127 -#define PROPERTY_ID_EDIT_WIDTH 128 +#define PROPERTY_ID_FONT 72 +#define PROPERTY_ID_ROW_HEIGHT 73 +#define PROPERTY_ID_TEXTCOLOR 74 +#define PROPERTY_ID_UPDATE_TABLENAME 75 +#define PROPERTY_ID_UPDATE_SCHEMANAME 76 +#define PROPERTY_ID_UPDATE_CATALOGNAME 77 +#define PROPERTY_ID_CONTROLMODEL 78 +#define PROPERTY_ID_RELATIVEPOSITION 79 +#define PROPERTY_ID_ISASCENDING 80 +#define PROPERTY_ID_RELATEDCOLUMN 81 +#define PROPERTY_ID_ISUNIQUE 82 +#define PROPERTY_ID_ISPRIMARYKEYINDEX 83 +#define PROPERTY_ID_IGNORERESULT 84 +#define PROPERTY_ID_DELETERULE 85 +#define PROPERTY_ID_UPDATERULE 86 +#define PROPERTY_ID_REFERENCEDTABLE 87 +#define PROPERTY_ID_REFERENCEDCOLUMN 88 +#define PROPERTY_ID_PARENTWINDOW 89 +#define PROPERTY_ID_SQLEXCEPTION 90 +#define PROPERTY_ID_ISHIDDEN 91 +#define PROPERTY_ID_SUPPRESSVERSIONCL 92 +#define PROPERTY_ID_LAYOUTINFORMATION 93 +#define PROPERTY_ID_TEXTLINECOLOR 94 +#define PROPERTY_ID_TEXTEMPHASIS 95 +#define PROPERTY_ID_TEXTRELIEF 96 +#define PROPERTY_ID_HELPTEXT 97 +#define PROPERTY_ID_CONTROLDEFAULT 98 +#define PROPERTY_ID_AUTOINCREMENTCREATION 99 +#define PROPERTY_ID_SPECIAL_OPTIONS 100 +#define PROPERTY_ID_FONTCHARWIDTH 101 +#define PROPERTY_ID_FONTCHARSET 102 +#define PROPERTY_ID_FONTFAMILY 103 +#define PROPERTY_ID_FONTHEIGHT 104 +#define PROPERTY_ID_FONTKERNING 105 +#define PROPERTY_ID_FONTNAME 106 +#define PROPERTY_ID_FONTORIENTATION 107 +#define PROPERTY_ID_FONTPITCH 108 +#define PROPERTY_ID_FONTSLANT 109 +#define PROPERTY_ID_FONTSTRIKEOUT 110 +#define PROPERTY_ID_FONTSTYLENAME 111 +#define PROPERTY_ID_FONTUNDERLINE 112 +#define PROPERTY_ID_FONTWEIGHT 113 +#define PROPERTY_ID_FONTWIDTH 114 +#define PROPERTY_ID_FONTWORDLINEMODE 115 +#define PROPERTY_ID_FONTTYPE 116 +#define PROPERTY_ID_PERSISTENT_NAME 117 +#define PROPERTY_ID_ORIGINAL 118 +#define PROPERTY_ID_TABSTOP 119 +#define PROPERTY_ID_DEFAULTCONTROL 120 +#define PROPERTY_ID_ENABLED 121 +#define PROPERTY_ID_BORDER 122 +#define PROPERTY_ID_COLUMN 123 +#define PROPERTY_ID_AS_TEMPLATE 124 +#define PROPERTY_ID_IS_FORM 125 +#define PROPERTY_ID_HAVING_CLAUSE 126 +#define PROPERTY_ID_GROUP_BY 127 +#define PROPERTY_ID_EDIT_WIDTH 128 #define PROPERTY_ID_SETTINGS 129 #define PROPERTY_ID_CONNECTION_RESOURCE 130 #define PROPERTY_ID_RESULT_SET 131 @@ -184,7 +184,7 @@ #define PROPERTY_ID_CURRENT_QUERY_DESIGN 144 #define PROPERTY_ID_SINGLESELECTQUERYCOMPOSER 145 #define PROPERTY_ID_PROPCHANGE_NOTIFY 146 - + //============================================================ //= property names //============================================================ diff --git a/dbaccess/source/inc/xmlstrings.hrc b/dbaccess/source/inc/xmlstrings.hrc index db5a729e2ea6..82fcbab8b94d 100644 --- a/dbaccess/source/inc/xmlstrings.hrc +++ b/dbaccess/source/inc/xmlstrings.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/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx index ed756b98a76c..12aa55645211 100644 --- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx +++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sdbtools //==================================================================== //= ConnectionDependentComponent //==================================================================== - class ConnectionDependentComponent + class ConnectionDependentComponent { private: mutable ::osl::Mutex m_aMutex; diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index 5f1e8153f278..cba20331f537 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,14 +92,14 @@ namespace sdbtools EntryGuard aGuard( *this ); return new TableName( getContext(), getConnection() ); } - + //-------------------------------------------------------------------- Reference< XObjectNames > SAL_CALL ConnectionTools::getObjectNames() throw (RuntimeException) { EntryGuard aGuard( *this ); return new ObjectNames( getContext(), getConnection() ); } - + //-------------------------------------------------------------------- Reference< XDataSourceMetaData > SAL_CALL ConnectionTools::getDataSourceMetaData() throw (RuntimeException) { @@ -130,7 +130,7 @@ namespace sdbtools { return getImplementationName_static(); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL ConnectionTools::supportsService(const ::rtl::OUString & _ServiceName) throw (RuntimeException) { @@ -139,7 +139,7 @@ namespace sdbtools const ::rtl::OUString* end = aSupported.getConstArray() + aSupported.getLength(); return ::std::find( begin, end, _ServiceName ) != end; } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames() throw (RuntimeException) { @@ -151,7 +151,7 @@ namespace sdbtools { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.dbaccess.ConnectionTools" ) ); } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static() { @@ -159,13 +159,13 @@ namespace sdbtools aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.tools.ConnectionTools" ) ); return aSupported; } - + //-------------------------------------------------------------------- Reference< XInterface > SAL_CALL ConnectionTools::Create(const Reference< XComponentContext >& _rxContext ) { return *( new ConnectionTools( ::comphelper::ComponentContext( _rxContext ) ) ); } - + //-------------------------------------------------------------------- void SAL_CALL ConnectionTools::initialize(const Sequence< Any > & _rArguments) throw (RuntimeException, Exception) { diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx index ed1372e5eb89..a85ade7020ca 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx index ef76d96eed95..169230063d58 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx index 440b1f6c2c81..41f19047b2e8 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 0b64bca252ef..d7a487289df8 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -200,7 +200,7 @@ namespace sdbtools if ( ( _rName.indexOf( (sal_Unicode)34 ) >= 0 ) // " || ( _rName.indexOf( (sal_Unicode)39 ) >= 0 ) // ' || ( _rName.indexOf( (sal_Unicode)96 ) >= 0 ) // - || ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) // + || ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) // || ( _rName.indexOf( (sal_Unicode)146 ) >= 0 ) // || ( _rName.indexOf( (sal_Unicode)180 ) >= 0 ) // #86621# removed unparsable chars ) @@ -448,7 +448,7 @@ namespace sdbtools return sName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL ObjectNames::convertToSQLName( const ::rtl::OUString& Name ) throw (RuntimeException) { @@ -456,7 +456,7 @@ namespace sdbtools Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), UNO_QUERY_THROW ); return ::dbtools::convertName2SQLName( Name, xMeta->getExtraNameCharacters() ); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException) { @@ -465,7 +465,7 @@ namespace sdbtools PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), _CommandType, getConnection()) ); return !pNameCheck->validateName( _Name ); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException) { @@ -474,7 +474,7 @@ namespace sdbtools PNameValidation pNameCheck( NameCheckFactory::createValidityCheck( getContext(), _CommandType, getConnection()) ); return pNameCheck->validateName( _Name ); } - + //-------------------------------------------------------------------- void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (SQLException, RuntimeException) { diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index de2b95951c62..4a9609a0d064 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index 4d6357a88d1b..cc704122134e 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,49 +108,49 @@ namespace sdbtools EntryGuard aGuard( *this ); return m_pImpl->sCatalog; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setCatalogName( const ::rtl::OUString& _catalogName ) throw (RuntimeException) { EntryGuard aGuard( *this ); m_pImpl->sCatalog = _catalogName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL TableName::getSchemaName() throw (RuntimeException) { EntryGuard aGuard( *this ); return m_pImpl->sSchema; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setSchemaName( const ::rtl::OUString& _schemaName ) throw (RuntimeException) { EntryGuard aGuard( *this ); m_pImpl->sSchema = _schemaName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL TableName::getTableName() throw (RuntimeException) { EntryGuard aGuard( *this ); return m_pImpl->sName; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setTableName( const ::rtl::OUString& _tableName ) throw (RuntimeException) { EntryGuard aGuard( *this ); m_pImpl->sName = _tableName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL TableName::getNameForSelect() throw (RuntimeException) { EntryGuard aGuard( *this ); return composeTableNameForSelect( getConnection(), m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName ); } - + //-------------------------------------------------------------------- Reference< XPropertySet > SAL_CALL TableName::getTable() throw (NoSuchElementException, RuntimeException) { @@ -178,7 +178,7 @@ namespace sdbtools return xTable; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setTable( const Reference< XPropertySet >& _table ) throw (IllegalArgumentException, RuntimeException) { @@ -208,7 +208,7 @@ namespace sdbtools throw IllegalArgumentException( e.Message, e.Context, 0 ); } } - + //-------------------------------------------------------------------- namespace { @@ -218,7 +218,7 @@ namespace sdbtools */ EComposeRule lcl_translateCompositionType_throw( sal_Int32 _nType ) { - struct + struct { sal_Int32 nCompositionType; EComposeRule eComposeRule; @@ -258,7 +258,7 @@ namespace sdbtools m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName, _Quote, lcl_translateCompositionType_throw( _Type ) ); } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setComposedName( const ::rtl::OUString& _ComposedName, ::sal_Int32 _Type ) throw (RuntimeException) { diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index d165fc8680fe..073a6ed34791 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx index 938ec38c6aca..185d9b1adef9 100644 --- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx +++ b/dbaccess/source/sdbtools/inc/module_sdbt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc index 1a23ab206fd8..5b94f748b7ae 100644 --- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc +++ b/dbaccess/source/sdbtools/inc/sdbt_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 @@ -33,7 +33,7 @@ #endif //------------------------------------------------------------------------------ -#define RID_SDBT_STRINGS_START RID_DBACCESS_START +#define RID_SDBT_STRINGS_START RID_DBACCESS_START //------------------------------------------------------------------------------ //- String-IDs diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx index f84822c1d25a..e90999ced2be 100644 --- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx +++ b/dbaccess/source/sdbtools/misc/module_sdbt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index dcea32927e21..06bfebaf2602 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ extern "C" void SAL_CALL sdbt_initializeModule() //--------------------------------------------------------------------------------------- extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { sdbt_initializeModule(); @@ -70,8 +70,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { return ::sdbtools::SdbtModule::getInstance().writeComponentInfos( static_cast<XMultiServiceFactory*>(pServiceManager), diff --git a/dbaccess/source/sdbtools/resource/sdbt_strings.src b/dbaccess/source/sdbtools/resource/sdbt_strings.src index bd6d7d49f5c1..f19a52c4b2c0 100644 --- a/dbaccess/source/sdbtools/resource/sdbt_strings.src +++ b/dbaccess/source/sdbtools/resource/sdbt_strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/cfg_reghelper.cxx b/dbaccess/source/shared/cfg_reghelper.cxx index e4565b27e9f3..5d88ab515bb3 100644 --- a/dbaccess/source/shared/cfg_reghelper.cxx +++ b/dbaccess/source/shared/cfg_reghelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/cfgstrings.cxx b/dbaccess/source/shared/cfgstrings.cxx index a08cb3227a28..b13623ed3c4f 100644 --- a/dbaccess/source/shared/cfgstrings.cxx +++ b/dbaccess/source/shared/cfgstrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace dbacfg IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_PASSWORDREQUIRED, "IsPasswordRequired"); IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_SUPPRESSVERSIONCL, "SuppressVersionColumns"); IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_BOOKMARKS, "Bookmarks"); - + IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COMMAND, "Command"); IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_ESCAPE_PROCESSING, "EscapeProcessing"); IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_TABLENAME, "UpdateTableName"); diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx index 3acbee9d2d91..51e258d47be3 100644 --- a/dbaccess/source/shared/dbu_reghelper.cxx +++ b/dbaccess/source/shared/dbu_reghelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx index 6352e15fb72c..6224ca151962 100644 --- a/dbaccess/source/shared/dbustrings.cxx +++ b/dbaccess/source/shared/dbustrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,13 +50,13 @@ namespace dbaui //============================================================ //= service names //============================================================ - IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG, "org.openoffice.comp.dbu.DirectSqlDialog"); + IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG, "org.openoffice.comp.dbu.DirectSqlDialog"); //============================================================ //= other //============================================================ - IMPLEMENT_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW, "QueryPreview"); - IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTROLDEFAULT, "com.sun.star.comp.dbu.OColumnControl"); + IMPLEMENT_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW, "QueryPreview"); + IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTROLDEFAULT, "com.sun.star.comp.dbu.OColumnControl"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_QUERYDESIGNVIEW, "QueryDesignView"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GRAPHICAL_DESIGN, "GraphicalDesign"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HELP_URL, "HelpURL"); @@ -64,8 +64,8 @@ namespace dbaui //============================================================ //= properties //============================================================ - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE, "TriState"); - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLEOUTERJOIN, "EnableOuterJoinEscape"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE, "TriState"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLEOUTERJOIN, "EnableOuterJoinEscape"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABSTOP, "TabStop"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL, "DefaultControl"); diff --git a/dbaccess/source/shared/flt_reghelper.cxx b/dbaccess/source/shared/flt_reghelper.cxx index bf98c4ddd82d..bbe5063295da 100644 --- a/dbaccess/source/shared/flt_reghelper.cxx +++ b/dbaccess/source/shared/flt_reghelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx index 56246cee507a..4b2f1cba944b 100644 --- a/dbaccess/source/shared/registrationhelper.cxx +++ b/dbaccess/source/shared/registrationhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,10 +37,10 @@ using namespace ::com::sun::star; using namespace ::comphelper; using namespace ::cppu; -uno::Sequence< ::rtl::OUString >* OModuleRegistration::s_pImplementationNames = NULL; -uno::Sequence< uno::Sequence< ::rtl::OUString > >* OModuleRegistration::s_pSupportedServices = NULL; -uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = NULL; -uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = NULL; +uno::Sequence< ::rtl::OUString >* OModuleRegistration::s_pImplementationNames = NULL; +uno::Sequence< uno::Sequence< ::rtl::OUString > >* OModuleRegistration::s_pSupportedServices = NULL; +uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = NULL; +uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OModuleRegistration::registerComponent( @@ -61,9 +61,9 @@ void OModuleRegistration::registerComponent( OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModuleRegistration::registerComponent : inconsistent state (the pointers (2)) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModuleRegistration::registerComponent : inconsistent state !"); sal_Int32 nOldLen = s_pImplementationNames->getLength(); @@ -88,9 +88,9 @@ void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementatio } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModuleRegistration::revokeComponent : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModuleRegistration::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -130,9 +130,9 @@ sal_Bool OModuleRegistration::writeComponentInfos( } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModuleRegistration::writeComponentInfos : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModuleRegistration::writeComponentInfos : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -179,9 +179,9 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModuleRegistration::getComponentFactory : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModuleRegistration::getComponentFactory : inconsistent state !"); diff --git a/dbaccess/source/shared/sdbtstrings.cxx b/dbaccess/source/shared/sdbtstrings.cxx index aa531d01f59d..6203ffb710b5 100644 --- a/dbaccess/source/shared/sdbtstrings.cxx +++ b/dbaccess/source/shared/sdbtstrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx index 4ae1bf472495..b531cf0bac2a 100644 --- a/dbaccess/source/shared/xmlstrings.cxx +++ b/dbaccess/source/shared/xmlstrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 68d5aac5fa33..ab511cb54efa 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -426,8 +426,8 @@ void SAL_CALL OApplicationController::disposing() ::comphelper::NamedValueCollection aArgs( m_xModel->getArgs() ); if ( true == aArgs.getOrDefault( "PickListEntry", true ) ) { - ::rtl::OUString aFilter; - INetURLObject aURL( m_xModel->getURL() ); + ::rtl::OUString aFilter; + INetURLObject aURL( m_xModel->getURL() ); const SfxFilter* pFilter = getStandardDatabaseFilter(); if ( pFilter ) aFilter = pFilter->GetFilterName(); @@ -1449,7 +1449,7 @@ void OApplicationController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:Save", ID_BROWSER_SAVEDOC, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( ".uno:SaveAs", ID_BROWSER_SAVEASDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:SendMail", SID_MAIL_SENDDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( ".uno:SendMail", SID_MAIL_SENDDOC, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( ".uno:DBSendReportAsMail",SID_DB_APP_SENDREPORTASMAIL, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( ".uno:DBSendReportToWriter",SID_DB_APP_SENDREPORTTOWRITER, @@ -1461,7 +1461,7 @@ void OApplicationController::describeSupportedFeatures() SID_FORM_CREATE_REPWIZ_PRE_SEL, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:DBNewReport", SID_APP_NEW_REPORT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:DBNewReport", SID_APP_NEW_REPORT, CommandGroup::INSERT ); implDescribeSupportedFeature( ".uno:DBNewReportAutoPilot", ID_DOCUMENT_CREATE_REPWIZ, CommandGroup::INSERT ); implDescribeSupportedFeature( ".uno:DBNewReportAutoPilotWithPreSelection", @@ -1478,7 +1478,7 @@ void OApplicationController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:DBNewViewSQL", SID_DB_NEW_VIEW_SQL, CommandGroup::INSERT ); implDescribeSupportedFeature( ".uno:DBDelete", SID_DB_APP_DELETE, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:Delete", SID_DB_APP_DELETE, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:Delete", SID_DB_APP_DELETE, CommandGroup::EDIT ); implDescribeSupportedFeature( ".uno:DBRename", SID_DB_APP_RENAME, CommandGroup::EDIT ); implDescribeSupportedFeature( ".uno:DBEdit", SID_DB_APP_EDIT, CommandGroup::EDIT ); implDescribeSupportedFeature( ".uno:DBEditSqlView", SID_DB_APP_EDIT_SQL_VIEW, CommandGroup::EDIT ); @@ -1539,18 +1539,18 @@ void OApplicationController::describeSupportedFeatures() // this one should not appear under Tools->Customize->Keyboard implDescribeSupportedFeature( ".uno:DBNewReportWithPreSelection", SID_APP_NEW_REPORT_PRE_SEL,CommandGroup::INTERNAL ); - implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBDBAdmin", SID_DB_APP_DBADMIN, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBDBAdmin", SID_DB_APP_DBADMIN, CommandGroup::INTERNAL); // status info - implDescribeSupportedFeature( ".uno:DBStatusType", SID_DB_APP_STATUS_TYPE, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBStatusDBName", SID_DB_APP_STATUS_DBNAME, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBStatusUserName", SID_DB_APP_STATUS_USERNAME, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBStatusHostName", SID_DB_APP_STATUS_HOSTNAME, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusType", SID_DB_APP_STATUS_TYPE, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusDBName", SID_DB_APP_STATUS_DBNAME, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusUserName", SID_DB_APP_STATUS_USERNAME, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusHostName", SID_DB_APP_STATUS_HOSTNAME, CommandGroup::INTERNAL); } // ----------------------------------------------------------------------------- -OApplicationView* OApplicationController::getContainer() const +OApplicationView* OApplicationController::getContainer() const { return static_cast< OApplicationView* >( getView() ); } @@ -1667,7 +1667,7 @@ void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rE default: break; } - // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName); + // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName); } catch( Exception& ) { @@ -2167,7 +2167,7 @@ void OApplicationController::renameEntry() { ::rtl::OUString sName = aDialog->getName(); ::rtl::OUString sCatalog = aDialog->getCatalog(); - ::rtl::OUString sSchema = aDialog->getSchema(); + ::rtl::OUString sSchema = aDialog->getSchema(); sNewName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sName, sal_False, ::dbtools::eInDataManipulation ); } @@ -2533,18 +2533,18 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) m_nAsyncDrop = 0; m_aAsyncDrop.aDroppedData.clear(); - m_aAsyncDrop.nType = pView->getElementType(); - m_aAsyncDrop.nAction = _rEvt.mnAction; - m_aAsyncDrop.bError = sal_False; - m_aAsyncDrop.bHtml = sal_False; - m_aAsyncDrop.aUrl = ::rtl::OUString(); + m_aAsyncDrop.nType = pView->getElementType(); + m_aAsyncDrop.nAction = _rEvt.mnAction; + m_aAsyncDrop.bError = sal_False; + m_aAsyncDrop.bHtml = sal_False; + m_aAsyncDrop.aUrl = ::rtl::OUString(); // loop through the available formats and see what we can do ... // first we have to check if it is our own format, if not we have to copy the stream :-( if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(aDroppedData.GetDataFlavorExVector()) ) { - m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); + m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); // asyncron because we some dialogs and we aren't allowed to show them while in D&D m_nAsyncDrop = Application::PostUserEvent(LINK(this, OApplicationController, OnAsyncDrop)); @@ -2850,7 +2850,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer { ElementType eType = E_NONE; const NamedValue* pIter = aCurrentSelection.getConstArray(); - const NamedValue* pEnd = pIter + aCurrentSelection.getLength(); + const NamedValue* pEnd = pIter + aCurrentSelection.getLength(); for(;pIter != pEnd;++pIter) { if ( pIter->Name.equalsAscii("Type") ) @@ -3012,7 +3012,7 @@ void OApplicationController::impl_migrateScripts_nothrow() } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index fd484c686616..a56989731b44 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ namespace dbaui , ::com::sun::star::sdb::application::XDatabaseDocumentUI , ::com::sun::star::ui::XContextMenuInterception , ::com::sun::star::view::XSelectionSupplier - > OApplicationController_Base; + > OApplicationController_Base; class SelectionNotifier; @@ -103,14 +103,14 @@ namespace dbaui private: - OTableCopyHelper::DropDescriptor m_aAsyncDrop; + OTableCopyHelper::DropDescriptor m_aAsyncDrop; SharedConnection m_xDataSourceConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - OModuleClient m_aModuleClient; - TransferableDataHelper m_aSystemClipboard; // content of the clipboard + OModuleClient m_aModuleClient; + TransferableDataHelper m_aSystemClipboard; // content of the clipboard ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > @@ -120,21 +120,21 @@ namespace dbaui ::cppu::OInterfaceContainerHelper m_aContextMenuInterceptors; - TContainerVector m_aCurrentContainers; // the containers where we are listener on + TContainerVector m_aCurrentContainers; // the containers where we are listener on ::rtl::Reference< SubComponentManager > m_pSubComponentManager; - ::dbaccess::ODsnTypeCollection + ::dbaccess::ODsnTypeCollection m_aTypeCollection; OTableCopyHelper m_aTableCopyHelper; TransferableClipboardListener* - m_pClipbordNotifier; // notifier for changes in the clipboard - ULONG m_nAsyncDrop; + m_pClipbordNotifier; // notifier for changes in the clipboard + ULONG m_nAsyncDrop; OAsyncronousLink m_aControllerConnectedEvent; OAsyncronousLink m_aSelectContainerEvent; - PreviewMode m_ePreviewMode; // the mode of the preview - ElementType m_eCurrentType; - sal_Bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date - sal_Bool m_bSuspended; // is true when the controller was already suspended + PreviewMode m_ePreviewMode; // the mode of the preview + ElementType m_eCurrentType; + sal_Bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date + sal_Bool m_bSuspended; // is true when the controller was already suspended ::std::auto_ptr< SelectionNotifier > m_pSelectionNotifier; @@ -143,7 +143,7 @@ namespace dbaui private: - OApplicationView* getContainer() const; + OApplicationView* getContainer() const; /** returns the database name @@ -159,17 +159,17 @@ namespace dbaui ::rtl::OUString getStrippedDatabaseName() const; /** return the element type for given container - @param _xContainer The container where the element type has to be found - @return the element type coressponding to the given container + @param _xContainer The container where the element type has to be found + @return the element type coressponding to the given container */ ElementType getElementType(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer) const; /** opens a new frame with either the table or the query or report or form or view - @param _sName + @param _sName The name of the object to open - @param _eType + @param _eType Defines the type to open - @param _eOpenMode + @param _eOpenMode denotes the mode in which to open the object @param _nInstigatorCommand denotes the command which instigated the action. Might be 0. @@ -193,9 +193,9 @@ namespace dbaui ); /** opens a new frame for creation or auto pilot - @param _eType + @param _eType Defines the type to open - @param i_rAdditionalArguments + @param i_rAdditionalArguments Additional arguments to pass when creating the component */ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > @@ -215,7 +215,7 @@ namespace dbaui void newElementWithPilot( ElementType _eType ); /** converts the query to a view - @param _sName + @param _sName The name of the query. */ void convertToView(const ::rtl::OUString& _sName); @@ -236,19 +236,19 @@ namespace dbaui void renameEntry(); /** deletes queries, forms, or reports - @param _eType + @param _eType the type of the objects - @param _rList + @param _rList The names of the elements to delete - @param _bConfirm + @param _bConfirm determines whether the user must confirm the deletion */ - void deleteObjects( ElementType _eType, + void deleteObjects( ElementType _eType, const ::std::vector< ::rtl::OUString>& _rList, bool _bConfirm ); /** deletes tables. - @param _rList + @param _rList The list of tables. */ void deleteTables(const ::std::vector< ::rtl::OUString>& _rList); @@ -260,9 +260,9 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getElements(ElementType _eType); /** returns the document access for the specific type - @param _eType + @param _eType the type - @return ::std::auto_ptr<OLinkedDocumentsAccess> + @return ::std::auto_ptr<OLinkedDocumentsAccess> */ ::std::auto_ptr<OLinkedDocumentsAccess> getDocumentsAccess(ElementType _eType); @@ -270,19 +270,19 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer> getQueryDefintions() const; /** pastes a special format from the system clipboard to the currently selected object types - @param _nFormatId + @param _nFormatId The format to be copied. */ void pasteFormat(sal_uInt32 _nFormatId); /** pastes a query, form or report into the data source - @param _eType + @param _eType The type of the object to paste. - @param _rPasteData + @param _rPasteData The data descriptor. - @param _sParentFolder + @param _sParentFolder The name of the parent folder if it exists. - @param _bMove + @param _bMove if <TRUE/> the name of the content must be inserted without any change, otherwise not. @return <TRUE/> if the paste opertions was successfull, otherwise <FALSE/>. @@ -296,21 +296,21 @@ namespace dbaui sal_Bool isTableFormat() const; /** fills the vector with all supported formats - @param _eType + @param _eType The type for which we need the formats - @param _rFormatIds + @param _rFormatIds The vector to be filled up. */ void getSupportedFormats(ElementType _eType,::std::vector<SotFormatStringId>& _rFormatIds) const; /** adds a listener to the current name access. - @param _xCollection + @param _xCollection The collection where we want to listen on. */ void addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xCollection); /** opens a uno dialog withthe currently selected data source as initialize argument - @param _sServiceName + @param _sServiceName The serivce name of the dialog to be executed. */ void openDialog(const ::rtl::OUString& _sServiceName); @@ -344,35 +344,35 @@ namespace dbaui ); /** Inserts a new object into the hierachy given be the type. - @param _eType + @param _eType Where to insert the new item. - @param _sParentFolder + @param _sParentFolder The name of the parent folder if it exists. - @param _xContent + @param _xContent The content to insert. - @param _bMove + @param _bMove if <TRUE/> the name of the content must be inserted without any change, otherwise not. @return <TRUE/> if the insert opertions was successfull, otherwise <FALSE/>. */ - sal_Bool insertHierachyElement( ElementType _eType + sal_Bool insertHierachyElement( ElementType _eType ,const String& _sParentFolder ,sal_Bool _bCollection = sal_True ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>() ,sal_Bool _bMove = sal_False); /** checks if delete command or rename comamnd is allowed - @param _eType + @param _eType The element type. - @param _bDelete + @param _bDelete If <TRUE> then the delete command should be checked. @return <TRUE> if the command is allowed */ sal_Bool isRenameDeleteAllowed(ElementType _eType,sal_Bool _bDelete) const; /** all selected entries will be opened, or edited, or converted to a view - @param _nId + @param _nId The slot which should be executed. - @param _eOpenMode + @param _eOpenMode Defines the mode of opening. @see ElementOpenMode */ void doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMode); @@ -413,12 +413,12 @@ namespace dbaui /** forces usage of a connection which we do not own <p>To be used from within XInitialization::initialize only.</p> */ - void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); + void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); // OGenericUnoController virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager ); @@ -531,9 +531,9 @@ namespace dbaui // IControlActionListener overridables virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const; - virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); - virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); - virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); + virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); + virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); // IContextMenuProvider (base of IApplicationController) virtual PopupMenu* getContextMenu( Control& _rControl ) const; @@ -555,11 +555,11 @@ namespace dbaui /** disconnects from our XConnection, and cleans up this connection */ - virtual void disconnect(); + virtual void disconnect(); // late construction - virtual sal_Bool Construct(Window* pParent); - virtual void describeSupportedFeatures(); + virtual sal_Bool Construct(Window* pParent); + virtual void describeSupportedFeatures(); protected: // XEventListener @@ -570,7 +570,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBAUI_APPCONTROLLER_HXX diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index b89f72956344..a5d3f331283f 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -512,7 +512,7 @@ TransferableHelper* OApplicationController::copyObject() ::rtl::OUString sName = getContainer()->getQualifiedName( NULL ); if ( sName.getLength() ) { - ::rtl::OUString sDataSource = getDatabaseName(); + ::rtl::OUString sDataSource = getDatabaseName(); if ( eType == E_TABLE ) { @@ -564,22 +564,22 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc { sal_Int32 nCommandType = CommandType::TABLE; if ( _rPasteData.has(daCommandType) ) - _rPasteData[daCommandType] >>= nCommandType; + _rPasteData[daCommandType] >>= nCommandType; if ( CommandType::QUERY == nCommandType || CommandType::COMMAND == nCommandType ) { // read all nescessary data - ::rtl::OUString sCommand; + ::rtl::OUString sCommand; sal_Bool bEscapeProcessing = sal_True; _rPasteData[daCommand] >>= sCommand; if ( _rPasteData.has(daEscapeProcessing) ) - _rPasteData[daEscapeProcessing] >>= bEscapeProcessing; + _rPasteData[daEscapeProcessing] >>= bEscapeProcessing; // plausibility check sal_Bool bValidDescriptor = sal_False; - ::rtl::OUString sDataSourceName = _rPasteData.getDataSource(); + ::rtl::OUString sDataSourceName = _rPasteData.getDataSource(); if (CommandType::QUERY == nCommandType) bValidDescriptor = sDataSourceName.getLength() && sCommand.getLength(); else if (CommandType::COMMAND == nCommandType) @@ -629,7 +629,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc bSuccess = true; } } - catch(SQLException&) { throw; } // caught and handled by the outer catch + catch(SQLException&) { throw; } // caught and handled by the outer catch catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -665,7 +665,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc has a /table/ with that name) */ if ( bNeedAskForName ) { - OSaveAsDlg aAskForName( getView(), + OSaveAsDlg aAskForName( getView(), CommandType::QUERY, getORB(), getConnection(), @@ -710,7 +710,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc Sequence< ::rtl::OUString> aSeq = xSrcNameAccess->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for( ; pIter != pEnd ; ++pIter) { Reference<XPropertySet> xSrcProp(xSrcNameAccess->getByName(*pIter),UNO_QUERY); @@ -811,7 +811,7 @@ IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) return 0L; } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 906607406e3a..f84b2293fa73 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -164,7 +164,7 @@ void OApplicationController::convertToView(const ::rtl::OUString& _sName) { ::rtl::OUString sName = aDlg.getName(); ::rtl::OUString sCatalog = aDlg.getCatalog(); - ::rtl::OUString sSchema = aDlg.getSchema(); + ::rtl::OUString sSchema = aDlg.getSchema(); ::rtl::OUString sNewName( ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, sal_False, ::dbtools::eInTableDefinitions ) ); Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject); @@ -794,7 +794,7 @@ void OApplicationController::doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMod // special handling for mail, if more than one document is selected attach them all if ( _eOpenMode == E_OPEN_FOR_MAIL ) { - + ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentIter = aCompoments.begin(); ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentEnd = aCompoments.end(); ::rtl::OUString aDocTypeString; @@ -839,7 +839,7 @@ ElementType OApplicationController::getElementType(const Reference< XContainer > } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index d89c495e5106..12f75c8db281 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index cb4a79970fca..663f69c02a98 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,15 +58,15 @@ namespace dbaui class OPreviewWindow : public Window { - GraphicObject m_aGraphicObj; - Rectangle m_aPreviewRect; + GraphicObject m_aGraphicObj; + Rectangle m_aPreviewRect; /** gets the graphic cnter rect - @param rGraphic + @param rGraphic the graphic - @param rResultRect + @param rResultRect the resulting rectangle - + @return <TRUE/> when successfull */ @@ -88,17 +88,17 @@ namespace dbaui //================================================================== class OAppDetailPageHelper : public Window { - DBTreeListBox* m_pLists[ELEMENT_COUNT]; - OAppBorderWindow& m_rBorderWin; - FixedLine m_aFL; - ToolBox m_aTBPreview; - Window m_aBorder; - OPreviewWindow m_aPreview; + DBTreeListBox* m_pLists[ELEMENT_COUNT]; + OAppBorderWindow& m_rBorderWin; + FixedLine m_aFL; + ToolBox m_aTBPreview; + Window m_aBorder; + OPreviewWindow m_aPreview; ::svtools::ODocumentInfoPreview m_aDocumentInfo; - Window* m_pTablePreview; + Window* m_pTablePreview; ::std::auto_ptr<PopupMenu> m_aMenu; - PreviewMode m_ePreviewMode; + PreviewMode m_ePreviewMode; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference < ::com::sun::star::io::XPersist > @@ -110,9 +110,9 @@ namespace dbaui int getVisibleControlIndex() const; /** sorts the entries in the tree list box. - @param _nPos + @param _nPos Which list should be sorted. - @param _eSortMode + @param _eSortMode How should be sorted. */ void sort(int _nPos,SvSortMode _eSortMode ); @@ -122,15 +122,15 @@ namespace dbaui void getElementIcons( ElementType _eType, USHORT& _rImageId, USHORT& _rHighContrastImageId ); /** fills the names in the listbox - @param _xContainer + @param _xContainer This can either be the queries, forms or report names. - @param _eType + @param _eType the type of elements which are being filled @param _nImageId the resource id of the image to use for non-container entries @param _nHighContrastImageId the resource id of the high contrast image to use for non-container entries - @param _pParent + @param _pParent The parent of the entries to be inserted. */ void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer, @@ -140,17 +140,17 @@ namespace dbaui SvLBoxEntry* _pParent ); /** sets the detail page - @param _pWindow + @param _pWindow The control which should be visible. */ void setDetailPage(Window* _pWindow); /** sets all HandleCallbacks - @param _pTreeView + @param _pTreeView The newly created DBTreeListBox - @param _rImage + @param _rImage the resource id of the default icon - @param _rImageHC + @param _rImageHC the resource id of the default icon (HC version) @return The new tree. @@ -158,24 +158,24 @@ namespace dbaui DBTreeListBox* createTree( DBTreeListBox* _pTreeView, const Image& _rImage, const Image& _rImageHC ); /** creates the tree and sets all HandleCallbacks - @param _nHelpId + @param _nHelpId The help id of the control - @param _nCollapsedBitmap + @param _nCollapsedBitmap The image to use for tree entries. - @param _rImageHC + @param _rImageHC The image to use in high contrast mode. @return The new tree. */ DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC ); - DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); - DECL_LINK( OnEntrySelChange, void* ); + DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); + DECL_LINK( OnEntrySelChange, void* ); - DECL_LINK( OnCutEntry, void* ); - DECL_LINK( OnCopyEntry, void* ); - DECL_LINK( OnPasteEntry, void* ); - DECL_LINK( OnDeleteEntry, void* ); + DECL_LINK( OnCutEntry, void* ); + DECL_LINK( OnCopyEntry, void* ); + DECL_LINK( OnPasteEntry, void* ); + DECL_LINK( OnDeleteEntry, void* ); DECL_LINK(PreviewChangeHdl, void*); // click a TB slot @@ -200,27 +200,27 @@ namespace dbaui void paste(); /** creates the tables page - @param _xConnection + @param _xConnection The connection to get the table names */ void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** creates the page for the specific type. - @param _eType + @param _eType The type which should be created. E_TABLE isn't allowed. - @param _xContainer + @param _xContainer The container of the elements to be inserted. */ void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer); /** returns the current visible tree list box */ - inline DBTreeListBox* getCurrentView() const - { + inline DBTreeListBox* getCurrentView() const + { ElementType eType = getElementType(); - return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)] : NULL; + return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)] : NULL; } - + /// select all entries in the visible control void selectAll(); @@ -234,7 +234,7 @@ namespace dbaui void sortUp(); /** returns the element names which are selected - @param _rNames + @param _rNames The list will be filled. */ void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; @@ -260,8 +260,8 @@ namespace dbaui void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); /** return the qualified name. - @param _pEntry - The entry of a table, or query, form, report to get the qualified name. + @param _pEntry + The entry of a table, or query, form, report to get the qualified name. If the entry is <NULL/>, the first selected is chosen. @return the qualified name @@ -300,13 +300,13 @@ namespace dbaui sal_Bool isFilled() const; /** adds a new object to the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the object to be inserted - @param _rObject + @param _rObject The object to add. - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ SvLBoxEntry* elementAdded(ElementType eType @@ -314,13 +314,13 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one - @param _eType + @param _eType The type where the entry shold be appended. - @param _rOldName + @param _rOldName The old name of the object to be replaced - @param _rNewName + @param _rNewName The new name of the object to be replaced - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ void elementReplaced(ElementType eType @@ -328,17 +328,17 @@ namespace dbaui ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the element to be removed. - @param _rxConn + @param _rxConn If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType ,const ::rtl::OUString& _rName ); - + /// returns the preview mode PreviewMode getPreviewMode(); @@ -346,29 +346,29 @@ namespace dbaui sal_Bool isPreviewEnabled(); /** switches to the given preview mode - @param _eMode + @param _eMode the mode to set for the preview - @param _bForce + @param _bForce Force the preview to be resetted */ void switchPreview(PreviewMode _eMode,BOOL _bForce = FALSE); /** shows the Preview of the content when it is enabled. - @param _xContent + @param _xContent The content which must support the "preview" command. */ void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); /** shows the Preview of a table or query - @param _sDataSourceName + @param _sDataSourceName the name of the data source - @param _sName + @param _sName the name of table or query - @param _bTable + @param _bTable <TRUE/> if it is a table, otherwise <FALSE/> - @return void + @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const ::rtl::OUString& _sDataSourceName, const ::rtl::OUString& _sName, sal_Bool _bTable); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 4003c14e854c..60b26dc005d9 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ using namespace ::com::sun::star::beans; using ::com::sun::star::util::URL; using ::com::sun::star::sdb::application::NamedDatabaseObject; -#define SPACEBETWEENENTRIES 4 +#define SPACEBETWEENENTRIES 4 // ----------------------------------------------------------------------------- TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled ) @@ -360,7 +360,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView ,m_aFL(this,WB_VERT) ,m_pDetailView(_pDetailView) { - DBG_CTOR(OTasksWindow,NULL); + DBG_CTOR(OTasksWindow,NULL); SetUniqueId(UID_APP_TASKS_WINDOW); m_aCreation.SetHelpId(HID_APP_CREATION_LIST); m_aCreation.SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl)); @@ -372,7 +372,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView // ----------------------------------------------------------------------------- OTasksWindow::~OTasksWindow() { - DBG_DTOR(OTasksWindow,NULL); + DBG_DTOR(OTasksWindow,NULL); Clear(); } // ----------------------------------------------------------------------- @@ -388,7 +388,7 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { DBG_CHKTHIS(OTasksWindow,NULL); @@ -461,13 +461,13 @@ void OTasksWindow::Resize() ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); Size aFLSize = LogicToPixel( Size( 2, 6 ), MAP_APPFONT ); sal_Int32 n6PPT = aFLSize.Height(); long nHalfOutputWidth = static_cast<long>(nOutputWidth * 0.5); - + m_aCreation.SetPosSizePixel( Point(0, 0), Size(nHalfOutputWidth - n6PPT, nOutputHeight) ); // i77897 make the m_aHelpText a little bit smaller. (-5) sal_Int32 nNewWidth = nOutputWidth - nHalfOutputWidth - aFLSize.Width() - 5; @@ -477,15 +477,15 @@ void OTasksWindow::Resize() m_aDescription.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, 0), Size(nNewWidth, nOutputHeight) ); Size aDesc = m_aDescription.CalcMinimumSize(); m_aHelpText.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, aDesc.Height() ), Size(nNewWidth, nOutputHeight - aDesc.Height() - n6PPT) ); - + m_aFL.SetPosSizePixel( Point(nHalfOutputWidth , 0), Size(aFLSize.Width(), nOutputHeight ) ); } // ----------------------------------------------------------------------------- void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) -{ +{ DBG_CHKTHIS(OTasksWindow,NULL); Clear(); - + try { Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getDetailView()->getBorderWin().getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); @@ -523,7 +523,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) { } - m_aCreation.Show(); + m_aCreation.Show(); m_aCreation.SelectAll(FALSE); m_aHelpText.Show(); m_aDescription.Show(); @@ -542,7 +542,7 @@ void OTasksWindow::Clear() delete reinterpret_cast< TaskEntry* >( pEntry->GetUserData() ); pEntry = m_aCreation.Next(pEntry); } - m_aCreation.Clear(); + m_aCreation.Clear(); } //================================================================== // class OApplicationDetailView @@ -554,7 +554,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe ,m_aContainer(this,0,WB_BORDER | WB_DIALOGCONTROL ) ,m_rBorderWin(_rParent) { - DBG_CTOR(OApplicationDetailView,NULL); + DBG_CTOR(OApplicationDetailView,NULL); SetUniqueId(UID_APP_DETAIL_VIEW); ImplInitSettings( sal_True, sal_True, sal_True ); @@ -572,7 +572,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe m_aContainer.SetUniqueId(UID_APP_CONTAINER_VIEW); m_aContainer.Show(); - const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); + const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); m_aHorzSplitter.SetPosSizePixel( Point(0,50), Size(0,nFrameWidth) ); // now set the components at the base class set(&m_aContainer,&m_aTasks); @@ -589,7 +589,7 @@ OApplicationDetailView::~OApplicationDetailView() setSplitter(NULL); m_pControlHelper = NULL; } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { DBG_CHKTHIS(OApplicationDetailView,NULL); @@ -878,23 +878,23 @@ SvLBoxEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const return m_pControlHelper->getEntry(_aPoint); } // ----------------------------------------------------------------------------- -sal_Bool OApplicationDetailView::isCutAllowed() -{ +sal_Bool OApplicationDetailView::isCutAllowed() +{ DBG_CHKTHIS(OApplicationDetailView,NULL); - return m_pControlHelper->isCutAllowed(); + return m_pControlHelper->isCutAllowed(); } -sal_Bool OApplicationDetailView::isCopyAllowed() -{ +sal_Bool OApplicationDetailView::isCopyAllowed() +{ DBG_CHKTHIS(OApplicationDetailView,NULL); - return m_pControlHelper->isCopyAllowed(); + return m_pControlHelper->isCopyAllowed(); } -sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); } -void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); } -void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); } -void OApplicationDetailView::paste() -{ +sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); } +void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); } +void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); } +void OApplicationDetailView::paste() +{ DBG_CHKTHIS(OApplicationDetailView,NULL); - m_pControlHelper->paste(); + m_pControlHelper->paste(); } // ----------------------------------------------------------------------------- SvLBoxEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) @@ -941,7 +941,7 @@ void OApplicationDetailView::showPreview(const Reference< XContent >& _xContent) m_pControlHelper->showPreview(_xContent); } // ----------------------------------------------------------------------------- -void OApplicationDetailView::showPreview( const ::rtl::OUString& _sDataSourceName, +void OApplicationDetailView::showPreview( const ::rtl::OUString& _sDataSourceName, const ::rtl::OUString& _sName, sal_Bool _bTable) { diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index ef2001ab65fb..eee11b21d8fb 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ namespace dbaui void updateHelpText(); protected: - virtual void PreparePaint( SvLBoxEntry* _pEntry ); + virtual void PreparePaint( SvLBoxEntry* _pEntry ); virtual Rectangle GetFocusRect( SvLBoxEntry* _pEntry, long _nLine ); virtual void ModelHasCleared(); @@ -108,7 +108,7 @@ namespace dbaui TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled = false ); }; - typedef ::std::vector< TaskEntry > TaskEntryList; + typedef ::std::vector< TaskEntry > TaskEntryList; struct TaskPaneData { @@ -120,13 +120,13 @@ namespace dbaui class OTasksWindow : public Window { - OCreationList m_aCreation; - FixedText m_aDescription; - FixedText m_aHelpText; - FixedLine m_aFL; - OApplicationDetailView* m_pDetailView; + OCreationList m_aCreation; + FixedText m_aDescription; + FixedText m_aHelpText; + FixedLine m_aFL; + OApplicationDetailView* m_pDetailView; - DECL_LINK( OnEntrySelectHdl, SvTreeListBox* ); + DECL_LINK( OnEntrySelectHdl, SvTreeListBox* ); void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); @@ -137,7 +137,7 @@ namespace dbaui // window overloads virtual void Resize(); - OApplicationDetailView* getDetailView() const { return m_pDetailView; } + OApplicationDetailView* getDetailView() const { return m_pDetailView; } /// fills the Creation listbox with the necessary strings and images void fillTaskEntryList( const TaskEntryList& _rList ); @@ -154,11 +154,11 @@ namespace dbaui class OApplicationDetailView : public OSplitterView , public IClipboardTest { - Splitter m_aHorzSplitter; - OTitleWindow m_aTasks; - OTitleWindow m_aContainer; - OAppBorderWindow& m_rBorderWin; // my parent - OAppDetailPageHelper* m_pControlHelper; + Splitter m_aHorzSplitter; + OTitleWindow m_aTasks; + OTitleWindow m_aContainer; + OAppBorderWindow& m_rBorderWin; // my parent + OAppDetailPageHelper* m_pControlHelper; ::std::vector< TaskPaneData > m_aTaskPaneData; MnemonicGenerator m_aExternalMnemonics; @@ -171,19 +171,19 @@ namespace dbaui OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode); virtual ~OApplicationDetailView(); // window overloads - // virtual void Resize(); + // virtual void Resize(); virtual void GetFocus(); /** creates the tables page - @param _xConnection + @param _xConnection The connection to get the table names */ void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** creates the page for the specific type. - @param _eType + @param _eType The type which should be created. E_TABLE isn't allowed. - @param _xContainer + @param _xContainer The container of the elements to be inserted. */ void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer); @@ -201,17 +201,17 @@ namespace dbaui inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } inline OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks.getChildWindow() ); } - sal_Bool isCutAllowed() ; - sal_Bool isCopyAllowed() ; - sal_Bool isPasteAllowed(); + sal_Bool isCutAllowed() ; + sal_Bool isCopyAllowed() ; + sal_Bool isPasteAllowed(); virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); } void copy(); void cut(); void paste(); /** return the qualified name. - @param _pEntry - The entry of a table, or query, form, report to get the qualified name. + @param _pEntry + The entry of a table, or query, form, report to get the qualified name. If the entry is <NULL/>, the first selected is chosen. @return the qualified name @@ -252,7 +252,7 @@ namespace dbaui ElementType getElementType() const; /** clears the detail pages. - @param _bTaskAlso + @param _bTaskAlso If <TRUE/> the task window will also be cleared. */ void clearPages(sal_Bool _bTaskAlso = sal_True); @@ -264,7 +264,7 @@ namespace dbaui sal_Int32 getSelectionCount(); /** returns the element names which are selected - @param _rNames + @param _rNames The list will be filled. */ void getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames ) const; @@ -290,13 +290,13 @@ namespace dbaui void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); /** adds a new object to the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the object to be inserted - @param _rObject + @param _rObject The object to add. - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ SvLBoxEntry* elementAdded(ElementType eType @@ -304,13 +304,13 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one - @param _eType + @param _eType The type where the entry shold be appended. - @param _rOldName + @param _rOldName The old name of the object to be replaced - @param _rNewName + @param _rNewName The new name of the object to be replaced - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. @param _xObject The object which was replaced @@ -320,11 +320,11 @@ namespace dbaui ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the element to be removed. - @param _rxConn + @param _rxConn If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType @@ -338,27 +338,27 @@ namespace dbaui /** switches to the given preview mode - @param _eMode + @param _eMode the mode to set for the preview */ void switchPreview(PreviewMode _eMode); /** shows the Preview of the content when it is enabled. - @param _xContent + @param _xContent The content which must support the "preview" command. */ void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); /** shows the Preview of a table or query - @param _sDataSourceName + @param _sDataSourceName the name of the data source - @param _sName + @param _sName the name of table or query - @param _bTable + @param _bTable <TRUE/> if it is a table, otherwise <FALSE/> - @return void + @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const ::rtl::OUString& _sDataSourceName, const ::rtl::OUString& _sName, sal_Bool _bTable); diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 939d174b23e9..8aa7ed471ef6 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ using namespace ::dbaui; // class OApplicationIconControl DBG_NAME(OApplicationIconControl) //================================================================== -OApplicationIconControl::OApplicationIconControl(Window* _pParent) +OApplicationIconControl::OApplicationIconControl(Window* _pParent) : SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/ WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER) ,DropTargetHelper(this) @@ -69,7 +69,7 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent) String( ModuleRes( aCategories[i].nLabelResId ) ), Image( ModuleRes( aCategories[i].nImageResId ) ), Image( ModuleRes( aCategories[i].nImageResIdHC ) ) ); - if ( pEntry ) + if ( pEntry ) pEntry->SetUserData( new ElementType( aCategories[i].eType ) ); } @@ -98,8 +98,8 @@ sal_Int8 OApplicationIconControl::AcceptDrop( const AcceptDropEvent& _rEvt ) sal_Int8 nDropOption = DND_ACTION_NONE; if ( m_pActionListener ) { - - SvxIconChoiceCtrlEntry* pEntry = GetEntry(_rEvt.maPosPixel); + + SvxIconChoiceCtrlEntry* pEntry = GetEntry(_rEvt.maPosPixel); if ( pEntry ) { SetCursor(pEntry); diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index 3bd27a99a56b..be650da5034e 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,23 +36,23 @@ namespace dbaui { class IControlActionListener; //================================================================== - class OApplicationIconControl :public SvtIconChoiceCtrl + class OApplicationIconControl :public SvtIconChoiceCtrl ,public DropTargetHelper { - Point m_aMousePos; - IControlActionListener* m_pActionListener; + Point m_aMousePos; + IControlActionListener* m_pActionListener; public: OApplicationIconControl(Window* _pParent); virtual ~OApplicationIconControl(); - void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } - IControlActionListener* getControlActionListener( ) const { return m_pActionListener; } + void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } + IControlActionListener* getControlActionListener( ) const { return m_pActionListener; } protected: // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); }; } #endif // DBAUI_APPICONCONTROL_HXX diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index e8b0393dec54..5becb111bd9d 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind ,m_rBorderWin( _rBorderWindow ) { DBG_CTOR(OApplicationSwapWindow,NULL); -// SetCompoundControl( TRUE ); +// SetCompoundControl( TRUE ); ImplInitSettings( sal_True, sal_True, sal_True ); @@ -84,7 +84,7 @@ void OApplicationSwapWindow::Resize() Size aOutputSize = GetOutputSize(); - m_aIconControl.SetPosSizePixel( Point(static_cast<long>((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height())); + m_aIconControl.SetPosSizePixel( Point(static_cast<long>((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height())); m_aIconControl.ArrangeIcons(); } // ----------------------------------------------------------------------------- @@ -179,7 +179,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType ) IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl) { ULONG nPos = 0; - SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos ); + SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos ); ElementType eType = E_NONE; if ( pEntry ) { @@ -199,7 +199,7 @@ IMPL_LINK(OApplicationSwapWindow, ChangeToLastSelected, void*, EMPTYARG) void OApplicationSwapWindow::selectContainer(ElementType _eType) { ULONG nCount = m_aIconControl.GetEntryCount(); - SvxIconChoiceCtrlEntry* pEntry = NULL; + SvxIconChoiceCtrlEntry* pEntry = NULL; for (ULONG i=0; i < nCount; ++i) { pEntry = m_aIconControl.GetEntry(i); diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index bc5cd2abb1df..2ef77e73ab7d 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,16 +37,16 @@ namespace dbaui { class OAppBorderWindow; //================================================================== - class OApplicationSwapWindow : public Window, + class OApplicationSwapWindow : public Window, public IClipboardTest { - OApplicationIconControl m_aIconControl; - ElementType m_eLastType; - OAppBorderWindow& m_rBorderWin; + OApplicationIconControl m_aIconControl; + ElementType m_eLastType; + OAppBorderWindow& m_rBorderWin; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* ); + DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* ); DECL_LINK( ChangeToLastSelected, void* ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); @@ -57,17 +57,17 @@ namespace dbaui virtual void Resize(); - inline sal_Bool isCutAllowed() { return sal_False; } - inline sal_Bool isCopyAllowed() { return sal_False; } - inline sal_Bool isPasteAllowed() { return sal_False; } + inline sal_Bool isCutAllowed() { return sal_False; } + inline sal_Bool isCopyAllowed() { return sal_False; } + inline sal_Bool isPasteAllowed() { return sal_False; } virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); } - inline void copy() { } - inline void cut() { } - inline void paste() { } + inline void copy() { } + inline void cut() { } + inline void paste() { } - inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); } - inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); } - inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); } + inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); } + inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); } + inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); } /** automatically creates mnemonics for the icon/texts in our left hand side panel */ @@ -90,7 +90,7 @@ namespace dbaui void clearSelection(); /** changes the container which should be displayed. The select handler will also be called. - @param _eType + @param _eType Which container to show. */ void selectContainer(ElementType _eType); diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index f0166e49d69a..3c5c2362919a 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace dbaui { - + DBG_NAME(OTitleWindow) OTitleWindow::OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift) : Window(_pParent,_nBits | WB_DIALOGCONTROL) @@ -73,30 +73,30 @@ void OTitleWindow::setChildWindow(Window* _pChild) { m_pChild = _pChild; } -#define SPACE_BORDER 1 +#define SPACE_BORDER 1 // ----------------------------------------------------------------------------- void OTitleWindow::Resize() { ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); - + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); + Size aTextSize = LogicToPixel( Size( 6, 3 ), MAP_APPFONT ); sal_Int32 nXOffset = aTextSize.Width(); sal_Int32 nYOffset = aTextSize.Height(); sal_Int32 nHeight = GetTextHeight() + 2*nYOffset; - m_aSpace1.SetPosSizePixel( Point(SPACE_BORDER, SPACE_BORDER ), + m_aSpace1.SetPosSizePixel( Point(SPACE_BORDER, SPACE_BORDER ), Size(nXOffset , nHeight - SPACE_BORDER) ); - m_aSpace2.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, SPACE_BORDER ), + m_aSpace2.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, SPACE_BORDER ), Size(nOutputWidth - nXOffset - 2*SPACE_BORDER, nYOffset) ); - m_aTitle.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, nYOffset + SPACE_BORDER), + m_aTitle.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, nYOffset + SPACE_BORDER), Size(nOutputWidth - nXOffset - 2*SPACE_BORDER, nHeight - nYOffset - SPACE_BORDER) ); if ( m_pChild ) { - m_pChild->SetPosSizePixel( Point(m_bShift ? (nXOffset+SPACE_BORDER) : sal_Int32(SPACE_BORDER), nHeight + nXOffset + SPACE_BORDER), + m_pChild->SetPosSizePixel( Point(m_bShift ? (nXOffset+SPACE_BORDER) : sal_Int32(SPACE_BORDER), nHeight + nXOffset + SPACE_BORDER), Size(nOutputWidth - ( m_bShift ? (2*nXOffset - 2*SPACE_BORDER) : sal_Int32(SPACE_BORDER) ), nOutputHeight - nHeight - 2*nXOffset - 2*SPACE_BORDER) ); } } @@ -145,7 +145,7 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B StyleSettings aStyle = aAllSettings.GetStyleSettings(); aStyle.SetMonoColor(aStyle.GetActiveBorderColor());//GetMenuBorderColor()); aAllSettings.SetStyleSettings(aStyle); - SetSettings(aAllSettings); + SetSettings(aAllSettings); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); if( bFont ) @@ -174,7 +174,7 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B pWindows[i]->SetFont(aFont); pWindows[i]->SetTextColor( aStyle.GetLightColor() ); pWindows[i]->SetBackground( Wallpaper( aStyle.GetShadowColor() ) ); - } + } } // ............................................................. } // namespace dbaui diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 8f230d9d9e1c..306ed964946e 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,44 +34,44 @@ namespace dbaui { class OTitleWindow : public Window { - FixedText m_aSpace1; - FixedText m_aSpace2; - FixedText m_aTitle; - Window* m_pChild; - BOOL m_bShift; + FixedText m_aSpace1; + FixedText m_aSpace2; + FixedText m_aTitle; + Window* m_pChild; + BOOL m_bShift; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); public: OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift = TRUE); virtual ~OTitleWindow(); - + // window overloads virtual void Resize(); virtual void GetFocus(); /** sets the child window which should be displayed below the title. It will be destroyed at the end. - @param _pChild + @param _pChild The child window. */ void setChildWindow(Window* _pChild); /** gets the child window. - + @return The child winodw. */ inline Window* getChildWindow() const { return m_pChild; } /** sets the title text out of the resource - @param _nTitleId + @param _nTitleId The resource id of the title text. */ void setTitle(USHORT _nTitleId); /** Gets the min Width in Pixel which is needed to display the whole - + @return the min width */ diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 17a16c5ea2b4..889d716b5fe2 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,8 +130,8 @@ void OAppBorderWindow::Resize() ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); long nX = 0; Size aFLSize = LogicToPixel( Size( 3, 8 ), MAP_APPFONT ); @@ -197,13 +197,13 @@ OApplicationView* OAppBorderWindow::getView() const } // ----------------------------------------------------------------------------- -OApplicationSwapWindow* OAppBorderWindow::getPanel() const +OApplicationSwapWindow* OAppBorderWindow::getPanel() const { return static_cast< OApplicationSwapWindow* >( m_pPanel->getChildWindow() ); } // ----------------------------------------------------------------------------- -OApplicationDetailView* OAppBorderWindow::getDetailView() const +OApplicationDetailView* OAppBorderWindow::getDetailView() const { return m_pDetailView; } @@ -530,7 +530,7 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent) getDetailView()->showPreview(_xContent); } // ----------------------------------------------------------------------------- -void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName, +void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sName, sal_Bool _bTable) diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index d4fa76c35849..371a58daf393 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ namespace dbaui //================================================================== class OAppBorderWindow : public Window { - OTitleWindow* m_pPanel; - OApplicationDetailView* m_pDetailView; - OApplicationView* m_pView; + OTitleWindow* m_pPanel; + OApplicationDetailView* m_pDetailView; + OApplicationView* m_pView; void ImplInitSettings(); protected: @@ -68,12 +68,12 @@ namespace dbaui virtual ~OAppBorderWindow(); // window overloads - virtual void GetFocus(); + virtual void GetFocus(); virtual void Resize(); - OApplicationView* getView() const; - OApplicationSwapWindow* getPanel() const; - OApplicationDetailView* getDetailView() const; + OApplicationView* getView() const; + OApplicationSwapWindow* getPanel() const; + OApplicationDetailView* getDetailView() const; }; //================================================================== @@ -88,18 +88,18 @@ namespace dbaui NONE }; private: - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + ::com::sun::star::lang::Locale m_aLocale; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xObject; - OAppBorderWindow* m_pWin; + OAppBorderWindow* m_pWin; IApplicationController& m_rAppController; - ChildFocusState m_eChildFocus; + ChildFocusState m_eChildFocus; IClipboardTest* getActiveChild() const; void ImplInitSettings(); protected: - + // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect); @@ -110,7 +110,7 @@ namespace dbaui // Window virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - OApplicationView( Window* pParent + OApplicationView( Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode @@ -128,7 +128,7 @@ namespace dbaui virtual void GetFocus(); inline IApplicationController& getAppController() const { return m_rAppController; } - inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;} + inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;} // IClipboardTest virtual sal_Bool isCutAllowed(); @@ -140,13 +140,13 @@ namespace dbaui virtual void paste(); /// get the left panel - inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); } + inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); } /// get the detail page - inline OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); } + inline OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); } /** return the qualified name. - @param _pEntry - The entry of a table, or query, form, report to get the qualified name. + @param _pEntry + The entry of a table, or query, form, report to get the qualified name. If the entry is <NULL/>, the first selected is chosen. @return the qualified name @@ -193,13 +193,13 @@ namespace dbaui sal_Int32 getSelectionCount(); /** clears the detail page and the selection on the left side. - @param _bTaskAlso + @param _bTaskAlso If <TRUE/> the task window will also be cleared. */ void clearPages(sal_Bool _bTaskAlso = sal_True); /** returns the element names which are selected - @param _rNames + @param _rNames The list will be filled. */ void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; @@ -225,13 +225,13 @@ namespace dbaui void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); /** adds a new object to the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the object to be inserted - @param _rObject + @param _rObject The object to add. - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ SvLBoxEntry* elementAdded(ElementType _eType @@ -239,13 +239,13 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one - @param _eType + @param _eType The type where the entry shold be appended. - @param _rOldName + @param _rOldName The old name of the object to be replaced - @param _rNewName + @param _rNewName The new name of the object to be replaced - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. @param _xObject The object which was replaced @@ -255,11 +255,11 @@ namespace dbaui ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the element to be removed. - @param _rxConn + @param _rxConn If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType @@ -267,7 +267,7 @@ namespace dbaui /** changes the container which should be displayed. The select handler will also be called. - @param _eType + @param _eType Which container to show. */ void selectContainer(ElementType _eType); @@ -279,29 +279,29 @@ namespace dbaui sal_Bool isPreviewEnabled(); /** switches to the given preview mode - @param _eMode + @param _eMode the mode to set for the preview */ void switchPreview(PreviewMode _eMode); /** shows the Preview of the content when it is enabled. - @param _xContent + @param _xContent The content which must support the "preview" command. */ void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); /** shows the Preview of a table or query - @param _sDataSourceName + @param _sDataSourceName the name of the data source - @param _xConnection + @param _xConnection the connection which will be shared - @param _sName + @param _sName the name of table or query - @param _bTable + @param _bTable <TRUE/> if it is a table, otherwise <FALSE/> - @return void + @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const ::rtl::OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sName, sal_Bool _bTable); diff --git a/dbaccess/source/ui/app/IApplicationController.hxx b/dbaccess/source/ui/app/IApplicationController.hxx index 5e7123e4d3ed..2dc4ab87192b 100644 --- a/dbaccess/source/ui/app/IApplicationController.hxx +++ b/dbaccess/source/ui/app/IApplicationController.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ namespace dbaui { public: /** called when an entry in a tree list box has been double-clicked - @param _rTree + @param _rTree The tree list box. @return <TRUE/> if the double click event has been handled by the called, and should not @@ -58,7 +58,7 @@ namespace dbaui virtual bool onEntryDoubleClick( SvTreeListBox& _rTree ) = 0; /** called when a container (category) in the application view has been selected - @param _pTree + @param _pTree The tree list box. @return <TRUE/> if the cotainer could be changed otherwise <FALSE/> @@ -66,7 +66,7 @@ namespace dbaui virtual sal_Bool onContainerSelect(ElementType _eType) = 0; /** called when an entry in a tree view has been selected - @param _pEntry + @param _pEntry the selected entry */ virtual void onSelectionChanged() = 0; diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index 2dec9005f847..ab325968f68a 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include "toolbox.hrc" #endif -#define MN_PROPS 25 +#define MN_PROPS 25 String RID_STR_NEW_FORM diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc index 7412dd85786d..1fc719762a8f 100644 --- a/dbaccess/source/ui/app/dbu_app.hrc +++ b/dbaccess/source/ui/app/dbu_app.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,42 +31,42 @@ #include "dbu_resource.hrc" #endif -#define TBI_SWITCH_PREVIEW RID_DBACCESS_START +#define TBI_SWITCH_PREVIEW RID_DBACCESS_START -#define RID_STR_NEW_FORM RID_STR_APP_START -#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 -#define RID_STR_NEW_REPORT RID_STR_APP_START + 2 -#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3 -#define RID_STR_NEW_TABLE RID_STR_APP_START + 4 -#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5 -#define RID_STR_NEW_VIEW RID_STR_APP_START + 6 -#define RID_STR_NEW_VIEW_AUTO RID_STR_APP_START + 7 -#define RID_STR_NEW_QUERY RID_STR_APP_START + 8 -#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9 -#define STR_QUERY_DELETE_DATASOURCE RID_STR_APP_START + 10 -#define STR_APP_TITLE RID_STR_APP_START + 11 -#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12 -#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13 -#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14 -#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15 -#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16 -#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17 -#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18 -#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19 -#define RID_STR_VIEWS_HELP_TEXT_WIZARD RID_STR_APP_START + 20 -#define STR_DATABASE RID_STR_APP_START + 21 -#define STR_TASKS RID_STR_APP_START + 22 -#define STR_DESCRIPTION RID_STR_APP_START + 23 -#define STR_PREVIEW RID_STR_APP_START + 24 -#define STR_DISABLEPREVIEW RID_STR_APP_START + 25 -#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26 -#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27 -#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28 -#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29 -#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30 +#define RID_STR_NEW_FORM RID_STR_APP_START +#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 +#define RID_STR_NEW_REPORT RID_STR_APP_START + 2 +#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3 +#define RID_STR_NEW_TABLE RID_STR_APP_START + 4 +#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5 +#define RID_STR_NEW_VIEW RID_STR_APP_START + 6 +#define RID_STR_NEW_VIEW_AUTO RID_STR_APP_START + 7 +#define RID_STR_NEW_QUERY RID_STR_APP_START + 8 +#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9 +#define STR_QUERY_DELETE_DATASOURCE RID_STR_APP_START + 10 +#define STR_APP_TITLE RID_STR_APP_START + 11 +#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12 +#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13 +#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14 +#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15 +#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16 +#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17 +#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18 +#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19 +#define RID_STR_VIEWS_HELP_TEXT_WIZARD RID_STR_APP_START + 20 +#define STR_DATABASE RID_STR_APP_START + 21 +#define STR_TASKS RID_STR_APP_START + 22 +#define STR_DESCRIPTION RID_STR_APP_START + 23 +#define STR_PREVIEW RID_STR_APP_START + 24 +#define STR_DISABLEPREVIEW RID_STR_APP_START + 25 +#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26 +#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27 +#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28 +#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29 +#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30 #define RID_STR_EMBEDDED_DATABASE RID_STR_APP_START + 31 -#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32 -#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33 +#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32 +#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 641051f20d49..7193d7098519 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index c66732528471..1a653141ea12 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/AsyncronousLink.cxx b/dbaccess/source/ui/browser/AsyncronousLink.cxx index 7cc0ac71d23b..9e615095a19b 100644 --- a/dbaccess/source/ui/browser/AsyncronousLink.cxx +++ b/dbaccess/source/ui/browser/AsyncronousLink.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/bcommon.src b/dbaccess/source/ui/browser/bcommon.src index 8c79179eda20..41ccc595ff5a 100644 --- a/dbaccess/source/ui/browser/bcommon.src +++ b/dbaccess/source/ui/browser/bcommon.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 66e774b22a53..999a6bca6f66 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,24 +114,24 @@ using namespace ::dbtools; using namespace ::comphelper; using namespace ::svt; -#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ - try \ - { \ - successflag = sal_False; \ - action; \ - successflag = sal_True; \ - } \ - catch(SQLException& e) \ - { \ +#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ + try \ + { \ + successflag = sal_False; \ + action; \ + successflag = sal_True; \ + } \ + catch(SQLException& e) \ + { \ SQLException aError = ::dbtools::prependErrorInfo(e, *this, context); \ - ::com::sun::star::sdb::SQLErrorEvent aEvent; \ - aEvent.Reason <<= aError; \ - errorOccured(aEvent); \ - } \ - catch(Exception&) \ - { \ + ::com::sun::star::sdb::SQLErrorEvent aEvent; \ + aEvent.Reason <<= aError; \ + errorOccured(aEvent); \ + } \ + catch(Exception&) \ + { \ DBG_UNHANDLED_EXCEPTION(); \ - } \ + } \ #define DO_SAFE( action, message ) try { action; } catch(Exception&) { DBG_ERROR(message); } ; @@ -145,12 +145,12 @@ namespace dbaui //================================================================== class OParameterContinuation : public OInteraction< XInteractionSupplyParameters > { - Sequence< PropertyValue > m_aValues; + Sequence< PropertyValue > m_aValues; public: OParameterContinuation() { } - Sequence< PropertyValue > getValues() const { return m_aValues; } + Sequence< PropertyValue > getValues() const { return m_aValues; } // XInteractionSupplyParameters virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException); @@ -172,8 +172,8 @@ class SbaXDataBrowserController::FormControllerImpl ::com::sun::star::frame::XFrameActionListener > { friend class SbaXDataBrowserController; - ::cppu::OInterfaceContainerHelper m_aActivateListeners; - SbaXDataBrowserController* m_pOwner; + ::cppu::OInterfaceContainerHelper m_aActivateListeners; + SbaXDataBrowserController* m_pOwner; public: FormControllerImpl(SbaXDataBrowserController* pOwner); @@ -241,7 +241,7 @@ public: // XTabController, base of XFormController virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > & Model) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > & _Container) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -579,7 +579,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const ::c //= SbaXDataBrowserController //================================================================== //------------------------------------------------------------------ -Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException) +Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getTypes" ); return ::comphelper::concatSequences( @@ -657,7 +657,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun SbaXDataBrowserController::~SbaXDataBrowserController() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::~SbaXDataBrowserController" ); - // deleteView(); + // deleteView(); // release the aggregated form controller if (m_xFormControllerImpl.is()) { @@ -674,7 +674,7 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::startFrameListening" ); SbaXDataBrowserController_Base::startFrameListening( _rxFrame ); - Reference< XFrameActionListener > xAggListener; + Reference< XFrameActionListener > xAggListener; if ( m_xFormControllerImpl.is() ) m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener; @@ -688,7 +688,7 @@ void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::stopFrameListening" ); SbaXDataBrowserController_Base::stopFrameListening( _rxFrame ); - Reference< XFrameActionListener > xAggListener; + Reference< XFrameActionListener > xAggListener; if ( m_xFormControllerImpl.is() ) m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener; @@ -855,7 +855,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent) if (!bSuccess) { - // deleteView(); + // deleteView(); return sal_False; } @@ -900,7 +900,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent) if (m_xLoadable.is()) m_xLoadable->addLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); + Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); if (xFormParameter.is()) xFormParameter->addParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this); @@ -997,7 +997,7 @@ void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun: xBroadcaster->addModifyListener(static_cast<XModifyListener*>(this)); // introduce ourself as dispatch provider for the grid - Reference< XDispatchProviderInterception > xInterception(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< XDispatchProviderInterception > xInterception(getBrowserView()->getGridControl(), UNO_QUERY); if (xInterception.is()) xInterception->registerDispatchProviderInterceptor(static_cast<XDispatchProviderInterceptor*>(this)); @@ -1015,7 +1015,7 @@ void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::s if (xBroadcaster.is()) xBroadcaster->removeModifyListener(static_cast<XModifyListener*>(this)); - Reference< XDispatchProviderInterception > xInterception(_xGridControl, UNO_QUERY); + Reference< XDispatchProviderInterception > xInterception(_xGridControl, UNO_QUERY); if (xInterception.is()) xInterception->releaseDispatchProviderInterceptor(static_cast<XDispatchProviderInterceptor*>(this)); @@ -1108,7 +1108,7 @@ void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang: if (m_xLoadable.is()) m_xLoadable->removeLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY); + Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY); if (xFormParameter.is()) xFormParameter->removeParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this); } @@ -1187,16 +1187,16 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t SolarMutexGuard aGuard; // the IsModified changed to sal_False ? - if ( (evt.PropertyName.equals(PROPERTY_ISMODIFIED)) - && (::comphelper::getBOOL(evt.NewValue) == sal_False) + if ( (evt.PropertyName.equals(PROPERTY_ISMODIFIED)) + && (::comphelper::getBOOL(evt.NewValue) == sal_False) ) - { // -> the current field isn't modified anymore, too + { // -> the current field isn't modified anymore, too setCurrentModified( sal_False ); } // switching to a new record ? - if ( (evt.PropertyName.equals(PROPERTY_ISNEW)) - && (::comphelper::getBOOL(evt.NewValue) == sal_True) + if ( (evt.PropertyName.equals(PROPERTY_ISNEW)) + && (::comphelper::getBOOL(evt.NewValue) == sal_True) ) { if (::comphelper::getINT32(xSource->getPropertyValue(PROPERTY_ROWCOUNT)) == 0) @@ -1205,7 +1205,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t InvalidateAll(); } - + // the filter or the sort criterias have changed ? -> update our parser if (evt.PropertyName.equals(PROPERTY_ACTIVECOMMAND)) { @@ -1216,7 +1216,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t { // if ( m_xParser.is() && m_xParser->getFilter() != ::comphelper::getString(evt.NewValue)) //{ - // DO_SAFE( m_xParser->setFilter(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); + // DO_SAFE( m_xParser->setFilter(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); //} InvalidateFeature(ID_BROWSER_REMOVEFILTER); } @@ -1224,7 +1224,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t { //if ( m_xParser.is() && m_xParser->getHavingClause() != ::comphelper::getString(evt.NewValue)) //{ - // DO_SAFE( m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); + // DO_SAFE( m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); //} InvalidateFeature(ID_BROWSER_REMOVEFILTER); } @@ -1232,7 +1232,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t { //if ( m_xParser.is() && m_xParser->getOrder() != ::comphelper::getString(evt.NewValue)) //{ - // DO_SAFE( m_xParser->setOrder(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new order to my parser !" ); + // DO_SAFE( m_xParser->setOrder(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new order to my parser !" ); //} InvalidateFeature(ID_BROWSER_REMOVEFILTER); } @@ -1332,7 +1332,7 @@ void SbaXDataBrowserController::disposing() if (m_xLoadable.is()) m_xLoadable->removeLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); + Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); if (xFormParameter.is()) xFormParameter->removeParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this); @@ -1361,9 +1361,9 @@ void SbaXDataBrowserController::disposing() { ::comphelper::disposeComponent(m_xRowSet); - m_xRowSet = NULL; - m_xColumnsSupplier = NULL; - m_xLoadable = NULL; + m_xRowSet = NULL; + m_xColumnsSupplier = NULL; + m_xLoadable = NULL; } catch(Exception&) { @@ -1454,7 +1454,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for return sal_True; } - Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters; + Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters; SolarMutexGuard aSolarGuard; // this may be executed in a non-main thread and we want to use vcl ... Window* pParent = Application::GetDefDialogParent(); @@ -1486,7 +1486,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for xHandler->handle(xParamRequest); if (!pParamValues->wasSelected()) - { // canceled + { // canceled setLoadingCancelled(); return sal_False; } @@ -1581,7 +1581,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const } // no chance without valid models if (isValid() && !isValidCursor()) - return aReturn; + return aReturn; switch (nId) { @@ -1638,9 +1638,9 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const break; } // run through - case ID_BROWSER_PASTE: + case ID_BROWSER_PASTE: case ID_BROWSER_CUT: - { + { CellControllerRef xCurrentController = getBrowserView()->getVclControl()->Controller(); if (xCurrentController.Is() && xCurrentController->ISA(EditCellController)) { @@ -1649,8 +1649,8 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const sal_Bool bIsReadOnly = rEdit.IsReadOnly(); switch (nId) { - case ID_BROWSER_CUT: aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen && !bIsReadOnly; break; - case SID_COPY : aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen; break; + case ID_BROWSER_CUT: aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen && !bIsReadOnly; break; + case SID_COPY : aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen; break; case ID_BROWSER_PASTE: aReturn.bEnabled = m_aCurrentFrame.isActive() && !bIsReadOnly; if(aReturn.bEnabled) @@ -1710,7 +1710,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const break; case ID_BROWSER_REDO: - aReturn.bEnabled = sal_False; // simply forget it ;). no redo possible. + aReturn.bEnabled = sal_False; // simply forget it ;). no redo possible. break; case ID_BROWSER_UNDORECORD: @@ -1733,17 +1733,17 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const // check if it is available Reference< XPropertySet > xDataSourceSet(getRowSet(), UNO_QUERY); if (!xDataSourceSet.is()) - break; // no datasource -> no edit mode + break; // no datasource -> no edit mode sal_Int32 nDataSourcePrivileges = ::comphelper::getINT32(xDataSourceSet->getPropertyValue(PROPERTY_PRIVILEGES)); sal_Bool bInsertAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::INSERT) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowInserts"))); sal_Bool bUpdateAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::UPDATE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowUpdates"))); sal_Bool bDeleteAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::DELETE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowDeletes"))); if (!bInsertAllowedAndPossible && !bUpdateAllowedAndPossible && !bDeleteAllowedAndPossible) - break; // no insert/update/delete -> no edit mode + break; // no insert/update/delete -> no edit mode if (!isValidCursor() || !isLoaded()) - break; // no cursor -> no edit mode + break; // no cursor -> no edit mode aReturn.bEnabled = sal_True; @@ -1968,10 +1968,10 @@ void SbaXDataBrowserController::ExecuteSearch() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ExecuteSearch" ); // calculate the control source of the active field - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); DBG_ASSERT(xGrid.is(), "SbaXDataBrowserController::ExecuteSearch : the control should have an ::com::sun::star::form::XGrid interface !"); - Reference< ::com::sun::star::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); + Reference< ::com::sun::star::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); Reference< ::com::sun::star::container::XIndexContainer > xColumns = xGridPeer->getColumns(); DBG_ASSERT(xGridPeer.is() && xColumns.is(), "SbaXDataBrowserController::ExecuteSearch : invalid peer !"); @@ -1983,7 +1983,7 @@ void SbaXDataBrowserController::ExecuteSearch() // the text within the current cell String sInitialText; - Reference< ::com::sun::star::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY); Reference< XInterface > xCurControl(xColControls->getByIndex(nViewCol),UNO_QUERY); ::rtl::OUString aInitialText; if (IsSearchableControl(xCurControl, &aInitialText)) @@ -2051,7 +2051,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property } break; case SID_FM_DELETEROWS: - + if (SaveModified()) { SbaGridControl* pVclGrid = getBrowserView()->getVclControl(); @@ -2126,8 +2126,8 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property switch (nId) { case ID_BROWSER_CUT : rEdit.Cut(); break; - case SID_COPY : rEdit.Copy(); break; - case ID_BROWSER_PASTE : rEdit.Paste(); break; + case SID_COPY : rEdit.Copy(); break; + case ID_BROWSER_PASTE : rEdit.Paste(); break; } if (ID_BROWSER_CUT == nId || ID_BROWSER_PASTE == nId) { @@ -2359,7 +2359,7 @@ sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor) } } - if ( !CommitCurrent() ) // das aktuelle Control committen lassen + if ( !CommitCurrent() ) // das aktuelle Control committen lassen return sal_False; Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); @@ -2398,7 +2398,7 @@ sal_Bool SbaXDataBrowserController::CommitCurrent() return sal_True; Reference< ::com::sun::star::awt::XControl > xActiveControl(getBrowserView()->getGridControl()); - Reference< ::com::sun::star::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY); + Reference< ::com::sun::star::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY); sal_Bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock(); if (xActiveControl.is() && !bControlIsLocked) { @@ -2498,7 +2498,7 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n // get the current column from the grid if (nViewPos == (sal_uInt16)-1) { - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); if (!xGrid.is()) return xEmptyReturn; nViewPos = xGrid->getCurrentColumnPosition(); @@ -2520,10 +2520,10 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n //------------------------------------------------------------------------------ IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, pContext) { - Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); // check all grid columns for their control source - Reference< ::com::sun::star::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY); DBG_ASSERT(xModelColumns.is(), "SbaXDataBrowserController::OnSearchContextRequest : there is a grid control without columns !"); // the case 'no columns' should be indicated with an empty container, I think ... DBG_ASSERT(xModelColumns->getCount() >= xPeerContainer->getCount(), "SbaXDataBrowserController::OnSearchContextRequest : impossible : have more view than model columns !"); @@ -2582,7 +2582,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), aOld); // and move to the field - Reference< ::com::sun::star::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); sal_uInt16 nViewPos; for ( nViewPos = 0; nViewPos < aColumnControls->getCount(); ++nViewPos ) @@ -2597,7 +2597,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn } } - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); xGrid->setCurrentColumnPosition(nViewPos); return 0; @@ -2679,7 +2679,7 @@ void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/) { DBG_UNHANDLED_EXCEPTION(); } - + // -------------------------------- // switch the control to alive mode getBrowserView()->getGridControl()->setDesignMode(sal_False); @@ -2705,7 +2705,7 @@ void SbaXDataBrowserController::initializeParser() const { const Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); if (::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING))) - { // (only if the statement isn't native) + { // (only if the statement isn't native) // (it is allowed to use the PROPERTY_ISPASSTHROUGH : _after_ loading a form it is valid) xFormSet->getPropertyValue(PROPERTY_SINGLESELECTQUERYCOMPOSER) >>= m_xParser; /* @@ -2738,7 +2738,7 @@ void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( Run { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::loaded" ); // not interested in - // we're loading within an separate thread and have a handling for it's "finished event" + // we're loading within an separate thread and have a handling for it's "finished event" } //------------------------------------------------------------------------------ @@ -2850,11 +2850,11 @@ class LoadFormHelper :public ::cppu::WeakImplHelper2< ::com::sun::star::form::XL XRowSetListener> { enum STATE { STARTED, LOADED, POSITIONED, DISPOSED }; - STATE m_eState; + STATE m_eState; - Reference< XRowSet > m_xForm; + Reference< XRowSet > m_xForm; - ::osl::Mutex m_aAccessSafety; + ::osl::Mutex m_aAccessSafety; public: LoadFormHelper(const Reference< XRowSet > & _rxForm); @@ -3017,7 +3017,7 @@ bool LoadFormHelper::WaitUntilReallyLoaded(bool _bOnlyIfLoaded) sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getCurrentColumnPosition" ); - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); sal_Int16 nViewPos = -1; try { @@ -3031,7 +3031,7 @@ sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setCurrentColumnPosition" ); - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); try { if ( -1 != _nPos ) @@ -3078,7 +3078,7 @@ sal_Bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com:: return sal_True; } //.................................................................. -} // namespace dbaui +} // namespace dbaui //.................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 6929a9ee162b..47881727c6dd 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,17 @@ using namespace dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::form; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -namespace +namespace { sal_Bool isGrabVclControlFocusAllowed(const UnoDataBrowserView* _pView) { - sal_Bool bGrabFocus = sal_False; + sal_Bool bGrabFocus = sal_False; SbaGridControl* pVclControl = _pView->getVclControl(); Reference< ::com::sun::star::awt::XControl > xGrid = _pView->getGridControl(); if (pVclControl && xGrid.is()) @@ -81,7 +81,7 @@ namespace DBG_NAME(UnoDataBrowserView) // ------------------------------------------------------------------------- -UnoDataBrowserView::UnoDataBrowserView( Window* pParent, +UnoDataBrowserView::UnoDataBrowserView( Window* pParent, IController& _rController, const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rFactory) :ODataView(pParent,_rController,_rFactory) @@ -121,7 +121,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont // get the VCL-control m_pVclControl = NULL; - getVclControl(); + getVclControl(); DBG_ASSERT(m_pVclControl != NULL, "UnoDataBrowserView::Construct : no real grid control !"); } @@ -139,7 +139,7 @@ UnoDataBrowserView::~UnoDataBrowserView() m_pSplitter = NULL; } setTreeView(NULL); - + if ( m_pStatus ) { delete m_pStatus; @@ -215,17 +215,17 @@ void UnoDataBrowserView::hideStatus() // ------------------------------------------------------------------------- void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) { - Point aSplitPos; - Size aSplitSize; - Point aPlaygroundPos( _rPlayground.TopLeft() ); - Size aPlaygroundSize( _rPlayground.GetSize() ); + Point aSplitPos; + Size aSplitSize; + Point aPlaygroundPos( _rPlayground.TopLeft() ); + Size aPlaygroundSize( _rPlayground.GetSize() ); if (m_pTreeView && m_pTreeView->IsVisible() && m_pSplitter) { // calculate the splitter pos and size - aSplitPos = m_pSplitter->GetPosPixel(); + aSplitPos = m_pSplitter->GetPosPixel(); aSplitPos.Y() = aPlaygroundPos.Y(); - aSplitSize = m_pSplitter->GetOutputSizePixel(); + aSplitSize = m_pSplitter->GetOutputSizePixel(); aSplitSize.Height() = aPlaygroundSize.Height(); if( ( aSplitPos.X() + aSplitSize.Width() ) > ( aPlaygroundSize.Width() )) @@ -235,8 +235,8 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) aSplitPos.X() = aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.2); // the tree pos and size - Point aTreeViewPos( aPlaygroundPos ); - Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); + Point aTreeViewPos( aPlaygroundPos ); + Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); // the status pos and size if (m_pStatus && m_pStatus->IsVisible()) @@ -249,7 +249,7 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) m_pStatus->SetPosSizePixel( aStatusPos, aStatusSize ); aTreeViewSize.Height() -= aStatusSize.Height(); } - + // set the size of treelistbox m_pTreeView->SetPosSizePixel( aTreeViewPos, aTreeViewSize ); @@ -276,8 +276,8 @@ sal_uInt16 UnoDataBrowserView::View2ModelPos(sal_uInt16 nPos) const } // ----------------------------------------------------------------------------- -SbaGridControl* UnoDataBrowserView::getVclControl() const -{ +SbaGridControl* UnoDataBrowserView::getVclControl() const +{ if ( !m_pVclControl ) { OSL_ENSURE(m_xGrid.is(),"Grid not set!"); @@ -296,7 +296,7 @@ SbaGridControl* UnoDataBrowserView::getVclControl() const } } } - return m_pVclControl; + return m_pVclControl; } // ----------------------------------------------------------------------------- void UnoDataBrowserView::GetFocus() diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index c0e3157bfb75..71d7e95a1bfc 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace dbaui class ColorChanger { protected: - OutputDevice* m_pDev; + OutputDevice* m_pDev; public: ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor ) @@ -77,9 +77,9 @@ namespace dbaui DBG_NAME(ODataView) // ------------------------------------------------------------------------- - ODataView::ODataView( Window* pParent, + ODataView::ODataView( Window* pParent, IController& _rController, - const Reference< XMultiServiceFactory >& _rFactory, + const Reference< XMultiServiceFactory >& _rFactory, WinBits nStyle) :Window(pParent,nStyle) ,m_xServiceFactory(_rFactory) @@ -102,7 +102,7 @@ namespace dbaui DBG_DTOR(ODataView,NULL); enableSeparator( sal_False ); - m_rController.release(); + m_rController.release(); } // ------------------------------------------------------------------------- @@ -176,7 +176,7 @@ namespace dbaui { case EVENT_KEYINPUT: { - const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); const KeyCode& aKeyCode = pKeyEvent->GetKeyCode(); if ( m_pAccel.get() && m_pAccel->execute( aKeyCode ) ) // the accelerator consumed the event diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index 21b4fc2d2172..fb834691c963 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ namespace dbaui using namespace ::com::sun::star::datatransfer; using namespace ::svx; - namespace + namespace { template<class T > void lcl_setListener(const Reference<T>& _xComponent, const Reference< XEventListener >& i_rListener, const bool i_bAdd ) { @@ -69,12 +69,12 @@ namespace dbaui i_bAdd ? xCom->addEventListener( i_rListener ) : xCom->removeEventListener( i_rListener ); } } - + // ----------------------------------------------------------------------------- ODataClipboard::ODataClipboard( - const ::rtl::OUString& _rDatasource, - const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const ::rtl::OUString& _rDatasource, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _rCommand, const Reference< XConnection >& _rxConnection, const Reference< XNumberFormatter >& _rxFormatter, const Reference< XMultiServiceFactory >& _rxORB) @@ -93,9 +93,9 @@ namespace dbaui // ----------------------------------------------------------------------------- ODataClipboard::ODataClipboard( - const ::rtl::OUString& _rDatasource, - const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const ::rtl::OUString& _rDatasource, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _rCommand, const Reference< XNumberFormatter >& _rxFormatter, const Reference< XMultiServiceFactory >& _rxORB) :ODataAccessObjectTransferable( _rDatasource, ::rtl::OUString(),_nCommandType, _rCommand) @@ -107,7 +107,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ODataClipboard::ODataClipboard( const Reference< XPropertySet >& i_rAliveForm, + ODataClipboard::ODataClipboard( const Reference< XPropertySet >& i_rAliveForm, const Sequence< Any >& i_rSelectedRows, const sal_Bool i_bBookmarkSelection, const Reference< XMultiServiceFactory >& i_rORB ) @@ -118,7 +118,7 @@ namespace dbaui OSL_PRECOND( i_rORB.is(), "ODataClipboard::ODataClipboard: having no factory is not good ..." ); osl_incrementInterlockedCount( &m_refCount ); - + Reference<XConnection> xConnection; getDescriptor()[ daConnection ] >>= xConnection; lcl_setListener( xConnection, this, true ); @@ -132,8 +132,8 @@ namespace dbaui OSL_ENSURE( xResultSetClone.is(), "ODataClipboard::ODataClipboard: could not clone the form's result set" ); lcl_setListener( xResultSetClone, this, true ); - getDescriptor()[daCursor] <<= xResultSetClone; - getDescriptor()[daSelection] <<= i_rSelectedRows; + getDescriptor()[daCursor] <<= xResultSetClone; + getDescriptor()[daSelection] <<= i_rSelectedRows; getDescriptor()[daBookmarkSelection]<<= i_bBookmarkSelection; addCompatibleSelectionDescription( i_rSelectedRows ); diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index bb4ae9b35b28..2bdcd5b0920f 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,22 +76,22 @@ using namespace dbaui; class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader, XServiceInfo> { private: - ::rtl::OUString m_aURL; - Sequence< PropertyValue> m_aArgs; - Reference< XLoadEventListener > m_xListener; - Reference< XFrame > m_xFrame; - Reference< XMultiServiceFactory > m_xServiceFactory; + ::rtl::OUString m_aURL; + Sequence< PropertyValue> m_aArgs; + Reference< XLoadEventListener > m_xListener; + Reference< XFrame > m_xFrame; + Reference< XMultiServiceFactory > m_xServiceFactory; public: DBContentLoader(const Reference< XMultiServiceFactory >&); ~DBContentLoader(); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + ::rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods - static ::rtl::OUString getImplementationName_Static() throw( ) + static ::rtl::OUString getImplementationName_Static() throw( ) { return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.DBContentLoader"); } @@ -100,7 +100,7 @@ public: SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); // XLoader - virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL, + virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArgs, const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancel(void) throw(); @@ -143,8 +143,8 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult sal_Bool SAL_CALL DBContentLoader::supportsService(const ::rtl::OUString& ServiceName) throw( ) { Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pBegin = aSNL.getConstArray(); - const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); + const ::rtl::OUString * pBegin = aSNL.getConstArray(); + const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); for( ; pBegin != pEnd; ++pBegin) if( *pBegin == ServiceName ) return sal_True; @@ -189,10 +189,10 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: const Sequence< PropertyValue >& rArgs, const Reference< XLoadEventListener > & rListener) throw(::com::sun::star::uno::RuntimeException) { - m_xFrame = rFrame; + m_xFrame = rFrame; m_xListener = rListener; - m_aURL = rURL; - m_aArgs = rArgs; + m_aURL = rURL; + m_aArgs = rArgs; ::comphelper::ComponentContext aContext( m_xServiceFactory ); @@ -311,9 +311,9 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: Sequence< Any > aInitArgs(m_aArgs.getLength()+1); Any* pBegin = aInitArgs.getArray(); - Any* pEnd = pBegin + aInitArgs.getLength(); + Any* pEnd = pBegin + aInitArgs.getLength(); *pBegin <<= aFrame; - const PropertyValue* pIter = m_aArgs.getConstArray(); + const PropertyValue* pIter = m_aArgs.getConstArray(); for(++pBegin;pBegin != pEnd;++pBegin,++pIter) { *pBegin <<= *pIter; diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx index c2975b9d8314..e2a94aa672ef 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.cxx +++ b/dbaccess/source/ui/browser/dbtreemodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx index b0afe70a5fe1..c28e5aa6f475 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.hxx +++ b/dbaccess/source/ui/browser/dbtreemodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ // syntax of the tree userdata // datasource holds the connection // queries holds the nameaccess for the queries -// query holds the query -// tables holds the nameaccess for the tables -// table holds the table +// query holds the query +// tables holds the nameaccess for the tables +// table holds the table -#define CONTAINER_QUERIES ULONG( 0 ) -#define CONTAINER_TABLES ULONG( 1 ) +#define CONTAINER_QUERIES ULONG( 0 ) +#define CONTAINER_TABLES ULONG( 1 ) namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } @@ -59,7 +59,7 @@ namespace dbaui xContainer; /// if the entry denotes a data source, this is the connection for this data source (if already connection) SharedConnection xConnection; - SbaTableQueryBrowser::EntryType eType; + SbaTableQueryBrowser::EntryType eType; String sAccessor; DBTreeListUserData(); diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index b69c67bc4bee..967df21722df 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,8 +47,8 @@ DBG_NAME(DBTreeView) //======================================================================== // class DBTreeView //======================================================================== -DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nBits) - : Window( pParent, nBits ) +DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nBits) + : Window( pParent, nBits ) , m_pTreeListBox(NULL) { DBG_CTOR(DBTreeView,NULL); @@ -62,7 +62,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory > } // ----------------------------------------------------------------------------- - + DBTreeView::~DBTreeView() { DBG_DTOR(DBTreeView,NULL); @@ -85,7 +85,7 @@ void DBTreeView::SetPreExpandHandler(const Link& _rHdl) } // ----------------------------------------------------------------------------- -void DBTreeView::setCopyHandler(const Link& _rHdl) +void DBTreeView::setCopyHandler(const Link& _rHdl) { m_pTreeListBox->setCopyHandler(_rHdl); } @@ -118,7 +118,7 @@ void DBTreeView::GetFocus() // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx index 2cba0dd10b08..7bcddc2ef32c 100644 --- a/dbaccess/source/ui/browser/dbtreeview.hxx +++ b/dbaccess/source/ui/browser/dbtreeview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,12 +45,12 @@ namespace dbaui class DBTreeView : public Window { private: - DBTreeListBox* m_pTreeListBox; + DBTreeListBox* m_pTreeListBox; protected: // window overridables virtual void Resize(); - public: - + public: + DBTreeView( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, WinBits nBits ); @@ -60,16 +60,16 @@ namespace dbaui <p>When calling the link, the parameter is an SvLBoxEntry marking the entry to be expanded. </p> */ - void SetPreExpandHandler(const Link& _rHdl); + void SetPreExpandHandler(const Link& _rHdl); /// gets the currently set NodeExpansionHandler - void setCopyHandler(const Link& _rHdl); + void setCopyHandler(const Link& _rHdl); - void setModel(SvLBoxTreeList* _pTreeModel); - void setSelChangeHdl(const Link& _rHdl); + void setModel(SvLBoxTreeList* _pTreeModel); + void setSelChangeHdl(const Link& _rHdl); - DBTreeListBox& getListBox() const { return *m_pTreeListBox; } + DBTreeListBox& getListBox() const { return *m_pTreeListBox; } virtual void GetFocus(); }; diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 26c7860a474e..5ef1ceabcb20 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace dbaui { // ......................................................................... // ----------------------------------------------------------------------------- -SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvLBoxEntry* _pEntry ) const +SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvLBoxEntry* _pEntry ) const { DBG_ASSERT(isContainer(_pEntry), "SbaTableQueryBrowser::getChildType: invalid entry!"); switch (getEntryType(_pEntry)) @@ -75,10 +75,10 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( SvLBoxEntry* if (!_pEntry) return etUnknown; - SvLBoxEntry* pRootEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry); - SvLBoxEntry* pEntryParent = m_pTreeView->getListBox().GetParent(_pEntry); - SvLBoxEntry* pTables = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_TABLES); - SvLBoxEntry* pQueries = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_QUERIES); + SvLBoxEntry* pRootEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry); + SvLBoxEntry* pEntryParent = m_pTreeView->getListBox().GetParent(_pEntry); + SvLBoxEntry* pTables = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_TABLES); + SvLBoxEntry* pQueries = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_QUERIES); #ifdef DBG_UTIL String sTest; @@ -269,7 +269,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged() } // ----------------------------------------------------------------------------- // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 9497d08f5076..3e0452f6fd16 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,20 +152,20 @@ namespace dbaui m_nAsyncDrop = 0; m_aAsyncDrop.aDroppedData.clear(); - m_aAsyncDrop.nType = E_TABLE; - m_aAsyncDrop.nAction = _rEvt.mnAction; - m_aAsyncDrop.bError = sal_False; - m_aAsyncDrop.bHtml = sal_False; - m_aAsyncDrop.pDroppedAt = NULL; - m_aAsyncDrop.aUrl = ::rtl::OUString(); + m_aAsyncDrop.nType = E_TABLE; + m_aAsyncDrop.nAction = _rEvt.mnAction; + m_aAsyncDrop.bError = sal_False; + m_aAsyncDrop.bHtml = sal_False; + m_aAsyncDrop.pDroppedAt = NULL; + m_aAsyncDrop.aUrl = ::rtl::OUString(); // loop through the available formats and see what we can do ... // first we have to check if it is our own format, if not we have to copy the stream :-( if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(aDroppedData.GetDataFlavorExVector()) ) { - m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); - m_aAsyncDrop.pDroppedAt = pHitEntry; + m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); + m_aAsyncDrop.pDroppedAt = pHitEntry; // asyncron because we some dialogs and we aren't allowed to show them while in D&D m_nAsyncDrop = Application::PostUserEvent(LINK(this, SbaTableQueryBrowser, OnAsyncDrop)); @@ -179,7 +179,7 @@ namespace dbaui && m_aTableCopyHelper.copyTagTable( aDroppedData, m_aAsyncDrop, xDestConnection ) ) { - m_aAsyncDrop.pDroppedAt = pHitEntry; + m_aAsyncDrop.pDroppedAt = pHitEntry; // asyncron because we some dialogs and we aren't allowed to show them while in D&D m_nAsyncDrop = Application::PostUserEvent(LINK(this, SbaTableQueryBrowser, OnAsyncDrop)); @@ -233,8 +233,8 @@ namespace dbaui TransferableHelper* pTransfer = NULL; Reference< XTransferable> aEnsureDelete; EntryType eType = getEntryType(_pEntry); - pTransfer = implCopyObject( _pEntry, eType == etQuery ? CommandType::QUERY : CommandType::TABLE); - aEnsureDelete = pTransfer; + pTransfer = implCopyObject( _pEntry, eType == etQuery ? CommandType::QUERY : CommandType::TABLE); + aEnsureDelete = pTransfer; if (pTransfer) pTransfer->CopyToClipboard(getView()); } @@ -291,7 +291,7 @@ namespace dbaui m_pCurrentlyDisplayed = NULL; } // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 6526592112fc..8ae902785475 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -196,7 +196,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U // create the col Reference< ::com::sun::star::form::XGridColumnFactory > xColFactory(getControlModel(), UNO_QUERY); - Reference< ::com::sun::star::beans::XPropertySet > xNewCol = xColFactory->createColumn(sControlType); + Reference< ::com::sun::star::beans::XPropertySet > xNewCol = xColFactory->createColumn(sControlType); Reference< XPropertySetInfo > xNewColProperties; if (xNewCol.is()) xNewColProperties = xNewCol->getPropertySetInfo(); @@ -214,9 +214,9 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U catch(Exception&) { OSL_ENSURE(sal_False, - ( ByteString("SbaExternalSourceBrowser::dispatch : could not set a column property (") - += ByteString(pControlProps->Name.getStr(), (sal_uInt16)pControlProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US) - += ByteString(")!")).GetBuffer()); + ( ByteString("SbaExternalSourceBrowser::dispatch : could not set a column property (") + += ByteString(pControlProps->Name.getStr(), (sal_uInt16)pControlProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US) + += ByteString(")!")).GetBuffer()); } } } @@ -272,22 +272,22 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaExternalSourceBrows m_bInQueryDispatch = sal_True; - if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AttachToForm"))) + if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AttachToForm"))) // attach a new external form - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AddGridColumn"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AddGridColumn"))) // add a column to the grid - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/ClearView"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/ClearView"))) // clear the grid ) xReturn = (::com::sun::star::frame::XDispatch*)this; - if ( !xReturn.is() - && ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToFirst"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToPrev"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNext"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToLast"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNew"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/undoRecord"))) + if ( !xReturn.is() + && ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToFirst"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToPrev"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNext"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToLast"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNew"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/undoRecord"))) ) ) { @@ -361,8 +361,8 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster) { Any aOldPos; sal_Bool bWasInsertRow = sal_False; - sal_Bool bBeforeFirst = sal_True; - sal_Bool bAfterLast = sal_True; + sal_Bool bBeforeFirst = sal_True; + sal_Bool bAfterLast = sal_True; Reference< XResultSet > xResultSet(xMaster, UNO_QUERY); Reference< XRowLocate > xCursor(xMaster, UNO_QUERY); Reference< XPropertySet > xMasterProps(xMaster, UNO_QUERY); @@ -378,7 +378,7 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster) if (xCursor.is() && xResultSet.is()) { bBeforeFirst = xResultSet->isBeforeFirst(); - bAfterLast = xResultSet->isAfterLast(); + bAfterLast = xResultSet->isAfterLast(); if(!bBeforeFirst && !bAfterLast) aOldPos = xCursor->getBookmark(); } @@ -460,7 +460,7 @@ void SbaExternalSourceBrowser::startListening() { if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is()) { - Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); + Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); xLoadable->addLoadListener((::com::sun::star::form::XLoadListener*)this); } } @@ -470,7 +470,7 @@ void SbaExternalSourceBrowser::stopListening() { if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is()) { - Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); + Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); xLoadable->removeLoadListener((::com::sun::star::form::XLoadListener*)this); } } diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 2a02d3827f56..70fb1adf9071 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1151,7 +1151,7 @@ void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException ) m_aContainerListeners.disposeAndClear(aEvt); // dispose all childs - for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = m_aChildren.begin(); + for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = m_aChildren.begin(); aIter != m_aChildren.end(); ++aIter ) @@ -1520,7 +1520,7 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const :: // ------------------------------------------------------------------------- sal_Int32 SbaXFormAdapter::implGetPos(const ::rtl::OUString& rName) { - ::std::vector< ::rtl::OUString>::iterator aIter = ::std::find_if( m_aChildNames.begin(), + ::std::vector< ::rtl::OUString>::iterator aIter = ::std::find_if( m_aChildNames.begin(), m_aChildNames.end(), ::std::bind2nd(::std::equal_to< rtl::OUString>(),rName)); @@ -1743,7 +1743,7 @@ void SAL_CALL SbaXFormAdapter::propertyChange(const ::com::sun::star::beans::Pro { if (evt.PropertyName.equals(PROPERTY_NAME)) { - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), m_aChildren.end(), ::std::bind2nd(::std::equal_to< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >(),evt.Source)); @@ -1764,7 +1764,7 @@ void SAL_CALL SbaXFormAdapter::disposing(const ::com::sun::star::lang::EventObje if (Source.Source == m_xMainForm) dispose(); - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), m_aChildren.end(), ::std::bind2nd(::std::equal_to< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >(),Source.Source)); if(aIter != m_aChildren.end()) diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 6bac728cad62..c6451a13a55f 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ using namespace ::dbtools; using namespace ::comphelper; // ------------------------------------------------------------------------- -#define ALL_FEATURES -1 +#define ALL_FEATURES -1 #define FIRST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() - 1000 ) #define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() ) @@ -273,7 +273,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/) } if (!m_xDatabaseContext.is()) - { // at least notify the user. Though the whole component does not make any sense without the database context ... + { // at least notify the user. Though the whole component does not make any sense without the database context ... ShowServiceNotAvailableError(getView(), String(SERVICE_SDB_DATABASECONTEXT), sal_True); } return sal_True; @@ -295,12 +295,12 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); - Reference< XWindow > xParent; + Reference< XWindow > xParent; Reference< XFrame > xFrame; PropertyValue aValue; - const Any* pIter = aArguments.getConstArray(); - const Any* pEnd = pIter + aArguments.getLength(); + const Any* pIter = aArguments.getConstArray(); + const Any* pEnd = pIter + aArguments.getLength(); for ( ; pIter != pEnd; ++pIter ) { @@ -503,7 +503,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF sal_uInt16 nFeat = m_aSupportedFeatures[ _rFeature ].nFeatureId; FeatureState aFeatState( GetState( nFeat ) ); - FeatureState& rCachedState = m_aStateCache[nFeat]; // creates if neccessary + FeatureState& rCachedState = m_aStateCache[nFeat]; // creates if neccessary if ( !_bIgnoreCache ) { // check if we really need to notify the listeners : this method may be called much more often than needed, so check @@ -523,8 +523,8 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF aEvent.FeatureURL.Complete = _rFeature; if (m_xUrlTransformer.is()) m_xUrlTransformer->parseStrict(aEvent.FeatureURL); - aEvent.Source = (XDispatch*)this; - aEvent.IsEnabled = aFeatState.bEnabled; + aEvent.Source = (XDispatch*)this; + aEvent.IsEnabled = aFeatState.bEnabled; // collect all states to be notified States aStates; @@ -534,7 +534,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF if ( xListener.is() ) lcl_notifyMultipleStates( *xListener.get(), aEvent, aStates ); else - { // no -> iterate through all listeners responsible for the URL + { // no -> iterate through all listeners responsible for the URL StringBag aFeatureCommands; ::std::for_each( m_aSupportedFeatures.begin(), @@ -692,7 +692,7 @@ void OGenericUnoController::InvalidateAll_Impl() } // ----------------------------------------------------------------------- -Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) +Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { Reference< XDispatch > xReturn; @@ -727,9 +727,9 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const if ( nLen ) { aReturn.realloc( nLen ); - Reference< XDispatch >* pReturn = aReturn.getArray(); - const Reference< XDispatch >* pReturnEnd = aReturn.getArray() + nLen; - const DispatchDescriptor* pDescripts = aDescripts.getConstArray(); + Reference< XDispatch >* pReturn = aReturn.getArray(); + const Reference< XDispatch >* pReturnEnd = aReturn.getArray() + nLen; + const DispatchDescriptor* pDescripts = aDescripts.getConstArray(); for ( ; pReturn != pReturnEnd; ++ pReturn, ++pDescripts ) { @@ -741,7 +741,7 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const } // ----------------------------------------------------------------------- -Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider(void) throw( RuntimeException ) +Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider(void) throw( RuntimeException ) { return m_xSlaveDispatcher; } @@ -753,7 +753,7 @@ void OGenericUnoController::setSlaveDispatchProvider(const Reference< XDispatchP } // ----------------------------------------------------------------------- -Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider(void) throw( RuntimeException ) +Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider(void) throw( RuntimeException ) { return m_xMasterDispatcher; } @@ -810,9 +810,9 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene while ( iterSearch != m_arrStatusListener.end() ) { DispatchTarget& rCurrent = *iterSearch; - if ( (rCurrent.xListener == aListener) - && ( bRemoveForAll - || (rCurrent.aURL.Complete.equals(_rURL.Complete)) + if ( (rCurrent.xListener == aListener) + && ( bRemoveForAll + || (rCurrent.aURL.Complete.equals(_rURL.Complete)) ) ) { @@ -831,7 +831,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find(_rURL.Complete); if (aIter != m_aSupportedFeatures.end()) - { // clear the cache for that feature + { // clear the cache for that feature StateCacheIterator aCachePos = m_aStateCache.find( aIter->second.nFeatureId ); if ( aCachePos != m_aStateCache.end() ) m_aStateCache.erase( aCachePos ); @@ -840,7 +840,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene // now remove the listener from the deque ::osl::MutexGuard aGuard( m_aFeatureMutex ); m_aFeaturesToInvalidate.erase( - ::std::remove_if( m_aFeaturesToInvalidate.begin(), + ::std::remove_if( m_aFeaturesToInvalidate.begin(), m_aFeaturesToInvalidate.end(), ::std::bind2nd(FindFeatureListener(),aListener)) ,m_aFeaturesToInvalidate.end()); @@ -1217,7 +1217,7 @@ namespace Reference< XServiceInfo > xSI( xModel, UNO_QUERY ); if ( !xSI.is() ) - { // try to go up the frame hierarchy + { // try to go up the frame hierarchy Reference< XFrame > xParentFrame; if ( _rxFrame.is() ) @@ -1243,7 +1243,7 @@ namespace static const sal_Char* pTransTable[] = { "com.sun.star.sdb.OfficeDatabaseDocument","sdatabase", "com.sun.star.report.ReportDefinition","sdatabase", - "com.sun.star.text.TextDocument", "swriter", + "com.sun.star.text.TextDocument", "swriter", "com.sun.star.sheet.SpreadsheetDocument", "scalc", "com.sun.star.presentation.PresentationDocument", "simpress", "com.sun.star.drawing.DrawingDocument", "sdraw", @@ -1260,7 +1260,7 @@ namespace for ( sal_Int32 j=0; j<nTableEntries; ++j ) { if ( xSI->supportsService( ::rtl::OUString::createFromAscii( *pDocumentService ) ) ) - { // found a table entry which matches the model's services + { // found a table entry which matches the model's services pReturn = *pHelpModuleName; break; } diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index 747a2d7ac8cf..fc28c1de325f 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" #endif -// #include <sfx2/sfx.hrc> +// #include <sfx2/sfx.hrc> #ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> #endif @@ -83,45 +83,45 @@ String RID_STR_TABLES_CONTAINER Text [ en-US ] = "Tables"; }; -#define MID_EDIT_DATABASE \ - Identifier = ID_TREE_EDIT_DATABASE ; \ - HelpId = HID_BROWSER_EDIT_DATABASE; \ +#define MID_EDIT_DATABASE \ + Identifier = ID_TREE_EDIT_DATABASE ; \ + HelpId = HID_BROWSER_EDIT_DATABASE; \ Text [ en-US ] = "Edit ~Database File..." ;\ -#define MID_ADMINISTRATE \ - Identifier = ID_TREE_ADMINISTRATE ; \ - HelpId = HID_BROWSER_ADMINISTRATE; \ +#define MID_ADMINISTRATE \ + Identifier = ID_TREE_ADMINISTRATE ; \ + HelpId = HID_BROWSER_ADMINISTRATE; \ Text [ en-US ] = "Registered databases ..." ;\ -#define MID_CLOSECONN \ - Identifier = ID_TREE_CLOSE_CONN ; \ - HelpId = HID_BROWSER_CLOSECONN ; \ - Text [ en-US ] = "Disco~nnect" ; \ +#define MID_CLOSECONN \ + Identifier = ID_TREE_CLOSE_CONN ; \ + HelpId = HID_BROWSER_CLOSECONN ; \ + Text [ en-US ] = "Disco~nnect" ; \ Menu MENU_BROWSER_DEFAULTCONTEXT { ItemList = { - MenuItem \ - { \ - MID_EDIT_DATABASE \ - }; \ - MenuItem \ - { \ - MID_CLOSECONN \ - }; \ - MenuItem \ - { \ - Separator = TRUE; \ + MenuItem \ + { \ + MID_EDIT_DATABASE \ + }; \ + MenuItem \ + { \ + MID_CLOSECONN \ + }; \ + MenuItem \ + { \ + Separator = TRUE; \ }; \ - MenuItem { ITEM_EDIT_COPY }; - MenuItem \ - { \ - Separator = TRUE; \ + MenuItem { ITEM_EDIT_COPY }; + MenuItem \ + { \ + Separator = TRUE; \ }; \ - MenuItem \ - { \ - MID_ADMINISTRATE \ + MenuItem \ + { \ + MID_ADMINISTRATE \ }; }; }; diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 1652ed46b094..62353cd5456b 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,11 +33,11 @@ #include <svx/svxids.hrc> -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN -#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO +#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY +#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY +#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK +#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN +#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO #define _ZFORLIST_DECLARE_TABLE @@ -172,9 +172,9 @@ Sequence< ::rtl::OUString> SbaXGridControl::getSupportedServiceNames_Static(void aSupported[2] = ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControl"); return aSupported; } -DBG_NAME(SbaXGridControl ); +DBG_NAME(SbaXGridControl ); //--------------------------------------------------------------------------------------- -SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM) +SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM) : FmXGridControl(_rM) { DBG_CTOR(SbaXGridControl ,NULL); @@ -183,7 +183,7 @@ SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM) //--------------------------------------------------------------------------------------- SbaXGridControl::~SbaXGridControl() { - DBG_DTOR(SbaXGridControl ,NULL); + DBG_DTOR(SbaXGridControl ,NULL); } //--------------------------------------------------------------------------------------- @@ -204,7 +204,7 @@ FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent) catch(Exception&) { } - + } pReturn->Create(pParent, nStyle); @@ -212,7 +212,7 @@ FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent) } //------------------------------------------------------------------------------ -Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType) throw (RuntimeException) +Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType) throw (RuntimeException) { Any aRet = FmXGridControl::queryInterface(_rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface(_rType,(::com::sun::star::frame::XDispatch*)this); @@ -257,10 +257,10 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt // TODO: why the hell this whole class does not use any mutex? -// if (0 == m_nPeerCreationLevel) +// if (0 == m_nPeerCreationLevel) { Reference< ::com::sun::star::frame::XDispatch > xDisp(getPeer(), UNO_QUERY); - for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); + for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); aIter != m_aStatusMultiplexer.end(); ++aIter) { @@ -294,12 +294,12 @@ void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListen if ( getPeer().is() ) { if ( 1 == pMultiplexer->getLength() ) - { // the first external listener for this URL + { // the first external listener for this URL Reference< XDispatch > xDisp( getPeer(), UNO_QUERY ); xDisp->addStatusListener( pMultiplexer, _rURL ); } else - { // already have other listeners for this URL + { // already have other listeners for this URL _rxListener->statusChanged( pMultiplexer->getLastEvent() ); } } @@ -334,7 +334,7 @@ void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException ) EventObject aEvt; aEvt.Source = *this; - for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); + for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); aIter != m_aStatusMultiplexer.end(); ++aIter) { @@ -365,7 +365,7 @@ SbaXGridPeer::SbaXGridPeer(const Reference< XMultiServiceFactory >& _rM) //--------------------------------------------------------------------------------------- SbaXGridPeer::~SbaXGridPeer() { - DBG_DTOR(SbaXGridPeer ,NULL); + DBG_DTOR(SbaXGridPeer ,NULL); } //--------------------------------------------------------------------------------------- @@ -401,7 +401,7 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl, else { ::cppu::OInterfaceContainerHelper * pIter = m_aStatusListeners.getContainer(_rUrl); - + if (pIter) { ::cppu::OInterfaceIteratorHelper aListIter(*pIter); @@ -412,7 +412,7 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl, } //------------------------------------------------------------------------------ -Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException) +Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException) { Any aRet = ::cppu::queryInterface(_rType,(::com::sun::star::frame::XDispatch*)this); if(aRet.hasValue()) @@ -423,10 +423,10 @@ Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeExce //--------------------------------------------------------------------------------------- Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { - if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/BrowserAttribs"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/RowHeight"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnAttribs"))) - || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnWidth"))) + if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/BrowserAttribs"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/RowHeight"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnAttribs"))) + || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnWidth"))) ) { return (::com::sun::star::frame::XDispatch*)this; @@ -439,7 +439,7 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDis IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ ) { SbaGridControl* pGrid = static_cast< SbaGridControl* >( GetWindow() ); - if ( pGrid ) // if this fails, we were disposing before arriving here + if ( pGrid ) // if this fails, we were disposing before arriving here { if ( Application::GetMainThreadIdentifier() != ::osl::Thread::getCurrentIdentifier() ) { @@ -595,17 +595,17 @@ void SAL_CALL SbaXGridPeer::removeStatusListener(const Reference< ::com::sun::st //--------------------------------------------------------------------------------------- const Sequence< sal_Int8 > & SbaXGridPeer::getUnoTunnelId() { - static Sequence< sal_Int8 > * pSeq = 0; - if( !pSeq ) + static Sequence< sal_Int8 > * pSeq = 0; + if( !pSeq ) { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); - if( !pSeq ) + if( !pSeq ) { static Sequence< sal_Int8 > aSeq( 16 ); - rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0,sal_True ); - pSeq = &aSeq; - } - } + rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0,sal_True ); + pSeq = &aSeq; + } + } return *pSeq; } @@ -626,7 +626,7 @@ sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId { if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast< sal_Int64 >( this ); - + return FmXGridPeer::getSomething(rId); } @@ -675,10 +675,10 @@ void SbaGridHeader::MouseButtonDown( const MouseEvent& _rMEvt ) // the base class will start a column move here, which we don't want to allow // (at the moment. If we store relative positions with the columns, we can allow column moves ....) -// sal_uInt16 nPos(0); -// sal_uInt16 nHitTest = ImplHitTest( _rMEvt.GetPosPixel(), mnMouseOff, nPos ); -// if (!nHitTest & HEAD_HITTEST_DIVIDER) -// return; +// sal_uInt16 nPos(0); +// sal_uInt16 nHitTest = ImplHitTest( _rMEvt.GetPosPixel(), mnMouseOff, nPos ); +// if (!nHitTest & HEAD_HITTEST_DIVIDER) +// return; } FmGridHeader::MouseButtonDown(_rMEvt); @@ -692,7 +692,7 @@ sal_Bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMo if (HEADERBAR_ITEM_NOTFOUND != nId) { Rectangle aColRect = GetItemRect(nId); - aColRect.Left() += nId ? 3 : 0; // the handle col (nId == 0) does not have a left margin for resizing + aColRect.Left() += nId ? 3 : 0; // the handle col (nId == 0) does not have a left margin for resizing aColRect.Right() -= 3; bResizingCol = !aColRect.IsInside(_rMousePos); } @@ -708,7 +708,7 @@ sal_Bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMo static_cast<SbaGridControl*>(GetParent())->StartDrag(_nAction, Point( - _rMousePos.X() + GetPosPixel().X(), // we aren't left-justified with our parent, in contrast to the data window + _rMousePos.X() + GetPosPixel().X(), // we aren't left-justified with our parent, in contrast to the data window _rMousePos.Y() - GetSizePixel().Height() ) ); @@ -740,7 +740,7 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM pShowColsMenu->EnableItem(SID_FM_SHOWALLCOLS, sal_False); } } - + // prepend some new items sal_Bool bColAttrs = (nColId != (sal_uInt16)-1) && (nColId != 0); if ( bColAttrs && !bDBIsReadOnly) @@ -811,7 +811,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM //================================================================== // SbaGridControl //================================================================== -DBG_NAME(SbaGridControl ); +DBG_NAME(SbaGridControl ); //--------------------------------------------------------------------------------------- SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM, Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) @@ -827,9 +827,9 @@ SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM, //--------------------------------------------------------------------------------------- SbaGridControl::~SbaGridControl() { - DBG_DTOR(SbaGridControl ,NULL); + DBG_DTOR(SbaGridControl ,NULL); if (m_nAsyncDropEvent) - Application::RemoveUserEvent(m_nAsyncDropEvent); + Application::RemoveUserEvent(m_nAsyncDropEvent); } //--------------------------------------------------------------------------------------- @@ -864,7 +864,7 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu) rMenu.SetHelpId(ID_BROWSER_ROWHEIGHT, aNewItems.GetHelpId(ID_BROWSER_ROWHEIGHT)); rMenu.InsertSeparator(nPos++); } // if (!IsReadOnlyDB()) - + if ( GetSelectRowCount() > 0 ) { rMenu.InsertItem(ID_BROWSER_COPY, aNewItems.GetItemText(SID_COPY), 0, nPos++); @@ -902,13 +902,13 @@ void SbaGridControl::SetColWidth(sal_uInt16 nColId) Any aWidth = xAffectedCol->getPropertyValue(PROPERTY_WIDTH); sal_Int32 nCurWidth = aWidth.hasValue() ? ::comphelper::getINT32(aWidth) : -1; - DlgSize aDlgColWidth(this, nCurWidth, sal_False); + DlgSize aDlgColWidth(this, nCurWidth, sal_False); if (aDlgColWidth.Execute()) { sal_Int32 nValue = aDlgColWidth.GetValue(); Any aNewWidth; if (-1 == nValue) - { // set to default + { // set to default Reference< XPropertyState > xPropState(xAffectedCol, UNO_QUERY); if (xPropState.is()) { @@ -938,26 +938,26 @@ void SbaGridControl::SetRowHeight() sal_Int32 nValue = aDlgRowHeight.GetValue(); Any aNewHeight; if ((sal_Int16)-1 == nValue) - { // set to default + { // set to default Reference< XPropertyState > xPropState(xCols, UNO_QUERY); if (xPropState.is()) { - try - { - aNewHeight = xPropState->getPropertyDefault(PROPERTY_ROW_HEIGHT); - } + try + { + aNewHeight = xPropState->getPropertyDefault(PROPERTY_ROW_HEIGHT); + } catch(Exception&) { } } } else aNewHeight <<= nValue; - try - { - xCols->setPropertyValue(PROPERTY_ROW_HEIGHT, aNewHeight); - } - catch(Exception&) - { + try + { + xCols->setPropertyValue(PROPERTY_ROW_HEIGHT, aNewHeight); + } + catch(Exception&) + { OSL_ENSURE(0,"setPropertyValue: PROPERTY_ROW_HEIGHT throws a exception"); } } @@ -1058,7 +1058,7 @@ void SbaGridControl::CursorMoved() } //--------------------------------------------------------------------------------------- -void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus /*= sal_True*/ ) +void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus /*= sal_True*/ ) { FmGridControl::ActivateCell(nRow, nCol, bSetCellFocus); if (m_pMasterListener) @@ -1122,7 +1122,7 @@ Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos) { OSL_ENSURE(0,"SbaGridControl::getField Exception occured!"); } - + return xEmptyReturn; } @@ -1194,7 +1194,7 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) long nCorrectRowCount = GetRowCount(); if (GetOptions() & OPT_INSERT) - --nCorrectRowCount; // there is a empty row for inserting records + --nCorrectRowCount; // there is a empty row for inserting records if (bCurrentRowVirtual) --nCorrectRowCount; @@ -1204,20 +1204,20 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) sal_Bool bHitHandle = (nColPos == 0); // check which kind of dragging has to be initiated - if ( bHitHandle // the handle column + if ( bHitHandle // the handle column // AND - && ( GetSelectRowCount() // at least one row is selected + && ( GetSelectRowCount() // at least one row is selected // OR - || ( (nRow >= 0) // a row below the header - && !bCurrentRowVirtual // we aren't appending a new record - && (nRow != GetCurrentPos()) // a row which is not the current one - ) // OR - || ( (0 == GetSelectRowCount()) // no rows selected - && (-1 == nRow) // hit the header + || ( (nRow >= 0) // a row below the header + && !bCurrentRowVirtual // we aren't appending a new record + && (nRow != GetCurrentPos()) // a row which is not the current one + ) // OR + || ( (0 == GetSelectRowCount()) // no rows selected + && (-1 == nRow) // hit the header ) ) ) - { // => start dragging the row + { // => start dragging the row if (GetDataWindow().IsMouseCaptured()) GetDataWindow().ReleaseMouse(); @@ -1231,11 +1231,11 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) bHandled = sal_True; } - else if ( (nRow < 0) // the header - && (!bHitHandle) // non-handle column - && (nViewPos < GetViewColCount()) // valid (existing) column + else if ( (nRow < 0) // the header + && (!bHitHandle) // non-handle column + && (nViewPos < GetViewColCount()) // valid (existing) column ) - { // => start dragging the column + { // => start dragging the column if (GetDataWindow().IsMouseCaptured()) GetDataWindow().ReleaseMouse(); @@ -1244,10 +1244,10 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) bHandled = sal_True; } - else if ( !bHitHandle // non-handle column - && (nRow >= 0) // non-header row + else if ( !bHitHandle // non-handle column + && (nRow >= 0) // non-header row ) - { // => start dragging the field content + { // => start dragging the field content if (GetDataWindow().IsMouseCaptured()) GetDataWindow().ReleaseMouse(); @@ -1300,7 +1300,7 @@ void SbaGridControl::DoColumnDrag(sal_uInt16 nColumnPos) } if (0 == sField.getLength()) return; - + OColumnTransferable* pDataTransfer = new OColumnTransferable(xDataSource, sField, xAffectedField, xActiveConnection, CTF_FIELD_DESCRIPTOR | CTF_COLUMN_DESCRIPTOR); Reference< XTransferable > xEnsureDelete = pDataTransfer; pDataTransfer->StartDrag(this, DND_ACTION_COPY | DND_ACTION_LINK); @@ -1385,10 +1385,10 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos) } /// unary_function Functor object for class ZZ returntype is void - struct SbaGridControlPrec : ::std::unary_function<DataFlavorExVector::value_type,bool> + struct SbaGridControlPrec : ::std::unary_function<DataFlavorExVector::value_type,bool> { - sal_Bool bQueryDrop; - SbaGridControlPrec(sal_Bool _bQueryDrop) + sal_Bool bQueryDrop; + SbaGridControlPrec(sal_Bool _bQueryDrop) : bQueryDrop(_bQueryDrop) { } @@ -1397,13 +1397,13 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos) { switch (_aType.mnSotId) { -// case SOT_FORMAT_RTF: // RTF data descriptions -// case SOT_FORMATSTR_ID_HTML: // HTML data descriptions - case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor - case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor - case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command +// case SOT_FORMAT_RTF: // RTF data descriptions +// case SOT_FORMATSTR_ID_HTML: // HTML data descriptions + case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor + case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor + case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command return true; - } + } return false; } }; @@ -1417,25 +1417,25 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) return nAction; if ( IsDropFormatSupported( FORMAT_STRING ) ) do - { // odd construction, but spares us a lot of (explicit ;) goto's + { // odd construction, but spares us a lot of (explicit ;) goto's if (!GetEmptyRow().Is()) // without an empty row we're not in update mode break; - long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); - sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); + long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); + sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); long nCorrectRowCount = GetRowCount(); if (GetOptions() & OPT_INSERT) - --nCorrectRowCount; // there is a empty row for inserting records + --nCorrectRowCount; // there is a empty row for inserting records if (IsCurrentAppending()) - --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one + --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one if ((nCol == BROWSER_INVALIDID) || (nRow >= nCorrectRowCount) || GetColumnId(nCol) == 0 ) // no valid cell under the mouse cursor break; - + Rectangle aRect = GetCellRect(nRow, nCol, sal_False); if (!aRect.IsInside(rEvt.maPosPixel)) // not dropped within a cell (a cell isn't as wide as the column - the are small spaces) @@ -1467,7 +1467,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) // assume RO break; } - + try { // assume that text can be dropped into a field if the column has a ::com::sun::star::awt::XTextComponent interface @@ -1531,14 +1531,14 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) if ( IsDropFormatSupported( FORMAT_STRING ) ) { - long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); - sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); + long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); + sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); long nCorrectRowCount = GetRowCount(); if (GetOptions() & OPT_INSERT) - --nCorrectRowCount; // there is a empty row for inserting records + --nCorrectRowCount; // there is a empty row for inserting records if (IsCurrentAppending()) - --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one + --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one DBG_ASSERT((nCol != BROWSER_INVALIDID) && (nRow < nCorrectRowCount), "SbaGridControl::Drop : dropped on an invalid position !"); // AcceptDrop should have caught this @@ -1609,9 +1609,9 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) { sal_Bool bCountFinal = sal_False; xDataSource->getPropertyValue(PROPERTY_ISROWCOUNTFINAL) >>= bCountFinal; - if ( !bCountFinal ) + if ( !bCountFinal ) setDataSource(NULL); // deattach from grid control - Reference< XResultSetUpdate > xResultSetUpdate(xDataSource,UNO_QUERY); + Reference< XResultSetUpdate > xResultSetUpdate(xDataSource,UNO_QUERY); ODatabaseImportExport* pImExport = new ORowSetImportExport(this,xResultSetUpdate,m_aDataDescriptor,getServiceManager()); Reference<XEventListener> xHolder = pImExport; Hide(); @@ -1639,11 +1639,11 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) Show(); DBG_UNHANDLED_EXCEPTION(); } - if ( !bCountFinal ) + if ( !bCountFinal ) setDataSource(Reference< XRowSet >(xDataSource,UNO_QUERY)); } - m_aDataDescriptor.clear(); - + m_aDataDescriptor.clear(); + return 0L; } // ------------------------------------------------------------------------- @@ -1657,7 +1657,7 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) } else sRet = FmGridControl::GetAccessibleObjectDescription( eObjType,_nPosition); - return sRet; + return sRet; } // ----------------------------------------------------------------------------- void SbaGridControl::DeleteSelectedRows() diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src index 1362944d5847..6c53941d0be3 100644 --- a/dbaccess/source/ui/browser/sbagrid.src +++ b/dbaccess/source/ui/browser/sbagrid.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx index 65733d7ae563..b637035eafa3 100644 --- a/dbaccess/source/ui/browser/sbamultiplex.cxx +++ b/dbaccess/source/ui/browser/sbamultiplex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ void SAL_CALL SbaXStatusMultiplexer::statusChanged(const ::com::sun::star::frame ::cppu::OInterfaceIteratorHelper aIt( *this ); while ( aIt.hasMoreElements() ) static_cast< ::com::sun::star::frame::XStatusListener* >( aIt.next() )->statusChanged( m_aLastKnownStatus ); -} \ +} \ // LoadListener IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener) diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index f963afecab31..6f7d72824243 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -381,7 +381,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent) { // create controls and set sizes - const long nFrameWidth = getBrowserView()->LogicToPixel( ::Size( 3, 0 ), MAP_APPFONT ).Width(); + const long nFrameWidth = getBrowserView()->LogicToPixel( ::Size( 3, 0 ), MAP_APPFONT ).Width(); m_pSplitter = new Splitter(getBrowserView(),WB_HSCROLL); m_pSplitter->SetPosSizePixel( ::Point(0,0), ::Size(nFrameWidth,0) ); @@ -442,27 +442,27 @@ sal_Bool SbaTableQueryBrowser::InitializeForm(const Reference< ::com::sun::star: { sal_Int32 nPos = 0; // is the filter intially applied ? - aProperties.getArray()[nPos] = PROPERTY_APPLYFILTER; - aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_APPLYFILTER); + aProperties.getArray()[nPos] = PROPERTY_APPLYFILTER; + aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_APPLYFILTER); // the initial filter - aProperties.getArray()[nPos] = PROPERTY_FILTER; - aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_FILTER); + aProperties.getArray()[nPos] = PROPERTY_FILTER; + aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_FILTER); if ( pData->xObjectProperties->getPropertySetInfo()->hasPropertyByName(PROPERTY_HAVING_CLAUSE) ) { aProperties.realloc(aProperties.getLength()+1); aValues.realloc(aValues.getLength()+1); // the initial having clause - aProperties.getArray()[nPos] = PROPERTY_HAVING_CLAUSE; - aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_HAVING_CLAUSE); + aProperties.getArray()[nPos] = PROPERTY_HAVING_CLAUSE; + aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_HAVING_CLAUSE); } // the initial ordering - aProperties.getArray()[nPos] = PROPERTY_ORDER; - aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_ORDER); + aProperties.getArray()[nPos] = PROPERTY_ORDER; + aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_ORDER); - Reference< XMultiPropertySet > xFormMultiSet(_rxForm, UNO_QUERY); + Reference< XMultiPropertySet > xFormMultiSet(_rxForm, UNO_QUERY); xFormMultiSet->setPropertyValues(aProperties, aValues); } } @@ -524,38 +524,38 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun:: Any* pValueIter = aValues.getArray(); if ( m_bPreview ) { - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")); - *pValueIter++ <<= sal_False; - *pStringIter++ = PROPERTY_BORDER; - *pValueIter++ <<= sal_Int16(0); + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")); + *pValueIter++ <<= sal_False; + *pStringIter++ = PROPERTY_BORDER; + *pValueIter++ <<= sal_Int16(0); } - *pStringIter++ = PROPERTY_FONT; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_FONT); - *pStringIter++ = PROPERTY_TEXTEMPHASIS; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTEMPHASIS); - *pStringIter++ = PROPERTY_TEXTRELIEF; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTRELIEF); + *pStringIter++ = PROPERTY_FONT; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_FONT); + *pStringIter++ = PROPERTY_TEXTEMPHASIS; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTEMPHASIS); + *pStringIter++ = PROPERTY_TEXTRELIEF; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTRELIEF); if ( m_bPreview ) { - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar")); - *pValueIter++ <<= sal_False; - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker")); - *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar")); + *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker")); + *pValueIter++ <<= sal_False; } - *pStringIter++ = PROPERTY_ROW_HEIGHT; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_ROW_HEIGHT); + *pStringIter++ = PROPERTY_ROW_HEIGHT; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_ROW_HEIGHT); if ( m_bPreview ) { - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")); - *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")); + *pValueIter++ <<= sal_False; } - *pStringIter++ = PROPERTY_TEXTCOLOR; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTCOLOR); - *pStringIter++ = PROPERTY_TEXTLINECOLOR; - *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTLINECOLOR); + *pStringIter++ = PROPERTY_TEXTCOLOR; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTCOLOR); + *pStringIter++ = PROPERTY_TEXTLINECOLOR; + *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTLINECOLOR); - Reference< XMultiPropertySet > xFormMultiSet(xGrid, UNO_QUERY); + Reference< XMultiPropertySet > xFormMultiSet(xGrid, UNO_QUERY); xFormMultiSet->setPropertyValues(aProperties, aValues); } @@ -576,10 +576,10 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun:: // insert the column into the gridcontrol so that we see something :-) ::rtl::OUString aCurrentModelType; Reference<XColumnsSupplier> xSupCols(getRowSet(),UNO_QUERY); - Reference<XNameAccess> xColumns = xSupCols->getColumns(); - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Reference<XNameAccess> xColumns = xSupCols->getColumns(); + Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); ::rtl::OUString sDefaultProperty; Reference< XPropertySet > xColumn; @@ -597,7 +597,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun:: continue; // use the result set column's type to determine the type of grid column to create - sal_Bool bFormattedIsNumeric = sal_True; + sal_Bool bFormattedIsNumeric = sal_True; sal_Int32 nType = ::comphelper::getINT32( xColumn->getPropertyValue( PROPERTY_TYPE ) ); ::std::vector< NamedValue > aInitialValues; @@ -688,7 +688,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun:: aDescription >>= sTemp; if ( !sTemp.getLength() ) xColumn->getPropertyValue( PROPERTY_DESCRIPTION ) >>= sTemp; - + aDescription <<= sTemp; aInitialValues.push_back( NamedValue( PROPERTY_HELPTEXT, aDescription ) ); @@ -773,7 +773,7 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw( // one of the many properties which require us to update the definition ? // a column's width ? else if (evt.PropertyName.equals(PROPERTY_WIDTH)) - { // a column width has changed -> update the model + { // a column width has changed -> update the model // (the update of the view is done elsewhere) Reference<XPropertySet> xProp = getColumnHelper(m_pCurrentlyDisplayed,xSource); if(xProp.is()) @@ -820,8 +820,8 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw( } // a column's format ? - else if ( (evt.PropertyName.equals(PROPERTY_FORMATKEY)) - && (TypeClass_LONG == evt.NewValue.getValueTypeClass()) + else if ( (evt.PropertyName.equals(PROPERTY_FORMATKEY)) + && (TypeClass_LONG == evt.NewValue.getValueTypeClass()) ) { // update the model (means the definition object) @@ -847,15 +847,15 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw( } } - else if ( evt.PropertyName.equals(PROPERTY_FONT) // the font ? - || evt.PropertyName.equals(PROPERTY_TEXTCOLOR) // the text color ? - || evt.PropertyName.equals(PROPERTY_FILTER) // the filter ? - || evt.PropertyName.equals(PROPERTY_HAVING_CLAUSE) // the having clause ? - || evt.PropertyName.equals(PROPERTY_ORDER) // the sort ? - || evt.PropertyName.equals(PROPERTY_APPLYFILTER) // the appliance of the filter ? - || evt.PropertyName.equals(PROPERTY_TEXTLINECOLOR) // the text line color ? - || evt.PropertyName.equals(PROPERTY_TEXTEMPHASIS) // the text emphasis ? - || evt.PropertyName.equals(PROPERTY_TEXTRELIEF) // the text relief ? + else if ( evt.PropertyName.equals(PROPERTY_FONT) // the font ? + || evt.PropertyName.equals(PROPERTY_TEXTCOLOR) // the text color ? + || evt.PropertyName.equals(PROPERTY_FILTER) // the filter ? + || evt.PropertyName.equals(PROPERTY_HAVING_CLAUSE) // the having clause ? + || evt.PropertyName.equals(PROPERTY_ORDER) // the sort ? + || evt.PropertyName.equals(PROPERTY_APPLYFILTER) // the appliance of the filter ? + || evt.PropertyName.equals(PROPERTY_TEXTLINECOLOR) // the text line color ? + || evt.PropertyName.equals(PROPERTY_TEXTEMPHASIS) // the text emphasis ? + || evt.PropertyName.equals(PROPERTY_TEXTRELIEF) // the text relief ? ) { transferChangedControlProperty(evt.PropertyName, evt.NewValue); @@ -955,14 +955,14 @@ void SbaTableQueryBrowser::checkDocumentDataSource() if (!bKnownDocDataSource) { if (NULL != pDataSourceEntry) - { // at least the data source is know + { // at least the data source is know if (NULL != pContainerEntry) bKnownDocDataSource = sal_True; // assume we know it. // TODO: should we expand the object container? This may be too expensive just for checking .... else { if ((NULL == pObjectEntry) && m_aDocumentDataSource.has(daCommandType) && m_aDocumentDataSource.has(daCommand)) - { // maybe we have a command to be displayed ? + { // maybe we have a command to be displayed ? sal_Int32 nCommandType = CommandType::TABLE; m_aDocumentDataSource[daCommandType] >>= nCommandType; @@ -1006,7 +1006,7 @@ namespace if ( aURL.GetProtocol() != INET_PROT_NOT_VALID ) { _rDisplayName = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET); - // _rDisplayName = aURL.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET); + // _rDisplayName = aURL.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET); _rUniqueId = aURL.GetMainURL( INetURLObject::NO_DECODE ); return true; } @@ -1176,7 +1176,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::svx::ODataAccessDescri // ------------------------------------------------------------------------- void SbaTableQueryBrowser::connectExternalDispatches() { - Reference< XDispatchProvider > xProvider( getFrame(), UNO_QUERY ); + Reference< XDispatchProvider > xProvider( getFrame(), UNO_QUERY ); DBG_ASSERT(xProvider.is(), "SbaTableQueryBrowser::connectExternalDispatches: no DispatchProvider !"); if (xProvider.is()) { @@ -1299,7 +1299,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) thr { Reference<XConnection> xCon(_rSource.Source, UNO_QUERY); if ( xCon.is() && m_pTreeView ) - { // our connection is in dispose so we have to find the entry equal with this connection + { // our connection is in dispose so we have to find the entry equal with this connection // and close it what means to collapse the entry // get the top-level representing the removed data source SvLBoxEntry* pDSLoop = m_pTreeView->getListBox().FirstChild(NULL); @@ -1552,7 +1552,7 @@ void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch) if (isValid() && !loadingCancelled()) { // did we load a query? - sal_Bool bTemporary; // needed because we m_bQueryEscapeProcessing is only one bit wide (and we want to pass it by reference) + sal_Bool bTemporary; // needed because we m_bQueryEscapeProcessing is only one bit wide (and we want to pass it by reference) if ( implGetQuerySignature( m_sQueryCommand, bTemporary ) ) m_bQueryEscapeProcessing = bTemporary; } @@ -1618,8 +1618,8 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const SvLBoxEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent( pCurrentEntry ); DBTreeListUserData* pDSData = pDataSourceEntry - ? static_cast< DBTreeListUserData* >( pDataSourceEntry->GetUserData() ) - : NULL; + ? static_cast< DBTreeListUserData* >( pDataSourceEntry->GetUserData() ) + : NULL; if ( nId == ID_TREE_CLOSE_CONN ) { @@ -1738,7 +1738,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const case ID_BROWSER_COLATTRSET: case ID_BROWSER_COLWIDTH: aReturn.bEnabled = getBrowserView() && getBrowserView()->getVclControl() && isValid() && isValidCursor(); - // aReturn.bEnabled &= getDefinition() && !getDefinition()->GetDatabase()->IsReadOnly(); + // aReturn.bEnabled &= getDefinition() && !getDefinition()->GetDatabase()->IsReadOnly(); break; case ID_BROWSER_COPY: @@ -1873,7 +1873,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue MultiSelection* pSelection = (MultiSelection*)pGrid->GetSelection(); Sequence< Any > aSelection; if ( !pGrid->IsAllSelected() ) - { // transfer the selected rows only if not all rows are selected + { // transfer the selected rows only if not all rows are selected // (all rows means the whole table) // i3832 - 03.04.2002 - fs@openoffice.org if (pSelection != NULL) @@ -1914,14 +1914,14 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue xProp->getPropertyValue(PROPERTY_DATASOURCENAME) >>= sDataSourceName; aDescriptor.setDataSource(sDataSourceName); - aDescriptor[daCommand] = xProp->getPropertyValue(PROPERTY_COMMAND); - aDescriptor[daCommandType] = xProp->getPropertyValue(PROPERTY_COMMAND_TYPE); - aDescriptor[daConnection] = xProp->getPropertyValue(PROPERTY_ACTIVE_CONNECTION); - aDescriptor[daCursor] <<= xCursorClone; + aDescriptor[daCommand] = xProp->getPropertyValue(PROPERTY_COMMAND); + aDescriptor[daCommandType] = xProp->getPropertyValue(PROPERTY_COMMAND_TYPE); + aDescriptor[daConnection] = xProp->getPropertyValue(PROPERTY_ACTIVE_CONNECTION); + aDescriptor[daCursor] <<= xCursorClone; if ( aSelection.getLength() ) { - aDescriptor[daSelection] <<= aSelection; - aDescriptor[daBookmarkSelection] <<= sal_False; + aDescriptor[daSelection] <<= aSelection; + aDescriptor[daBookmarkSelection] <<= sal_False; // these are selection indicies // before we change this, all clients have to be adjusted // so that they recognize the new BookmarkSelection property! @@ -2031,8 +2031,8 @@ void SbaTableQueryBrowser::initializeTreeModel() // fill the model with the names of the registered datasources Sequence< ::rtl::OUString > aDatasources = m_xDatabaseContext->getElementNames(); - const ::rtl::OUString* pIter = aDatasources.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aDatasources.getLength(); + const ::rtl::OUString* pIter = aDatasources.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aDatasources.getLength(); for (; pIter != pEnd; ++pIter) implAddDatasource( *pIter, aDBImage, sQueriesName, aQueriesImage, sTablesName, aTablesImage, SharedConnection() ); } @@ -2049,8 +2049,8 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce try { Sequence< ::rtl::OUString > aNames = _xNameAccess->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for (; pIter != pEnd; ++pIter) { if( !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent)) @@ -2181,7 +2181,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent) // 0 indicates that an error occured } else - { // we have to expand the queries or bookmarks + { // we have to expand the queries or bookmarks if (ensureEntryObject(_pParent)) { DBTreeListUserData* pParentData = static_cast< DBTreeListUserData* >( _pParent->GetUserData() ); @@ -2236,7 +2236,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvLBoxEntry* _pEntry ) { DBG_UNHANDLED_EXCEPTION(); } - + bSuccess = pEntryData->xContainer.is(); } else @@ -2297,7 +2297,7 @@ sal_Bool SbaTableQueryBrowser::implLoadAnything(const ::rtl::OUString& _rDataSou Reference<XPropertySet> xProp(getRowSet(),UNO_QUERY); if(xProp.is()) { - Reference< ::com::sun::star::form::XLoadable > xLoadable(xProp,UNO_QUERY); + Reference< ::com::sun::star::form::XLoadable > xLoadable(xProp,UNO_QUERY); try { // the values allowing the RowSet to re-execute @@ -2403,7 +2403,7 @@ sal_Bool SbaTableQueryBrowser::implSelect(const ::rtl::OUString& _rDataSourceNam else if (!pCommandType) { if ( m_pCurrentlyDisplayed ) - { // tell the old entry (if any) it has been deselected + { // tell the old entry (if any) it has been deselected selectPath(m_pCurrentlyDisplayed, sal_False); m_pCurrentlyDisplayed = NULL; } @@ -2469,7 +2469,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) sal_Int32 nOldType = 0; xRowSetProps->getPropertyValue(PROPERTY_COMMAND_TYPE) >>= nOldType; Reference<XConnection> xOldConnection(xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY); - + // the name of the table or query SvLBoxString* pString = (SvLBoxString*)_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING); OSL_ENSURE(pString,"There must be a string item!"); @@ -2489,16 +2489,16 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) } ::rtl::OUString aName = sNameBuffer.makeStringAndClear(); - sal_Int32 nCommandType = ( etTableContainer == pContainerData->eType) - ? CommandType::TABLE - : CommandType::QUERY; + sal_Int32 nCommandType = ( etTableContainer == pContainerData->eType) + ? CommandType::TABLE + : CommandType::QUERY; // check if need to rebuild the rowset sal_Bool bRebuild = ( xOldConnection != pConData->xConnection ) || ( nOldType != nCommandType ) || ( aName != aOldName ); - Reference< ::com::sun::star::form::XLoadable > xLoadable = getLoadable(); + Reference< ::com::sun::star::form::XLoadable > xLoadable = getLoadable(); bRebuild |= !xLoadable->isLoaded(); bool bSuccess = true; if ( bRebuild ) @@ -2612,7 +2612,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) String sDataSourceName( getDataSourceAcessor( pConnection ) ); bSuccess = implLoadAnything( sDataSourceName, aName, nCommandType, sal_True, pConData->xConnection ); if ( !bSuccess ) - { // clean up + { // clean up criticalFail(); } } @@ -2652,18 +2652,18 @@ SvLBoxEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNameAc SvLBoxEntry* pDSLoop = rListBox.FirstChild(NULL); while (pDSLoop) { - pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_QUERIES); + pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_QUERIES); DBTreeListUserData* pQueriesData = static_cast<DBTreeListUserData*>(pContainer->GetUserData()); if ( pQueriesData && pQueriesData->xContainer == _rxNameAccess ) break; - pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_TABLES); + pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_TABLES); DBTreeListUserData* pTablesData = static_cast<DBTreeListUserData*>(pContainer->GetUserData()); if ( pTablesData && pTablesData->xContainer == _rxNameAccess ) break; - pDSLoop = rListBox.NextSibling(pDSLoop); - pContainer = NULL; + pDSLoop = rListBox.NextSibling(pDSLoop); + pContainer = NULL; } return pContainer; } @@ -2677,7 +2677,7 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEve // first search for a definition container where we can insert this element SvLBoxEntry* pEntry = getEntryFromContainer(xNames); - if(pEntry) // found one + if(pEntry) // found one { // insert the new entry into the tree DBTreeListUserData* pContainerData = static_cast<DBTreeListUserData*>(pEntry->GetUserData()); @@ -2709,9 +2709,9 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEve sal_Bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const String& _sName,SvLBoxEntry* _pContainer) { return m_pCurrentlyDisplayed - && getEntryType(m_pCurrentlyDisplayed) == getChildType(_pContainer) - && m_pTreeView->getListBox().GetParent(m_pCurrentlyDisplayed) == _pContainer - && m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed) == _sName; + && getEntryType(m_pCurrentlyDisplayed) == getChildType(_pContainer) + && m_pTreeView->getListBox().GetParent(m_pCurrentlyDisplayed) == _pContainer + && m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed) == _sName; } // ------------------------------------------------------------------------- void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException) @@ -2727,7 +2727,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven String aName = ::comphelper::getString(_rEvent.Accessor).getStr(); if ( isCurrentlyDisplayedChanged( aName, pContainer) ) - { // the element displayed currently has been replaced + { // the element displayed currently has been replaced // we need to remember the old value SvLBoxEntry* pTemp = m_pCurrentlyDisplayed; @@ -2774,11 +2774,11 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve Reference< XNameAccess > xNames(_rEvent.Source, UNO_QUERY); SvLBoxEntry* pContainer = getEntryFromContainer(xNames); if ( pContainer ) - { // a table or query as been replaced + { // a table or query as been replaced String aName = ::comphelper::getString(_rEvent.Accessor).getStr(); if ( isCurrentlyDisplayedChanged( aName, pContainer) ) - { // the element displayed currently has been replaced + { // the element displayed currently has been replaced // we need to remember the old value SvLBoxEntry* pTemp = m_pCurrentlyDisplayed; @@ -2829,7 +2829,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve checkDocumentDataSource(); } else if (xNames.get() == m_xDatabaseContext.get()) - { // a datasource has been replaced in the context + { // a datasource has been replaced in the context DBG_ERROR("SbaTableQueryBrowser::elementReplaced: no support for replaced data sources!"); // very suspicious: the database context should not allow to replace data source, only to register // and revoke them @@ -3064,20 +3064,20 @@ void SbaTableQueryBrowser::impl_initialize() ::rtl::OUString* pStringIter = aProperties.getArray(); Any* pValueIter = aValues.getArray(); - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")); - *pValueIter++ <<= sal_False; - *pStringIter++ = PROPERTY_BORDER; - *pValueIter++ <<= sal_Int16(0); + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")); + *pValueIter++ <<= sal_False; + *pStringIter++ = PROPERTY_BORDER; + *pValueIter++ <<= sal_Int16(0); - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar")); - *pValueIter++ <<= sal_False; - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker")); - *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar")); + *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker")); + *pValueIter++ <<= sal_False; - *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")); - *pValueIter++ <<= sal_False; + *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")); + *pValueIter++ <<= sal_False; - Reference< XMultiPropertySet > xFormMultiSet(getFormComponent(), UNO_QUERY); + Reference< XMultiPropertySet > xFormMultiSet(getFormComponent(), UNO_QUERY); if ( xFormMultiSet.is() ) xFormMultiSet->setPropertyValues(aProperties, aValues); } @@ -3220,8 +3220,8 @@ sal_Bool SbaTableQueryBrowser::ensureConnection(SvLBoxEntry* _pAnyEntry, SharedC SvLBoxEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent(_pAnyEntry); DBTreeListUserData* pDSData = pDSEntry - ? static_cast<DBTreeListUserData*>(pDSEntry->GetUserData()) - : NULL; + ? static_cast<DBTreeListUserData*>(pDSEntry->GetUserData()) + : NULL; return ensureConnection( pDSEntry, pDSData, _rConnection ); } @@ -3242,8 +3242,8 @@ sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvLBoxEntry* _pAnyEntry SvLBoxEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent( _pAnyEntry ); DBTreeListUserData* pDSData = pDSEntry - ? static_cast< DBTreeListUserData* >( pDSEntry->GetUserData() ) - : NULL; + ? static_cast< DBTreeListUserData* >( pDSEntry->GetUserData() ) + : NULL; if ( pDSData ) _rConnection = pDSData->xConnection; return _rConnection.is(); @@ -3340,7 +3340,7 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa String sLeftText = pLeftTextItem->GetText(); String sRightText = pRightTextItem->GetText(); - sal_Int32 nCompareResult = 0; // equal by default + sal_Int32 nCompareResult = 0; // equal by default if (m_xCollator.is()) { @@ -3503,12 +3503,12 @@ sal_Bool SbaTableQueryBrowser::implGetQuerySignature( ::rtl::OUString& _rCommand // ontain the dss (data source signature) of the form ::rtl::OUString sDataSourceName; ::rtl::OUString sCommand; - sal_Int32 nCommandType = CommandType::COMMAND; + sal_Int32 nCommandType = CommandType::COMMAND; Reference< XPropertySet > xRowsetProps( getRowSet(), UNO_QUERY ); ODataAccessDescriptor aDesc( xRowsetProps ); sDataSourceName = aDesc.getDataSource(); - aDesc[ daCommand ] >>= sCommand; - aDesc[ daCommandType ] >>= nCommandType; + aDesc[ daCommand ] >>= sCommand; + aDesc[ daCommandType ] >>= nCommandType; // do we need to do anything? if ( CommandType::QUERY != nCommandType ) @@ -3559,8 +3559,8 @@ void SbaTableQueryBrowser::clearGridColumns(const Reference< XNameContainer >& _ { // first we have to clear the grid Sequence< ::rtl::OUString > aNames = _xColContainer->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); Reference< XInterface > xColumn; for (; pIter != pEnd;++pIter) { @@ -3723,7 +3723,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour return; if ( isSelected( pDataSourceEntry ) ) - { // a table or query belonging to the deleted data source is currently beeing displayed. + { // a table or query belonging to the deleted data source is currently beeing displayed. OSL_ENSURE( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) == pDataSourceEntry, "SbaTableQueryBrowser::impl_cleanupDataSourceEntry: inconsistence (1)!" ); unloadAndCleanup( sal_True ); @@ -3731,7 +3731,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour else OSL_ENSURE( ( NULL == m_pCurrentlyDisplayed ) - || ( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) != pDataSourceEntry ), + || ( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) != pDataSourceEntry ), "SbaTableQueryBrowser::impl_cleanupDataSourceEntry: inconsistence (2)!"); // delete any user data of the child entries of the to-be-removed entry @@ -3779,7 +3779,7 @@ void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegis // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 094b1c6f4271..8dc0b41f75cd 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ DBG_NAME(OColumnControlWindow) //======================================================================== OColumnControlWindow::OColumnControlWindow(Window* pParent ,const Reference<XMultiServiceFactory>& _rxFactory) - : OFieldDescControl(pParent,NULL) + : OFieldDescControl(pParent,NULL) , m_xORB(_rxFactory) , m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) , m_bAutoIncrementEnabled(sal_True) @@ -73,7 +73,7 @@ void OColumnControlWindow::ActivateAggregate( EControlType eType ) { case tpFormat: case tpDefault: -// case tpAutoIncrement: +// case tpAutoIncrement: case tpColumnName: break; default: @@ -87,7 +87,7 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType ) { case tpFormat: case tpDefault: -// case tpAutoIncrement: +// case tpAutoIncrement: case tpColumnName: break; default: @@ -100,7 +100,7 @@ void OColumnControlWindow::CellModified(long /*nRow*/, USHORT /*nColId*/ ) saveCurrentFieldDescData(); } // ----------------------------------------------------------------------------- -::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const +::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const { return m_aLocale; } @@ -131,7 +131,7 @@ TOTypeInfoSP OColumnControlWindow::getTypeInfo(sal_Int32 _nPos) return ( _nPos >= 0 && _nPos < static_cast<sal_Int32>(m_aDestTypeInfoIndex.size())) ? m_aDestTypeInfoIndex[_nPos]->second : TOTypeInfoSP(); } // ----------------------------------------------------------------------------- -const OTypeInfoMap* OColumnControlWindow::getTypeInfo() const +const OTypeInfoMap* OColumnControlWindow::getTypeInfo() const { return &m_aDestTypeInfo; } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 353fba74e3e1..e05829656531 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,10 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN +#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY +#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY +#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK +#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN #include "FieldDescControl.hxx" #include "FieldControls.hxx" @@ -51,7 +51,7 @@ #include <svx/svxids.hrc> #include <svx/algitem.hxx> #include <svl/itempool.hxx> -#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx> +#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx> #include <svl/zforlist.hxx> #include <svl/rngitem.hxx> #include <svl/intitem.hxx> @@ -84,18 +84,18 @@ using namespace ::com::sun::star::util; //================================================================== // fuer die Controls auf der OFieldDescGenPage -#define CONTROL_SPACING_X 18 // 6 -#define CONTROL_SPACING_Y 4 -#define CONTROL_WIDTH_1 160 // 100 -#define CONTROL_WIDTH_2 100 // 60 -#define CONTROL_WIDTH_3 250 -#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5) +#define CONTROL_SPACING_X 18 // 6 +#define CONTROL_SPACING_Y 4 +#define CONTROL_WIDTH_1 160 // 100 +#define CONTROL_WIDTH_2 100 // 60 +#define CONTROL_WIDTH_3 250 +#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5) -#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem -#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format -#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem +#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem +#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format +#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem -#define HSCROLL_STEP 20 +#define HSCROLL_STEP 20 namespace @@ -105,7 +105,7 @@ namespace { double nValue = _nValue; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(_xNumberFormatter,_nFormatKey); - if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE + if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME ) { nValue = DBTypeConversion::toStandardDbDate(DBTypeConversion::getNULLDate(_xNumberFormatter->getNumberFormatsSupplier()),nValue); @@ -263,11 +263,11 @@ OFieldDescControl::~OFieldDescControl() { ::std::auto_ptr<Window> aTemp(m_pVertScroll); - m_pVertScroll = NULL; + m_pVertScroll = NULL; } { ::std::auto_ptr<Window> aTemp(m_pHorzScroll); - m_pHorzScroll = NULL; + m_pHorzScroll = NULL; } if ( m_bAdded ) ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); @@ -410,7 +410,7 @@ void OFieldDescControl::CheckScrollBars() { m_pVertScroll->Show(); m_pVertScroll->SetRangeMax(nActive - nLastVisible); -// m_pVertScroll->SetThumbPos(0); +// m_pVertScroll->SetThumbPos(0); m_pVertScroll->SetPosSizePixel( Point(nNewHWidth, 0), Size(nVScrollWidth, szOverallSize.Height()) ); } @@ -425,7 +425,7 @@ void OFieldDescControl::CheckScrollBars() { m_pHorzScroll->Show(); m_pHorzScroll->SetRangeMax((lMaxXPosition - lMaxXAvailable + HSCROLL_STEP - 1 )/HSCROLL_STEP); -// m_pHorzScroll->SetThumbPos(0); +// m_pHorzScroll->SetThumbPos(0); m_pHorzScroll->SetPosSizePixel( Point(0, nNewVHeight), Size(bNeedVScrollBar ? nNewHWidth : szOverallSize.Width(), nHScrollHeight) ); } @@ -475,12 +475,12 @@ void OFieldDescControl::ScrollAllAggregates() if (nDeltaX || nDeltaY) { - Control* ppAggregates[] = { pRequired, pNumType + Control* ppAggregates[] = { pRequired, pNumType , pAutoIncrement, pDefault , pTextLen, pLength , pScale, m_pColumnName , m_pType, m_pAutoIncrementValue}; - Control* ppAggregatesText[] = { pRequiredText, pNumTypeText + Control* ppAggregatesText[] = { pRequiredText, pNumTypeText , pAutoIncrementText, pDefaultText , pTextLenText, pLengthText , pScaleText, m_pColumnNameText @@ -527,13 +527,13 @@ void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly ) DBG_CHKTHIS(OFieldDescControl,NULL); ////////////////////////////////////////////////////////////////////// // Controls enablen/disablen - Control* ppAggregates[] = { pRequired, pNumType + Control* ppAggregates[] = { pRequired, pNumType , pAutoIncrement, pDefault , pTextLen, pLength , pScale, m_pColumnName , m_pType, m_pAutoIncrementValue , pFormat}; - Control* ppAggregatesText[] = { pRequiredText, pNumTypeText + Control* ppAggregatesText[] = { pRequiredText, pNumTypeText , pAutoIncrementText, pDefaultText , pTextLenText, pLengthText , pScaleText, m_pColumnNameText @@ -729,7 +729,7 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ ) } // ----------------------------------------------------------------------- -void OFieldDescControl::SetModified(sal_Bool /*bModified*/) +void OFieldDescControl::SetModified(sal_Bool /*bModified*/) { } //------------------------------------------------------------------------ @@ -814,9 +814,9 @@ void OFieldDescControl::ArrangeAggregates() // die Beschreibung eines Controls struct AGGREGATE_DESCRIPTION { - Control* pctrlInputControl; // das eigentliche Control zur Eingabe - Control* pctrlTextControl; // das Label dazu - USHORT nPosSizeArgument; // das zweite Argument fuer SetPosSize + Control* pctrlInputControl; // das eigentliche Control zur Eingabe + Control* pctrlTextControl; // das Label dazu + USHORT nPosSizeArgument; // das zweite Argument fuer SetPosSize }; AGGREGATE_DESCRIPTION adAggregates[] = { { m_pColumnName, m_pColumnNameText, 1}, @@ -924,7 +924,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) pRequired->InsertEntry( aYes ); pRequired->InsertEntry( aNo ); pRequired->SelectEntryPos(1); - + InitializeControl(pRequired,HID_TAB_ENT_REQUIRED,true); } } @@ -1094,7 +1094,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER ); pControl->SetDecimalDigits(0); pControl->SetMin(0); - pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig + pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig pControl->SetStrictFormat(TRUE); InitializeControl(pControl,_nHelpId,false); @@ -1170,7 +1170,7 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType ) void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 nCol ) { DBG_CHKTHIS(OFieldDescControl,NULL); - + ////////////////////////////////////////////////////////////////////// // Groesse ermitteln const sal_Int32 nControlHeight = GetMaxControlHeight(); @@ -1228,12 +1228,12 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MAP_APPFONT).Height(); aPosition.Y() += ((nRow+1)*nControl_Spacing_y) + (nRow*nControlHeight); - + ////////////////////////////////////////////////////////////////////// // Control anzeigen (*ppControl)->SetPosSizePixel( aPosition, aSize ); aSize = (*ppControl)->GetSizePixel(); - + (*ppControl)->Show(); } //------------------------------------------------------------------------------ @@ -1461,7 +1461,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) { // disable autoincrement value because it should only be visible when autoincrement is to true DeactivateAggregate( tpAutoIncrementValue ); - pAutoIncrement->SelectEntryPos( 1 ); // no + pAutoIncrement->SelectEntryPos( 1 ); // no ActivateAggregate( tpDefault ); // hat Auswirkungen auf pRequired if(!pFieldDescr->IsPrimaryKey()) @@ -1478,7 +1478,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( pBoolDefault ) { // wenn pRequired auf sal_True gesetzt ist, dann darf das sal_Bool Feld nicht den Eintrag <<keiner>> besitzen - ::rtl::OUString sValue; + ::rtl::OUString sValue; pFieldDescr->GetControlDefault() >>= sValue; String sDef = BoolStringUI(sValue); @@ -1507,9 +1507,9 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( pRequired ) { if( pFieldDescr->IsNullable() ) - pRequired->SelectEntryPos( 1 ); // no + pRequired->SelectEntryPos( 1 ); // no else - pRequired->SelectEntryPos( 0 ); // yes + pRequired->SelectEntryPos( 0 ); // yes } if( pTextLen ) @@ -1540,7 +1540,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) USHORT nPos = pFieldType.get() ? m_pType->GetEntryPos(String(pFieldDescr->getTypeInfo()->aUIName)) : LISTBOX_ENTRY_NOTFOUND; if(nPos == LISTBOX_ENTRY_NOTFOUND) { - const OTypeInfoMap* pMap = getTypeInfo(); + const OTypeInfoMap* pMap = getTypeInfo(); OTypeInfoMap::const_iterator aIter = pMap->find(pFieldType.get() ? pFieldDescr->getTypeInfo()->nType : pFieldDescr->GetType()); if(aIter == pMap->end() && !pMap->empty()) { @@ -1787,9 +1787,9 @@ void OFieldDescControl::LoseFocus() sal_Bool OFieldDescControl::isCopyAllowed() { sal_Bool bAllowed = (m_pActFocusWindow != NULL) && - (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || - m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || - m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || + (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || + m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || + m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || m_pActFocusWindow == m_pAutoIncrementValue) && static_cast<Edit*>(m_pActFocusWindow)->GetSelected().Len() != 0; @@ -1799,9 +1799,9 @@ sal_Bool OFieldDescControl::isCopyAllowed() sal_Bool OFieldDescControl::isCutAllowed() { sal_Bool bAllowed = (m_pActFocusWindow != NULL) && - (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || - m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || - m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || + (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || + m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || + m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || m_pActFocusWindow == m_pAutoIncrementValue) && static_cast<Edit*>(m_pActFocusWindow)->GetSelected().Len() != 0; return bAllowed; @@ -1810,9 +1810,9 @@ sal_Bool OFieldDescControl::isCutAllowed() sal_Bool OFieldDescControl::isPasteAllowed() { sal_Bool bAllowed = (m_pActFocusWindow != NULL) && - (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || - m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || - m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || + (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || + m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || + m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || m_pActFocusWindow == m_pAutoIncrementValue); if ( bAllowed ) { @@ -1915,7 +1915,7 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= aLocale; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey); - if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE + if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME ) { nValue = DBTypeConversion::toNullDate(DBTypeConversion::getNULLDate(xNumberFormatter->getNumberFormatsSupplier()),nValue); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 0687b61d7b8e..d4a70092980f 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ #include <algorithm> -#define SOURCE_COLUMN 1 -#define DEST_COLUMN 2 +#define SOURCE_COLUMN 1 +#define DEST_COLUMN 2 namespace dbaui { @@ -67,20 +67,20 @@ namespace dbaui friend class OTableListBoxControl; ::std::auto_ptr< ::svt::ListBoxControl> m_pListCell; - TTableConnectionData::value_type m_pConnData; - const OJoinTableView::OTableWindowMap* m_pTableMap; - OTableListBoxControl* m_pBoxControl; - long m_nDataPos; - Reference< XPropertySet> m_xSourceDef; - Reference< XPropertySet> m_xDestDef; + TTableConnectionData::value_type m_pConnData; + const OJoinTableView::OTableWindowMap* m_pTableMap; + OTableListBoxControl* m_pBoxControl; + long m_nDataPos; + Reference< XPropertySet> m_xSourceDef; + Reference< XPropertySet> m_xDestDef; void fillListBox(const Reference< XPropertySet>& _xDest,long nRow,USHORT nColumnId); /** returns the column id for the editbrowsebox - @param _nColId + @param _nColId the column id SOURCE_COLUMN or DEST_COLUMN - @return the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data + @return the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data */ USHORT getColumnIdent( USHORT _nColId ) const; public: @@ -88,9 +88,9 @@ namespace dbaui virtual ~ORelationControl(); /** searches for a connection between these two tables - @param _pSource + @param _pSource the left table - @param _pDest + @param _pDest the right window */ void setWindowTables(const OTableWindow* _pSource,const OTableWindow* _pDest); @@ -125,7 +125,7 @@ namespace dbaui private: DECL_LINK( AsynchActivate, void* ); - + }; //======================================================================== @@ -177,12 +177,12 @@ namespace dbaui ////////////////////////////////////////////////////////////////////// // set browse mode - SetMode( BROWSER_COLUMNSELECTION | - BROWSER_HLINESFULL | - BROWSER_VLINESFULL | - BROWSER_HIDECURSOR | - BROWSER_HIDESELECT | - BROWSER_AUTO_HSCROLL | + SetMode( BROWSER_COLUMNSELECTION | + BROWSER_HLINESFULL | + BROWSER_VLINESFULL | + BROWSER_HIDECURSOR | + BROWSER_HIDESELECT | + BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL); } else @@ -209,7 +209,7 @@ namespace dbaui PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate)); else if (rNEvt.GetType() == EVENT_GETFOCUS) PostUserEvent(LINK(this, ORelationControl, AsynchActivate)); - + return EditBrowseBox::PreNotify(rNEvt); } @@ -234,8 +234,8 @@ namespace dbaui long nRow = GetCurRow(); USHORT nCol = GetCurColumnId(); - BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1))) - || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0))); + BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1))) + || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0))); return bRet && EditBrowseBox::IsTabAllowed(bForward); } @@ -304,18 +304,18 @@ namespace dbaui void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId ) { DBG_CHKTHIS(ORelationControl,NULL); - + ULONG nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; Reference< XPropertySet> xDef; switch ( getColumnIdent(nColumnId) ) { case SOURCE_COLUMN: - xDef = m_xSourceDef; + xDef = m_xSourceDef; nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; break; case DEST_COLUMN: - xDef = m_xDestDef; + xDef = m_xDestDef; nHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL; break; default: @@ -359,7 +359,7 @@ namespace dbaui DBG_CHKTHIS(ORelationControl,NULL); String aText =const_cast< ORelationControl*>(this)->GetCellText( m_nDataPos, nColumnId ); - Point aPos( rRect.TopLeft() ); + Point aPos( rRect.TopLeft() ); Size aTextSize( GetDataWindow().GetTextHeight(),GetDataWindow().GetTextWidth( aText )); if( aPos.X() < rRect.Right() || aPos.X() + aTextSize.Width() > rRect.Right() || @@ -409,7 +409,7 @@ namespace dbaui { m_xSourceDef = _pSource->GetTable(); SetColumnTitle(1, _pSource->GetName()); - + m_xDestDef = _pDest->GetTable(); SetColumnTitle(2, _pDest->GetName()); @@ -465,11 +465,11 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent ,IRelationControlInterface* _pParentDialog) : Window(_pParent,_rResId) , m_aFL_InvolvedTables( this, ResId(FL_INVOLVED_TABLES,*_rResId.GetResMgr())) - , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr())) - , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr())) + , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr())) + , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr())) , m_aFL_InvolvedFields( this, ResId(FL_INVOLVED_FIELDS,*_rResId.GetResMgr())) , m_pTableMap(_pTableMap) - , m_pParentDialog(_pParentDialog) + , m_pParentDialog(_pParentDialog) { m_pRC_Tables = new ORelationControl( this,m_pTableMap ); m_pRC_Tables->SetHelpId(HID_RELDLG_KEYFIELDS); @@ -530,7 +530,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent m_pRC_Tables->setWindowTables(pInitialLeft,pInitialRight); // die in einer ComboBox ausgewaehlte Tabelle darf nicht in der anderen zur Verfuegung stehen - + if ( m_pTableMap->size() > 2 ) { m_lmbLeftTable.RemoveEntry(m_strCurrentRight); @@ -547,8 +547,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox*, pListBox ) { String strSelected(pListBox->GetSelectEntry()); - OTableWindow* pLeft = NULL; - OTableWindow* pRight = NULL; + OTableWindow* pLeft = NULL; + OTableWindow* pRight = NULL; // eine Sonderbehandlung : wenn es nur zwei Tabellen gibt, muss ich bei Wechsel in einer LB auch in der anderen umschalten if ( m_pTableMap->size() == 2 ) @@ -567,13 +567,13 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent if ( m_lmbLeftTable.GetSelectEntry() == String(pFirst->GetName()) ) { - pLeft = pFirst; - pRight = pSecond; + pLeft = pFirst; + pRight = pSecond; } else { - pLeft = pSecond; - pRight = pFirst; + pLeft = pSecond; + pRight = pFirst; } } else @@ -592,10 +592,10 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent m_lmbRightTable.InsertEntry(m_strCurrentLeft); // und den jetzt selektierten raus m_lmbRightTable.RemoveEntry(strSelected); - m_strCurrentLeft = strSelected; - + m_strCurrentLeft = strSelected; + pLeft = pLoop; - + OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_lmbRightTable.GetSelectEntry()); OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name"); if ( aIter != m_pTableMap->end() ) @@ -700,8 +700,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent return bRet; } // ----------------------------------------------------------------------------- - TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const - { + TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const + { return m_pRC_Tables->getData()->getReferencingTable(); } // ----------------------------------------------------------------------------- @@ -710,7 +710,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent if ( !_bEnable ) PostUserEvent(LINK(m_pRC_Tables, ORelationControl, AsynchDeactivate)); m_pRC_Tables->Enable(_bEnable); - + } // ----------------------------------------------------------------------------- } diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx index 47cac018ffc5..2299e47688a5 100644 --- a/dbaccess/source/ui/control/ScrollHelper.cxx +++ b/dbaccess/source/ui/control/ScrollHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include "ScrollHelper.hxx" #include <tools/debug.hxx> -#define LISTBOX_SCROLLING_AREA 12 +#define LISTBOX_SCROLLING_AREA 12 namespace dbaui { DBG_NAME(OScrollHelper) @@ -47,7 +47,7 @@ DBG_NAME(OScrollHelper) // ----------------------------------------------------------------------------- OScrollHelper::~OScrollHelper() { - + DBG_DTOR(OScrollHelper,NULL); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 5acc67d433a6..8e05e67fb2cc 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace dbaui //------------------------------------------------------------------ sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars) { - return ( + return ( (_cChar >= 'A' && _cChar <= 'Z') || _cChar == '_' || _sAllowedChars.indexOf(_cChar) != -1 || @@ -43,16 +43,16 @@ namespace dbaui ); } //------------------------------------------------------------------ - sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, + sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, const ::rtl::OUString& _sToCheck, ::rtl::OUString& _rsCorrected) { sal_Bool bCorrected = sal_False; if ( m_bCheck ) { - XubString sSavedValue = _sOldValue; - XubString sText = _sToCheck; - xub_StrLen nMatch = 0; + XubString sSavedValue = _sOldValue; + XubString sText = _sToCheck; + xub_StrLen nMatch = 0; for ( xub_StrLen i=nMatch;i < sText.Len(); ++i ) { if ( !isCharOk( sText.GetBuffer()[i], i == 0, m_bOnlyUpperCase, m_sAllowedChars ) ) diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 991dca50d804..57ea25f505a2 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,13 +47,13 @@ using namespace ::dbaui; using namespace ::svt; const USHORT COL_TABLE_NAME = 1; -const USHORT COL_SELECT = 2; -const USHORT COL_INSERT = 3; -const USHORT COL_DELETE = 4; -const USHORT COL_UPDATE = 5; -const USHORT COL_ALTER = 6; -const USHORT COL_REF = 7; -const USHORT COL_DROP = 8; +const USHORT COL_SELECT = 2; +const USHORT COL_INSERT = 3; +const USHORT COL_DELETE = 4; +const USHORT COL_UPDATE = 5; +const USHORT COL_ALTER = 6; +const USHORT COL_REF = 7; +const USHORT COL_DROP = 8; DBG_NAME(OTableGrantControl) @@ -72,7 +72,7 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId) ////////////////////////////////////////////////////////////////////// // Spalten einfuegen USHORT i=1; - InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75); + InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75); FreezeColumn(i++); InsertDataColumn( i++, String(ModuleRes(STR_TABLE_PRIV_SELECT)), 75); InsertDataColumn( i++, String(ModuleRes(STR_TABLE_PRIV_INSERT)), 75); @@ -99,7 +99,7 @@ OTableGrantControl::~OTableGrantControl() delete m_pCheckCell; delete m_pEdit; - m_xTables = NULL; + m_xTables = NULL; } // ----------------------------------------------------------------------------- void OTableGrantControl::setTablesSupplier(const Reference< XTablesSupplier >& _xTablesSup) @@ -131,7 +131,7 @@ void OTableGrantControl::UpdateTables() if(m_xTables.is()) RowInserted(0, m_aTableNames.getLength()); - // m_bEnable = m_xDb->GetUser() != ((OUserAdmin*)GetParent())->GetUser(); + // m_bEnable = m_xDb->GetUser() != ((OUserAdmin*)GetParent())->GetUser(); } //------------------------------------------------------------------------ void OTableGrantControl::Init() @@ -143,10 +143,10 @@ void OTableGrantControl::Init() // ComboBox instanzieren if(!m_pCheckCell) { - m_pCheckCell = new CheckBoxControl( &GetDataWindow() ); + m_pCheckCell = new CheckBoxControl( &GetDataWindow() ); m_pCheckCell->GetBox().EnableTriState(FALSE); - m_pEdit = new Edit( &GetDataWindow() ); + m_pEdit = new Edit( &GetDataWindow() ); m_pEdit->SetReadOnly(); m_pEdit->Enable(FALSE); } @@ -155,7 +155,7 @@ void OTableGrantControl::Init() ////////////////////////////////////////////////////////////////////// // Browser Mode setzen BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | - BROWSER_HIDECURSOR | BROWSER_HIDESELECT; + BROWSER_HIDECURSOR | BROWSER_HIDESELECT; SetMode(nMode); } @@ -219,10 +219,10 @@ BOOL OTableGrantControl::IsTabAllowed(BOOL bForward) const return EditBrowseBox::IsTabAllowed(bForward); } //------------------------------------------------------------------------------ -#define GRANT_REVOKE_RIGHT(what) \ - if(m_pCheckCell->GetBox().IsChecked()) \ +#define GRANT_REVOKE_RIGHT(what) \ + if(m_pCheckCell->GetBox().IsChecked()) \ xAuth->grantPrivileges(sTableName,PrivilegeObject::TABLE,what);\ - else \ + else \ xAuth->revokePrivileges(sTableName,PrivilegeObject::TABLE,what) //------------------------------------------------------------------------------ @@ -238,7 +238,7 @@ BOOL OTableGrantControl::SaveModified() BOOL bErg = TRUE; try { - + if ( m_xUsers->hasByName(m_sUserName) ) { Reference<XAuthorizable> xAuth(m_xUsers->getByName(m_sUserName),UNO_QUERY); @@ -291,7 +291,7 @@ String OTableGrantControl::GetCellText( long nRow, USHORT nColId ) const DBG_CHKTHIS(OTableGrantControl,NULL); if(COL_TABLE_NAME == nColId) return m_aTableNames[nRow]; - + sal_Int32 nPriv = 0; TTablePrivilegeMap::const_iterator aFind = findPrivilege(nRow); if(aFind != m_aPrivMap.end()) @@ -316,9 +316,9 @@ void OTableGrantControl::InitController( CellControllerRef& /*rController*/, lon } } // ----------------------------------------------------------------------------- -void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const +void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const { - + if ( m_xUsers->hasByName(m_sUserName) ) { try @@ -328,7 +328,7 @@ void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const { // get the privileges TPrivileges nRights; - nRights.nRights = xAuth->getPrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE); + nRights.nRights = xAuth->getPrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE); if(m_xGrantUser.is()) nRights.nWithGrant = m_xGrantUser->getGrantablePrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE); else @@ -429,7 +429,7 @@ BOOL OTableGrantControl::SeekRow( long nRow ) void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const { DBG_CHKTHIS(OTableGrantControl,NULL); - + if(nColumnId != COL_TABLE_NAME) { TTablePrivilegeMap::const_iterator aFind = findPrivilege(m_nDataPos); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src index 8da72a1f9fe1..9ed55e529906 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.src +++ b/dbaccess/source/ui/control/TableGrantCtrl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 929b5c050743..c3eed83c5d43 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <tools/debug.hxx> -#define SPLITTER_WIDTH 80 +#define SPLITTER_WIDTH 80 using namespace ::dbaui; @@ -46,8 +46,8 @@ OSplitterView::OSplitterView(Window* _pParent,sal_Bool _bVertical) : Window(_pPa ,m_pRight(NULL) ,m_bVertical(_bVertical) { - DBG_CTOR(OSplitterView,NULL); - ImplInitSettings( sal_True, sal_True, sal_True ); + DBG_CTOR(OSplitterView,NULL); + ImplInitSettings( sal_True, sal_True, sal_True ); } // ----------------------------------------------------------------------------- OSplitterView::~OSplitterView() @@ -59,7 +59,7 @@ OSplitterView::~OSplitterView() IMPL_LINK( OSplitterView, SplitHdl, Splitter*, /*pSplit*/ ) { OSL_ENSURE(m_pSplitter, "Splitter is NULL!"); - if ( m_bVertical ) + if ( m_bVertical ) { long nPosY = m_pSplitter->GetPosPixel().Y(); m_pSplitter->SetPosPixel( Point( m_pSplitter->GetSplitPosPixel(), nPosY ) ); @@ -81,7 +81,7 @@ void OSplitterView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_ if ( IsControlFont() ) aFont.Merge( GetControlFont() ); SetPointFont( aFont ); -// Set/*Zoomed*/PointFont( aFont ); +// Set/*Zoomed*/PointFont( aFont ); } if ( bFont || bForeground ) @@ -130,18 +130,18 @@ void OSplitterView::Resize() Window::Resize(); OSL_ENSURE( m_pRight, "No init called!"); - Point aSplitPos; - Size aSplitSize; - Point aPlaygroundPos( 0,0 ); - Size aPlaygroundSize( GetOutputSizePixel() ); + Point aSplitPos; + Size aSplitSize; + Point aPlaygroundPos( 0,0 ); + Size aPlaygroundSize( GetOutputSizePixel() ); if ( m_pLeft && m_pLeft->IsVisible() && m_pSplitter ) { - aSplitPos = m_pSplitter->GetPosPixel(); - aSplitSize = m_pSplitter->GetOutputSizePixel(); - if ( m_bVertical ) + aSplitPos = m_pSplitter->GetPosPixel(); + aSplitSize = m_pSplitter->GetOutputSizePixel(); + if ( m_bVertical ) { - // calculate the splitter pos and size + // calculate the splitter pos and size aSplitPos.Y() = aPlaygroundPos.Y(); aSplitSize.Height() = aPlaygroundSize.Height(); @@ -152,8 +152,8 @@ void OSplitterView::Resize() aSplitPos.X() = aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.3); // the tree pos and size - Point aTreeViewPos( aPlaygroundPos ); - Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); + Point aTreeViewPos( aPlaygroundPos ); + Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); // set the size of treelistbox m_pLeft->SetPosSizePixel( aTreeViewPos, aTreeViewSize ); @@ -174,8 +174,8 @@ void OSplitterView::Resize() aSplitPos.Y() = aPlaygroundPos.Y() + sal_Int32(aPlaygroundSize.Height() * 0.3); // the tree pos and size - Point aTreeViewPos( aPlaygroundPos ); - Size aTreeViewSize( aPlaygroundSize.Width() ,aSplitPos.Y()); + Point aTreeViewPos( aPlaygroundPos ); + Size aTreeViewSize( aPlaygroundSize.Width() ,aSplitPos.Y()); // set the size of treelistbox m_pLeft->SetPosSizePixel( aTreeViewPos, aTreeViewSize ); @@ -188,7 +188,7 @@ void OSplitterView::Resize() if ( m_pRight ) { - if ( m_bVertical ) + if ( m_bVertical ) m_pRight->SetPosSizePixel( aSplitPos.X() + aSplitSize.Width(), aPlaygroundPos.Y(), aPlaygroundSize.Width() - aSplitSize.Width() - aSplitPos.X(), aPlaygroundSize.Height()); else diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index bd72946958ca..df1d6261fd44 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 43f8ae2e6a57..ec8c6e3faf7b 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ OConnectionURLEdit::~OConnectionURLEdit() Edit* pSubEdit = GetSubEdit(); SetSubEdit(NULL); delete pSubEdit; - delete m_pForcedPrefix; + delete m_pForcedPrefix; } //------------------------------------------------------------------------- @@ -128,7 +128,7 @@ void OConnectionURLEdit::SetText(const String& _rStr, const Selection& /*_rNewSe GetSubEdit()->Show(); // do the real SetTex -// Edit::SetText(bIsEmpty ? _rStr : m_pTypeCollection->cutPrefix(_rStr), _rNewSelection); +// Edit::SetText(bIsEmpty ? _rStr : m_pTypeCollection->cutPrefix(_rStr), _rNewSelection); String sNewText( _rStr ); if ( !bIsEmpty ) sNewText = m_pTypeCollection->cutPrefix( _rStr ); @@ -150,7 +150,7 @@ void OConnectionURLEdit::ShowPrefix(BOOL _bShowPrefix) m_pForcedPrefix->Show(m_bShowPrefix); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 381c7036677f..c2d057037c9f 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ using namespace ::com::sun::star::ui; using namespace ::com::sun::star::view; DBG_NAME(DBTreeListBox) -#define SPACEBETWEENENTRIES 4 +#define SPACEBETWEENENTRIES 4 //======================================================================== // class DBTreeListBox //======================================================================== @@ -92,7 +92,7 @@ DBTreeListBox::DBTreeListBox( Window* pParent, const Reference< XMultiServiceFac ,m_xORB(_rxORB) { DBG_CTOR(DBTreeListBox,NULL); - init(); + init(); } // ----------------------------------------------------------------------------- void DBTreeListBox::init() @@ -119,7 +119,7 @@ DBTreeListBox::~DBTreeListBox() //------------------------------------------------------------------------ SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const IEntryFilter* _pFilter ) const { - SvLBoxTreeList* myModel = GetModel(); + SvLBoxTreeList* myModel = GetModel(); SvTreeEntryList* pChilds = myModel->GetChildList(pStart); SvLBoxEntry* pEntry = NULL; if ( pChilds ) @@ -349,7 +349,7 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt ) void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) { KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); - USHORT nCode = rKEvt.GetKeyCode().GetCode(); + USHORT nCode = rKEvt.GetKeyCode().GetCode(); sal_Bool bHandled = sal_False; if(eFunc != KEYFUNC_DONTKNOW) @@ -407,7 +407,7 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) // 2002-12-02 - 105831 - fs@openoffice.org } - if ( !bHandled ) + if ( !bHandled ) SvTreeListBox::KeyInput(rKEvt); } // ----------------------------------------------------------------------------- @@ -427,7 +427,7 @@ BOOL DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText m_aSelectedEntries.erase( pEntry ); } SetEntryText(pEntry,aEntry.aNewText); - + return FALSE; // we never want that the base change our text } @@ -592,20 +592,20 @@ namespace throw IllegalArgumentException(); // API bug: this should be a NoSupportException } - + //-------------------------------------------------------------------- Any SAL_CALL SelectionSupplier::getSelection( ) throw (RuntimeException) { return m_aSelection; } - + //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { OSL_ENSURE( false, "SelectionSupplier::removeSelectionChangeListener: no support!" ); // API bug: this should be a NoSupportException } - + //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { @@ -711,7 +711,7 @@ IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/) { implStopSelectionTimer(); - m_aSelChangeHdl.Call( NULL ); + m_aSelChangeHdl.Call( NULL ); return 0L; } // ----------------------------------------------------------------------------- @@ -721,7 +721,7 @@ void DBTreeListBox::StateChanged( StateChangedType nStateChange ) implStopSelectionTimer(); } // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx index 2f2c7afd2a60..7de4fc35bf56 100644 --- a/dbaccess/source/ui/control/listviewitems.cxx +++ b/dbaccess/source/ui/control/listviewitems.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace dbaui } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 1ecb15575ca9..bca4ebe053cf 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; //......................................................................... -#define SPACEBETWEENENTRIES 4 +#define SPACEBETWEENENTRIES 4 //======================================================================== //= OMarkableTreeListBox //======================================================================== DBG_NAME(OMarkableTreeListBox) //------------------------------------------------------------------------ -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle ) +OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle ) : DBTreeListBox(pParent,_rxORB,nWinStyle) { DBG_CTOR(OMarkableTreeListBox,NULL); @@ -53,7 +53,7 @@ OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XM InitButtonData(); } //------------------------------------------------------------------------ -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, const ResId& rResId) +OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, const ResId& rResId) : DBTreeListBox(pParent,_rxORB,rResId) { DBG_CTOR(OMarkableTreeListBox,NULL); @@ -205,7 +205,7 @@ void OMarkableTreeListBox::CheckButtonHdl() void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) { SvButtonState eState = GetCheckButtonState( _pEntry); - if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken + if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken { SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry); SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry); @@ -220,7 +220,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) while(pEntry) { SetCheckButtonState(pEntry,eState); - if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken + if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken { SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry); SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry); @@ -237,7 +237,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) //------------------------------------------------------------------------ //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 78fd8f4fdd1c..5672fc94941c 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 3eee26f30959..066085de70b1 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -175,7 +175,7 @@ void OSqlEdit::SetText(const String& rNewText) { DBG_CHKTHIS(OSqlEdit,NULL); if (m_timerUndoActionCreation.IsActive()) - { // die noch anstehenden Undo-Action erzeugen + { // die noch anstehenden Undo-Action erzeugen m_timerUndoActionCreation.Stop(); LINK(this, OSqlEdit, OnUndoActionTimer).Call(NULL); } diff --git a/dbaccess/source/ui/control/statusbarontroller.cxx b/dbaccess/source/ui/control/statusbarontroller.cxx index 37cb9c85f990..ddf46a3f0479 100644 --- a/dbaccess/source/ui/control/statusbarontroller.cxx +++ b/dbaccess/source/ui/control/statusbarontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 832459021f1e..fa593339152b 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -318,7 +318,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn TNames::const_iterator aEnd = _rTables.end(); Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW ); - for ( ; aIter != aEnd; ++aIter ) + for ( ; aIter != aEnd; ++aIter ) { // add the entry implAddEntry( @@ -409,8 +409,8 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, // special emphasizing handling for the "all objects" entry // 89709 - 16.07.2001 - frank.schoenheit@sun.com sal_Bool bAllObjectsEntryAffected = haveVirtualRoot() && (getAllObjectsEntry() == _pEntry); - if ( GetModel()->HasChilds(_pEntry) // the entry has children - || bAllObjectsEntryAffected // or it is the "all objects" entry + if ( GetModel()->HasChilds(_pEntry) // the entry has children + || bAllObjectsEntryAffected // or it is the "all objects" entry ) { OBoldListboxString* pTextItem = static_cast<OBoldListboxString*>(_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING)); @@ -690,7 +690,7 @@ void OTableTreeListBox::removedTable( const ::rtl::OUString& _rName ) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/tabletree.hrc b/dbaccess/source/ui/control/tabletree.hrc index 1566e1ec10ce..b5450948e978 100644 --- a/dbaccess/source/ui/control/tabletree.hrc +++ b/dbaccess/source/ui/control/tabletree.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ //------------------------------------------------------------------------ //- menu ids -#define MID_SORT_ASCENDING 1 -#define MID_SORT_DECENDING 2 +#define MID_SORT_ASCENDING 1 +#define MID_SORT_DECENDING 2 #endif // _DBAUI_TABLETREE_HRC_ diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src index d08535f3e8da..26342fe28ba2 100644 --- a/dbaccess/source/ui/control/tabletree.src +++ b/dbaccess/source/ui/control/tabletree.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 57618dea47b1..ad90d8a35e04 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ namespace dbaui m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewViewSQL")) ,sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuery")) ,sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuerySql")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReportAutoPilot")),sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTable")) ,sal_True)); } diff --git a/dbaccess/source/ui/control/undosqledit.cxx b/dbaccess/source/ui/control/undosqledit.cxx index 39e44be96f3f..ae527a9080a1 100644 --- a/dbaccess/source/ui/control/undosqledit.cxx +++ b/dbaccess/source/ui/control/undosqledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src index 814a304d18c0..09884a24b906 100644 --- a/dbaccess/source/ui/control/undosqledit.src +++ b/dbaccess/source/ui/control/undosqledit.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/AdabasPage.hrc b/dbaccess/source/ui/dlg/AdabasPage.hrc index a36dbb25da27..52b14304d910 100644 --- a/dbaccess/source/ui/dlg/AdabasPage.hrc +++ b/dbaccess/source/ui/dlg/AdabasPage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,23 +27,23 @@ #ifndef DBAUI_ADABASPAGE_HRC #define DBAUI_ADABASPAGE_HRC -#define FT_CACHE_SIZE 1 -#define FT_DATA_INCREMENT 2 -#define FT_CTRLPASSWORD 3 -#define FT_CTRLUSERNAME 4 +#define FT_CACHE_SIZE 1 +#define FT_DATA_INCREMENT 2 +#define FT_CTRLPASSWORD 3 +#define FT_CTRLUSERNAME 4 -#define NF_DATA_INCREMENT 1 -#define NF_CACHE_SIZE 2 +#define NF_DATA_INCREMENT 1 +#define NF_CACHE_SIZE 2 -#define CB_SHUTDB 1 +#define CB_SHUTDB 1 -#define FL_1 1 +#define FL_1 1 -#define PB_STAT 1 +#define PB_STAT 1 -#define ET_CTRLPASSWORD 1 -#define ET_CTRLUSERNAME 2 +#define ET_CTRLPASSWORD 1 +#define ET_CTRLUSERNAME 2 #endif // DBAUI_ADABASPAGE_HRC diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx index 6f4af6e9aae8..b1c24e3b090f 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.cxx +++ b/dbaccess/source/ui/dlg/AdabasStat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,20 +63,20 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, const Reference< XMultiServiceFactory >& _xFactory) : ModalDialog( pParent, ModuleRes(DLG_ADABASSTAT) ) ,m_FL_FILES( this , ModuleRes(FL_FILES)) - ,m_FT_SYSDEVSPACE( this , ModuleRes(FT_SYSDEVSPACE)) - ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ModuleRes(ET_SYSDEVSPACE)) - ,m_FT_TRANSACTIONLOG( this , ModuleRes(FT_TRANSACTIONLOG)) - ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ModuleRes(ET_TRANSACTIONLOG)) - ,m_FT_DATADEVSPACE( this , ModuleRes(FT_DATADEVSPACE)) - ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ModuleRes(LB_DATADEVS)) + ,m_FT_SYSDEVSPACE( this , ModuleRes(FT_SYSDEVSPACE)) + ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ModuleRes(ET_SYSDEVSPACE)) + ,m_FT_TRANSACTIONLOG( this , ModuleRes(FT_TRANSACTIONLOG)) + ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ModuleRes(ET_TRANSACTIONLOG)) + ,m_FT_DATADEVSPACE( this , ModuleRes(FT_DATADEVSPACE)) + ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ModuleRes(LB_DATADEVS)) ,m_FL_SIZES( this , ModuleRes(FL_SIZES)) - ,m_FT_SIZE( this , ModuleRes(FT_SIZE)) - ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ModuleRes(ET_SIZE)) - ,m_FT_FREESIZE( this , ModuleRes(FT_FREESIZE)) - ,m_ET_FREESIZE( this , STR_ADABAS_HELP_FREESIZE,ModuleRes(ET_FREESIZE)) - ,m_FT_MEMORYUSING( this , ModuleRes(FT_MEMORYUSING)) - ,m_ET_MEMORYUSING( this , STR_ADABAS_HELP_MEMORYUSING,ModuleRes(ET_MEMORYUSING)) - ,m_PB_OK( this , ModuleRes(PB_OK)) + ,m_FT_SIZE( this , ModuleRes(FT_SIZE)) + ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ModuleRes(ET_SIZE)) + ,m_FT_FREESIZE( this , ModuleRes(FT_FREESIZE)) + ,m_ET_FREESIZE( this , STR_ADABAS_HELP_FREESIZE,ModuleRes(ET_FREESIZE)) + ,m_FT_MEMORYUSING( this , ModuleRes(FT_MEMORYUSING)) + ,m_ET_MEMORYUSING( this , STR_ADABAS_HELP_MEMORYUSING,ModuleRes(ET_MEMORYUSING)) + ,m_PB_OK( this , ModuleRes(PB_OK)) ,m_xConnection(_xCurrentConnection) ,m_bErrorShown(sal_False) { @@ -90,17 +90,17 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, Reference<XStatement> xStmt; Reference<XResultSet> xRes; - sal_Bool bCanSelect = sal_False; + sal_Bool bCanSelect = sal_False; ::rtl::OUString aStmt; ::rtl::OUString sSchema = _rUser.toAsciiUpperCase(); Reference<XDatabaseMetaData> xMetaData; - // first read the sizes + // first read the sizes try { xMetaData = m_xConnection->getMetaData(); bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("SERVERDBSTATISTICS"),sSchema); - + if(bCanSelect) { aStmt = ::rtl::OUString::createFromAscii("SELECT SERVERDBSIZE, UNUSEDPAGES FROM "); @@ -154,7 +154,7 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, try { bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("DATADEVSPACES"),sSchema); - + if(bCanSelect) { // then the db files @@ -198,7 +198,7 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, try { bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("CONFIGURATION"),sSchema); - + if(bCanSelect) { aStmt = ::rtl::OUString::createFromAscii("SELECT * FROM "); diff --git a/dbaccess/source/ui/dlg/AdabasStat.hrc b/dbaccess/source/ui/dlg/AdabasStat.hrc index 32734ea9075a..d2bb95c38b2e 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hrc +++ b/dbaccess/source/ui/dlg/AdabasStat.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,22 +28,22 @@ #define DBAUI_ADABASSTAT_HRC -#define FT_SYSDEVSPACE 1 -#define FT_TRANSACTIONLOG 2 -#define FT_DATADEVSPACE 3 -#define FT_SIZE 4 -#define FT_FREESIZE 5 -#define FT_MEMORYUSING 6 +#define FT_SYSDEVSPACE 1 +#define FT_TRANSACTIONLOG 2 +#define FT_DATADEVSPACE 3 +#define FT_SIZE 4 +#define FT_FREESIZE 5 +#define FT_MEMORYUSING 6 -#define ET_SYSDEVSPACE 1 -#define ET_TRANSACTIONLOG 2 -#define ET_MEMORYUSING 3 -#define ET_SIZE 4 -#define ET_FREESIZE 5 +#define ET_SYSDEVSPACE 1 +#define ET_TRANSACTIONLOG 2 +#define ET_MEMORYUSING 3 +#define ET_SIZE 4 +#define ET_FREESIZE 5 -#define LB_DATADEVS 1 +#define LB_DATADEVS 1 -#define PB_OK 1 +#define PB_OK 1 #define FL_FILES 1 #define FL_SIZES 2 diff --git a/dbaccess/source/ui/dlg/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx index 7bba19f59724..f9cec381c65b 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hxx +++ b/dbaccess/source/ui/dlg/AdabasStat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,32 +47,32 @@ namespace dbaui protected: FixedLine m_FL_FILES; - FixedText m_FT_SYSDEVSPACE; - OPropEditCtrl m_ET_SYSDEVSPACE; - FixedText m_FT_TRANSACTIONLOG; - OPropEditCtrl m_ET_TRANSACTIONLOG; - FixedText m_FT_DATADEVSPACE; - OPropListBoxCtrl m_LB_DATADEVS; + FixedText m_FT_SYSDEVSPACE; + OPropEditCtrl m_ET_SYSDEVSPACE; + FixedText m_FT_TRANSACTIONLOG; + OPropEditCtrl m_ET_TRANSACTIONLOG; + FixedText m_FT_DATADEVSPACE; + OPropListBoxCtrl m_LB_DATADEVS; FixedLine m_FL_SIZES; - FixedText m_FT_SIZE; - OPropEditCtrl m_ET_SIZE; - FixedText m_FT_FREESIZE; - OPropEditCtrl m_ET_FREESIZE; - FixedText m_FT_MEMORYUSING; - OPropNumericEditCtrl m_ET_MEMORYUSING; + FixedText m_FT_SIZE; + OPropEditCtrl m_ET_SIZE; + FixedText m_FT_FREESIZE; + OPropEditCtrl m_ET_FREESIZE; + FixedText m_FT_MEMORYUSING; + OPropNumericEditCtrl m_ET_MEMORYUSING; - OKButton m_PB_OK; + OKButton m_PB_OK; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xConnection; /// valid as long as the page is active - sal_Bool m_bErrorShown; // true when we shown already the error + m_xConnection; /// valid as long as the page is active + sal_Bool m_bErrorShown; // true when we shown already the error // check if the given table is accessable by the connected user sal_Bool checkSystemTable(const ::rtl::OUString& _rsSystemTable, ::rtl::OUString& _rsSchemaName ); void showError(); public: - OAdabasStatistics( Window* pParent, + OAdabasStatistics( Window* pParent, const ::rtl::OUString& _rUser, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCurrentConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory); diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src index ff29ac12383d..77472536425e 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.src +++ b/dbaccess/source/ui/dlg/AdabasStat.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,129 +37,129 @@ ModalDialog DLG_ADABASSTAT { - OutputSize = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + OutputSize = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; FixedLine FL_FILES { - Pos = MAP_APPFONT ( 6 , 3 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 12, 8 ) ; Text [ en-US ] = "Database files"; }; FixedText FT_SYSDEVSPACE { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "S~YSDEVSPACE:"; }; Edit ET_SYSDEVSPACE { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 14 ) ; - Size = MAP_APPFONT ( 128 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 14 ) ; + Size = MAP_APPFONT ( 128 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_TRANSACTIONLOG { - Pos = MAP_APPFONT ( 12 , 32 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 32 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "~TRANSACTIONLOG:"; }; Edit ET_TRANSACTIONLOG { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 31 ) ; - Size = MAP_APPFONT ( 128 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 31 ) ; + Size = MAP_APPFONT ( 128 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_DATADEVSPACE { - Pos = MAP_APPFONT ( 12 , 49 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 49 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "DATAD~EVSPACE:"; }; ListBox LB_DATADEVS { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 48 ) ; - Size = MAP_APPFONT ( 128 , 42 ) ; - TabStop = TRUE; - AutoHScroll = TRUE; - VScroll = TRUE; - HScroll = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 48 ) ; + Size = MAP_APPFONT ( 128 , 42 ) ; + TabStop = TRUE; + AutoHScroll = TRUE; + VScroll = TRUE; + HScroll = TRUE; }; FixedLine FL_SIZES { - Pos = MAP_APPFONT ( 6 , 99 ) ; + Pos = MAP_APPFONT ( 6 , 99 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ; Text [ en-US ] = "Database sizes"; }; FixedText FT_SIZE { - Pos = MAP_APPFONT ( 12 , 110 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 110 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "S~ize (MB):"; }; Edit ET_SIZE { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 109 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 109 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_FREESIZE { - Pos = MAP_APPFONT ( 12 , 127 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 127 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "~Free memory space (MB):"; }; Edit ET_FREESIZE { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 126 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 126 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_MEMORYUSING { - Pos = MAP_APPFONT ( 12 , 144 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 144 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "~Memory utilization (in %):"; }; NumericField ET_MEMORYUSING { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 144 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 144 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; OKButton PB_OK { - Pos = MAP_APPFONT ( WINDOW_SIZE_X - 56,WINDOW_SIZE_Y - 20 ) ; - Size = MAP_APPFONT ( 50, 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; + Pos = MAP_APPFONT ( WINDOW_SIZE_X - 56,WINDOW_SIZE_Y - 20 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; }; Text [ en-US ] = "Database Statistics"; diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src index 1bfe3c0233a9..9036489b37ea 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ String STR_MSACCESS_MDB_FILE Text[ en-US ] = "Microsoft Access database file"; }; - + String STR_NO_ADDITIONAL_SETTINGS { Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button."; diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index 425e713094f3..5ec09c3ae5c7 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ #endif -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define EDIT_X 101 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define EDIT_X 101 #define FT_AUTOJDBCDRIVERCLASS 80 #define FT_AUTOFIELDSEPARATOR 81 @@ -107,55 +107,55 @@ #define AUTO_WIZARDHELPTEXT( AUTO_LINECOUNT ) \ - FixedText FT_AUTOWIZARDHEADER \ - { \ + FixedText FT_AUTOWIZARDHEADER \ + { \ Pos = MAP_APPFONT ( START_X , 8 ) ; \ Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = ""; \ - WordBreak = TRUE; \ + WordBreak = TRUE; \ }; \ \ - FixedText FT_AUTOWIZARDHELPTEXT \ - { \ + FixedText FT_AUTOWIZARDHELPTEXT \ + { \ Pos = MAP_APPFONT ( START_X , INIT_Y ) ; \ Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6 , AUTO_LINECOUNT * FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = ""; \ - WordBreak = TRUE; \ + WordBreak = TRUE; \ }; // ------------------------------------------------------------------------------------------------- -#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \ - FixedText FT_AUTOBROWSEURL { \ - Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \ - Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = ""; \ - }; \ +#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \ + FixedText FT_AUTOBROWSEURL { \ + Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \ + Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = ""; \ + }; \ \ \ Edit ET_AUTOBROWSEURL \ - { \ - Pos = MAP_APPFONT ( AUTO_X , AUTO_Y + FIXEDTEXT_HEIGHT + 3) ; \ - Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 - 3 - BUTTON_WIDTH , EDIT_HEIGHT ) ; \ - HelpId = AUTO_HID; \ - TabStop = TRUE ; \ - Border = TRUE ; \ - }; \ + { \ + Pos = MAP_APPFONT ( AUTO_X , AUTO_Y + FIXEDTEXT_HEIGHT + 3) ; \ + Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 - 3 - BUTTON_WIDTH , EDIT_HEIGHT ) ; \ + HelpId = AUTO_HID; \ + TabStop = TRUE ; \ + Border = TRUE ; \ + }; \ \ - PushButton PB_AUTOBROWSEURL \ - { \ - Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \ - Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ - HelpId = (AUTO_HID + 1); \ - TabStop = TRUE ; \ + PushButton PB_AUTOBROWSEURL \ + { \ + Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \ + Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ + HelpId = (AUTO_HID + 1); \ + TabStop = TRUE ; \ Text[ en-US ] = "Browse"; \ }; // -------------------------------------------------------------------------------------------------- -#define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTODATABASENAME \ { \ Pos = MAP_APPFONT ( START_X , AUTO_Y + 2) ; \ @@ -163,39 +163,39 @@ Text[ en-US ] = "Database name"; \ }; \ \ - Edit ET_AUTODATABASENAME \ - { \ - Pos = MAP_APPFONT ( EDIT_X, AUTO_Y) ; \ - Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ - HelpId = AUTO_HID; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + Edit ET_AUTODATABASENAME \ + { \ + Pos = MAP_APPFONT ( EDIT_X, AUTO_Y) ; \ + Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ + HelpId = AUTO_HID; \ + TabStop = TRUE ; \ + Border = TRUE ; \ }; // -------------------------------------------------------------------------------------------------- #define AUTO_HOSTCONTROLGROUP(AUTO_Y, AUTO_HID) \ - FixedText FT_AUTOHOSTNAME \ + FixedText FT_AUTOHOSTNAME \ { \ Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \ Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ); \ Text [ en-US ] = "Server" ; \ }; \ \ - Edit ET_AUTOHOSTNAME \ + Edit ET_AUTOHOSTNAME \ { \ - Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ - Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ - HelpId = AUTO_HID; \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + HelpId = AUTO_HID; \ TabStop = TRUE ; \ - Border = TRUE ; \ - }; + Border = TRUE ; \ + }; // -------------------------------------------------------------------------------------------------- -#define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTOBASEDN \ { \ Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \ @@ -207,9 +207,9 @@ { \ HelpId = AUTO_HID ; \ Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ - Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + TabStop = TRUE ; \ + Border = TRUE ; \ }; \ // -------------------------------------------------------------------------------------------------- @@ -225,18 +225,18 @@ \ NumericField NF_AUTOPORTNUMBER \ { \ - HelpId = AUTO_HID ; \ - Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + HelpId = AUTO_HID ; \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ Size = MAP_APPFONT ( 22 , EDIT_HEIGHT ) ; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + TabStop = TRUE ; \ + Border = TRUE ; \ NoThousandSep = TRUE; \ }; \ \ FixedText FT_AUTOPORTNUMBERDEFAULT \ { \ - HelpId = AUTO_HID + 1 ; \ - Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \ + HelpId = AUTO_HID + 1 ; \ + Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \ Size = MAP_APPFONT ( WIZARD_PAGE_X - EDIT_X - 22 - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "" ; \ }; @@ -267,12 +267,12 @@ CurPos = 0 ; \ }; \ -// -------------------------------------------------------------------------------------------------- +// -------------------------------------------------------------------------------------------------- #define AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X) \ \ FixedText FT_AUTOEXTENSIONHEADER \ { \ - Pos = MAP_APPFONT ( START_X , AUTO_Y) ; \ + Pos = MAP_APPFONT ( START_X , AUTO_Y) ; \ Size = MAP_APPFONT ( AUTOPAGE_X - 2*START_X , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "Specify the type of files you want to access" ; \ }; \ @@ -305,9 +305,9 @@ { \ HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION; \ Pos = MAP_APPFONT (START_X + 66, AUTO_Y + 3*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS - 2 ) ; \ - Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + TabStop = TRUE ; \ + Border = TRUE ; \ }; \ \ FIXEDTEXT FT_AUTOOWNEXTENSIONAPPENDIX \ @@ -332,7 +332,7 @@ }; \ ComboBox CM_AUTOFIELDSEPARATOR \ { \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT - 2 ) ; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT - 2 ) ; \ Size = MAP_APPFONT ( 32 , 60 ) ; \ Text = ";" ; \ TabStop = TRUE ; \ @@ -437,7 +437,7 @@ String STR_AUTONO_WILDCARDS \ { \ Text[ en-US ] = "Wildcards such as ?,* are not allowed in #1." ; \ - }; + }; #define NAMECONTROLGROUP_HEIGHT (FIXEDTEXT_HEIGHT + 2 + EDIT_HEIGHT) @@ -445,8 +445,8 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \ - AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \ +#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \ + AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \ AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID) @@ -455,11 +455,11 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \ \ FixedText FT_AUTOJDBCDRIVERCLASS \ { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \ + Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \ Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ; \ Text [ en-US ] = "JDBC d~river class"; \ }; \ @@ -470,7 +470,7 @@ Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - BUTTON_WIDTH - RELATED_CONTROLS - UNRELATED_CONTROLS , EDIT_HEIGHT ) ; \ TabStop = TRUE ; \ Border = TRUE ; \ - HelpId = AUTO_HID; \ + HelpId = AUTO_HID; \ }; \ \ PushButton PB_AUTOTESTDRIVERCLASS \ @@ -478,8 +478,8 @@ TabStop = TRUE ; \ Pos = MAP_APPFONT ( WIZARD_PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , AUTO_Y + FIXEDTEXT_HEIGHT + 2) ; \ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ - Size = MAP_APPFONT (50, 14); \ - HelpId = AUTO_HID + 1; \ + Size = MAP_APPFONT (50, 14); \ + HelpId = AUTO_HID + 1; \ Text[ en-US ] = "Test class" ; \ }; @@ -493,22 +493,22 @@ Text [ en-US ] = "Socket" ; \ }; \ \ - Edit ET_SOCKET \ + Edit ET_SOCKET \ { \ - Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ - Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ TabStop = TRUE ; \ - Border = TRUE ; \ - }; + Border = TRUE ; \ + }; -#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \ +#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \ AUTO_WIZARDHELPTEXT( 6 ) \ AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID ) \ - AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \ - AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \ + AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \ + AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \ AUTO_SOCKETCONTROLGROUP(129) \ - AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) + AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) // -------------------------------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index c3308fd53f9a..196a19453198 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #include <osl/thread.h> #include <connectivity/dbexception.hxx> -#define FILEDIALOG_DEF_IMAGEBORDER 10 +#define FILEDIALOG_DEF_IMAGEBORDER 10 //......................................................................... namespace dbaui { @@ -79,17 +79,17 @@ OCollectionView::OCollectionView( Window * pParent ,const ::rtl::OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) : ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW)) - , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) - , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) ) - , m_aUp( this, ModuleRes( BTN_EXPLORERFILE_UP ) ) - , m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE ) - , m_aFTName( this, ModuleRes( FT_EXPLORERFILE_FILENAME ) ) - , m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) ) - , m_aFL( this, ModuleRes( FL_1 ) ) - , m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) ) - , m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) - , m_aPB_HELP( this, ModuleRes( PB_HELP ) ) - , m_sPath( ModuleRes( STR_PATHNAME ) ) + , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) + , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) ) + , m_aUp( this, ModuleRes( BTN_EXPLORERFILE_UP ) ) + , m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE ) + , m_aFTName( this, ModuleRes( FT_EXPLORERFILE_FILENAME ) ) + , m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) ) + , m_aFL( this, ModuleRes( FL_1 ) ) + , m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) ) + , m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) + , m_aPB_HELP( this, ModuleRes( PB_HELP ) ) + , m_sPath( ModuleRes( STR_PATHNAME ) ) , m_xContent(_xContent) , m_xORB(_xORB) , m_bCreateForm(sal_True) @@ -336,7 +336,7 @@ void OCollectionView::initCurrentPath() } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/CollectionView.hrc b/dbaccess/source/ui/dlg/CollectionView.hrc index 0a385ff7f23c..8c43b4c0c5a5 100644 --- a/dbaccess/source/ui/dlg/CollectionView.hrc +++ b/dbaccess/source/ui/dlg/CollectionView.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,23 +28,23 @@ #ifndef DBAUI_COLLECTIONVIEW_HRC #define DBAUI_COLLECTIONVIEW_HRC -#define CTRL_VIEW 1 +#define CTRL_VIEW 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define PB_CANCEL 1 +#define PB_HELP 1 -#define ED_EXPLORERFILE_FILENAME 1 +#define ED_EXPLORERFILE_FILENAME 1 -#define FT_EXPLORERFILE_CURRENTPATH 1 -#define FT_EXPLORERFILE_FILENAME 2 +#define FT_EXPLORERFILE_CURRENTPATH 1 +#define FT_EXPLORERFILE_FILENAME 2 -#define BTN_EXPLORERFILE_NEWFOLDER 1 -#define BTN_EXPLORERFILE_UP 2 -#define BTN_EXPLORERFILE_SAVE 3 +#define BTN_EXPLORERFILE_NEWFOLDER 1 +#define BTN_EXPLORERFILE_UP 2 +#define BTN_EXPLORERFILE_SAVE 3 -#define STR_PATHNAME 1 +#define STR_PATHNAME 1 -#define FL_1 1 +#define FL_1 1 #endif //DBAUI_COLLECTIONVIEW_HRC diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src index 018893384dab..3b82d565a7ac 100644 --- a/dbaccess/source/ui/dlg/CollectionView.src +++ b/dbaccess/source/ui/dlg/CollectionView.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,14 +34,14 @@ #define WIN_X 200 #define WIN_Y 192 -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define FIXEDLINE_HEIGHT 1 -#define IMG_SIZE 15 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define FIXEDLINE_HEIGHT 1 +#define IMG_SIZE 15 ModalDialog DLG_COLLECTION_VIEW @@ -55,7 +55,7 @@ ModalDialog DLG_COLLECTION_VIEW Size = MAP_APPFONT ( WIN_X , WIN_Y ) ; Text [ en-US ] = "Save" ; - + FixedText FT_EXPLORERFILE_CURRENTPATH { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS ) ; @@ -76,7 +76,7 @@ ModalDialog DLG_COLLECTION_VIEW Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ; QuickHelpText [ en-US ] = "Up One Level" ; }; - + Control CTRL_VIEW { TabStop = TRUE ; @@ -98,13 +98,13 @@ ModalDialog DLG_COLLECTION_VIEW Border = TRUE ; TabStop = TRUE ; }; - + FixedLine FL_1 { Pos = MAP_APPFONT ( 0 , WIN_Y - 2*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT) ; Size = MAP_APPFONT ( WIN_X , FIXEDLINE_HEIGHT ) ; }; - + PushButton BTN_EXPLORERFILE_SAVE { Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; @@ -113,22 +113,22 @@ ModalDialog DLG_COLLECTION_VIEW TabStop = TRUE ; Text [ en-US ] = "Save" ; }; - + CancelButton PB_CANCEL { TabStop = TRUE ; - Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; + Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ; }; - + HelpButton PB_HELP { TabStop = TRUE ; - Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; + Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ; }; - - + + String STR_PATHNAME { Text [ en-US ] = "~Path:" ; @@ -141,7 +141,7 @@ String STR_NEW_FOLDER }; Image IMG_NAVIGATION_BTN_UP_SC { - ImageBitmap = Bitmap { File = "fp010"; }; + ImageBitmap = Bitmap { File = "fp010"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; Image IMG_NAVIGATION_BTN_UP_SCH diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 7e6ac39f658f..743cf89beb5e 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -307,28 +307,28 @@ DBG_NAME(OConnectionHelper) sal_Bool bOldFashion = sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength(); if(!bOldFashion) // we have a normal adabas installation - { // so we check the local database names in $DBROOT/config - sAdabasConfigDir = sRootDir; - sAdabasWorkDir = sRootDir; + { // so we check the local database names in $DBROOT/config + sAdabasConfigDir = sRootDir; + sAdabasWorkDir = sRootDir; } if(sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength() && sRootDir.getLength()) { - aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); + aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); if(!aInstalledDBs.size() && bOldFashion) { - sAdabasConfigDir = sRootDir; - sAdabasWorkDir = sRootDir; - aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); + sAdabasConfigDir = sRootDir; + sAdabasWorkDir = sRootDir; + aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); } ODatasourceSelectDialog aSelector(GetParent(), aInstalledDBs, true,m_pItemSetHelper->getWriteOutputSet()); if (RET_OK == aSelector.Execute()) { setURLNoPrefix(aSelector.GetSelected()); - // checkCreateDatabase( ::dbaccess::DST_ADABAS); + // checkCreateDatabase( ::dbaccess::DST_ADABAS); SetRoadmapStateValue(sal_True); callModifiedHdl(); } @@ -560,7 +560,7 @@ DBG_NAME(OConnectionHelper) do { if ( !createDirectoryDeep(_rURL) ) - { // could not create the directory + { // could not create the directory sQuery = String(ModuleRes(STR_COULD_NOT_CREATE_DIRECTORY)); sQuery.SearchAndReplaceAscii("$name$", aTransformer.get(OFileNotation::N_SYSTEM)); @@ -634,7 +634,7 @@ DBG_NAME(OConnectionHelper) { } if (bIsFolder && aAdabasConfigDir.get().is()) - { // we have a content for the directory, loop through all entries + { // we have a content for the directory, loop through all entries Sequence< ::rtl::OUString > aProperties(1); aProperties[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); @@ -678,8 +678,8 @@ DBG_NAME(OConnectionHelper) StringBag aInstalledDBs; // collect the names of the installed databases StringBag aConfigDBs,aWrkDBs; - aConfigDBs = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY); - aWrkDBs = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY); + aConfigDBs = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY); + aWrkDBs = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY); ConstStringBagIterator aOuter = aConfigDBs.begin(); ConstStringBagIterator aOuterEnd = aConfigDBs.end(); for(;aOuter != aOuterEnd;++aOuter) @@ -730,16 +730,16 @@ DBG_NAME(OConnectionHelper) { case EVENT_GETFOCUS: if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) - { // a descendant of the URL edit field got the focus + { // a descendant of the URL edit field got the focus m_aConnectionURL.SaveValueNoPrefix(); } break; case EVENT_LOSEFOCUS: if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) - { // a descendant of the URL edit field lost the focus + { // a descendant of the URL edit field lost the focus if (!commitURL()) - return 1L; // handled + return 1L; // handled } break; } // switch (_rNEvt.GetType()) @@ -760,15 +760,15 @@ DBG_NAME(OConnectionHelper) INetProtocol eProtocol = aParser.GetProtocol(); - ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels + ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels // search a level which exists // #106016# --------------------- IS_PATH_EXIST eParentExists = PATH_NOT_EXIST; while ( eParentExists == PATH_NOT_EXIST && aParser.getSegmentCount()) { - aToBeCreated.push_back(aParser.getName()); // remember the local name for creation - aParser.removeSegment(); // cut the local name + aToBeCreated.push_back(aParser.getName()); // remember the local name for creation + aParser.removeSegment(); // cut the local name eParentExists = pathExists(aParser.GetMainURL(INetURLObject::NO_DECODE), sal_False); } @@ -802,7 +802,7 @@ DBG_NAME(OConnectionHelper) Sequence< Any > aNewDirectoryAttributes(1); // loop - for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); + for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); aLocalName != aToBeCreated.rend(); ++aLocalName ) @@ -847,7 +847,7 @@ DBG_NAME(OConnectionHelper) if ( m_pCollection->isFileSystemBased(m_eType) ) { if ( ( sURL != sOldPath ) && ( 0 != sURL.Len() ) ) - { // the text changed since entering the control + { // the text changed since entering the control // the path may be in system notation .... OFileNotation aTransformer(sURL); @@ -907,7 +907,7 @@ DBG_NAME(OConnectionHelper) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 3e4c538d084c..b9b378329a0d 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,11 +35,11 @@ #include <sfx2/filedlghelper.hxx> -#define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \ - if (editcontrol.GetText() != editcontrol.GetSavedValue()) \ - { \ - itemset.Put(SfxStringItem(itemid, editcontrol.GetText())); \ - modifiedflag = sal_True; \ +#define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \ + if (editcontrol.GetText() != editcontrol.GetSavedValue()) \ + { \ + itemset.Put(SfxStringItem(itemid, editcontrol.GetText())); \ + modifiedflag = sal_True; \ } //......................................................................... @@ -59,21 +59,21 @@ namespace dbaui class OConnectionHelper : public OGenericAdministrationPage { - sal_Bool m_bUserGrabFocus : 1; + sal_Bool m_bUserGrabFocus : 1; public: OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper(); - FixedText m_aFT_Connection; - OConnectionURLEdit m_aConnectionURL; - PushButton m_aPB_Connection; + FixedText m_aFT_Connection; + OConnectionURLEdit m_aConnectionURL; + PushButton m_aPB_Connection; ::rtl::OUString m_eType; // the type can't be changed in this class, so we hold it as member. public: // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes - ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance + ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance virtual long PreNotify( NotifyEvent& _rNEvt ); // <method>OGenericAdministrationPage::fillControls</method> @@ -85,25 +85,25 @@ namespace dbaui // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes - //String getURL( OConnectionURLEdit* _m_pConnection ) const; - //void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection ); + //String getURL( OConnectionURLEdit* _m_pConnection ) const; + //void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection ); - String getURLNoPrefix( ) const; - void setURLNoPrefix( const String& _rURL ); + String getURLNoPrefix( ) const; + void setURLNoPrefix( const String& _rURL ); /** checks if the path is existence - @param _rURL + @param _rURL The URL to check. - */ - sal_Int32 checkPathExistence(const String& _rURL); - + */ + sal_Int32 checkPathExistence(const String& _rURL); - IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const; - sal_Bool createDirectoryDeep(const String& _rPathNormalized); - sal_Bool commitURL(); + + IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const; + sal_Bool createDirectoryDeep(const String& _rPathNormalized); + sal_Bool commitURL(); /** opens the FileOpen dialog and asks for a FileName - @param _aFileOpen + @param _aFileOpen Executes the file open dialog, which must be filled from caller. */ void askForFileName(::sfx2::FileDialogHelper& _aFileOpen); @@ -113,21 +113,21 @@ namespace dbaui OGenericAdministrationPage::SetServiceFactory(_rxORB); } - protected: - void setURL( const String& _rURL ); + protected: + void setURL( const String& _rURL ); virtual bool checkTestConnection(); private: DECL_LINK(OnBrowseConnections, PushButton*); StringBag getInstalledAdabasDBDirs(const String &_rPath,const ::ucbhelper::ResultSetInclude& _reResultSetInclude); StringBag getInstalledAdabasDBs(const String &_rConfigDir,const String &_rWorkDir); - String impl_getURL( sal_Bool _bPrefix ) const; - void impl_setURL( const String& _rURL, sal_Bool _bPrefix ); + String impl_getURL( sal_Bool _bPrefix ) const; + void impl_setURL( const String& _rURL, sal_Bool _bPrefix ); void implUpdateURLDependentStates() const; }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_CONNECTIONHELPER_HXX diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 03f2b5f057df..af1745c72852 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OConnectionTabPage( pParent, _rAttrSet ) ); } @@ -376,7 +376,7 @@ namespace dbaui return 0L; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hrc b/dbaccess/source/ui/dlg/ConnectionPage.hrc index 347b0f0bac28..6c18a3e42ced 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hrc +++ b/dbaccess/source/ui/dlg/ConnectionPage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 140ea6792efc..ff50f7d715fb 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,24 +48,24 @@ namespace dbaui */ class OConnectionTabPage : public OConnectionHelper { - sal_Bool m_bUserGrabFocus : 1; + sal_Bool m_bUserGrabFocus : 1; protected: - // connection - FixedLine m_aFL1; + // connection + FixedLine m_aFL1; // user authentification - FixedLine m_aFL2; - FixedText m_aUserNameLabel; - Edit m_aUserName; - CheckBox m_aPasswordRequired; + FixedLine m_aFL2; + FixedText m_aUserNameLabel; + Edit m_aUserName; + CheckBox m_aPasswordRequired; // jdbc driver - FixedLine m_aFL3; - FixedText m_aJavaDriverLabel; - Edit m_aJavaDriver; - PushButton m_aTestJavaDriver; + FixedLine m_aFL3; + FixedText m_aJavaDriverLabel; + Edit m_aJavaDriver; + PushButton m_aTestJavaDriver; // connection test - PushButton m_aTestConnection; + PushButton m_aTestConnection; // called when the test connection button was clicked @@ -73,10 +73,10 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(sal_False); } inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); } @@ -101,7 +101,7 @@ namespace dbaui virtual bool checkTestConnection(); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src index 8ead374bdef4..22eed5dee2fa 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ b/dbaccess/source/ui/dlg/ConnectionPage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index fcc5af853afd..066e6c23519c 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ namespace dbaui - OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_DBASE, _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE); oDBWizardPage->FreeResource(); @@ -94,35 +94,35 @@ namespace dbaui } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_MSACCESS, _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADABAS, _rAttrSet, STR_ADABAS_HELPTEXT, STR_ADABAS_HEADERTEXT, STR_ADABAS_DATABASE_NAME); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADO, _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ODBC, _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_USERDEFINED, _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL); oDBWizardPage->FreeResource(); @@ -201,12 +201,12 @@ namespace dbaui //! TODO //if ( m_eType >= ::dbaccess::DST_USERDEFINE1 ) //{ - // String sDisplayName = m_pCollection->getTypeDisplayName(m_eType); - // FixedText* ppTextControls[] ={&m_aFT_Connection}; - // for (size_t i = 0; i < SAL_N_ELEMENTS(ppTextControls); ++i) - // { - // ppTextControls[i]->SetText(sDisplayName); - // } + // String sDisplayName = m_pCollection->getTypeDisplayName(m_eType); + // FixedText* ppTextControls[] ={&m_aFT_Connection}; + // for (size_t i = 0; i < SAL_N_ELEMENTS(ppTextControls); ++i) + // { + // ppTextControls[i]->SetText(sDisplayName); + // } //} callModifiedHdl(); @@ -238,7 +238,7 @@ namespace dbaui return 0L; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index c49fcc8d28ad..96eba0545bce 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace dbaui { //......................................................................... -/* // #106016# -------------- +/* // #106016# -------------- enum IS_PATH_EXIST { PATH_NOT_EXIST = 0, @@ -60,7 +60,7 @@ namespace dbaui */ class OConnectionTabPageSetup : public OConnectionHelper { - sal_Bool m_bUserGrabFocus : 1; + sal_Bool m_bUserGrabFocus : 1; protected: FixedText m_aFT_HelpText; @@ -69,17 +69,17 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); @@ -90,8 +90,8 @@ namespace dbaui <p>The new URL must be of the type which is currently selected, only the parts which do not affect the type may be changed (compared to the previous URL).</p> */ - void changeConnectionURL( const String& _rNewDSN ); - String getConnectionURL( ) const; + void changeConnectionURL( const String& _rNewDSN ); + String getConnectionURL( ) const; protected: @@ -102,9 +102,9 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 66a1c3b44787..75c0bdd46529 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,16 +73,16 @@ namespace dbaui { //......................................................................... using namespace ::com::sun::star; -// using namespace ::com::sun::star::ucb; -// using namespace ::com::sun::star::ui::dialogs; -// using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::lang; -// using namespace ::com::sun::star::container; -// using namespace ::dbtools; -// using namespace ::svt; +// using namespace ::com::sun::star::ucb; +// using namespace ::com::sun::star::ui::dialogs; +// using namespace ::com::sun::star::sdbc; +// using namespace ::com::sun::star::beans; +// using namespace ::com::sun::star::lang; +// using namespace ::com::sun::star::container; +// using namespace ::dbtools; +// using namespace ::svt; - OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OTextConnectionPageSetup( pParent, _rAttrSet ) ); } @@ -165,7 +165,7 @@ DBG_NAME(OTextConnectionPageSetup) } - OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPConnectionPageSetup( pParent, _rAttrSet ) ); } @@ -178,12 +178,12 @@ DBG_NAME(OTextConnectionPageSetup) :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_LDAP), _rCoreAttrs) ,m_aFTHeaderText (this, ModuleRes(FT_LDAP_HEADERTEXT)) ,m_aFTHelpText (this, ModuleRes(FT_LDAP_HELPTEXT)) - ,m_aFTHostServer (this, ModuleRes(FT_AUTOHOSTNAME)) - ,m_aETHostServer (this, ModuleRes(ET_AUTOHOSTNAME)) - ,m_aFTBaseDN (this, ModuleRes(FT_AUTOBASEDN)) - ,m_aETBaseDN (this, ModuleRes(ET_AUTOBASEDN)) - ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) + ,m_aFTHostServer (this, ModuleRes(FT_AUTOHOSTNAME)) + ,m_aETHostServer (this, ModuleRes(ET_AUTOHOSTNAME)) + ,m_aFTBaseDN (this, ModuleRes(FT_AUTOBASEDN)) + ,m_aETBaseDN (this, ModuleRes(ET_AUTOBASEDN)) + ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT)) ,m_aCBUseSSL (this, ModuleRes(CB_WIZ_USESSL)) { @@ -433,16 +433,16 @@ DBG_NAME(OMySQLIntroPageSetup) OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId, USHORT _nDefaultPortResId, USHORT _nHelpTextResId, USHORT _nHeaderTextResId, USHORT _nDriverClassId) :OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs) ,m_aFTHelpText (this, ModuleRes(FT_AUTOWIZARDHELPTEXT)) - ,m_aFTDatabasename (this, ModuleRes(FT_AUTODATABASENAME)) - ,m_aETDatabasename (this, ModuleRes(ET_AUTODATABASENAME)) - ,m_aFTHostname (this, ModuleRes(FT_AUTOHOSTNAME)) - ,m_aETHostname (this, ModuleRes(ET_AUTOHOSTNAME)) - ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) + ,m_aFTDatabasename (this, ModuleRes(FT_AUTODATABASENAME)) + ,m_aETDatabasename (this, ModuleRes(ET_AUTODATABASENAME)) + ,m_aFTHostname (this, ModuleRes(FT_AUTOHOSTNAME)) + ,m_aETHostname (this, ModuleRes(ET_AUTOHOSTNAME)) + ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT)) - ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) - ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) - ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) - ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) + ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) + ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) + ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) + ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) ,m_nPortId(_nPortId) { m_aFTDriverClass.SetText(String(ModuleRes(_nDriverClassId))); @@ -474,7 +474,7 @@ DBG_NAME(OMySQLIntroPageSetup) // ----------------------------------------------------------------------- - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, PAGE_DBWIZARD_MYSQL_JDBC, @@ -487,7 +487,7 @@ DBG_NAME(OMySQLIntroPageSetup) } // ----------------------------------------------------------------------- - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, PAGE_DBWIZARD_ORACLE, @@ -606,7 +606,7 @@ DBG_NAME(OMySQLIntroPageSetup) } // ----------------------------------------------------------------------- - OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet)); } @@ -617,9 +617,9 @@ DBG_NAME(OMySQLIntroPageSetup) //======================================================================== OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_JDBC, _rCoreAttrs, STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL) - ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) - ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) - ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) + ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) + ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) + ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) { m_aETDriverClass.SetModifyHdl(LINK(this, OJDBCConnectionPageSetup, OnEditModified)); m_aPBTestJavaDriver.SetClickHdl(LINK(this,OJDBCConnectionPageSetup,OnTestJavaClickHdl)); @@ -686,7 +686,7 @@ DBG_NAME(OMySQLIntroPageSetup) BOOL bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0); bEnableTestConnection = bEnableTestConnection && (m_aETDriverClass.GetText().Len() != 0); return bEnableTestConnection; -// m_aTestConnection.Enable(bEnableTestConnection); +// m_aTestConnection.Enable(bEnableTestConnection); } @@ -726,7 +726,7 @@ DBG_NAME(OMySQLIntroPageSetup) } - OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) ); } @@ -778,7 +778,7 @@ DBG_NAME(OSpreadSheetConnectionPageSetup) return bChangedSomething; } - OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAuthentificationPageSetup( pParent, _rAttrSet) ); } @@ -857,7 +857,7 @@ DBG_NAME(OAuthentificationPageSetup) } - OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet) { return ( new OFinalDBPageSetup( pParent, _rAttrSet) ); } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index da3735b18cc7..fe236af08f2e 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace dbaui //......................................................................... class IDatabaseSettingsDialog; -// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); +// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); //======================================================================== @@ -57,8 +57,8 @@ namespace dbaui class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); protected: @@ -78,12 +78,12 @@ namespace dbaui class OTextConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: - + protected: virtual ~OTextConnectionPageSetup(); virtual sal_Bool prepareLeave(); @@ -102,8 +102,8 @@ namespace dbaui class OLDAPConnectionPageSetup : public OGenericAdministrationPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual Link getControlModifiedLink() { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } @@ -118,11 +118,11 @@ namespace dbaui FixedText m_aFTHelpText; FixedText m_aFTHostServer; Edit m_aETHostServer; - FixedText m_aFTBaseDN; - Edit m_aETBaseDN; - FixedText m_aFTPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTDefaultPortNumber; + FixedText m_aFTBaseDN; + Edit m_aETBaseDN; + FixedText m_aFTPortNumber; + NumericField m_aNFPortNumber; + FixedText m_aFTDefaultPortNumber; CheckBox m_aCBUseSSL; }; @@ -145,7 +145,7 @@ namespace dbaui virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ); - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual Link getControlModifiedLink(); @@ -168,11 +168,11 @@ namespace dbaui , USHORT _nHelpTextResId , USHORT _nHeaderTextResId , USHORT _nDriverClassId ); - static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -183,19 +183,19 @@ namespace dbaui FixedText m_aFTHelpText; FixedText m_aFTDatabasename; Edit m_aETDatabasename; - FixedText m_aFTHostname; - Edit m_aETHostname; - FixedText m_aFTPortNumber; - FixedText m_aFTDefaultPortNumber; - NumericField m_aNFPortNumber; - - - FixedText m_aFTDriverClass; - Edit m_aETDriverClass; - PushButton m_aPBTestJavaDriver; - - String m_sDefaultJdbcDriverName; - USHORT m_nPortId; + FixedText m_aFTHostname; + Edit m_aETHostname; + FixedText m_aFTPortNumber; + FixedText m_aFTDefaultPortNumber; + NumericField m_aNFPortNumber; + + + FixedText m_aFTDriverClass; + Edit m_aETDriverClass; + PushButton m_aPBTestJavaDriver; + + String m_sDefaultJdbcDriverName; + USHORT m_nPortId; }; @@ -206,21 +206,21 @@ namespace dbaui { public: OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual bool checkTestConnection(); - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); - FixedText m_aFTDriverClass; - Edit m_aETDriverClass; - PushButton m_aPBTestJavaDriver; + FixedText m_aFTDriverClass; + Edit m_aETDriverClass; + PushButton m_aPBTestJavaDriver; }; @@ -240,7 +240,7 @@ namespace dbaui OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs); - static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); Link maClickHdl; void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } @@ -248,7 +248,7 @@ namespace dbaui DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); - + protected: virtual BOOL FillItemSet(SfxItemSet& _rSet); @@ -278,8 +278,8 @@ namespace dbaui class OAuthentificationPageSetup : public OGenericAdministrationPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); protected: @@ -305,8 +305,8 @@ namespace dbaui class OFinalDBPageSetup : public OGenericAdministrationPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); FixedText m_aFTFinalHeader; FixedText m_aFTFinalHelpText; @@ -337,7 +337,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 8be379b9aa89..88eb810bf869 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/task/XInteractionRequest.hpp> +#include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp> #include <com/sun/star/ucb/AuthenticationRequest.hpp> /** === end UNO includes === **/ @@ -141,7 +141,7 @@ namespace String lcl_createHostWithPort(const SfxStringItem* _pHostName,const SfxInt32Item* _pPortNumber) { String sNewUrl; - + if ( _pHostName && _pHostName->GetValue().Len() ) sNewUrl = _pHostName->GetValue(); @@ -254,7 +254,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pUser, SfxStringItem, DSID_USER, sal_True); if (pUser && pUser->GetValue().Len()) aReturn.push_back( - PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), 0, + PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), 0, makeAny(::rtl::OUString(pUser->GetValue())), PropertyState_DIRECT_VALUE)); // check if the connection type requires a password @@ -280,7 +280,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if ( !xHandler.is() ) ShowServiceNotAvailableError(m_pParent->GetParent(), String(SERVICE_TASK_INTERACTION_HANDLER), sal_True); } - + String sName = pName ? pName->GetValue() : String(); String sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD)); ::rtl::OUString sTemp = sName; @@ -333,7 +333,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert } if (!pAuthenticate->wasSelected()) return sal_False; - + sPassword = pAuthenticate->getPassword(); if (pAuthenticate->getRememberPassword()) m_pItemSetHelper->getWriteOutputSet()->Put(SfxStringItem(DSID_PASSWORD, sPassword)); @@ -341,7 +341,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if (sPassword.Len()) aReturn.push_back( - PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")), 0, + PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")), 0, makeAny(::rtl::OUString(sPassword)), PropertyState_DIRECT_VALUE)); } @@ -476,7 +476,7 @@ Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSourc } } - + DBG_ASSERT(m_xDatasource.is(), "ODbDataSourceAdministrationHelper::getCurrentDataSource: no data source!"); return m_xDatasource; } @@ -586,7 +586,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const break; case ::dbaccess::DST_LDAP: { - // SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); + // SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True); sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue()); sNewUrl += lcl_createHostWithPort(NULL,pPortNumber); @@ -612,7 +612,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const struct PropertyValueLess { bool operator() (const PropertyValue& x, const PropertyValue& y) const - { return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning + { return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning }; DECLARE_STL_SET( PropertyValue, PropertyValueLess, PropertyValueSet); @@ -624,7 +624,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr if (_rxSource.is()) { - for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); + for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); aDirect != m_aDirectPropTranslator.end(); ++aDirect ) @@ -662,7 +662,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr for (sal_Int32 i=0; i<aAdditionalInfo.getLength(); ++i, ++pAdditionalInfo) { if (0 == pAdditionalInfo->Name.compareToAscii("JDBCDRV")) - { // compatibility + { // compatibility PropertyValue aCompatibility(*pAdditionalInfo); aCompatibility.Name = ::rtl::OUString::createFromAscii("JavaDriverClass"); aInfos.insert(aCompatibility); @@ -676,7 +676,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr { PropertyValue aSearchFor; ConstMapInt2StringIterator aEnd = m_aIndirectPropTranslator.end(); - for ( ConstMapInt2StringIterator aIndirect = m_aIndirectPropTranslator.begin(); + for ( ConstMapInt2StringIterator aIndirect = m_aIndirectPropTranslator.begin(); aIndirect != aEnd; ++aIndirect) { @@ -715,11 +715,11 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r Reference< XPropertySetInfo > xInfo; try { xInfo = _rxDest->getPropertySetInfo(); } catch(Exception&) { } - + const ::rtl::OUString sUrlProp(RTL_CONSTASCII_USTRINGPARAM("URL")); // ----------------------------- // transfer the direct properties - for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); + for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); aDirect != m_aDirectPropTranslator.end(); ++aDirect ) @@ -738,7 +738,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r if ( sUrlProp == aDirect->second ) { Any aValue(makeAny(::rtl::OUString(getConnectionURL()))); - // aValue <<= ::rtl::OUString(); + // aValue <<= ::rtl::OUString(); lcl_putProperty(_rxDest, aDirect->second,aValue); } else @@ -800,7 +800,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS } // settings to preserve - MapInt2String aPreservedSettings; + MapInt2String aPreservedSettings; // now aRelevantSettings contains all the property values relevant for the current data source type, // check the original sequence if it already contains any of these values (which have to be overwritten, then) @@ -813,13 +813,13 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS aSearchFor.Name = pInfo->Name; PropertyValueSetIterator aOverwrittenSetting = aRelevantSettings.find(aSearchFor); if (aRelevantSettings.end() != aOverwrittenSetting) - { // the setting was present in the original sequence, and it is to be overwritten -> replace it + { // the setting was present in the original sequence, and it is to be overwritten -> replace it if ( !::comphelper::compare(pInfo->Value,aOverwrittenSetting->Value) ) *pInfo = *aOverwrittenSetting; aRelevantSettings.erase(aOverwrittenSetting); } else if (0 == pInfo->Name.compareToAscii("JDBCDRV")) - { // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass) + { // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass) nObsoleteSetting = i; } else @@ -829,7 +829,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ::comphelper::removeElementAt(_rInfo, nObsoleteSetting); if ( !aPreservedSettings.empty() ) - { // check if there are settings which + { // check if there are settings which // * are known as indirect properties // * but not relevant for the current data source type // These settings have to be removed: If they're not relevant, we have no UI for changing them. @@ -846,7 +846,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ::std::vector< sal_Int32 > aRemoveIndexes; sal_Int32 nPositionCorrector = 0; ConstMapInt2StringIterator aPreservedEnd = aPreservedSettings.end(); - for ( ConstMapInt2StringIterator aPreserved = aPreservedSettings.begin(); + for ( ConstMapInt2StringIterator aPreserved = aPreservedSettings.begin(); aPreserved != aPreservedEnd; ++aPreserved ) @@ -862,7 +862,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS } // now finally remove all such props ::std::vector< sal_Int32 >::const_iterator aRemoveEnd = aRemoveIndexes.end(); - for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); + for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); aRemoveIndex != aRemoveEnd; ++aRemoveIndex ) @@ -894,7 +894,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS _rInfo.realloc(nOldLength + aRelevantSettings.size()); PropertyValue* pAppendValues = _rInfo.getArray() + nOldLength; ConstPropertyValueSetIterator aRelevantEnd = aRelevantSettings.end(); - for ( ConstPropertyValueSetIterator aLoop = aRelevantSettings.begin(); + for ( ConstPropertyValueSetIterator aLoop = aRelevantSettings.begin(); aLoop != aRelevantEnd; ++aLoop, ++pAppendValues ) @@ -997,9 +997,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no string)!" ) ).getStr() ); } @@ -1027,9 +1027,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no boolean)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no boolean)!" ) ).getStr() ); } @@ -1044,9 +1044,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no int)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no int)!" ) ).getStr() ); } @@ -1077,9 +1077,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string sequence)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no string sequence)!" ) ).getStr() ); } @@ -1116,8 +1116,8 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest) ::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection(); DBG_ASSERT(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!"); - USHORT nPortNumberId = 0; - sal_Int32 nPortNumber = -1; + USHORT nPortNumberId = 0; + sal_Int32 nPortNumber = -1; String sNewHostName; //String sUrl = pCollection->cutPrefix(pUrlItem->GetValue()); String sUrlPart; @@ -1175,8 +1175,8 @@ sal_Bool ODbDataSourceAdministrationHelper::saveChanges(const SfxItemSet& _rSour return sal_True; } // ----------------------------------------------------------------------------- -void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName ) -{ +void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName ) +{ DBG_ASSERT( !m_aDataSourceOrName.hasValue(), "ODbDataSourceAdministrationHelper::setDataSourceOrName: already have one!" ); // hmm. We could reset m_xDatasource/m_xModel, probably, and continue working m_aDataSourceOrName = _rDataSourceOrName; @@ -1213,7 +1213,7 @@ SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 02ef746fcd7a..ad5a323cf98e 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,23 +68,23 @@ namespace dbaui private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xORB; /// service factory + m_xORB; /// service factory ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xDatabaseContext; /// database context we're working in + m_xDatabaseContext; /// database context we're working in ::com::sun::star::uno::Reference< ::com::sun::star::uno::XNamingService > - m_xDynamicContext; /// just another interface of the context ... + m_xDynamicContext; /// just another interface of the context ... ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDatasource; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Any m_aDataSourceOrName; - typedef ::std::set< ::rtl::OUString > StringSet; - typedef StringSet::const_iterator ConstStringSetIterator; - + ::com::sun::star::uno::Any m_aDataSourceOrName; + typedef ::std::set< ::rtl::OUString > StringSet; + typedef StringSet::const_iterator ConstStringSetIterator; - MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source) - MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source) - Window* m_pParent; - IItemSetHelper* m_pItemSetHelper; + + MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source) + MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source) + Window* m_pParent; + IItemSetHelper* m_pItemSetHelper; public: ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB @@ -94,15 +94,15 @@ namespace dbaui /** translate the current dialog SfxItems into driver relevant PropertyValues @see successfullyConnected */ - sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); + sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); /** to be called if the settings got from getCurrentSettings have been used for successfully connecting @see getCurrentSettings */ - void successfullyConnected(); + void successfullyConnected(); /// clear the password in the current data source's item set - void clearPassword(); + void clearPassword(); inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xORB; } @@ -111,16 +111,16 @@ namespace dbaui /** creates a new connection. The caller is responsible to dispose it !!!! */ - ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); + ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); /** return the corresponding driver for the selected URL */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(const ::rtl::OUString& _sURL); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(const ::rtl::OUString& _sURL); /** returns the data source the dialog is currently working with */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); // returns the Url of a database document String getDocumentUrl(SfxItemSet& _rDest); @@ -143,9 +143,9 @@ namespace dbaui const MapInt2String& getIndirectProperties() const { return m_aIndirectPropTranslator; } /** translates properties of an UNO data source into SfxItems - @param _rxSource + @param _rxSource The data source - @param _rDest + @param _rDest The item set to fill. */ void translateProperties( @@ -153,9 +153,9 @@ namespace dbaui SfxItemSet& _rDest); /** translate SfxItems into properties of an UNO data source - @param _rSource + @param _rSource The item set to read from. - @param _rxDest + @param _rxDest The data source to fill. */ void translateProperties( @@ -169,18 +169,18 @@ namespace dbaui void fillDatasourceInfo(const SfxItemSet& _rSource, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo); /// translate the given value into an SfxPoolItem, put this into the given set under the given id - void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue); - + void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue); + /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type> ::com::sun::star::uno::Any implTranslateProperty(const SfxPoolItem* _pItem); /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type>, set it (under the given name) on the given property set - void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const ::rtl::OUString& _rName, const SfxPoolItem* _pItem); + void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const ::rtl::OUString& _rName, const SfxPoolItem* _pItem); /** check if the data source described by the given set needs authentication<p/> The return value depends on the data source type only. */ - sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; + sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; #ifdef DBG_UTIL ::rtl::OString translatePropertyId( sal_Int32 _nId ); @@ -188,7 +188,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DBADMINIMPL_HXX_ diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index 23390d34bba2..e531109c470c 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 13b4b50e5943..754b391b42aa 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,66 +44,66 @@ namespace dbaui /** filles the IDs of the settings which are reflected in indirect data source properties (aka properties in the css.sdb.DataSource.Info sequence) - @param _eType + @param _eType The Type of the data source. - @param _out_rDetailsIds + @param _out_rDetailsIds Will be filled. */ static void getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory,::std::vector< sal_Int32>& _out_rDetailsIds ); /** Creates the detail page for Dbase */ - static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for ODBC */ - static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for user */ - static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for MySQLODBC */ - static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for MySQLJDBC */ - static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for MySQLNATIVE */ - static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for Oracle JDBC */ - static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for Adabas */ - static SfxTabPage* CreateAdabas( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateAdabas( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for LDAP */ - static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet ); /// Creates the detail page for Text - static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet& _rAttrSet ); /// creates the GeneratedValues page - static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ); /// creates the "Special Settings" page of the "Advanced Settings" dialog - static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); }; } diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx index 47b77106cd3e..ff1f6407d12f 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,9 +66,9 @@ DBG_NAME( dbu_OExtensionNotPresentDialog ) OExtensionNotPresentDialog::OExtensionNotPresentDialog( Window* _pParent, uno::Reference< lang::XMultiServiceFactory > _xORB) : ModalDialog( _pParent, ModuleRes(RID_EXTENSION_NOT_PRESENT_DLG) ) ,m_aFI_WARNING(this, ModuleRes(FI_WARNING)) - ,m_aFT_TEXT(this, ModuleRes(FT_TEXT ) ) - ,m_aPB_DOWNLOAD(this, ModuleRes(PB_DOWNLOAD)) - ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,m_aFT_TEXT(this, ModuleRes(FT_TEXT ) ) + ,m_aPB_DOWNLOAD(this, ModuleRes(PB_DOWNLOAD)) + ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) ,m_xMultiServiceFactory(_xORB) { DBG_CTOR( dbu_OExtensionNotPresentDialog, NULL); @@ -84,10 +84,10 @@ DBG_NAME( dbu_OExtensionNotPresentDialog ) // set a ClickHandler for the 'Download' button m_aPB_DOWNLOAD.SetClickHdl( LINK( this, OExtensionNotPresentDialog, Download_Click ) ); - + // get message string out of the resource String sText = String( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) ); - // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) ); + // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) ); String sExtensionName = getFromConfigurationExtension("Name"); sText.SearchAndReplaceAscii("%RPT_EXTENSION_NAME", sExtensionName); @@ -137,12 +137,12 @@ DBG_NAME( dbu_OExtensionNotPresentDialog ) // WinBits aBits = m_aFI_WARNING.GetStyle(); // aBits |= WB_SCALE; // m_aFI_WARNING.SetStyle(aBits); - // + // // Size aImageSize = m_aFI_WARNING.GetSizePixel(); // (void) aImageSize; // m_aFI_WARNING.Resize(); - + Resize(); FreeResource(); } @@ -174,9 +174,9 @@ rtl::OUString OExtensionNotPresentDialog::getFromConfigurationExtension(rtl::OUS { // get the URL to open in a browser from Configuration static const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign/Extension" ) ); - + ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithServiceFactory( m_xMultiServiceFactory, sConfigName ) ); - + rtl::OUString aValue; aConfiguration.getNodeValue( _sPropertyName ) >>= aValue; return aValue; @@ -195,14 +195,14 @@ IMPL_LINK( OExtensionNotPresentDialog, Download_Click, PushButton*, EMPTYARG ) try { EndDialog( TRUE ); - + rtl::OUString suDownloadURL = getFromConfigurationExtension("DownloadURL"); if (suDownloadURL.getLength() == 0) { // fallback suDownloadURL = UNISTRING("http://extensions.libreoffice.org"); } - + // open such URL in a browser localizeWebserviceURI(suDownloadURL); uno::Reference< com::sun::star::system::XSystemShellExecute > xShellExecute( getShellExecuter() ); diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc index 69794e3a76bc..cb314b9f7683 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,22 +27,22 @@ #ifndef DBU_EXTENSIONNOTPRESENT_HRC #define DBU_EXTENSIONNOTPRESENT_HRC -#define FT_TEXT (1) -#define FI_WARNING (2) -#define PB_DOWNLOAD (10) -#define PB_CANCEL (11) +#define FT_TEXT (1) +#define FI_WARNING (2) +#define PB_DOWNLOAD (10) +#define PB_CANCEL (11) -#define FIXEDTEXT_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 #define CELL_PADDING 8 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 55 -#define BROWSER_HEIGHT 75 -// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING) +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 55 +#define BROWSER_HEIGHT 75 +// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING) #define LEFT_PADDING 32 /* size for the icon */ #define RIGHT_PADDING 16 -#define DLG_WIDTH ( 250 ) +#define DLG_WIDTH ( 250 ) #define ACTION_LINE_START (CELL_PADDING + ( 3 * FIXEDTEXT_HEIGHT ) + 2 * CELL_PADDING + 1 ) -#define DLG_HEIGHT (ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING) +#define DLG_HEIGHT (ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING) #endif /* DBU_EXTENSIONNOTPRESENT_HRC */ diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src index 9507c4256360..9944278cd359 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ String RID_STR_EXTENSION_NOT_PRESENT // To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name // String RID_STR_EXTENSION_NAME // { -// Text = "Sun(TM) Report Builder"; +// Text = "Sun(TM) Report Builder"; // }; ModalDialog RID_EXTENSION_NOT_PRESENT_DLG @@ -52,7 +52,7 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG HelpId = HID_EXTENSION_NOT_PRESENT_DLG; Moveable = TRUE ; Closeable = TRUE ; - + // most of the calulated values here are overridden by the ExtensionNotPresent ctor itself. FixedImage FI_WARNING { @@ -60,12 +60,12 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG Size = (32, 32); Fixed=BMP_EXCEPTION_WARNING; }; - + FixedText FT_TEXT { - Pos = MAP_APPFONT ( 32 , CELL_PADDING ) ; - Size = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ; + Pos = MAP_APPFONT ( 32 , CELL_PADDING ) ; + Size = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ; // Border = TRUE ; // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT }; diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 947bec14a021..e574d4051040 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,15 +68,15 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, ,m_pTableMap(pParent->GetTabWinMap()) ,aFL_CascUpd( this, ModuleRes(FL_CASC_UPD) ) - ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) ) - ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) ) - ,aRB_CascUpdNull( this, ModuleRes(RB_CASC_UPD_NULL) ) - ,aRB_CascUpdDefault( this, ModuleRes(RB_CASC_UPD_DEFAULT) ) + ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) ) + ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) ) + ,aRB_CascUpdNull( this, ModuleRes(RB_CASC_UPD_NULL) ) + ,aRB_CascUpdDefault( this, ModuleRes(RB_CASC_UPD_DEFAULT) ) ,aFL_CascDel( this, ModuleRes(FL_CASC_DEL) ) - ,aRB_NoCascDel( this, ModuleRes(RB_NO_CASC_DEL) ) - ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) ) - ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) ) - ,aRB_CascDelDefault( this, ModuleRes(RB_CASC_DEL_DEFAULT) ) + ,aRB_NoCascDel( this, ModuleRes(RB_NO_CASC_DEL) ) + ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) ) + ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) ) + ,aRB_CascDelDefault( this, ModuleRes(RB_CASC_DEL_DEFAULT) ) ,aPB_OK( this, ModuleRes( PB_OK ) ) ,aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) @@ -218,7 +218,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) } catch( const SQLException& ) { - ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ), + ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ), this, static_cast<OJoinTableView*>(GetParent())->getDesignView()->getController().getORB()); } diff --git a/dbaccess/source/ui/dlg/RelationDlg.hrc b/dbaccess/source/ui/dlg/RelationDlg.hrc index b0d14aa6d93a..0e1f57174b3b 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.hrc +++ b/dbaccess/source/ui/dlg/RelationDlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,18 +34,18 @@ #define FL_CASC_DEL 3 #define FL_CASC_UPD 4 -#define RB_NO_CASC_DEL 1 -#define RB_NO_CASC_UPD 2 -#define RB_CASC_DEL 3 -#define RB_CASC_UPD 4 -#define RB_CASC_DEL_NULL 5 -#define RB_CASC_DEL_DEFAULT 6 -#define RB_CASC_UPD_NULL 7 +#define RB_NO_CASC_DEL 1 +#define RB_NO_CASC_UPD 2 +#define RB_CASC_DEL 3 +#define RB_CASC_UPD 4 +#define RB_CASC_DEL_NULL 5 +#define RB_CASC_DEL_DEFAULT 6 +#define RB_CASC_UPD_NULL 7 #define RB_CASC_UPD_DEFAULT 8 -#define PB_OK 1 -#define PB_CANCEL 2 -#define PB_HELP 3 +#define PB_OK 1 +#define PB_CANCEL 2 +#define PB_HELP 3 #define WND_CONTROL 1 diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src index 68399ca52619..f0517f5c989e 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.src +++ b/dbaccess/source/ui/dlg/RelationDlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,8 +86,8 @@ ModalDialog DLG_REL_PROPERTIES }; }; - - + + FixedLine FL_CASC_UPD { diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index fe392d82cbe0..ebdc2519bc26 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,7 +131,7 @@ SfxItemSet* OTableSubscriptionDialog::getWriteOutputSet() } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 4e2864aaaa52..97922615c81d 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,22 +93,22 @@ DBG_NAME(OTextConnectionHelper) ,m_aRBAccessOtherFiles (this, ModuleRes(RB_AUTOACCESSOTHERS)) ,m_aETOwnExtension (this, ModuleRes(ET_AUTOOWNEXTENSION)) ,m_aFTExtensionExample (this, ModuleRes(FT_AUTOOWNEXTENSIONAPPENDIX)) - ,m_aLineFormat (this, ModuleRes(FL_AUTOSEPARATOR2)) - ,m_aFieldSeparatorLabel (this, ModuleRes(FT_AUTOFIELDSEPARATOR)) - ,m_aFieldSeparator (this, ModuleRes(CM_AUTOFIELDSEPARATOR)) - ,m_aTextSeparatorLabel (this, ModuleRes(FT_AUTOTEXTSEPARATOR)) - ,m_aTextSeparator (this, ModuleRes(CM_AUTOTEXTSEPARATOR)) - ,m_aDecimalSeparatorLabel (this, ModuleRes(FT_AUTODECIMALSEPARATOR)) - ,m_aDecimalSeparator (this, ModuleRes(CM_AUTODECIMALSEPARATOR)) - ,m_aThousandsSeparatorLabel (this, ModuleRes(FT_AUTOTHOUSANDSSEPARATOR)) - ,m_aThousandsSeparator (this, ModuleRes(CM_AUTOTHOUSANDSSEPARATOR)) + ,m_aLineFormat (this, ModuleRes(FL_AUTOSEPARATOR2)) + ,m_aFieldSeparatorLabel (this, ModuleRes(FT_AUTOFIELDSEPARATOR)) + ,m_aFieldSeparator (this, ModuleRes(CM_AUTOFIELDSEPARATOR)) + ,m_aTextSeparatorLabel (this, ModuleRes(FT_AUTOTEXTSEPARATOR)) + ,m_aTextSeparator (this, ModuleRes(CM_AUTOTEXTSEPARATOR)) + ,m_aDecimalSeparatorLabel (this, ModuleRes(FT_AUTODECIMALSEPARATOR)) + ,m_aDecimalSeparator (this, ModuleRes(CM_AUTODECIMALSEPARATOR)) + ,m_aThousandsSeparatorLabel (this, ModuleRes(FT_AUTOTHOUSANDSSEPARATOR)) + ,m_aThousandsSeparator (this, ModuleRes(CM_AUTOTHOUSANDSSEPARATOR)) ,m_aRowHeader (this, ModuleRes(CB_AUTOHEADER)) ,m_aCharSetHeader (this, ModuleRes(FL_DATACONVERT)) ,m_aCharSetLabel (this, ModuleRes(FT_CHARSET)) ,m_aCharSet (this, ModuleRes(LB_CHARSET)) - ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) - ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) - ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE)) + ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) + ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) + ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE)) ,m_nAvailableSections( _nAvailableSections ) { DBG_CTOR(OTextConnectionHelper,NULL); @@ -335,59 +335,59 @@ DBG_NAME(OTextConnectionHelper) String sExtension = GetExtension(); String aErrorText; Control* pErrorWin = NULL; - // if (!m_aFieldSeparator.GetText().Len()) + // if (!m_aFieldSeparator.GetText().Len()) // bug (#42168) if this line is compiled under OS2 (in a product environent) // -> use a temporary variable String aDelText(m_aFieldSeparator.GetText()); if(!aDelText.Len()) - { // Kein FeldTrenner + { // Kein FeldTrenner aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (!m_aDecimalSeparator.GetText().Len()) - { // kein Decimaltrenner + { // kein Decimaltrenner aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING)); aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText()); pErrorWin = &m_aDecimalSeparator; } else if (m_aTextSeparator.GetText() == m_aFieldSeparator.GetText()) - { // Feld und TextTrenner duerfen nicht gleich sein + { // Feld und TextTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aFieldSeparatorLabel.GetText()); pErrorWin = &m_aTextSeparator; } else if (m_aDecimalSeparator.GetText() == m_aThousandsSeparator.GetText()) - { // Tausender und DecimalTrenner duerfen nicht gleich sein + { // Tausender und DecimalTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aDecimalSeparator; } else if (m_aFieldSeparator.GetText() == m_aThousandsSeparator.GetText()) - { // Tausender und FeldTrenner duerfen nicht gleich sein + { // Tausender und FeldTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (m_aFieldSeparator.GetText() == m_aDecimalSeparator.GetText()) - { // Zehner und FeldTrenner duerfen nicht gleich sein + { // Zehner und FeldTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (m_aTextSeparator.GetText() == m_aThousandsSeparator.GetText()) - { // Tausender und TextTrenner duerfen nicht gleich sein + { // Tausender und TextTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aTextSeparator; } else if (m_aTextSeparator.GetText() == m_aDecimalSeparator.GetText()) - { // Zehner und TextTrenner duerfen nicht gleich sein + { // Zehner und TextTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText()); @@ -500,8 +500,8 @@ DBG_NAME(OTextConnectionHelper) //------------------------------------------------------------------------ String OTextConnectionHelper::GetSeparator( const ComboBox& rBox, const String& rList ) { - sal_Unicode nTok = '\t'; - xub_StrLen nPos(rBox.GetEntryPos( rBox.GetText() )); + sal_Unicode nTok = '\t'; + xub_StrLen nPos(rBox.GetEntryPos( rBox.GetText() )); if( nPos == COMBOBOX_ENTRY_NOTFOUND ) return rBox.GetText().Copy(0); @@ -517,13 +517,13 @@ DBG_NAME(OTextConnectionHelper) //------------------------------------------------------------------------ void OTextConnectionHelper::SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ) { - char nTok = '\t'; - xub_StrLen nCnt(rList.GetTokenCount( nTok )); - xub_StrLen i; + char nTok = '\t'; + xub_StrLen nCnt(rList.GetTokenCount( nTok )); + xub_StrLen i; for( i=0 ; i<nCnt ; i+=2 ) { - String sTVal( + String sTVal( static_cast< sal_Unicode >( rList.GetToken( (i+1), nTok ).ToInt32())); @@ -544,7 +544,7 @@ DBG_NAME(OTextConnectionHelper) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 8c1d0aa0c0fd..c178e3a68c08 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace dbaui { OTextConnectionHelper(); - Link m_aModifiedHandler; /// to be called if something on the page has been modified + Link m_aModifiedHandler; /// to be called if something on the page has been modified public: OTextConnectionHelper( Window* pParent, const short _nAvailableSections ); @@ -71,24 +71,24 @@ namespace dbaui RadioButton m_aRBAccessOtherFiles; Edit m_aETOwnExtension; FixedText m_aFTExtensionExample; - FixedLine m_aLineFormat; - FixedText m_aFieldSeparatorLabel; - ComboBox m_aFieldSeparator; - FixedText m_aTextSeparatorLabel; - ComboBox m_aTextSeparator; - FixedText m_aDecimalSeparatorLabel; - ComboBox m_aDecimalSeparator; - FixedText m_aThousandsSeparatorLabel; - ComboBox m_aThousandsSeparator; - CheckBox m_aRowHeader; + FixedLine m_aLineFormat; + FixedText m_aFieldSeparatorLabel; + ComboBox m_aFieldSeparator; + FixedText m_aTextSeparatorLabel; + ComboBox m_aTextSeparator; + FixedText m_aDecimalSeparatorLabel; + ComboBox m_aDecimalSeparator; + FixedText m_aThousandsSeparatorLabel; + ComboBox m_aThousandsSeparator; + CheckBox m_aRowHeader; FixedLine m_aCharSetHeader; FixedText m_aCharSetLabel; CharSetListBox m_aCharSet; - String m_aFieldSeparatorList; - String m_aTextSeparatorList; - String m_aTextNone; + String m_aFieldSeparatorList; + String m_aTextSeparatorList; + String m_aTextNone; String m_aOldExtension; - Link m_aGetExtensionHandler; /// to be called if a new type is selected + Link m_aGetExtensionHandler; /// to be called if a new type is selected short m_nAvailableSections; @@ -100,11 +100,11 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); private: - String GetSeparator( const ComboBox& rBox, const String& rList ); - void SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ); + String GetSeparator( const ComboBox& rBox, const String& rList ); + void SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ); void SetExtension(const String& _rVal); - + public: void implInitControls(const SfxItemSet& _rSet, sal_Bool _bValid); void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -116,7 +116,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBWIZ2_HXX diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index d22e8c4839a7..961375276259 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,16 +64,16 @@ using namespace comphelper; class OPasswordDialog : public ModalDialog { - FixedLine aFLUser; - FixedText aFTOldPassword; - Edit aEDOldPassword; - FixedText aFTPassword; - Edit aEDPassword; - FixedText aFTPasswordRepeat; - Edit aEDPasswordRepeat; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + FixedLine aFLUser; + FixedText aFTOldPassword; + Edit aEDOldPassword; + FixedText aFTPassword; + Edit aEDPassword; + FixedText aFTPasswordRepeat; + Edit aEDPasswordRepeat; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; DECL_LINK( OKHdl_Impl, OKButton * ); @@ -82,24 +82,24 @@ class OPasswordDialog : public ModalDialog public: OPasswordDialog( Window* pParent,const String& _sUserName); - String GetOldPassword() const { return aEDOldPassword.GetText(); } - String GetNewPassword() const { return aEDPassword.GetText(); } + String GetOldPassword() const { return aEDOldPassword.GetText(); } + String GetNewPassword() const { return aEDPassword.GetText(); } }; OPasswordDialog::OPasswordDialog(Window* _pParent,const String& _sUserName) : ModalDialog( _pParent, ModuleRes( DLG_PASSWORD) ), - aFLUser ( this, ModuleRes( FL_USER ) ), - aFTOldPassword ( this, ModuleRes( FT_OLDPASSWORD ) ), - aEDOldPassword ( this, ModuleRes( ED_OLDPASSWORD ) ), - aFTPassword ( this, ModuleRes( FT_PASSWORD ) ), - aEDPassword ( this, ModuleRes( ED_PASSWORD ) ), - aFTPasswordRepeat ( this, ModuleRes( FT_PASSWORD_REPEAT ) ), - aEDPasswordRepeat ( this, ModuleRes( ED_PASSWORD_REPEAT ) ), - aOKBtn ( this, ModuleRes( BTN_PASSWORD_OK ) ), - aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ), - aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) ) + aFLUser ( this, ModuleRes( FL_USER ) ), + aFTOldPassword ( this, ModuleRes( FT_OLDPASSWORD ) ), + aEDOldPassword ( this, ModuleRes( ED_OLDPASSWORD ) ), + aFTPassword ( this, ModuleRes( FT_PASSWORD ) ), + aEDPassword ( this, ModuleRes( ED_PASSWORD ) ), + aFTPasswordRepeat ( this, ModuleRes( FT_PASSWORD_REPEAT ) ), + aEDPasswordRepeat ( this, ModuleRes( ED_PASSWORD_REPEAT ) ), + aOKBtn ( this, ModuleRes( BTN_PASSWORD_OK ) ), + aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ), + aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) ) { // hide until a help is avalable aHelpBtn.Hide(); @@ -142,14 +142,14 @@ DBG_NAME(OUserAdmin); //================================================================================ OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet) : OGenericAdministrationPage( pParent, ModuleRes(TAB_PAGE_USERADMIN), _rAttrSet) - ,m_FL_USER( this , ModuleRes(FL_USER)) - ,m_FT_USER( this , ModuleRes(FT_USER)) - ,m_LB_USER( this , ModuleRes(LB_USER)) - ,m_PB_NEWUSER( this , ModuleRes(PB_NEWUSER)) - ,m_PB_CHANGEPWD( this , ModuleRes(PB_CHANGEPWD)) - ,m_PB_DELETEUSER( this , ModuleRes(PB_DELETEUSER)) + ,m_FL_USER( this , ModuleRes(FL_USER)) + ,m_FT_USER( this , ModuleRes(FT_USER)) + ,m_LB_USER( this , ModuleRes(LB_USER)) + ,m_PB_NEWUSER( this , ModuleRes(PB_NEWUSER)) + ,m_PB_CHANGEPWD( this , ModuleRes(PB_CHANGEPWD)) + ,m_PB_DELETEUSER( this , ModuleRes(PB_DELETEUSER)) ,m_FL_TABLE_GRANTS( this , ModuleRes(FL_TABLE_GRANTS)) - ,m_TableCtrl( this , ModuleRes(CTRL_TABLE_GRANTS)) + ,m_TableCtrl( this , ModuleRes(CTRL_TABLE_GRANTS)) { DBG_CTOR(OUserAdmin,NULL); m_LB_USER.SetSelectHdl(LINK(this, OUserAdmin, ListDblClickHdl)); @@ -186,7 +186,7 @@ void OUserAdmin::FillUserNames() m_aUserNames = m_xUsers->getElementNames(); const ::rtl::OUString* pBegin = m_aUserNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength(); + const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength(); ::rtl::OUString sUserName = m_UserName; for(;pBegin != pEnd;++pBegin) m_LB_USER.InsertEntry(*pBegin); @@ -215,7 +215,7 @@ void OUserAdmin::FillUserNames() } // ----------------------------------------------------------------------- -SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet ) +SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OUserAdmin( pParent, _rAttrSet ) ); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.hrc b/dbaccess/source/ui/dlg/UserAdmin.hrc index 6a012724f49a..35ae40db6632 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hrc +++ b/dbaccess/source/ui/dlg/UserAdmin.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,33 +27,33 @@ #ifndef DBAUI_USERADMIN_HRC #define DBAUI_USERADMIN_HRC -#define FT_USER 1 - -#define LB_USER 1 - -#define NF_TIMEOUT 1 +#define FT_USER 1 -#define FL_TABLE_GRANTS 1 -#define FL_USER 2 +#define LB_USER 1 + +#define NF_TIMEOUT 1 + +#define FL_TABLE_GRANTS 1 +#define FL_USER 2 -#define CTRL_TABLE_GRANTS 1 +#define CTRL_TABLE_GRANTS 1 -#define PB_NEWUSER 2 -#define PB_CHANGEPWD 3 -#define PB_DELETEUSER 4 +#define PB_NEWUSER 2 +#define PB_CHANGEPWD 3 +#define PB_DELETEUSER 4 -#define FT_OLDPASSWORD 19 -#define ED_OLDPASSWORD 19 -#define FT_PASSWORD 20 -#define ED_PASSWORD 21 -#define FT_PASSWORD_REPEAT 22 -#define ED_PASSWORD_REPEAT 23 +#define FT_OLDPASSWORD 19 +#define ED_OLDPASSWORD 19 +#define FT_PASSWORD 20 +#define ED_PASSWORD 21 +#define FT_PASSWORD_REPEAT 22 +#define ED_PASSWORD_REPEAT 23 -#define BTN_PASSWORD_OK 50 -#define BTN_PASSWORD_CANCEL 51 -#define BTN_PASSWORD_HELP 52 +#define BTN_PASSWORD_OK 50 +#define BTN_PASSWORD_CANCEL 51 +#define BTN_PASSWORD_HELP 52 #endif // DBAUI_USERADMIN_HRC diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 73458126dbb1..45995bc201d9 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,32 +48,32 @@ namespace dbaui class OUserAdmin : public OGenericAdministrationPage { protected: - FixedLine m_FL_USER; - FixedText m_FT_USER; - ListBox m_LB_USER; - PushButton m_PB_NEWUSER; - PushButton m_PB_CHANGEPWD; - PushButton m_PB_DELETEUSER; - FixedLine m_FL_TABLE_GRANTS; - OTableGrantControl m_TableCtrl; // show the grant rights of one user - - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames; - - String m_UserName; + FixedLine m_FL_USER; + FixedText m_FT_USER; + ListBox m_LB_USER; + PushButton m_PB_NEWUSER; + PushButton m_PB_CHANGEPWD; + PushButton m_PB_DELETEUSER; + FixedLine m_FL_TABLE_GRANTS; + OTableGrantControl m_TableCtrl; // show the grant rights of one user + + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; + ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames; + String m_UserName; + // methods DECL_LINK( ListDblClickHdl, ListBox * ); - DECL_LINK( CloseHdl, PushButton * ); - DECL_LINK( UserHdl, PushButton * ); + DECL_LINK( CloseHdl, PushButton * ); + DECL_LINK( UserHdl, PushButton * ); - void FillUserNames(); + void FillUserNames(); OUserAdmin( Window* pParent, const SfxItemSet& _rCoreAttrs); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); - + static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + ~OUserAdmin(); String GetUser(); diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src index 2cab4f9e89f0..7ec8120b51b1 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.src +++ b/dbaccess/source/ui/dlg/UserAdmin.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,82 +40,82 @@ TabPage TAB_PAGE_USERADMIN { - SVLook = TRUE ; - HelpId = HID_TAB_PAGE_USERADMIN ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + SVLook = TRUE ; + HelpId = HID_TAB_PAGE_USERADMIN ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; Hide = TRUE; FixedLine FL_USER { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; - Text [ en-US ] = "User selection"; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; + Text [ en-US ] = "User selection"; }; FixedText FT_USER { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; - Text [ en-US ] = "Us~er:"; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 90 , 10 ) ; + Text [ en-US ] = "Us~er:"; }; ListBox LB_USER { - Border = TRUE ; - Pos = MAP_APPFONT ( 108 , 13) ; - Size = MAP_APPFONT ( 105 , 97 ) ; - TabStop = TRUE ; - HScroll = TRUE ; - Sort = TRUE ; - DropDown = TRUE ; - HelpId = HID_TAB_PAGE_LBUSER ; + Border = TRUE ; + Pos = MAP_APPFONT ( 108 , 13) ; + Size = MAP_APPFONT ( 105 , 97 ) ; + TabStop = TRUE ; + HScroll = TRUE ; + Sort = TRUE ; + DropDown = TRUE ; + HelpId = HID_TAB_PAGE_LBUSER ; }; PushButton PB_NEWUSER { - Pos = MAP_APPFONT ( 12 , 29 ) ; - Size = MAP_APPFONT ( 70 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - HelpId = HID_TAB_PAGE_PBUSER ; + Pos = MAP_APPFONT ( 12 , 29 ) ; + Size = MAP_APPFONT ( 70 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + HelpId = HID_TAB_PAGE_PBUSER ; Text [ en-US ] = "~Add User..."; }; PushButton PB_CHANGEPWD { - Pos = MAP_APPFONT ( 95 , 29 ) ; - Size = MAP_APPFONT ( 70 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - HelpId = HID_TAB_PAGE_PBCHGPWD ; + Pos = MAP_APPFONT ( 95 , 29 ) ; + Size = MAP_APPFONT ( 70 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + HelpId = HID_TAB_PAGE_PBCHGPWD ; Text [ en-US ] = "Change ~Password..."; }; PushButton PB_DELETEUSER { - Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ; - Size = MAP_APPFONT ( 70 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - HelpId = HID_TAB_PAGE_PBUSERDELETE ; + Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ; + Size = MAP_APPFONT ( 70 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + HelpId = HID_TAB_PAGE_PBUSERDELETE ; Text [ en-US ] = "~Delete User..."; }; FixedLine FL_TABLE_GRANTS { - Pos = MAP_APPFONT ( 6 , 52 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; + Pos = MAP_APPFONT ( 6 , 52 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; Text [ en-US ] = "Access rights for selected user"; }; Control CTRL_TABLE_GRANTS { - Pos = MAP_APPFONT ( 12 , 63 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 22, WINDOW_SIZE_Y - 75 ); - Border = TRUE ; - TabStop = TRUE ; - HelpId = HID_TAB_PAGE_TBLGRANTS ; + Pos = MAP_APPFONT ( 12 , 63 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 22, WINDOW_SIZE_Y - 75 ); + Border = TRUE ; + TabStop = TRUE ; + HelpId = HID_TAB_PAGE_TBLGRANTS ; }; }; @@ -130,10 +130,10 @@ String STR_USERADMIN_NOT_AVAILABLE Text [ en-US ] = "The database does not support user administration." ; }; -#define EDIT_SIZE_X 50 -#define FT_SIZE_X 90 -#define WIN_X 220 -#define WIN_Y 72 +#define EDIT_SIZE_X 50 +#define FT_SIZE_X 90 +#define WIN_X 220 +#define WIN_Y 72 ModalDialog DLG_PASSWORD { @@ -191,7 +191,7 @@ ModalDialog DLG_PASSWORD Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ; PassWord = TRUE ; }; - + OKButton BTN_PASSWORD_OK { Pos = MAP_APPFONT ( WIN_X - 56 , 6 ) ; @@ -207,7 +207,7 @@ ModalDialog DLG_PASSWORD { Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; - }; + }; Text [ en-US ] = "Change Password"; }; diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 5e7e28158777..3f731cade662 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -178,7 +178,7 @@ DBG_NAME(OUserAdminDlg) return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const + ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -203,7 +203,7 @@ DBG_NAME(OUserAdminDlg) return PrepareLeaveCurrentPage(); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.hrc b/dbaccess/source/ui/dlg/UserAdminDlg.hrc index c1e023cfc9b7..dd1bdd5b57af 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.hrc +++ b/dbaccess/source/ui/dlg/UserAdminDlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #ifndef DBAUI_USERADMINDLG_HRC #define DBAUI_USERADMINDLG_HRC -#define STR_PAGETITLE_USERADMIN 1 +#define STR_PAGETITLE_USERADMIN 1 #endif // DBAUI_USERADMINDLG_HRC diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src index faa7f33302d7..bed16e575dc1 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.src +++ b/dbaccess/source/ui/dlg/UserAdminDlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,14 +37,14 @@ TabDialog DLG_DATABASE_USERADMIN -{ +{ OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; Hide = TRUE; HelpId = HID_DSADMIN_USERADMIN; - + TabControl 1 { OutputSize = TRUE ; @@ -55,6 +55,6 @@ TabDialog DLG_DATABASE_USERADMIN { Text[ en-US ] = "User Settings"; }; - + Text [ en-US ] = "User administration" ; }; diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index cfdc2dd3842f..5213bda4c8a5 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,18 +152,18 @@ namespace dbaui //-------------------------------------------------------------------- MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink ) :Control( &_rParent, ModuleRes( RID_MYSQL_NATIVE_SETTINGS ).SetAutoRelease( FALSE ) ) - ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) ) - ,m_aDatabaseName ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) ) + ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) ) + ,m_aDatabaseName ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) ) ,m_aHostPortRadio ( this, ModuleRes( RB_MYSQL_HOST_PORT ) ) - ,m_aSocketRadio ( this, ModuleRes( RB_MYSQL_SOCKET ) ) - ,m_aNamedPipeRadio ( this, ModuleRes( RB_MYSQL_NAMED_PIPE ) ) - ,m_aHostNameLabel ( this, ModuleRes( FT_COMMON_HOST_NAME ) ) - ,m_aHostName ( this, ModuleRes( ED_COMMON_HOST_NAME ) ) - ,m_aPortLabel ( this, ModuleRes( FT_COMMON_PORT ) ) - ,m_aPort ( this, ModuleRes( NF_COMMON_PORT ) ) + ,m_aSocketRadio ( this, ModuleRes( RB_MYSQL_SOCKET ) ) + ,m_aNamedPipeRadio ( this, ModuleRes( RB_MYSQL_NAMED_PIPE ) ) + ,m_aHostNameLabel ( this, ModuleRes( FT_COMMON_HOST_NAME ) ) + ,m_aHostName ( this, ModuleRes( ED_COMMON_HOST_NAME ) ) + ,m_aPortLabel ( this, ModuleRes( FT_COMMON_PORT ) ) + ,m_aPort ( this, ModuleRes( NF_COMMON_PORT ) ) ,m_aDefaultPort ( this, ModuleRes( FT_COMMON_PORT_DEFAULT ) ) - ,m_aSocket ( this, ModuleRes( ED_MYSQL_SOCKET ) ) - ,m_aNamedPipe ( this, ModuleRes( ED_MYSQL_NAMED_PIPE ) ) + ,m_aSocket ( this, ModuleRes( ED_MYSQL_SOCKET ) ) + ,m_aNamedPipe ( this, ModuleRes( ED_MYSQL_NAMED_PIPE ) ) { FreeResource(); diff --git a/dbaccess/source/ui/dlg/admincontrols.hrc b/dbaccess/source/ui/dlg/admincontrols.hrc index 8286bc7f8b25..01eadee58e83 100755 --- a/dbaccess/source/ui/dlg/admincontrols.hrc +++ b/dbaccess/source/ui/dlg/admincontrols.hrc @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index cd3246cdc332..4caa61be5664 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,10 +55,10 @@ namespace dbaui FixedText m_aHostNameLabel; Edit m_aHostName; FixedText m_aPortLabel; - NumericField m_aPort; - FixedText m_aDefaultPort; - Edit m_aSocket; - Edit m_aNamedPipe; + NumericField m_aPort; + FixedText m_aDefaultPort; + Edit m_aSocket; + Edit m_aNamedPipe; ::svt::ControlDependencyManager m_aControlDependencies; diff --git a/dbaccess/source/ui/dlg/admincontrols.src b/dbaccess/source/ui/dlg/admincontrols.src index 8ce3bb4030dc..5e5ceda60428 100755 --- a/dbaccess/source/ui/dlg/admincontrols.src +++ b/dbaccess/source/ui/dlg/admincontrols.src @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Size = MAP_APPFONT ( COLUMN_WIDTH_1 - UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ); Text[ en-US ] = "~Database name"; }; - + Edit ED_MYSQL_DATABASE_NAME { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, 0 ); @@ -84,7 +84,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Text [ en-US ] = "~Port" ; Group = TRUE; }; - + NumericField NF_COMMON_PORT { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + LINE_HEIGHT ); @@ -93,7 +93,7 @@ Control RID_MYSQL_NATIVE_SETTINGS NoThousandSep = TRUE; Value = 3306; }; - + FixedText FT_COMMON_PORT_DEFAULT { Pos = MAP_APPFONT ( COLUMN_WIDTH_1 + 25 + RELATED_CONTROLS, OPTION_GROUP_START + LINE_HEIGHT + 2 ); @@ -107,7 +107,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS, FIXEDTEXT_HEIGHT ); Text [ en-US ] = "So~cket"; }; - + Edit ED_MYSQL_SOCKET { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 * LINE_HEIGHT ); @@ -121,7 +121,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS, FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Named p~ipe"; }; - + Edit ED_MYSQL_NAMED_PIPE { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 * LINE_HEIGHT ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index e87ca6a93d45..2e4d3fbee797 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ namespace dbaui OGenericAdministrationPage::~OGenericAdministrationPage() { DELETEZ(m_pFT_HeaderText); - + DBG_DTOR(OGenericAdministrationPage,NULL); } @@ -186,7 +186,7 @@ namespace dbaui fillControls(aControlList); ::std::for_each(aControlList.begin(),aControlList.end(),TSaveValueWrapperFunctor()); } - + if ( bReadonly ) { fillWindows(aControlList); @@ -264,7 +264,7 @@ namespace dbaui // ----------------------------------------------------------------------- IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/) - { + { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); sal_Bool bSuccess = sal_False; if ( m_pAdminDialog ) @@ -294,7 +294,7 @@ namespace dbaui else { eImage = OSQLMessageBox::Error; - aMessage = String(ModuleRes(STR_CONNECTION_NO_SUCCESS)); + aMessage = String(ModuleRes(STR_CONNECTION_NO_SUCCESS)); } OSQLMessageBox aMsg( this, sTitle, aMessage, WB_OK, eImage ); aMsg.Execute(); @@ -333,7 +333,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index eba739fec877..9a6775269bf0 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,10 +50,10 @@ namespace dbaui virtual bool SaveValue() = 0; virtual bool Disable() = 0; }; - + template < class T > class OSaveValueWrapper : public ISaveValueWrapper { - T* m_pSaveValue; + T* m_pSaveValue; public: OSaveValueWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } @@ -64,7 +64,7 @@ namespace dbaui template < class T > class ODisableWrapper : public ISaveValueWrapper { - T* m_pSaveValue; + T* m_pSaveValue; public: ODisableWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } @@ -75,14 +75,14 @@ namespace dbaui struct TSaveValueWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool> { - bool operator() (ISaveValueWrapper* lhs) + bool operator() (ISaveValueWrapper* lhs) { return lhs->SaveValue(); } }; struct TDisableWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool> { - bool operator() (ISaveValueWrapper* lhs) + bool operator() (ISaveValueWrapper* lhs) { return lhs->Disable(); } @@ -90,7 +90,7 @@ namespace dbaui struct TDeleteWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool> { - bool operator() (ISaveValueWrapper* lhs) + bool operator() (ISaveValueWrapper* lhs) { delete lhs; return true; @@ -101,12 +101,12 @@ namespace dbaui //= OGenericAdministrationPage //========================================================================= class IDatabaseSettingsDialog; - class IItemSetHelper; + class IItemSetHelper; class OGenericAdministrationPage :public SfxTabPage ,public ::svt::IWizardPageController { private: - Link m_aModifiedHandler; /// to be called if something on the page has been modified + Link m_aModifiedHandler; /// to be called if something on the page has been modified sal_Bool m_abEnableRoadmap; protected: IDatabaseSettingsDialog* m_pAdminDialog; @@ -123,32 +123,32 @@ namespace dbaui void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; } /** Sets the ParentDialog - @param _pAdminDialog + @param _pAdminDialog the ParentDialog - @param _pItemSetHelper + @param _pItemSetHelper the itemset helper */ - inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper) - { + inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper) + { OSL_ENSURE(_pDialog && _pItemSetHelper,"Values are NULL!"); - m_pAdminDialog = _pDialog; + m_pAdminDialog = _pDialog; m_pItemSetHelper = _pItemSetHelper; } /** Sets the ServiceFactory - @param _rxORB + @param _rxORB The service factory. */ virtual void SetServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB) - { - m_xORB = _rxORB; + { + m_xORB = _rxORB; } /** opens a dialog filled with all data sources available for this type and returns the selected on. - @param _eType + @param _eType The type for which the data source dialog should be opened. - @param _sReturn + @param _sReturn <OUT/> contains the selected name. @return <FALSE/> if an error occured, otherwise <TRUE/> @@ -168,12 +168,12 @@ namespace dbaui virtual int DeactivatePage(SfxItemSet* pSet); using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False - virtual void Reset(const SfxItemSet& _rCoreAttrs); + virtual void Reset(const SfxItemSet& _rCoreAttrs); /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True virtual void ActivatePage(const SfxItemSet& _rSet); // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage(); protected: void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call((void*)this); } @@ -182,7 +182,7 @@ namespace dbaui virtual sal_Bool prepareLeave() { return sal_True; } /** called from within Reset and ActivatePage, use to initialize the controls with the items from the given set - @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls + @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls */ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); @@ -190,28 +190,28 @@ namespace dbaui void getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly); /** will be called inside <method>implInitControls</method> to save the value if necessary - @param _rControlList - The list must be filled with the controls. + @param _rControlList + The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. */ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) = 0; /** will be called inside <method>implInitControls</method> to disable if necessary - @param _rControlList - The list must be filled with the controls. + @param _rControlList + The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. */ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) = 0; public: /** fills the Boolean value into the item set when the value changed. - @param _rSet + @param _rSet The item set where to put the new value into. - @param _pCheckBox + @param _pCheckBox The check box which is checked. - @param _nID + @param _nID The id in the itemset to set whith the new value. - @param _bChangedSomething + @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> @param _bRevertValue set to <TRUE/> if the display value should be reverted before putting it into the set @@ -219,25 +219,25 @@ namespace dbaui static void fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, USHORT _nID, sal_Bool& _bChangedSomething, bool _bRevertValue = false); /** fills the int value into the item set when the value changed. - @param _rSet + @param _rSet The item set where to put the new value into. - @param _pEdit + @param _pEdit The check box which is checked. - @param _nID + @param _nID The id in the itemset to set whith the new value. - @param _bChangedSomething + @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ static void fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething); /** fills the String value into the item set when the value changed. - @param _rSet + @param _rSet The item set where to put the new value into. - @param _pEdit + @param _pEdit The check box which is checked. - @param _nID + @param _nID The id in the itemset to set whith the new value. - @param _bChangedSomething + @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ static void fillString(SfxItemSet& _rSet,Edit* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething); @@ -280,7 +280,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ADMINPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index a0f0365fb22b..21f806db613a 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,14 +71,14 @@ BSTR PromptNew(long hWnd) // Initialize COM ::CoInitialize( NULL ); - + // Instantiate DataLinks object. hr = CoCreateInstance( - CLSID_DataLinks, //clsid -- Data Links UI - NULL, //pUnkOuter - CLSCTX_INPROC_SERVER, //dwClsContext - IID_IDataSourceLocator, //riid - (void**)&dlPrompt //ppvObj + CLSID_DataLinks, //clsid -- Data Links UI + NULL, //pUnkOuter + CLSCTX_INPROC_SERVER, //dwClsContext + IID_IDataSourceLocator, //riid + (void**)&dlPrompt //ppvObj ); if( FAILED( hr ) ) { @@ -86,7 +86,7 @@ BSTR PromptNew(long hWnd) dlPrompt->Release( ); return connstr; } - + dlPrompt->put_hWnd(hWnd); if( FAILED( hr ) ) { @@ -98,7 +98,7 @@ BSTR PromptNew(long hWnd) // Prompt for connection information. hr = dlPrompt->PromptNew((IDispatch **)&piTmpConnection); - if( FAILED( hr ) || !piTmpConnection ) + if( FAILED( hr ) || !piTmpConnection ) { dlPrompt->Release( ); return connstr; @@ -128,7 +128,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) // Initialize COM ::CoInitialize( NULL ); - hr = CoCreateInstance(CLSID_CADOConnection, + hr = CoCreateInstance(CLSID_CADOConnection, NULL, CLSCTX_INPROC_SERVER, IID_IADOConnection, @@ -139,21 +139,21 @@ BSTR PromptEdit(long hWnd,BSTR connstr) return connstr; } - + hr = piTmpConnection->put_ConnectionString(connstr); if( FAILED( hr ) ) { piTmpConnection->Release( ); return connstr; } - + // Instantiate DataLinks object. hr = CoCreateInstance( - CLSID_DataLinks, //clsid -- Data Links UI - NULL, //pUnkOuter - CLSCTX_INPROC_SERVER, //dwClsContext - IID_IDataSourceLocator, //riid - (void**)&dlPrompt //ppvObj + CLSID_DataLinks, //clsid -- Data Links UI + NULL, //pUnkOuter + CLSCTX_INPROC_SERVER, //dwClsContext + IID_IDataSourceLocator, //riid + (void**)&dlPrompt //ppvObj ); if( FAILED( hr ) ) { @@ -161,7 +161,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) dlPrompt->Release( ); return connstr; } - + dlPrompt->put_hWnd(hWnd); if( FAILED( hr ) ) { @@ -171,7 +171,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) } VARIANT_BOOL pbSuccess; - + // Prompt for connection information. hr = dlPrompt->PromptEdit((IDispatch **)&piTmpConnection,&pbSuccess); if( SUCCEEDED( hr ) && FALSE == pbSuccess ) //if user press cancel then FALSE == pbSuccess @@ -181,7 +181,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) return connstr; } - if( FAILED( hr ) ) + if( FAILED( hr ) ) { // Prompt for new connection information. piTmpConnection->Release( ); diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index e5f299e7a7be..e7c08b3e1b6e 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 68b7d64abd8c..49bc28b34b4c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ class TableListFacade : public ::cppu::BaseMutex { OTableTreeListBox& m_rTableList; Reference< XConnection > m_xConnection; - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; bool m_bAllowViews; @@ -94,7 +94,7 @@ public: { } virtual ~TableListFacade(); - + private: virtual void updateTableObjectList( bool _bAllowViews ); @@ -133,8 +133,8 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const try { Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW ); - if ( !aCatalog.getLength() - && aSchema.getLength() + if ( !aCatalog.getLength() + && aSchema.getLength() && xMeta->supportsCatalogsInDataManipulation() && !xMeta->supportsSchemasInDataManipulation() ) { @@ -175,7 +175,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) try { Reference< XTablesSupplier > xTableSupp( m_xConnection, UNO_QUERY_THROW ); - + Reference< XViewsSupplier > xViewSupp; Reference< XNameAccess > xTables, xViews; Sequence< ::rtl::OUString > sTables, sViews; @@ -203,12 +203,12 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) // if no views are allowed remove the views also out the table name filter if ( !_bAllowViews ) { - const ::rtl::OUString* pTableBegin = sTables.getConstArray(); - const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength(); + const ::rtl::OUString* pTableBegin = sTables.getConstArray(); + const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength(); ::std::vector< ::rtl::OUString > aTables(pTableBegin,pTableEnd); const ::rtl::OUString* pViewBegin = sViews.getConstArray(); - const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength(); + const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength(); ::comphelper::TStringMixEqualFunctor aEqualFunctor; for(;pViewBegin != pViewEnd;++pViewBegin) aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end()); @@ -249,7 +249,7 @@ class QueryListFacade : public ::cppu::BaseMutex { SvTreeListBox& m_rQueryList; Reference< XConnection > m_xConnection; - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; public: @@ -513,7 +513,7 @@ BOOL OAddTableDlg::Close() //------------------------------------------------------------------------------ bool OAddTableDlg::impl_isAddAllowed() { - return m_rContext.allowAddition(); + return m_rContext.allowAddition(); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/dlg/adtabdlg.hrc b/dbaccess/source/ui/dlg/adtabdlg.hrc index 3c0e348abfaa..ce0a9ba4f227 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.hrc +++ b/dbaccess/source/ui/dlg/adtabdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,13 +28,13 @@ #define DBAUI_ADTABDLG_HRC #define LB_TABLE_OR_QUERY 1 -#define LB_DATABASE 2 +#define LB_DATABASE 2 -#define FT_DATABASE 1 +#define FT_DATABASE 1 -#define PB_ADDTABLE 1 -#define PB_CLOSE 2 -#define PB_HELP 3 +#define PB_ADDTABLE 1 +#define PB_CLOSE 2 +#define PB_HELP 3 #define RB_CASE_TABLES 1 #define RB_CASE_QUERIES 2 diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src index af1d861a0faa..69b202644a6c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.src +++ b/dbaccess/source/ui/dlg/adtabdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 66df4a24c74c..b42aa4843c66 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -447,7 +447,7 @@ namespace dbaui // auto-generated values? if ( rFeatures.supportsGeneratedValues() ) AddTabPage( PAGE_GENERATED_VALUES, String( ModuleRes( STR_GENERATED_VALUE ) ), ODriversSettings::CreateGeneratedValuesPage, NULL ); - + // any "special settings"? if ( rFeatures.supportsAnySpecialSetting() ) AddTabPage( PAGE_ADVANCED_SETTINGS_SPECIAL, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateSpecialSettingsPage, NULL ); @@ -532,7 +532,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const + ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.hrc b/dbaccess/source/ui/dlg/advancedsettings.hrc index 8abc5d8810d2..8a09c0adcf7a 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hrc +++ b/dbaccess/source/ui/dlg/advancedsettings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #define ADVANCED_CHECKBOX_OPTIONS 15 #define ADVANCED_LISTBOX_OPTIONS 1 -#define ADVANCED_PAGE_X 200 +#define ADVANCED_PAGE_X 200 #define ADVANCED_PAGE_Y \ /* top space */ START_Y + \ /* label */ FIXEDTEXT_HEIGHT + RELATED_CONTROLS + \ @@ -40,23 +40,23 @@ /* bottom space */ START_Y -#define STR_GENERATED_VALUE 1 -#define STR_DS_BEHAVIOUR 2 +#define STR_GENERATED_VALUE 1 +#define STR_DS_BEHAVIOUR 2 -#define FL_SEPARATORAUTO 1 -#define FL_DATAHANDLING 2 +#define FL_SEPARATORAUTO 1 +#define FL_DATAHANDLING 2 -#define CB_SUPPRESVERSIONCL 1 -#define CB_SQL92CHECK 2 -#define CB_RETRIEVE_AUTO 3 -#define CB_APPENDTABLEALIAS 4 +#define CB_SUPPRESVERSIONCL 1 +#define CB_SQL92CHECK 2 +#define CB_RETRIEVE_AUTO 3 +#define CB_APPENDTABLEALIAS 4 #define CB_IGNOREDRIVER_PRIV 5 -#define CB_PARAMETERNAMESUBST 6 -#define CB_ENABLEOUTERJOIN 7 -#define CB_SCHEMA 8 -#define CB_CATALOG 9 -#define CB_IGNOREINDEXAPPENDIX 10 -#define CB_DOSLINEENDS 11 +#define CB_PARAMETERNAMESUBST 6 +#define CB_ENABLEOUTERJOIN 7 +#define CB_SCHEMA 8 +#define CB_CATALOG 9 +#define CB_IGNOREINDEXAPPENDIX 10 +#define CB_DOSLINEENDS 11 #define CB_AS_BEFORE_CORR_NAME 12 #define CB_CHECK_REQUIRED 13 #define CB_IGNORECURRENCY 14 @@ -64,12 +64,12 @@ #define CB_PRIMARY_KEY_SUPPORT 16 #define ET_AUTOINCREMENTVALUE 1 -#define ET_RETRIEVE_AUTO 2 +#define ET_RETRIEVE_AUTO 2 -#define FT_AUTOINCREMENTVALUE 1 -#define FT_RETRIEVE_AUTO 2 -#define FT_BOOLEANCOMPARISON 3 +#define FT_AUTOINCREMENTVALUE 1 +#define FT_RETRIEVE_AUTO 2 +#define FT_BOOLEANCOMPARISON 3 -#define LB_BOOLEANCOMPARISON 1 +#define LB_BOOLEANCOMPARISON 1 #endif // DBAUI_ADVANCEDSETTINGS_HRC diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index f4c6e75e4f3f..b13043ca71b0 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ namespace dbaui CheckBox* m_pIndexAppendix; CheckBox* m_pDosLineEnds; CheckBox* m_pCheckRequiredFields; - CheckBox* m_pIgnoreCurrency; + CheckBox* m_pIgnoreCurrency; CheckBox* m_pEscapeDateTime; CheckBox* m_pPrimaryKeySupport; @@ -127,7 +127,7 @@ namespace dbaui GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: - + // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten virtual ~GeneratedValuesPage(); diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src index 4c5a7d924d33..a4eb47133f63 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.src +++ b/dbaccess/source/ui/dlg/advancedsettings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -174,14 +174,14 @@ }; //------------------------------------------------------------------------- -#define AUTO_IGNORECURRENCY(AUTO_Y) \ - CheckBox CB_IGNORECURRENCY \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ - Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ - TabStop = TRUE ; \ - HelpId = HID_DSADMIN_IGNORECURRENCY; \ - Text [ en-US ] = "Ignore currency field information"; \ +#define AUTO_IGNORECURRENCY(AUTO_Y) \ + CheckBox CB_IGNORECURRENCY \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_IGNORECURRENCY; \ + Text [ en-US ] = "Ignore currency field information"; \ }; //------------------------------------------------------------------------- @@ -227,7 +227,7 @@ < "SQL" ; Default ; > ; \ < "Mixed" ; Default ; > ; \ < "MS Access" ; Default ; > ; \ - }; + }; #define AUTO_BOOLEANCOMPARISON(AUTO_Y) \ @@ -337,30 +337,30 @@ TabPage PAGE_ADVANCED_SETTINGS_SPECIAL //------------------------------------------------------------------------- TabDialog DLG_DATABASE_ADVANCED -{ +{ OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; Hide = TRUE; HelpId = HID_DSADMIN_ADVANCED; - + TabControl 1 { OutputSize = TRUE ; HelpId = HID_DSADMIN_TABCONTROL; SingleLine=TRUE; }; - + String STR_GENERATED_VALUE { Text [ en-US ] = "Generated Values"; }; - + String STR_DS_BEHAVIOUR { Text [ en-US ] = "Special Settings"; }; - + Text [ en-US ] = "Advanced Properties" ; }; diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 028705d806ea..2783d030b347 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,7 +149,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD { case ::dbaccess::DST_DBASE: addDetailPage(PAGE_DBASE, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateDbase); - // bResetPasswordRequired = sal_True; + // bResetPasswordRequired = sal_True; break; case ::dbaccess::DST_ADO: @@ -158,7 +158,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD case ::dbaccess::DST_FLAT: addDetailPage(PAGE_TEXT, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateText); - // bResetPasswordRequired = sal_True; + // bResetPasswordRequired = sal_True; break; case ::dbaccess::DST_ODBC: @@ -188,7 +188,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD case ::dbaccess::DST_LDAP: addDetailPage(PAGE_LDAP,STR_PAGETITLE_ADVANCED,ODriversSettings::CreateLDAP); break; - case ::dbaccess::DST_USERDEFINE1: /// first user defined driver + case ::dbaccess::DST_USERDEFINE1: /// first user defined driver case ::dbaccess::DST_USERDEFINE2: case ::dbaccess::DST_USERDEFINE3: case ::dbaccess::DST_USERDEFINE4: @@ -228,7 +228,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou // are set. Select another data source of the same type, where the indirect props are not set (yet). Then, // the indirect property values of the first ds are shown in the second ds ...) const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties(); - for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); + for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); aIndirect != rMap.end(); ++aIndirect ) @@ -282,7 +282,7 @@ sal_Bool ODbAdminDialog::saveDatasource() ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges() { if (!PrepareLeaveCurrentPage()) - { // the page did not allow us to leave + { // the page did not allow us to leave return AR_KEEP; } @@ -331,7 +331,7 @@ Reference< XDriver > ODbAdminDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const +::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -351,7 +351,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp const ::rtl::OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); // create and initialize the defaults _rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1]; - SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults + SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults *pCounter++ = new SfxStringItem(DSID_NAME, String()); *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, String()); *pCounter++ = new SfxStringItem(DSID_CONNECTURL, String()); @@ -509,9 +509,9 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, _rppDefaults = NULL; // no need to explicitly delete the defaults, this has been done by the ReleaseDefaults } - + //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc index 88ed5aea8d47..d49537cfdab2 100644 --- a/dbaccess/source/ui/dlg/dbadmin.hrc +++ b/dbaccess/source/ui/dlg/dbadmin.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ #define CB_PASSWORD_REQUIRED 1 #define CB_SHOWDELETEDROWS 2 #define CB_USESSL 3 -#define CB_USECATALOG 4 +#define CB_USECATALOG 4 #define FL_SEPARATOR2 1 @@ -103,9 +103,9 @@ //======================================================================== // menu item ids -#define MID_NEW_DATASOURCE 1 -#define MID_DELETE_DATASOURCE 2 -#define MID_RESTORE_DATASOURCE 3 +#define MID_NEW_DATASOURCE 1 +#define MID_DELETE_DATASOURCE 2 +#define MID_RESTORE_DATASOURCE 3 #endif // _DBAUI_DBADMIN_HRC_ diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index c4457c62eec0..02389611a993 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,55 +48,55 @@ //------------------------------------------------------------------------- #define AUTO_USECATALOG(AUTO_Y) \ - CheckBox CB_USECATALOG \ - { \ - Pos = MAP_APPFONT ( 6 ,AUTO_Y) ; \ - Size = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ - TabStop = TRUE ; \ - HelpId = HID_DSADMIN_USECATALOG; \ - Text[ en-US ] = "Use catalog for file-based databases"; \ + CheckBox CB_USECATALOG \ + { \ + Pos = MAP_APPFONT ( 6 ,AUTO_Y) ; \ + Size = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_USECATALOG; \ + Text[ en-US ] = "Use catalog for file-based databases"; \ }; //------------------------------------------------------------------------- #define AUTO_FIXEDLINE_CONNSETTINGS(AUTO_Y) \ - FixedLine FL_SEPARATOR1 \ - { \ - Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \ - Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = "Connection Settings"; \ - }; \ - -#define AUTO_HOST_AND_PORT(AUTO_Y) \ - FixedText FT_HOSTNAME \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y + 2 ) ; \ - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = "~Host name"; \ - }; \ - Edit ET_HOSTNAME \ - { \ - TabStop = TRUE ; \ - Border = TRUE ; \ - HelpId = HID_DSADMIN_HOSTNAME; \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ; \ - Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ - }; \ + FixedLine FL_SEPARATOR1 \ + { \ + Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = "Connection Settings"; \ + }; \ + +#define AUTO_HOST_AND_PORT(AUTO_Y) \ + FixedText FT_HOSTNAME \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y + 2 ) ; \ + Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = "~Host name"; \ + }; \ + Edit ET_HOSTNAME \ + { \ + TabStop = TRUE ; \ + Border = TRUE ; \ + HelpId = HID_DSADMIN_HOSTNAME; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ; \ + Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ + }; \ \ - FixedText FT_PORTNUMBER \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ; \ - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = "~Port number"; \ - }; \ - NumericField NF_PORTNUMBER \ - { \ - TabStop = TRUE ; \ - Border = TRUE ; \ - HelpId = HID_DSADMIN_PORTNUMBER; \ + FixedText FT_PORTNUMBER \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ; \ + Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = "~Port number"; \ + }; \ + NumericField NF_PORTNUMBER \ + { \ + TabStop = TRUE ; \ + Border = TRUE ; \ + HelpId = HID_DSADMIN_PORTNUMBER; \ NoThousandSep = TRUE; \ Pos = MAP_APPFONT ( EDIT_X , AUTO_Y +UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT ) ; \ - Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ + Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ }; //------------------------------------------------------------------------- @@ -393,7 +393,7 @@ TabPage PAGE_ODBC HelpId = HID_DSADMIN_ODBC_OPTIONS; }; - AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) + AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) }; TabPage PAGE_ADABAS @@ -434,11 +434,11 @@ TabPage PAGE_ADABAS }; NumericField NF_CACHE_SIZE { - Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ; - Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ; + Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; SpinSize = 1; StrictFormat = TRUE; }; @@ -451,11 +451,11 @@ TabPage PAGE_ADABAS }; NumericField NF_DATA_INCREMENT { - Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; - Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; + Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; SpinSize = 1; StrictFormat = TRUE; }; @@ -502,8 +502,8 @@ TabPage PAGE_ADABAS PushButton PB_STAT { - Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ; - Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; + Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ; + Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text[ en-US ] = "E~xtended..."; }; @@ -511,9 +511,9 @@ TabPage PAGE_ADABAS }; //......................................................................... -#define MYSQL_YDIST 53 -#define MYSQL_FL_Y 8 -#define MYSQL_DRIVERCLASS_Y 8 +#define MYSQL_YDIST 53 +#define MYSQL_FL_Y 8 +#define MYSQL_DRIVERCLASS_Y 8 TabPage PAGE_MYSQL_ODBC { diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src index 50b796541872..2a7c0abb178a 100644 --- a/dbaccess/source/ui/dlg/dbadmin2.src +++ b/dbaccess/source/ui/dlg/dbadmin2.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,10 +102,10 @@ String STR_HINT_CONNECTION_NOT_CAPABLE Text [ en-US ] = "(Not supported by this connection)"; }; -#define EDIT_SIZE_X 50 -#define FT_SIZE_X 90 -#define WIN_X 220 -#define WIN_Y 72 +#define EDIT_SIZE_X 50 +#define FT_SIZE_X 90 +#define WIN_X 220 +#define WIN_Y 72 ModalDialog DLG_DOMAINPASSWORD { @@ -145,7 +145,7 @@ ModalDialog DLG_DOMAINPASSWORD { Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; - }; + }; }; #define PAGE_X_T (PAGE_X -80) @@ -158,7 +158,7 @@ TabPage PAGE_TABLESUBSCRIPTION Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( PAGE_X_T, PAGE_Y_T) ; HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION; - + Text [ en-US ] = "Tables Filter" ; FixedLine FL_SEPARATOR1 @@ -169,17 +169,17 @@ TabPage PAGE_TABLESUBSCRIPTION }; Control CTL_TABLESUBSCRIPTION { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ; - Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ; - Group = TRUE; - Border = TRUE ; + Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ; + Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ; + Group = TRUE; + Border = TRUE ; TabStop = TRUE ; HelpId = HID_DSADMIN_TABLE_SELECTOR; }; FixedText FT_FILTER_EXPLANATION { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 2*UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + 81 ) ; - Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ; + Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ; HelpId = HID_DSADMIN_FILTER_EXPLANATION; WordBreak = TRUE; Text [ en-US ] = "Mark the tables that should be visible for the applications."; diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc index 7d6757951089..282557af2485 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.hrc +++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,45 +40,45 @@ #endif -#define STR_DBASE_HELPTEXT 28 -#define STR_MSACCESS_HELPTEXT 29 -#define STR_TEXT_HELPTEXT 30 +#define STR_DBASE_HELPTEXT 28 +#define STR_MSACCESS_HELPTEXT 29 +#define STR_TEXT_HELPTEXT 30 // FREE -#define STR_ADO_HELPTEXT 32 -#define STR_JDBC_HELPTEXT 33 -#define STR_ODBC_HELPTEXT 34 -#define STR_MYSQLJDBC_HELPTEXT 35 -#define STR_SPREADSHEET_HELPTEXT 36 +#define STR_ADO_HELPTEXT 32 +#define STR_JDBC_HELPTEXT 33 +#define STR_ODBC_HELPTEXT 34 +#define STR_MYSQLJDBC_HELPTEXT 35 +#define STR_SPREADSHEET_HELPTEXT 36 // FREE -#define STR_FINAL_HELPTEXT 38 -#define STR_ADABAS_HELPTEXT 39 -#define STR_ORACLE_HELPTEXT 40 -#define STR_DBASE_HEADERTEXT 41 -#define STR_MSACCESS_HEADERTEXT 42 -#define STR_TEXT_HEADERTEXT 43 +#define STR_FINAL_HELPTEXT 38 +#define STR_ADABAS_HELPTEXT 39 +#define STR_ORACLE_HELPTEXT 40 +#define STR_DBASE_HEADERTEXT 41 +#define STR_MSACCESS_HEADERTEXT 42 +#define STR_TEXT_HEADERTEXT 43 // FREE -#define STR_ADO_HEADERTEXT 45 -#define STR_JDBC_HEADERTEXT 46 -#define STR_ODBC_HEADERTEXT 47 +#define STR_ADO_HEADERTEXT 45 +#define STR_JDBC_HEADERTEXT 46 +#define STR_ODBC_HEADERTEXT 47 #define STR_MYSQLJDBC_HEADERTEXT 48 // FREE -#define STR_SPREADSHEET_HEADERTEXT 50 -#define STR_FINAL_HEADERTEXT 52 -#define STR_ADABAS_HEADERTEXT 53 -#define STR_ORACLE_HEADERTEXT 54 +#define STR_SPREADSHEET_HEADERTEXT 50 +#define STR_FINAL_HEADERTEXT 52 +#define STR_ADABAS_HEADERTEXT 53 +#define STR_ORACLE_HEADERTEXT 54 #define STR_GENERAL_HEADERTEXT 55 #define STR_DBWIZARDTITLE 56 -#define STR_DEFAULTLDAPPORTNUMBER 60 +#define STR_DEFAULTLDAPPORTNUMBER 60 -#define STR_ADABASNAME 61 -#define STR_ODBCDATASOURCENAME 63 -#define STR_SPREADSHEETPATH 64 -#define STR_DBLOCATIONLABEL 65 -#define STR_ADMIN_HELPTEXT 66 +#define STR_ADABASNAME 61 +#define STR_ODBCDATASOURCENAME 63 +#define STR_SPREADSHEETPATH 64 +#define STR_DBLOCATIONLABEL 65 +#define STR_ADMIN_HELPTEXT 66 #define STR_ORACLE_DEFAULT 67 -#define STR_PAGETITLE_INTROPAGE 69 +#define STR_PAGETITLE_INTROPAGE 69 #define STR_PAGETITLE_DBASE 70 #define STR_PAGETITLE_TEXT 71 #define STR_PAGETITLE_MSACCESS 72 @@ -100,15 +100,15 @@ #define FT_PORTNUMBERDEFAULT 1 -#define FT_LDAP_HELPTEXT 2 -#define FT_MYSQL_HELPTEXT 3 -#define FT_MYSQL_HEADERTEXT 4 -#define FT_MYSQLCONNECTIONMODE 5 -#define FT_BROWSEURL 6 -#define FT_AUTHENTIFICATIONHELPTEXT 7 +#define FT_LDAP_HELPTEXT 2 +#define FT_MYSQL_HELPTEXT 3 +#define FT_MYSQL_HEADERTEXT 4 +#define FT_MYSQLCONNECTIONMODE 5 +#define FT_BROWSEURL 6 +#define FT_AUTHENTIFICATIONHELPTEXT 7 #define FT_AUTHENTIFICATIONHEADERTEXT 8 -#define FT_LDAP_HEADERTEXT 9 -#define FT_GENERALUSERNAME 10 +#define FT_LDAP_HEADERTEXT 9 +#define FT_GENERALUSERNAME 10 #define FT_FINALHEADER 11 #define FT_FINALTEXT 12 #define FT_FINALHELPTEXT 13 @@ -116,19 +116,19 @@ #define FT_SETUP_WIZARD_HEADER 15 #define FT_SETUP_WIZARD_HELP 16 -#define ET_GENERALUSERNAME 1 +#define ET_GENERALUSERNAME 1 -#define PB_TESTCONNECTION 1 +#define PB_TESTCONNECTION 1 -#define RB_CONNECTVIAODBC 1 -#define RB_CONNECTVIAJDBC 2 +#define RB_CONNECTVIAODBC 1 +#define RB_CONNECTVIAJDBC 2 #define RB_REGISTERDATASOURCE 3 #define RB_DONTREGISTERDATASOURCE 4 #define RB_CONNECTVIANATIVE 5 #define CB_WIZ_USESSL 1 -#define CB_STARTTABLEWIZARD 2 -#define CB_OPENAFTERWARDS 3 +#define CB_STARTTABLEWIZARD 2 +#define CB_OPENAFTERWARDS 3 #define CB_SPREADSHEETPASSWORDREQUIRED 4 #define CB_GENERALPASSWORDREQUIRED 5 diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index 7b0dbe011342..00fa1b3cd3e5 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,12 +34,12 @@ #endif -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define EDIT_X 101 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define EDIT_X 101 // ----------------------------------------------------------------------------- @@ -214,7 +214,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; Hide = TRUE ; - FixedText FT_AUTHENTIFICATIONHEADERTEXT + FixedText FT_AUTHENTIFICATIONHEADERTEXT { Pos = MAP_APPFONT ( START_X , 8 ) ; Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ; @@ -387,7 +387,7 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE Text[ en-US ] = "Set up connection to a MySQL database" ; WordBreak = TRUE; }; - + FixedText FT_SETUP_WIZARD_HELP { Pos = MAP_APPFONT ( START_X , INIT_Y ) ; @@ -492,9 +492,9 @@ TabPage PAGE_DBWIZARD_LDAP Text[ en-US ] = "Please enter the required information to connect to an LDAP directory.\nPlease contact your system administrator if you are unsure about the following settings." ; WordBreak = TRUE ; }; - AUTO_HOSTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER) - AUTO_BASEDNCONTROLGROUP(INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + EDIT_HEIGHT + RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_BASEDN) - AUTO_PORTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 2 * EDIT_HEIGHT + 2 * RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER) + AUTO_HOSTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER) + AUTO_BASEDNCONTROLGROUP(INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + EDIT_HEIGHT + RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_BASEDN) + AUTO_PORTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 2 * EDIT_HEIGHT + 2 * RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER) String STR_LDAP_DEFAULT{ Text[ en-US ] = "Default: 389" ; @@ -503,7 +503,7 @@ TabPage PAGE_DBWIZARD_LDAP CheckBox CB_WIZ_USESSL { HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ; - Pos = MAP_APPFONT (START_X , INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 3 * EDIT_HEIGHT + 4 * RELATED_CONTROLS ) ; + Pos = MAP_APPFONT (START_X , INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 3 * EDIT_HEIGHT + 4 * RELATED_CONTROLS ) ; Size = MAP_APPFONT ( 212 , 8 ) ; Text[ en-US ] = "Use ~secure connection (SSL)" ; }; diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 809ccddc27eb..23aff6374ead 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,16 +61,16 @@ DBG_NAME(ODbaseIndexDialog) //------------------------------------------------------------------------- ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName ) : ModalDialog( pParent, ModuleRes(DLG_DBASE_INDEXES) ), - aPB_OK( this, ModuleRes( PB_OK ) ), - aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ), - aPB_HELP( this, ModuleRes( PB_HELP ) ), - m_FT_Tables( this, ModuleRes( FT_TABLES ) ), - aCB_Tables( this, ModuleRes( CB_TABLES ) ), + aPB_OK( this, ModuleRes( PB_OK ) ), + aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ), + aPB_HELP( this, ModuleRes( PB_HELP ) ), + m_FT_Tables( this, ModuleRes( FT_TABLES ) ), + aCB_Tables( this, ModuleRes( CB_TABLES ) ), m_FL_Indexes( this, ModuleRes( FL_INDEXES ) ), - m_FT_TableIndexes( this, ModuleRes( FT_TABLEINDEXES ) ), - aLB_TableIndexes( this, ModuleRes( LB_TABLEINDEXES ) ), - m_FT_AllIndexes( this, ModuleRes( FT_ALLINDEXES ) ), - aLB_FreeIndexes( this, ModuleRes( LB_FREEINDEXES ) ), + m_FT_TableIndexes( this, ModuleRes( FT_TABLEINDEXES ) ), + aLB_TableIndexes( this, ModuleRes( LB_TABLEINDEXES ) ), + m_FT_AllIndexes( this, ModuleRes( FT_ALLINDEXES ) ), + aLB_FreeIndexes( this, ModuleRes( LB_FREEINDEXES ) ), aIB_Add( this, ModuleRes( IB_ADD ) ), aIB_Remove( this, ModuleRes( IB_REMOVE ) ), aIB_AddAll( this, ModuleRes( IB_ADDALL ) ), @@ -96,10 +96,10 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName ) FreeResource(); // set Hi contrast bitmaps - aIB_Add.SetModeImage( ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST); - aIB_AddAll.SetModeImage( ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST); - aIB_Remove.SetModeImage( ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST); - aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST); + aIB_Add.SetModeImage( ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST); + aIB_AddAll.SetModeImage( ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST); + aIB_Remove.SetModeImage( ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST); + aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST); } //------------------------------------------------------------------------- @@ -112,7 +112,7 @@ ODbaseIndexDialog::~ODbaseIndexDialog() //------------------------------------------------------------------------- sal_Bool ODbaseIndexDialog::GetTable(const String& _rName, TableInfoListIterator& _rPosition) { - for ( _rPosition = m_aTableInfoList.begin(); + for ( _rPosition = m_aTableInfoList.begin(); _rPosition != m_aTableInfoList.end(); ++_rPosition ) @@ -149,7 +149,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const String& _rName, TableIndexL sal_Int32 nPos = 0; TableIndexListIterator aSearch; - for ( aSearch = _rList.begin(); + for ( aSearch = _rList.begin(); aSearch != _rList.end(); ++aSearch, ++nPos ) @@ -212,7 +212,7 @@ IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ ) { // let all tables write their INF file - for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); + for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); aLoop != m_aTableInfoList.end(); ++aLoop ) @@ -291,7 +291,7 @@ IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox ) // fill the listbox for the indexes aLB_TableIndexes.Clear(); - for ( ConstTableIndexListIterator aLoop = aTablePos->aIndexList.begin(); + for ( ConstTableIndexListIterator aLoop = aTablePos->aIndexList.begin(); aLoop != aTablePos->aIndexList.end(); ++aLoop ) @@ -335,7 +335,7 @@ void ODbaseIndexDialog::Init() aURL.SetSmartURL(m_aDSN); - // String aFileName = aURL.PathToFileName(); + // String aFileName = aURL.PathToFileName(); m_aDSN = aURL.GetMainURL(INetURLObject::NO_DECODE); ::ucbhelper::Content aFile; sal_Bool bFolder=sal_True; @@ -413,7 +413,7 @@ void ODbaseIndexDialog::Init() } } - for ( ::std::vector< String >::const_iterator aUsedIndex = aUsedIndexes.begin(); + for ( ::std::vector< String >::const_iterator aUsedIndex = aUsedIndexes.begin(); aUsedIndex != aUsedIndexes.end(); ++aUsedIndex ) @@ -436,7 +436,7 @@ void ODbaseIndexDialog::Init() void ODbaseIndexDialog::SetCtrls() { // ComboBox Tabellen - for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); + for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); aLoop != m_aTableInfoList.end(); ++aLoop ) @@ -449,7 +449,7 @@ void ODbaseIndexDialog::SetCtrls() aCB_Tables.SetText( rTabInfo.aTableName ); // ListBox der Tabellenindizes aufbauen - for ( ConstTableIndexListIterator aIndex = rTabInfo.aIndexList.begin(); + for ( ConstTableIndexListIterator aIndex = rTabInfo.aIndexList.begin(); aIndex != rTabInfo.aIndexList.end(); ++aIndex ) @@ -461,7 +461,7 @@ void ODbaseIndexDialog::SetCtrls() } // ListBox freie Indizes - for ( ConstTableIndexListIterator aFree = m_aFreeIndexList.begin(); + for ( ConstTableIndexListIterator aFree = m_aFreeIndexList.begin(); aFree != m_aFreeIndexList.end(); ++aFree ) @@ -522,13 +522,13 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const // Jetzt alle gespeicherten Indizes hinzufuegen sal_uInt16 nPos = 0; - for ( ConstTableIndexListIterator aIndex = aIndexList.begin(); + for ( ConstTableIndexListIterator aIndex = aIndexList.begin(); aIndex != aIndexList.end(); ++aIndex, ++nPos ) { aKeyName = "NDX"; - if( nPos > 0 ) // Erster Index erhaelt keine Ziffer + if( nPos > 0 ) // Erster Index erhaelt keine Ziffer aKeyName += ByteString::CreateFromInt32( nPos ); aInfFile.WriteKey( aKeyName, ByteString(aIndex->GetIndexFileName(), gsl_getSystemTextEncoding()) ); } @@ -555,7 +555,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbfindex.hrc b/dbaccess/source/ui/dlg/dbfindex.hrc index 0d67da065568..988cedbe2a3b 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hrc +++ b/dbaccess/source/ui/dlg/dbfindex.hrc @@ -1,20 +1,20 @@ #ifndef _DBAUI_DBF_INDEXES_HRC_ #define _DBAUI_DBF_INDEXES_HRC_ -#define CB_TABLES 1 +#define CB_TABLES 1 -#define FT_TABLES 1 -#define FT_TABLEINDEXES 2 -#define FT_ALLINDEXES 3 +#define FT_TABLES 1 +#define FT_TABLEINDEXES 2 +#define FT_ALLINDEXES 3 #define FL_INDEXES 1 -#define LB_TABLEINDEXES 1 -#define LB_FREEINDEXES 2 +#define LB_TABLEINDEXES 1 +#define LB_FREEINDEXES 2 -#define PB_OK 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define PB_OK 1 +#define PB_CANCEL 1 +#define PB_HELP 1 #define IB_ADD 1 #define IB_REMOVE 2 diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 59b1f0f66f1e..58318800591d 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public: }; //------------------------------------------------------------------------- -typedef ::std::list< OTableIndex > TableIndexList; +typedef ::std::list< OTableIndex > TableIndexList; DECLARE_STL_ITERATORS(TableIndexList); //========================================================================= @@ -87,7 +87,7 @@ public: }; //------------------------------------------------------------------------- -typedef ::std::list< OTableInfo > TableInfoList; +typedef ::std::list< OTableInfo > TableInfoList; DECLARE_STL_ITERATORS(TableInfoList); ////////////////////////////////////////////////////////////////////////// @@ -95,20 +95,20 @@ DECLARE_STL_ITERATORS(TableInfoList); class ODbaseIndexDialog : public ModalDialog { protected: - OKButton aPB_OK; - CancelButton aPB_CANCEL; - HelpButton aPB_HELP; + OKButton aPB_OK; + CancelButton aPB_CANCEL; + HelpButton aPB_HELP; - FixedText m_FT_Tables; - ComboBox aCB_Tables; + FixedText m_FT_Tables; + ComboBox aCB_Tables; FixedLine m_FL_Indexes; - FixedText m_FT_TableIndexes; - ListBox aLB_TableIndexes; + FixedText m_FT_TableIndexes; + ListBox aLB_TableIndexes; - FixedText m_FT_AllIndexes; - ListBox aLB_FreeIndexes; + FixedText m_FT_AllIndexes; + ListBox aLB_FreeIndexes; ImageButton aIB_Add; ImageButton aIB_Remove; @@ -123,22 +123,22 @@ protected: DECL_LINK( OKClickHdl, PushButton* ); DECL_LINK( OnListEntrySelected, ListBox* ); - String m_aDSN; - TableInfoList m_aTableInfoList; - TableIndexList m_aFreeIndexList; - BOOL m_bCaseSensitiv; + String m_aDSN; + TableInfoList m_aTableInfoList; + TableIndexList m_aFreeIndexList; + BOOL m_bCaseSensitiv; - void Init(); - void SetCtrls(); - sal_Bool GetTable(const String& rName, TableInfoListIterator& _rPosition); + void Init(); + void SetCtrls(); + sal_Bool GetTable(const String& rName, TableInfoListIterator& _rPosition); - OTableIndex implRemoveIndex(const String& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist); - void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay); + OTableIndex implRemoveIndex(const String& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist); + void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay); - OTableIndex RemoveFreeIndex( const String& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, aLB_FreeIndexes, _bMustExist); } - void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, aLB_FreeIndexes); } - OTableIndex RemoveTableIndex( const String& _rTableName, const String& _rIndexName, sal_Bool _bMustExist ); - void InsertTableIndex( const String& _rTableName, const OTableIndex& _rIndex ); + OTableIndex RemoveFreeIndex( const String& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, aLB_FreeIndexes, _bMustExist); } + void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, aLB_FreeIndexes); } + OTableIndex RemoveTableIndex( const String& _rTableName, const String& _rIndexName, sal_Bool _bMustExist ); + void InsertTableIndex( const String& _rTableName, const OTableIndex& _rIndex ); void checkButtons(); @@ -148,7 +148,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DBFINDEX_HXX_ diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src index ad401102601d..8f6ef6e49697 100644 --- a/dbaccess/source/ui/dlg/dbfindex.src +++ b/dbaccess/source/ui/dlg/dbfindex.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -170,7 +170,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94 , 60 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -189,7 +189,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94 , 77 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -208,7 +208,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94 , 98 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -227,7 +227,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94, 114 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index cac6a8499601..1355a6556cab 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,14 +62,14 @@ using namespace com::sun::star::util; using namespace com::sun::star::beans; using namespace com::sun::star::container; -#define START_PAGE 0 -#define CONNECTION_PAGE 1 -#define ADDITIONAL_PAGE_DBASE 2 +#define START_PAGE 0 +#define CONNECTION_PAGE 1 +#define ADDITIONAL_PAGE_DBASE 2 #define ADDITIONAL_PAGE_FLAT 3 #define ADDITIONAL_PAGE_LDAP 4 #define ADDITIONAL_PAGE_ADABAS 5 #define ADDITIONAL_PAGE_MYSQL_JDBC 6 -#define ADDITIONAL_PAGE_MYSQL_ODBC 7 +#define ADDITIONAL_PAGE_MYSQL_ODBC 7 #define ADDITIONAL_PAGE_ORACLE_JDBC 8 #define ADDITIONAL_PAGE_ADO 9 #define ADDITIONAL_PAGE_ODBC 10 @@ -93,7 +93,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent ,m_bApplied(sal_False) ,m_bUIEnabled( sal_True ) { - DBG_CTOR(ODbTypeWizDialog,NULL); + DBG_CTOR(ODbTypeWizDialog,NULL); m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); @@ -125,8 +125,8 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent //------------------------------------------------------------------------- ODbTypeWizDialog::~ODbTypeWizDialog() { - DBG_DTOR(ODbTypeWizDialog,NULL); - delete m_pOutSet; + DBG_DTOR(ODbTypeWizDialog,NULL); + delete m_pOutSet; } //------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage) @@ -245,7 +245,7 @@ Reference< XDriver > ODbTypeWizDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const +::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -316,7 +316,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) // register ourself as modified listener if ( pPage ) - { + { static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory(m_pImpl->getORB()); static_cast<OGenericAdministrationPage*>(pPage)->SetAdminDialog(this,this); // open our own resource block, as the page titles are strings local to this block @@ -380,7 +380,7 @@ sal_Bool ODbTypeWizDialog::onFinish() return m_pImpl->saveChanges(*m_pOutSet) ? OWizardMachine::onFinish() : sal_False; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index aea15cf0fb8a..56bd08565ac4 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,8 +120,8 @@ using namespace ::com::sun::star::document; using namespace ::comphelper; using namespace ::cppu; -#define START_PAGE 0 -#define CONNECTION_PAGE 1 +#define START_PAGE 0 +#define CONNECTION_PAGE 1 OFinalDBPageSetup* pFinalPage; @@ -181,7 +181,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ); m_pImpl->translateProperties(xDatasource, *m_pOutSet); -// eType = m_pImpl->getDatasourceType(*m_pOutSet); +// eType = m_pImpl->getDatasourceType(*m_pOutSet); SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT)); ShowButtonFixedLine(sal_True); @@ -430,7 +430,7 @@ void ODbTypeWizDialogSetup::resetPages(const Reference< XPropertySet >& _rxDatas // are set. Select another data source of the same type, where the indirect props are not set (yet). Then, // the indirect property values of the first ds are shown in the second ds ...) const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties(); - for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); + for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); aIndirect != rMap.end(); ++aIndirect ) @@ -490,7 +490,7 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const +::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const { ::rtl::OUString sRet = m_pImpl->getDatasourceType(_rSet); if (m_pMySQLIntroPage != NULL && m_pMySQLIntroPage->IsVisible() ) @@ -576,11 +576,11 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) pPage = OConnectionTabPageSetup::CreateAdabasTabPage( this, *m_pOutSet); break; - case PAGE_DBSETUPWIZARD_LDAP : + case PAGE_DBSETUPWIZARD_LDAP : pPage = OLDAPConnectionPageSetup::CreateLDAPTabPage(this,*m_pOutSet); break; - case PAGE_DBSETUPWIZARD_SPREADSHEET: /// first user defined driver + case PAGE_DBSETUPWIZARD_SPREADSHEET: /// first user defined driver pPage = OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage(this,*m_pOutSet); break; @@ -1135,7 +1135,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index fb3a27decc66..6e53e81d0c77 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ namespace dbaui m_pCharset->SetSelectHdl(getControlModifiedLink()); } - Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine, + Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine, m_pAutoIncrementLabel, m_pAutoIncrement, m_pAutoRetrievingLabel, m_pAutoRetrieving }; @@ -231,10 +231,10 @@ namespace dbaui //------------------------------------------------------------------------ ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS)) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aFT_Message (this, ModuleRes( FT_SPECIAL_MESSAGE) ) - ,m_aIndexes (this, ModuleRes(PB_INDICIES)) + ,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_aFT_Message (this, ModuleRes( FT_SPECIAL_MESSAGE) ) + ,m_aIndexes (this, ModuleRes(PB_INDICIES)) { DBG_CTOR(ODbaseDetailsPage,NULL); @@ -255,7 +255,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new ODbaseDetailsPage( pParent, _rAttrSet ) ); } @@ -346,7 +346,7 @@ namespace dbaui DBG_DTOR(OAdoDetailsPage,NULL); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAdoDetailsPage( pParent, _rAttrSet ) ); } @@ -357,8 +357,8 @@ namespace dbaui //======================================================================== OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS,false) - ,m_aFL_1 (this, ModuleRes(FL_SEPARATOR1)) - ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) + ,m_aFL_1 (this, ModuleRes(FL_SEPARATOR1)) + ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) { m_aUseCatalog.SetToggleHdl(getControlModifiedLink()); FreeResource(); @@ -373,7 +373,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OOdbcDetailsPage( pParent, _rAttrSet ) ); } @@ -417,18 +417,18 @@ namespace dbaui OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_USERDRIVER, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS ,false) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) + ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) + ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) + ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) { m_aUseCatalog.SetToggleHdl(getControlModifiedLink()); FreeResource(); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) ); } @@ -492,7 +492,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OMySQLODBCDetailsPage( pParent, _rAttrSet ) ); } @@ -502,16 +502,16 @@ namespace dbaui //======================================================================== OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId) :OCommonBehaviourTabPage(pParent, _nResId, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aFTSocket (this, ModuleRes(FT_SOCKET)) - ,m_aEDSocket (this, ModuleRes(ET_SOCKET)) - ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS)) - ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS)) - ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) + ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) + ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aFTSocket (this, ModuleRes(FT_SOCKET)) + ,m_aEDSocket (this, ModuleRes(ET_SOCKET)) + ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS)) + ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS)) + ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS)) ,m_nPortId(_nPortId) ,m_bUseClass(true) { @@ -538,7 +538,7 @@ namespace dbaui m_aFTSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); m_aEDSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); - + m_aEDHostname.SetModifyHdl(getControlModifiedLink()); m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); m_aEDSocket.SetModifyHdl(getControlModifiedLink()); @@ -750,18 +750,18 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_MYSQL_JDBC, _rAttrSet,DSID_MYSQL_PORTNUMBER ) ); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new MySQLNativePage( pParent, _rAttrSet ) ); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_ORACLE_JDBC, _rAttrSet,DSID_ORACLE_PORTNUMBER) ); } @@ -772,35 +772,35 @@ namespace dbaui //======================================================================== OAdabasDetailsPage::OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_ADABAS, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_FT_CACHE_SIZE( this, ModuleRes( FT_CACHE_SIZE ) ) - ,m_NF_CACHE_SIZE( this, ModuleRes( NF_CACHE_SIZE ) ) - ,m_FT_DATA_INCREMENT( this, ModuleRes( FT_DATA_INCREMENT ) ) - ,m_NF_DATA_INCREMENT( this, ModuleRes( NF_DATA_INCREMENT ) ) - ,m_aFL_2( this, ModuleRes( FL_SEPARATOR2 ) ) - ,m_FT_CTRLUSERNAME( this, ModuleRes( FT_CTRLUSERNAME ) ) - ,m_ET_CTRLUSERNAME( this, ModuleRes( ET_CTRLUSERNAME ) ) - ,m_FT_CTRLPASSWORD( this, ModuleRes( FT_CTRLPASSWORD ) ) - ,m_ET_CTRLPASSWORD( this, ModuleRes( ET_CTRLPASSWORD ) ) - ,m_CB_SHUTDB( this, ModuleRes( CB_SHUTDB ) ) - ,m_PB_STAT( this, ModuleRes( PB_STAT ) ) + ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) + ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_FT_CACHE_SIZE( this, ModuleRes( FT_CACHE_SIZE ) ) + ,m_NF_CACHE_SIZE( this, ModuleRes( NF_CACHE_SIZE ) ) + ,m_FT_DATA_INCREMENT( this, ModuleRes( FT_DATA_INCREMENT ) ) + ,m_NF_DATA_INCREMENT( this, ModuleRes( NF_DATA_INCREMENT ) ) + ,m_aFL_2( this, ModuleRes( FL_SEPARATOR2 ) ) + ,m_FT_CTRLUSERNAME( this, ModuleRes( FT_CTRLUSERNAME ) ) + ,m_ET_CTRLUSERNAME( this, ModuleRes( ET_CTRLUSERNAME ) ) + ,m_FT_CTRLPASSWORD( this, ModuleRes( FT_CTRLPASSWORD ) ) + ,m_ET_CTRLPASSWORD( this, ModuleRes( ET_CTRLPASSWORD ) ) + ,m_CB_SHUTDB( this, ModuleRes( CB_SHUTDB ) ) + ,m_PB_STAT( this, ModuleRes( PB_STAT ) ) { m_aEDHostname.SetModifyHdl(getControlModifiedLink()); FreeResource(); - m_PB_STAT.SetClickHdl( LINK(this,OAdabasDetailsPage,PBClickHdl)); + m_PB_STAT.SetClickHdl( LINK(this,OAdabasDetailsPage,PBClickHdl)); - m_CB_SHUTDB.SetClickHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_NF_DATA_INCREMENT.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLUSERNAME.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLPASSWORD.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_CB_SHUTDB.SetClickHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_NF_DATA_INCREMENT.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_ET_CTRLUSERNAME.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_ET_CTRLPASSWORD.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLUSERNAME.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); - m_ET_CTRLPASSWORD.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); + m_ET_CTRLUSERNAME.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); + m_ET_CTRLPASSWORD.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); m_NF_DATA_INCREMENT.SetMin(20); m_NF_DATA_INCREMENT.SetMax(LONG_MAX); @@ -826,7 +826,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateAdabas( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateAdabas( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAdabasDetailsPage( pParent, _rAttrSet ) ); } @@ -941,14 +941,14 @@ namespace dbaui //======================================================================== OLDAPDetailsPage::OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_LDAP, _rCoreAttrs,0,false) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aBaseDN (this, ModuleRes(FT_BASEDN)) - ,m_aETBaseDN (this, ModuleRes(ET_BASEDN)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_aBaseDN (this, ModuleRes(FT_BASEDN)) + ,m_aETBaseDN (this, ModuleRes(ET_BASEDN)) ,m_aCBUseSSL (this, ModuleRes(CB_USESSL)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aFTRowCount (this, ModuleRes(FT_LDAPROWCOUNT)) - ,m_aNFRowCount (this, ModuleRes(NF_LDAPROWCOUNT)) + ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aFTRowCount (this, ModuleRes(FT_LDAPROWCOUNT)) + ,m_aNFRowCount (this, ModuleRes(NF_LDAPROWCOUNT)) { m_aETBaseDN.SetModifyHdl(getControlModifiedLink()); m_aCBUseSSL.SetToggleHdl(getControlModifiedLink()); @@ -963,7 +963,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPDetailsPage( pParent, _rAttrSet ) ); } @@ -1065,7 +1065,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OTextDetailsPage( pParent, _rAttrSet ) ); } @@ -1109,20 +1109,20 @@ namespace dbaui } //------------------------------------------------------------------------ - SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ) { return new GeneratedValuesPage( _pParent, _rAttrSet ); } //------------------------------------------------------------------------ - SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) { ::rtl::OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( _rAttrSet ); DataSourceMetaData aMetaData( eType ); - return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData ); + return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData ); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 2d304430e865..f2a4cfbc5542 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ namespace dbaui //========================================================================= //= OCommonBehaviourTabPage //========================================================================= - #define CBTP_NONE 0x00000000 - #define CBTP_USE_CHARSET 0x00000002 - #define CBTP_USE_OPTIONS 0x00000004 + #define CBTP_NONE 0x00000000 + #define CBTP_USE_CHARSET 0x00000002 + #define CBTP_USE_OPTIONS 0x00000004 /** eases the implementation of tab pages handling user/password and/or character set and/or generic options input @@ -64,33 +64,33 @@ namespace dbaui { protected: - FixedText* m_pOptionsLabel; - Edit* m_pOptions; + FixedText* m_pOptionsLabel; + Edit* m_pOptions; - FixedLine* m_pDataConvertFixedLine; - FixedText* m_pCharsetLabel; + FixedLine* m_pDataConvertFixedLine; + FixedText* m_pCharsetLabel; CharSetListBox* m_pCharset; - FixedLine* m_pAutoFixedLine; - CheckBox* m_pAutoRetrievingEnabled; - FixedText* m_pAutoIncrementLabel; - Edit* m_pAutoIncrement; - FixedText* m_pAutoRetrievingLabel; - Edit* m_pAutoRetrieving; + FixedLine* m_pAutoFixedLine; + CheckBox* m_pAutoRetrievingEnabled; + FixedText* m_pAutoIncrementLabel; + Edit* m_pAutoIncrement; + FixedText* m_pAutoRetrievingLabel; + Edit* m_pAutoRetrieving; - sal_uInt32 m_nControlFlags; + sal_uInt32 m_nControlFlags; public: - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); OCommonBehaviourTabPage(Window* pParent, USHORT nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true); protected: - + // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten virtual ~OCommonBehaviourTabPage(); // must be overloaded by subclasses, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); // <method>OGenericAdministrationPage::fillControls</method> virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -105,20 +105,20 @@ namespace dbaui class ODbaseDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs); private: // please add new controls also to <method>fillControls</method> or <method>fillWindows</method> - CheckBox m_aShowDeleted; - FixedLine m_aFL_1; - FixedText m_aFT_Message; - PushButton m_aIndexes; + CheckBox m_aShowDeleted; + FixedLine m_aFL_1; + FixedText m_aFT_Message; + PushButton m_aIndexes; - String m_sDsn; + String m_sDsn; protected: - + virtual ~ODbaseDetailsPage(); protected: @@ -148,7 +148,7 @@ namespace dbaui class OOdbcDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -156,8 +156,8 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedLine m_aFL_1; - CheckBox m_aUseCatalog; + FixedLine m_aFL_1; + CheckBox m_aUseCatalog; }; @@ -167,7 +167,7 @@ namespace dbaui class OUserDriverDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -175,11 +175,11 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - CheckBox m_aUseCatalog; + FixedText m_aFTHostname; + Edit m_aEDHostname; + FixedText m_aPortNumber; + NumericField m_aNFPortNumber; + CheckBox m_aUseCatalog; }; //======================================================================== @@ -199,35 +199,35 @@ namespace dbaui public: OGeneralSpecialJDBCDetailsPage( Window* pParent , USHORT _nResId - , const SfxItemSet& _rCoreAttrs + , const SfxItemSet& _rCoreAttrs , USHORT _nPortId ); protected: + - - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); - - FixedLine m_aFL_1; - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTSocket; - Edit m_aEDSocket; - - FixedText m_aFTDriverClass; - Edit m_aEDDriverClass; - PushButton m_aTestJavaDriver; - - String m_sDefaultJdbcDriverName; - USHORT m_nPortId; + + FixedLine m_aFL_1; + FixedText m_aFTHostname; + Edit m_aEDHostname; + FixedText m_aPortNumber; + NumericField m_aNFPortNumber; + FixedText m_aFTSocket; + Edit m_aEDSocket; + + FixedText m_aFTDriverClass; + Edit m_aEDDriverClass; + PushButton m_aTestJavaDriver; + + String m_sDefaultJdbcDriverName; + USHORT m_nPortId; bool m_bUseClass; }; @@ -241,16 +241,16 @@ namespace dbaui const SfxItemSet& _rCoreAttrs ); private: - FixedLine m_aSeparator1; + FixedLine m_aSeparator1; MySQLNativeSettings m_aMySQLSettings; - FixedLine m_aSeparator2; - FixedText m_aUserNameLabel; - Edit m_aUserName; - CheckBox m_aPasswordRequired; + FixedLine m_aSeparator2; + FixedText m_aUserNameLabel; + Edit m_aUserName; + CheckBox m_aPasswordRequired; protected: - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -262,7 +262,7 @@ namespace dbaui class OAdabasDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -271,30 +271,30 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedLine m_aFL_1; - FixedText m_FT_CACHE_SIZE; - NumericField m_NF_CACHE_SIZE; - - FixedText m_FT_DATA_INCREMENT; - NumericField m_NF_DATA_INCREMENT; - - FixedLine m_aFL_2; - FixedText m_FT_CTRLUSERNAME; - Edit m_ET_CTRLUSERNAME; - FixedText m_FT_CTRLPASSWORD; - Edit m_ET_CTRLPASSWORD; - - CheckBox m_CB_SHUTDB; - PushButton m_PB_STAT; - String m_sUser; - BOOL bAttrsChanged; - - DECL_LINK( AttributesChangedHdl, void * ); - DECL_LINK( UserSettingsHdl, void * ); - DECL_LINK( LoseFocusHdl, Edit * ); - DECL_LINK( PBClickHdl, Button *); + FixedText m_aFTHostname; + Edit m_aEDHostname; + FixedLine m_aFL_1; + FixedText m_FT_CACHE_SIZE; + NumericField m_NF_CACHE_SIZE; + + FixedText m_FT_DATA_INCREMENT; + NumericField m_NF_DATA_INCREMENT; + + FixedLine m_aFL_2; + FixedText m_FT_CTRLUSERNAME; + Edit m_ET_CTRLUSERNAME; + FixedText m_FT_CTRLPASSWORD; + Edit m_ET_CTRLPASSWORD; + + CheckBox m_CB_SHUTDB; + PushButton m_PB_STAT; + String m_sUser; + BOOL bAttrsChanged; + + DECL_LINK( AttributesChangedHdl, void * ); + DECL_LINK( UserSettingsHdl, void * ); + DECL_LINK( LoseFocusHdl, Edit * ); + DECL_LINK( PBClickHdl, Button *); }; //======================================================================== @@ -303,7 +303,7 @@ namespace dbaui class OLDAPDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -311,17 +311,17 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedLine m_aFL_1; - FixedText m_aBaseDN; - Edit m_aETBaseDN; - CheckBox m_aCBUseSSL; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTRowCount; - NumericField m_aNFRowCount; - - sal_Int32 m_iSSLPort; - sal_Int32 m_iNormalPort; + FixedLine m_aFL_1; + FixedText m_aBaseDN; + Edit m_aETBaseDN; + CheckBox m_aCBUseSSL; + FixedText m_aPortNumber; + NumericField m_aNFPortNumber; + FixedText m_aFTRowCount; + NumericField m_aNFRowCount; + + sal_Int32 m_iSSLPort; + sal_Int32 m_iNormalPort; DECL_LINK( OnCheckBoxClick, CheckBox * ); }; @@ -343,16 +343,16 @@ namespace dbaui class OTextDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: - String m_aFieldSeparatorList; - String m_aTextSeparatorList; - String m_aTextNone; + String m_aFieldSeparatorList; + String m_aTextSeparatorList; + String m_aTextNone; protected: virtual ~OTextDetailsPage(); virtual sal_Bool prepareLeave(); @@ -365,7 +365,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index d964da262c30..90390d488c16 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace dbaui LargeEntryListBox( Window* _pParent, const ResId& _rId ); protected: - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); }; //-------------------------------------------------------------------- @@ -83,17 +83,17 @@ DBG_NAME(DirectSQLDialog) //-------------------------------------------------------------------- DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference< XConnection >& _rxConn ) :ModalDialog(_pParent, ModuleRes(DLG_DIRECTSQL)) - ,m_aFrame (this, ModuleRes(FL_SQL)) - ,m_aSQLLabel (this, ModuleRes(FT_SQL)) - ,m_aSQL (this, ModuleRes(ME_SQL)) - ,m_aExecute (this, ModuleRes(PB_EXECUTE)) - ,m_aHistoryLabel (this, ModuleRes(FT_HISTORY)) + ,m_aFrame (this, ModuleRes(FL_SQL)) + ,m_aSQLLabel (this, ModuleRes(FT_SQL)) + ,m_aSQL (this, ModuleRes(ME_SQL)) + ,m_aExecute (this, ModuleRes(PB_EXECUTE)) + ,m_aHistoryLabel (this, ModuleRes(FT_HISTORY)) ,m_pSQLHistory(new LargeEntryListBox(this, ModuleRes(LB_HISTORY))) - ,m_aStatusFrame (this, ModuleRes(FL_STATUS)) - ,m_aStatus (this, ModuleRes(ME_STATUS)) - ,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS)) - ,m_aHelp (this, ModuleRes(PB_HELP)) - ,m_aClose (this, ModuleRes(PB_CLOSE)) + ,m_aStatusFrame (this, ModuleRes(FL_STATUS)) + ,m_aStatus (this, ModuleRes(ME_STATUS)) + ,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS)) + ,m_aHelp (this, ModuleRes(PB_HELP)) + ,m_aClose (this, ModuleRes(PB_CLOSE)) ,m_nHistoryLimit(20) ,m_nStatusCount(1) ,m_xConnection(_rxConn) @@ -127,7 +127,7 @@ DBG_NAME(DirectSQLDialog) stopAllComponentListening(); } delete m_pSQLHistory; - + DBG_DTOR(DirectSQLDialog,NULL); } @@ -345,7 +345,7 @@ DBG_NAME(DirectSQLDialog) } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/directsql.hrc b/dbaccess/source/ui/dlg/directsql.hrc index 23f19a350ab4..ee09db68e896 100644 --- a/dbaccess/source/ui/dlg/directsql.hrc +++ b/dbaccess/source/ui/dlg/directsql.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,16 +28,16 @@ #ifndef _DBACCESS_UI_DIRECTSQL_HRC_ #define _DBACCESS_UI_DIRECTSQL_HRC_ -#define FL_SQL 1 -#define FT_SQL 2 -#define ME_SQL 3 -#define PB_EXECUTE 4 -#define FT_HISTORY 5 -#define LB_HISTORY 6 -#define FL_STATUS 7 -#define ME_STATUS 8 -#define FL_BUTTONS 9 -#define PB_HELP 10 -#define PB_CLOSE 11 +#define FL_SQL 1 +#define FT_SQL 2 +#define ME_SQL 3 +#define PB_EXECUTE 4 +#define FT_HISTORY 5 +#define LB_HISTORY 6 +#define FL_STATUS 7 +#define ME_STATUS 8 +#define FL_BUTTONS 9 +#define PB_HELP 10 +#define PB_CLOSE 11 #endif // _DBACCESS_UI_DIRECTSQL_HRC_ diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src index 230fe4dac320..1fa897b80da6 100644 --- a/dbaccess/source/ui/dlg/directsql.src +++ b/dbaccess/source/ui/dlg/directsql.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,19 +32,19 @@ #include "dbu_dlg.hrc" #endif -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 -#define WINDOW_SIZE_X 200 -#define WINDOW_SIZE_Y 210 + BUTTON_SIZE_Y + BUTTON_SIZE_Y +#define WINDOW_SIZE_X 200 +#define WINDOW_SIZE_Y 210 + BUTTON_SIZE_Y + BUTTON_SIZE_Y ModalDialog DLG_DIRECTSQL { - OutputSize = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + OutputSize = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; FixedLine FL_SQL { @@ -119,7 +119,7 @@ ModalDialog DLG_DIRECTSQL Text [ en-US ] = "Close"; }; - Text [ en-US ] = "Execute SQL Statement" ; + Text [ en-US ] = "Execute SQL Statement" ; }; String STR_COMMAND_EXECUTED_SUCCESSFULLY diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index 20537fce089d..6e5d8a9b6a7f 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) case RID_SVXPAGE_CHAR_STD: { - // ((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem()); + // ((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem()); } break; diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src index 8dce0835aa69..6c793ac524e1 100644 --- a/dbaccess/source/ui/dlg/dlgattr.src +++ b/dbaccess/source/ui/dlg/dlgattr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index d9466a39663e..67719b64d8d0 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,34 +62,34 @@ namespace dbaui class OSaveAsDlgImpl { public: - FixedText m_aDescription; - FixedText m_aCatalogLbl; - OSQLNameComboBox m_aCatalog; - FixedText m_aSchemaLbl; - OSQLNameComboBox m_aSchema; - FixedText m_aLabel; - OSQLNameEdit m_aTitle; - OKButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_HELP; - String m_aQryLabel; - String m_sTblLabel; + FixedText m_aDescription; + FixedText m_aCatalogLbl; + OSQLNameComboBox m_aCatalog; + FixedText m_aSchemaLbl; + OSQLNameComboBox m_aSchema; + FixedText m_aLabel; + OSQLNameEdit m_aTitle; + OKButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_HELP; + String m_aQryLabel; + String m_sTblLabel; rtl::OUString m_sCatalog; - rtl::OUString m_sSchema; - String m_aName; + rtl::OUString m_sSchema; + String m_aName; const IObjectNameCheck& m_rObjectNameCheck; - String m_sParentURL; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; - sal_Int32 m_nType; - sal_Int32 m_nFlags; + String m_sParentURL; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + sal_Int32 m_nType; + sal_Int32 m_nFlags; - OSaveAsDlgImpl( Window * pParent,const sal_Int32& _rType, + OSaveAsDlgImpl( Window * pParent,const sal_Int32& _rType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); - OSaveAsDlgImpl( Window * pParent, + OSaveAsDlgImpl( Window * pParent, const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); @@ -264,15 +264,15 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_pImpl->m_xMetaData, m_pImpl->m_aName, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); USHORT nPos = m_pImpl->m_aCatalog.GetEntryPos(String(sCatalog)); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) m_pImpl->m_aCatalog.SelectEntryPos(nPos); - + if ( sSchema.getLength() ) { nPos = m_pImpl->m_aSchema.GetEntryPos(String(sSchema)); @@ -300,7 +300,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, m_pImpl->m_aTitle.setCheck(bCheck); // enable non valid sql chars as well m_pImpl->m_aSchema.setCheck(bCheck); // enable non valid sql chars as well m_pImpl->m_aCatalog.setCheck(bCheck); // enable non valid sql chars as well - + Size aSize = GetSizePixel(); aSize.Height() = aPos.Y() + m_pImpl->m_aPB_OK.GetSizePixel().Height() + m_pImpl->m_aTitle.GetSizePixel().Height() / 2; @@ -326,7 +326,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, { m_pImpl = new OSaveAsDlgImpl(this,rDefault,_rObjectNameCheck,_nFlags); implInitOnlyTitle(_sLabel); - implInit(); + implInit(); } // ----------------------------------------------------------------------------- OSaveAsDlg::~OSaveAsDlg() @@ -408,7 +408,7 @@ void OSaveAsDlg::implInit() sal_Int32 nMoveUp = m_pImpl->m_aCatalog.GetPosPixel().Y() - m_pImpl->m_aDescription.GetPosPixel().Y(); // loop to all controls and move them ... - for ( Window* pChildControl = GetWindow( WINDOW_FIRSTCHILD ); + for ( Window* pChildControl = GetWindow( WINDOW_FIRSTCHILD ); pChildControl; pChildControl= pChildControl->GetWindow( WINDOW_NEXT ) ) @@ -434,15 +434,15 @@ void OSaveAsDlg::implInit() SetText( String( ModuleRes( STR_TITLE_RENAME ) ) ); m_pImpl->m_aTitle.SetHelpId(HID_DLG_RENAME); } - + m_pImpl->m_aPB_OK.SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl)); m_pImpl->m_aTitle.SetModifyHdl(LINK(this,OSaveAsDlg,EditModifyHdl)); m_pImpl->m_aTitle.GrabFocus(); FreeResource(); } // ----------------------------------------------------------------------------- -String OSaveAsDlg::getName() const { return m_pImpl->m_aName; } -String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); } -String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); } +String OSaveAsDlg::getName() const { return m_pImpl->m_aName; } +String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); } +String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgsave.hrc b/dbaccess/source/ui/dlg/dlgsave.hrc index 7a36319ef4de..7778745d9991 100644 --- a/dbaccess/source/ui/dlg/dlgsave.hrc +++ b/dbaccess/source/ui/dlg/dlgsave.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,24 +30,24 @@ // defines ------------------------------------------------------------------ -#define PB_OK 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define PB_OK 1 +#define PB_CANCEL 1 +#define PB_HELP 1 -#define ET_CATALOG 1 -#define ET_SCHEMA 2 -#define ET_TITLE 3 +#define ET_CATALOG 1 +#define ET_SCHEMA 2 +#define ET_TITLE 3 -#define FT_DESCRIPTION 1 -#define FT_CATALOG 2 -#define FT_SCHEMA 3 -#define FT_TITLE 4 +#define FT_DESCRIPTION 1 +#define FT_CATALOG 2 +#define FT_SCHEMA 3 +#define FT_TITLE 4 -#define STR_TBL_LABEL 1 -#define STR_VW_LABEL 2 -#define STR_QRY_LABEL 3 -#define STR_TITLE_RENAME 4 -#define STR_TITLE_PASTE_AS 6 +#define STR_TBL_LABEL 1 +#define STR_VW_LABEL 2 +#define STR_QRY_LABEL 3 +#define STR_TITLE_RENAME 4 +#define STR_TITLE_PASTE_AS 6 #endif // DBAUI_DLGSAVE_HRC diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src index d550704b85f8..a6c036ec2831 100644 --- a/dbaccess/source/ui/dlg/dlgsave.src +++ b/dbaccess/source/ui/dlg/dlgsave.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,9 +64,9 @@ ModalDialog DLG_SAVE_AS Border = TRUE ; Pos = MAP_APPFONT ( 77 , 25 ) ; Size = MAP_APPFONT ( 89 , 12 ) ; - SVLook = TRUE ; - TabStop = TRUE ; - DropDown = TRUE ; + SVLook = TRUE ; + TabStop = TRUE ; + DropDown = TRUE ; AutoHScroll = TRUE ; }; FixedText FT_SCHEMA @@ -80,9 +80,9 @@ ModalDialog DLG_SAVE_AS Border = TRUE ; Pos = MAP_APPFONT ( 77 , 42 ) ; Size = MAP_APPFONT ( 89 , 12 ) ; - SVLook = TRUE ; - TabStop = TRUE ; - DropDown = TRUE ; + SVLook = TRUE ; + TabStop = TRUE ; + DropDown = TRUE ; AutoHScroll = TRUE ; }; FixedText FT_TITLE diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index a42122657c23..f70bdac69bb8 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAl :ModalDialog( pParent, ModuleRes(bRow ? DLG_ROWHEIGHT : DLG_COLWIDTH)) ,m_nPrevValue(nVal) ,m_nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH) - ,aFT_VALUE(this, ModuleRes( FT_VALUE)) - ,aMF_VALUE(this, ModuleRes( MF_VALUE)) + ,aFT_VALUE(this, ModuleRes( FT_VALUE)) + ,aMF_VALUE(this, ModuleRes( MF_VALUE)) ,aCB_STANDARD(this, ModuleRes(CB_STANDARD)) - ,aPB_OK(this, ModuleRes(PB_OK)) - ,aPB_CANCEL(this, ModuleRes(PB_CANCEL)) - ,aPB_HELP(this, ModuleRes(PB_HELP)) + ,aPB_OK(this, ModuleRes(PB_OK)) + ,aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,aPB_HELP(this, ModuleRes(PB_HELP)) { DBG_CTOR(DlgSize,NULL); @@ -117,7 +117,7 @@ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton ) } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/dlgsize.hrc b/dbaccess/source/ui/dlg/dlgsize.hrc index 3eef0951a0dd..2a83edf70e04 100644 --- a/dbaccess/source/ui/dlg/dlgsize.hrc +++ b/dbaccess/source/ui/dlg/dlgsize.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,12 +28,12 @@ #ifndef DBAUI_DLGSIZE_HRC #define DBAUI_DLGSIZE_HRC -#define FT_VALUE 1 -#define MF_VALUE 1 -#define CB_STANDARD 2 -#define PB_OK 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define FT_VALUE 1 +#define MF_VALUE 1 +#define CB_STANDARD 2 +#define PB_OK 1 +#define PB_CANCEL 1 +#define PB_HELP 1 #endif //DBAUI_DLGSIZE_HRC diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src index ade6f3ff1222..b690e7e50afd 100644 --- a/dbaccess/source/ui/dlg/dlgsize.src +++ b/dbaccess/source/ui/dlg/dlgsize.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,10 +29,10 @@ // (c) Copyright 1996 - 2000 by Star Division GmbH, Hamburg, Germany // // Ersterstellung: - // JN + // JN // // Letzte Aenderung: - // $Author: rt $ $Date: 2008-04-10 14:52:17 $ $Revision: 1.32 $ + // $Author: rt $ $Date: 2008-04-10 14:52:17 $ $Revision: 1.32 $ // //--------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index a3b542a1d4f6..eb9aa07d791e 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,20 +50,20 @@ namespace dbaui */ class DbuTypeCollectionItem : public SfxPoolItem { - ::dbaccess::ODsnTypeCollection* m_pCollection; + ::dbaccess::ODsnTypeCollection* m_pCollection; public: TYPEINFO(); DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; + virtual int operator==(const SfxPoolItem& _rItem) const; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; - ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } + ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DSNITEM_HXX_ diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index dc7e5426c1d8..f0dfb02a6be3 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,19 +66,19 @@ using namespace ::comphelper; //================================================================== ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet) :ModalDialog(_pParent, ModuleRes(DLG_DATASOURCE_SELECTION)) - ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) - ,m_aDatasource (this, ModuleRes(LB_DATASOURCE)) - ,m_aOk (this, ModuleRes(PB_OK)) - ,m_aCancel (this, ModuleRes(PB_CANCEL)) - ,m_aHelp (this, ModuleRes(PB_HELP)) + ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) + ,m_aDatasource (this, ModuleRes(LB_DATASOURCE)) + ,m_aOk (this, ModuleRes(PB_OK)) + ,m_aCancel (this, ModuleRes(PB_CANCEL)) + ,m_aHelp (this, ModuleRes(PB_HELP)) #ifdef HAVE_ODBC_ADMINISTRATION - ,m_aManageDatasources (this, ModuleRes(PB_MANAGE)) + ,m_aManageDatasources (this, ModuleRes(PB_MANAGE)) #endif - ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE)) + ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE)) ,m_pOutputSet(_pOutputSet) { if ( _bAdabas ) - { // set a new title (indicating that we're browsing local data sources only) + { // set a new title (indicating that we're browsing local data sources only) SetText(ModuleRes(STR_LOCAL_DATASOURCES)); m_aDescription.SetText(ModuleRes(STR_DESCRIPTION2)); @@ -156,7 +156,7 @@ IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, /*pButton*/ ) xORB->createInstanceWithArguments(SERVICE_SDB_ADABASCREATIONDIALOG, aArgs), UNO_QUERY); if (!xDialog.is()) { - // ShowServiceNotAvailableError(this, String(SERVICE_SDB_ADABASCREATIONDIALOG), sal_True); + // ShowServiceNotAvailableError(this, String(SERVICE_SDB_ADABASCREATIONDIALOG), sal_True); return 0L; } @@ -249,13 +249,13 @@ IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ ) #endif // ----------------------------------------------------------------------------- void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) -{ +{ ::rtl::OUString sSelected; if (m_aDatasource.GetEntryCount()) sSelected = m_aDatasource.GetSelectEntry(); m_aDatasource.Clear(); // fill the list - for ( ConstStringBagIterator aDS = _rDatasources.begin(); + for ( ConstStringBagIterator aDS = _rDatasources.begin(); aDS != _rDatasources.end(); ++aDS ) @@ -267,13 +267,13 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) { if (sSelected.getLength()) m_aDatasource.SelectEntry(sSelected); - else // select the first entry + else // select the first entry m_aDatasource.SelectEntryPos(0); } } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dsselect.hrc b/dbaccess/source/ui/dlg/dsselect.hrc index 5deffeeef102..47aed265ec26 100644 --- a/dbaccess/source/ui/dlg/dsselect.hrc +++ b/dbaccess/source/ui/dlg/dsselect.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,14 +28,14 @@ #ifndef _DBAUI_DSSELECT_HRC_ #define _DBAUI_DSSELECT_HRC_ -#define LB_DATASOURCE 1 -#define PB_OK 2 -#define PB_CANCEL 3 -#define PB_HELP 4 -#define PB_MANAGE 5 -#define FT_DESCRIPTION 6 -#define STR_LOCAL_DATASOURCES 7 -#define PB_CREATE 9 -#define STR_DESCRIPTION2 10 +#define LB_DATASOURCE 1 +#define PB_OK 2 +#define PB_CANCEL 3 +#define PB_HELP 4 +#define PB_MANAGE 5 +#define FT_DESCRIPTION 6 +#define STR_LOCAL_DATASOURCES 7 +#define PB_CREATE 9 +#define STR_DESCRIPTION2 10 #endif // _DBAUI_DSSELECT_HRC_ diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 555464635b84..2ab0f86db71c 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,16 +54,16 @@ namespace dbaui class ODatasourceSelectDialog : public ModalDialog { protected: - FixedText m_aDescription; - ListBox m_aDatasource; - OKButton m_aOk; - CancelButton m_aCancel; - HelpButton m_aHelp; + FixedText m_aDescription; + ListBox m_aDatasource; + OKButton m_aOk; + CancelButton m_aCancel; + HelpButton m_aHelp; #ifdef HAVE_ODBC_ADMINISTRATION - PushButton m_aManageDatasources; + PushButton m_aManageDatasources; #endif - PushButton m_aCreateAdabasDB; - SfxItemSet* m_pOutputSet; + PushButton m_aCreateAdabasDB; + SfxItemSet* m_pOutputSet; #ifdef HAVE_ODBC_ADMINISTRATION ::std::auto_ptr< OOdbcManagement > m_pODBCManagement; @@ -73,10 +73,10 @@ public: ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet = NULL ); ~ODatasourceSelectDialog(); - inline String GetSelected() const { return m_aDatasource.GetSelectEntry();} - void Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); } + inline String GetSelected() const { return m_aDatasource.GetSelectEntry();} + void Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); } - virtual BOOL Close(); + virtual BOOL Close(); protected: DECL_LINK( ListDblClickHdl, ListBox * ); @@ -89,7 +89,7 @@ protected: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DSSELECT_HXX_ diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src index 8eff7fffe6c4..4539754e808b 100644 --- a/dbaccess/source/ui/dlg/dsselect.src +++ b/dbaccess/source/ui/dlg/dsselect.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ ModalDialog DLG_DATASOURCE_SELECTION HScroll = TRUE ; Sort = TRUE ; }; - + OKButton PB_OK { Pos = MAP_APPFONT ( 166 , 6 ) ; diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx index aee6876e8ebc..cdb919578cd7 100644 --- a/dbaccess/source/ui/dlg/finteraction.cxx +++ b/dbaccess/source/ui/dlg/finteraction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace dbaui } //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index bbc837e0b074..4015f2fdcb62 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ namespace dbaui //==================================================================== //= OFilePickerInteractionHandler //==================================================================== - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler - > OFilePickerInteractionHandler_Base; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler + > OFilePickerInteractionHandler_Base; /** a InteractionHandler implementation which extends another handler with some customizability */ @@ -49,13 +49,13 @@ namespace dbaui { protected: ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > - m_xMaster; // our master handler - sal_Bool m_bDoesNotExist; + m_xMaster; // our master handler + sal_Bool m_bDoesNotExist; public: OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster ); - inline sal_Bool isDoesNotExist( ) const { return m_bDoesNotExist; } + inline sal_Bool isDoesNotExist( ) const { return m_bDoesNotExist; } protected: // XInteractionHandler @@ -65,7 +65,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBAUI_FILEPICKER_INTERACTION_HXX diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 1103a375b636..9c4038dbf89f 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,14 +77,14 @@ namespace dbaui ,m_aFT_DocListLabel (this, ModuleRes(FT_DOCLISTLABEL)) ,m_pLB_DocumentList ( new OpenDocumentListBox( this, "com.sun.star.sdb.OfficeDatabaseDocument", ModuleRes( LB_DOCUMENTLIST ) ) ) ,m_aPB_OpenDocument (this, "com.sun.star.sdb.OfficeDatabaseDocument", ModuleRes(PB_OPENDOCUMENT)) - ,m_aTypePreLabel (this, ModuleRes(FT_DATASOURCETYPE_PRE)) - ,m_aDatasourceTypeLabel (this, ModuleRes(FT_DATATYPE)) - ,m_pDatasourceType ( new ListBox(this, ModuleRes(LB_DATATYPE))) + ,m_aTypePreLabel (this, ModuleRes(FT_DATASOURCETYPE_PRE)) + ,m_aDatasourceTypeLabel (this, ModuleRes(FT_DATATYPE)) + ,m_pDatasourceType ( new ListBox(this, ModuleRes(LB_DATATYPE))) ,m_aFTDataSourceAppendix (this, ModuleRes(FT_DATATYPEAPPENDIX)) - ,m_aTypePostLabel (this, ModuleRes(FT_DATASOURCETYPE_POST)) - ,m_aSpecialMessage (this, ModuleRes(FT_SPECIAL_MESSAGE)) + ,m_aTypePostLabel (this, ModuleRes(FT_DATASOURCETYPE_POST)) + ,m_aSpecialMessage (this, ModuleRes(FT_SPECIAL_MESSAGE)) ,m_DBWizardMode (_bDBWizardMode) - ,m_sMySQLEntry (ModuleRes(STR_MYSQLENTRY)) + ,m_sMySQLEntry (ModuleRes(STR_MYSQLENTRY)) ,m_eOriginalCreationMode (eCreateNew) ,m_pCollection (NULL) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN) @@ -190,16 +190,16 @@ namespace dbaui DisplayedTypes aDisplayedTypes; ::dbaccess::ODsnTypeCollection::TypeIterator aEnd = m_pCollection->end(); - for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop = m_pCollection->begin(); + for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop = m_pCollection->begin(); aTypeLoop != aEnd; ++aTypeLoop ) { const ::rtl::OUString sURLPrefix = aTypeLoop.getURLPrefix(); if ( sURLPrefix.getLength() ) - { + { String sDisplayName = aTypeLoop.getDisplayName(); - if ( m_pDatasourceType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND + if ( m_pDatasourceType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND && approveDataSourceType( sURLPrefix, sDisplayName ) ) { aDisplayedTypes.push_back( DisplayedTypes::value_type( sURLPrefix, sDisplayName ) ); @@ -383,9 +383,9 @@ namespace dbaui if ( approveDataSourceType( m_eCurrentSelection, sDisplayName ) && ( LISTBOX_ENTRY_NOTFOUND == m_pDatasourceType->GetEntryPos( sDisplayName ) ) ) - { // this indicates it's really a type which is known in general, but not supported on the current platform + { // this indicates it's really a type which is known in general, but not supported on the current platform // show a message saying so - // eSpecialMessage = smUnsupportedType; + // eSpecialMessage = smUnsupportedType; insertDatasourceTypeEntryData(m_eCurrentSelection, sDisplayName); // remember this type so we can show the special message again if the user selects this // type again (without changing the data source) @@ -479,7 +479,7 @@ namespace dbaui } //------------------------------------------------------------------------- - SfxTabPage* OGeneralPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet, sal_Bool _bWizardMode) + SfxTabPage* OGeneralPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet, sal_Bool _bWizardMode) { return ( new OGeneralPage( _pParent, _rAttrSet, _bWizardMode ) ); } @@ -607,7 +607,7 @@ namespace dbaui const SfxFilter* pFilter = getStandardDatabaseFilter(); if ( pFilter ) { -// aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); +// aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); aFileDlg.SetCurrentFilter(pFilter->GetUIName()); } if ( aFileDlg.Execute() == ERRCODE_NONE ) @@ -632,7 +632,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index ad28e2dc0692..d67aabc96c5c 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,15 +76,15 @@ namespace dbaui ::std::auto_ptr< OpenDocumentListBox > m_pLB_DocumentList; OpenDocumentButton m_aPB_OpenDocument; - FixedText m_aTypePreLabel; - FixedText m_aDatasourceTypeLabel; + FixedText m_aTypePreLabel; + FixedText m_aDatasourceTypeLabel; ::std::auto_ptr< ListBox > m_pDatasourceType; FixedText m_aFTDataSourceAppendix; - FixedText m_aTypePostLabel; - FixedText m_aSpecialMessage; + FixedText m_aTypePostLabel; + FixedText m_aSpecialMessage; sal_Bool m_DBWizardMode; - String m_sMySQLEntry; + String m_sMySQLEntry; CreationMode m_eOriginalCreationMode; DocumentDescriptor m_aBrowsedDocument; @@ -93,47 +93,47 @@ namespace dbaui ::std::vector< ::rtl::OUString> m_aURLPrefixes; - ::dbaccess::ODsnTypeCollection* - m_pCollection; /// the DSN type collection instance - ::rtl::OUString m_eCurrentSelection; /// currently selected type - ::dbaccess::DATASOURCE_TYPE m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered .... + ::dbaccess::ODsnTypeCollection* + m_pCollection; /// the DSN type collection instance + ::rtl::OUString m_eCurrentSelection; /// currently selected type + ::dbaccess::DATASOURCE_TYPE m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered .... enum SPECIAL_MESSAGE { smNone, smUnsupportedType }; - SPECIAL_MESSAGE m_eLastMessage; + SPECIAL_MESSAGE m_eLastMessage; - Link m_aTypeSelectHandler; /// to be called if a new type is selected - Link m_aCreationModeHandler; /// to be called if a new type is selected - Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected + Link m_aTypeSelectHandler; /// to be called if a new type is selected + Link m_aCreationModeHandler; /// to be called if a new type is selected + Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected Link m_aChooseDocumentHandler; /// to be called when a recent document has been definately chosen - sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted - sal_Bool m_bUserGrabFocus : 1; - bool m_bInitTypeList : 1; + sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted + sal_Bool m_bUserGrabFocus : 1; + bool m_bInitTypeList : 1; bool approveDataSourceType( const ::rtl::OUString& _sURLPrefix, String& _inout_rDisplayName ); - void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName); + void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName); public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& _rAttrSet, sal_Bool _bDBWizardMode = sal_False); + static SfxTabPage* Create(Window* pParent, const SfxItemSet& _rAttrSet, sal_Bool _bDBWizardMode = sal_False); /// set a handler which gets called every time the user selects a new type - void SetTypeSelectHandler(const Link& _rHandler) { m_aTypeSelectHandler = _rHandler; } - void SetCreationModeHandler(const Link& _rHandler) { m_aCreationModeHandler = _rHandler; } - void SetDocumentSelectionHandler( const Link& _rHandler) { m_aDocumentSelectionHandler = _rHandler; } - void SetChooseDocumentHandler( const Link& _rHandler) { m_aChooseDocumentHandler = _rHandler; } + void SetTypeSelectHandler(const Link& _rHandler) { m_aTypeSelectHandler = _rHandler; } + void SetCreationModeHandler(const Link& _rHandler) { m_aCreationModeHandler = _rHandler; } + void SetDocumentSelectionHandler( const Link& _rHandler) { m_aDocumentSelectionHandler = _rHandler; } + void SetChooseDocumentHandler( const Link& _rHandler) { m_aChooseDocumentHandler = _rHandler; } CreationMode GetDatabaseCreationMode() const; DocumentDescriptor GetSelectedDocument() const; /// get the currently selected datasource type - ::rtl::OUString GetSelectedType() const { return m_eCurrentSelection; } + ::rtl::OUString GetSelectedType() const { return m_eCurrentSelection; } protected: // SfxTabPage overridables - virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); - virtual void Reset(const SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); + virtual void Reset(const SfxItemSet& _rCoreAttrs); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); @@ -163,7 +163,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_GENERALPAGE_HXX_ diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 780fe621157f..756d5c1183b3 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,8 +59,8 @@ namespace dbaui //------------------------------------------------------------------ sal_Bool operator ==(const OIndexField& _rLHS, const OIndexField& _rRHS) { - return (_rLHS.sFieldName == _rRHS.sFieldName) - && (_rLHS.bSortAscending == _rRHS.bSortAscending); + return (_rLHS.sFieldName == _rRHS.sFieldName) + && (_rLHS.bSortAscending == _rRHS.bSortAscending); } //------------------------------------------------------------------ @@ -78,7 +78,7 @@ namespace dbaui ConstIndexFieldsIterator aLeft = _rLHS.begin(); ConstIndexFieldsIterator aLeftEnd = _rLHS.end(); ConstIndexFieldsIterator aRight = _rRHS.begin(); - for (; aLeft != aLeftEnd; ++aLeft, ++aRight) + for (; aLeft != aLeftEnd; ++aLeft, ++aRight) { if (*aLeft != *aRight) return sal_False; @@ -116,9 +116,9 @@ namespace dbaui ::rtl::OUString sNewName(_rNewText); ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters()); if ( ( xMeta->supportsMixedCaseQuotedIdentifiers() ) - ? - sAlias != sNewName - : + ? + sAlias != sNewName + : !sNewName.equalsIgnoreAsciiCase(sAlias)) return sal_False; } @@ -180,23 +180,23 @@ namespace dbaui //================================================================== DBG_NAME(DbaIndexDialog) //------------------------------------------------------------------ - DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames, - const Reference< XNameAccess >& _rxIndexes, + DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames, + const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, const Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _nMaxColumnsInIndex) :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN)) ,m_xConnection(_rxConnection) ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString::createFromAscii("dbaccess.tabledesign.indexdialog")) - ,m_aActions (this, ModuleRes(TLB_ACTIONS)) - ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) - ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) - ,m_aDescriptionLabel (this, ModuleRes(FT_DESC_LABEL)) - ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) - ,m_aUnique (this, ModuleRes(CB_UNIQUE)) - ,m_aFieldsLabel (this, ModuleRes(FT_FIELDS)) - ,m_pFields(new IndexFieldsControl (this, ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" ))) - ,m_aClose (this, ModuleRes(PB_CLOSE)) - ,m_aHelp (this, ModuleRes(HB_HELP)) + ,m_aActions (this, ModuleRes(TLB_ACTIONS)) + ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) + ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) + ,m_aDescriptionLabel (this, ModuleRes(FT_DESC_LABEL)) + ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) + ,m_aUnique (this, ModuleRes(CB_UNIQUE)) + ,m_aFieldsLabel (this, ModuleRes(FT_FIELDS)) + ,m_pFields(new IndexFieldsControl (this, ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" ))) + ,m_aClose (this, ModuleRes(PB_CLOSE)) + ,m_aHelp (this, ModuleRes(HB_HELP)) ,m_pIndexes(NULL) ,m_pPreviousSelection(NULL) ,m_bEditAgain(sal_False) @@ -240,17 +240,17 @@ DBG_NAME(DbaIndexDialog) m_aClose.SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog)); // get our most recent geometry settings -// if (m_aGeometrySettings.Exists()) -// { -// Point aPos; -// m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y()); -// SetPosPixel(aPos); -// } +// if (m_aGeometrySettings.Exists()) +// { +// Point aPos; +// m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y()); +// SetPosPixel(aPos); +// } // if all of the indexes have an empty description, we're not interested in displaying it Indexes::const_iterator aCheck; - for ( aCheck = m_pIndexes->begin(); + for ( aCheck = m_pIndexes->begin(); aCheck != m_pIndexes->end(); ++aCheck ) @@ -294,7 +294,7 @@ DBG_NAME(DbaIndexDialog) SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); sal_Bool bSelectedAnything = NULL != pSelected; - + if (pSelected) { @@ -344,9 +344,9 @@ DBG_NAME(DbaIndexDialog) delete m_pFields; // save our geometry settings -// Point aPos = GetPosPixel(); -// m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y()); - +// Point aPos = GetPosPixel(); +// m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y()); + DBG_DTOR(DbaIndexDialog,NULL); } @@ -552,7 +552,7 @@ DBG_NAME(DbaIndexDialog) OnDropIndex(sal_False); return; } - + SQLExceptionInfo aExceptionInfo; try { @@ -619,7 +619,7 @@ DBG_NAME(DbaIndexDialog) { // the descriptor Indexes::const_iterator aSelected = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData()); - + if (aSelected->isModified() || aSelected->isNew()) { QueryBox aQuestion(this, ModuleRes(QUERY_SAVE_CURRENT_INDEX)); @@ -656,7 +656,7 @@ DBG_NAME(DbaIndexDialog) IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvLBoxEntry*, _pEntry ) { Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); - + DBG_ASSERT(aPosition >= m_pIndexes->begin() && aPosition < m_pIndexes->end(), "DbaIndexDialog::OnEntryEdited: invalid entry!"); @@ -739,7 +739,7 @@ DBG_NAME(DbaIndexDialog) // no double fields DECLARE_STL_STDKEY_SET( String, StringBag ); StringBag aExistentFields; - for ( ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin(); + for ( ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin(); aFieldCheck != _rPos->aFields.end(); ++aFieldCheck ) @@ -830,7 +830,7 @@ DBG_NAME(DbaIndexDialog) // commit the old data if (m_aIndexes.FirstSelected() != m_pPreviousSelection) - { // (this call may happen in case somebody ended an in-place edit with 'return', so we need to check this before committing) + { // (this call may happen in case somebody ended an in-place edit with 'return', so we need to check this before committing) if (!implCommitPreviouslySelected()) { m_aIndexes.SelectNoHandlerCall(m_pPreviousSelection); @@ -871,7 +871,7 @@ DBG_NAME(DbaIndexDialog) { // The physical toolbar changed its outlook and shows another logical toolbar! // We have to set the correct high contrast mode on the new tbx manager. - // pMgr->SetHiContrast( IsHiContrastMode() ); + // pMgr->SetHiContrast( IsHiContrastMode() ); checkImageList(); } } @@ -880,9 +880,9 @@ DBG_NAME(DbaIndexDialog) { ModalDialog::DataChanged( rDCEvt ); - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode checkImageList(); @@ -893,7 +893,7 @@ DBG_NAME(DbaIndexDialog) { sal_Int16 nN = IMG_INDEX_DLG_SC; sal_Int16 nH = IMG_INDEX_DLG_SCH; - if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) + if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) { nN = IMG_INDEX_DLG_LC; nH = IMG_INDEX_DLG_LCH; @@ -910,7 +910,7 @@ DBG_NAME(DbaIndexDialog) Size aDlgSize = GetSizePixel(); // adjust size of dlg SetSizePixel(Size(aDlgSize.Width() + _rDiff.Width(), - aDlgSize.Height() + _rDiff.Height()) + aDlgSize.Height() + _rDiff.Height()) ); Size aIndexSize = m_aIndexes.GetSizePixel(); m_aIndexes.SetPosSizePixel(m_aIndexes.GetPosPixel() + Point(0,_rDiff.Height()), @@ -934,7 +934,7 @@ DBG_NAME(DbaIndexDialog) } //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexdialog.hrc b/dbaccess/source/ui/dlg/indexdialog.hrc index 825e96de2edc..003bcf6a0903 100644 --- a/dbaccess/source/ui/dlg/indexdialog.hrc +++ b/dbaccess/source/ui/dlg/indexdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,21 +29,21 @@ #define _DBAUI_INDEXDIALOG_HRC_ -#define CTR_INDEXLIST 1 -#define CTR_FIELDS 2 +#define CTR_INDEXLIST 1 +#define CTR_FIELDS 2 -#define FL_INDEXDETAILS 1 +#define FL_INDEXDETAILS 1 -#define CB_UNIQUE 1 +#define CB_UNIQUE 1 -#define FT_FIELDS 1 -#define FT_DESC_LABEL 2 -#define FT_DESCRIPTION 3 +#define FT_FIELDS 1 +#define FT_DESC_LABEL 2 +#define FT_DESCRIPTION 3 -#define TLB_ACTIONS 1 +#define TLB_ACTIONS 1 -#define PB_CLOSE 1 +#define PB_CLOSE 1 -#define HB_HELP 1 +#define HB_HELP 1 #endif // _DBAUI_INDEXDIALOG_HRC_ diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src index ae8f80d6c616..ead770c40482 100644 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ b/dbaccess/source/ui/dlg/indexdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ #include "dbaccess_helpid.hrc" #endif -#define DIALOG_SIZE_X 220 -#define DIALOG_SIZE_Y 140 -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define DIALOG_SIZE_X 220 +#define DIALOG_SIZE_Y 140 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 -#define LIST_WIDTH 70 +#define LIST_WIDTH 70 ModalDialog DLG_INDEXDESIGN { @@ -57,7 +57,7 @@ ModalDialog DLG_INDEXDESIGN ToolBox TLB_ACTIONS { Pos = MAP_APPFONT ( 6 , 6 ) ; - // Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ; + // Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ; ButtonType = BUTTON_SYMBOL; Align = BOXALIGN_TOP; HelpId = HID_INDEX_DIALOG_ACTION_TB; diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index a617abd6baa6..e4b78625718f 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,11 +39,11 @@ namespace dbaui { //...................................................................... -#define BROWSER_STANDARD_FLAGS BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | \ +#define BROWSER_STANDARD_FLAGS BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | \ BROWSER_HIDECURSOR | BROWSER_HIDESELECT | BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL -#define COLUMN_ID_FIELDNAME 1 -#define COLUMN_ID_ORDER 2 +#define COLUMN_ID_FIELDNAME 1 +#define COLUMN_ID_ORDER 2 using namespace ::com::sun::star::uno; using namespace ::svt; @@ -54,8 +54,8 @@ namespace dbaui class DbaMouseDownListBoxController : public ListBoxCellController { protected: - Link m_aOriginalModifyHdl; - Link m_aAdditionalModifyHdl; + Link m_aOriginalModifyHdl; + Link m_aAdditionalModifyHdl; public: DbaMouseDownListBoxController(ListBoxControl* _pParent) @@ -131,7 +131,7 @@ DBG_NAME(IndexFieldsControl) { delete m_pSortingCell; delete m_pFieldNameCell; - + DBG_DTOR(IndexFieldsControl,NULL); } @@ -198,7 +198,7 @@ DBG_NAME(IndexFieldsControl) // insert rows for the the fields RowInserted(GetRowCount(), m_aFields.size(), sal_False); // insert an additional row for a new field for that index -// if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex ) +// if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex ) RowInserted(GetRowCount(), 1, sal_False); SetUpdateMode(sal_True); @@ -282,7 +282,7 @@ DBG_NAME(IndexFieldsControl) // for the field name cell m_pFieldNameCell = new ListBoxControl(&GetDataWindow()); m_pFieldNameCell->InsertEntry(String()); - m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); + m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); const ::rtl::OUString* pFields = _rAvailableFields.getConstArray(); const ::rtl::OUString* pFieldsEnd = pFields + _rAvailableFields.getLength(); for (;pFields < pFieldsEnd; ++pFields) @@ -363,7 +363,7 @@ DBG_NAME(IndexFieldsControl) { sal_Int32 nRow = GetCurRow(); OSL_ENSURE(nRow < (sal_Int32)m_aFields.size(), "IndexFieldsControl::SaveModified: invalid current row!"); - if (nRow >= 0) // may be -1 in case the control was empty + if (nRow >= 0) // may be -1 in case the control was empty { // remove the field from the selection IndexFieldsIterator aPos = m_aFields.begin() + nRow; @@ -436,9 +436,9 @@ DBG_NAME(IndexFieldsControl) m_aModifyHdl.Call(this); if (_pBox == m_pFieldNameCell) - { // a field has been selected + { // a field has been selected if (GetCurRow() >= GetRowCount() - 2) - { // and we're in one of the last two rows + { // and we're in one of the last two rows String sSelectedEntry = m_pFieldNameCell->GetSelectEntry(); sal_Int32 nCurrentRow = GetCurRow(); sal_Int32 rowCount = GetRowCount(); @@ -446,14 +446,14 @@ DBG_NAME(IndexFieldsControl) OSL_ENSURE(((sal_Int32)(m_aFields.size() + 1)) == rowCount, "IndexFieldsControl::OnListEntrySelected: inconsistence!"); if (sSelectedEntry.Len() && (nCurrentRow == rowCount - 1) /*&& (!m_nMaxColumnsInIndex || rowCount < m_nMaxColumnsInIndex )*/ ) - { // in the last row, an non-empty string has been selected + { // in the last row, an non-empty string has been selected // -> insert a new row m_aFields.push_back(OIndexField()); RowInserted(GetRowCount(), 1); Invalidate(GetRowRectPixel(nCurrentRow)); } else if (!sSelectedEntry.Len() && (nCurrentRow == rowCount - 2)) - { // in the (last-1)th row, an empty entry has been selected + { // in the (last-1)th row, an empty entry has been selected // -> remove the last row m_aFields.erase(m_aFields.end() - 1); RowRemoved(GetRowCount() - 1, 1); @@ -504,7 +504,7 @@ DBG_NAME(IndexFieldsControl) //------------------------------------------------------------------ //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 1f27f2408f17..488be71caad1 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,22 +42,22 @@ #ifdef HAVE_ODBC_SUPPORT #if defined(WIN) || defined(OS2) -#define ODBC_LIBRARY "ODBC.DLL" -#define ODBC_UI_LIBRARY "ODBCINST.DLL" +#define ODBC_LIBRARY "ODBC.DLL" +#define ODBC_UI_LIBRARY "ODBCINST.DLL" #endif #if defined WNT -#define ODBC_LIBRARY "ODBC32.DLL" -#define ODBC_UI_LIBRARY "ODBCCP32.DLL" +#define ODBC_LIBRARY "ODBC32.DLL" +#define ODBC_UI_LIBRARY "ODBCCP32.DLL" #endif #ifdef UNX #ifdef MACOSX -#define ODBC_LIBRARY "libiodbc.dylib" -#define ODBC_UI_LIBRARY "libiodbcinst.dylib" +#define ODBC_LIBRARY "libiodbc.dylib" +#define ODBC_UI_LIBRARY "libiodbcinst.dylib" #else -#define ODBC_LIBRARY_1 "libodbc.so.1" -#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1" -#define ODBC_LIBRARY "libodbc.so" -#define ODBC_UI_LIBRARY "libodbcinst.so" +#define ODBC_LIBRARY_1 "libodbc.so.1" +#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1" +#define ODBC_LIBRARY "libodbc.so" +#define ODBC_UI_LIBRARY "libodbcinst.so" #endif #endif @@ -101,10 +101,10 @@ #else -#define ODBC_LIBRARY "" -#define ODBC_UI_LIBRARY "" +#define ODBC_LIBRARY "" +#define ODBC_UI_LIBRARY "" -#endif // HAVE_ODBC_SUPPORT +#endif // HAVE_ODBC_SUPPORT //......................................................................... namespace dbaui @@ -114,10 +114,10 @@ namespace dbaui #ifdef HAVE_ODBC_SUPPORT typedef SQLRETURN (SQL_API* TSQLManageDataSource) (SQLHWND hwndParent); -typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr); +typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr); typedef SQLRETURN (SQL_API* TSQLFreeHandle) (SQLSMALLINT HandleType, SQLHANDLE Handle); typedef SQLRETURN (SQL_API* TSQLSetEnvAttr) (SQLHENV EnvironmentHandle, SQLINTEGER Attribute, SQLPOINTER ValuePtr, SQLINTEGER StringLength); -typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, +typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, SQLSMALLINT BufferLength1, SQLSMALLINT* NameLength1Ptr, SQLCHAR* Description, SQLSMALLINT BufferLength2, SQLSMALLINT* NameLength2Ptr); #define NSQLManageDataSource(a) (*(TSQLManageDataSource)(m_pSQLManageDataSource))(a) @@ -184,10 +184,10 @@ OOdbcLibWrapper::~OOdbcLibWrapper() struct OdbcTypesImpl { #ifdef HAVE_ODBC_SUPPORT - SQLHANDLE hEnvironment; + SQLHANDLE hEnvironment; OdbcTypesImpl() : hEnvironment(0) { } #else - void* pDummy; + void* pDummy; #endif }; DBG_NAME(OOdbcEnumeration) @@ -291,7 +291,7 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) SQLRETURN nResult = SQL_SUCCESS; rtl_TextEncoding nTextEncoding = osl_getThreadTextEncoding(); - for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription); + for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription); ; nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_NEXT, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription) ) @@ -382,7 +382,7 @@ bool OOdbcManagement::isRunning() const #endif // HAVE_ODBC_ADMINISTRATION //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 479c0743953b..e66e0bf21c2c 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,14 +56,14 @@ namespace dbaui */ class OOdbcLibWrapper { - oslModule m_pOdbcLib; // the library handle - ::rtl::OUString m_sLibPath; // the path to the library + oslModule m_pOdbcLib; // the library handle + ::rtl::OUString m_sLibPath; // the path to the library public: #ifdef HAVE_ODBC_SUPPORT - sal_Bool isLoaded() const { return NULL != m_pOdbcLib; } + sal_Bool isLoaded() const { return NULL != m_pOdbcLib; } #else - sal_Bool isLoaded() const { return sal_False; } + sal_Bool isLoaded() const { return sal_False; } #endif ::rtl::OUString getLibraryName() const { return m_sLibPath; } @@ -78,9 +78,9 @@ protected: oslGenericFunction loadSymbol(const sal_Char* _pFunctionName); /// load the lib - sal_Bool load(const sal_Char* _pLibPath); + sal_Bool load(const sal_Char* _pLibPath); /// unload the lib - void unload(); + void unload(); }; //========================================================================= @@ -97,7 +97,7 @@ class OOdbcEnumeration : public OOdbcLibWrapper oslGenericFunction m_pDataSources; #endif - OdbcTypesImpl* m_pImpl; + OdbcTypesImpl* m_pImpl; // needed because we can't have a member of type SQLHANDLE: this would require us to include the respective // ODBC file, which would lead to a lot of conflicts with other includes @@ -105,13 +105,13 @@ public: OOdbcEnumeration(); ~OOdbcEnumeration(); - void getDatasourceNames(StringBag& _rNames); + void getDatasourceNames(StringBag& _rNames); protected: /// ensure that an ODBC environment is allocated - sal_Bool allocEnv(); + sal_Bool allocEnv(); /// free any allocated ODBC environment - void freeEnv(); + void freeEnv(); }; //========================================================================= @@ -134,7 +134,7 @@ public: #endif //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ODBC_CONFIG_HXX_ diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index 5a271ab4be45..050ab6e6f7cd 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index 0fdb2dedf611..6890ac7a2df5 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ namespace dbaui OptionalBoolItem( sal_Int16 nWhich ); OptionalBoolItem( const OptionalBoolItem& _rSource ); - virtual int operator==( const SfxPoolItem& _rItem ) const; - virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const; + virtual int operator==( const SfxPoolItem& _rItem ) const; + virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const; bool HasValue() const { return !!m_aValue; } void ClearValue() { m_aValue.reset(); } diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 21023208a4d7..29d0460eda39 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ #include "localresaccess.hxx" #include <unotools/syslocale.hxx> -#define EF_VISITED 0x0001 -#define EF_DIRTY 0x0002 +#define EF_VISITED 0x0001 +#define EF_DIRTY 0x0002 //......................................................................... namespace dbaui { //......................................................................... - + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -66,19 +66,19 @@ namespace dbaui //================================================================== //------------------------------------------------------------------------------ - #define INIT_MEMBERS() \ - :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \ - ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \ - ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \ - ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \ - ,m_aParam (this, ModuleRes(ET_PARAM)) \ - ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \ - ,m_aOKBtn (this, ModuleRes(BT_OK)) \ - ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \ - ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \ - ,m_xConnection(_rxConnection) \ - ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \ - ,m_bNeedErrorOnCurrent(sal_True) \ + #define INIT_MEMBERS() \ + :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \ + ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \ + ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \ + ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \ + ,m_aParam (this, ModuleRes(ET_PARAM)) \ + ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \ + ,m_aOKBtn (this, ModuleRes(BT_OK)) \ + ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \ + ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \ + ,m_xConnection(_rxConnection) \ + ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \ + ,m_bNeedErrorOnCurrent(sal_True) \ //------------------------------------------------------------------------------ @@ -136,7 +136,7 @@ DBG_NAME(OParameterDialog) { DBG_UNHANDLED_EXCEPTION(); } - + Construct(); @@ -169,12 +169,12 @@ DBG_NAME(OParameterDialog) m_aAllParams.SelectEntryPos(0); LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams); - if (m_aAllParams.GetEntryCount() == 1) + if (m_aAllParams.GetEntryCount() == 1) { m_aTravelNext.Enable(sal_False); } - if (m_aAllParams.GetEntryCount() > 1) + if (m_aAllParams.GetEntryCount() > 1) { m_aOKBtn.SetStyle(m_aOKBtn.GetStyle() & ~WB_DEFBUTTON); m_aTravelNext.SetStyle(m_aTravelNext.GetStyle() | WB_DEFBUTTON); @@ -216,14 +216,14 @@ DBG_NAME(OParameterDialog) if (!m_bNeedErrorOnCurrent) return 1L; - m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified + m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified ::rtl::OUString sName; - try - { - sName = ::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME)); - } - catch(Exception&) + try + { + sName = ::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME)); + } + catch(Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -250,8 +250,8 @@ DBG_NAME(OParameterDialog) if (&m_aCancelBtn == pButton) { // no interpreting of the given values anymore .... - m_aParam.SetLoseFocusHdl(Link()); // no direct call from the control anymore ... - m_bNeedErrorOnCurrent = sal_False; // in case of any indirect calls -> no error message + m_aParam.SetLoseFocusHdl(Link()); // no direct call from the control anymore ... + m_bNeedErrorOnCurrent = sal_False; // in case of any indirect calls -> no error message m_aCancelBtn.SetClickHdl(Link()); m_aCancelBtn.Click(); } @@ -259,7 +259,7 @@ DBG_NAME(OParameterDialog) { // transfer the current values into the Any if (LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams) != 0L) - { // there was an error interpreting the current text + { // there was an error interpreting the current text m_bNeedErrorOnCurrent = sal_True; // we're are out of the complex web :) of direct and indirect calls to OnValueLoseFocus now, // so the next time it is called we need an error message, again .... @@ -288,7 +288,7 @@ DBG_NAME(OParameterDialog) { DBG_UNHANDLED_EXCEPTION(); } - + } // to close the dialog (which is more code than a simple EndDialog) m_aOKBtn.SetClickHdl(Link()); @@ -333,7 +333,7 @@ DBG_NAME(OParameterDialog) { // do the transformation of the current text if (LINK(this, OParameterDialog, OnValueLoseFocus).Call(&m_aParam) != 0L) - { // there was an error interpreting the text + { // there was an error interpreting the text m_aAllParams.SelectEntryPos(m_nCurrentlySelected); return 1L; } @@ -369,7 +369,7 @@ DBG_NAME(OParameterDialog) // was it the last "not visited yet" entry ? ConstByteVectorIterator aIter; - for ( aIter = m_aVisitedParams.begin(); + for ( aIter = m_aVisitedParams.begin(); aIter < m_aVisitedParams.end(); ++aIter ) @@ -378,10 +378,10 @@ DBG_NAME(OParameterDialog) break; } if (aIter == m_aVisitedParams.end()) - { // yes, there isn't another one -> change the "default button" + { // yes, there isn't another one -> change the "default button" m_aTravelNext.SetStyle(m_aTravelNext.GetStyle() & ~WB_DEFBUTTON); m_aOKBtn.SetStyle(m_aOKBtn.GetStyle() | WB_DEFBUTTON); - + // set to focus to one of the buttons temporary (with this their "default"-state is really updated) Window* pOldFocus = Application::GetFocusWindow(); @@ -421,7 +421,7 @@ DBG_NAME(OParameterDialog) //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/paramdialog.hrc b/dbaccess/source/ui/dlg/paramdialog.hrc index 0b834dd3e7eb..c344ef454c65 100644 --- a/dbaccess/source/ui/dlg/paramdialog.hrc +++ b/dbaccess/source/ui/dlg/paramdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,19 +28,19 @@ #ifndef _DBAUI_PARAMDIALOG_HRC_ #define _DBAUI_PARAMDIALOG_HRC_ -#define LB_ALLPARAMS 1 -#define FL_PARAMS 2 -#define FT_VALUE 3 -#define ET_PARAM 4 -#define CB_NULLVAL 5 -#define BT_TRAVELNEXT 6 -#define BT_OK 7 -#define BT_CANCEL 8 -#define AB_PREV 9 -#define AB_NEXT 10 +#define LB_ALLPARAMS 1 +#define FL_PARAMS 2 +#define FT_VALUE 3 +#define ET_PARAM 4 +#define CB_NULLVAL 5 +#define BT_TRAVELNEXT 6 +#define BT_OK 7 +#define BT_CANCEL 8 +#define AB_PREV 9 +#define AB_NEXT 10 -#define STR_COULD_NOT_CONVERT_PARAM 1 +#define STR_COULD_NOT_CONVERT_PARAM 1 #endif // _DBAUI_PARAMDIALOG_HRC_ diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src index 3993096f8847..c35e395c697c 100644 --- a/dbaccess/source/ui/dlg/paramdialog.src +++ b/dbaccess/source/ui/dlg/paramdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,8 +32,8 @@ #include "dbu_dlg.hrc" #endif -#define LIST_WIDTH 100 -#define LIST_HEIGHT 50 +#define LIST_WIDTH 100 +#define LIST_HEIGHT 50 ModalDialog DLG_PARAMETERS { diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 6c3a6124f5b4..a6baa7f06439 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,26 +88,26 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, const Reference< XNameAccess>& _rxCols ) :ModalDialog( pParent, ModuleRes( DLG_FILTERCRIT ) ) - ,aLB_WHEREFIELD1 ( this, ModuleRes( LB_WHEREFIELD1 ) ) - ,aLB_WHERECOMP1 ( this, ModuleRes( LB_WHERECOMP1 ) ) - ,aET_WHEREVALUE1 ( this, ModuleRes( ET_WHEREVALUE1 ) ) - ,aLB_WHERECOND2 ( this, ModuleRes( LB_WHERECOND2 ) ) - ,aLB_WHEREFIELD2 ( this, ModuleRes( LB_WHEREFIELD2 ) ) - ,aLB_WHERECOMP2 ( this, ModuleRes( LB_WHERECOMP2 ) ) - ,aET_WHEREVALUE2 ( this, ModuleRes( ET_WHEREVALUE2 ) ) - ,aLB_WHERECOND3 ( this, ModuleRes( LB_WHERECOND3 ) ) - ,aLB_WHEREFIELD3 ( this, ModuleRes( LB_WHEREFIELD3 ) ) - ,aLB_WHERECOMP3 ( this, ModuleRes( LB_WHERECOMP3 ) ) - ,aET_WHEREVALUE3 ( this, ModuleRes( ET_WHEREVALUE3 ) ) - ,aFT_WHEREFIELD ( this, ModuleRes( FT_WHEREFIELD ) ) - ,aFT_WHERECOMP ( this, ModuleRes( FT_WHERECOMP ) ) - ,aFT_WHEREVALUE ( this, ModuleRes( FT_WHEREVALUE ) ) - ,aFT_WHEREOPER ( this, ModuleRes( FT_WHEREOPER ) ) + ,aLB_WHEREFIELD1 ( this, ModuleRes( LB_WHEREFIELD1 ) ) + ,aLB_WHERECOMP1 ( this, ModuleRes( LB_WHERECOMP1 ) ) + ,aET_WHEREVALUE1 ( this, ModuleRes( ET_WHEREVALUE1 ) ) + ,aLB_WHERECOND2 ( this, ModuleRes( LB_WHERECOND2 ) ) + ,aLB_WHEREFIELD2 ( this, ModuleRes( LB_WHEREFIELD2 ) ) + ,aLB_WHERECOMP2 ( this, ModuleRes( LB_WHERECOMP2 ) ) + ,aET_WHEREVALUE2 ( this, ModuleRes( ET_WHEREVALUE2 ) ) + ,aLB_WHERECOND3 ( this, ModuleRes( LB_WHERECOND3 ) ) + ,aLB_WHEREFIELD3 ( this, ModuleRes( LB_WHEREFIELD3 ) ) + ,aLB_WHERECOMP3 ( this, ModuleRes( LB_WHERECOMP3 ) ) + ,aET_WHEREVALUE3 ( this, ModuleRes( ET_WHEREVALUE3 ) ) + ,aFT_WHEREFIELD ( this, ModuleRes( FT_WHEREFIELD ) ) + ,aFT_WHERECOMP ( this, ModuleRes( FT_WHERECOMP ) ) + ,aFT_WHEREVALUE ( this, ModuleRes( FT_WHEREVALUE ) ) + ,aFT_WHEREOPER ( this, ModuleRes( FT_WHEREOPER ) ) ,aFL_FIELDS ( this, ModuleRes( FL_FIELDS ) ) - ,aBT_OK ( this, ModuleRes( BT_OK ) ) - ,aBT_CANCEL ( this, ModuleRes( BT_CANCEL ) ) - ,aBT_HELP ( this, ModuleRes( BT_HELP ) ) - ,aSTR_NOENTRY ( ModuleRes( STR_NOENTRY ) ) + ,aBT_OK ( this, ModuleRes( BT_OK ) ) + ,aBT_CANCEL ( this, ModuleRes( BT_CANCEL ) ) + ,aBT_HELP ( this, ModuleRes( BT_HELP ) ) + ,aSTR_NOENTRY ( ModuleRes( STR_NOENTRY ) ) ,aSTR_COMPARE_OPERATORS( ModuleRes( STR_COMPARE_OPERATORS ) ) ,m_xQueryComposer(_rxComposer) ,m_xColumns( _rxCols ) @@ -221,8 +221,8 @@ DlgFilterCrit::~DlgFilterCrit() DBG_DTOR(DlgFilterCrit,NULL); } -#define LbText(x) ((x).GetSelectEntry()) -#define LbPos(x) ((x).GetSelectEntryPos()) +#define LbText(x) ((x).GetSelectEntry()) +#define LbPos(x) ((x).GetSelectEntryPos()) //------------------------------------------------------------------------------ sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const String& _rSelectedPredicate ) const @@ -335,7 +335,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom { if ( xInfo->hasPropertyByName(PROPERTY_TABLENAME) ) { - xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; + xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; if ( sTableName.getLength() ) { // properly quote all parts of the table name, so e.g. <schema>.<table> becomes "<schema>"."<table>" @@ -344,7 +344,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, sal_True, ::dbtools::eInDataManipulation ); } } - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction")); if ( xInfo->hasPropertyByName(sAgg) ) xColumn->getPropertyValue(sAgg) >>= bHaving; @@ -354,7 +354,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom } if ( !bFunction ) { - const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); + const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); _rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name); if ( sTableName.getLength() ) { @@ -394,14 +394,14 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie { Sequence< ::rtl::OUString> aSeq = xColumns->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xProp(xColumns->getByName(*pIter),UNO_QUERY); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { ::rtl::OUString sRealName; - xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; if ( sRealName == _rFieldName ) { if ( m_xColumns.is() && m_xColumns->hasByName( *pIter ) ) @@ -487,7 +487,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Bool _bOr ) { DBG_CHKTHIS(DlgFilterCrit,NULL); - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; _rItem.Value >>= aCondition; String aStr = aCondition.getStr(); ::Replace_SQL_PlaceHolder(aStr); @@ -499,7 +499,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo switch(_rItem.Handle) { case SQLFilterOperator::EQUAL: - // aStr.Erase(0,1); + // aStr.Erase(0,1); break; case SQLFilterOperator::NOT_EQUAL: aStr.Erase(0,2); @@ -586,11 +586,11 @@ void DlgFilterCrit::SelectField( ListBox& rBox, const String& rField ) { DBG_CHKTHIS(DlgFilterCrit,NULL); sal_uInt16 nCnt = rBox.GetEntryCount(); - // sal_Bool bCase = m_rIterator.TablesAreSensitive(); + // sal_Bool bCase = m_rIterator.TablesAreSensitive(); for( sal_uInt16 i=0 ; i<nCnt ; i++ ) { - // if(bCase ? rBox.GetEntry(i) == rField : rBox.GetEntry(i).EqualsIgnoreCaseAscii(rField)) + // if(bCase ? rBox.GetEntry(i) == rField : rBox.GetEntry(i).EqualsIgnoreCaseAscii(rField)) if(rBox.GetEntry(i) == rField) { rBox.SelectEntryPos(i); @@ -781,7 +781,7 @@ void DlgFilterCrit::BuildWherePart() Sequence<Sequence<PropertyValue> > aFilter,aHaving; aFilter.realloc(1); aHaving.realloc(1); - // ::rtl::OUString aFilter; + // ::rtl::OUString aFilter; if( LbPos(aLB_WHEREFIELD1) != 0 ) { @@ -859,13 +859,13 @@ void DlgFilterCrit::BuildWherePart() void DlgFilterCrit::fillLines(const Sequence<Sequence<PropertyValue > >& _aValues) { const Sequence<PropertyValue >* pOrIter = _aValues.getConstArray(); - const Sequence<PropertyValue >* pOrEnd = pOrIter + _aValues.getLength(); + const Sequence<PropertyValue >* pOrEnd = pOrIter + _aValues.getLength(); sal_Bool bOr = sal_True; for(sal_uInt16 i=0;pOrIter != pOrEnd; ++pOrIter) { bOr = sal_True; - const PropertyValue* pAndIter = pOrIter->getConstArray(); - const PropertyValue* pAndEnd = pAndIter + pOrIter->getLength(); + const PropertyValue* pAndIter = pOrIter->getConstArray(); + const PropertyValue* pAndEnd = pAndIter + pOrIter->getLength(); for(;pAndIter != pAndEnd; ++pAndIter) { SetLine( i++,*pAndIter,bOr); diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc index ff2aaaca30d0..9895f222e274 100644 --- a/dbaccess/source/ui/dlg/queryfilter.hrc +++ b/dbaccess/source/ui/dlg/queryfilter.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,34 +31,34 @@ #include "dbu_dlg.hrc" #endif -#define FT_WHEREFIELD 1 -#define FT_WHERECOMP 2 -#define FT_WHEREVALUE 3 -#define FT_WHEREOPER 4 +#define FT_WHEREFIELD 1 +#define FT_WHERECOMP 2 +#define FT_WHEREVALUE 3 +#define FT_WHEREOPER 4 -#define LB_WHEREFIELD1 1 -#define LB_WHERECOMP1 2 -#define LB_WHEREFIELD2 3 -#define LB_WHERECOMP2 4 -#define LB_WHEREFIELD3 5 -#define LB_WHERECOMP3 6 -#define LB_WHERECOND2 7 -#define LB_WHERECOND3 8 +#define LB_WHEREFIELD1 1 +#define LB_WHERECOMP1 2 +#define LB_WHEREFIELD2 3 +#define LB_WHERECOMP2 4 +#define LB_WHEREFIELD3 5 +#define LB_WHERECOMP3 6 +#define LB_WHERECOND2 7 +#define LB_WHERECOND3 8 #define FL_FIELDS 1 -#define ET_WHEREVALUE1 1 -#define ET_WHEREVALUE2 2 -#define ET_WHEREVALUE3 3 +#define ET_WHEREVALUE1 1 +#define ET_WHEREVALUE2 2 +#define ET_WHEREVALUE3 3 -#define STR_NOENTRY 1 -#define STR_NOENTRY2 2 -#define STR_DEFAULT 3 +#define STR_NOENTRY 1 +#define STR_NOENTRY2 2 +#define STR_DEFAULT 3 #define STR_COMPARE_OPERATORS 4 -#define BT_OK 1 -#define BT_CANCEL 2 -#define BT_HELP 3 +#define BT_OK 1 +#define BT_CANCEL 2 +#define BT_HELP 3 #endif // DBAUI_QUERYFILTER_HRC diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src index 2b1ef6e6baf5..fcabfdcb496e 100644 --- a/dbaccess/source/ui/dlg/queryfilter.src +++ b/dbaccess/source/ui/dlg/queryfilter.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,11 +84,11 @@ ModalDialog DLG_FILTERCRIT TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; -// STRLST_AND_OR +// STRLST_AND_OR StringList [ en-US ] = { - < "AND" ; Default ; > ; - < "OR" ; Default ; > ; + < "AND" ; Default ; > ; + < "OR" ; Default ; > ; }; }; ListBox LB_WHEREFIELD2 @@ -124,11 +124,11 @@ ModalDialog DLG_FILTERCRIT TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; -// STRLST_AND_OR +// STRLST_AND_OR StringList [ en-US ] = { - < "AND" ; Default ; > ; - < "OR" ; Default ; > ; + < "AND" ; Default ; > ; + < "OR" ; Default ; > ; }; }; ListBox LB_WHEREFIELD3 diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index d237978ce1ce..527cc15a4deb 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,27 +60,27 @@ using namespace ::com::sun::star::beans; DBG_NAME(DlgOrderCrit) //------------------------------------------------------------------------------ -DlgOrderCrit::DlgOrderCrit( Window * pParent, +DlgOrderCrit::DlgOrderCrit( Window * pParent, const Reference< XConnection>& _rxConnection, const Reference< XSingleSelectQueryComposer >& _rxComposer, const Reference< XNameAccess>& _rxCols) :ModalDialog( pParent, ModuleRes(DLG_ORDERCRIT) ) - ,aLB_ORDERFIELD1( this, ModuleRes( LB_ORDERFIELD1 ) ) - ,aLB_ORDERVALUE1( this, ModuleRes( LB_ORDERVALUE1 ) ) - ,aLB_ORDERFIELD2( this, ModuleRes( LB_ORDERFIELD2 ) ) - ,aLB_ORDERVALUE2( this, ModuleRes( LB_ORDERVALUE2 ) ) - ,aLB_ORDERFIELD3( this, ModuleRes( LB_ORDERFIELD3 ) ) - ,aLB_ORDERVALUE3( this, ModuleRes( LB_ORDERVALUE3 ) ) - ,aFT_ORDERFIELD( this, ModuleRes( FT_ORDERFIELD ) ) - ,aFT_ORDERAFTER1( this, ModuleRes( FT_ORDERAFTER1 ) ) - ,aFT_ORDERAFTER2( this, ModuleRes( FT_ORDERAFTER2 ) ) - ,aFT_ORDEROPER( this, ModuleRes( FT_ORDEROPER ) ) - ,aFT_ORDERDIR( this, ModuleRes( FT_ORDERDIR ) ) - ,aBT_OK( this, ModuleRes( BT_OK ) ) - ,aBT_CANCEL( this, ModuleRes( BT_CANCEL ) ) - ,aBT_HELP( this, ModuleRes( BT_HELP ) ) + ,aLB_ORDERFIELD1( this, ModuleRes( LB_ORDERFIELD1 ) ) + ,aLB_ORDERVALUE1( this, ModuleRes( LB_ORDERVALUE1 ) ) + ,aLB_ORDERFIELD2( this, ModuleRes( LB_ORDERFIELD2 ) ) + ,aLB_ORDERVALUE2( this, ModuleRes( LB_ORDERVALUE2 ) ) + ,aLB_ORDERFIELD3( this, ModuleRes( LB_ORDERFIELD3 ) ) + ,aLB_ORDERVALUE3( this, ModuleRes( LB_ORDERVALUE3 ) ) + ,aFT_ORDERFIELD( this, ModuleRes( FT_ORDERFIELD ) ) + ,aFT_ORDERAFTER1( this, ModuleRes( FT_ORDERAFTER1 ) ) + ,aFT_ORDERAFTER2( this, ModuleRes( FT_ORDERAFTER2 ) ) + ,aFT_ORDEROPER( this, ModuleRes( FT_ORDEROPER ) ) + ,aFT_ORDERDIR( this, ModuleRes( FT_ORDERDIR ) ) + ,aBT_OK( this, ModuleRes( BT_OK ) ) + ,aBT_CANCEL( this, ModuleRes( BT_CANCEL ) ) + ,aBT_HELP( this, ModuleRes( BT_HELP ) ) ,aFL_ORDER( this, ModuleRes( FL_ORDER ) ) - ,aSTR_NOENTRY( ModuleRes( STR_NOENTRY ) ) + ,aSTR_NOENTRY( ModuleRes( STR_NOENTRY ) ) ,m_xQueryComposer( _rxComposer ) ,m_xColumns(_rxCols) ,m_xConnection(_rxConnection) @@ -156,8 +156,8 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent, //------------------------------------------------------------------------------ -#define LbText(x) ((x).GetSelectEntry()) -#define LbPos(x) ((x).GetSelectEntryPos()) +#define LbText(x) ((x).GetSelectEntry()) +#define LbPos(x) ((x).GetSelectEntryPos()) //------------------------------------------------------------------------------ DlgOrderCrit::~DlgOrderCrit() @@ -246,7 +246,7 @@ void DlgOrderCrit::EnableLines() { DBG_CHKTHIS(DlgOrderCrit,NULL); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); - ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); + ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); static const ::rtl::OUString sDESC = ::rtl::OUString::createFromAscii(" DESC "); static const ::rtl::OUString sASC = ::rtl::OUString::createFromAscii(" ASC "); @@ -270,7 +270,7 @@ void DlgOrderCrit::EnableLines() if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { ::rtl::OUString sRealName; - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; sName = sRealName; static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction")); static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function")); diff --git a/dbaccess/source/ui/dlg/queryorder.hrc b/dbaccess/source/ui/dlg/queryorder.hrc index 059151ba9a8d..fde41dfc39d9 100644 --- a/dbaccess/source/ui/dlg/queryorder.hrc +++ b/dbaccess/source/ui/dlg/queryorder.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,26 +32,26 @@ #endif -#define FT_ORDERFIELD 1 -#define FT_ORDERDIR 3 -#define FT_ORDERAFTER1 4 -#define FT_ORDERAFTER2 5 -#define FT_ORDEROPER 6 +#define FT_ORDERFIELD 1 +#define FT_ORDERDIR 3 +#define FT_ORDERAFTER1 4 +#define FT_ORDERAFTER2 5 +#define FT_ORDEROPER 6 -#define LB_ORDERFIELD1 1 -#define LB_ORDERFIELD2 2 -#define LB_ORDERFIELD3 3 -#define LB_ORDERVALUE1 4 -#define LB_ORDERVALUE2 5 -#define LB_ORDERVALUE3 6 +#define LB_ORDERFIELD1 1 +#define LB_ORDERFIELD2 2 +#define LB_ORDERFIELD3 3 +#define LB_ORDERVALUE1 4 +#define LB_ORDERVALUE2 5 +#define LB_ORDERVALUE3 6 #define FL_ORDER 1 -#define BT_OK 1 -#define BT_CANCEL 2 -#define BT_HELP 3 +#define BT_OK 1 +#define BT_CANCEL 2 +#define BT_HELP 3 -#define STR_NOENTRY 1 +#define STR_NOENTRY 1 #endif // DBAUI_QUERYORDER_HRC diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src index 2f2f85a797a0..2927be9d838a 100644 --- a/dbaccess/source/ui/dlg/queryorder.src +++ b/dbaccess/source/ui/dlg/queryorder.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 0220c2691ade..20db037334ef 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include "UITools.hxx" #include "moduledbu.hxx" -#define BUTTONID_MORE BUTTONID_RETRY + 1 +#define BUTTONID_MORE BUTTONID_RETRY + 1 #define DIALOG_WIDTH 220 #define OUTER_MARGIN 6 @@ -126,7 +126,7 @@ namespace :m_label( ModuleRes( _labelResourceID ) ) { } - + virtual String getLabel() const { return m_label; @@ -327,11 +327,11 @@ namespace class OExceptionChainDialog : public ModalDialog { FixedLine m_aFrame; - FixedText m_aListLabel; - SvTreeListBox m_aExceptionList; - FixedText m_aDescLabel; - MultiLineEdit m_aExceptionText; - OKButton m_aOK; + FixedText m_aListLabel; + SvTreeListBox m_aExceptionList; + FixedText m_aDescLabel; + MultiLineEdit m_aExceptionText; + OKButton m_aOK; String m_sStatusLabel; String m_sErrorCodeLabel; @@ -350,12 +350,12 @@ DBG_NAME(OExceptionChainDialog) //------------------------------------------------------------------------------ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions ) :ModalDialog(pParent, ModuleRes(DLG_SQLEXCEPTIONCHAIN)) - ,m_aFrame (this, ModuleRes(FL_DETAILS)) - ,m_aListLabel (this, ModuleRes(FT_ERRORLIST)) - ,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST)) - ,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION)) - ,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION)) - ,m_aOK (this, ModuleRes(PB_OK)) + ,m_aFrame (this, ModuleRes(FL_DETAILS)) + ,m_aListLabel (this, ModuleRes(FT_ERRORLIST)) + ,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST)) + ,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION)) + ,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION)) + ,m_aOK (this, ModuleRes(PB_OK)) ,m_aExceptions( _rExceptions ) { DBG_CTOR(OExceptionChainDialog,NULL); @@ -505,11 +505,11 @@ void OSQLMessageBox::impl_positionControls() { OSL_PRECOND( !m_pImpl->aDisplayInfo.empty(), "OSQLMessageBox::impl_positionControls: nothing to display at all?" ); - + if ( m_pImpl->aDisplayInfo.empty() ) return; const ExceptionDisplayInfo* pSecondInfo = NULL; - + const ExceptionDisplayInfo& rFirstInfo = *m_pImpl->aDisplayInfo.begin(); if ( m_pImpl->aDisplayInfo.size() > 1 ) pSecondInfo = &m_pImpl->aDisplayInfo[1]; @@ -781,7 +781,7 @@ OSQLWarningBox::OSQLWarningBox( Window* _pParent, const UniString& _rMessage, Wi } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/sqlmessage.hrc b/dbaccess/source/ui/dlg/sqlmessage.hrc index 76f722a1b08f..b8267bafcb7a 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.hrc +++ b/dbaccess/source/ui/dlg/sqlmessage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,23 +28,23 @@ #ifndef _DBAUI_SQLMESSAGE_HRC_ #define _DBAUI_SQLMESSAGE_HRC_ -#define FT_ERRORLIST 1 -#define FT_DESCRIPTION 2 +#define FT_ERRORLIST 1 +#define FT_DESCRIPTION 2 -#define ED_TEXT 1 +#define ED_TEXT 1 #define FL_DATA 1 -#define FL_DETAILS 1 +#define FL_DETAILS 1 -#define PB_OK 1 -#define PB_CANCEL 2 +#define PB_OK 1 +#define PB_CANCEL 2 -#define CTL_ERRORLIST 1 +#define CTL_ERRORLIST 1 -#define ME_DESCRIPTION 1 +#define ME_DESCRIPTION 1 -#define STR_EXCEPTION_STATUS 1 -#define STR_EXCEPTION_ERRORCODE 2 +#define STR_EXCEPTION_STATUS 1 +#define STR_EXCEPTION_ERRORCODE 2 #endif // _DBAUI_SQLMESSAGE_HRC_ diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src index af3d53f785dd..fe368f1824d5 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ b/dbaccess/source/ui/dlg/sqlmessage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 441aa6c6f846..99857a2c8249 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,11 +86,11 @@ DBG_NAME(OTableSubscriptionPage) //------------------------------------------------------------------------ OTableSubscriptionPage::OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs,OTableSubscriptionDialog* _pTablesDlg ) :OGenericAdministrationPage( pParent, ModuleRes(PAGE_TABLESUBSCRIPTION), _rCoreAttrs ) - ,m_aTables (this, ModuleRes(FL_SEPARATOR1)) - ,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True) - ,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION)) - ,m_bCheckedAll ( sal_False ) - ,m_bCatalogAtStart ( sal_True ) + ,m_aTables (this, ModuleRes(FL_SEPARATOR1)) + ,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True) + ,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION)) + ,m_bCheckedAll ( sal_False ) + ,m_bCatalogAtStart ( sal_True ) ,m_pTablesDlg(_pTablesDlg) { DBG_CTOR(OTableSubscriptionPage,NULL); @@ -140,9 +140,9 @@ DBG_NAME(OTableSubscriptionPage) { OGenericAdministrationPage::DataChanged( rDCEvt ); - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode m_aTablesList.notifyHiContrastChanged(); @@ -233,13 +233,13 @@ DBG_NAME(OTableSubscriptionPage) void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter ) { if (!_rTableFilter.getLength()) - { // no tables visible + { // no tables visible CheckAll(sal_False); } else { if ((1 == _rTableFilter.getLength()) && _rTableFilter[0].equalsAsciiL("%", 1)) - { // all tables visible + { // all tables visible CheckAll(sal_True); } else @@ -260,7 +260,7 @@ DBG_NAME(OTableSubscriptionPage) String sDSName = pNameItem->GetValue(); if (bValid && sDSName.Len() && !m_xCurrentConnection.is() ) - { // get the current table list from the connection for the current settings + { // get the current table list from the connection for the current settings // the PropertyValues for the current dialog settings Sequence< PropertyValue > aConnectionParams; @@ -313,7 +313,7 @@ DBG_NAME(OTableSubscriptionPage) Any aTableTypeFilter = xProp->getPropertyValue(PROPERTY_TABLETYPEFILTER); Reference<XModifiable> xModi(getDataSourceOrModel(xProp),UNO_QUERY); - sal_Bool bModified = ( xModi.is() && xModi->isModified() ); + sal_Bool bModified = ( xModi.is() && xModi->isModified() ); Sequence< ::rtl::OUString > aNewTableFilter(1); aNewTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); @@ -330,7 +330,7 @@ DBG_NAME(OTableSubscriptionPage) xModi->setModified(sal_False); } - + if ( m_xCurrentConnection.is() ) { m_aTablesList.UpdateTableList( m_xCurrentConnection ); @@ -362,8 +362,8 @@ DBG_NAME(OTableSubscriptionPage) else { // in addition, we need some infos about the connection used - m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default) - m_bCatalogAtStart = sal_True; // (default) + m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default) + m_bCatalogAtStart = sal_True; // (default) try { Reference< XDatabaseMetaData > xMeta; @@ -459,7 +459,7 @@ DBG_NAME(OTableSubscriptionPage) String sLeftText = pLeftTextItem->GetText(); String sRightText = pRightTextItem->GetText(); - sal_Int32 nCompareResult = 0; // equal by default + sal_Int32 nCompareResult = 0; // equal by default if (m_xCollator.is()) { @@ -492,13 +492,13 @@ DBG_NAME(OTableSubscriptionPage) SvLBoxEntry* pEntry = m_aTablesList.GetModel()->Next(const_cast<SvLBoxEntry*>(pAllObjectsEntry)); while(pEntry) { - sal_Bool bCatalogWildcard = sal_False; - sal_Bool bSchemaWildcard = sal_False; + sal_Bool bCatalogWildcard = sal_False; + sal_Bool bSchemaWildcard = sal_False; SvLBoxEntry* pSchema = NULL; SvLBoxEntry* pCatalog = NULL; if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChilds(pEntry)) - { // checked and a leaf, which means it's no catalog, no schema, but a real table + { // checked and a leaf, which means it's no catalog, no schema, but a real table ::rtl::OUString sCatalog; if(m_aTablesList.GetModel()->HasParent(pEntry)) { @@ -508,7 +508,7 @@ DBG_NAME(OTableSubscriptionPage) pSchema = NULL; if (pSchema) - { // it's a real schema entry, not the "all objects" root + { // it's a real schema entry, not the "all objects" root if(m_aTablesList.GetModel()->HasParent(pSchema)) { pCatalog = m_aTablesList.GetModel()->GetParent(pSchema); @@ -517,7 +517,7 @@ DBG_NAME(OTableSubscriptionPage) pCatalog = NULL; if (pCatalog) - { // it's a real catalog entry, not the "all objects" root + { // it's a real catalog entry, not the "all objects" root bCatalogWildcard = m_aTablesList.isWildcardChecked(pCatalog); if (m_bCatalogAtStart) { @@ -598,7 +598,7 @@ DBG_NAME(OTableSubscriptionPage) ///////////////////////////////////////////////////////////////////////// // create the output string which contains all the table names if ( m_xCurrentConnection.is() ) - { // collect the table filter data only if we have a connection - else no tables are displayed at all + { // collect the table filter data only if we have a connection - else no tables are displayed at all Sequence< ::rtl::OUString > aTableFilter; if (m_aTablesList.isWildcardChecked(m_aTablesList.getAllObjectsEntry())) { @@ -628,7 +628,7 @@ DBG_NAME(OTableSubscriptionPage) } // ----------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index a15e7e159e53..97d343d6bf3a 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,34 +51,34 @@ namespace dbaui :public OGenericAdministrationPage { private: - FixedLine m_aTables; - OTableTreeListBox m_aTablesList; - FixedText m_aExplanation; + FixedLine m_aTables; + OTableTreeListBox m_aTablesList; + FixedText m_aExplanation; - ::rtl::OUString m_sCatalogSeparator; - sal_Bool m_bCheckedAll : 1; - sal_Bool m_bCatalogAtStart : 1; + ::rtl::OUString m_sCatalogSeparator; + sal_Bool m_bCheckedAll : 1; + sal_Bool m_bCatalogAtStart : 1; - ::osl::Mutex m_aNotifierMutex; + ::osl::Mutex m_aNotifierMutex; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xCurrentConnection; /// valid as long as the page is active + m_xCurrentConnection; /// valid as long as the page is active ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; OTableSubscriptionDialog* m_pTablesDlg; public: - virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); - virtual int DeactivatePage(SfxItemSet* _pSet); + virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); + virtual int DeactivatePage(SfxItemSet* _pSet); using OGenericAdministrationPage::DeactivatePage; - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); /** will be called when the controls need to be resized. */ - virtual void resizeControls(const Size& _rDiff); + virtual void resizeControls(const Size& _rDiff); OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg); virtual ~OTableSubscriptionPage(); @@ -91,9 +91,9 @@ namespace dbaui DECL_LINK( OnTreeEntryChecked, Control* ); private: + - - /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> + /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> */ void implCheckTables(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTables); @@ -115,7 +115,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_TABLESPAGE_HXX_ diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 2ceefab64a35..6371268a9324 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.src b/dbaccess/source/ui/dlg/textconnectionsettings.src index cca76e7f65a3..f285199c54ba 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.src +++ b/dbaccess/source/ui/dlg/textconnectionsettings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src index 2e2a64d87448..c579bc1b7323 100644 --- a/dbaccess/source/ui/imagelists/dbimagelists.src +++ b/dbaccess/source/ui/imagelists/dbimagelists.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx index adcd7bf75c4b..a6e8fbeed6d1 100644 --- a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx +++ b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,20 +32,20 @@ namespace dbaui { - class SAL_NO_VTABLE IAccessibleHelper + class SAL_NO_VTABLE IAccessibleHelper { protected: /** isEditable returns the current editable state - @return true if it is editable otherwise false + @return true if it is editable otherwise false */ virtual sal_Bool isEditable() const = 0; public: /** notifies all listeners that this object has changed - @param _nEventId the event id - @param _aOldValue the old value - @param _aNewValue the new value + @param _nEventId the event id + @param _aOldValue the old value + @param _aNewValue the new value */ - virtual void notifyAccessibleEvent( sal_Int16 _nEventId, + virtual void notifyAccessibleEvent( sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _aOldValue, const ::com::sun::star::uno::Any& _aNewValue) = 0; }; diff --git a/dbaccess/source/ui/inc/AppElementType.hxx b/dbaccess/source/ui/inc/AppElementType.hxx index 006f5ced1c73..6a6c25c704d7 100644 --- a/dbaccess/source/ui/inc/AppElementType.hxx +++ b/dbaccess/source/ui/inc/AppElementType.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,20 +37,20 @@ namespace dbaui enum ElementType { - E_TABLE = ::com::sun::star::sdb::application::DatabaseObject::TABLE, - E_QUERY = ::com::sun::star::sdb::application::DatabaseObject::QUERY, - E_FORM = ::com::sun::star::sdb::application::DatabaseObject::FORM, - E_REPORT = ::com::sun::star::sdb::application::DatabaseObject::REPORT, + E_TABLE = ::com::sun::star::sdb::application::DatabaseObject::TABLE, + E_QUERY = ::com::sun::star::sdb::application::DatabaseObject::QUERY, + E_FORM = ::com::sun::star::sdb::application::DatabaseObject::FORM, + E_REPORT = ::com::sun::star::sdb::application::DatabaseObject::REPORT, - E_NONE = 4, + E_NONE = 4, E_ELEMENT_TYPE_COUNT = E_NONE }; enum PreviewMode { - E_PREVIEWNONE = 0, - E_DOCUMENT = 1, - E_DOCUMENTINFO = 2 + E_PREVIEWNONE = 0, + E_DOCUMENT = 1, + E_DOCUMENTINFO = 2 }; enum ElementOpenMode diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 395ad71f3e0c..deb5750b9566 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,24 +43,24 @@ namespace dbaui /* this class allows to browse through the collection of forms and reports */ class OCollectionView : public ModalDialog - { - FixedText m_aFTCurrentPath; - ImageButton m_aNewFolder; - ImageButton m_aUp; - SvtFileView m_aView; - FixedText m_aFTName; - Edit m_aName; - FixedLine m_aFL; - PushButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_HELP; - String m_sPath; - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; - Size m_aDlgSize; - Size m_a6Size; - sal_Int32 m_nFixDeltaHeight; - sal_Bool m_bCreateForm; + { + FixedText m_aFTCurrentPath; + ImageButton m_aNewFolder; + ImageButton m_aUp; + SvtFileView m_aView; + FixedText m_aFTName; + Edit m_aName; + FixedLine m_aFL; + PushButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_HELP; + String m_sPath; + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; + Size m_aDlgSize; + Size m_a6Size; + sal_Int32 m_nFixDeltaHeight; + sal_Bool m_bCreateForm; DECL_LINK(Up_Click,PushButton*); DECL_LINK(NewFolder_Click,PushButton*); @@ -80,7 +80,7 @@ namespace dbaui ::rtl::OUString getName() const; }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index d0376cbf76dc..d0a7357d66be 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,28 +42,28 @@ namespace dbaui // ============================================================================================= class OColumnControlWindow : public OFieldDescControl { - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + ::com::sun::star::lang::Locale m_aLocale; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier - OTypeInfoMap m_aDestTypeInfo; + OTypeInfoMap m_aDestTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aDestTypeInfoIndex; - mutable TOTypeInfoSP m_pTypeInfo; // default type - String m_sTypeNames; // these type names are the ones out of the resource file - ::rtl::OUString m_sAutoIncrementValue; - sal_Bool m_bAutoIncrementEnabled; + mutable TOTypeInfoSP m_pTypeInfo; // default type + String m_sTypeNames; // these type names are the ones out of the resource file + ::rtl::OUString m_sAutoIncrementValue; + sal_Bool m_bAutoIncrementEnabled; protected: - virtual void ActivateAggregate( EControlType eType ); - virtual void DeactivateAggregate( EControlType eType ); + virtual void ActivateAggregate( EControlType eType ); + virtual void DeactivateAggregate( EControlType eType ); - virtual ::com::sun::star::lang::Locale GetLocale() const; + virtual ::com::sun::star::lang::Locale GetLocale() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); - virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; - virtual void CellModified(long nRow, USHORT nColId ); + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); + virtual sal_Bool isAutoIncrementValueEnabled() const; + virtual ::rtl::OUString getAutoIncrementValue() const; + virtual void CellModified(long nRow, USHORT nColId ); public: OColumnControlWindow(Window* pParent @@ -74,11 +74,11 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(); - virtual const OTypeInfoMap* getTypeInfo() const; + virtual const OTypeInfoMap* getTypeInfo() const; TOTypeInfoSP getDefaultTyp() const; }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_COLUMNCONTROLWINDOW_HXX diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index a8070ecd183e..1fdbc04b182d 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ namespace dbaui { //================================================================== - // ConnData ---------->* ConnLineData - // ^1 ^1 - // | | - // Conn ---------->* ConnLine + // ConnData ---------->* ConnLineData + // ^1 ^1 + // | | + // Conn ---------->* ConnLine //================================================================== /* @@ -50,14 +50,14 @@ namespace dbaui class OConnectionLineData; class OTableConnection; class OTableWindow; - class OConnectionLine + class OConnectionLine { - OTableConnection* m_pTabConn; - OConnectionLineDataRef m_pData; + OTableConnection* m_pTabConn; + OConnectionLineDataRef m_pData; - Point m_aSourceConnPos, + Point m_aSourceConnPos, m_aDestConnPos; - Point m_aSourceDescrLinePos, + Point m_aSourceDescrLinePos, m_aDestDescrLinePos; public: OConnectionLine( OTableConnection* pConn, OConnectionLineDataRef pLineData ); @@ -66,25 +66,25 @@ namespace dbaui virtual OConnectionLine& operator=( const OConnectionLine& rLine ); - Rectangle GetBoundingRect(); - BOOL RecalcLine(); - void Draw( OutputDevice* pOutDev ); - bool CheckHit( const Point& rMousePos ) const; - String GetSourceFieldName() const { return m_pData->GetSourceFieldName(); } - String GetDestFieldName() const { return m_pData->GetDestFieldName(); } + Rectangle GetBoundingRect(); + BOOL RecalcLine(); + void Draw( OutputDevice* pOutDev ); + bool CheckHit( const Point& rMousePos ) const; + String GetSourceFieldName() const { return m_pData->GetSourceFieldName(); } + String GetDestFieldName() const { return m_pData->GetDestFieldName(); } - BOOL IsValid() const; + BOOL IsValid() const; - Rectangle GetSourceTextPos() const; - Rectangle GetDestTextPos() const; + Rectangle GetSourceTextPos() const; + Rectangle GetDestTextPos() const; - OConnectionLineDataRef GetData() const { return m_pData; } + OConnectionLineDataRef GetData() const { return m_pData; } - Point getMidPoint() const; + Point getMidPoint() const; }; /// unary_function Functor object for class OConnectionLine returntype is void /// draws a connectionline object on outputdevice - struct TConnectionLineDrawFunctor : ::std::unary_function<OConnectionLine*,void> + struct TConnectionLineDrawFunctor : ::std::unary_function<OConnectionLine*,void> { OutputDevice* pDevice; TConnectionLineDrawFunctor(OutputDevice* _pDevice) @@ -98,9 +98,9 @@ namespace dbaui }; /// binary_function Functor object for class OConnectionLine returntype is bool /// checks if the point is on connectionline - struct TConnectionLineCheckHitFunctor : ::std::binary_function<OConnectionLine*,Point,bool> + struct TConnectionLineCheckHitFunctor : ::std::binary_function<OConnectionLine*,Point,bool> { - inline bool operator()(const OConnectionLine* lhs,const Point& rhs) const + inline bool operator()(const OConnectionLine* lhs,const Point& rhs) const { return lhs->CheckHit(rhs); } diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index d36af945165f..e9edc1837a5c 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,17 +41,17 @@ namespace dbaui /** the class OConnectionLineAccess represents the accessible object for the connection between two table windows like they are used in the QueryDesign and the RelationDesign */ - class OConnectionLineAccess : public VCLXAccessibleComponent - , public OConnectionLineAccess_BASE + class OConnectionLineAccess : public VCLXAccessibleComponent + , public OConnectionLineAccess_BASE { - const OTableConnection* m_pLine; // the window which I should give accessibility to + const OTableConnection* m_pLine; // the window which I should give accessibility to protected: /** this function is called upon disposing the component */ virtual void SAL_CALL disposing(); /** isEditable returns the current editable state - @return true if it is editable otherwise false + @return true if it is editable otherwise false */ virtual sal_Bool isEditable() const; public: @@ -75,7 +75,7 @@ namespace dbaui static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - + // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index 50898937894c..176e169b3fd3 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,10 +40,10 @@ namespace dbaui { //================================================================== - // ConnData ---------->* ConnLineData - // ^1 ^1 - // | | - // Conn ---------->* ConnLine + // ConnData ---------->* ConnLineData + // ^1 ^1 + // | | + // Conn ---------->* ConnLine //================================================================== @@ -65,23 +65,23 @@ namespace dbaui OConnectionLineData(); OConnectionLineData( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ); OConnectionLineData( const OConnectionLineData& rConnLineData ); - + // eine Kopie der eigenen Instanz liefern (das ist mir irgendwie angenehmer als ein virtueller Zuweisungsoperator) void CopyFrom(const OConnectionLineData& rSource); // Memberzugriff (schreiben) - void SetFieldName(EConnectionSide nWhich, const ::rtl::OUString& strFieldName) - { - if (nWhich==JTCS_FROM) - m_aSourceFieldName = strFieldName; - else - m_aDestFieldName = strFieldName; + void SetFieldName(EConnectionSide nWhich, const ::rtl::OUString& strFieldName) + { + if (nWhich==JTCS_FROM) + m_aSourceFieldName = strFieldName; + else + m_aDestFieldName = strFieldName; } void SetSourceFieldName( const ::rtl::OUString& rSourceFieldName){ SetFieldName(JTCS_FROM, rSourceFieldName); } void SetDestFieldName( const ::rtl::OUString& rDestFieldName ){ SetFieldName(JTCS_TO, rDestFieldName); } inline bool clearSourceFieldName() { SetSourceFieldName(::rtl::OUString()); return true;} - inline bool clearDestFieldName() { SetDestFieldName(::rtl::OUString()); return true;} + inline bool clearDestFieldName() { SetDestFieldName(::rtl::OUString()); return true;} // Memberzugriff (lesen) ::rtl::OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; } @@ -94,8 +94,8 @@ namespace dbaui //------------------------------------------------------------------------- //------------------------------------------------------------------ - typedef ::rtl::Reference< OConnectionLineData > OConnectionLineDataRef; - typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec; + typedef ::rtl::Reference< OConnectionLineData > OConnectionLineDataRef; + typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec; } #endif // DBAUI_CONNECTIONLINEDATA_HXX diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 4a96c8176825..fde1711272a7 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include "IUpdateHelper.hxx" #include "WTypeSelect.hxx" -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace awt{ struct FontDescriptor; } @@ -69,26 +69,26 @@ namespace dbaui { public: DECLARE_STL_MAP(::rtl::OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns); - typedef ::std::vector<TColumns::const_iterator> TColumnVector; - typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > TPositions; + typedef ::std::vector<TColumns::const_iterator> TColumnVector; + typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > TPositions; protected: - TPositions m_vColumns; // Welche Spalten "ubernommen werden sollen - ::std::vector<sal_Int32> m_vColumnTypes; // FeldTypen f"ur schnelleren Zugriff - ::std::vector<sal_Int32> m_vColumnSize; - ::std::vector<sal_Int16> m_vNumberFormat; - ::com::sun::star::lang::Locale m_aLocale; - - TColumns m_aDestColumns; // container for new created columns - TColumnVector m_vDestVector; - - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; // dest table - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables; // container - SharedConnection m_xConnection; // dest conn - + TPositions m_vColumns; // Welche Spalten "ubernommen werden sollen + ::std::vector<sal_Int32> m_vColumnTypes; // FeldTypen f"ur schnelleren Zugriff + ::std::vector<sal_Int32> m_vColumnSize; + ::std::vector<sal_Int16> m_vNumberFormat; + ::com::sun::star::lang::Locale m_aLocale; + + TColumns m_aDestColumns; // container for new created columns + TColumnVector m_vDestVector; + + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; // dest table + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables; // container + SharedConnection m_xConnection; // dest conn + ::boost::shared_ptr<IUpdateHelper> m_pUpdateHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; // - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; // + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; ::com::sun::star::util::Date m_aNullDate; @@ -96,49 +96,49 @@ namespace dbaui SvStream& m_rInputStream; //dyf add 2006/06/01 //for save the selected tablename - ::rtl::OUString m_sDefaultTableName; + ::rtl::OUString m_sDefaultTableName; //dyf add end - String m_sTextToken; // Zellen Inhalt - String m_sNumToken; /// SDNUM value - String m_sValToken; /// SDVAL value - TOTypeInfoSP m_pTypeInfo; // contains the default type + String m_sTextToken; // Zellen Inhalt + String m_sNumToken; /// SDNUM value + String m_sValToken; /// SDVAL value + TOTypeInfoSP m_pTypeInfo; // contains the default type const TColumnVector* m_pColumnList; const OTypeInfoMap* m_pInfoMap; - sal_Int32 m_nColumnPos; // aktuelle Spaltenposition - sal_Int32 m_nRows; // Anzahl der Zeilen die durchsucht werden sollen - sal_Int32 m_nRowCount; // current count of rows - rtl_TextEncoding m_nDefToken; // Sprache - sal_Bool m_bError; // Fehler und Abbruchstatus - sal_Bool m_bInTbl; // Ist gesetzt, wenn der Parser sich in der RTF Tabelle befindet - sal_Bool m_bHead; // ist true, wenn die Kopfzeile noch nicht gelesen wurde - sal_Bool m_bDontAskAgain;// Falls beim Einf"ugen ein Fehler auftritt, soll die Fehlermeldung nicht - sal_Bool m_bIsAutoIncrement; // if PKey is set by user - sal_Bool m_bFoundTable; // set to true when a table was found - sal_Bool m_bCheckOnly; + sal_Int32 m_nColumnPos; // aktuelle Spaltenposition + sal_Int32 m_nRows; // Anzahl der Zeilen die durchsucht werden sollen + sal_Int32 m_nRowCount; // current count of rows + rtl_TextEncoding m_nDefToken; // Sprache + sal_Bool m_bError; // Fehler und Abbruchstatus + sal_Bool m_bInTbl; // Ist gesetzt, wenn der Parser sich in der RTF Tabelle befindet + sal_Bool m_bHead; // ist true, wenn die Kopfzeile noch nicht gelesen wurde + sal_Bool m_bDontAskAgain;// Falls beim Einf"ugen ein Fehler auftritt, soll die Fehlermeldung nicht + sal_Bool m_bIsAutoIncrement; // if PKey is set by user + sal_Bool m_bFoundTable; // set to true when a table was found + sal_Bool m_bCheckOnly; bool m_bAppendFirstLine; - virtual sal_Bool CreateTable(int nToken) = 0; + virtual sal_Bool CreateTable(int nToken) = 0; virtual TypeSelectionPageFactory getTypeSelectionPageFactory() = 0; - void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); - sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); + void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); + sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); void adjustFormat(); void eraseTokens(); - void insertValueIntoColumn(); - sal_Bool createRowSet(); - void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e); + void insertValueIntoColumn(); + sal_Bool createRowSet(); + void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e); void ensureFormatter(); /** executeWizard calls a wizard to create/append data - @param _sTableName the tablename - @param _aTextColor the text color of the new created table - @param _rFont the font of the new table + @param _sTableName the tablename + @param _aTextColor the text color of the new created table + @param _rFont the font of the new table - @return true when an error occurs + @return true when an error occurs */ - sal_Bool executeWizard( const ::rtl::OUString& _sTableName, + sal_Bool executeWizard( const ::rtl::OUString& _sTableName, const ::com::sun::star::uno::Any& _aTextColor, const ::com::sun::star::awt::FontDescriptor& _rFont); @@ -165,11 +165,11 @@ namespace dbaui SvStream& _rInputStream ); - void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); - + void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); + //dyf add 20070601 inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; } - //dyf add end + //dyf add end virtual void release() = 0; diff --git a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx index 9252a6b3974c..78f88c3eb522 100644 --- a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx +++ b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,15 +47,15 @@ namespace dbaui |* Groups and Sorting dialog |* \************************************************************************/ -class OExtensionNotPresentDialog : public ModalDialog +class OExtensionNotPresentDialog : public ModalDialog { FixedImage m_aFI_WARNING; FixedText m_aFT_TEXT; - PushButton m_aPB_DOWNLOAD; - CancelButton m_aPB_CANCEL; + PushButton m_aPB_DOWNLOAD; + CancelButton m_aPB_CANCEL; - ::com::sun::star::lang::Locale m_nLocale; + ::com::sun::star::lang::Locale m_nLocale; com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xMultiServiceFactory; /** returns the format string. @@ -77,7 +77,7 @@ class OExtensionNotPresentDialog : public ModalDialog public: OExtensionNotPresentDialog( Window* pParent, com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > ); virtual ~OExtensionNotPresentDialog(); - virtual short Execute(); + virtual short Execute(); inline String getText() const { return m_aFT_TEXT.GetText(); } }; diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 5ccb33bb70dc..3a9133dc193e 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,8 +52,8 @@ namespace dbaui class OPropColumnEditCtrl : public OSQLNameEdit { OModuleClient m_aModuleClient; - short m_nPos; - String m_strHelpText; + short m_nPos; + String m_strHelpText; public: inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); @@ -69,9 +69,9 @@ namespace dbaui } }; inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, - ::rtl::OUString& _rAllowedChars, - USHORT nHelpId, - short nPosition, + ::rtl::OUString& _rAllowedChars, + USHORT nHelpId, + short nPosition, WinBits nWinStyle) :OSQLNameEdit(pParent, _rAllowedChars,nWinStyle) ,m_nPos(nPosition) @@ -79,11 +79,11 @@ namespace dbaui m_strHelpText=String(ModuleRes(nHelpId)); } //================================================================== - class OPropEditCtrl : public Edit + class OPropEditCtrl : public Edit { OModuleClient m_aModuleClient; - short m_nPos; - String m_strHelpText; + short m_nPos; + String m_strHelpText; public: inline OPropEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); @@ -117,8 +117,8 @@ namespace dbaui //================================================================== class OPropNumericEditCtrl : public NumericField { - short m_nPos; - String m_strHelpText; + short m_nPos; + String m_strHelpText; public: inline OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); @@ -152,8 +152,8 @@ namespace dbaui //================================================================== class OPropListBoxCtrl : public ListBox { - short m_nPos; - String m_strHelpText; + short m_nPos; + String m_strHelpText; public: inline OPropListBoxCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 38c270610a5f..d6677b14169e 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,25 +36,25 @@ //------------------------------------------------------------------ // die Spalten einer Feld-Beschreibung einer Tabelle -#define FIELD_NAME 1 -#define FIELD_TYPE 2 -#define HELP_TEXT 3 +#define FIELD_NAME 1 +#define FIELD_TYPE 2 +#define HELP_TEXT 3 #define COLUMN_DESCRIPTION 4 -#define FIELD_FIRST_VIRTUAL_COLUMN 5 - -#define FIELD_PROPERTY_REQUIRED 5 -#define FIELD_PROPERTY_NUMTYPE 6 -#define FIELD_PROPERTY_AUTOINC 7 -#define FIELD_PROPERTY_DEFAULT 8 -#define FIELD_PROPERTY_TEXTLEN 9 -#define FIELD_PROPERTY_LENGTH 10 -#define FIELD_PROPERTY_SCALE 11 -#define FIELD_PROPERTY_BOOL_DEFAULT 12 -#define FIELD_PROPERTY_FORMAT 13 -#define FIELD_PRPOERTY_COLUMNNAME 14 -#define FIELD_PRPOERTY_TYPE 15 -#define FIELD_PRPOERTY_AUTOINCREMENT 16 +#define FIELD_FIRST_VIRTUAL_COLUMN 5 + +#define FIELD_PROPERTY_REQUIRED 5 +#define FIELD_PROPERTY_NUMTYPE 6 +#define FIELD_PROPERTY_AUTOINC 7 +#define FIELD_PROPERTY_DEFAULT 8 +#define FIELD_PROPERTY_TEXTLEN 9 +#define FIELD_PROPERTY_LENGTH 10 +#define FIELD_PROPERTY_SCALE 11 +#define FIELD_PROPERTY_BOOL_DEFAULT 12 +#define FIELD_PROPERTY_FORMAT 13 +#define FIELD_PRPOERTY_COLUMNNAME 14 +#define FIELD_PRPOERTY_TYPE 15 +#define FIELD_PRPOERTY_AUTOINCREMENT 16 class FixedText; class PushButton; @@ -79,56 +79,56 @@ namespace dbaui class OFieldDescControl : public TabPage { private: - OTableDesignHelpBar* pHelp; - Window* pLastFocusWindow; - Window* m_pActFocusWindow; - - FixedText* pDefaultText; - FixedText* pRequiredText; - FixedText* pAutoIncrementText; - FixedText* pTextLenText; - FixedText* pNumTypeText; - FixedText* pLengthText; - FixedText* pScaleText; - FixedText* pFormatText; - FixedText* pBoolDefaultText; - FixedText* m_pColumnNameText; - FixedText* m_pTypeText; - FixedText* m_pAutoIncrementValueText; - - OPropListBoxCtrl* pRequired; - OPropListBoxCtrl* pNumType; - OPropListBoxCtrl* pAutoIncrement; - OPropEditCtrl* pDefault; - OPropNumericEditCtrl* pTextLen; - OPropNumericEditCtrl* pLength; - OPropNumericEditCtrl* pScale; - OPropEditCtrl* pFormatSample; - OPropListBoxCtrl* pBoolDefault; - OPropColumnEditCtrl* m_pColumnName; - OPropListBoxCtrl* m_pType; - OPropEditCtrl* m_pAutoIncrementValue; - - PushButton* pFormat; - - ScrollBar* m_pVertScroll; - ScrollBar* m_pHorzScroll; - - TOTypeInfoSP m_pPreviousType; - USHORT nCurChildId; - short m_nPos; - XubString aYes; - XubString aNo; - - long m_nOldVThumb; - long m_nOldHThumb; - sal_Int32 m_nWidth; - - ULONG nDelayedGrabFocusEvent; + OTableDesignHelpBar* pHelp; + Window* pLastFocusWindow; + Window* m_pActFocusWindow; + + FixedText* pDefaultText; + FixedText* pRequiredText; + FixedText* pAutoIncrementText; + FixedText* pTextLenText; + FixedText* pNumTypeText; + FixedText* pLengthText; + FixedText* pScaleText; + FixedText* pFormatText; + FixedText* pBoolDefaultText; + FixedText* m_pColumnNameText; + FixedText* m_pTypeText; + FixedText* m_pAutoIncrementValueText; + + OPropListBoxCtrl* pRequired; + OPropListBoxCtrl* pNumType; + OPropListBoxCtrl* pAutoIncrement; + OPropEditCtrl* pDefault; + OPropNumericEditCtrl* pTextLen; + OPropNumericEditCtrl* pLength; + OPropNumericEditCtrl* pScale; + OPropEditCtrl* pFormatSample; + OPropListBoxCtrl* pBoolDefault; + OPropColumnEditCtrl* m_pColumnName; + OPropListBoxCtrl* m_pType; + OPropEditCtrl* m_pAutoIncrementValue; + + PushButton* pFormat; + + ScrollBar* m_pVertScroll; + ScrollBar* m_pHorzScroll; + + TOTypeInfoSP m_pPreviousType; + USHORT nCurChildId; + short m_nPos; + XubString aYes; + XubString aNo; + + long m_nOldVThumb; + long m_nOldHThumb; + sal_Int32 m_nWidth; + + ULONG nDelayedGrabFocusEvent; sal_Bool m_bAdded; bool m_bRightAligned; - OFieldDescription* pActFieldDescr; + OFieldDescription* pActFieldDescr; DECL_LINK( OnScroll, ScrollBar*); @@ -140,15 +140,15 @@ namespace dbaui DECL_LINK( OnControlFocusLost, Control* ); DECL_LINK( OnControlFocusGot, Control* ); - void UpdateFormatSample(OFieldDescription* pFieldDescr); - void ArrangeAggregates(); + void UpdateFormatSample(OFieldDescription* pFieldDescr); + void ArrangeAggregates(); - void SetPosSize( Control** ppControl, long nRow, USHORT nCol ); + void SetPosSize( Control** ppControl, long nRow, USHORT nCol ); - void ScrollAggregate(Control* pText, Control* pInput, Control* pButton, long nDeltaX, long nDeltaY); - void ScrollAllAggregates(); + void ScrollAggregate(Control* pText, Control* pInput, Control* pButton, long nDeltaX, long nDeltaY); + void ScrollAllAggregates(); - sal_Bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; + sal_Bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; void Contruct(); OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId); FixedText* CreateText(USHORT _nTextRes); @@ -162,70 +162,70 @@ namespace dbaui inline OFieldDescription* getCurrentFieldDescData() { return pActFieldDescr; } inline void setCurrentFieldDescData( OFieldDescription* _pDesc ) { pActFieldDescr = _pDesc; } - sal_uInt16 CountActiveAggregates() const; + sal_uInt16 CountActiveAggregates() const; sal_Int32 GetMaxControlHeight() const; - virtual void ActivateAggregate( EControlType eType ); - virtual void DeactivateAggregate( EControlType eType ); - virtual BOOL IsReadOnly() { return FALSE; }; + virtual void ActivateAggregate( EControlType eType ); + virtual void DeactivateAggregate( EControlType eType ); + virtual BOOL IsReadOnly() { return FALSE; }; // Sind von den abgeleiteten Klassen zu impl. virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const = 0; + + virtual ::com::sun::star::lang::Locale GetLocale() const = 0; - virtual ::com::sun::star::lang::Locale GetLocale() const = 0; - - virtual void CellModified(long nRow, USHORT nColId ) = 0; - virtual void SetModified(BOOL bModified); // base implementation is empty - - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) = 0; - virtual const OTypeInfoMap* getTypeInfo() const = 0; - - virtual sal_Bool isAutoIncrementValueEnabled() const = 0; - virtual ::rtl::OUString getAutoIncrementValue() const = 0; + virtual void CellModified(long nRow, USHORT nColId ) = 0; + virtual void SetModified(BOOL bModified); // base implementation is empty + + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) = 0; + virtual const OTypeInfoMap* getTypeInfo() const = 0; + + virtual sal_Bool isAutoIncrementValueEnabled() const = 0; + virtual ::rtl::OUString getAutoIncrementValue() const = 0; - String BoolStringPersistent(const String& rUIString) const; - String BoolStringUI(const String& rPersistentString) const; + String BoolStringPersistent(const String& rUIString) const; + String BoolStringUI(const String& rPersistentString) const; - const OPropColumnEditCtrl* getColumnCtrl() const { return m_pColumnName; } + const OPropColumnEditCtrl* getColumnCtrl() const { return m_pColumnName; } public: OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar); OFieldDescControl( Window* pParent, const ResId& rResId, OTableDesignHelpBar* pHelpBar); virtual ~OFieldDescControl(); - void DisplayData(OFieldDescription* pFieldDescr ); - // void DisplayData(const OColumn* pColumn); + void DisplayData(OFieldDescription* pFieldDescr ); + // void DisplayData(const OColumn* pColumn); - void SaveData( OFieldDescription* pFieldDescr ); - // void SaveData( OColumn* pColumn); + void SaveData( OFieldDescription* pFieldDescr ); + // void SaveData( OColumn* pColumn); - void SetControlText( USHORT nControlId, const String& rText ); - String GetControlText( USHORT nControlId ); - void SetReadOnly( BOOL bReadOnly ); + void SetControlText( USHORT nControlId, const String& rText ); + String GetControlText( USHORT nControlId ); + void SetReadOnly( BOOL bReadOnly ); // Resize aufegrufen - void CheckScrollBars(); - sal_Bool isCutAllowed(); - sal_Bool isCopyAllowed(); - sal_Bool isPasteAllowed(); + void CheckScrollBars(); + sal_Bool isCutAllowed(); + sal_Bool isCopyAllowed(); + sal_Bool isPasteAllowed(); - void cut(); - void copy(); - void paste(); + void cut(); + void copy(); + void paste(); - virtual void Init(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Resize(); + virtual void Init(); + virtual void GetFocus(); + virtual void LoseFocus(); + virtual void Resize(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() = 0; - String getControlDefault( const OFieldDescription* _pFieldDescr ,sal_Bool _bCheck = sal_True) const; + String getControlDefault( const OFieldDescription* _pFieldDescr ,sal_Bool _bCheck = sal_True) const; - inline void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; } + inline void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; } protected: - void implFocusLost(Window* _pWhich); + void implFocusLost(Window* _pWhich); }; } #endif // DBAUI_FIELDDESCRIPTIONCONTROL_HXX diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index 980b23050f3e..6764192599aa 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,32 +40,32 @@ namespace dbaui class OFieldDescription { private: - ::com::sun::star::uno::Any m_aDefaultValue; // the default value from the database - ::com::sun::star::uno::Any m_aControlDefault; // the value which the control inserts as default - ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void - ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void - - TOTypeInfoSP m_pType; + ::com::sun::star::uno::Any m_aDefaultValue; // the default value from the database + ::com::sun::star::uno::Any m_aControlDefault; // the value which the control inserts as default + ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void + ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; + TOTypeInfoSP m_pType; - ::rtl::OUString m_sName; - ::rtl::OUString m_sTypeName; - ::rtl::OUString m_sDescription; - ::rtl::OUString m_sHelpText; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; - ::rtl::OUString m_sAutoIncrementValue; - sal_Int32 m_nType; // only used when m_pType is null - sal_Int32 m_nPrecision; - sal_Int32 m_nScale; - sal_Int32 m_nIsNullable; - sal_Int32 m_nFormatKey; - SvxCellHorJustify m_eHorJustify; - sal_Bool m_bIsAutoIncrement; - sal_Bool m_bIsPrimaryKey; - sal_Bool m_bIsCurrency; - sal_Bool m_bHidden; + ::rtl::OUString m_sName; + ::rtl::OUString m_sTypeName; + ::rtl::OUString m_sDescription; + ::rtl::OUString m_sHelpText; + + ::rtl::OUString m_sAutoIncrementValue; + sal_Int32 m_nType; // only used when m_pType is null + sal_Int32 m_nPrecision; + sal_Int32 m_nScale; + sal_Int32 m_nIsNullable; + sal_Int32 m_nFormatKey; + SvxCellHorJustify m_eHorJustify; + sal_Bool m_bIsAutoIncrement; + sal_Bool m_bIsPrimaryKey; + sal_Bool m_bIsCurrency; + sal_Bool m_bHidden; public: OFieldDescription(); @@ -74,49 +74,49 @@ namespace dbaui ,sal_Bool _bUseAsDest = sal_False); ~OFieldDescription(); - void SetName(const ::rtl::OUString& _rName); + void SetName(const ::rtl::OUString& _rName); void SetDescription(const ::rtl::OUString& _rDescription); void SetHelpText(const ::rtl::OUString& _sHelptext); - void SetDefaultValue(const ::com::sun::star::uno::Any& _rDefaultValue); + void SetDefaultValue(const ::com::sun::star::uno::Any& _rDefaultValue); void SetControlDefault(const ::com::sun::star::uno::Any& _rControlDefault); - void SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue); + void SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue); void SetType(TOTypeInfoSP _pType); void SetTypeValue(sal_Int32 _nType); void SetTypeName(const ::rtl::OUString& _sTypeName); - void SetPrecision(const sal_Int32& _rPrecision); - void SetScale(const sal_Int32& _rScale); - void SetIsNullable(const sal_Int32& _rIsNullable); - void SetFormatKey(const sal_Int32& _rFormatKey); - void SetHorJustify(const SvxCellHorJustify& _rHorJustify); - void SetAutoIncrement(sal_Bool _bAuto); - void SetPrimaryKey(sal_Bool _bPKey); + void SetPrecision(const sal_Int32& _rPrecision); + void SetScale(const sal_Int32& _rScale); + void SetIsNullable(const sal_Int32& _rIsNullable); + void SetFormatKey(const sal_Int32& _rFormatKey); + void SetHorJustify(const SvxCellHorJustify& _rHorJustify); + void SetAutoIncrement(sal_Bool _bAuto); + void SetPrimaryKey(sal_Bool _bPKey); void SetCurrency(sal_Bool _bIsCurrency); /** copies the content of the field eescription into the column - @param _rxColumn the dest + @param _rxColumn the dest */ void copyColumnSettingsTo(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn); void FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bForce,sal_Bool _bReset); - ::rtl::OUString GetName() const; - ::rtl::OUString GetDescription() const; - ::rtl::OUString GetHelpText() const; - ::com::sun::star::uno::Any GetControlDefault() const; - ::rtl::OUString GetAutoIncrementValue() const; - sal_Int32 GetType() const; - ::rtl::OUString GetTypeName() const; - sal_Int32 GetPrecision() const; - sal_Int32 GetScale() const; - sal_Int32 GetIsNullable() const; - sal_Int32 GetFormatKey() const; - SvxCellHorJustify GetHorJustify() const; - TOTypeInfoSP getTypeInfo() const; - TOTypeInfoSP getSpecialTypeInfo() const; - sal_Bool IsAutoIncrement() const; - sal_Bool IsPrimaryKey() const; - sal_Bool IsCurrency() const; - sal_Bool IsNullable() const; + ::rtl::OUString GetName() const; + ::rtl::OUString GetDescription() const; + ::rtl::OUString GetHelpText() const; + ::com::sun::star::uno::Any GetControlDefault() const; + ::rtl::OUString GetAutoIncrementValue() const; + sal_Int32 GetType() const; + ::rtl::OUString GetTypeName() const; + sal_Int32 GetPrecision() const; + sal_Int32 GetScale() const; + sal_Int32 GetIsNullable() const; + sal_Int32 GetFormatKey() const; + SvxCellHorJustify GetHorJustify() const; + TOTypeInfoSP getTypeInfo() const; + TOTypeInfoSP getSpecialTypeInfo() const; + sal_Bool IsAutoIncrement() const; + sal_Bool IsPrimaryKey() const; + sal_Bool IsCurrency() const; + sal_Bool IsNullable() const; }; } #endif // DBAUI_FIELDDESCRIPTIONS_HXX diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 29e4d09e5670..727ffb091b0a 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,14 +42,14 @@ namespace dbaui OModuleClient m_aModuleClient; protected: - String m_strComment; // undo, redo comment + String m_strComment; // undo, redo comment public: TYPEINFO(); OCommentUndoAction(USHORT nCommentID) { m_strComment = String(ModuleRes(nCommentID)); } - virtual UniString GetComment() const { return m_strComment; } - }; + virtual UniString GetComment() const { return m_strComment; } + }; } #endif // DBAUI_GENERALUNDO_HXX diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 83d1926f1b1c..73f9db169066 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,22 +43,22 @@ namespace dbaui class OHTMLReader : public HTMLParser, public ODatabaseExport { String m_sCurrent; - sal_Int32 m_nTableCount; - sal_Int16 m_nWidth; - sal_Int16 m_nColumnWidth; // max. Spaltenbreite - sal_Bool m_bMetaOptions; // true when we scaned the meta information - sal_Bool m_bSDNum; - + sal_Int32 m_nTableCount; + sal_Int16 m_nWidth; + sal_Int16 m_nColumnWidth; // max. Spaltenbreite + sal_Bool m_bMetaOptions; // true when we scaned the meta information + sal_Bool m_bSDNum; + protected: - virtual void NextToken( int nToken ); // Basisklasse - virtual sal_Bool CreateTable(int nToken); + virtual void NextToken( int nToken ); // Basisklasse + virtual sal_Bool CreateTable(int nToken); virtual TypeSelectionPageFactory getTypeSelectionPageFactory(); - void TableDataOn(SvxCellHorJustify& eVal,int nToken); - void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); - sal_Int16 GetWidthPixel( const HTMLOption* pOption ); - void setTextEncoding(); + void TableDataOn(SvxCellHorJustify& eVal,int nToken); + void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); + sal_Int16 GetWidthPixel( const HTMLOption* pOption ); + void setTextEncoding(); void fetchOptions(); virtual ~OHTMLReader(); public: @@ -78,8 +78,8 @@ namespace dbaui const OTypeInfoMap* _pInfoMap, sal_Bool _bAutoIncrementEnabled); - virtual SvParserState CallParser();// Basisklasse - virtual void release(); + virtual SvParserState CallParser();// Basisklasse + virtual void release(); // birgt nur korrekte Daten, wenn der 1. CTOR benutzt wurde }; diff --git a/dbaccess/source/ui/inc/IClipBoardTest.hxx b/dbaccess/source/ui/inc/IClipBoardTest.hxx index 2f64d667379d..dfb7085965fb 100644 --- a/dbaccess/source/ui/inc/IClipBoardTest.hxx +++ b/dbaccess/source/ui/inc/IClipBoardTest.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,15 +34,15 @@ namespace dbaui class SAL_NO_VTABLE IClipboardTest { public: - virtual sal_Bool isCutAllowed() = 0; - virtual sal_Bool isCopyAllowed() = 0; - virtual sal_Bool isPasteAllowed() = 0; + virtual sal_Bool isCutAllowed() = 0; + virtual sal_Bool isCopyAllowed() = 0; + virtual sal_Bool isPasteAllowed() = 0; - virtual sal_Bool hasChildPathFocus() = 0; + virtual sal_Bool hasChildPathFocus() = 0; - virtual void copy() = 0; - virtual void cut() = 0; - virtual void paste() = 0; + virtual void copy() = 0; + virtual void cut() = 0; + virtual void paste() = 0; }; } #endif // DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index 8d39925c33e0..d6e082d77510 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,10 +53,10 @@ namespace dbaui public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const = 0; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() = 0; virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const = 0; virtual void clearPassword() = 0; - virtual sal_Bool saveDatasource() = 0; + virtual sal_Bool saveDatasource() = 0; virtual void setTitle(const ::rtl::OUString& _sTitle) = 0; /** enables or disables the user's possibility to confirm the settings diff --git a/dbaccess/source/ui/inc/IUpdateHelper.hxx b/dbaccess/source/ui/inc/IUpdateHelper.hxx index b9976efe9935..a13dbb5fa6a2 100644 --- a/dbaccess/source/ui/inc/IUpdateHelper.hxx +++ b/dbaccess/source/ui/inc/IUpdateHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 7ecb0dbf4aa4..bfedcaa2ed66 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,22 +36,22 @@ namespace dbaui class OJoinTableView; typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessible > OJoinDesignViewAccess_BASE; - /** the class OJoinDesignViewAccess represents the accessible object for join views + /** the class OJoinDesignViewAccess represents the accessible object for join views like the QueryDesign and the RelationDesign */ - class OJoinDesignViewAccess : public VCLXAccessibleComponent, public OJoinDesignViewAccess_BASE + class OJoinDesignViewAccess : public VCLXAccessibleComponent, public OJoinDesignViewAccess_BASE { - OJoinTableView* m_pTableView; // the window which I should give accessibility to + OJoinTableView* m_pTableView; // the window which I should give accessibility to protected: /** isEditable returns the current editable state - @return true if the controller is not readonly otherwise false + @return true if the controller is not readonly otherwise false */ virtual sal_Bool isEditable() const; public: /** OJoinDesignViewAccess needs a valid view */ - OJoinDesignViewAccess( OJoinTableView* _pTableView); + OJoinDesignViewAccess( OJoinTableView* _pTableView); // XInterface DECLARE_XINTERFACE( ) @@ -70,7 +70,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - OJoinTableView* getTableView() const { return m_pTableView; } + OJoinTableView* getTableView() const { return m_pTableView; } void notifyAccessibleEvent( const sal_Int16 _nEventId, @@ -80,7 +80,7 @@ namespace dbaui { NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); } - + void clearTableView(); }; } diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 7c27a499e783..bf8b02ddb4a4 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,32 +62,32 @@ namespace dbaui TTableConnectionData m_vTableConnectionData; TTableWindowData m_vTableData; - Fraction m_aZoom; - ::dbtools::SQLExceptionInfo m_aExceptionInfo; + Fraction m_aZoom; + ::dbtools::SQLExceptionInfo m_aExceptionInfo; - OAddTableDlg* m_pAddTableDialog; + OAddTableDlg* m_pAddTableDialog; ::std::auto_ptr< AddTableDialogContext > m_pDialogContext; Point m_aMinimumTableViewSize; // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); /** loads the information for the windows. - @param i_rViewSettings + @param i_rViewSettings The properties which comes from the layout information. */ void loadTableWindows( const ::comphelper::NamedValueCollection& i_rViewSettings ); /** loads the information for one window. - @param _rTable + @param _rTable The properties which comes from the layout information. */ void loadTableWindow( const ::comphelper::NamedValueCollection& i_rTableWindowSettings ); /** saves the TableWindows structure in a sequence of property values - @param _rViewProps + @param _rViewProps Contains the new sequence. */ void saveTableWindows( ::comphelper::NamedValueCollection& o_rViewSettings ) const; @@ -98,8 +98,8 @@ namespace dbaui // --------------------------------------------------------------- // attribute access - inline TTableWindowData* getTableWindowData() { return &m_vTableData; } - inline TTableConnectionData* getTableConnectionData() { return &m_vTableConnectionData;} + inline TTableWindowData* getTableWindowData() { return &m_vTableData; } + inline TTableConnectionData* getTableConnectionData() { return &m_vTableConnectionData;} inline OAddTableDlg* getAddTableDialog()const { return m_pAddTableDialog; } // --------------------------------------------------------------- @@ -120,19 +120,19 @@ namespace dbaui /** provides access to the OJoinDesignView belonging to the controller, which might or might not be the direct view (getView) */ - virtual OJoinDesignView* getJoinView(); + virtual OJoinDesignView* getJoinView(); // --------------------------------------------------------------- /** erase the data in the data vector - @param _pData + @param _pData the data whioch should be erased */ void removeConnectionData(const TTableConnectionData::value_type& _pData); void SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabWinList, long nOffsetX, long nOffsetY ); - void SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, long nOffsetY); + void SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, long nOffsetY); // --------------------------------------------------------------- // UNO interface overridables @@ -140,7 +140,7 @@ namespace dbaui virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); // ::com::sun::star::frame::XController virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); @@ -169,7 +169,7 @@ namespace dbaui // ask the user if the design should be saved when it is modified virtual short saveModified() = 0; // called when the orignal state should be reseted (first time load) - virtual void reset() = 0; + virtual void reset() = 0; virtual void describeSupportedFeatures(); AddTableDialogContext& impl_getDialogContext() const; diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index ce67cc1b8990..386d49777ab8 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,16 +46,16 @@ namespace dbaui class OScrollWindowHelper; class OJoinTableView; class OTableWindow; - + class OJoinDesignView : public ODataView { protected: - OScrollWindowHelper* m_pScrollWindow; // contains only the scrollbars - OJoinTableView* m_pTableView; // presents the upper window - OJoinController& m_rController; + OScrollWindowHelper* m_pScrollWindow; // contains only the scrollbars + OJoinTableView* m_pTableView; // presents the upper window + OJoinController& m_rController; public: - OJoinDesignView(Window* pParent, + OJoinDesignView(Window* pParent, OJoinController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); virtual ~OJoinDesignView(); diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 44f19b89c528..d56547513301 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,17 @@ namespace dbaui :public TransferableHelper ,public OJoinExchObj_Base { - static String m_sJoinFormat; - sal_Bool m_bFirstEntry; + static String m_sJoinFormat; + sal_Bool m_bFirstEntry; protected: - OJoinExchangeData m_jxdSourceDescription; - IDragTransferableListener* m_pDragListener; + OJoinExchangeData m_jxdSourceDescription; + IDragTransferableListener* m_pDragListener; virtual ~OJoinExchObj(); public: OJoinExchObj(const OJoinExchangeData& jxdSource,sal_Bool _bFirstEntry=sal_False); - + // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); @@ -69,13 +69,13 @@ namespace dbaui void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); - static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject); - static sal_Bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID=SOT_FORMATSTR_ID_SBA_JOIN); + static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject); + static sal_Bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID=SOT_FORMATSTR_ID_SBA_JOIN); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void DragFinished( sal_Int8 nDropAction ); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 72f5d054345e..a2fa86925441 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ namespace dbaui class OJoinTableView; class OScrollWindowHelper : public Window { - ScrollBar m_aHScrollBar; - ScrollBar m_aVScrollBar; - Window* m_pCornerWindow; - OJoinTableView* m_pTableView; + ScrollBar m_aHScrollBar; + ScrollBar m_aVScrollBar; + Window* m_pCornerWindow; + OJoinTableView* m_pTableView; protected: virtual void Resize(); @@ -78,7 +78,7 @@ namespace dbaui }; - class OJoinTableView : public Window + class OJoinTableView : public Window ,public IDragTransferableListener ,public DropTargetHelper { @@ -86,31 +86,31 @@ namespace dbaui public: DECLARE_STL_USTRINGACCESS_MAP(OTableWindow*,OTableWindowMap); private: - OTableWindowMap m_aTableMap; - ::std::vector<OTableConnection*> m_vTableConnection; - - Timer m_aDragScrollTimer; - Rectangle m_aDragRect; - Rectangle m_aSizingRect; - Point m_aDragOffset; - Point m_aScrollOffset; - Point m_ptPrevDraggingPos; - Size m_aOutputSize; - - - OTableWindow* m_pDragWin; - OTableWindow* m_pSizingWin; - OTableConnection* m_pSelectedConn; - - - BOOL m_bTrackingInitiallyMoved; + OTableWindowMap m_aTableMap; + ::std::vector<OTableConnection*> m_vTableConnection; + + Timer m_aDragScrollTimer; + Rectangle m_aDragRect; + Rectangle m_aSizingRect; + Point m_aDragOffset; + Point m_aScrollOffset; + Point m_ptPrevDraggingPos; + Size m_aOutputSize; + + + OTableWindow* m_pDragWin; + OTableWindow* m_pSizingWin; + OTableConnection* m_pSelectedConn; + + + BOOL m_bTrackingInitiallyMoved; DECL_LINK(OnDragScrollTimer, void*); - + protected: - OTableWindow* m_pLastFocusTabWin; - OJoinDesignView* m_pView; - OJoinDesignViewAccess* m_pAccessible; + OTableWindow* m_pLastFocusTabWin; + OJoinDesignView* m_pView; + OJoinDesignViewAccess* m_pAccessible; public: OJoinTableView( Window* pParent, OJoinDesignView* pView ); @@ -141,15 +141,15 @@ namespace dbaui virtual void RemoveTabWin( OTableWindow* pTabWin ); // alle TabWins verstecken (NICHT loeschen, sie werden in eine Undo-Action gepackt) - virtual void HideTabWins(); + virtual void HideTabWins(); virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) = 0; /** RemoveConnection allows to remove connections from join table view, it implies that the same as addConnection - @param _pConnection + @param _pConnection the connection which should be removed - @param _bDelete + @param _bDelete when truie then the connection will be deleted @return an iterator to next valid connection, so it can be used in any loop @@ -158,45 +158,45 @@ namespace dbaui /** allows to add new connections to join table view, it implies an invalidation of the features ID_BROWSER_ADDTABLE and SID_RELATION_ADD_RELATION also the modified flag will be set to true - @param _pConnection + @param _pConnection the connection which should be added - @param _bAddData - <TRUE/> when the data should also be appended + @param _bAddData + <TRUE/> when the data should also be appended */ void addConnection(OTableConnection* _pConnection,sal_Bool _bAddData = sal_True); - BOOL ScrollPane( long nDelta, BOOL bHoriz, BOOL bPaintScrollBars ); - ULONG GetTabWinCount(); - Point GetScrollOffset() const { return m_aScrollOffset; } + BOOL ScrollPane( long nDelta, BOOL bHoriz, BOOL bPaintScrollBars ); + ULONG GetTabWinCount(); + Point GetScrollOffset() const { return m_aScrollOffset; } - OJoinDesignView* getDesignView() const { return m_pView; } - OTableWindow* GetTabWindow( const String& rName ); + OJoinDesignView* getDesignView() const { return m_pView; } + OTableWindow* GetTabWindow( const String& rName ); - OTableConnection* GetSelectedConn() { return m_pSelectedConn; } - void DeselectConn(OTableConnection* pConn); // NULL ist ausdruecklich zugelassen, dann passiert nichts - void SelectConn(OTableConnection* pConn); + OTableConnection* GetSelectedConn() { return m_pSelectedConn; } + void DeselectConn(OTableConnection* pConn); // NULL ist ausdruecklich zugelassen, dann passiert nichts + void SelectConn(OTableConnection* pConn); - OTableWindowMap* GetTabWinMap() { return &m_aTableMap; } - const OTableWindowMap* GetTabWinMap() const { return &m_aTableMap; } + OTableWindowMap* GetTabWinMap() { return &m_aTableMap; } + const OTableWindowMap* GetTabWinMap() const { return &m_aTableMap; } /** gives a read only access to the connection vector */ - const ::std::vector<OTableConnection*>* getTableConnections() const { return &m_vTableConnection; } + const ::std::vector<OTableConnection*>* getTableConnections() const { return &m_vTableConnection; } - - BOOL ExistsAConn(const OTableWindow* pFromWin) const; + + BOOL ExistsAConn(const OTableWindow* pFromWin) const; /** getTableConnections searchs for all connections of a table - @param _pFromWin the table for which connections should be found - + @param _pFromWin the table for which connections should be found + @return an iterator which can be used to travel all connections of the table */ ::std::vector<OTableConnection*>::const_iterator getTableConnections(const OTableWindow* _pFromWin) const; /** getConnectionCount returns how many connection belongs to single table - @param _pFromWin the table for which connections should be found + @param _pFromWin the table for which connections should be found - @return the count of connections wich belongs to this table + @return the count of connections wich belongs to this table */ sal_Int32 getConnectionCount(const OTableWindow* _pFromWin) const; @@ -220,9 +220,9 @@ namespace dbaui virtual long PreNotify(NotifyEvent& rNEvt); // DnD stuff - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); /** can be used in derevied classes to make some special ui handling @@ -242,9 +242,9 @@ namespace dbaui void modified(); /** returns if teh given window is visible. - @param _rPoint + @param _rPoint The Point to check - @param _rSize + @param _rSize The Size to be check as well @return <TRUE/> if the area is visible otherwise <FALSE/> @@ -283,7 +283,7 @@ namespace dbaui ,const ::rtl::OUString& _rWinName); /** factory method to create table windows - @param _pData + @param _pData The data corresponding to the window. @return The new TableWindow @@ -302,18 +302,18 @@ namespace dbaui virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const; private: - void InitColors(); - BOOL ScrollWhileDragging(); + void InitColors(); + BOOL ScrollWhileDragging(); /** executePopup opens the context menu to delate a connection - @param _aPos the position where the popup menu should appear - @param _pSelConnection the connection which should be deleted + @param _aPos the position where the popup menu should appear + @param _pSelConnection the connection which should be deleted */ void executePopup(const Point& _aPos,OTableConnection* _pSelConnection); - /** invalidateAndModify invalidates this window without children and + /** invalidateAndModify invalidates this window without children and set the controller modified - @param _pAction a possible undo action to add at the controller + @param _pAction a possible undo action to add at the controller */ void invalidateAndModify(SfxUndoAction *_pAction=NULL); diff --git a/dbaccess/source/ui/inc/QEnumTypes.hxx b/dbaccess/source/ui/inc/QEnumTypes.hxx index 13ea803c3866..828595cd39b5 100644 --- a/dbaccess/source/ui/inc/QEnumTypes.hxx +++ b/dbaccess/source/ui/inc/QEnumTypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,35 +30,35 @@ namespace dbaui { - enum EOrderDir - { - ORDER_NONE=0, - ORDER_ASC, - ORDER_DESC + enum EOrderDir + { + ORDER_NONE=0, + ORDER_ASC, + ORDER_DESC }; enum EFunctionType { - FKT_NONE =0x00000000, - FKT_OTHER =0x00000001, - FKT_AGGREGATE =0x00000002, - FKT_CONDITION =0x00000004, - FKT_NUMERIC =0x00000008 + FKT_NONE =0x00000000, + FKT_OTHER =0x00000001, + FKT_AGGREGATE =0x00000002, + FKT_CONDITION =0x00000004, + FKT_NUMERIC =0x00000008 // wenn dieser Fkt.Typ gesetzt handelt es sich um EXISTS oder UNIQUE, der FieldName enthält das gesamte Statement }; - enum EConnectionSide - { - JTCS_FROM=0, - JTCS_TO + enum EConnectionSide + { + JTCS_FROM=0, + JTCS_TO }; - enum ETableFieldType - { - TAB_NORMAL_FIELD=0, - TAB_PRIMARY_FIELD + enum ETableFieldType + { + TAB_NORMAL_FIELD=0, + TAB_PRIMARY_FIELD }; - + enum EJoinType { FULL_JOIN=0, diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 4fa761fa3b64..5c781b77d74b 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ namespace dbaui class OTableConnection; class OQueryTableConnectionData; class OQueryContainerWindow; - + class OQueryDesignView : public OQueryView { enum ChildFocusState @@ -79,15 +79,15 @@ namespace dbaui NONE }; - Splitter m_aSplitter; + Splitter m_aSplitter; + + ::com::sun::star::lang::Locale m_aLocale; + ::rtl::OUString m_sDecimalSep; - ::com::sun::star::lang::Locale m_aLocale; - ::rtl::OUString m_sDecimalSep; - - OSelectionBrowseBox* m_pSelectionBox; // presents the lower window - ChildFocusState m_eChildFocus; - sal_Bool m_bInKeyEvent; - sal_Bool m_bInSplitHandler; + OSelectionBrowseBox* m_pSelectionBox; // presents the lower window + ChildFocusState m_eChildFocus; + sal_Bool m_bInKeyEvent; + sal_Bool m_bInSplitHandler; public: OQueryDesignView(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); @@ -115,13 +115,13 @@ namespace dbaui // window overloads virtual long PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); - + sal_Bool isSlotEnabled(sal_Int32 _nSlotId); void setSlotEnabled(sal_Int32 _nSlotId,sal_Bool _bEnable); void setNoneVisbleRow(sal_Int32 _nRows); - ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} - ::rtl::OUString getDecimalSeparator() const { return m_sDecimalSep;} + ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} + ::rtl::OUString getDecimalSeparator() const { return m_sDecimalSep;} SqlParseError InsertField( const OTableFieldDescRef& rInfo, sal_Bool bVis=sal_True, sal_Bool bActivate = sal_True); bool HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const; @@ -155,7 +155,7 @@ namespace dbaui const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rFieldDescriptions ); - ::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry, + ::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry, const String& _sCriteria, ::rtl::OUString& _rsErrorMessage, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn) const; diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index 5bd45e30ccb9..590ef4a42925 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,9 +37,9 @@ namespace dbaui struct TabWinsChangeNotification { - enum ACTION_TYPE { AT_ADDED_WIN, AT_REMOVED_WIN }; - ACTION_TYPE atActionPerformed; - String strAffectedTable; + enum ACTION_TYPE { AT_ADDED_WIN, AT_REMOVED_WIN }; + ACTION_TYPE atActionPerformed; + String strAffectedTable; TabWinsChangeNotification(ACTION_TYPE at, const String& str) : atActionPerformed(at), strAffectedTable(str) { } }; @@ -52,14 +52,14 @@ namespace dbaui class OQueryDesignView; class OQueryTableView : public OJoinTableView { - Link m_lnkTabWinsChangeHandler; + Link m_lnkTabWinsChangeHandler; protected: virtual void ConnDoubleClicked(OTableConnection* pConnection); virtual void KeyInput(const KeyEvent& rEvt); virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData); - + /** called when init fails at the tablewindowdata because the m_xTable object could not provide columns, but no exception was thrown. Expected to throw. */ @@ -76,10 +76,10 @@ namespace dbaui virtual void RemoveTabWin(OTableWindow* pTabWin); // und ein AddTabWin, das einen Alias vorgibt - void AddTabWin(const ::rtl::OUString& strDatabase, const ::rtl::OUString& strTableName, const ::rtl::OUString& strAlias, BOOL bNewTable = FALSE); + void AddTabWin(const ::rtl::OUString& strDatabase, const ::rtl::OUString& strTableName, const ::rtl::OUString& strAlias, BOOL bNewTable = FALSE); // TabWin suchen - OQueryTableWindow* FindTable(const String& rAliasName); - BOOL FindTableFromField(const String& rFieldName, OTableFieldDescRef& rInfo, USHORT& rCnt); + OQueryTableWindow* FindTable(const String& rAliasName); + BOOL FindTableFromField(const String& rFieldName, OTableFieldDescRef& rInfo, USHORT& rCnt); // Basisklasse ueberschrieben : Connections kreieren und loeschen virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest); @@ -96,14 +96,14 @@ namespace dbaui // natuerlich alle Connections an diesen Fenstern und alle Abfrage-Spalten, die auf diesen Tabellen basierten. // TabWin anzeigen oder verstecken (NICHT kreieren oder loeschen) - BOOL ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend); - void HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction); + BOOL ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend); + void HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction); // Sichbarkeit eines TabWins sicherstellen (+ Invalidieren der Connections) virtual void EnsureVisible(const OTableWindow* _pWin); // wieviel Tabellen mit einem bestimmten Namen habe ich schon ? - sal_Int32 CountTableAlias(const String& rName, sal_Int32& rMax); + sal_Int32 CountTableAlias(const String& rName, sal_Int32& rMax); // ein Feld einfuegen (wird einfach an das Elter weitergereicht void InsertField(const OTableFieldDescRef& rInfo); @@ -119,7 +119,7 @@ namespace dbaui // eine neu Connection bekanntgeben und einfuegen lassen, wenn nicht schon existent void NotifyTabConnection(const OQueryTableConnection& rNewConn, BOOL _bCreateUndoAction = TRUE); - Link SetTabWinsChangeHandler(const Link& lnk) { Link lnkRet = m_lnkTabWinsChangeHandler; m_lnkTabWinsChangeHandler = lnk; return lnkRet; } + Link SetTabWinsChangeHandler(const Link& lnk) { Link lnkRet = m_lnkTabWinsChangeHandler; m_lnkTabWinsChangeHandler = lnk; return lnkRet; } // der Handler bekommt einen Zeiger auf eine TabWinsChangeNotification-Struktur BOOL ExistsAVisitedConn(const OQueryTableWindow* pFrom) const; diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index d541e972169c..b8b4861c08cb 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace dbaui class OQueryTextView : public Window { friend class OQueryViewSwitch; - OSqlEdit* m_pEdit; + OSqlEdit* m_pEdit; public: OQueryTextView( OQueryContainerWindow* pParent ); virtual ~OQueryTextView(); @@ -63,7 +63,7 @@ namespace dbaui // allow access to our edit OSqlEdit* getSqlEdit() const { return m_pEdit; } - OQueryContainerWindow* getContainerWindow() { return static_cast< OQueryContainerWindow* >( GetParent() ); } + OQueryContainerWindow* getContainerWindow() { return static_cast< OQueryContainerWindow* >( GetParent() ); } protected: virtual void Resize(); }; diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index 9ddc6ce20108..a55803a53d1c 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,11 +41,11 @@ namespace dbaui class OQueryTextView; class OAddTableDlg; class OQueryContainerWindow; - class OQueryViewSwitch + class OQueryViewSwitch { - OQueryDesignView* m_pDesignView; - OQueryTextView* m_pTextView; - sal_Bool m_bAddTableDialogWasVisible; // true if so + OQueryDesignView* m_pDesignView; + OQueryTextView* m_pTextView; + sal_Bool m_bAddTableDialogWasVisible; // true if so public: OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); virtual ~OQueryViewSwitch(); @@ -78,8 +78,8 @@ namespace dbaui bool switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo ); void forceInitialView(); sal_Bool isSlotEnabled(sal_Int32 _nSlotId); - void setSlotEnabled(sal_Int32 _nSlotId,sal_Bool _bEnable); - void setNoneVisbleRow(sal_Int32 _nRows); + void setSlotEnabled(sal_Int32 _nSlotId,sal_Bool _bEnable); + void setNoneVisbleRow(sal_Int32 _nRows); void SaveUIConfig(); bool reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ); void GrabFocus(); @@ -87,8 +87,8 @@ namespace dbaui // returs the add table dialog from the design view OAddTableDlg* getAddTableDialog(); - OQueryDesignView* getDesignView() const { return m_pDesignView; } - OQueryContainerWindow* getContainer() const; + OQueryDesignView* getDesignView() const { return m_pDesignView; } + OQueryContainerWindow* getContainer() const; void SetPosSizePixel( Point _rPt,Size _rSize); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 184e0e97cbdb..19d4f801388b 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,19 +35,19 @@ namespace dbaui { - const UINT16 CARDINAL_UNDEFINED = 0x0000; - const UINT16 CARDINAL_ONE_MANY = 0x0001; - const UINT16 CARDINAL_MANY_ONE = 0x0002; - const UINT16 CARDINAL_ONE_ONE = 0x0004; + const UINT16 CARDINAL_UNDEFINED = 0x0000; + const UINT16 CARDINAL_ONE_MANY = 0x0001; + const UINT16 CARDINAL_MANY_ONE = 0x0002; + const UINT16 CARDINAL_ONE_ONE = 0x0004; class OConnectionLineData; //================================================================== - class ORelationTableConnectionData : public OTableConnectionData + class ORelationTableConnectionData : public OTableConnectionData { friend bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs); friend bool operator!=(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs) { return !(lhs == rhs); } - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; // @see com.sun.star.sdbc.KeyRule sal_Int32 m_nUpdateRules; @@ -55,8 +55,8 @@ namespace dbaui sal_Int32 m_nCardinality; BOOL checkPrimaryKey(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const; - BOOL IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); } - BOOL IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); } + BOOL IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); } + BOOL IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); } protected: virtual OConnectionLineDataRef CreateLineDataObj(); @@ -79,19 +79,19 @@ namespace dbaui @return true if successful */ virtual BOOL Update(); + + void SetCardinality(); + inline void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; } + inline void SetDeleteRules( sal_Int32 nAttr ){ m_nDeleteRules = nAttr; } - void SetCardinality(); - inline void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; } - inline void SetDeleteRules( sal_Int32 nAttr ){ m_nDeleteRules = nAttr; } - - inline sal_Int32 GetUpdateRules() const { return m_nUpdateRules; } - inline sal_Int32 GetDeleteRules() const { return m_nDeleteRules; } - inline sal_Int32 GetCardinality() const { return m_nCardinality; } + inline sal_Int32 GetUpdateRules() const { return m_nUpdateRules; } + inline sal_Int32 GetDeleteRules() const { return m_nDeleteRules; } + inline sal_Int32 GetCardinality() const { return m_nCardinality; } - BOOL IsConnectionPossible(); - void ChangeOrientation(); - BOOL DropRelation(); + BOOL IsConnectionPossible(); + void ChangeOrientation(); + BOOL DropRelation(); }; } diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx index 20912af0af1c..6e33ef2367d9 100644 --- a/dbaccess/source/ui/inc/RefFunctor.hxx +++ b/dbaccess/source/ui/inc/RefFunctor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,10 +47,10 @@ namespace dbaui { m_aFunction(_aType.get()); } -// inline void operator()(const ::rtl::Reference<T>& _aType) -// { -// m_aFunction(_aType.get()); -// } +// inline void operator()(const ::rtl::Reference<T>& _aType) +// { +// m_aFunction(_aType.get()); +// } }; // ----------------------------------------------------------------------------- } // namespace dbaui diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index ab0366263e50..d5a1d5b299e6 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,14 +44,14 @@ namespace dbaui virtual TTableConnectionData::value_type getConnectionData() const = 0; /** setValid set the valid inside, can be used for OK buttons - @param _bValid true when the using control allows an update + @param _bValid true when the using control allows an update */ virtual void setValid(sal_Bool _bValid) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() = 0; /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists - @param _pConnectionData the connection which exists between the new tables + @param _pConnectionData the connection which exists between the new tables */ virtual void notifyConnectionChange() = 0; }; diff --git a/dbaccess/source/ui/inc/RelationControl.hrc b/dbaccess/source/ui/inc/RelationControl.hrc index 6f0c811db3da..1f833d9fb922 100644 --- a/dbaccess/source/ui/inc/RelationControl.hrc +++ b/dbaccess/source/ui/inc/RelationControl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index 55983b1dff6e..ec5108d280a9 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,28 +37,28 @@ namespace dbaui //======================================================================== class OTableListBoxControl; class OTableConnectionData; - class ORelationTableConnectionData; - class IRelationControlInterface; + class ORelationTableConnectionData; + class IRelationControlInterface; class ORelationControl; - class OTableListBoxControl : public Window + class OTableListBoxControl : public Window { - FixedLine m_aFL_InvolvedTables; - ListBox m_lmbLeftTable, + FixedLine m_aFL_InvolvedTables; + ListBox m_lmbLeftTable, m_lmbRightTable; - FixedLine m_aFL_InvolvedFields; + FixedLine m_aFL_InvolvedFields; - ORelationControl* m_pRC_Tables; - const OJoinTableView::OTableWindowMap* m_pTableMap; - IRelationControlInterface* m_pParentDialog; - String m_strCurrentLeft; - String m_strCurrentRight; + ORelationControl* m_pRC_Tables; + const OJoinTableView::OTableWindowMap* m_pTableMap; + IRelationControlInterface* m_pParentDialog; + String m_strCurrentLeft; + String m_strCurrentRight; private: DECL_LINK( OnTableChanged, ListBox* ); public: OTableListBoxControl(Window* _pParent, const ResId& _rResId, - const OJoinTableView::OTableWindowMap* _pTableMap, + const OJoinTableView::OTableWindowMap* _pTableMap, IRelationControlInterface* _pParentDialog); virtual ~OTableListBoxControl(); @@ -67,7 +67,7 @@ namespace dbaui void fillListBoxes(); /** fillAndDisable fill the listboxes only with one entry and then disable them - @param _pConnectionData + @param _pConnectionData contains the data which should be filled into the listboxes */ void fillAndDisable(const TTableConnectionData::value_type& _pConnectionData); @@ -83,7 +83,7 @@ namespace dbaui void NotifyCellChange(); /** Init is a call through to the control inside this one - @param _pConnData + @param _pConnData the connection data which is used to init the control */ void Init(const TTableConnectionData::value_type& _pConnData); @@ -92,7 +92,7 @@ namespace dbaui BOOL SaveModified(); - TTableWindowData::value_type getReferencingTable() const; + TTableWindowData::value_type getReferencingTable() const; /** getContainer returns the container interface @return the interface of the container diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 3b0e375f8537..e16dfa9356da 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,22 +42,22 @@ namespace dbaui class OTableWindow; class ORelationController : public OJoinController { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; ::std::auto_ptr<WaitObject> m_pWaitObject; - ULONG m_nThreadEvent; - sal_Bool m_bRelationsPossible; + ULONG m_nThreadEvent; + sal_Bool m_bRelationsPossible; protected: // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); - ORelationDesignView* getRelationView() { return static_cast<ORelationDesignView*>( getView() ); } + ORelationDesignView* getRelationView() { return static_cast<ORelationDesignView*>( getView() ); } void loadData(); TTableWindowData::value_type existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const; - + // load the window positions out of the datasource void loadLayoutInformation(); void loadTableData(const ::com::sun::star::uno::Any& _aTable); @@ -67,9 +67,9 @@ namespace dbaui ~ORelationController(); // temp void SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabWinList, long nOffsetX, long nOffsetY ); - + void mergeData(const TTableConnectionData& _aConnectionData); - + virtual sal_Bool Construct(Window* pParent); // XServiceInfo diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index 423885b3ee38..dae48967302a 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace dbaui class ORelationTableConnectionData; class OConnectionLineData; class ORelationController; - + class ORelationDesignView : public OJoinDesignView { public: @@ -56,7 +56,7 @@ namespace dbaui virtual void Construct(); virtual void initialize(); - + virtual long PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); }; diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index bbd66b2ba7b8..044eaa418ed3 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ namespace dbaui ,public IRelationControlInterface { OModuleClient m_aModuleClient; - ::std::auto_ptr<OTableListBoxControl> m_pTableControl; - OJoinTableView::OTableWindowMap* m_pTableMap; + ::std::auto_ptr<OTableListBoxControl> m_pTableControl; + OJoinTableView::OTableWindowMap* m_pTableMap; FixedLine aFL_CascUpd; RadioButton aRB_NoCascUpd, @@ -57,21 +57,21 @@ namespace dbaui aRB_CascUpdNull, aRB_CascUpdDefault; FixedLine aFL_CascDel; - RadioButton aRB_NoCascDel, + RadioButton aRB_NoCascDel, aRB_CascDel, aRB_CascDelNull, aRB_CascDelDefault; - OKButton aPB_OK; + OKButton aPB_OK; CancelButton aPB_CANCEL; - HelpButton aPB_HELP; - + HelpButton aPB_HELP; - TTableConnectionData::value_type m_pConnData; - TTableConnectionData::value_type m_pOrigConnData; + + TTableConnectionData::value_type m_pConnData; + TTableConnectionData::value_type m_pOrigConnData; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - BOOL m_bTriedOneUpdate; + BOOL m_bTriedOneUpdate; public: ORelationDialog(OJoinTableView* pParent, @@ -94,19 +94,19 @@ namespace dbaui virtual TTableConnectionData::value_type getConnectionData() const; /** setValid set the valid inside, can be used for OK buttons - @param _bValid true when the using control allows an update + @param _bValid true when the using control allows an update */ virtual void setValid(sal_Bool _bValid); /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists - @param _pConnectionData the connection which exists between the new tables + @param _pConnectionData the connection which exists between the new tables */ virtual void notifyConnectionChange(); protected: void Init(const TTableConnectionData::value_type& _pConnectionData); private: - DECL_LINK( OKClickHdl, Button* ); + DECL_LINK( OKClickHdl, Button* ); }; } #endif // DBAUI_RELATIONDIALOG_HXX diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index b7213e440754..ab0533164091 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef DBAUI_RELATION_TABLEVIEW_HXX #define DBAUI_RELATION_TABLEVIEW_HXX - + #include "JoinTableView.hxx" #include <comphelper/containermultiplexer.hxx> #include <cppuhelper/basemutex.hxx> @@ -40,12 +40,12 @@ namespace dbaui , public OJoinTableView , public ::comphelper::OContainerListener { - OTableConnection* m_pExistingConnection; // is set when a connection was draged on an existing connection + OTableConnection* m_pExistingConnection; // is set when a connection was draged on an existing connection TTableConnectionData::value_type m_pCurrentlyTabConnData; // set when we creating a connection with more than one keycolumn - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; bool m_bInRemove; - + virtual void ConnDoubleClicked( OTableConnection* pConnection ); virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL bNewTable = FALSE); diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 299274aef315..457768327088 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,25 +39,25 @@ namespace dbaui { class ORTFReader : public SvRTFParser , public ODatabaseExport { - ::std::vector<sal_Int32> m_vecColor; + ::std::vector<sal_Int32> m_vecColor; - // void insertValueIntoColumn(); + // void insertValueIntoColumn(); protected: - virtual sal_Bool CreateTable(int nToken); - virtual void NextToken( int nToken ); // Basisklasse + virtual sal_Bool CreateTable(int nToken); + virtual void NextToken( int nToken ); // Basisklasse virtual TypeSelectionPageFactory getTypeSelectionPageFactory(); ~ORTFReader(); public: - ORTFReader( SvStream& rIn, + ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* rList = 0, const OTypeInfoMap* _pInfoMap = 0); // wird f"ur auto. Typ-Erkennung gebraucht - ORTFReader( SvStream& rIn, + ORTFReader( SvStream& rIn, sal_Int32 nRows, const TPositions &_rColumnPositions, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, @@ -66,8 +66,8 @@ namespace dbaui const OTypeInfoMap* _pInfoMap, sal_Bool _bAutoIncrementEnabled); - virtual SvParserState CallParser();// Basisklasse - virtual void release(); + virtual SvParserState CallParser();// Basisklasse + virtual void release(); // birgt nur korrekte Daten, wenn der 2. CTOR benutzt wurde // ansonsten wird die SbaColumnList ohne "Anderung zur"uckgegeben }; diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx index 6835c99eef3e..5eda7f69940a 100644 --- a/dbaccess/source/ui/inc/ScrollHelper.hxx +++ b/dbaccess/source/ui/inc/ScrollHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ namespace dbaui { class OScrollHelper { - Link m_aUpScroll; - Link m_aDownScroll; + Link m_aUpScroll; + Link m_aDownScroll; public: /** default contructor */ @@ -46,7 +46,7 @@ namespace dbaui ~OScrollHelper(); /** set the memthod which should be called when scrolling up - @param _rUpScroll + @param _rUpScroll the method to set */ inline void setUpScrollMethod( const Link& _rUpScroll ) @@ -55,7 +55,7 @@ namespace dbaui } /** set the memthod which should be called when scrolling down - @param _rDownScroll + @param _rDownScroll the method to set */ inline void setDownScrollMethod( const Link& _rDownScroll ) @@ -64,9 +64,9 @@ namespace dbaui } /** check if a scroll method has to be called - @param _rPoint + @param _rPoint the current selection point - @param _rOutputSize + @param _rOutputSize the output size of the window */ void scroll(const Point& _rPoint, const Size& _rOutputSize); diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index edeed2d4f40b..2356e9d0ed58 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ namespace dbaui class OSQLNameChecker { ::rtl::OUString m_sAllowedChars; - sal_Bool m_bOnlyUpperCase; - sal_Bool m_bCheck; // true when we should check for invalid chars + sal_Bool m_bOnlyUpperCase; + sal_Bool m_bCheck; // true when we should check for invalid chars public: OSQLNameChecker(const ::rtl::OUString& _rAllowedChars) :m_sAllowedChars(_rAllowedChars) @@ -46,12 +46,12 @@ namespace dbaui { } - void setUpperCase(sal_Bool _bUpper=sal_True) - { - m_bOnlyUpperCase = _bUpper; + void setUpperCase(sal_Bool _bUpper=sal_True) + { + m_bOnlyUpperCase = _bUpper; } - void setAllowedChars(const ::rtl::OUString& _rAllowedChars) - { + void setAllowedChars(const ::rtl::OUString& _rAllowedChars) + { m_sAllowedChars = _rAllowedChars; } // default is false because it is initialized with true @@ -66,19 +66,19 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameEdit(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) + OSQLNameEdit(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) : Edit(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameEdit(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) + OSQLNameEdit(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) : Edit(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { } // Window overload - // virtual long PreNotify( NotifyEvent& rNEvt ); + // virtual long PreNotify( NotifyEvent& rNEvt ); // Edit virtual void Modify(); }; @@ -87,16 +87,16 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameComboBox(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) + OSQLNameComboBox(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) : ComboBox(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) + OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) : ComboBox(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { - } + } // Window overload // Edit diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 5eb3429ce931..02519af26207 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ namespace dbaui DBG_NAMEEX(OTableConnection) class OTableConnection : public Window { - ::std::vector<OConnectionLine*> m_vConnLine; - TTableConnectionData::value_type + ::std::vector<OConnectionLine*> m_vConnLine; + TTableConnectionData::value_type m_pData; - OJoinTableView* m_pParent; + OJoinTableView* m_pParent; - BOOL m_bSelected; + BOOL m_bSelected; void Init(); /** clearLineData loops through the vector and deletes all lines @@ -73,35 +73,35 @@ namespace dbaui virtual ~OTableConnection(); OTableConnection& operator=( const OTableConnection& rConn ); + - - void Select(); - void Deselect(); - BOOL IsSelected() const { return m_bSelected; } - BOOL CheckHit( const Point& rMousePos ) const; - bool InvalidateConnection(); - void UpdateLineList(); + void Select(); + void Deselect(); + BOOL IsSelected() const { return m_bSelected; } + BOOL CheckHit( const Point& rMousePos ) const; + bool InvalidateConnection(); + void UpdateLineList(); OTableWindow* GetSourceWin() const; OTableWindow* GetDestWin() const; bool RecalcLines(); /** isTableConnection - @param _pTable the table where we should check if we belongs to it + @param _pTable the table where we should check if we belongs to it - @return true when the source or the destination window are equal + @return true when the source or the destination window are equal */ bool isTableConnection(const OTableWindow* _pTable) { return (_pTable == GetSourceWin() || _pTable == GetDestWin()); } - Rectangle GetBoundingRect() const; + Rectangle GetBoundingRect() const; - inline TTableConnectionData::value_type GetData() const { return m_pData; } + inline TTableConnectionData::value_type GetData() const { return m_pData; } const ::std::vector<OConnectionLine*>* GetConnLineList() const { return &m_vConnLine; } - inline OJoinTableView* GetParent() const { return m_pParent; } - virtual void Draw( const Rectangle& rRect ); + inline OJoinTableView* GetParent() const { return m_pParent; } + virtual void Draw( const Rectangle& rRect ); using Window::Draw; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 0a91e9bf5cc2..2d558249f1c3 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,20 +39,20 @@ namespace dbaui { #define MAX_CONN_COUNT 2 //================================================================== - // ConnData ---------->* ConnLineData - // ^1 ^1 - // | | - // Conn ---------->* ConnLine + // ConnData ---------->* ConnLineData + // ^1 ^1 + // | | + // Conn ---------->* ConnLine //================================================================== - + //================================================================== /* - the class OTableConnectionData contains all connection data which exists between two windows + the class OTableConnectionData contains all connection data which exists between two windows **/ class OTableConnectionData { - + protected: TTableWindowData::value_type m_pReferencingTable; TTableWindowData::value_type m_pReferencedTable; @@ -60,7 +60,7 @@ namespace dbaui OConnectionLineDataVec m_vConnLineData; - void Init(); + void Init(); virtual OConnectionLineDataRef CreateLineDataObj(); virtual OConnectionLineDataRef CreateLineDataObj( const OConnectionLineData& rConnLineData ); diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 5b61c5ada9eb..0b07cccd51e0 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,32 +44,32 @@ namespace dbaui { class OTableRow; class OFieldDescription; - typedef OSingleDocumentController OTableController_BASE; + typedef OSingleDocumentController OTableController_BASE; class OTableController : public OTableController_BASE { private: OModuleClient m_aModuleClient; - ::std::vector< ::boost::shared_ptr<OTableRow> > m_vRowList; - OTypeInfoMap m_aTypeInfo; + ::std::vector< ::boost::shared_ptr<OTableRow> > m_vRowList; + OTypeInfoMap m_aTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - - ::rtl::OUString m_sCatalogName; // catalog for update data - ::rtl::OUString m_sSchemaName; // schema for update data - ::rtl::OUString m_sName; // table for update data - ::rtl::OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource - String m_sTypeNames; // these type names are the ones out of the resource file - TOTypeInfoSP m_pTypeInfo; // fall back when type is unkown because database driver has a failure + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - sal_Bool m_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has a AutoIncrementValue property in their info property - sal_Bool m_bNew : 1; // is true when we create a new table + ::rtl::OUString m_sCatalogName; // catalog for update data + ::rtl::OUString m_sSchemaName; // schema for update data + ::rtl::OUString m_sName; // table for update data + ::rtl::OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource + String m_sTypeNames; // these type names are the ones out of the resource file + TOTypeInfoSP m_pTypeInfo; // fall back when type is unkown because database driver has a failure + sal_Bool m_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has a AutoIncrementValue property in their info property + sal_Bool m_bNew : 1; // is true when we create a new table + void reSyncRows(); - void assignTable(); // set the table if a name is given + void assignTable(); // set the table if a name is given void loadData(); - sal_Bool checkColumns(sal_Bool _bNew) throw(::com::sun::star::sdbc::SQLException); // check if we have double column names + sal_Bool checkColumns(sal_Bool _bNew) throw(::com::sun::star::sdbc::SQLException); // check if we have double column names String createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxTables,const String& _rDefault); void appendColumns(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup,sal_Bool _bNew,sal_Bool _bKeyColumns = sal_False); void appendPrimaryKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup,sal_Bool _bNew); @@ -77,63 +77,63 @@ namespace dbaui void dropPrimaryKey(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getKeyColumns() const; ::rtl::OUString createUniqueName(const ::rtl::OUString& _rName); - + void reload(); - + // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual void losingConnection( ); virtual ::rtl::OUString getPrivateTitle( ) const; - - void doEditIndexes(); - sal_Bool doSaveDoc(sal_Bool _bSaveAs); + + void doEditIndexes(); + sal_Bool doSaveDoc(sal_Bool _bSaveAs); virtual ~OTableController(); public: OTableController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getTable() { return m_xTable;} - - sal_Bool isAddAllowed() const; - sal_Bool isDropAllowed() const; - sal_Bool isAlterAllowed() const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getTable() { return m_xTable;} + + sal_Bool isAddAllowed() const; + sal_Bool isDropAllowed() const; + sal_Bool isAlterAllowed() const; bool isAutoIncrementPrimaryKey() const; - inline sal_Bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } - inline const ::rtl::OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } - + inline sal_Bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } + inline const ::rtl::OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } + virtual void impl_onModifyChanged(); - // const ::connectivity::OSQLParseNode* getParseTree() const { return m_aSqlIterator.getParseTree();} + // const ::connectivity::OSQLParseNode* getParseTree() const { return m_aSqlIterator.getParseTree();} // need for undo's and redo's SfxUndoManager* getUndoMgr(); - inline ::std::vector< ::boost::shared_ptr<OTableRow> >* getRows() { return &m_vRowList; } + inline ::std::vector< ::boost::shared_ptr<OTableRow> >* getRows() { return &m_vRowList; } /// returns the postion of the the first empty row - sal_Int32 getFirstEmptyRowPosition(); - - inline const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } - - inline TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } - TOTypeInfoSP getTypeInfoByType(sal_Int32 _nDataType) const; + sal_Int32 getFirstEmptyRowPosition(); - inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; } + inline const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } - virtual sal_Bool Construct(Window* pParent); + inline TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } + TOTypeInfoSP getTypeInfoByType(sal_Int32 _nDataType) const; + + inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; } + + virtual sal_Bool Construct(Window* pParent); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); @@ -144,7 +144,7 @@ namespace dbaui static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); - // + // virtual void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxIn); virtual void Save(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOut); diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 86012fa3706f..778739896747 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ namespace dbaui /// unary_function Functor object for class DataFlavorExVector::value_type returntype is bool struct TAppSupportedSotFunctor : ::std::unary_function<DataFlavorExVector::value_type,bool> { - ElementType eEntryType; - sal_Bool bQueryDrop; + ElementType eEntryType; + sal_Bool bQueryDrop; TAppSupportedSotFunctor(const ElementType& _eEntryType,sal_Bool _bQueryDrop) : eEntryType(_eEntryType) , bQueryDrop(_bQueryDrop) @@ -58,12 +58,12 @@ namespace dbaui { switch (_aType.mnSotId) { - case SOT_FORMAT_RTF: // RTF data descriptions - case SOT_FORMATSTR_ID_HTML: // HTML data descriptions - case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor + case SOT_FORMAT_RTF: // RTF data descriptions + case SOT_FORMATSTR_ID_HTML: // HTML data descriptions + case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor return (E_TABLE == eEntryType); - case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor - case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command + case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor + case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command return ((E_QUERY == eEntryType) || ( !bQueryDrop && E_TABLE == eEntryType)); } return false; @@ -74,24 +74,24 @@ namespace dbaui { private: OGenericUnoController* m_pController; - ::rtl::OUString m_sTableNameForAppend; + ::rtl::OUString m_sTableNameForAppend; public: // is needed to describe the drop target struct DropDescriptor { - ::svx::ODataAccessDescriptor aDroppedData; + ::svx::ODataAccessDescriptor aDroppedData; //dyf add 20070601 //for transfor the tablename ::rtl::OUString sDefaultTableName; //dyf add end - String aUrl; - SotStorageStreamRef aHtmlRtfStorage; - ElementType nType; + String aUrl; + SotStorageStreamRef aHtmlRtfStorage; + ElementType nType; SvLBoxEntry* pDroppedAt; - sal_Int8 nAction; - sal_Bool bHtml; - sal_Bool bError; + sal_Int8 nAction; + sal_Bool bHtml; + sal_Bool bError; DropDescriptor() : nType(E_TABLE),pDroppedAt(NULL),nAction(DND_ACTION_NONE) { } }; @@ -99,9 +99,9 @@ namespace dbaui OTableCopyHelper(OGenericUnoController* _pControler); /** pastes a table into the data source - @param _rPasteData + @param _rPasteData The data helper. - @param _sDestDataSourceName + @param _sDestDataSourceName The name of the dest data source. */ void pasteTable( const TransferableDataHelper& _rTransData @@ -109,11 +109,11 @@ namespace dbaui ,const SharedConnection& _xConnection); /** pastes a table into the data source - @param _nFormatId + @param _nFormatId The format which should be copied. - @param _rPasteData + @param _rPasteData The data helper. - @param _sDestDataSourceName + @param _sDestDataSourceName The name of the dest data source. */ void pasteTable( SotFormatStringId _nFormatId @@ -122,9 +122,9 @@ namespace dbaui ,const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF - @param _rDesc + @param _rDesc The Drop descriptor - @param _bCheck + @param _bCheck If set to <TRUE/> than the controller checks only if a copy is possible. @param _xConnection The connection @@ -134,9 +134,9 @@ namespace dbaui const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF - @param _rDesc + @param _rDesc The Drop descriptor - @param _bCheck + @param _bCheck If set to <TRUE/> than the controller checks only if a copy is possible. @param _xConnection The connection @@ -148,7 +148,7 @@ namespace dbaui /** copies a table which was constructed by tags like HTML or RTF @param _aDroppedData The dropped data - @param _rDesc + @param _rDesc IN/OUT parameter @param _xConnection The connection @@ -166,9 +166,9 @@ namespace dbaui private: /** pastes a table into the data source - @param _rPasteData + @param _rPasteData The data descriptor. - @param _sDestDataSourceName + @param _sDestDataSourceName The name of the dest data source. */ void pasteTable( @@ -193,7 +193,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBUI_TABLECOPYHELPER_HXX diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index 9acd1fbf02eb..c9468a15b597 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,28 +46,28 @@ namespace dbaui friend class OTableDesignUndoAct; protected: - long m_nDataPos; // derzeit benoetigte Zeile - long m_nCurrentPos; // Aktuelle Position der ausgewaehlten Column + long m_nDataPos; // derzeit benoetigte Zeile + long m_nCurrentPos; // Aktuelle Position der ausgewaehlten Column private: - USHORT m_nCurUndoActId; + USHORT m_nCurUndoActId; protected: - BOOL m_bCurrentModified; - BOOL m_bUpdatable; - BOOL m_bClipboardFilled; + BOOL m_bCurrentModified; + BOOL m_bUpdatable; + BOOL m_bClipboardFilled; public: OTableRowView(Window* pParent); virtual ~OTableRowView(); - virtual void SetCellData( long nRow, USHORT nColId, const TOTypeInfoSP& _pTypeInfo ) = 0; - virtual void SetCellData( long nRow, USHORT nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0; - virtual ::com::sun::star::uno::Any GetCellData( long nRow, USHORT nColId ) = 0; - virtual void SetControlText( long nRow, USHORT nColId, const String& rText ) = 0; - virtual String GetControlText( long nRow, USHORT nColId ) = 0; + virtual void SetCellData( long nRow, USHORT nColId, const TOTypeInfoSP& _pTypeInfo ) = 0; + virtual void SetCellData( long nRow, USHORT nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0; + virtual ::com::sun::star::uno::Any GetCellData( long nRow, USHORT nColId ) = 0; + virtual void SetControlText( long nRow, USHORT nColId, const String& rText ) = 0; + virtual String GetControlText( long nRow, USHORT nColId ) = 0; virtual OTableDesignView* GetView() const = 0; - USHORT GetCurUndoActId(){ return m_nCurUndoActId; } + USHORT GetCurUndoActId(){ return m_nCurUndoActId; } // IClipboardTest virtual void cut(); @@ -77,14 +77,14 @@ namespace dbaui protected: void Paste( long nRow ); - virtual void CopyRows() = 0; - virtual void DeleteRows() = 0; - virtual void InsertRows( long nRow ) = 0; - virtual void InsertNewRows( long nRow ) = 0; + virtual void CopyRows() = 0; + virtual void DeleteRows() = 0; + virtual void InsertRows( long nRow ) = 0; + virtual void InsertNewRows( long nRow ) = 0; - virtual sal_Bool IsPrimaryKeyAllowed( long nRow ) = 0; - virtual sal_Bool IsInsertNewAllowed( long nRow ) = 0; - virtual sal_Bool IsDeleteAllowed( long nRow ) = 0; + virtual sal_Bool IsPrimaryKeyAllowed( long nRow ) = 0; + virtual sal_Bool IsInsertNewAllowed( long nRow ) = 0; + virtual sal_Bool IsDeleteAllowed( long nRow ) = 0; virtual BOOL IsUpdatable() const {return m_bUpdatable;} virtual void SetUpdatable( BOOL bUpdate=TRUE ); diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index 5e7c440a1466..b3d40d329812 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,9 +43,9 @@ namespace dbaui ,public IClipboardTest { private: - String m_sHelpText; - MultiLineEdit* m_pTextWin; - USHORT m_nDummy; + String m_sHelpText; + MultiLineEdit* m_pTextWin; + USHORT m_nDummy; protected: virtual void Resize(); diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index b7bc8356ed76..4608010afa93 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,9 +42,9 @@ namespace dbaui //================================================================== class OTableBorderWindow : public Window { - Splitter m_aHorzSplitter; - OTableFieldDescWin* m_pFieldDescWin; - OTableEditorCtrl* m_pEditorCtrl; + Splitter m_aHorzSplitter; + OTableFieldDescWin* m_pFieldDescWin; + OTableEditorCtrl* m_pEditorCtrl; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); void ArrangeChilds( long nSplitPos ,Rectangle& rRect); @@ -58,8 +58,8 @@ namespace dbaui virtual void Resize(); virtual void GetFocus(); - OTableEditorCtrl* GetEditorCtrl() const { return m_pEditorCtrl; } - OTableFieldDescWin* GetDescWin() const { return m_pFieldDescWin; } + OTableEditorCtrl* GetEditorCtrl() const { return m_pEditorCtrl; } + OTableFieldDescWin* GetDescWin() const { return m_pFieldDescWin; } }; //================================================================== class OTableDesignView : public ODataView @@ -72,33 +72,33 @@ namespace dbaui NONE }; private: - ::com::sun::star::lang::Locale m_aLocale; - OTableBorderWindow* m_pWin; - OTableController& m_rController; - ChildFocusState m_eChildFocus; + ::com::sun::star::lang::Locale m_aLocale; + OTableBorderWindow* m_pWin; + OTableController& m_rController; + ChildFocusState m_eChildFocus; IClipboardTest* getActiveChild() const; protected: - + // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect); public: - OTableDesignView( Window* pParent, + OTableDesignView( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&, OTableController& _rController); virtual ~OTableDesignView(); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void GetFocus(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void GetFocus(); - OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } - OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } - OTableController& getController() const { return m_rController; } + OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } + OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } + OTableController& getController() const { return m_rController; } - ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} + ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} // IClipboardTest virtual sal_Bool isCutAllowed(); diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 6f716e30d5e8..1438d5bdac73 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,23 +53,23 @@ namespace dbaui ::std::vector< ::rtl::OUString > m_aCriteria; - ::rtl::OUString m_aTableName; - ::rtl::OUString m_aAliasName; // table range - ::rtl::OUString m_aFieldName; // column - ::rtl::OUString m_aFieldAlias; // column alias - ::rtl::OUString m_aFunctionName; // enth"alt den Funktionsnamen, nur wenn m_eFunctionType != FKT_NONE gesetzt - - Window* m_pTabWindow; - - sal_Int32 m_eDataType; - sal_Int32 m_eFunctionType; - ETableFieldType m_eFieldType; - EOrderDir m_eOrderDir; - sal_Int32 m_nIndex; - sal_Int32 m_nColWidth; - sal_uInt16 m_nColumnId; - sal_Bool m_bGroupBy; - sal_Bool m_bVisible; + ::rtl::OUString m_aTableName; + ::rtl::OUString m_aAliasName; // table range + ::rtl::OUString m_aFieldName; // column + ::rtl::OUString m_aFieldAlias; // column alias + ::rtl::OUString m_aFunctionName; // enth"alt den Funktionsnamen, nur wenn m_eFunctionType != FKT_NONE gesetzt + + Window* m_pTabWindow; + + sal_Int32 m_eDataType; + sal_Int32 m_eFunctionType; + ETableFieldType m_eFieldType; + EOrderDir m_eOrderDir; + sal_Int32 m_nIndex; + sal_Int32 m_nColWidth; + sal_uInt16 m_nColumnId; + sal_Bool m_bGroupBy; + sal_Bool m_bVisible; // !!!! bitte bei Erweiterung um neue Felder auch IsEmpty mitpflegen !!!! @@ -79,56 +79,56 @@ namespace dbaui OTableFieldDesc(const OTableFieldDesc& rRS); ~OTableFieldDesc(); - inline sal_Bool IsEmpty() const; - + inline sal_Bool IsEmpty() const; + OTableFieldDesc& operator=( const OTableFieldDesc& _aField ); - sal_Bool operator==( const OTableFieldDesc& rDesc ); - - sal_Bool IsVisible() const { return m_bVisible;} - sal_Bool IsGroupBy() const { return m_bGroupBy;} - - void SetVisible( sal_Bool bVis=sal_True ){ m_bVisible = bVis;} - void SetGroupBy( sal_Bool bGb=sal_False ){ m_bGroupBy = bGb;} - void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin;} - void SetField( const ::rtl::OUString& rF ){ m_aFieldName = rF;} - void SetFieldAlias( const ::rtl::OUString& rF ){ m_aFieldAlias = rF;} - void SetTable( const ::rtl::OUString& rT ){ m_aTableName = rT;} - void SetAlias( const ::rtl::OUString& rT ){ m_aAliasName = rT;} - void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT;} - void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; } - void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; } - void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; } - void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit); - void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; } - void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; } - void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; } - void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; } - - - ::rtl::OUString GetField() const { return m_aFieldName;} - ::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;} - ::rtl::OUString GetTable() const { return m_aTableName;} - ::rtl::OUString GetAlias() const { return m_aAliasName;} - ::rtl::OUString GetFunction() const { return m_aFunctionName;} - sal_Int32 GetDataType() const { return m_eDataType; } - ETableFieldType GetFieldType() const { return m_eFieldType; } - EOrderDir GetOrderDir() const { return m_eOrderDir; } - ::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const; - sal_Int32 GetColWidth() const { return m_nColWidth; } - sal_Int32 GetFieldIndex() const { return m_nIndex; } - Window* GetTabWindow() const { return m_pTabWindow;} - sal_Int32 GetFunctionType() const { return m_eFunctionType; } - sal_uInt16 GetColumnId() const { return m_nColumnId;} - - inline sal_Bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; } - inline sal_Bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; } - inline sal_Bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; } - inline sal_Bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; } - inline sal_Bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; } - inline sal_Bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); } - - sal_Bool HasCriteria() const - { + sal_Bool operator==( const OTableFieldDesc& rDesc ); + + sal_Bool IsVisible() const { return m_bVisible;} + sal_Bool IsGroupBy() const { return m_bGroupBy;} + + void SetVisible( sal_Bool bVis=sal_True ){ m_bVisible = bVis;} + void SetGroupBy( sal_Bool bGb=sal_False ){ m_bGroupBy = bGb;} + void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin;} + void SetField( const ::rtl::OUString& rF ){ m_aFieldName = rF;} + void SetFieldAlias( const ::rtl::OUString& rF ){ m_aFieldAlias = rF;} + void SetTable( const ::rtl::OUString& rT ){ m_aTableName = rT;} + void SetAlias( const ::rtl::OUString& rT ){ m_aAliasName = rT;} + void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT;} + void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; } + void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; } + void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; } + void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit); + void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; } + void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; } + void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; } + void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; } + + + ::rtl::OUString GetField() const { return m_aFieldName;} + ::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;} + ::rtl::OUString GetTable() const { return m_aTableName;} + ::rtl::OUString GetAlias() const { return m_aAliasName;} + ::rtl::OUString GetFunction() const { return m_aFunctionName;} + sal_Int32 GetDataType() const { return m_eDataType; } + ETableFieldType GetFieldType() const { return m_eFieldType; } + EOrderDir GetOrderDir() const { return m_eOrderDir; } + ::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const; + sal_Int32 GetColWidth() const { return m_nColWidth; } + sal_Int32 GetFieldIndex() const { return m_nIndex; } + Window* GetTabWindow() const { return m_pTabWindow;} + sal_Int32 GetFunctionType() const { return m_eFunctionType; } + sal_uInt16 GetColumnId() const { return m_nColumnId;} + + inline sal_Bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; } + inline sal_Bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; } + inline sal_Bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; } + inline sal_Bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; } + inline sal_Bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; } + inline sal_Bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); } + + sal_Bool HasCriteria() const + { ::std::vector< ::rtl::OUString>::const_iterator aIter = m_aCriteria.begin(); ::std::vector< ::rtl::OUString>::const_iterator aEnd = m_aCriteria.end(); for(;aIter != aEnd;++aIter) @@ -137,26 +137,26 @@ namespace dbaui return aIter != aEnd; } - const ::std::vector< ::rtl::OUString>& GetCriteria() const { return m_aCriteria; } + const ::std::vector< ::rtl::OUString>& GetCriteria() const { return m_aCriteria; } void Load( const ::com::sun::star::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria ); void Save( ::comphelper::NamedValueCollection& o_rSettings, const bool i_bIncludingCriteria ); }; //------------------------------------------------------------------ - inline sal_Bool OTableFieldDesc::IsEmpty() const + inline sal_Bool OTableFieldDesc::IsEmpty() const { - sal_Bool bEmpty = (!m_aTableName.getLength() && - !m_aAliasName.getLength() && - !m_aFieldName.getLength() && - !m_aFieldAlias.getLength() && - !m_aFunctionName.getLength() && + sal_Bool bEmpty = (!m_aTableName.getLength() && + !m_aAliasName.getLength() && + !m_aFieldName.getLength() && + !m_aFieldAlias.getLength() && + !m_aFunctionName.getLength() && !HasCriteria()); return bEmpty; } //------------------------------------------------------------------ - typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef; - typedef ::std::vector<OTableFieldDescRef> OTableFields; + typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef; + typedef ::std::vector<OTableFieldDescRef> OTableFields; } #endif // diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index bc4679434a0f..247966ff8018 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,19 +51,19 @@ class OTableGrantControl : public ::svt::EditBrowseBox OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable> m_xGrantUser; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aTableNames; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable> m_xGrantUser; + ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aTableNames; - mutable TTablePrivilegeMap m_aPrivMap; - ::rtl::OUString m_sUserName; - ::svt::CheckBoxControl* m_pCheckCell; - Edit* m_pEdit; - long m_nDataPos; - BOOL m_bEnable; - ULONG m_nDeactivateEvent; + mutable TTablePrivilegeMap m_aPrivMap; + ::rtl::OUString m_sUserName; + ::svt::CheckBoxControl* m_pCheckCell; + Edit* m_pEdit; + long m_nDataPos; + BOOL m_bEnable; + ULONG m_nDeactivateEvent; public: OTableGrantControl( Window* pParent,const ResId& _RsId); @@ -85,7 +85,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ); - + protected: virtual void Resize(); @@ -105,8 +105,8 @@ private: DECL_LINK( AsynchActivate, void* ); DECL_LINK( AsynchDeactivate, void* ); - sal_Bool isAllowed(USHORT _nColumnId,sal_Int32 _nPrivilege) const; - void fillPrivilege(sal_Int32 _nRow) const; + sal_Bool isAllowed(USHORT _nColumnId,sal_Int32 _nPrivilege) const; + void fillPrivilege(sal_Int32 _nRow) const; TTablePrivilegeMap::const_iterator findPrivilege(sal_Int32 _nRow) const; }; diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index 3fe4afa56854..edaab51ae6db 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,18 +37,18 @@ namespace dbaui { -// class OTableRow; -// friend SvStream& operator<<( SvStream& rStr, OTableRow& _rRow ); +// class OTableRow; +// friend SvStream& operator<<( SvStream& rStr, OTableRow& _rRow ); class OFieldDescription; class OTypeInfo; class OTableRow { private: - OFieldDescription* m_pActFieldDescr; - long m_nPos; - bool m_bReadOnly; - bool m_bOwnsDescriptions; + OFieldDescription* m_pActFieldDescr; + long m_nPos; + bool m_bReadOnly; + bool m_bOwnsDescriptions; protected: public: @@ -66,14 +66,14 @@ namespace dbaui BOOL IsPrimaryKey() const; /** returns the current position in the table. - @return + @return the current position in the table */ inline long GetPos() const { return m_nPos; } inline void SetPos(sal_Int32 _nPos) { m_nPos = _nPos; } /** set the row readonly - @param _bRead + @param _bRead if <TRUE/> then the row is redonly, otherwise not */ inline void SetReadOnly( bool _bRead=true ){ m_bReadOnly = _bRead; } @@ -84,8 +84,8 @@ namespace dbaui */ inline bool IsReadOnly() const { return m_bReadOnly; } - friend SvStream& operator<<( SvStream& rStr,const OTableRow& _rRow ); - friend SvStream& operator>>( SvStream& rStr, OTableRow& _rRow ); + friend SvStream& operator<<( SvStream& rStr,const OTableRow& _rRow ); + friend SvStream& operator>>( SvStream& rStr, OTableRow& _rRow ); }; } #endif // DBAUI_TABLEROW_HXX diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 4a433f7c849e..c927dd8ef21b 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,10 +42,10 @@ namespace dbaui public: OTableRowExchange(const ::std::vector< ::boost::shared_ptr<OTableRow> >& _rvTableRow); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); }; } #endif // DBAUI_TABLEROW_EXCHANGE_HXX diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 323656ca869d..3f2bb9bfdd33 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,11 +45,11 @@ namespace dbaui { ////////////////////////////////////////////////////////////////////////// // Flags fuer die Groessenanpassung der SbaJoinTabWins - const UINT16 SIZING_NONE = 0x0000; - const UINT16 SIZING_TOP = 0x0001; - const UINT16 SIZING_BOTTOM = 0x0002; - const UINT16 SIZING_LEFT = 0x0004; - const UINT16 SIZING_RIGHT = 0x0008; + const UINT16 SIZING_NONE = 0x0000; + const UINT16 SIZING_TOP = 0x0001; + const UINT16 SIZING_BOTTOM = 0x0002; + const UINT16 SIZING_LEFT = 0x0004; + const UINT16 SIZING_RIGHT = 0x0008; class OTableWindowListBox; class OJoinDesignView; @@ -65,19 +65,19 @@ namespace dbaui protected: // und die Tabelle selber (brauche ich, da ich sie locken will, solange das Fenster lebt) FixedImage m_aTypeImage; - OTableWindowTitle m_aTitle; - OTableWindowListBox* m_pListBox; - OTableWindowAccess* m_pAccessible; + OTableWindowTitle m_aTitle; + OTableWindowListBox* m_pListBox; + OTableWindowAccess* m_pAccessible; private: - TTableWindowData::value_type + TTableWindowData::value_type m_pData; - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; - sal_Int32 m_nMoveCount; // how often the arrow keys was pressed - sal_Int32 m_nMoveIncrement; // how many pixel we should move - UINT16 m_nSizingFlags; - BOOL m_bActive; + sal_Int32 m_nMoveCount; // how often the arrow keys was pressed + sal_Int32 m_nMoveIncrement; // how many pixel we should move + UINT16 m_nSizingFlags; + BOOL m_bActive; void Draw3DBorder( const Rectangle& rRect ); // OContainerListener @@ -86,13 +86,13 @@ namespace dbaui virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rEvt ); - virtual void MouseButtonDown( const MouseEvent& rEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); + virtual void MouseMove( const MouseEvent& rEvt ); + virtual void MouseButtonDown( const MouseEvent& rEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual OTableWindowListBox* CreateListBox(); + virtual OTableWindowListBox* CreateListBox(); // wird im ERSTEN Init aufgerufen BOOL FillListBox(); // wird in JEDEM Init aufgerufen @@ -101,29 +101,29 @@ namespace dbaui // wird aus dem DoubleClickHdl der ListBox heraus aufgerufen /** HandleKeyInput triues to handle the KeyEvent. Movement or deletion - @param rEvt + @param rEvt The KEyEvent @return <TRUE/> when the table could handle the keyevent. */ - BOOL HandleKeyInput( const KeyEvent& rEvt ); + BOOL HandleKeyInput( const KeyEvent& rEvt ); /** delete the user data with the equal type as created within createUserData - @param _pUserData + @param _pUserData The user data store in the listbox entries. Created with a call to createUserData. _pUserData may be <NULL/>. _pUserData will be set to <NULL/> after call. */ virtual void deleteUserData(void*& _pUserData); /** creates user information that will be append at the ListBoxentry - @param _xColumn + @param _xColumn The corresponding column, can be <NULL/>. - @param _bPrimaryKey + @param _bPrimaryKey <TRUE/> when the column belongs to the primary key @return the user data which will be append at the listbox entry, may be <NULL/> */ - virtual void* createUserData(const ::com::sun::star::uno::Reference< + virtual void* createUserData(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bPrimaryKey); @@ -139,55 +139,55 @@ namespace dbaui // spaeter Constructor, siehe auch CreateListbox und FillListbox virtual BOOL Init(); - OJoinTableView* getTableView(); - const OJoinTableView* getTableView() const; - OJoinDesignView* getDesignView(); - void SetPosPixel( const Point& rNewPos ); - void SetSizePixel( const Size& rNewSize ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + OJoinTableView* getTableView(); + const OJoinTableView* getTableView() const; + OJoinDesignView* getDesignView(); + void SetPosPixel( const Point& rNewPos ); + void SetSizePixel( const Size& rNewSize ); + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); - String getTitle() const; - void SetBoldTitle( BOOL bBold ); - void setActive(sal_Bool _bActive = sal_True); + String getTitle() const; + void SetBoldTitle( BOOL bBold ); + void setActive(sal_Bool _bActive = sal_True); - void Remove(); - BOOL IsActiveWindow(){ return m_bActive; } + void Remove(); + BOOL IsActiveWindow(){ return m_bActive; } - ::rtl::OUString GetTableName() const { return m_pData->GetTableName(); } - ::rtl::OUString GetWinName() const { return m_pData->GetWinName(); } - ::rtl::OUString GetComposedName() const { return m_pData->GetComposedName(); } - OTableWindowListBox* GetListBox() const { return m_pListBox; } + ::rtl::OUString GetTableName() const { return m_pData->GetTableName(); } + ::rtl::OUString GetWinName() const { return m_pData->GetWinName(); } + ::rtl::OUString GetComposedName() const { return m_pData->GetComposedName(); } + OTableWindowListBox* GetListBox() const { return m_pListBox; } TTableWindowData::value_type GetData() const { return m_pData; } - OTableWindowTitle* GetTitleCtrl() { return &m_aTitle; } + OTableWindowTitle* GetTitleCtrl() { return &m_aTitle; } /** returns the name which should be used when displaying join or relations @return The composed name or the window name. */ - virtual ::rtl::OUString GetName() const = 0; + virtual ::rtl::OUString GetName() const = 0; inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); } inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetTable() const { return m_pData->getTable(); } - UINT16 GetSizingFlags() const { return m_nSizingFlags; } + UINT16 GetSizingFlags() const { return m_nSizingFlags; } /** set the sizing flag to the direction - @param _rPos + @param _rPos The EndPosition after resizing. */ - void setSizingFlag(const Point& _rPos); + void setSizingFlag(const Point& _rPos); /** set the rsizing flag to NONE. */ - void resetSizingFlag() { m_nSizingFlags = SIZING_NONE; } + void resetSizingFlag() { m_nSizingFlags = SIZING_NONE; } - /** returns the new sizing + /** returns the new sizing */ Rectangle getSizingRect(const Point& _rPos,const Size& _rOutputSize) const; // window override - virtual void StateChanged( StateChangedType nStateChange ); - virtual void GetFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void Command(const CommandEvent& rEvt); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void GetFocus(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void Command(const CommandEvent& rEvt); // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index f8351362c001..a1fd78373b4a 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ namespace dbaui /** the class OTableWindowAccess represents the accessible object for table windows like they are used in the QueryDesign and the RelationDesign */ - class OTableWindowAccess : public VCLXAccessibleComponent - , public OTableWindowAccess_BASE + class OTableWindowAccess : public VCLXAccessibleComponent + , public OTableWindowAccess_BASE { - OTableWindow* m_pTable; // the window which I should give accessibility to + OTableWindow* m_pTable; // the window which I should give accessibility to ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getParentChild(sal_Int32 _nIndex); protected: @@ -53,13 +53,13 @@ namespace dbaui virtual void SAL_CALL disposing(); /** isEditable returns the current editable state - @return true if it is editable otherwise false + @return true if it is editable otherwise false */ virtual sal_Bool isEditable() const; virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); public: - OTableWindowAccess( OTableWindow* _pTable); + OTableWindowAccess( OTableWindow* _pTable); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); @@ -85,7 +85,7 @@ namespace dbaui // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); - + // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index aa44a8d6d5f5..5aaad03a4f40 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace dbaui { class OTableWindowData : public ::utl::OEventListenerAdapter { - mutable ::osl::Mutex m_aMutex; + mutable ::osl::Mutex m_aMutex; void listen(); protected: @@ -50,12 +50,12 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xKeys; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - ::rtl::OUString m_aTableName; - ::rtl::OUString m_aWinName; - ::rtl::OUString m_sComposedName; - Point m_aPosition; - Size m_aSize; - sal_Bool m_bShowAll; + ::rtl::OUString m_aTableName; + ::rtl::OUString m_aWinName; + ::rtl::OUString m_sComposedName; + Point m_aPosition; + Size m_aSize; + sal_Bool m_bShowAll; bool m_bIsQuery; bool m_bIsValid; @@ -68,38 +68,38 @@ namespace dbaui /** late constructor * - * \param _xConnection + * \param _xConnection * \param _bAllowQueries when true, queries are allowed * \return false if the table was unaccessible otherwise true */ bool init(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection ,bool _bAllowQueries); - inline ::rtl::OUString GetComposedName() const { return m_sComposedName; } - inline ::rtl::OUString GetTableName() const { return m_aTableName; } - inline ::rtl::OUString GetWinName() const { return m_aWinName; } - inline Point GetPosition() const { return m_aPosition; } - inline Size GetSize() const { return m_aSize; } - inline BOOL IsShowAll() const { return m_bShowAll; } + inline ::rtl::OUString GetComposedName() const { return m_sComposedName; } + inline ::rtl::OUString GetTableName() const { return m_aTableName; } + inline ::rtl::OUString GetWinName() const { return m_aWinName; } + inline Point GetPosition() const { return m_aPosition; } + inline Size GetSize() const { return m_aSize; } + inline BOOL IsShowAll() const { return m_bShowAll; } inline bool isQuery() const { return m_bIsQuery; } inline bool isValid() const { return m_bIsValid; } // it is either a table or query but it is known - BOOL HasPosition() const; - BOOL HasSize() const; + BOOL HasPosition() const; + BOOL HasSize() const; - inline void SetWinName( const ::rtl::OUString& rWinName ) { m_aWinName = rWinName; } - inline void SetPosition( const Point& rPos ) { m_aPosition=rPos; } - inline void SetSize( const Size& rSize ) { m_aSize = rSize; } - inline void ShowAll( BOOL bAll ) { m_bShowAll = bAll; } + inline void SetWinName( const ::rtl::OUString& rWinName ) { m_aWinName = rWinName; } + inline void SetPosition( const Point& rPos ) { m_aPosition=rPos; } + inline void SetSize( const Size& rSize ) { m_aSize = rSize; } + inline void ShowAll( BOOL bAll ) { m_bShowAll = bAll; } inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getTable() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xTable; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xKeys; } + inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xKeys; } inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getColumns() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xColumns; } // OEventListenerAdapter virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ); }; - typedef ::std::vector< ::boost::shared_ptr<OTableWindowData> > TTableWindowData; + typedef ::std::vector< ::boost::shared_ptr<OTableWindowData> > TTableWindowData; } #endif // DBAUI_TABLEWINDOWDATA_HXX diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index a3de07dac935..d5b9c250dd3c 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ namespace dbaui struct OJoinExchangeData { public: - OTableWindowListBox* pListBox; // die ListBox innerhalb desselben (daraus kann man sich das TabWin und daraus den WinName besorgen) - SvLBoxEntry* pEntry; // der Eintrag, der gedraggt oder auf den gedroppt wurde + OTableWindowListBox* pListBox; // die ListBox innerhalb desselben (daraus kann man sich das TabWin und daraus den WinName besorgen) + SvLBoxEntry* pEntry; // der Eintrag, der gedraggt oder auf den gedroppt wurde OJoinExchangeData(OTableWindowListBox* pBox); OJoinExchangeData() : pListBox(NULL), pEntry(NULL) { } @@ -61,38 +61,38 @@ namespace dbaui DECL_LINK( ScrollDownHdl, SvTreeListBox* ); DECL_LINK( DropHdl, void* ); DECL_LINK( LookForUiHdl, void* ); + + Timer m_aScrollTimer; + Point m_aMousePos; - Timer m_aScrollTimer; - Point m_aMousePos; - - OTableWindow* m_pTabWin; - ULONG m_nDropEvent; - ULONG m_nUiEvent; - OJoinDropData m_aDropInfo; + OTableWindow* m_pTabWin; + ULONG m_nDropEvent; + ULONG m_nUiEvent; + OJoinDropData m_aDropInfo; - BOOL m_bReallyScrolled : 1; - BOOL m_bDragSource : 1; + BOOL m_bReallyScrolled : 1; + BOOL m_bDragSource : 1; protected: virtual void LoseFocus(); virtual void GetFocus(); - virtual void NotifyScrolled(); + virtual void NotifyScrolled(); virtual void NotifyEndScroll(); virtual long PreNotify(NotifyEvent& rNEvt); virtual void dragFinished( ); - - + + public: OTableWindowListBox(OTableWindow* pParent); virtual ~OTableWindowListBox(); // DnD stuff - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); // window virtual void Command(const CommandEvent& rEvt); diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx index e81ab0be5597..a07e8fda099c 100644 --- a/dbaccess/source/ui/inc/TableWindowTitle.hxx +++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace dbaui protected: virtual void Command(const CommandEvent& rEvt); - // virtual void Paint( const Rectangle& rRect ); + // virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rEvt ); virtual void KeyInput( const KeyEvent& rEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index e9c7880caf9c..b861d4e11b07 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,11 +50,11 @@ class ODbDataSourceAdministrationHelper; //======================================================================== class OTableSubscriptionDialog : public SfxSingleTabDialog, public IItemSetHelper { - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; sal_Bool m_bStopExecution; // set when the dialog should not be executed DECL_LINK( OKClickHdl, OKButton* ); - SfxItemSet* m_pOutSet; + SfxItemSet* m_pOutSet; public: OTableSubscriptionDialog(Window* pParent @@ -65,21 +65,21 @@ class ODbDataSourceAdministrationHelper; virtual ~OTableSubscriptionDialog(); // forwards from ODbDataSourceAdministrationHelper - void successfullyConnected(); - sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); - void clearPassword(); - String getConnectionURL() const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); + void successfullyConnected(); + sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); + void clearPassword(); + String getConnectionURL() const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); inline void endExecution() { m_bStopExecution = sal_True; } virtual const SfxItemSet* getOutputSet() const; virtual SfxItemSet* getWriteOutputSet(); - virtual short Execute(); + virtual short Execute(); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_TABLESSINGLEDLG_HXX_ diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 1e87054a9ece..43952c95fc0d 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include <memory> -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace sdbc{ class XRowUpdate; } @@ -68,28 +68,28 @@ namespace dbaui void impl_initializeRowMember_throw(); protected: - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; + ::com::sun::star::lang::Locale m_aLocale; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; sal_Bool m_bBookmarkSelection; - SvStream* m_pStream; - ::com::sun::star::awt::FontDescriptor m_aFont; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xObject; // table/query + SvStream* m_pStream; + ::com::sun::star::awt::FontDescriptor m_aFont; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xObject; // table/query SharedConnection m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xRow; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate > m_xRowLocate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xResultSetMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xResultSetMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xRowSetColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; ::rtl::OUString m_sName; - //dyf add 20070601 + //dyf add 20070601 //for transfor the tablename ::rtl::OUString m_sDefaultTableName; //dyf add end ::rtl::OUString m_sDataSourceName; - sal_Int32 m_nCommandType; + sal_Int32 m_nCommandType; bool m_bNeedToReInitialize; #if defined UNX @@ -98,20 +98,20 @@ namespace dbaui static const char __FAR_DATA sNewLine[]; #endif - ODatabaseExport* m_pReader; - sal_Int32* m_pRowMarker; // wenn gesetzt, dann nur diese Rows kopieren + ODatabaseExport* m_pReader; + sal_Int32* m_pRowMarker; // wenn gesetzt, dann nur diese Rows kopieren rtl_TextEncoding m_eDestEnc; - sal_Bool m_bInInitialize; - sal_Bool m_bCheckOnly; + sal_Bool m_bInInitialize; + sal_Bool m_bCheckOnly; // export data - ODatabaseImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + ODatabaseImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const String& rExchange = String()); // import data - ODatabaseImportExport( const SharedConnection& _rxConnection, + ODatabaseImportExport( const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM); @@ -150,17 +150,17 @@ namespace dbaui void appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk); public: // export data - ORTFImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + ORTFImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const String& rExchange = String()) + const String& rExchange = String()) : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange) {}; // import data - ORTFImportExport( const SharedConnection& _rxConnection, + ORTFImportExport( const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) - : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) + : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) {} virtual BOOL Write(); @@ -174,15 +174,15 @@ namespace dbaui class OHTMLImportExport : public ODatabaseImportExport { // default HtmlFontSz[1-7] - static const sal_Int16 nDefaultFontSize[SBA_HTML_FONTSIZES]; + static const sal_Int16 nDefaultFontSize[SBA_HTML_FONTSIZES]; // HtmlFontSz[1-7] in s*3.ini [user] - static sal_Int16 nFontSize[SBA_HTML_FONTSIZES]; - static const sal_Int16 nCellSpacing; + static sal_Int16 nFontSize[SBA_HTML_FONTSIZES]; + static const sal_Int16 nCellSpacing; static const char __FAR_DATA sIndentSource[]; - char sIndent[nIndentMax+1]; - sal_Int16 m_nIndent; + char sIndent[nIndentMax+1]; + sal_Int16 m_nIndent; #ifdef DBG_UTIL - BOOL m_bCheckFont; + BOOL m_bCheckFont; #endif void WriteHeader(); @@ -190,21 +190,21 @@ namespace dbaui void WriteTables(); void WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_Int32 nHeightPixel,const char* pChar,const String& rValue,const char* pHtmlTag); void IncIndent( sal_Int16 nVal ); - const char* GetIndentStr() { return sIndent; } + const char* GetIndentStr() { return sIndent; } void FontOn(); inline void FontOff(); public: // export data - OHTMLImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + OHTMLImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const String& rExchange = String()); // import data - OHTMLImportExport( const SharedConnection& _rxConnection, + OHTMLImportExport( const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) - : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) + : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) {} virtual BOOL Write(); @@ -217,14 +217,14 @@ namespace dbaui class ORowSetImportExport : public ODatabaseImportExport { - OModuleClient m_aModuleClient; - ::std::vector<sal_Int32> m_aColumnMapping; - ::std::vector<sal_Int32> m_aColumnTypes; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; // - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; // - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; // - Window* m_pParent; - sal_Bool m_bAlreadyAsked; + OModuleClient m_aModuleClient; + ::std::vector<sal_Int32> m_aColumnMapping; + ::std::vector<sal_Int32> m_aColumnTypes; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; // + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; // + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; // + Window* m_pParent; + sal_Bool m_bAlreadyAsked; sal_Bool insertNewRow(); protected: @@ -240,10 +240,10 @@ namespace dbaui // import data ORowSetImportExport(const SharedConnection& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) - : ODatabaseImportExport(_rxConnection,NULL,_rM) + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) + : ODatabaseImportExport(_rxConnection,NULL,_rM) {} - + virtual BOOL Write(); virtual BOOL Read(); diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 10ea51cf58aa..73ffcbde5c50 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,63 +42,63 @@ namespace dbaui { //======================================================================== // Anhand dieser Ids werden die sprachabhaengigen ::rtl::OUString aus der Resource geholt -const sal_uInt16 TYPE_UNKNOWN = 0; -const sal_uInt16 TYPE_TEXT = 1; -const sal_uInt16 TYPE_NUMERIC = 2; -const sal_uInt16 TYPE_DATETIME = 3; -const sal_uInt16 TYPE_DATE = 4; -const sal_uInt16 TYPE_TIME = 5; -const sal_uInt16 TYPE_BOOL = 6; -const sal_uInt16 TYPE_CURRENCY = 7; -const sal_uInt16 TYPE_MEMO = 8; -const sal_uInt16 TYPE_COUNTER = 9; -const sal_uInt16 TYPE_IMAGE = 10; -const sal_uInt16 TYPE_CHAR = 11; -const sal_uInt16 TYPE_DECIMAL = 12; -const sal_uInt16 TYPE_BINARY = 13; -const sal_uInt16 TYPE_VARBINARY = 14; -const sal_uInt16 TYPE_BIGINT = 15; -const sal_uInt16 TYPE_DOUBLE = 16; -const sal_uInt16 TYPE_FLOAT = 17; -const sal_uInt16 TYPE_REAL = 18; -const sal_uInt16 TYPE_INTEGER = 19; -const sal_uInt16 TYPE_SMALLINT = 20; -const sal_uInt16 TYPE_TINYINT = 21; -const sal_uInt16 TYPE_SQLNULL = 22; -const sal_uInt16 TYPE_OBJECT = 23; -const sal_uInt16 TYPE_DISTINCT = 24; -const sal_uInt16 TYPE_STRUCT = 25; -const sal_uInt16 TYPE_ARRAY = 26; -const sal_uInt16 TYPE_BLOB = 27; -const sal_uInt16 TYPE_CLOB = 28; -const sal_uInt16 TYPE_REF = 29; -const sal_uInt16 TYPE_OTHER = 30; -const sal_uInt16 TYPE_BIT = 31; +const sal_uInt16 TYPE_UNKNOWN = 0; +const sal_uInt16 TYPE_TEXT = 1; +const sal_uInt16 TYPE_NUMERIC = 2; +const sal_uInt16 TYPE_DATETIME = 3; +const sal_uInt16 TYPE_DATE = 4; +const sal_uInt16 TYPE_TIME = 5; +const sal_uInt16 TYPE_BOOL = 6; +const sal_uInt16 TYPE_CURRENCY = 7; +const sal_uInt16 TYPE_MEMO = 8; +const sal_uInt16 TYPE_COUNTER = 9; +const sal_uInt16 TYPE_IMAGE = 10; +const sal_uInt16 TYPE_CHAR = 11; +const sal_uInt16 TYPE_DECIMAL = 12; +const sal_uInt16 TYPE_BINARY = 13; +const sal_uInt16 TYPE_VARBINARY = 14; +const sal_uInt16 TYPE_BIGINT = 15; +const sal_uInt16 TYPE_DOUBLE = 16; +const sal_uInt16 TYPE_FLOAT = 17; +const sal_uInt16 TYPE_REAL = 18; +const sal_uInt16 TYPE_INTEGER = 19; +const sal_uInt16 TYPE_SMALLINT = 20; +const sal_uInt16 TYPE_TINYINT = 21; +const sal_uInt16 TYPE_SQLNULL = 22; +const sal_uInt16 TYPE_OBJECT = 23; +const sal_uInt16 TYPE_DISTINCT = 24; +const sal_uInt16 TYPE_STRUCT = 25; +const sal_uInt16 TYPE_ARRAY = 26; +const sal_uInt16 TYPE_BLOB = 27; +const sal_uInt16 TYPE_CLOB = 28; +const sal_uInt16 TYPE_REF = 29; +const sal_uInt16 TYPE_OTHER = 30; +const sal_uInt16 TYPE_BIT = 31; class OTypeInfo { public: - ::rtl::OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName) - ::rtl::OUString aTypeName; // Name des Types in der Datenbank - ::rtl::OUString aLiteralPrefix; // Prefix zum Quoten - ::rtl::OUString aLiteralSuffix; // Suffix zum Quoten - ::rtl::OUString aCreateParams; // Parameter zum Erstellen - ::rtl::OUString aLocalTypeName; - - sal_Int32 nPrecision; // Laenge des Types - sal_Int32 nType; // Datenbanktyp - - sal_Int16 nMaximumScale; // Nachkommastellen - sal_Int16 nMinimumScale; // Min Nachkommastellen - - sal_Int16 nSearchType; // kann nach dem Typen gesucht werden - - - sal_Bool bCurrency : 1, // Waehrung - bAutoIncrement : 1, // Ist es ein automatisch incrementierendes Feld - bNullable : 1, // Kann das Feld NULL annehmen - bCaseSensitive : 1, // Ist der Type Casesensitive - bUnsigned : 1; // Ist der Type Unsigned + ::rtl::OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName) + ::rtl::OUString aTypeName; // Name des Types in der Datenbank + ::rtl::OUString aLiteralPrefix; // Prefix zum Quoten + ::rtl::OUString aLiteralSuffix; // Suffix zum Quoten + ::rtl::OUString aCreateParams; // Parameter zum Erstellen + ::rtl::OUString aLocalTypeName; + + sal_Int32 nPrecision; // Laenge des Types + sal_Int32 nType; // Datenbanktyp + + sal_Int16 nMaximumScale; // Nachkommastellen + sal_Int16 nMinimumScale; // Min Nachkommastellen + + sal_Int16 nSearchType; // kann nach dem Typen gesucht werden + + + sal_Bool bCurrency : 1, // Waehrung + bAutoIncrement : 1, // Ist es ein automatisch incrementierendes Feld + bNullable : 1, // Kann das Feld NULL annehmen + bCaseSensitive : 1, // Ist der Type Casesensitive + bUnsigned : 1; // Ist der Type Unsigned OTypeInfo() :nPrecision(0) @@ -114,21 +114,21 @@ const sal_uInt16 TYPE_BIT = 31; {} sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } sal_Bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; } - inline ::rtl::OUString getDBName() const { return aTypeName; } + inline ::rtl::OUString getDBName() const { return aTypeName; } }; - typedef ::boost::shared_ptr<OTypeInfo> TOTypeInfoSP; - typedef ::std::multimap<sal_Int32,TOTypeInfoSP> OTypeInfoMap; + typedef ::boost::shared_ptr<OTypeInfo> TOTypeInfoSP; + typedef ::std::multimap<sal_Int32,TOTypeInfoSP> OTypeInfoMap; /** return the most suitable typeinfo for a requested type - @param _rTypeInfo contains a map of type to typeinfo - @param _nType the requested type - @param _sTypeName the typename - @param _sCreateParams the create params - @param _nPrecision the precision - @param _nScale the scale - @param _bAutoIncrement if it is a auto increment - @param _brForceToType true when type was found which has some differenes + @param _rTypeInfo contains a map of type to typeinfo + @param _nType the requested type + @param _sTypeName the typename + @param _sCreateParams the create params + @param _nPrecision the precision + @param _nScale the scale + @param _bAutoIncrement if it is a auto increment + @param _brForceToType true when type was found which has some differenes */ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, sal_Int32 _nType, diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 8bd112c38742..6ecab0555549 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,12 +35,12 @@ #include <vcl/taskpanelist.hxx> #include <connectivity/dbtools.hxx> -#define RET_ALL 10 +#define RET_ALL 10 // we only need forward decl here namespace com { namespace sun { namespace star { - namespace beans { class XPropertySet;} + namespace beans { class XPropertySet;} namespace container { class XNameAccess; @@ -95,12 +95,12 @@ namespace dbaui class DBTreeListBox; /** creates a new connection and appends the eventlistener - @param _rsDataSourceName name of the datasource - @param _xDatabaseContext the database context + @param _rsDataSourceName name of the datasource + @param _xDatabaseContext the database context @param _rMF the multi service factory - @param _rEvtLst the eventlistener which will be added to the new created connection - @param _rOUTConnection this parameter will be filled with the new created connection - @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false + @param _rEvtLst the eventlistener which will be added to the new created connection + @param _rOUTConnection this parameter will be filled with the new created connection + @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false */ ::dbtools::SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, @@ -109,11 +109,11 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ); /** creates a new connection and appends the eventlistener - @param _xDataSource the datasource + @param _xDataSource the datasource @param _rMF the multi service factory - @param _rEvtLst the eventlistener which will be added to the new created connection - @param _rOUTConnection this parameter will be filled with the new created connection - @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false + @param _rEvtLst the eventlistener which will be added to the new created connection + @param _rOUTConnection this parameter will be filled with the new created connection + @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false */ ::dbtools::SQLExceptionInfo createConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDataSource, @@ -121,50 +121,50 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ); - /** creates a error dialog which displays the SQLExceptionInfo. Also it supports a "more" button where detailed information are available - @param _rInfo the error which should be shown, if the info is not valid no error dialog will appear - @param _pParent the parent of the error dialog - @param _xFactory need to create the dialog + /** creates a error dialog which displays the SQLExceptionInfo. Also it supports a "more" button where detailed information are available + @param _rInfo the error which should be shown, if the info is not valid no error dialog will appear + @param _pParent the parent of the error dialog + @param _xFactory need to create the dialog */ - void showError( const ::dbtools::SQLExceptionInfo& _rInfo, + void showError( const ::dbtools::SQLExceptionInfo& _rInfo, Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory); /** return a vector which contains all key columns for the @see com::sun::star::sdbc::KeyType _nKeyType - @param _rxTable the table which must be a @see com::sun::star::sdbcx::XColumnsSupplier - @param _nKeyType @see com::sun::star::sdbc::KeyType + @param _rxTable the table which must be a @see com::sun::star::sdbcx::XColumnsSupplier + @param _nKeyType @see com::sun::star::sdbc::KeyType */ ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> > - getKeyColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxKeys, + getKeyColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxKeys, sal_Int32 _nKeyType); /** fills a map and a vector with localized type names - @param _rxConnection the connection to acces the metadata - @param _rsTypeNames a list of localized type names seperated with ';' - @param _rTypeInfoMap the filled map with the type names - @param _rTypeInfoIters the vector filled with map iterators + @param _rxConnection the connection to acces the metadata + @param _rsTypeNames a list of localized type names seperated with ';' + @param _rTypeInfoMap the filled map with the type names + @param _rTypeInfoIters the vector filled with map iterators */ - void fillTypeInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, + void fillTypeInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const String& _rsTypeNames, OTypeInfoMap& _rTypeInfoMap, ::std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters); /** fill a column with data of a field description - @param _rxColumn the column which should be filled - @param _pFieldDesc the source of the data + @param _rxColumn the column which should be filled + @param _pFieldDesc the source of the data */ class OFieldDescription; - void setColumnProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, + void setColumnProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const OFieldDescription* _pFieldDesc); - ::rtl::OUString createDefaultName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, + ::rtl::OUString createDefaultName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTables, const ::rtl::OUString& _sName); /** checks if the given name exists in the database context */ - sal_Bool checkDataSourceAvailable( const ::rtl::OUString& _sDataSourceName, + sal_Bool checkDataSourceAvailable( const ::rtl::OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory_xORB); /** maps SvxCellHorJustify to com::sun::star::awt::TextAlign @@ -197,7 +197,7 @@ namespace dbaui ::dbtools::SQLExceptionInfo* _pErrorInfo ); - /** returns either the model when data source is given as parameter, + /** returns either the model when data source is given as parameter, or returns a data source when a model is given. @param _xObject Either a data source or a model. */ @@ -210,14 +210,14 @@ namespace dbaui SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment); /** convert Font to ::com::sun::star::awt::FontDescriptor - @param _rFont Font to be converted - @return the new FontDescriptor + @param _rFont Font to be converted + @return the new FontDescriptor */ ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const Font& _rFont ); /** call teh format dialog and set the selected format at the column - @param _xAffectedCol Font to be converted - @param _xField Font to be converted + @param _xAffectedCol Font to be converted + @param _xField Font to be converted */ void callColumnFormatDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xAffectedCol, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xField, @@ -231,13 +231,13 @@ namespace dbaui sal_Int32 _nDataType, sal_Int32& _nFormatKey, SvxCellHorJustify& _eJustify, - sal_uInt16& _nFlags, + sal_uInt16& _nFlags, sal_Bool _bHasFormat); /** append a name to tablefilter of a datasource - @param _xConnection the connection is need to get the datasource - @param _sName the name which should be appended - @param _xFactory needed to check if datasource is available - @param _pParent needed when an error must be shown + @param _xConnection the connection is need to get the datasource + @param _sName the name which should be appended + @param _xFactory needed to check if datasource is available + @param _pParent needed when an error must be shown @return false when datsource is not available otherwise true */ sal_Bool appendToFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, @@ -246,11 +246,11 @@ namespace dbaui Window* _pParent); /** notifySystemWindow adds or remove the given window _pToRegister at the Systemwindow found when search _pWindow. - @param _pWindow + @param _pWindow The window which is used to search for the SystemWindow. - @param _pToRegister + @param _pToRegister The window which should be added or removed on the TaskPaneList. - @param _rMemFunc + @param _rMemFunc The member function which should be called at the SystemWindow when found. Possible values are: ::comphelper::mem_fun(&TaskPaneList::AddWindow) @@ -261,13 +261,13 @@ namespace dbaui ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc); /** adjustToolBoxSize checks if the size of the ToolBox is still valid. If not it will be resized. - @param _pToolBox + @param _pToolBox The Toolbox which should be resized. */ void adjustToolBoxSize(ToolBox* _pToolBox); /** isHiContrast check if we are in hi contrast mode. - @param _pWindow + @param _pWindow The window we have to check on. @return <TRUE/> if so, otherwise <FALSE/> @@ -277,7 +277,7 @@ namespace dbaui void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId ); /** check if SQL92 name checking is enabled - @param _xConnection + @param _xConnection Used to get the datasource as parent from the connection. @return <TRUE/> if so otherwise <FALSE/> @@ -285,7 +285,7 @@ namespace dbaui sal_Bool isSQL92CheckEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** check if the alias name of the table should be added at select statements - @param _xConnection + @param _xConnection Used to get the datasource as parent from the connection. @return <TRUE/> if so otherwise <FALSE/> @@ -297,11 +297,11 @@ namespace dbaui sal_Bool generateAsBeforeTableAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection ); /** fills the bool and string value with information out of the datasource info property - @param _xDatasource + @param _xDatasource Asked for the properties. - @param _rAutoIncrementValueEnabled + @param _rAutoIncrementValueEnabled <OUT/> Set to TRUE when the property was set in the datasource. - @param _rsAutoIncrementValue + @param _rsAutoIncrementValue <OUT/> Set to the value when the property was set in the datasource. */ void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDatasource @@ -309,11 +309,11 @@ namespace dbaui ,::rtl::OUString& _rsAutoIncrementValue); /** fills the bool and string value with information out of the datasource info property - @param _xConnection + @param _xConnection Used to get the datasource as parent from the connection. - @param _rAutoIncrementValueEnabled + @param _rAutoIncrementValueEnabled <OUT/> Set to TRUE when the property was set in the datasource. - @param _rsAutoIncrementValue + @param _rsAutoIncrementValue <OUT/> Set to the value when the property was set in the datasource. */ void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection @@ -321,20 +321,20 @@ namespace dbaui ,::rtl::OUString& _rsAutoIncrementValue); /** creates the URL or the help agent - @param _sModuleName - @param _nHelpId + @param _sModuleName + @param _nHelpId @return The URL for the help agent to dispatch. */ - ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId); + ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId); /** set the evaluation flag at the number formatter - @param _rxFormatter + @param _rxFormatter */ void setEvalDateFormatForFormatter(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter); /** query for a type info which can be used to create a primary key column - @param _rTypeInfo + @param _rTypeInfo The map which contains all available types. @return The type info which can be used to create a primary key column. @@ -342,9 +342,9 @@ namespace dbaui TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo); /** query for a specific type. - @param _nDataType + @param _nDataType The type we are searching. - @param _rTypeInfo + @param _rTypeInfo The map which contains all available types. @return The type or <NULL/> if we can't find it. @@ -355,18 +355,18 @@ namespace dbaui @return the configuration node name of user defined drivers. */ - + /** returns the result of the user action when view the query dialog. - @param _pParent + @param _pParent The parent of the dialog - @param _nTitle + @param _nTitle A string resource id for the text which will be displayed as title. - @param _nText + @param _nText A string resource id for the text which will be displayed above the buttons. When the string contains a #1. This will be replaced by the name. - @param _bAll + @param _bAll When set to <TRUE/>, the all button will be appended. - @param _sName + @param _sName The name of the object to ask for. @return RET_YES, RET_NO, RET_ALL @@ -374,11 +374,11 @@ namespace dbaui sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Bool _bAll,const ::rtl::OUString& _sName); /** creates a new view from a query or table - @param _sName + @param _sName The name of the view to be created. - @param _xConnection + @param _xConnection The source connection. - @param _xSourceObject + @param _xSourceObject The object for which a view should be created. @return The created view. @@ -396,9 +396,9 @@ namespace dbaui ); /** returns the stripped database name. - @param _xDataSource + @param _xDataSource The data source - @param _rsDatabaseName + @param _rsDatabaseName Will be filled with the original data source if it is empty. @return The stripped database name either the registered naem or if it is a file url the last segment. @@ -413,21 +413,21 @@ namespace dbaui const SfxFilter* getStandardDatabaseFilter(); /** opens a save dialog to store a form or report folder in the current hierachy. - @param _pParent + @param _pParent The parent of the dialog. @param _rxORB a multi service factory which can be used to instantiate usual global services - @param _xNames + @param _xNames Where to insert the new object. - @param _sParentFolder + @param _sParentFolder The name of the parent folder. - @param _bForm + @param _bForm <TRUE/> if a form should be inserted - @param _bCollection + @param _bCollection A folder should be inserted - @param _xContent + @param _xContent The content which should be copied. - @param _bMove + @param _bMove if <TRUE/> the name of the content must be inserted without any change, otherwise not. @return <TRUE/> if the insert opertions was successfull, otherwise <FALSE/>. @@ -444,9 +444,9 @@ namespace dbaui ); /** creates a number formatter - @param _rxConnection + @param _rxConnection The connection is needed to create the formatter - @param _rMF + @param _rMF The multi service factory */ ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF ); diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 3b510f9a8926..96df23c0ae71 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,10 +54,10 @@ namespace dbaui class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - sal_Bool m_bOwnConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + sal_Bool m_bOwnConnection; protected: virtual void PageCreated(USHORT _nId, SfxTabPage& _rPage); public: @@ -66,18 +66,18 @@ namespace dbaui ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); - + virtual ~OUserAdminDlg(); virtual const SfxItemSet* getOutputSet() const; virtual SfxItemSet* getWriteOutputSet(); - virtual short Execute(); + virtual short Execute(); // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); @@ -85,7 +85,7 @@ namespace dbaui virtual void enableConfirmSettings( bool _bEnable ); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_USERADMINDLG_HXX diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index 32f35779288e..3d484f6c9ec4 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,10 @@ namespace dbaui //================================================================== class OSplitterView : public Window { - Splitter* m_pSplitter; - Window* m_pLeft; - Window* m_pRight; - sal_Bool m_bVertical; + Splitter* m_pSplitter; + Window* m_pLeft; + Window* m_pRight; + sal_Bool m_bVertical; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); DECL_LINK( SplitHdl, Splitter* ); diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 110e8227027d..c683e6b324d9 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,23 +45,23 @@ namespace dbaui class OCopyTable : public OWizardPage { protected: - FixedText m_ftTableName; - Edit m_edTableName; + FixedText m_ftTableName; + Edit m_edTableName; FixedLine m_aFL_Options; - RadioButton m_aRB_DefData; - RadioButton m_aRB_Def; - RadioButton m_aRB_View; - RadioButton m_aRB_AppendData; - CheckBox m_aCB_UseHeaderLine; - CheckBox m_aCB_PrimaryColumn; - FixedText m_aFT_KeyName; - Edit m_edKeyName; + RadioButton m_aRB_DefData; + RadioButton m_aRB_Def; + RadioButton m_aRB_View; + RadioButton m_aRB_AppendData; + CheckBox m_aCB_UseHeaderLine; + CheckBox m_aCB_PrimaryColumn; + FixedText m_aFT_KeyName; + Edit m_edKeyName; sal_Int16 m_nOldOperation; - OWizColumnSelect* m_pPage2; - OWizNormalExtend* m_pPage3; + OWizColumnSelect* m_pPage2; + OWizNormalExtend* m_pPage3; - BOOL m_bPKeyAllowed; + BOOL m_bPKeyAllowed; BOOL m_bUseHeaderAllowed; @@ -75,19 +75,19 @@ namespace dbaui //--------add end public: - virtual void Reset(); - virtual void ActivatePage(); - virtual BOOL LeavePage(); - virtual String GetTitle() const ; + virtual void Reset(); + virtual void ActivatePage(); + virtual BOOL LeavePage(); + virtual String GetTitle() const ; OCopyTable( Window * pParent ); virtual ~OCopyTable(); - inline BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); } - inline BOOL IsOptionDef() const { return m_aRB_Def.IsChecked(); } - inline BOOL IsOptionAppendData() const { return m_aRB_AppendData.IsChecked(); } - inline BOOL IsOptionView() const { return m_aRB_View.IsChecked(); } - inline BOOL UseHeaderLine() const { return m_aCB_UseHeaderLine.IsChecked(); } + inline BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); } + inline BOOL IsOptionDef() const { return m_aRB_Def.IsChecked(); } + inline BOOL IsOptionAppendData() const { return m_aRB_AppendData.IsChecked(); } + inline BOOL IsOptionView() const { return m_aRB_View.IsChecked(); } + inline BOOL UseHeaderLine() const { return m_aCB_UseHeaderLine.IsChecked(); } String GetKeyName() const { return m_edKeyName.GetText(); } void setCreateStyleAction(); diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 8c0f16228bd2..6dd66a547ed5 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ namespace dbaui { FixedLine m_flColumns; - MultiListBox m_lbOrgColumnNames; // left side + MultiListBox m_lbOrgColumnNames; // left side ImageButton m_ibColumn_RH; ImageButton m_ibColumns_RH; ImageButton m_ibColumn_LH; ImageButton m_ibColumns_LH; - MultiListBox m_lbNewColumnNames; // right side + MultiListBox m_lbNewColumnNames; // right side DECL_LINK( ButtonClickHdl, Button * ); @@ -61,38 +61,38 @@ namespace dbaui void clearListBox(MultiListBox& _rListBox); - void fillColumns( ListBox* pRight, + void fillColumns( ListBox* pRight, ::std::vector< ::rtl::OUString> &_rRightColumns); - void createNewColumn( ListBox* _pListbox, + void createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase); - void moveColumn( ListBox* _pRight, + void moveColumn( ListBox* _pRight, ListBox* _pLeft, ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase); void enableButtons(); - + USHORT adjustColumnPosition(ListBox* _pLeft, - const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::TStringMixEqualFunctor& _aCase); public: - virtual void Reset ( ); - virtual void ActivatePage(); - virtual sal_Bool LeavePage(); - virtual String GetTitle() const ; + virtual void Reset ( ); + virtual void ActivatePage(); + virtual sal_Bool LeavePage(); + virtual String GetTitle() const ; OWizColumnSelect(Window* pParent); virtual ~OWizColumnSelect(); diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 7249dcdc1104..c28630bb18f3 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ namespace dbaui { m_pColumns = _pColumns; } - inline bool operator()(const ::rtl::OUString& _sColumnName) const + inline bool operator()(const ::rtl::OUString& _sColumnName) const { return m_pColumns->find(_sColumnName) != m_pColumns->end(); } @@ -83,7 +83,7 @@ namespace dbaui ,m_pVector(_pVector) { } - inline bool operator()(const ::rtl::OUString& _sColumnName) const + inline bool operator()(const ::rtl::OUString& _sColumnName) const { return ::std::find_if(m_pVector->begin(),m_pVector->end(), ::std::bind2nd(m_aCase, _sColumnName)) != m_pVector->end(); @@ -126,7 +126,7 @@ namespace dbaui /** copies the filter and sorting * - * \return + * \return */ virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const = 0; @@ -220,11 +220,11 @@ namespace dbaui // ======================================================== class OCopyTableWizard : public WizardDialog { - friend class OWizColumnSelect; - friend class OWizTypeSelect; - friend class OWizTypeSelectControl; - friend class OCopyTable; - friend class OWizNameMatching; + friend class OWizColumnSelect; + friend class OWizTypeSelect; + friend class OWizTypeSelectControl; + friend class OCopyTable; + friend class OWizNameMatching; public: DECLARE_STL_MAP(::rtl::OUString,::rtl::OUString,::comphelper::UStringMixLess,TNameMapping); @@ -239,54 +239,54 @@ namespace dbaui }; private: - ODatabaseExport::TColumns m_vDestColumns; // contains the columns - ODatabaseExport::TColumnVector m_aDestVec; // the order to insert the columns - ODatabaseExport::TColumns m_vSourceColumns; - ODatabaseExport::TColumnVector m_vSourceVec; + ODatabaseExport::TColumns m_vDestColumns; // contains the columns + ODatabaseExport::TColumnVector m_aDestVec; // the order to insert the columns + ODatabaseExport::TColumns m_vSourceColumns; + ODatabaseExport::TColumnVector m_vSourceVec; HelpButton m_pbHelp; - CancelButton m_pbCancel; - PushButton m_pbPrev; - PushButton m_pbNext; - OKButton m_pbFinish; + CancelButton m_pbCancel; + PushButton m_pbPrev; + PushButton m_pbNext; + OKButton m_pbFinish; - OTypeInfoMap m_aTypeInfo; + OTypeInfoMap m_aTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; - OTypeInfoMap m_aDestTypeInfo; + OTypeInfoMap m_aDestTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aDestTypeInfoIndex; - TNameMapping m_mNameMapping; + TNameMapping m_mNameMapping; - ODatabaseExport::TPositions m_vColumnPos; - ::std::vector<sal_Int32> m_vColumnTypes; + ODatabaseExport::TPositions m_vColumnPos; + ::std::vector<sal_Int32> m_vColumnTypes; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xDestConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xDestConnection; const ICopyTableSourceObject& m_rSourceObject; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> m_xInteractionHandler; - String m_sTypeNames; // these type names are the ones out of the resource file - sal_uInt32 m_nPageCount; - sal_Bool m_bDeleteSourceColumns; + String m_sTypeNames; // these type names are the ones out of the resource file + sal_uInt32 m_nPageCount; + sal_Bool m_bDeleteSourceColumns; bool m_bInterConnectionCopy; // are we copying between different connections? - ::com::sun::star::lang::Locale m_aLocale; - ::rtl::OUString m_sName; // for a table the name is composed - ::rtl::OUString m_sSourceName; - ::rtl::OUString m_aKeyName; - TOTypeInfoSP m_pTypeInfo; // default type - sal_Bool m_bAddPKFirstTime; + ::com::sun::star::lang::Locale m_aLocale; + ::rtl::OUString m_sName; // for a table the name is composed + ::rtl::OUString m_sSourceName; + ::rtl::OUString m_aKeyName; + TOTypeInfoSP m_pTypeInfo; // default type + sal_Bool m_bAddPKFirstTime; sal_Int16 m_nOperation; - Wizard_Button_Style m_ePressed; - sal_Bool m_bCreatePrimaryKeyColumn; + Wizard_Button_Style m_ePressed; + sal_Bool m_bCreatePrimaryKeyColumn; sal_Bool m_bUseHeaderLine; private: - DECL_LINK( ImplPrevHdl , PushButton* ); - DECL_LINK( ImplNextHdl , PushButton* ); - DECL_LINK( ImplOKHdl , OKButton* ); + DECL_LINK( ImplPrevHdl , PushButton* ); + DECL_LINK( ImplNextHdl , PushButton* ); + DECL_LINK( ImplOKHdl , OKButton* ); DECL_LINK( ImplActivateHdl, WizardDialog* ); sal_Bool CheckColumns(sal_Int32& _rnBreakPos); void loadData( const ICopyTableSourceObject& _rSourceObject, @@ -308,8 +308,8 @@ namespace dbaui const ::rtl::OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xSourceConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xSourceConnection, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler>& _xInteractionHandler ); @@ -322,7 +322,7 @@ namespace dbaui const ODatabaseExport::TColumns& _rDestColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _xFormatter, + const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM @@ -330,36 +330,36 @@ namespace dbaui virtual ~OCopyTableWizard(); - virtual long DeactivatePage(); - OKButton& GetOKButton() { return m_pbFinish; } + virtual long DeactivatePage(); + OKButton& GetOKButton() { return m_pbFinish; } Wizard_Button_Style GetPressedButton() const { return m_ePressed; } - void EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable); - void AddWizardPage(OWizardPage* pPage); // Page wird von OCopyTableWizard gelöscht - void RemoveWizardPage(OWizardPage* pPage); // Page goes again to user - void CheckButtons(); // checks which button can be disabled, enabled + void EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable); + void AddWizardPage(OWizardPage* pPage); // Page wird von OCopyTableWizard gelöscht + void RemoveWizardPage(OWizardPage* pPage); // Page goes again to user + void CheckButtons(); // checks which button can be disabled, enabled // returns a vector where the position of a column and if the column is in the selection // when not the value is COLUMN_POSITION_NOT_FOUND == (sal_uInt32)-1 - ODatabaseExport::TPositions GetColumnPositions() const { return m_vColumnPos; } - ::std::vector<sal_Int32> GetColumnTypes() const { return m_vColumnTypes; } + ODatabaseExport::TPositions GetColumnPositions() const { return m_vColumnPos; } + ::std::vector<sal_Int32> GetColumnTypes() const { return m_vColumnTypes; } sal_Bool UseHeaderLine() const { return m_bUseHeaderLine; } void setUseHeaderLine(sal_Bool _bUseHeaderLine) { m_bUseHeaderLine = _bUseHeaderLine; } void insertColumn(sal_Int32 _nPos,OFieldDescription* _pField); /** replaces a field description with another one. The name must not be known so far. - @param _nPos + @param _nPos The pos inside the vector, 0 based. - @param _pField + @param _pField The field to set. - @param _sOldName + @param _sOldName The name of column to be replaced. */ void replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const ::rtl::OUString& _sOldName); /** returns whether a primary key should be created in the target database */ - sal_Bool shouldCreatePrimaryKey() const; + sal_Bool shouldCreatePrimaryKey() const; void setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ); static bool supportsPrimaryKey( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); @@ -372,23 +372,23 @@ namespace dbaui @return The name of the primary key. */ - ::rtl::OUString getPrimaryKeyName() const { return m_aKeyName; } + ::rtl::OUString getPrimaryKeyName() const { return m_aKeyName; } - TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } - const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } + TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } + const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } - TOTypeInfoSP getDestTypeInfo(sal_Int32 _nPos) const { return m_aDestTypeInfoIndex[_nPos]->second; } - const OTypeInfoMap* getDestTypeInfo() const { return &m_aDestTypeInfo; } + TOTypeInfoSP getDestTypeInfo(sal_Int32 _nPos) const { return m_aDestTypeInfoIndex[_nPos]->second; } + const OTypeInfoMap* getDestTypeInfo() const { return &m_aDestTypeInfo; } - ::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; } + ::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; } ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const { return m_xFormatter; } ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> GetFactory() const { return m_xFactory; } - const ODatabaseExport::TColumns* getSourceColumns() const{ return &m_vSourceColumns; } - const ODatabaseExport::TColumnVector* getSrcVector() const { return &m_vSourceVec; } - ODatabaseExport::TColumns* getDestColumns() { return &m_vDestColumns; } - const ODatabaseExport::TColumnVector* getDestVector() const { return &m_aDestVec; } - ::rtl::OUString getName() const { return m_sName; } + const ODatabaseExport::TColumns* getSourceColumns() const{ return &m_vSourceColumns; } + const ODatabaseExport::TColumnVector* getSrcVector() const { return &m_vSourceVec; } + ODatabaseExport::TColumns* getDestColumns() { return &m_vDestColumns; } + const ODatabaseExport::TColumnVector* getDestVector() const { return &m_aDestVec; } + ::rtl::OUString getName() const { return m_sName; } /** clears the dest vectors */ @@ -401,10 +401,10 @@ namespace dbaui void setOperation( const sal_Int16 _nOperation ); sal_Int16 getOperation() const; - ::rtl::OUString convertColumnName( const TColumnFindFunctor& _rCmpFunctor, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen); + ::rtl::OUString convertColumnName( const TColumnFindFunctor& _rCmpFunctor, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen); TOTypeInfoSP convertType(const TOTypeInfoSP&_pType,sal_Bool& _bNotConvert); ::rtl::OUString createUniqueName(const ::rtl::OUString& _sName); diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index b12578deda6b..7e82893041ca 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ namespace dbaui class OWizHTMLExtend : public OWizTypeSelect { protected: - virtual SvParser* createReader(sal_Int32 _nRows); + virtual SvParser* createReader(sal_Int32 _nRows); public: - OWizHTMLExtend(Window* pParent, SvStream& _rStream) + OWizHTMLExtend(Window* pParent, SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } @@ -58,7 +58,7 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows); public: - OWizRTFExtend(Window* pParent,SvStream& _rStream) + OWizRTFExtend(Window* pParent,SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 06d6a76fe655..e9d056347764 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,20 +63,20 @@ namespace dbaui // ======================================================== class OWizNameMatching : public OWizardPage { - FixedText m_FT_TABLE_LEFT; - FixedText m_FT_TABLE_RIGHT; - OColumnTreeBox m_CTRL_LEFT; // left side - OColumnTreeBox m_CTRL_RIGHT; // right side + FixedText m_FT_TABLE_LEFT; + FixedText m_FT_TABLE_RIGHT; + OColumnTreeBox m_CTRL_LEFT; // left side + OColumnTreeBox m_CTRL_RIGHT; // right side ImageButton m_ibColumn_up; ImageButton m_ibColumn_down; ImageButton m_ibColumn_up_right; ImageButton m_ibColumn_down_right; - PushButton m_pbAll; - PushButton m_pbNone; - String m_sSourceText; - String m_sDestText; + PushButton m_pbAll; + PushButton m_pbNone; + String m_sSourceText; + String m_sDestText; - sal_Bool m_bAttrsChanged; + sal_Bool m_bAttrsChanged; DECL_LINK( ButtonClickHdl, Button * ); DECL_LINK( RightButtonClickHdl, Button * ); @@ -85,10 +85,10 @@ namespace dbaui DECL_LINK( TableListRightSelectHdl, void* ); public: - virtual void Reset ( ); - virtual void ActivatePage(); - virtual sal_Bool LeavePage(); - virtual String GetTitle() const ; + virtual void Reset ( ); + virtual void ActivatePage(); + virtual sal_Bool LeavePage(); + virtual String GetTitle() const ; OWizNameMatching(Window* pParent); virtual ~OWizNameMatching(); diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index 7aa6c138bd1b..9b86bd0e5bfe 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,20 +37,20 @@ namespace dbaui // Wizard Page // ======================================================== class OCopyTableWizard; - class OWizardPage : public TabPage + class OWizardPage : public TabPage { protected: - OCopyTableWizard* m_pParent; - sal_Bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode + OCopyTableWizard* m_pParent; + sal_Bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode OWizardPage( Window* pParent, const ResId& rResId );// : TabPage(pParent,rResId),m_pParent((OCopyTableWizard*)pParent),m_bFirstTime(sal_True) {}; public: - virtual void Reset ( ) = 0; - virtual sal_Bool LeavePage() = 0; - virtual String GetTitle() const = 0; + virtual void Reset ( ) = 0; + virtual sal_Bool LeavePage() = 0; + virtual String GetTitle() const = 0; - sal_Bool IsFirstTime() const { return m_bFirstTime; } + sal_Bool IsFirstTime() const { return m_bFirstTime; } }; } #endif // DBAUI_WIZ_TABBPAGE_HXX diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index ab57648adf90..d5ddf0790bc2 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,17 +48,17 @@ namespace dbaui class OWizTypeSelectControl : public OFieldDescControl { protected: - virtual void ActivateAggregate( EControlType eType ); - virtual void DeactivateAggregate( EControlType eType ); + virtual void ActivateAggregate( EControlType eType ); + virtual void DeactivateAggregate( EControlType eType ); - virtual void CellModified(long nRow, sal_uInt16 nColId ); + virtual void CellModified(long nRow, sal_uInt16 nColId ); - virtual ::com::sun::star::lang::Locale GetLocale() const; + virtual ::com::sun::star::lang::Locale GetLocale() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); - virtual const OTypeInfoMap* getTypeInfo() const; - virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); + virtual const OTypeInfoMap* getTypeInfo() const; + virtual sal_Bool isAutoIncrementValueEnabled() const; + virtual ::rtl::OUString getAutoIncrementValue() const; public: OWizTypeSelectControl(Window* pParent, const ResId& rResId,OTableDesignHelpBar* pHelpBar=NULL); @@ -75,17 +75,17 @@ namespace dbaui // ======================================================== class OWizTypeSelectList : public MultiListBox { - sal_Bool m_bPKey; - sal_Bool IsPrimaryKeyAllowed() const; - void setPrimaryKey( OFieldDescription* _pFieldDescr, + sal_Bool m_bPKey; + sal_Bool IsPrimaryKeyAllowed() const; + void setPrimaryKey( OFieldDescription* _pFieldDescr, sal_uInt16 _nPos, sal_Bool _bSet=sal_False); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); public: OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) {}; OWizTypeSelectList( Window* pParent, const ResId& rResId ) : MultiListBox(pParent,rResId) {}; - void SetPKey(sal_Bool bPKey) { m_bPKey = bPKey; } + void SetPKey(sal_Bool bPKey) { m_bPKey = bPKey; } }; // ======================================================== @@ -101,31 +101,31 @@ namespace dbaui DECL_LINK( ColumnSelectHdl, MultiListBox* ); DECL_LINK( ButtonClickHdl, Button * ); protected: - OWizTypeSelectList m_lbColumnNames; + OWizTypeSelectList m_lbColumnNames; FixedLine m_flColumns; - OWizTypeSelectControl m_aTypeControl; + OWizTypeSelectControl m_aTypeControl; FixedLine m_flAutoType; - FixedText m_ftAuto; - NumericField m_etAuto; - PushButton m_pbAuto; + FixedText m_ftAuto; + NumericField m_etAuto; + PushButton m_pbAuto; - Image m_imgPKey; - SvStream* m_pParserStream; // stream to read the tokens from or NULL - ::rtl::OUString m_sAutoIncrementValue; - sal_Int32 m_nDisplayRow; - sal_Bool m_bAutoIncrementEnabled; - sal_Bool m_bDuplicateName; + Image m_imgPKey; + SvStream* m_pParserStream; // stream to read the tokens from or NULL + ::rtl::OUString m_sAutoIncrementValue; + sal_Int32 m_nDisplayRow; + sal_Bool m_bAutoIncrementEnabled; + sal_Bool m_bDuplicateName; - void fillColumnList(sal_uInt32 nRows); - virtual SvParser* createReader(sal_Int32 _nRows) = 0; + void fillColumnList(sal_uInt32 nRows); + virtual SvParser* createReader(sal_Int32 _nRows) = 0; - void EnableAuto(sal_Bool bEnable); + void EnableAuto(sal_Bool bEnable); public: - virtual void Reset ( ); - virtual void ActivatePage( ); - virtual void Resize(); - virtual sal_Bool LeavePage(); - virtual String GetTitle() const; + virtual void Reset ( ); + virtual void ActivatePage( ); + virtual void Resize(); + virtual sal_Bool LeavePage(); + virtual String GetTitle() const; OWizTypeSelect(Window* pParent, SvStream* _pStream = NULL ); virtual ~OWizTypeSelect(); diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 214e5f9113e3..b1627f8f81e0 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,14 +78,14 @@ namespace dbaui RadioButton m_aCaseTables; RadioButton m_aCaseQueries; - OTableTreeListBox m_aTableList; + OTableTreeListBox m_aTableList; SvTreeListBox m_aQueryList; ::std::auto_ptr< TableObjectListFacade > m_pCurrentList; - PushButton aAddButton; - CancelButton aCloseButton; - HelpButton aHelpButton; + PushButton aAddButton; + CancelButton aCloseButton; + HelpButton aHelpButton; IAddTableDialogContext& m_rContext; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 092afbb98108..c4f5a81d00fe 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace dbaui ,public IDatabaseSettingsDialog { OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; protected: @@ -66,7 +66,7 @@ namespace dbaui ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName); - + virtual ~AdvancedSettingsDialog(); /// determines whether or not the given data source type has any advanced setting @@ -75,12 +75,12 @@ namespace dbaui virtual const SfxItemSet* getOutputSet() const; virtual SfxItemSet* getWriteOutputSet(); - virtual short Execute(); + virtual short Execute(); // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); diff --git a/dbaccess/source/ui/inc/asyncmodaldialog.hxx b/dbaccess/source/ui/inc/asyncmodaldialog.hxx index 4cdc83d70dfc..9711070bc9a0 100644 --- a/dbaccess/source/ui/inc/asyncmodaldialog.hxx +++ b/dbaccess/source/ui/inc/asyncmodaldialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx index 7bd5a7c67171..3bac18ae4fb8 100644 --- a/dbaccess/source/ui/inc/browserids.hxx +++ b/dbaccess/source/ui/inc/browserids.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,89 +31,89 @@ #include <svx/svxids.hrc> #include "dbaccess_slotid.hrc" -#define ID_BROWSER_COPY SID_COPY -#define ID_BROWSER_CUT SID_CUT -#define ID_BROWSER_EDITDOC SID_EDITDOC -#define ID_BROWSER_UNDORECORD SID_FM_RECORD_UNDO -#define ID_BROWSER_SAVERECORD SID_FM_RECORD_SAVE -#define ID_BROWSER_PASTE SID_PASTE -#define ID_BROWSER_CLIPBOARD_FORMAT_ITEMS SID_CLIPBOARD_FORMAT_ITEMS -#define ID_BROWSER_REDO SID_REDO -#define ID_BROWSER_SAVEDOC SID_SAVEDOC -#define ID_BROWSER_SAVEASDOC SID_SAVEASDOC -#define ID_BROWSER_TITLE SID_DOCINFO_TITLE -#define ID_BROWSER_UNDO SID_UNDO -#define ID_BROWSER_INSERTCOLUMNS SID_SBA_BRW_INSERT -#define ID_BROWSER_FORMLETTER SID_SBA_BRW_MERGE -#define ID_BROWSER_INSERTCONTENT SID_SBA_BRW_UPDATE +#define ID_BROWSER_COPY SID_COPY +#define ID_BROWSER_CUT SID_CUT +#define ID_BROWSER_EDITDOC SID_EDITDOC +#define ID_BROWSER_UNDORECORD SID_FM_RECORD_UNDO +#define ID_BROWSER_SAVERECORD SID_FM_RECORD_SAVE +#define ID_BROWSER_PASTE SID_PASTE +#define ID_BROWSER_CLIPBOARD_FORMAT_ITEMS SID_CLIPBOARD_FORMAT_ITEMS +#define ID_BROWSER_REDO SID_REDO +#define ID_BROWSER_SAVEDOC SID_SAVEDOC +#define ID_BROWSER_SAVEASDOC SID_SAVEASDOC +#define ID_BROWSER_TITLE SID_DOCINFO_TITLE +#define ID_BROWSER_UNDO SID_UNDO +#define ID_BROWSER_INSERTCOLUMNS SID_SBA_BRW_INSERT +#define ID_BROWSER_FORMLETTER SID_SBA_BRW_MERGE +#define ID_BROWSER_INSERTCONTENT SID_SBA_BRW_UPDATE -#define ID_BROWSER_SEARCH SID_FM_SEARCH -#define ID_BROWSER_SORTUP SID_FM_SORTUP -#define ID_BROWSER_SORTDOWN SID_FM_SORTDOWN -#define ID_BROWSER_AUTOFILTER SID_FM_AUTOFILTER -#define ID_BROWSER_FILTERCRIT SID_FM_FILTERCRIT -#define ID_BROWSER_ORDERCRIT SID_FM_ORDERCRIT -#define ID_BROWSER_REMOVEFILTER SID_FM_REMOVE_FILTER_SORT -#define ID_BROWSER_FILTERED SID_FM_FORM_FILTERED -#define ID_BROWSER_REFRESH SID_FM_REFRESH -#define ID_BROWSER_EXPL_PREVLEVEL SID_EXPLORER_PREVLEVEL -#define ID_BROWSER_COLATTRSET 20 // Spaltenformatierung -#define ID_BROWSER_COLWIDTH 21 // Spaltenbreite -#define ID_BROWSER_TABLEATTR 22 // table format attributes -#define ID_BROWSER_ROWHEIGHT 23 // Zeilenhoehe -#define ID_BROWSER_COLUMNINFO 24 // copies the column description to insert it into the table design -#define ID_BROWSER_COUNTALL SID_FM_COUNTALL // count all -#define ID_BROWSER_ADDTABLE SID_FM_ADDTABLE -#define ID_BROWSER_EXPLORER SID_DSBROWSER_EXPLORER -#define ID_BROWSER_DOCUMENT_DATASOURCE SID_DOCUMENT_DATA_SOURCE +#define ID_BROWSER_SEARCH SID_FM_SEARCH +#define ID_BROWSER_SORTUP SID_FM_SORTUP +#define ID_BROWSER_SORTDOWN SID_FM_SORTDOWN +#define ID_BROWSER_AUTOFILTER SID_FM_AUTOFILTER +#define ID_BROWSER_FILTERCRIT SID_FM_FILTERCRIT +#define ID_BROWSER_ORDERCRIT SID_FM_ORDERCRIT +#define ID_BROWSER_REMOVEFILTER SID_FM_REMOVE_FILTER_SORT +#define ID_BROWSER_FILTERED SID_FM_FORM_FILTERED +#define ID_BROWSER_REFRESH SID_FM_REFRESH +#define ID_BROWSER_EXPL_PREVLEVEL SID_EXPLORER_PREVLEVEL +#define ID_BROWSER_COLATTRSET 20 // Spaltenformatierung +#define ID_BROWSER_COLWIDTH 21 // Spaltenbreite +#define ID_BROWSER_TABLEATTR 22 // table format attributes +#define ID_BROWSER_ROWHEIGHT 23 // Zeilenhoehe +#define ID_BROWSER_COLUMNINFO 24 // copies the column description to insert it into the table design +#define ID_BROWSER_COUNTALL SID_FM_COUNTALL // count all +#define ID_BROWSER_ADDTABLE SID_FM_ADDTABLE +#define ID_BROWSER_EXPLORER SID_DSBROWSER_EXPLORER +#define ID_BROWSER_DOCUMENT_DATASOURCE SID_DOCUMENT_DATA_SOURCE // The following ids are local to special components (e.g. menus), so they don't need to be unique // overall. Please have this in mind when changing anything #define ID_TREE_EDIT_DATABASE 1 -#define ID_TREE_CLOSE_CONN 2 +#define ID_TREE_CLOSE_CONN 2 // FREE -#define ID_TREE_ADMINISTRATE 4 +#define ID_TREE_ADMINISTRATE 4 #define ID_MIGRATE_SCRIPTS 5 -#define ID_REPORT_NEW_TEXT 14 -#define ID_FORM_NEW_TEXT 15 -#define ID_FORM_NEW_CALC 16 -#define ID_FORM_NEW_IMPRESS 17 -#define ID_NEW_QUERY_DESIGN 20 -#define ID_EDIT_QUERY_DESIGN 21 -#define ID_NEW_QUERY_SQL 22 -#define ID_EDIT_QUERY_SQL 23 -#define ID_NEW_TABLE_DESIGN 25 -#define ID_NEW_VIEW_DESIGN 28 -#define ID_DIRECT_SQL 32 -#define ID_BROWSER_REFRESH_REBUILD 34 -#define ID_INDEX_NEW 36 -#define ID_INDEX_DROP 37 -#define ID_INDEX_RENAME 38 -#define ID_INDEX_SAVE 39 -#define ID_INDEX_RESET 40 -#define ID_DOCUMENT_CREATE_REPWIZ 41 -#define ID_BROWSER_SQL 42 +#define ID_REPORT_NEW_TEXT 14 +#define ID_FORM_NEW_TEXT 15 +#define ID_FORM_NEW_CALC 16 +#define ID_FORM_NEW_IMPRESS 17 +#define ID_NEW_QUERY_DESIGN 20 +#define ID_EDIT_QUERY_DESIGN 21 +#define ID_NEW_QUERY_SQL 22 +#define ID_EDIT_QUERY_SQL 23 +#define ID_NEW_TABLE_DESIGN 25 +#define ID_NEW_VIEW_DESIGN 28 +#define ID_DIRECT_SQL 32 +#define ID_BROWSER_REFRESH_REBUILD 34 +#define ID_INDEX_NEW 36 +#define ID_INDEX_DROP 37 +#define ID_INDEX_RENAME 38 +#define ID_INDEX_SAVE 39 +#define ID_INDEX_RESET 40 +#define ID_DOCUMENT_CREATE_REPWIZ 41 +#define ID_BROWSER_SQL 42 -#define ID_APP_NEW_QUERY_AUTO_PILOT 44 -#define ID_NEW_TABLE_DESIGN_AUTO_PILOT 45 -#define ID_NEW_VIEW_DESIGN_AUTO_PILOT 46 +#define ID_APP_NEW_QUERY_AUTO_PILOT 44 +#define ID_NEW_TABLE_DESIGN_AUTO_PILOT 45 +#define ID_NEW_VIEW_DESIGN_AUTO_PILOT 46 // other -#define ID_BROWSER_QUERY_EXECUTE SID_FM_EXECUTE +#define ID_BROWSER_QUERY_EXECUTE SID_FM_EXECUTE -#define ID_BROWSER_CLOSE SID_CLOSEWIN -#define ID_BROWSER_ESACPEPROCESSING SID_FM_NATIVESQL +#define ID_BROWSER_CLOSE SID_CLOSEWIN +#define ID_BROWSER_ESACPEPROCESSING SID_FM_NATIVESQL -#define ID_QUERY_FUNCTION (SID_SBA_START + 41) // Funktionen anzeigen -#define ID_QUERY_TABLENAME (SID_SBA_START + 42) // Tabellennamen anzeigen -#define ID_QUERY_ALIASNAME (SID_SBA_START + 43) // Aliasnamen anzeigen -#define ID_QUERY_DISTINCT (SID_SBA_START + 44) // Distinct anzeigen -#define ID_QUERY_EDIT_JOINCONNECTION (SID_SBA_START + 45) // show-edit Join -#define ID_BROWSER_INSERT_ROW (SID_SBA_START + 46) // insert row -#define ID_QUERY_ZOOM_IN SID_ZOOM_IN -#define ID_QUERY_ZOOM_OUT SID_ZOOM_OUT +#define ID_QUERY_FUNCTION (SID_SBA_START + 41) // Funktionen anzeigen +#define ID_QUERY_TABLENAME (SID_SBA_START + 42) // Tabellennamen anzeigen +#define ID_QUERY_ALIASNAME (SID_SBA_START + 43) // Aliasnamen anzeigen +#define ID_QUERY_DISTINCT (SID_SBA_START + 44) // Distinct anzeigen +#define ID_QUERY_EDIT_JOINCONNECTION (SID_SBA_START + 45) // show-edit Join +#define ID_BROWSER_INSERT_ROW (SID_SBA_START + 46) // insert row +#define ID_QUERY_ZOOM_IN SID_ZOOM_IN +#define ID_QUERY_ZOOM_OUT SID_ZOOM_OUT #endif // DBACCESS_UI_BROWSER_ID_HXX diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index ccc53bc650c7..9f2fe801ddce 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ namespace dbaui , ::com::sun::star::awt::XFocusListener , ::com::sun::star::container::XContainerListener , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::frame::XModule + , ::com::sun::star::frame::XModule > SbaXDataBrowserController_Base; class SbaXDataBrowserController :public SbaXDataBrowserController_Base @@ -93,47 +93,47 @@ namespace dbaui friend class FormControllerImpl; OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; // our rowset - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xColumnsSupplier; // queried from the rowset member - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xLoadable; // queried from the rowset member as well - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > m_xGridModel; // the model of our grid - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xFormControllerImpl; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > - m_xParser; // for sorting 'n filtering + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; // our rowset + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xColumnsSupplier; // queried from the rowset member + ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xLoadable; // queried from the rowset member as well + ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > m_xGridModel; // the model of our grid + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xFormControllerImpl; + mutable ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > + m_xParser; // for sorting 'n filtering sal_Int32 m_nRowSetPrivileges; // cached Privileges property of m_xRowSet - AutoTimer m_aInvalidateClipboard; // for testing the state of the CUT/COPY/PASTE-slots + AutoTimer m_aInvalidateClipboard; // for testing the state of the CUT/COPY/PASTE-slots - TransferableDataHelper m_aSystemClipboard; // content of the clipboard + TransferableDataHelper m_aSystemClipboard; // content of the clipboard TransferableClipboardListener* - m_pClipbordNotifier; // notifier for changes in the clipboard + m_pClipbordNotifier; // notifier for changes in the clipboard - ::osl::Mutex m_aAsyncLoadSafety; // for multi-thread access to our members + ::osl::Mutex m_aAsyncLoadSafety; // for multi-thread access to our members - OAsyncronousLink m_aAsyncGetCellFocus; + OAsyncronousLink m_aAsyncGetCellFocus; OAsyncronousLink m_aAsyncDisplayError; ::dbtools::SQLExceptionInfo m_aCurrentError; - String m_sStateSaveRecord; - String m_sStateUndoRecord; + String m_sStateSaveRecord; + String m_sStateUndoRecord; ::rtl::OUString m_sModuleIdentifier; // members for asynchronous load operations - FormControllerImpl* m_pFormControllerImpl; // implementing the XFormController + FormControllerImpl* m_pFormControllerImpl; // implementing the XFormController - ULONG m_nPendingLoadFinished; // the event used to tell ourself that the load is finished - sal_uInt16 m_nFormActionNestingLevel; // see enter-/leaveFormAction + ULONG m_nPendingLoadFinished; // the event used to tell ourself that the load is finished + sal_uInt16 m_nFormActionNestingLevel; // see enter-/leaveFormAction - sal_Bool m_bLoadCanceled : 1; // the load was canceled somehow - sal_Bool m_bClosingKillOpen : 1; // are we killing the load thread because we are to be suspended ? + sal_Bool m_bLoadCanceled : 1; // the load was canceled somehow + sal_Bool m_bClosingKillOpen : 1; // are we killing the load thread because we are to be suspended ? bool m_bCannotSelectUnfiltered : 1; // recieved an DATA_CANNOT_SELECT_UNFILTERED error protected: class FormErrorHelper { - SbaXDataBrowserController* m_pOwner; + SbaXDataBrowserController* m_pOwner; public: FormErrorHelper(SbaXDataBrowserController* pOwner) : m_pOwner(pOwner) { m_pOwner->enterFormAction(); } virtual ~FormErrorHelper() { m_pOwner->leaveFormAction(); } @@ -143,20 +143,20 @@ namespace dbaui // ================ // attribute access protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getRowSet() const { return m_xRowSet; } - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > getColumnsSupplier()const { return m_xColumnsSupplier; } - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > getLoadable() const { return m_xLoadable; } - - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > getFormComponent() const { return m_xGridModel; } - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > getControlModel() const { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > (m_xGridModel, ::com::sun::star::uno::UNO_QUERY); } - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter()const { return m_xFormatter; } - - sal_Bool isValid() const { return m_xRowSet.is() && m_xGridModel.is(); } - sal_Bool isValidCursor() const; // checks the ::com::sun::star::data::XDatabaseCursor-interface of m_xRowSet - sal_Bool isLoaded() const; - sal_Bool loadingCancelled() const { return m_bLoadCanceled; } + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getRowSet() const { return m_xRowSet; } + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > getColumnsSupplier()const { return m_xColumnsSupplier; } + ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > getLoadable() const { return m_xLoadable; } + + ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > getFormComponent() const { return m_xGridModel; } + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > getControlModel() const { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > (m_xGridModel, ::com::sun::star::uno::UNO_QUERY); } + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter()const { return m_xFormatter; } + + sal_Bool isValid() const { return m_xRowSet.is() && m_xGridModel.is(); } + sal_Bool isValidCursor() const; // checks the ::com::sun::star::data::XDatabaseCursor-interface of m_xRowSet + sal_Bool isLoaded() const; + sal_Bool loadingCancelled() const { return m_bLoadCanceled; } void onStartLoading( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable ); - void setLoadingCancelled() { m_bLoadCanceled = sal_True; } + void setLoadingCancelled() { m_bLoadCanceled = sal_True; } const TransferableDataHelper& getViewClipboard() const { return m_aSystemClipboard; } @@ -169,7 +169,7 @@ namespace dbaui virtual sal_Bool Construct(Window* pParent); // UNO - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -201,19 +201,19 @@ namespace dbaui virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); // ::com::sun::star::frame::XFrameActionListener - virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::sdb::XSQLErrorListener - virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::form::XDatabaseParameterListener - virtual sal_Bool SAL_CALL approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::form::XConfirmDeleteListener - virtual sal_Bool SAL_CALL confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::form::XLoadListener virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException ); @@ -241,11 +241,11 @@ namespace dbaui virtual ~SbaXDataBrowserController(); // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual void startFrameListening( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); virtual void stopFrameListening( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); @@ -268,8 +268,8 @@ namespace dbaui // you most probably don't want to override this behaviuor // the default implementation of disposing distributes the events to the following disposingXXX functions - virtual void disposingGridControl(const ::com::sun::star::lang::EventObject& Source); // calls removeControlListeners - virtual void disposingGridModel(const ::com::sun::star::lang::EventObject& Source); // calls removeModelListeners + virtual void disposingGridControl(const ::com::sun::star::lang::EventObject& Source); // calls removeControlListeners + virtual void disposingGridModel(const ::com::sun::star::lang::EventObject& Source); // calls removeModelListeners virtual void disposingFormModel(const ::com::sun::star::lang::EventObject& Source); virtual void disposingColumnModel(const ::com::sun::star::lang::EventObject& Source); @@ -313,7 +313,7 @@ namespace dbaui virtual sal_Bool SaveModified(sal_Bool bAskFor = sal_True); // save the modified record - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; // a PropertySet corresponding to the cursor field a column is bound to // if nViewPos is (sal_uInt16)-1 (the default) then the field for the current column will be retrieved @@ -336,18 +336,18 @@ namespace dbaui void ExecuteFilterSortCrit(sal_Bool bFilter); // execute the search slot - void ExecuteSearch(); + void ExecuteSearch(); void initializeParser() const; // changes the mutable member m_xParser - void applyParserFilter(const ::rtl::OUString& _rOldFilter, sal_Bool _bOldFilterApplied,const ::rtl::OUString& _sOldHaving,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); - void applyParserOrder(const ::rtl::OUString& _rOldOrder,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); + void applyParserFilter(const ::rtl::OUString& _rOldFilter, sal_Bool _bOldFilterApplied,const ::rtl::OUString& _sOldHaving,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); + void applyParserOrder(const ::rtl::OUString& _rOldOrder,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); sal_Int16 getCurrentColumnPosition(); - void setCurrentColumnPosition( sal_Int16 _nPos ); - void addColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); + void setCurrentColumnPosition( sal_Int16 _nPos ); + void addColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); void impl_checkForCannotSelectUnfiltered( const ::dbtools::SQLExceptionInfo& _rError ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > createParser_nothrow(); + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > createParser_nothrow(); // time to check the CUT/COPY/PASTE-slot-states DECL_LINK( OnInvalidateClipboard, AutoTimer* ); diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index b73016ea34e8..b954688867bd 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,21 +56,21 @@ namespace dbaui class UnoDataBrowserView : public ODataView, public ::utl::OEventListenerAdapter { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > m_xGrid; // our grid's UNO representation - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xMe; // our own UNO representation - DBTreeView* m_pTreeView; - Splitter* m_pSplitter; - mutable SbaGridControl* m_pVclControl; // our grid's VCL representation - Window* m_pStatus; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > m_xGrid; // our grid's UNO representation + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xMe; // our own UNO representation + DBTreeView* m_pTreeView; + Splitter* m_pSplitter; + mutable SbaGridControl* m_pVclControl; // our grid's VCL representation + Window* m_pStatus; DECL_LINK( SplitHdl, void* ); // attribute access public: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > getGridControl() const { return m_xGrid; } - SbaGridControl* getVclControl() const; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > getGridControl() const { return m_xGrid; } + SbaGridControl* getVclControl() const; public: - UnoDataBrowserView( Window* pParent, + UnoDataBrowserView( Window* pParent, IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); virtual ~UnoDataBrowserView(); @@ -78,20 +78,20 @@ namespace dbaui /// late construction virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel); - /** as columns may be hidden there is a difference between a columns model pos and its view pos + /** as columns may be hidden there is a difference between a columns model pos and its view pos so we you may use these translation function */ sal_uInt16 View2ModelPos(sal_uInt16 nPos) const; - /// for the same reason the view column count isn't the same as the model column count + /// for the same reason the view column count isn't the same as the model column count void setSplitter(Splitter* _pSplitter); void setTreeView(DBTreeView* _pTreeView); - void showStatus( const String& _rStatus ); - void hideStatus(); - - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getContainer() { return m_xMe; } + void showStatus( const String& _rStatus ); + void hideStatus(); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getContainer() { return m_xMe; } + protected: virtual long PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); @@ -105,7 +105,7 @@ namespace dbaui class BrowserViewStatusDisplay { protected: - UnoDataBrowserView* m_pView; + UnoDataBrowserView* m_pView; public: BrowserViewStatusDisplay( UnoDataBrowserView* _pView, const String& _rStatus ); diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx index 355e8faafcad..2acd041c6673 100644 --- a/dbaccess/source/ui/inc/callbacks.hxx +++ b/dbaccess/source/ui/inc/callbacks.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,15 +64,15 @@ namespace dbaui /** handler for StartDrag requests @return <TRUE/> if a drag operation was started */ - virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ) = 0; + virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ) = 0; /** check whether or not a drop request should be accepted */ - virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) = 0; + virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) = 0; /** execute a drop request */ - virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) = 0; + virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) = 0; }; //==================================================================== @@ -117,11 +117,11 @@ namespace dbaui { public: /// called when a drag operation done with a Transferable has been finished - virtual void dragFinished( ) = 0; + virtual void dragFinished( ) = 0; }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // _DBACCESS_UI_CALLBACKS_HXX_ diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 0f581e61b670..e566e8b8a410 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace dbaui bool StoreSelectedCharSet( SfxItemSet& _rSet, const USHORT _nItemId ); private: - OCharsetDisplay m_aCharSets; + OCharsetDisplay m_aCharSets; }; //........................................................................ diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index f5f51690178c..00a4a1f83a1f 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace dbaui ,protected SvxTextEncodingTable { protected: - ::rtl::OUString m_aSystemDisplayName; + ::rtl::OUString m_aSystemDisplayName; public: class ExtendedCharsetIterator; @@ -65,14 +65,14 @@ namespace dbaui const_iterator findDisplayName(const ::rtl::OUString& _rDisplayName) const; /// get access to the first element of the charset collection - const_iterator begin() const; + const_iterator begin() const; /// get access to the (last + 1st) element of the charset collection - const_iterator end() const; + const_iterator end() const; // size of the map - sal_Int32 size() const { return OCharsetDisplay_Base::size(); } + sal_Int32 size() const { return OCharsetDisplay_Base::size(); } protected: - virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; + virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; private: using OCharsetDisplay_Base::find; @@ -86,14 +86,14 @@ namespace dbaui { friend class OCharsetDisplay::ExtendedCharsetIterator; - ::rtl::OUString m_sDisplayName; + ::rtl::OUString m_sDisplayName; public: CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper& _rSource); - rtl_TextEncoding getEncoding() const { return CharsetDisplayDerefHelper_Base::getEncoding(); } - ::rtl::OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); } - ::rtl::OUString getDisplayName() const { return m_sDisplayName; } + rtl_TextEncoding getEncoding() const { return CharsetDisplayDerefHelper_Base::getEncoding(); } + ::rtl::OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); } + ::rtl::OUString getDisplayName() const { return m_sDisplayName; } protected: CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const ::rtl::OUString& _rDisplayName); @@ -109,12 +109,12 @@ namespace dbaui friend bool operator==(const ExtendedCharsetIterator& lhs, const ExtendedCharsetIterator& rhs); friend bool operator!=(const ExtendedCharsetIterator& lhs, const ExtendedCharsetIterator& rhs) { return !(lhs == rhs); } - typedef ::dbtools::OCharsetMap container; - typedef container::CharsetIterator base_iterator; + typedef ::dbtools::OCharsetMap container; + typedef container::CharsetIterator base_iterator; protected: - const OCharsetDisplay* m_pContainer; - base_iterator m_aPosition; + const OCharsetDisplay* m_pContainer; + base_iterator m_aPosition; public: ExtendedCharsetIterator(const ExtendedCharsetIterator& _rSource); @@ -122,21 +122,21 @@ namespace dbaui CharsetDisplayDerefHelper operator*() const; /// prefix increment - const ExtendedCharsetIterator& operator++(); + const ExtendedCharsetIterator& operator++(); /// postfix increment - const ExtendedCharsetIterator operator++(int) { ExtendedCharsetIterator hold(*this); ++*this; return hold; } + const ExtendedCharsetIterator operator++(int) { ExtendedCharsetIterator hold(*this); ++*this; return hold; } /// prefix decrement - const ExtendedCharsetIterator& operator--(); + const ExtendedCharsetIterator& operator--(); /// postfix decrement - const ExtendedCharsetIterator operator--(int) { ExtendedCharsetIterator hold(*this); --*this; return hold; } + const ExtendedCharsetIterator operator--(int) { ExtendedCharsetIterator hold(*this); --*this; return hold; } protected: ExtendedCharsetIterator( const OCharsetDisplay* _pContainer, const base_iterator& _rPosition ); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_CHARSETS_HXX_ diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index 4fde4f6d1b38..61dede6f134f 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <comphelper/stl_types.hxx> #include <unotools/sharedunocomponent.hxx> -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace sdbc { class XConnection; } @@ -50,7 +50,7 @@ namespace dbaui typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_COMMON_TYPES_HXX_ diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index 5983f252c8e5..3bff8de08eef 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ class OConnectionURLEdit : public Edit { ::dbaccess::ODsnTypeCollection* m_pTypeCollection; - FixedText* m_pForcedPrefix; - String m_sSaveValueNoPrefix; - BOOL m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not + FixedText* m_pForcedPrefix; + String m_sSaveValueNoPrefix; + BOOL m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not public: OConnectionURLEdit(Window* pParent, const ResId& rResId,BOOL _bShowPrefix = FALSE); @@ -60,28 +60,28 @@ public: public: // Edit overridables - virtual void SetText(const String& _rStr); - virtual void SetText(const String& _rStr, const Selection& _rNewSelection); - virtual String GetText() const; + virtual void SetText(const String& _rStr); + virtual void SetText(const String& _rStr, const Selection& _rNewSelection); + virtual String GetText() const; /** Showsthe Prefix - @param _bShowPrefix + @param _bShowPrefix If <TRUE/> than the prefix will be visible, otherwise not. */ void ShowPrefix(BOOL _bShowPrefix); /// get the currently set text, excluding the prefix indicating the type - virtual String GetTextNoPrefix() const; + virtual String GetTextNoPrefix() const; /// set a new text, leave the current prefix unchanged - virtual void SetTextNoPrefix(const String& _rText); + virtual void SetTextNoPrefix(const String& _rText); - inline void SaveValueNoPrefix() { m_sSaveValueNoPrefix = GetTextNoPrefix(); } - inline String GetSavedValueNoPrefix() const { return m_sSaveValueNoPrefix; } + inline void SaveValueNoPrefix() { m_sSaveValueNoPrefix = GetTextNoPrefix(); } + inline String GetSavedValueNoPrefix() const { return m_sSaveValueNoPrefix; } inline void SetTypeCollection(::dbaccess::ODsnTypeCollection* _pTypeCollection) { m_pTypeCollection = _pTypeCollection; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_CURLEDIT_HXX_ diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index 97659f454888..9ea455557b17 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ namespace dbaui /** sets the target frame into which the view should be loaded. - By default, the view is loaded into a top-level frame not being part of the + By default, the view is loaded into a top-level frame not being part of the Desktop. */ void setTargetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) @@ -144,7 +144,7 @@ namespace dbaui the data source for which a new object is to be created @param _rObjectName the name of the object to be edited - @param _rArgs + @param _rArgs Additional settings which should be forwarded to the frame @return the frame into which the view has been loaded @@ -225,13 +225,13 @@ namespace dbaui class ResultSetBrowser : public DatabaseObjectView { private: - sal_Bool m_bTable; + sal_Bool m_bTable; protected: virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rQualifiedName + const ::rtl::OUString& _rQualifiedName ); public: @@ -256,7 +256,7 @@ namespace dbaui ); }; // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... #endif // DBACCESS_DATABASE_OBJECT_VIEW_HXX diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index cb2842591dd6..12aba17aed6f 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,10 +51,10 @@ namespace dbaui class ODatasourceConnector { protected: - Window* m_pErrorMessageParent; + Window* m_pErrorMessageParent; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; - ::rtl::OUString m_sContextInformation; + ::rtl::OUString m_sContextInformation; public: ODatasourceConnector( @@ -68,7 +68,7 @@ namespace dbaui ); /// returns <TRUE/> if the object is able to create data source connections - sal_Bool isValid() const { return m_xORB.is(); } + sal_Bool isValid() const { return m_xORB.is(); } /** creates a connection to the data source, displays the possible error to the user, or returns it */ @@ -88,7 +88,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DATASOURCECONNECTOR_HXX_ diff --git a/dbaccess/source/ui/inc/datasourcemap.hxx b/dbaccess/source/ui/inc/datasourcemap.hxx index 836f001bf580..4b19d28b36a1 100644 --- a/dbaccess/source/ui/inc/datasourcemap.hxx +++ b/dbaccess/source/ui/inc/datasourcemap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace dbaui { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xDatasource; - SfxItemSet* pModifications; + SfxItemSet* pModifications; DatasourceInfo() :pModifications (NULL) { } DatasourceInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDS, @@ -60,16 +60,16 @@ namespace dbaui }; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xORB; /// service factory + m_xORB; /// service factory ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xDatabaseContext; /// database context we're working in + m_xDatabaseContext; /// database context we're working in DECLARE_STL_USTRINGACCESS_MAP(DatasourceInfo, DatasourceInfos); - DatasourceInfos m_aDatasources; /// known infos about data sources + DatasourceInfos m_aDatasources; /// known infos about data sources // deleted data sources, not necessarily with distinct names, that's why accessed via unique ids DECLARE_STL_MAP(sal_Int32, DatasourceInfo, ::std::less< sal_Int32 >, MapInt2Info); - MapInt2Info m_aDeletedDatasources; + MapInt2Info m_aDeletedDatasources; public: /// iterating through all data sources @@ -89,63 +89,63 @@ namespace dbaui getContext() { return m_xDatabaseContext; } /// first element for iterating through the datasources - Iterator begin(); + Iterator begin(); /// last element for iterating through the datasources - Iterator end(); + Iterator end(); /// first element for iterating through the deleted datasources - Iterator beginDeleted(); + Iterator beginDeleted(); /// last element for iterating through the deleted datasources - Iterator endDeleted(); + Iterator endDeleted(); /// check if the object contains a valid datasource enumeration - sal_Bool isValid() const { return m_xDatabaseContext.is(); } + sal_Bool isValid() const { return m_xDatabaseContext.is(); } /// check if a datasource with the given name exists - sal_Bool exists(const ::rtl::OUString& _rName) const; + sal_Bool exists(const ::rtl::OUString& _rName) const; /// return the number of datasources available - sal_Int32 size() const { return m_aDatasources.size(); } + sal_Int32 size() const { return m_aDatasources.size(); } /// clear the map (non-deleted <em>and</em> deleted items) - void clear(); + void clear(); /// clear the map (deleted items only) - void clearDeleted(); + void clearDeleted(); /// clear the modification items for a datasource - void clearModifiedFlag(const ::rtl::OUString& _rName); + void clearModifiedFlag(const ::rtl::OUString& _rName); /** tell the map that a data source is scheduled to be deleted. - @return id for accessing the deleted data source later. -1 if no free id existed or an error occured + @return id for accessing the deleted data source later. -1 if no free id existed or an error occured */ - sal_Int32 markDeleted(const ::rtl::OUString& _rName); + sal_Int32 markDeleted(const ::rtl::OUString& _rName); /** restores a datasource which has previously been marked as deleted.<p/> - @param _nAccessId the access id as got from <method>markDeleted</method> - @param _rName contains, upon return, the name of the datasource the access key refers to - @return sal_True if the datasource was successfully restored, sal_False if it could not be restored + @param _nAccessId the access id as got from <method>markDeleted</method> + @param _rName contains, upon return, the name of the datasource the access key refers to + @return sal_True if the datasource was successfully restored, sal_False if it could not be restored because of a naming conflict (e.g. because another data source now has the name of the to-be-restored one). - @see renamed - @see markDeleted + @see renamed + @see markDeleted */ - sal_Bool restoreDeleted(sal_Int32 _nAccessId, ::rtl::OUString& _rName); + sal_Bool restoreDeleted(sal_Int32 _nAccessId, ::rtl::OUString& _rName); /// remove an element from the map - void deleted(const ::rtl::OUString& _rName); + void deleted(const ::rtl::OUString& _rName); // (should be an erase(const Iterator&), but this is way to general ... /// update the infos for a data source with a given item set - void update(const ::rtl::OUString& _rName, SfxItemSet& _rSet); + void update(const ::rtl::OUString& _rName, SfxItemSet& _rSet); /** Tells the map that an entry has been renamed in a sense that it should be accessible under a new name. This does not necesssarily mean that the data source has been renamed within it's database context */ - void renamed(const ::rtl::OUString& _rOldName, const ::rtl::OUString& _rNewName); + void renamed(const ::rtl::OUString& _rOldName, const ::rtl::OUString& _rNewName); /** adjust the registration name if necessary<p/> The real name of the data source (as indicated in the SfxItemSet for this ds) may be another one than the name the ds is registered for. This method corrects this, the ds will become registered under it's real name. - @param _rName the name the ds is registered for - @return the real name of the data source + @param _rName the name the ds is registered for + @return the real name of the data source */ ::rtl::OUString adjustRealName(const ::rtl::OUString& _rName); @@ -154,7 +154,7 @@ namespace dbaui This method allows us lazy access to the data sources: They're retrieved from the context only if they're accessed by somebody. */ - void ensureObject(const ::rtl::OUString& _rName); + void ensureObject(const ::rtl::OUString& _rName); }; //------------------------------------------------------------------------- @@ -166,27 +166,27 @@ namespace dbaui friend class ODatasourceMap::Iterator; private: - ODatasourceMap* m_pOwner; - const ODatasourceMap::DatasourceInfo& m_rInfoImpl; - ::rtl::OUString m_sName; - sal_Int32 m_nAccessKey; + ODatasourceMap* m_pOwner; + const ODatasourceMap::DatasourceInfo& m_rInfoImpl; + ::rtl::OUString m_sName; + sal_Int32 m_nAccessKey; public: ODatasourceInfo(const ODatasourceInfo& _rSource) :m_pOwner(_rSource.m_pOwner), m_sName(_rSource.m_sName), m_rInfoImpl(_rSource.m_rInfoImpl), m_nAccessKey(_rSource.m_nAccessKey) { } /// check if the datasource settings are modified - sal_Bool isModified() const; + sal_Bool isModified() const; /// get the name the datasource is registered under - ::rtl::OUString getName() const { return m_sName; } + ::rtl::OUString getName() const { return m_sName; } /// get the original name of a datasource (may habe been renamed) - ::rtl::OUString getOriginalName() const; + ::rtl::OUString getOriginalName() const; /// get the real name of the datasource, which is the name which is in the item set - ::rtl::OUString getRealName() const; + ::rtl::OUString getRealName() const; /// check if the datasource should is about to be renamed (which means the original name does not equal the real name - sal_Bool isRenamed() const { return !getRealName().equals(getOriginalName()); } + sal_Bool isRenamed() const { return !getRealName().equals(getOriginalName()); } /// get the key used to acces the object in the data source map - sal_Int32 getAccessKey() const { return m_nAccessKey; } + sal_Int32 getAccessKey() const { return m_nAccessKey; } /// return the datasource the object represents ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > @@ -216,10 +216,10 @@ namespace dbaui { friend class ODatasourceMap; protected: - ODatasourceMap* m_pOwner; - ODatasourceMap::ConstDatasourceInfosIterator m_aPos; - ODatasourceMap::ConstMapInt2InfoIterator m_aPosDeleted; - sal_Bool m_bLoopingDeleted; + ODatasourceMap* m_pOwner; + ODatasourceMap::ConstDatasourceInfosIterator m_aPos; + ODatasourceMap::ConstMapInt2InfoIterator m_aPosDeleted; + sal_Bool m_bLoopingDeleted; public: Iterator(const Iterator& _rSource); @@ -228,14 +228,14 @@ namespace dbaui ODatasourceInfo operator*() const; /// prefix increment - const Iterator& operator++(); + const Iterator& operator++(); /// postfix increment - const Iterator operator++(int) { Iterator hold(*this); ++*this; return hold; } + const Iterator operator++(int) { Iterator hold(*this); ++*this; return hold; } /// prefix decrement - const Iterator& operator--(); + const Iterator& operator--(); /// postfix decrement - const Iterator operator--(int) { Iterator hold(*this); --*this; return hold; } + const Iterator operator--(int) { Iterator hold(*this); --*this; return hold; } // compare two iterators @@ -258,7 +258,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DATASOURCEMAP_HXX diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 4ba63866454b..0a31ba19f7de 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,12 +56,12 @@ class ODbAdminDialog : public SfxTabDialog , public IItemSetHelper, public IData { private: typedef ::std::stack< sal_Int32 > PageStack; - PageStack m_aCurrentDetailPages; // ids of all currently enabled (type-dependent) detail pages + PageStack m_aCurrentDetailPages; // ids of all currently enabled (type-dependent) detail pages - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; - sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing - sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> + sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing + sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> USHORT m_nMainPageID; public: @@ -75,16 +75,16 @@ public: virtual ~ODbAdminDialog(); /** create and return an item set for use with the dialog. - @param _pTypeCollection pointer to an <type>ODatasourceMap</type>. May be NULL, in this case + @param _pTypeCollection pointer to an <type>ODatasourceMap</type>. May be NULL, in this case the pool will not contain a typecollection default. */ - static SfxItemSet* createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection); + static SfxItemSet* createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection); /** destroy and item set / item pool / pool defaults previously created by <method>createItemSet</method> */ - static void destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults); + static void destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults); /** selects the DataSource - @param _rName + @param _rName The name of the data source */ void selectDataSource(const ::com::sun::star::uno::Any& _aDataSourceName); @@ -95,7 +95,7 @@ public: // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); @@ -110,8 +110,8 @@ protected: virtual short Ok(); protected: - inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } - inline void disabledUI() { m_bUIEnabled = sal_False; } + inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } + inline void disabledUI() { m_bUIEnabled = sal_False; } private: /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. @@ -121,17 +121,17 @@ private: enum ApplyResult { - AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed - AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed + AR_LEAVE_UNCHANGED, // no changes were made + AR_KEEP // don't leave the page (e.g. because an error occured) }; /** apply all changes made */ - ApplyResult implApplyChanges(); + ApplyResult implApplyChanges(); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DBADMIN_HXX_ diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 29a8c3c2867e..f41d5971afd6 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,25 +47,25 @@ namespace dbaui class OHTMLImportExport; class ODataClipboard : public ::svx::ODataAccessObjectTransferable - + { ::rtl::Reference< OHTMLImportExport > m_pHtml; ::rtl::Reference< ORTFImportExport > m_pRtf; public: ODataClipboard( - const ::rtl::OUString& _rDatasource, - const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const ::rtl::OUString& _rDatasource, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); ODataClipboard( - const ::rtl::OUString& _rDatasource, - const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const ::rtl::OUString& _rDatasource, + const sal_Int32 _nCommandType, + const ::rtl::OUString& _rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); @@ -81,10 +81,10 @@ namespace dbaui virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); }; } diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 4a7cbf0131c6..cb3f00cda447 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ namespace dbaui { struct DBTreeEditedEntry { - SvLBoxEntry* pEntry; - XubString aNewText; + SvLBoxEntry* pEntry; + XubString aNewText; }; class IEntryFilter @@ -56,30 +56,30 @@ namespace dbaui //======================================================================== class IControlActionListener; class IContextMenuProvider; - class DBTreeListBox :public SvTreeListBox + class DBTreeListBox :public SvTreeListBox { OModuleClient m_aModuleClient; - OScrollHelper m_aScrollHelper; - Timer m_aTimer; // is needed for table updates - Point m_aMousePos; + OScrollHelper m_aScrollHelper; + Timer m_aTimer; // is needed for table updates + Point m_aMousePos; ::std::set< SvListEntry* > m_aSelectedEntries; - SvLBoxEntry* m_pDragedEntry; - IControlActionListener* m_pActionListener; + SvLBoxEntry* m_pDragedEntry; + IControlActionListener* m_pActionListener; IContextMenuProvider* m_pContextMenuProvider; - Link m_aPreExpandHandler; // handler to be called before a node is expanded + Link m_aPreExpandHandler; // handler to be called before a node is expanded Link m_aSelChangeHdl; // handlet to be called (asynchronously) when the selection changes in any way - Link m_aCutHandler; // called when someone press CTRL+X - Link m_aCopyHandler; // called when someone press CTRL+C - Link m_aPasteHandler; // called when someone press CTRL+V - Link m_aDeleteHandler; // called when someone press DELETE Key - Link m_aEditingHandler; // called before someone will edit an entry - Link m_aEditedHandler; // called after someone edited an entry - Link m_aEnterKeyHdl; - + Link m_aCutHandler; // called when someone press CTRL+X + Link m_aCopyHandler; // called when someone press CTRL+C + Link m_aPasteHandler; // called when someone press CTRL+V + Link m_aDeleteHandler; // called when someone press DELETE Key + Link m_aEditingHandler; // called before someone will edit an entry + Link m_aEditedHandler; // called after someone edited an entry + Link m_aEnterKeyHdl; + - sal_Bool m_bHandleEnterKey; + sal_Bool m_bHandleEnterKey; protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; @@ -94,68 +94,68 @@ namespace dbaui public: DBTreeListBox( Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB - ,WinBits nWinStyle=0 + ,WinBits nWinStyle=0 ,sal_Bool _bHandleEnterKey = sal_False); DBTreeListBox( Window* pParent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB - ,const ResId& rResId + ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + ,const ResId& rResId ,sal_Bool _bHandleEnterKey = sal_False); ~DBTreeListBox(); - void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } - void setContextMenuProvider( IContextMenuProvider* _pContextMenuProvider ) { m_pContextMenuProvider = _pContextMenuProvider; } + void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } + void setContextMenuProvider( IContextMenuProvider* _pContextMenuProvider ) { m_pContextMenuProvider = _pContextMenuProvider; } inline void setORB(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) { m_xORB = _xORB; } + - - void SetPreExpandHandler(const Link& _rHdl) { m_aPreExpandHandler = _rHdl; } + void SetPreExpandHandler(const Link& _rHdl) { m_aPreExpandHandler = _rHdl; } void SetSelChangeHdl( const Link& _rHdl ) { m_aSelChangeHdl = _rHdl; } - void setCutHandler(const Link& _rHdl) { m_aCutHandler = _rHdl; } - void setCopyHandler(const Link& _rHdl) { m_aCopyHandler = _rHdl; } - void setPasteHandler(const Link& _rHdl) { m_aPasteHandler = _rHdl; } - void setDeleteHandler(const Link& _rHdl) { m_aDeleteHandler = _rHdl; } - void setEditingHandler(const Link& _rHdl) { m_aEditingHandler = _rHdl; } - void setEditedHandler(const Link& _rHdl) { m_aEditedHandler = _rHdl; } + void setCutHandler(const Link& _rHdl) { m_aCutHandler = _rHdl; } + void setCopyHandler(const Link& _rHdl) { m_aCopyHandler = _rHdl; } + void setPasteHandler(const Link& _rHdl) { m_aPasteHandler = _rHdl; } + void setDeleteHandler(const Link& _rHdl) { m_aDeleteHandler = _rHdl; } + void setEditingHandler(const Link& _rHdl) { m_aEditingHandler = _rHdl; } + void setEditedHandler(const Link& _rHdl) { m_aEditedHandler = _rHdl; } // modified the given entry so that the expand handler is called whenever the entry is expanded // (normally, the expand handler is called only once) - void EnableExpandHandler(SvLBoxEntry* _pEntry); + void EnableExpandHandler(SvLBoxEntry* _pEntry); - SvLBoxEntry* GetEntryPosByName( const String& aName, SvLBoxEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const; - virtual void RequestingChilds( SvLBoxEntry* pParent ); - virtual void SelectHdl(); - virtual void DeselectHdl(); + SvLBoxEntry* GetEntryPosByName( const String& aName, SvLBoxEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const; + virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual void SelectHdl(); + virtual void DeselectHdl(); // Window - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); virtual void StateChanged( StateChangedType nStateChange ); - virtual void InitEntry( SvLBoxEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind); + virtual void InitEntry( SvLBoxEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind); // enable editing for tables/views and queries - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); + virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& ); + virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); - virtual BOOL DoubleClickHdl(); + virtual BOOL DoubleClickHdl(); virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); + virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); - void SetEnterKeyHdl(const Link& rNewHdl) {m_aEnterKeyHdl = rNewHdl;} + void SetEnterKeyHdl(const Link& rNewHdl) {m_aEnterKeyHdl = rNewHdl;} void clearCurrentSelection() { m_aSelectedEntries.clear(); } protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); - virtual void ModelHasRemoved( SvListEntry* pEntry ); - virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); + virtual void ModelHasRemoved( SvListEntry* pEntry ); + virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); void implStopSelectionTimer(); void implStartSelectionTimer(); diff --git a/dbaccess/source/ui/inc/dbu_brw.hrc b/dbaccess/source/ui/inc/dbu_brw.hrc index 8d49e1101045..8473a0ad81fa 100644 --- a/dbaccess/source/ui/inc/dbu_brw.hrc +++ b/dbaccess/source/ui/inc/dbu_brw.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,24 +32,24 @@ #endif // FREE RID_STR_BRW_START + 0 -#define RID_STR_DATABROWSER_FILTERED RID_STR_BRW_START + 1 -#define SBA_BROWSER_SETTING_ORDER RID_STR_BRW_START + 2 -#define SBA_BROWSER_SETTING_FILTER RID_STR_BRW_START + 3 -#define STR_DATASOURCE_GRIDCONTROL_DESC RID_STR_BRW_START + 4 -#define RID_STR_UNDO_MODIFY_RECORD RID_STR_BRW_START + 5 -#define STR_NO_COLUMNNAME_MATCHING RID_STR_BRW_START + 6 -#define RID_STR_SAVE_CURRENT_RECORD RID_STR_BRW_START + 7 -#define STR_DATASOURCE_GRIDCONTROL_NAME RID_STR_BRW_START + 8 -#define STR_OPENTABLES_WARNINGS RID_STR_BRW_START + 9 -#define STR_OPENTABLES_WARNINGS_DETAILS RID_STR_BRW_START + 10 -#define STR_CONNECTING_DATASOURCE RID_STR_BRW_START + 11 -#define STR_LOADING_QUERY RID_STR_BRW_START + 12 -#define STR_LOADING_TABLE RID_STR_BRW_START + 13 - -// please adjust checking before insert new strings - -#if STR_LOADING_TABLE > RID_STR_BRW_END -#error Resource-Id Ueberlauf in #file, #line -#endif +#define RID_STR_DATABROWSER_FILTERED RID_STR_BRW_START + 1 +#define SBA_BROWSER_SETTING_ORDER RID_STR_BRW_START + 2 +#define SBA_BROWSER_SETTING_FILTER RID_STR_BRW_START + 3 +#define STR_DATASOURCE_GRIDCONTROL_DESC RID_STR_BRW_START + 4 +#define RID_STR_UNDO_MODIFY_RECORD RID_STR_BRW_START + 5 +#define STR_NO_COLUMNNAME_MATCHING RID_STR_BRW_START + 6 +#define RID_STR_SAVE_CURRENT_RECORD RID_STR_BRW_START + 7 +#define STR_DATASOURCE_GRIDCONTROL_NAME RID_STR_BRW_START + 8 +#define STR_OPENTABLES_WARNINGS RID_STR_BRW_START + 9 +#define STR_OPENTABLES_WARNINGS_DETAILS RID_STR_BRW_START + 10 +#define STR_CONNECTING_DATASOURCE RID_STR_BRW_START + 11 +#define STR_LOADING_QUERY RID_STR_BRW_START + 12 +#define STR_LOADING_TABLE RID_STR_BRW_START + 13 -#endif // _DBU_BRW_HRC_ +// please adjust checking before insert new strings + +#if STR_LOADING_TABLE > RID_STR_BRW_END +#error Resource-Id Ueberlauf in #file, #line +#endif + +#endif // _DBU_BRW_HRC_ diff --git a/dbaccess/source/ui/inc/dbu_control.hrc b/dbaccess/source/ui/inc/dbu_control.hrc index 7b597a8dc6e1..6a2a74e955ae 100644 --- a/dbaccess/source/ui/inc/dbu_control.hrc +++ b/dbaccess/source/ui/inc/dbu_control.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,20 +31,20 @@ #include "dbu_resource.hrc" #endif -#define STR_TABLE_PRIV_NAME RID_STR_CONTROL_START -#define STR_TABLE_PRIV_INSERT RID_STR_CONTROL_START + 1 -#define STR_TABLE_PRIV_DELETE RID_STR_CONTROL_START + 2 -#define STR_TABLE_PRIV_UPDATE RID_STR_CONTROL_START + 3 -#define STR_TABLE_PRIV_ALTER RID_STR_CONTROL_START + 4 -#define STR_TABLE_PRIV_REFERENCE RID_STR_CONTROL_START + 5 -#define STR_TABLE_PRIV_DROP RID_STR_CONTROL_START + 6 -#define STR_TABLE_PRIV_SELECT RID_STR_CONTROL_START + 7 -#define STR_ALL_TABLES_AND_VIEWS RID_STR_CONTROL_START + 8 -#define STR_COULDNOTCONNECT RID_STR_CONTROL_START + 9 -#define STR_COULDNOTCONNECT_PLEASECHECK RID_STR_CONTROL_START + 10 -#define STR_NOTABLEINFO RID_STR_CONTROL_START + 11 -#define STR_ALL_TABLES RID_STR_CONTROL_START + 12 -#define STR_ALL_VIEWS RID_STR_CONTROL_START + 13 +#define STR_TABLE_PRIV_NAME RID_STR_CONTROL_START +#define STR_TABLE_PRIV_INSERT RID_STR_CONTROL_START + 1 +#define STR_TABLE_PRIV_DELETE RID_STR_CONTROL_START + 2 +#define STR_TABLE_PRIV_UPDATE RID_STR_CONTROL_START + 3 +#define STR_TABLE_PRIV_ALTER RID_STR_CONTROL_START + 4 +#define STR_TABLE_PRIV_REFERENCE RID_STR_CONTROL_START + 5 +#define STR_TABLE_PRIV_DROP RID_STR_CONTROL_START + 6 +#define STR_TABLE_PRIV_SELECT RID_STR_CONTROL_START + 7 +#define STR_ALL_TABLES_AND_VIEWS RID_STR_CONTROL_START + 8 +#define STR_COULDNOTCONNECT RID_STR_CONTROL_START + 9 +#define STR_COULDNOTCONNECT_PLEASECHECK RID_STR_CONTROL_START + 10 +#define STR_NOTABLEINFO RID_STR_CONTROL_START + 11 +#define STR_ALL_TABLES RID_STR_CONTROL_START + 12 +#define STR_ALL_VIEWS RID_STR_CONTROL_START + 13 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc index 7e1b7df0d100..f403caafd712 100644 --- a/dbaccess/source/ui/inc/dbu_dlg.hrc +++ b/dbaccess/source/ui/inc/dbu_dlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,22 +31,22 @@ #include "dbu_resource.hrc" #endif -#define PAGE_X 281 -#define PAGE_Y 185 -#define WIZARD_PAGE_X 225 -#define WIZARD_PAGE_Y 210 -#define START_X 6 +#define PAGE_X 281 +#define PAGE_Y 185 +#define WIZARD_PAGE_X 225 +#define WIZARD_PAGE_Y 210 +#define START_X 6 #define START_Y 6 -#define CHECKBOX_HEIGHT 8 +#define CHECKBOX_HEIGHT 8 #define LISTBOX_HEIGHT 12 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 //constants for the wizards #define INIT_Y 28 @@ -55,62 +55,62 @@ #define INDENT_BELOW_CHECK 10 -#define STR_ADABAS_HELP_SYSDEVSPACE RID_STR_DLG_START -#define STR_ADABAS_HELP_TRANSACT RID_STR_DLG_START + 1 -#define STR_ADABAS_HELP_DATADEVSPACES RID_STR_DLG_START + 2 -#define STR_ADABAS_HELP_SIZE RID_STR_DLG_START + 3 -#define STR_ADABAS_HELP_FREESIZE RID_STR_DLG_START + 4 -#define STR_ADABAS_HELP_MEMORYUSING RID_STR_DLG_START + 5 -#define STR_ADABAS_ERROR_SYSTEMTABLES RID_STR_DLG_START + 6 -#define STR_ERROR_PASSWORDS_NOT_IDENTICAL RID_STR_DLG_START + 7 -#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME RID_STR_DLG_START + 8 -#define STR_DATASOURCE_DEFAULTNAME RID_STR_DLG_START + 9 -#define STR_ERR_EMPTY_DSN_NAME RID_STR_DLG_START + 10 -#define STR_ERR_USE_CONNECT_TO RID_STR_DLG_START + 11 -#define STR_ALREADYEXISTOVERWRITE RID_STR_DLG_START + 12 -#define STR_QUERY_DROP_ALL RID_STR_DLG_START + 13 -#define STR_INDEX_NAME_ALREADY_USED RID_STR_DLG_START + 14 -#define STR_ASK_FOR_DIRECTORY_CREATION RID_STR_DLG_START + 15 -#define STR_COULD_NOT_CREATE_DIRECTORY RID_STR_DLG_START + 16 -#define STR_ADDRESSBOOK_SYSTEM RID_STR_DLG_START + 17 -#define STR_ADDRESSBOOK_MOZILLA RID_STR_DLG_START + 18 -#define STR_ADDRESSBOOK_EVOLUTION RID_STR_DLG_START + 19 +#define STR_ADABAS_HELP_SYSDEVSPACE RID_STR_DLG_START +#define STR_ADABAS_HELP_TRANSACT RID_STR_DLG_START + 1 +#define STR_ADABAS_HELP_DATADEVSPACES RID_STR_DLG_START + 2 +#define STR_ADABAS_HELP_SIZE RID_STR_DLG_START + 3 +#define STR_ADABAS_HELP_FREESIZE RID_STR_DLG_START + 4 +#define STR_ADABAS_HELP_MEMORYUSING RID_STR_DLG_START + 5 +#define STR_ADABAS_ERROR_SYSTEMTABLES RID_STR_DLG_START + 6 +#define STR_ERROR_PASSWORDS_NOT_IDENTICAL RID_STR_DLG_START + 7 +#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME RID_STR_DLG_START + 8 +#define STR_DATASOURCE_DEFAULTNAME RID_STR_DLG_START + 9 +#define STR_ERR_EMPTY_DSN_NAME RID_STR_DLG_START + 10 +#define STR_ERR_USE_CONNECT_TO RID_STR_DLG_START + 11 +#define STR_ALREADYEXISTOVERWRITE RID_STR_DLG_START + 12 +#define STR_QUERY_DROP_ALL RID_STR_DLG_START + 13 +#define STR_INDEX_NAME_ALREADY_USED RID_STR_DLG_START + 14 +#define STR_ASK_FOR_DIRECTORY_CREATION RID_STR_DLG_START + 15 +#define STR_COULD_NOT_CREATE_DIRECTORY RID_STR_DLG_START + 16 +#define STR_ADDRESSBOOK_SYSTEM RID_STR_DLG_START + 17 +#define STR_ADDRESSBOOK_MOZILLA RID_STR_DLG_START + 18 +#define STR_ADDRESSBOOK_EVOLUTION RID_STR_DLG_START + 19 // FREE -#define STR_ADDRESSBOOK_LDAP RID_STR_DLG_START + 21 -#define STR_ADDRESSBOOK_OUTLOOK RID_STR_DLG_START + 22 -#define STR_COMMAND_EXECUTED_SUCCESSFULLY RID_STR_DLG_START + 23 -#define STR_DIRECTSQL_CONNECTIONLOST RID_STR_DLG_START + 24 -#define STR_HINT_READONLY_CONNECTION RID_STR_DLG_START + 25 -#define STR_HINT_CONNECTION_NOT_CAPABLE RID_STR_DLG_START + 26 -#define STR_USERADMIN_NOT_AVAILABLE RID_STR_DLG_START + 27 -#define STR_TAB_INDEX_SORTORDER RID_STR_DLG_START + 28 -#define STR_TAB_INDEX_FIELD RID_STR_DLG_START + 29 -#define STR_ORDER_ASCENDING RID_STR_DLG_START + 30 -#define STR_ORDER_DESCENDING RID_STR_DLG_START + 31 -#define STR_CONFIRM_DROP_INDEX RID_STR_DLG_START + 32 -#define STR_LOGICAL_INDEX_NAME RID_STR_DLG_START + 33 -#define STR_CONNECTION_TEST RID_STR_DLG_START + 34 -#define STR_CONNECTION_SUCCESS RID_STR_DLG_START + 35 +#define STR_ADDRESSBOOK_LDAP RID_STR_DLG_START + 21 +#define STR_ADDRESSBOOK_OUTLOOK RID_STR_DLG_START + 22 +#define STR_COMMAND_EXECUTED_SUCCESSFULLY RID_STR_DLG_START + 23 +#define STR_DIRECTSQL_CONNECTIONLOST RID_STR_DLG_START + 24 +#define STR_HINT_READONLY_CONNECTION RID_STR_DLG_START + 25 +#define STR_HINT_CONNECTION_NOT_CAPABLE RID_STR_DLG_START + 26 +#define STR_USERADMIN_NOT_AVAILABLE RID_STR_DLG_START + 27 +#define STR_TAB_INDEX_SORTORDER RID_STR_DLG_START + 28 +#define STR_TAB_INDEX_FIELD RID_STR_DLG_START + 29 +#define STR_ORDER_ASCENDING RID_STR_DLG_START + 30 +#define STR_ORDER_DESCENDING RID_STR_DLG_START + 31 +#define STR_CONFIRM_DROP_INDEX RID_STR_DLG_START + 32 +#define STR_LOGICAL_INDEX_NAME RID_STR_DLG_START + 33 +#define STR_CONNECTION_TEST RID_STR_DLG_START + 34 +#define STR_CONNECTION_SUCCESS RID_STR_DLG_START + 35 // FREE -#define STR_JDBCDRIVER_SUCCESS RID_STR_DLG_START + 37 -#define STR_JDBCDRIVER_NO_SUCCESS RID_STR_DLG_START + 38 -#define STR_MSACCESS_FILTERNAME RID_STR_DLG_START + 39 -#define STR_CONNECTION_NO_SUCCESS RID_STR_DLG_START + 40 -#define STR_DBASE_PATH_OR_FILE RID_STR_DLG_START + 41 -#define STR_TEXT_PATH_OR_FILE RID_STR_DLG_START + 45 -#define STR_FLAT_PATH_OR_FILE RID_STR_DLG_START + 46 -#define STR_CALC_PATH_OR_FILE RID_STR_DLG_START + 47 -#define STR_NAME_OF_ODBC_DATASOURCE RID_STR_DLG_START + 48 -#define STR_MYSQL_DATABASE_NAME RID_STR_DLG_START + 49 -#define STR_ORACLE_DATABASE_NAME RID_STR_DLG_START + 50 -#define STR_ADABAS_DATABASE_NAME RID_STR_DLG_START + 51 -#define STR_MSACCESS_MDB_FILE RID_STR_DLG_START + 52 -#define STR_COMMONURL RID_STR_DLG_START + 53 -#define STR_DATABASEDEFAULTNAME RID_STR_DLG_START + 54 -#define STR_NO_ADABASE_DATASOURCES RID_STR_DLG_START + 55 -#define STR_NO_ADDITIONAL_SETTINGS RID_STR_DLG_START + 56 +#define STR_JDBCDRIVER_SUCCESS RID_STR_DLG_START + 37 +#define STR_JDBCDRIVER_NO_SUCCESS RID_STR_DLG_START + 38 +#define STR_MSACCESS_FILTERNAME RID_STR_DLG_START + 39 +#define STR_CONNECTION_NO_SUCCESS RID_STR_DLG_START + 40 +#define STR_DBASE_PATH_OR_FILE RID_STR_DLG_START + 41 +#define STR_TEXT_PATH_OR_FILE RID_STR_DLG_START + 45 +#define STR_FLAT_PATH_OR_FILE RID_STR_DLG_START + 46 +#define STR_CALC_PATH_OR_FILE RID_STR_DLG_START + 47 +#define STR_NAME_OF_ODBC_DATASOURCE RID_STR_DLG_START + 48 +#define STR_MYSQL_DATABASE_NAME RID_STR_DLG_START + 49 +#define STR_ORACLE_DATABASE_NAME RID_STR_DLG_START + 50 +#define STR_ADABAS_DATABASE_NAME RID_STR_DLG_START + 51 +#define STR_MSACCESS_MDB_FILE RID_STR_DLG_START + 52 +#define STR_COMMONURL RID_STR_DLG_START + 53 +#define STR_DATABASEDEFAULTNAME RID_STR_DLG_START + 54 +#define STR_NO_ADABASE_DATASOURCES RID_STR_DLG_START + 55 +#define STR_NO_ADDITIONAL_SETTINGS RID_STR_DLG_START + 56 #define STR_HOSTNAME RID_STR_DLG_START + 57 -#define STR_ADDRESSBOOK_THUNDERBIRD RID_STR_DLG_START + 58 +#define STR_ADDRESSBOOK_THUNDERBIRD RID_STR_DLG_START + 58 #define STR_MOZILLA_PROFILE_NAME RID_STR_DLG_START + 59 #define STR_THUNDERBIRD_PROFILE_NAME RID_STR_DLG_START + 60 #define STR_EXPLAN_STRINGCONVERSION_ERROR RID_STR_DLG_START + 61 diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc index 04017faab8f0..dcf86cdf04b4 100644 --- a/dbaccess/source/ui/inc/dbu_misc.hrc +++ b/dbaccess/source/ui/inc/dbu_misc.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,22 +33,22 @@ // free // free -#define STR_WIZ_COLUMN_SELECT_TITEL RID_STR_MISC_START + 2 -#define STR_WIZ_TYPE_SELECT_TITEL RID_STR_MISC_START + 3 -#define STR_WIZ_PKEY_ALREADY_DEFINED RID_STR_MISC_START + 4 -#define STR_WIZ_NAME_MATCHING_TITEL RID_STR_MISC_START + 5 -#define STR_WIZ_TABLE_COPY RID_STR_MISC_START + 6 -#define STR_COPYTABLE_TITLE_COPY RID_STR_MISC_START + 7 -#define STR_COULDNOTOPEN_LINKEDDOC RID_STR_MISC_START + 8 +#define STR_WIZ_COLUMN_SELECT_TITEL RID_STR_MISC_START + 2 +#define STR_WIZ_TYPE_SELECT_TITEL RID_STR_MISC_START + 3 +#define STR_WIZ_PKEY_ALREADY_DEFINED RID_STR_MISC_START + 4 +#define STR_WIZ_NAME_MATCHING_TITEL RID_STR_MISC_START + 5 +#define STR_WIZ_TABLE_COPY RID_STR_MISC_START + 6 +#define STR_COPYTABLE_TITLE_COPY RID_STR_MISC_START + 7 +#define STR_COULDNOTOPEN_LINKEDDOC RID_STR_MISC_START + 8 #define STR_SUGGEST_APPEND_TABLE_DATA RID_STR_MISC_START + 9 -#define STR_UNDO_COLON RID_STR_MISC_START + 10 -#define STR_REDO_COLON RID_STR_MISC_START + 11 -#define STR_UNKNOWN_TYPE_FOUND RID_STR_MISC_START + 12 +#define STR_UNDO_COLON RID_STR_MISC_START + 10 +#define STR_REDO_COLON RID_STR_MISC_START + 11 +#define STR_UNKNOWN_TYPE_FOUND RID_STR_MISC_START + 12 #define STR_FILE_DOES_NOT_EXIST RID_STR_MISC_START + 13 #define STR_WARNINGS_DURING_CONNECT RID_STR_MISC_START + 14 #define STR_NAMED_OBJECT_ALREADY_EXISTS RID_STR_MISC_START + 15 -#define STR_INVALID_TABLE_NAME RID_STR_MISC_START + 16 -#define STR_INVALID_TABLE_NAME_LENGTH RID_STR_MISC_START + 17 +#define STR_INVALID_TABLE_NAME RID_STR_MISC_START + 16 +#define STR_INVALID_TABLE_NAME_LENGTH RID_STR_MISC_START + 17 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc index 26bd4c82b374..04b2daa5da66 100644 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ b/dbaccess/source/ui/inc/dbu_qry.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,50 +32,50 @@ #endif -#define STR_QRY_FUNCTIONS RID_STR_QRY_START -#define STR_QRY_SORTTEXT RID_STR_QRY_START + 1 -#define STR_QUERY_UNDO_MOVETABWIN RID_STR_QRY_START + 2 -#define STR_QUERY_UNDO_SIZETABWIN RID_STR_QRY_START + 3 -#define STR_QUERY_UNDO_INSERTCONNECTION RID_STR_QRY_START + 4 -#define STR_QUERY_UNDO_REMOVECONNECTION RID_STR_QRY_START + 5 -#define STR_QUERY_UNDO_TABWINSHOW RID_STR_QRY_START + 6 -#define STR_QUERY_UNDO_TABWINDELETE RID_STR_QRY_START + 7 -#define STR_QUERY_UNDO_MODIFY_CELL RID_STR_QRY_START + 8 -#define STR_QUERY_UNDO_SIZE_COLUMN RID_STR_QRY_START + 9 -#define STR_QUERY_UNDO_TABFIELDDELETE RID_STR_QRY_START + 10 -#define STR_QUERY_UNDO_TABFIELDCREATE RID_STR_QRY_START + 11 -#define STR_QRY_TOOCOMPLEX RID_STR_QRY_START + 12 -#define RID_STR_TABLE_DOESNT_EXIST RID_STR_QRY_START + 13 -#define RID_STR_FIELD_DOESNT_EXIST RID_STR_QRY_START + 14 -#define RID_STR_TOMUCHTABLES RID_STR_QRY_START + 15 -#define STR_QUERY_INNER_JOIN RID_STR_QRY_START + 16 -#define STR_QUERY_LEFTRIGHT_JOIN RID_STR_QRY_START + 17 -#define STR_QUERY_FULL_JOIN RID_STR_QRY_START + 18 -#define STR_QUERY_SORTTEXT RID_STR_QRY_START + 19 -#define STR_QUERY_FUNCTIONS RID_STR_QRY_START + 20 -#define STR_QUERY_NOTABLE RID_STR_QRY_START + 21 -#define STR_QRY_ORDERBY_UNRELATED RID_STR_QRY_START + 22 -#define STR_QUERY_HANDLETEXT RID_STR_QRY_START + 23 -#define STR_QUERY_FALSE RID_STR_QRY_START + 24 -#define STR_QUERY_TRUE RID_STR_QRY_START + 25 -#define STR_QRY_TOO_MANY_COLUMNS RID_STR_QRY_START + 26 -#define STR_SVT_SQL_SYNTAX_ERROR RID_STR_QRY_START + 27 -#define STR_QUERYDESIGN_NO_VIEW_SUPPORT RID_STR_QRY_START + 28 -#define STR_QUERYDESIGN_NO_VIEW_ASK RID_STR_QRY_START + 29 -#define STR_QRY_NOSELECT RID_STR_QRY_START + 30 -#define STR_QRY_COLUMN_NOT_FOUND RID_STR_QRY_START + 31 -#define STR_QRY_JOIN_COLUMN_COMPARE RID_STR_QRY_START + 32 -#define STR_QRY_LIKE_LEFT_NO_COLUMN RID_STR_QRY_START + 33 -#define STR_QRY_CHECK_CASESENSITIVE RID_STR_QRY_START + 34 -#define STR_QUERY_UNDO_TABFIELDMOVED RID_STR_QRY_START + 35 -#define STR_QRY_ILLEGAL_JOIN RID_STR_QRY_START + 36 -#define STR_QRY_TOO_LONG_STATEMENT RID_STR_QRY_START + 37 -#define STR_QRY_SYNTAX RID_STR_QRY_START + 38 -#define STR_QRY_NATIVE RID_STR_QRY_START + 39 -#define STR_QRY_TOO_MANY_TABLES RID_STR_QRY_START + 40 -#define STR_QRY_TOOMANYCOND RID_STR_QRY_START + 41 -#define STR_QUERYDESIGN RID_STR_QRY_START + 42 -#define STR_VIEWDESIGN RID_STR_QRY_START + 43 +#define STR_QRY_FUNCTIONS RID_STR_QRY_START +#define STR_QRY_SORTTEXT RID_STR_QRY_START + 1 +#define STR_QUERY_UNDO_MOVETABWIN RID_STR_QRY_START + 2 +#define STR_QUERY_UNDO_SIZETABWIN RID_STR_QRY_START + 3 +#define STR_QUERY_UNDO_INSERTCONNECTION RID_STR_QRY_START + 4 +#define STR_QUERY_UNDO_REMOVECONNECTION RID_STR_QRY_START + 5 +#define STR_QUERY_UNDO_TABWINSHOW RID_STR_QRY_START + 6 +#define STR_QUERY_UNDO_TABWINDELETE RID_STR_QRY_START + 7 +#define STR_QUERY_UNDO_MODIFY_CELL RID_STR_QRY_START + 8 +#define STR_QUERY_UNDO_SIZE_COLUMN RID_STR_QRY_START + 9 +#define STR_QUERY_UNDO_TABFIELDDELETE RID_STR_QRY_START + 10 +#define STR_QUERY_UNDO_TABFIELDCREATE RID_STR_QRY_START + 11 +#define STR_QRY_TOOCOMPLEX RID_STR_QRY_START + 12 +#define RID_STR_TABLE_DOESNT_EXIST RID_STR_QRY_START + 13 +#define RID_STR_FIELD_DOESNT_EXIST RID_STR_QRY_START + 14 +#define RID_STR_TOMUCHTABLES RID_STR_QRY_START + 15 +#define STR_QUERY_INNER_JOIN RID_STR_QRY_START + 16 +#define STR_QUERY_LEFTRIGHT_JOIN RID_STR_QRY_START + 17 +#define STR_QUERY_FULL_JOIN RID_STR_QRY_START + 18 +#define STR_QUERY_SORTTEXT RID_STR_QRY_START + 19 +#define STR_QUERY_FUNCTIONS RID_STR_QRY_START + 20 +#define STR_QUERY_NOTABLE RID_STR_QRY_START + 21 +#define STR_QRY_ORDERBY_UNRELATED RID_STR_QRY_START + 22 +#define STR_QUERY_HANDLETEXT RID_STR_QRY_START + 23 +#define STR_QUERY_FALSE RID_STR_QRY_START + 24 +#define STR_QUERY_TRUE RID_STR_QRY_START + 25 +#define STR_QRY_TOO_MANY_COLUMNS RID_STR_QRY_START + 26 +#define STR_SVT_SQL_SYNTAX_ERROR RID_STR_QRY_START + 27 +#define STR_QUERYDESIGN_NO_VIEW_SUPPORT RID_STR_QRY_START + 28 +#define STR_QUERYDESIGN_NO_VIEW_ASK RID_STR_QRY_START + 29 +#define STR_QRY_NOSELECT RID_STR_QRY_START + 30 +#define STR_QRY_COLUMN_NOT_FOUND RID_STR_QRY_START + 31 +#define STR_QRY_JOIN_COLUMN_COMPARE RID_STR_QRY_START + 32 +#define STR_QRY_LIKE_LEFT_NO_COLUMN RID_STR_QRY_START + 33 +#define STR_QRY_CHECK_CASESENSITIVE RID_STR_QRY_START + 34 +#define STR_QUERY_UNDO_TABFIELDMOVED RID_STR_QRY_START + 35 +#define STR_QRY_ILLEGAL_JOIN RID_STR_QRY_START + 36 +#define STR_QRY_TOO_LONG_STATEMENT RID_STR_QRY_START + 37 +#define STR_QRY_SYNTAX RID_STR_QRY_START + 38 +#define STR_QRY_NATIVE RID_STR_QRY_START + 39 +#define STR_QRY_TOO_MANY_TABLES RID_STR_QRY_START + 40 +#define STR_QRY_TOOMANYCOND RID_STR_QRY_START + 41 +#define STR_QUERYDESIGN RID_STR_QRY_START + 42 +#define STR_VIEWDESIGN RID_STR_QRY_START + 43 #define STR_JOIN_TYPE_HINT RID_STR_QRY_START + 44 #define STR_QUERY_SAVEMODIFIED RID_STR_QRY_START + 45 #define STR_ERROR_PARSING_STATEMENT RID_STR_QRY_START + 46 diff --git a/dbaccess/source/ui/inc/dbu_rel.hrc b/dbaccess/source/ui/inc/dbu_rel.hrc index 8a08e160171c..b53c752e619e 100644 --- a/dbaccess/source/ui/inc/dbu_rel.hrc +++ b/dbaccess/source/ui/inc/dbu_rel.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,13 +32,13 @@ #endif -#define STR_QUERY_REL_EDIT_RELATION RID_STR_REL_START -#define STR_RELATIONDESIGN RID_STR_REL_START + 1 -#define STR_RELATIONDESIGN_NOT_AVAILABLE RID_STR_REL_START + 2 -#define STR_QUERY_REL_DELETE_WINDOW RID_STR_REL_START + 3 -#define STR_QUERY_REL_EDIT RID_STR_REL_START + 4 -#define STR_QUERY_REL_CREATE RID_STR_REL_START + 5 -#define STR_QUERY_REL_COULD_NOT_CREATE RID_STR_REL_START + 6 +#define STR_QUERY_REL_EDIT_RELATION RID_STR_REL_START +#define STR_RELATIONDESIGN RID_STR_REL_START + 1 +#define STR_RELATIONDESIGN_NOT_AVAILABLE RID_STR_REL_START + 2 +#define STR_QUERY_REL_DELETE_WINDOW RID_STR_REL_START + 3 +#define STR_QUERY_REL_EDIT RID_STR_REL_START + 4 +#define STR_QUERY_REL_CREATE RID_STR_REL_START + 5 +#define STR_QUERY_REL_COULD_NOT_CREATE RID_STR_REL_START + 6 // please adjust checking before insert new strings #if STR_QUERY_REL_COULD_NOT_CREATE > RID_STR_REL_END diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index be49adc0e518..8228be7bbcbf 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,51 +32,51 @@ #include <svl/solar.hrc> #endif -#define RID_DIALOG_START RID_DBACCESS_START -#define RID_PAGE_START RID_DBACCESS_START -#define RID_ERRORBOX_START RID_DBACCESS_START -#define RID_QUERYBOX_START RID_DBACCESS_START -#define RID_TOOLBOX_START RID_DBACCESS_START -#define RID_BITMAP_START RID_DBACCESS_START -#define RID_IMAGE_START RID_DBACCESS_START -#define RID_IMAGELIST_START RID_DBACCESS_START -#define RID_MENU_START RID_DBACCESS_START -#define RID_STRING_START RID_DBACCESS_START -#define RID_UNTYPED_START RID_DBACCESS_START -#define RID_WARN_START RID_DBACCESS_START -#define RID_CONTROL_START RID_DBACCESS_START +#define RID_DIALOG_START RID_DBACCESS_START +#define RID_PAGE_START RID_DBACCESS_START +#define RID_ERRORBOX_START RID_DBACCESS_START +#define RID_QUERYBOX_START RID_DBACCESS_START +#define RID_TOOLBOX_START RID_DBACCESS_START +#define RID_BITMAP_START RID_DBACCESS_START +#define RID_IMAGE_START RID_DBACCESS_START +#define RID_IMAGELIST_START RID_DBACCESS_START +#define RID_MENU_START RID_DBACCESS_START +#define RID_STRING_START RID_DBACCESS_START +#define RID_UNTYPED_START RID_DBACCESS_START +#define RID_WARN_START RID_DBACCESS_START +#define RID_CONTROL_START RID_DBACCESS_START #define RID_MISC_START RID_DBACCESS_START // new defines to make the strings folder specific -#define RID_STR_BRW_START RID_DBACCESS_START -#define RID_STR_BRW_END RID_STR_BRW_START + 40 // 0 - 39 +#define RID_STR_BRW_START RID_DBACCESS_START +#define RID_STR_BRW_END RID_STR_BRW_START + 40 // 0 - 39 -#define RID_STR_CONTROL_START RID_STR_BRW_END -#define RID_STR_CONTROL_END RID_STR_CONTROL_START + 30 // 40 - 69 +#define RID_STR_CONTROL_START RID_STR_BRW_END +#define RID_STR_CONTROL_END RID_STR_CONTROL_START + 30 // 40 - 69 -#define RID_STR_DLG_START RID_STR_CONTROL_END -#define RID_STR_DLG_END RID_STR_DLG_START + 80 // 70 - 149 +#define RID_STR_DLG_START RID_STR_CONTROL_END +#define RID_STR_DLG_END RID_STR_DLG_START + 80 // 70 - 149 -#define RID_STR_MISC_START RID_STR_DLG_END -#define RID_STR_MISC_END RID_STR_MISC_START + 20 // 150 - 169 +#define RID_STR_MISC_START RID_STR_DLG_END +#define RID_STR_MISC_END RID_STR_MISC_START + 20 // 150 - 169 -#define RID_STR_QRY_START RID_STR_MISC_END -#define RID_STR_QRY_END RID_STR_QRY_START + 80 // 170 - 249 +#define RID_STR_QRY_START RID_STR_MISC_END +#define RID_STR_QRY_END RID_STR_QRY_START + 80 // 170 - 249 -#define RID_STR_TBL_START RID_STR_QRY_END -#define RID_STR_TBL_END RID_STR_TBL_START + 80 // 250 - 329 +#define RID_STR_TBL_START RID_STR_QRY_END +#define RID_STR_TBL_END RID_STR_TBL_START + 80 // 250 - 329 -#define RID_STR_REL_START RID_STR_TBL_END -#define RID_STR_REL_END RID_STR_REL_START + 10 // 330 - 349 +#define RID_STR_REL_START RID_STR_TBL_END +#define RID_STR_REL_END RID_STR_REL_START + 10 // 330 - 349 -#define RID_STR_UNO_START RID_STR_REL_END -#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 350 - 369 +#define RID_STR_UNO_START RID_STR_REL_END +#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 350 - 369 -#define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 55 // 370 - 424 +#define RID_STR_GEN_START RID_STR_UNO_END +#define RID_STR_GEN_END RID_STR_GEN_START + 55 // 370 - 424 -#define RID_STR_APP_START RID_STR_GEN_END -#define RID_STR_APP_END RID_STR_APP_START + 40 // 425 - 464 +#define RID_STR_APP_START RID_STR_GEN_END +#define RID_STR_APP_END RID_STR_APP_START + 40 // 425 - 464 #if RID_STR_GEN_END > RID_DBACCESS_END @@ -86,84 +86,84 @@ //======================================================================== // dialog ids -#define DLG_DATABASE_ADMINISTRATION RID_DIALOG_START + 0 -#define DLG_DBASE_INDEXES RID_DIALOG_START + 1 -#define DLG_SQLMESSAGE RID_DIALOG_START + 2 -#define DLG_SQLEXCEPTIONCHAIN RID_DIALOG_START + 3 -#define DLG_DATASOURCE_SELECTION RID_DIALOG_START + 4 -#define DLG_PARAMETERS RID_DIALOG_START + 5 -#define DLG_FILTERCRIT RID_DIALOG_START + 6 -#define DLG_ORDERCRIT RID_DIALOG_START + 7 -#define DLG_ROWHEIGHT RID_DIALOG_START + 8 -#define DLG_COLWIDTH RID_DIALOG_START + 9 -#define DLG_ATTR RID_DIALOG_START + 10 -#define DLG_SAVE_AS RID_DIALOG_START + 11 -#define DLG_ERROR RID_DIALOG_START + 12 -#define DLG_TEXT RID_DIALOG_START + 13 -#define DLG_JOIN_TABADD RID_DIALOG_START + 14 -#define DLG_QRY_JOIN RID_DIALOG_START + 15 -#define WIZ_RTFCOPYTABLE RID_DIALOG_START + 16 -#define DLG_REL_PROPERTIES RID_DIALOG_START + 17 -#define DLG_ADABASSTAT RID_DIALOG_START + 18 -#define DLG_INDEXDESIGN RID_DIALOG_START + 19 -#define DLG_DATABASE_ADABASADMIN RID_DIALOG_START + 20 -#define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21 -#define DLG_DIRECTSQL RID_DIALOG_START + 22 -#define DLG_PASSWORD RID_DIALOG_START + 23 -#define DLG_DOMAINPASSWORD RID_DIALOG_START + 24 -#define DLG_RENAME RID_DIALOG_START + 25 -#define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26 -#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27 -#define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28 -#define DLG_DATABASE_WIZARD RID_DIALOG_START + 29 +#define DLG_DATABASE_ADMINISTRATION RID_DIALOG_START + 0 +#define DLG_DBASE_INDEXES RID_DIALOG_START + 1 +#define DLG_SQLMESSAGE RID_DIALOG_START + 2 +#define DLG_SQLEXCEPTIONCHAIN RID_DIALOG_START + 3 +#define DLG_DATASOURCE_SELECTION RID_DIALOG_START + 4 +#define DLG_PARAMETERS RID_DIALOG_START + 5 +#define DLG_FILTERCRIT RID_DIALOG_START + 6 +#define DLG_ORDERCRIT RID_DIALOG_START + 7 +#define DLG_ROWHEIGHT RID_DIALOG_START + 8 +#define DLG_COLWIDTH RID_DIALOG_START + 9 +#define DLG_ATTR RID_DIALOG_START + 10 +#define DLG_SAVE_AS RID_DIALOG_START + 11 +#define DLG_ERROR RID_DIALOG_START + 12 +#define DLG_TEXT RID_DIALOG_START + 13 +#define DLG_JOIN_TABADD RID_DIALOG_START + 14 +#define DLG_QRY_JOIN RID_DIALOG_START + 15 +#define WIZ_RTFCOPYTABLE RID_DIALOG_START + 16 +#define DLG_REL_PROPERTIES RID_DIALOG_START + 17 +#define DLG_ADABASSTAT RID_DIALOG_START + 18 +#define DLG_INDEXDESIGN RID_DIALOG_START + 19 +#define DLG_DATABASE_ADABASADMIN RID_DIALOG_START + 20 +#define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21 +#define DLG_DIRECTSQL RID_DIALOG_START + 22 +#define DLG_PASSWORD RID_DIALOG_START + 23 +#define DLG_DOMAINPASSWORD RID_DIALOG_START + 24 +#define DLG_RENAME RID_DIALOG_START + 25 +#define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26 +#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27 +#define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28 +#define DLG_DATABASE_WIZARD RID_DIALOG_START + 29 #define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 #define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31 //======================================================================== // tab pages -#define PAGE_GENERAL RID_PAGE_START + 0 -#define PAGE_DBASE RID_PAGE_START + 1 -#define PAGE_ODBC RID_PAGE_START + 3 -#define PAGE_TEXT RID_PAGE_START + 4 -#define PAGE_ADABAS RID_PAGE_START + 5 -#define PAGE_CONNECTION RID_PAGE_START + 6 -#define PAGE_ADO RID_PAGE_START + 7 -#define PAGE_QUERYADMINISTRATION RID_PAGE_START + 8 -#define TAB_WIZ_COLUMN_SELECT RID_PAGE_START + 9 -#define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10 -#define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11 -#define TAB_WIZ_COPYTABLE RID_PAGE_START + 12 -#define TAB_PAG_ADABAS_SETTINGS RID_PAGE_START + 13 +#define PAGE_GENERAL RID_PAGE_START + 0 +#define PAGE_DBASE RID_PAGE_START + 1 +#define PAGE_ODBC RID_PAGE_START + 3 +#define PAGE_TEXT RID_PAGE_START + 4 +#define PAGE_ADABAS RID_PAGE_START + 5 +#define PAGE_CONNECTION RID_PAGE_START + 6 +#define PAGE_ADO RID_PAGE_START + 7 +#define PAGE_QUERYADMINISTRATION RID_PAGE_START + 8 +#define TAB_WIZ_COLUMN_SELECT RID_PAGE_START + 9 +#define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10 +#define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11 +#define TAB_WIZ_COPYTABLE RID_PAGE_START + 12 +#define TAB_PAG_ADABAS_SETTINGS RID_PAGE_START + 13 // free -#define PAGE_LDAP RID_PAGE_START + 15 -#define TAB_PAGE_USERADMIN RID_PAGE_START + 16 -#define PAGE_MYSQL_ODBC RID_PAGE_START + 17 -#define TAB_PAGE_TABLEPRIVILEGES RID_PAGE_START + 18 -#define PAGE_USERDRIVER RID_PAGE_START + 19 -#define PAGE_MYSQL_JDBC RID_PAGE_START + 20 -#define PAGE_GENERATED_VALUES RID_PAGE_START + 22 +#define PAGE_LDAP RID_PAGE_START + 15 +#define TAB_PAGE_USERADMIN RID_PAGE_START + 16 +#define PAGE_MYSQL_ODBC RID_PAGE_START + 17 +#define TAB_PAGE_TABLEPRIVILEGES RID_PAGE_START + 18 +#define PAGE_USERDRIVER RID_PAGE_START + 19 +#define PAGE_MYSQL_JDBC RID_PAGE_START + 20 +#define PAGE_GENERATED_VALUES RID_PAGE_START + 22 #define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23 #define PAGE_MYSQL_NATIVE RID_PAGE_START + 24 // FREE // FREE -#define PAGE_ORACLE_JDBC RID_PAGE_START + 27 -#define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28 +#define PAGE_ORACLE_JDBC RID_PAGE_START + 27 +#define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28 // FREE // FREE // FREE -#define PAGE_MOZILLA RID_PAGE_START + 32 +#define PAGE_MOZILLA RID_PAGE_START + 32 #define PAGE_DS_ORACLE_ADVANCED_SETTINGS RID_PAGE_START + 33 #define PAGE_DBWIZARD_INTRO RID_PAGE_START + 40 -#define PAGE_DBWIZARD_DBASE RID_PAGE_START + 41 +#define PAGE_DBWIZARD_DBASE RID_PAGE_START + 41 #define PAGE_DBWIZARD_TEXT RID_PAGE_START + 42 #define PAGE_DBWIZARD_MSACCESS RID_PAGE_START + 43 #define PAGE_DBWIZARD_LDAP RID_PAGE_START + 44 #define PAGE_DBWIZARD_ADABAS RID_PAGE_START + 45 #define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START + 46 -#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47 +#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47 #define PAGE_DBWIZARD_ORACLE RID_PAGE_START + 48 #define PAGE_DBWIZARD_JDBC RID_PAGE_START + 49 #define PAGE_DBWIZARD_ADO RID_PAGE_START + 50 @@ -172,44 +172,44 @@ #define PAGE_DBWIZARD_AUTHENTIFICATION RID_PAGE_START + 53 #define PAGE_DBWIZARD_MYSQL_JDBC RID_PAGE_START + 54 #define PAGE_DBWIZARD_FINAL RID_PAGE_START + 55 -#define PAGE_DBWIZARD_USERDEFINED RID_PAGE_START + 56 -#define PAGE_DBWIZARD_MYSQL_NATIVE RID_PAGE_START + 57 +#define PAGE_DBWIZARD_USERDEFINED RID_PAGE_START + 56 +#define PAGE_DBWIZARD_MYSQL_NATIVE RID_PAGE_START + 57 //======================================================================== // error boxes -#define ERR_NOREGISTEREDDATASOURCES RID_ERRORBOX_START + 0 +#define ERR_NOREGISTEREDDATASOURCES RID_ERRORBOX_START + 0 // free -#define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2 -#define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3 -#define ERR_QRY_AMB_FIELD RID_ERRORBOX_START + 4 +#define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2 +#define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3 +#define ERR_QRY_AMB_FIELD RID_ERRORBOX_START + 4 // FREE -#define ERR_INVALID_LISTBOX_ENTRY RID_ERRORBOX_START + 6 +#define ERR_INVALID_LISTBOX_ENTRY RID_ERRORBOX_START + 6 // FREE -#define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8 -#define ERR_QRY_NOSTATEMENT RID_ERRORBOX_START + 9 -#define ERR_QRY_NOCRITERIA RID_ERRORBOX_START + 10 -#define ERR_CANTDOTABLEACTION RID_ERRORBOX_START + 11 +#define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8 +#define ERR_QRY_NOSTATEMENT RID_ERRORBOX_START + 9 +#define ERR_QRY_NOCRITERIA RID_ERRORBOX_START + 10 +#define ERR_CANTDOTABLEACTION RID_ERRORBOX_START + 11 //======================================================================== // query boxes -#define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0 -#define QUERY_BRW_SAVEMODIFIED RID_QUERYBOX_START + 1 -#define QUERY_CONNECTION_LOST RID_QUERYBOX_START + 2 -#define QUERY_BRW_DELETE_QUERY_CONFIRM RID_QUERYBOX_START + 3 -#define APP_SAVEMODIFIED RID_QUERYBOX_START + 4 -#define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5 -#define TABLE_QUERY_CONNECTION_LOST RID_QUERYBOX_START + 6 -#define QUERY_SAVE_CURRENT_INDEX RID_QUERYBOX_START + 7 -#define QUERY_SAVE_TABLE_EDIT_INDEXES RID_QUERYBOX_START + 8 -#define RELATION_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 9 +#define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0 +#define QUERY_BRW_SAVEMODIFIED RID_QUERYBOX_START + 1 +#define QUERY_CONNECTION_LOST RID_QUERYBOX_START + 2 +#define QUERY_BRW_DELETE_QUERY_CONFIRM RID_QUERYBOX_START + 3 +#define APP_SAVEMODIFIED RID_QUERYBOX_START + 4 +#define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5 +#define TABLE_QUERY_CONNECTION_LOST RID_QUERYBOX_START + 6 +#define QUERY_SAVE_CURRENT_INDEX RID_QUERYBOX_START + 7 +#define QUERY_SAVE_TABLE_EDIT_INDEXES RID_QUERYBOX_START + 8 +#define RELATION_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 9 // FREE -#define APP_CLOSEDOCUMENTS RID_QUERYBOX_START + 11 -#define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12 -#define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13 +#define APP_CLOSEDOCUMENTS RID_QUERYBOX_START + 11 +#define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12 +#define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13 @@ -221,166 +221,166 @@ //======================================================================== // toolboxes -#define RID_BRW_TAB_TOOLBOX RID_TOOLBOX_START + 0 -#define RID_BRW_QRY_TOOLBOX RID_TOOLBOX_START + 1 -#define RID_QRY_TOOLBOX_SQL RID_TOOLBOX_START + 2 -#define RID_BRW_QUERYDESIGN_TOOLBOX RID_TOOLBOX_START + 3 -#define RID_BRW_REALTIONDESIGN_TOOLBOX RID_TOOLBOX_START + 4 -#define RID_BRW_APPLICATION_TOOLBOX RID_TOOLBOX_START + 5 +#define RID_BRW_TAB_TOOLBOX RID_TOOLBOX_START + 0 +#define RID_BRW_QRY_TOOLBOX RID_TOOLBOX_START + 1 +#define RID_QRY_TOOLBOX_SQL RID_TOOLBOX_START + 2 +#define RID_BRW_QUERYDESIGN_TOOLBOX RID_TOOLBOX_START + 3 +#define RID_BRW_REALTIONDESIGN_TOOLBOX RID_TOOLBOX_START + 4 +#define RID_BRW_APPLICATION_TOOLBOX RID_TOOLBOX_START + 5 //======================================================================== // bitmaps -// start with RID_BITMAP_START +// start with RID_BITMAP_START //======================================================================== // images -#define TABLE_TREE_ICON RID_IMAGE_START + 0 -#define VIEW_TREE_ICON RID_IMAGE_START + 1 -#define TABLEFOLDER_TREE_ICON RID_IMAGE_START + 2 -#define BMP_EXCEPTION_ERROR RID_IMAGE_START + 3 -#define BMP_EXCEPTION_WARNING RID_IMAGE_START + 4 -#define BMP_EXCEPTION_INFO RID_IMAGE_START + 5 -#define QUERYFOLDER_TREE_ICON RID_IMAGE_START + 6 -#define QUERY_TREE_ICON RID_IMAGE_START + 7 -#define DATABASE_TREE_ICON RID_IMAGE_START + 8 +#define TABLE_TREE_ICON RID_IMAGE_START + 0 +#define VIEW_TREE_ICON RID_IMAGE_START + 1 +#define TABLEFOLDER_TREE_ICON RID_IMAGE_START + 2 +#define BMP_EXCEPTION_ERROR RID_IMAGE_START + 3 +#define BMP_EXCEPTION_WARNING RID_IMAGE_START + 4 +#define BMP_EXCEPTION_INFO RID_IMAGE_START + 5 +#define QUERYFOLDER_TREE_ICON RID_IMAGE_START + 6 +#define QUERY_TREE_ICON RID_IMAGE_START + 7 +#define DATABASE_TREE_ICON RID_IMAGE_START + 8 // free // free // free -#define IMG_PKEYICON RID_IMAGE_START + 12 -#define REPORTFOLDER_TREE_ICON_SCH RID_IMAGE_START + 13 -#define FORMFOLDER_TREE_ICON_SCH RID_IMAGE_START + 14 -#define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15 -#define QUERYFOLDER_TREE_ICON_SCH RID_IMAGE_START + 16 -#define TABLEFOLDER_TREE_ICON_SCH RID_IMAGE_START + 17 +#define IMG_PKEYICON RID_IMAGE_START + 12 +#define REPORTFOLDER_TREE_ICON_SCH RID_IMAGE_START + 13 +#define FORMFOLDER_TREE_ICON_SCH RID_IMAGE_START + 14 +#define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15 +#define QUERYFOLDER_TREE_ICON_SCH RID_IMAGE_START + 16 +#define TABLEFOLDER_TREE_ICON_SCH RID_IMAGE_START + 17 // free -#define DATABASE_TREE_ICON_SCH RID_IMAGE_START + 19 -#define IMG_DATABASE_CONNECTED_SCH RID_IMAGE_START + 20 -#define TABLE_TREE_ICON_SCH RID_IMAGE_START + 21 -#define VIEW_TREE_ICON_SCH RID_IMAGE_START + 22 -#define QUERY_TREE_ICON_SCH RID_IMAGE_START + 23 -#define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24 +#define DATABASE_TREE_ICON_SCH RID_IMAGE_START + 19 +#define IMG_DATABASE_CONNECTED_SCH RID_IMAGE_START + 20 +#define TABLE_TREE_ICON_SCH RID_IMAGE_START + 21 +#define VIEW_TREE_ICON_SCH RID_IMAGE_START + 22 +#define QUERY_TREE_ICON_SCH RID_IMAGE_START + 23 +#define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24 // free // free // free -#define BMP_EXCEPTION_ERROR_SCH RID_IMAGE_START + 28 -#define BMP_EXCEPTION_WARNING_SCH RID_IMAGE_START + 29 -#define BMP_EXCEPTION_INFO_SCH RID_IMAGE_START + 30 -#define IMG_PKEYICON_SCH RID_IMAGE_START + 31 -#define IMG_JOINS_H RID_IMAGE_START + 32 -#define IMG_ALL_LEFT_H RID_IMAGE_START + 33 -#define IMG_ONE_LEFT_H RID_IMAGE_START + 34 -#define IMG_ONE_RIGHT_H RID_IMAGE_START + 35 -#define IMG_ALL_RIGHT_H RID_IMAGE_START + 36 -#define IMG_SORTUP_H RID_IMAGE_START + 37 -#define IMG_SORTDOWN_H RID_IMAGE_START + 38 -#define IMG_FORMFOLDER_TREE_L RID_IMAGE_START + 39 -#define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40 -#define IMG_QUERYFOLDER_TREE_L RID_IMAGE_START + 41 -#define IMG_TABLEFOLDER_TREE_L RID_IMAGE_START + 42 -#define IMG_FORMFOLDER_TREE_LHC RID_IMAGE_START + 43 -#define IMG_REPORTFOLDER_TREE_LHC RID_IMAGE_START + 44 -#define IMG_QUERYFOLDER_TREE_LHC RID_IMAGE_START + 45 -#define IMG_TABLEFOLDER_TREE_LHC RID_IMAGE_START + 46 -#define IMG_NAVIGATION_BTN_UP_SC RID_IMAGE_START + 47 -#define IMG_NAVIGATION_BTN_UP_SCH RID_IMAGE_START + 48 -#define IMG_NAVIGATION_CREATEFOLDER_SC RID_IMAGE_START + 49 -#define IMG_NAVIGATION_CREATEFOLDER_SCH RID_IMAGE_START + 50 -#define FORM_TREE_ICON RID_IMAGE_START + 51 -#define REPORT_TREE_ICON RID_IMAGE_START + 52 -#define FORM_TREE_ICON_SCH RID_IMAGE_START + 53 -#define REPORT_TREE_ICON_SCH RID_IMAGE_START + 54 -#define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55 +#define BMP_EXCEPTION_ERROR_SCH RID_IMAGE_START + 28 +#define BMP_EXCEPTION_WARNING_SCH RID_IMAGE_START + 29 +#define BMP_EXCEPTION_INFO_SCH RID_IMAGE_START + 30 +#define IMG_PKEYICON_SCH RID_IMAGE_START + 31 +#define IMG_JOINS_H RID_IMAGE_START + 32 +#define IMG_ALL_LEFT_H RID_IMAGE_START + 33 +#define IMG_ONE_LEFT_H RID_IMAGE_START + 34 +#define IMG_ONE_RIGHT_H RID_IMAGE_START + 35 +#define IMG_ALL_RIGHT_H RID_IMAGE_START + 36 +#define IMG_SORTUP_H RID_IMAGE_START + 37 +#define IMG_SORTDOWN_H RID_IMAGE_START + 38 +#define IMG_FORMFOLDER_TREE_L RID_IMAGE_START + 39 +#define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40 +#define IMG_QUERYFOLDER_TREE_L RID_IMAGE_START + 41 +#define IMG_TABLEFOLDER_TREE_L RID_IMAGE_START + 42 +#define IMG_FORMFOLDER_TREE_LHC RID_IMAGE_START + 43 +#define IMG_REPORTFOLDER_TREE_LHC RID_IMAGE_START + 44 +#define IMG_QUERYFOLDER_TREE_LHC RID_IMAGE_START + 45 +#define IMG_TABLEFOLDER_TREE_LHC RID_IMAGE_START + 46 +#define IMG_NAVIGATION_BTN_UP_SC RID_IMAGE_START + 47 +#define IMG_NAVIGATION_BTN_UP_SCH RID_IMAGE_START + 48 +#define IMG_NAVIGATION_CREATEFOLDER_SC RID_IMAGE_START + 49 +#define IMG_NAVIGATION_CREATEFOLDER_SCH RID_IMAGE_START + 50 +#define FORM_TREE_ICON RID_IMAGE_START + 51 +#define REPORT_TREE_ICON RID_IMAGE_START + 52 +#define FORM_TREE_ICON_SCH RID_IMAGE_START + 53 +#define REPORT_TREE_ICON_SCH RID_IMAGE_START + 54 +#define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55 //======================================================================== // image lists -#define IMG_JOINS RID_IMAGELIST_START + 0 -#define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1 -#define IMG_INDEX_DLG_SCH RID_IMAGELIST_START + 2 -#define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3 -#define IMG_INDEX_DLG_LCH RID_IMAGELIST_START + 4 -#define IMP_FORM_SC RID_IMAGELIST_START + 5 -#define IMP_FORM_SCH RID_IMAGELIST_START + 6 -#define IMP_FORM_LC RID_IMAGELIST_START + 7 -#define IMP_FORM_LCH RID_IMAGELIST_START + 8 -#define IMP_REPORT_SC RID_IMAGELIST_START + 9 -#define IMP_REPORT_SCH RID_IMAGELIST_START + 10 -#define IMP_REPORT_LC RID_IMAGELIST_START + 11 -#define IMP_REPORT_LCH RID_IMAGELIST_START + 12 +#define IMG_JOINS RID_IMAGELIST_START + 0 +#define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1 +#define IMG_INDEX_DLG_SCH RID_IMAGELIST_START + 2 +#define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3 +#define IMG_INDEX_DLG_LCH RID_IMAGELIST_START + 4 +#define IMP_FORM_SC RID_IMAGELIST_START + 5 +#define IMP_FORM_SCH RID_IMAGELIST_START + 6 +#define IMP_FORM_LC RID_IMAGELIST_START + 7 +#define IMP_FORM_LCH RID_IMAGELIST_START + 8 +#define IMP_REPORT_SC RID_IMAGELIST_START + 9 +#define IMP_REPORT_SCH RID_IMAGELIST_START + 10 +#define IMP_REPORT_LC RID_IMAGELIST_START + 11 +#define IMP_REPORT_LCH RID_IMAGELIST_START + 12 //======================================================================== // menues -#define MENU_TABLETREE_POPUP RID_MENU_START + 0 -#define MENU_DATASOURCELIST_POPUP RID_MENU_START + 1 -#define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2 -#define RID_SBA_GRID_ROWCTXMENU RID_MENU_START + 3 -#define MENU_BROWSERTREE_CONTEXT RID_MENU_START + 4 -#define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5 -#define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6 -#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7 -#define RID_BRW_TABLEDESIGN_TOOLBOX RID_MENU_START + 8 -#define RID_SBA_RTF_PKEYPOPUP RID_MENU_START + 9 -#define RID_MENU_APP_EDIT RID_MENU_START + 10 -#define RID_MENU_APP_NEW RID_MENU_START + 11 -#define RID_MENU_APP_PREVIEW RID_MENU_START + 12 -#define RID_NEW_FORM RID_MENU_START + 13 -#define MENU_BROWSER_DEFAULTCONTEXT RID_MENU_START + 14 -#define RID_MENU_REFRESH_DATA RID_MENU_START + 15 -#define RID_MENU_JOINVIEW_CONNECTION RID_MENU_START + 16 -#define RID_MENU_JOINVIEW_TABLE RID_MENU_START + 17 +#define MENU_TABLETREE_POPUP RID_MENU_START + 0 +#define MENU_DATASOURCELIST_POPUP RID_MENU_START + 1 +#define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2 +#define RID_SBA_GRID_ROWCTXMENU RID_MENU_START + 3 +#define MENU_BROWSERTREE_CONTEXT RID_MENU_START + 4 +#define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5 +#define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6 +#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7 +#define RID_BRW_TABLEDESIGN_TOOLBOX RID_MENU_START + 8 +#define RID_SBA_RTF_PKEYPOPUP RID_MENU_START + 9 +#define RID_MENU_APP_EDIT RID_MENU_START + 10 +#define RID_MENU_APP_NEW RID_MENU_START + 11 +#define RID_MENU_APP_PREVIEW RID_MENU_START + 12 +#define RID_NEW_FORM RID_MENU_START + 13 +#define MENU_BROWSER_DEFAULTCONTEXT RID_MENU_START + 14 +#define RID_MENU_REFRESH_DATA RID_MENU_START + 15 +#define RID_MENU_JOINVIEW_CONNECTION RID_MENU_START + 16 +#define RID_MENU_JOINVIEW_TABLE RID_MENU_START + 17 //======================================================================== // controls -#define RID_DB_TAB_EDITOR RID_CONTROL_START + 0 +#define RID_DB_TAB_EDITOR RID_CONTROL_START + 0 #define RID_MYSQL_NATIVE_SETTINGS RID_CONTROL_START + 1 //======================================================================== // strings -#define STR_TBL_TITLE RID_STR_GEN_START +#define STR_TBL_TITLE RID_STR_GEN_START #define STR_ERROR_DURING_CREATION RID_STR_GEN_START + 1 -#define RID_STR_CONNECTION_LOST RID_STR_GEN_START + 2 +#define RID_STR_CONNECTION_LOST RID_STR_GEN_START + 2 #define STR_NAME_ALREADY_EXISTS RID_STR_GEN_START + 3 // free -#define STR_TITLE_CONFIRM_DELETION RID_STR_GEN_START + 5 -#define STR_STAT_WARNING RID_STR_GEN_START + 6 -#define STR_TABLEDESIGN_DATASOURCE_DELETED RID_STR_GEN_START + 7 -#define STR_TABLEDESIGN_DBFIELDTYPES RID_STR_GEN_START + 8 -#define STR_QRY_CONTINUE RID_STR_GEN_START + 9 -#define STR_COLUMN_NAME RID_STR_GEN_START + 10 -#define STR_ERROR_OCCURED_WHILE_COPYING RID_STR_GEN_START + 11 -#define STR_MISSING_TABLES_XDROP RID_STR_GEN_START + 12 -#define STR_QUERY_DELETE_TABLE RID_STR_GEN_START + 13 -#define STR_BUTTON_TEXT_ALL RID_STR_GEN_START + 14 -#define STR_COULDNOTCREATE_DRIVERMANAGER RID_STR_GEN_START + 15 -#define STR_UNEXPECTED_ERROR RID_STR_GEN_START + 16 -#define STR_REMEMBERPASSWORD_SESSION RID_STR_GEN_START + 17 -#define STR_ENTER_CONNECTION_PASSWORD RID_STR_GEN_START + 18 -#define STR_NOREGISTEREDDRIVER RID_STR_GEN_START + 19 -#define STR_DATASOURCE_DELETED RID_STR_GEN_START + 20 -#define STR_QUERY_UNDO_MODIFYSQLEDIT RID_STR_GEN_START + 21 -#define STR_QRY_TITLE RID_STR_GEN_START + 22 -#define STR_VIEW_TITLE RID_STR_GEN_START + 23 +#define STR_TITLE_CONFIRM_DELETION RID_STR_GEN_START + 5 +#define STR_STAT_WARNING RID_STR_GEN_START + 6 +#define STR_TABLEDESIGN_DATASOURCE_DELETED RID_STR_GEN_START + 7 +#define STR_TABLEDESIGN_DBFIELDTYPES RID_STR_GEN_START + 8 +#define STR_QRY_CONTINUE RID_STR_GEN_START + 9 +#define STR_COLUMN_NAME RID_STR_GEN_START + 10 +#define STR_ERROR_OCCURED_WHILE_COPYING RID_STR_GEN_START + 11 +#define STR_MISSING_TABLES_XDROP RID_STR_GEN_START + 12 +#define STR_QUERY_DELETE_TABLE RID_STR_GEN_START + 13 +#define STR_BUTTON_TEXT_ALL RID_STR_GEN_START + 14 +#define STR_COULDNOTCREATE_DRIVERMANAGER RID_STR_GEN_START + 15 +#define STR_UNEXPECTED_ERROR RID_STR_GEN_START + 16 +#define STR_REMEMBERPASSWORD_SESSION RID_STR_GEN_START + 17 +#define STR_ENTER_CONNECTION_PASSWORD RID_STR_GEN_START + 18 +#define STR_NOREGISTEREDDRIVER RID_STR_GEN_START + 19 +#define STR_DATASOURCE_DELETED RID_STR_GEN_START + 20 +#define STR_QUERY_UNDO_MODIFYSQLEDIT RID_STR_GEN_START + 21 +#define STR_QRY_TITLE RID_STR_GEN_START + 22 +#define STR_VIEW_TITLE RID_STR_GEN_START + 23 #define STR_SUB_DOCS_WITH_SCRIPTS RID_STR_GEN_START + 24 #define STR_SUB_DOCS_WITH_SCRIPTS_DETAIL RID_STR_GEN_START + 25 -#define STR_TABLEDESIGN_DUPLICATE_NAME RID_STR_GEN_START + 26 -#define STR_COULDNOTCONNECT_DATASOURCE RID_STR_GEN_START + 27 -#define STR_NO_TABLE_FORMAT_INSIDE RID_STR_GEN_START + 28 -#define RID_STR_QUERIES_CONTAINER RID_STR_GEN_START + 29 -#define RID_STR_TABLES_CONTAINER RID_STR_GEN_START + 30 -#define STR_NEW_FOLDER RID_STR_GEN_START + 31 -#define RID_STR_FORM RID_STR_GEN_START + 32 -#define RID_STR_REPORT RID_STR_GEN_START + 33 -#define STR_FRM_LABEL RID_STR_GEN_START + 34 -#define STR_RPT_LABEL RID_STR_GEN_START + 35 -#define STR_FOLDER_LABEL RID_STR_GEN_START + 36 -#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD RID_STR_GEN_START + 37 -#define STR_TABLEDESIGN_NO_PRIM_KEY RID_STR_GEN_START + 38 +#define STR_TABLEDESIGN_DUPLICATE_NAME RID_STR_GEN_START + 26 +#define STR_COULDNOTCONNECT_DATASOURCE RID_STR_GEN_START + 27 +#define STR_NO_TABLE_FORMAT_INSIDE RID_STR_GEN_START + 28 +#define RID_STR_QUERIES_CONTAINER RID_STR_GEN_START + 29 +#define RID_STR_TABLES_CONTAINER RID_STR_GEN_START + 30 +#define STR_NEW_FOLDER RID_STR_GEN_START + 31 +#define RID_STR_FORM RID_STR_GEN_START + 32 +#define RID_STR_REPORT RID_STR_GEN_START + 33 +#define STR_FRM_LABEL RID_STR_GEN_START + 34 +#define STR_RPT_LABEL RID_STR_GEN_START + 35 +#define STR_FOLDER_LABEL RID_STR_GEN_START + 36 +#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD RID_STR_GEN_START + 37 +#define STR_TABLEDESIGN_NO_PRIM_KEY RID_STR_GEN_START + 38 // FREE #define RID_STR_EXTENSION_NOT_PRESENT RID_STR_GEN_START + 40 #define RID_STR_EXTENSION_NAME RID_STR_GEN_START + 41 @@ -389,32 +389,32 @@ // untyped resources // free -#define RSC_CHARSETS RID_UNTYPED_START + 2 +#define RSC_CHARSETS RID_UNTYPED_START + 2 // free #define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4 -#define IMG_TABLESUBCRIPTION_SC RID_UNTYPED_START + 5 -#define IMG_TABLESUBCRIPTION_SCH RID_UNTYPED_START + 6 -#define IMG_TABLESUBCRIPTION_LC RID_UNTYPED_START + 7 -#define IMG_TABLESUBCRIPTION_LCH RID_UNTYPED_START + 8 -#define IMG_QUERYADMINISTRATION_SC RID_UNTYPED_START + 9 -#define IMG_QUERYADMINISTRATION_SCH RID_UNTYPED_START + 10 -#define IMG_QUERYADMINISTRATION_LC RID_UNTYPED_START + 11 -#define IMG_QUERYADMINISTRATION_LCH RID_UNTYPED_START + 12 -#define IMG_DOCUMENTLINKS_SC RID_UNTYPED_START + 13 -#define IMG_DOCUMENTLINKS_SCH RID_UNTYPED_START + 14 -#define IMG_DOCUMENTLINKS_LC RID_UNTYPED_START + 15 -#define IMG_DOCUMENTLINKS_LCH RID_UNTYPED_START + 16 +#define IMG_TABLESUBCRIPTION_SC RID_UNTYPED_START + 5 +#define IMG_TABLESUBCRIPTION_SCH RID_UNTYPED_START + 6 +#define IMG_TABLESUBCRIPTION_LC RID_UNTYPED_START + 7 +#define IMG_TABLESUBCRIPTION_LCH RID_UNTYPED_START + 8 +#define IMG_QUERYADMINISTRATION_SC RID_UNTYPED_START + 9 +#define IMG_QUERYADMINISTRATION_SCH RID_UNTYPED_START + 10 +#define IMG_QUERYADMINISTRATION_LC RID_UNTYPED_START + 11 +#define IMG_QUERYADMINISTRATION_LCH RID_UNTYPED_START + 12 +#define IMG_DOCUMENTLINKS_SC RID_UNTYPED_START + 13 +#define IMG_DOCUMENTLINKS_SCH RID_UNTYPED_START + 14 +#define IMG_DOCUMENTLINKS_LC RID_UNTYPED_START + 15 +#define IMG_DOCUMENTLINKS_LCH RID_UNTYPED_START + 16 //======================================================================== // various -#define PB_FORMAT RID_MISC_START + 0 -#define FIXED_NO_CONNECTION RID_MISC_START + 1 -#define LB_LEFT_TABLE RID_MISC_START + 2 -#define LB_RIGHT_TABLE RID_MISC_START + 3 -#define LB_CONTROL RID_MISC_START + 4 -#define FL_INVOLVED_TABLES RID_MISC_START + 5 -#define FL_INVOLVED_FIELDS RID_MISC_START + 6 +#define PB_FORMAT RID_MISC_START + 0 +#define FIXED_NO_CONNECTION RID_MISC_START + 1 +#define LB_LEFT_TABLE RID_MISC_START + 2 +#define LB_RIGHT_TABLE RID_MISC_START + 3 +#define LB_CONTROL RID_MISC_START + 4 +#define FL_INVOLVED_TABLES RID_MISC_START + 5 +#define FL_INVOLVED_FIELDS RID_MISC_START + 6 #endif // _DBU_RESOURCE_HRC_ diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc index a0a6b2eb8736..310baa5eb512 100644 --- a/dbaccess/source/ui/inc/dbu_tbl.hrc +++ b/dbaccess/source/ui/inc/dbu_tbl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,62 +31,62 @@ #include "dbu_resource.hrc" #endif -#define STR_HELP_AUTOINCREMENT_VALUE RID_STR_TBL_START -#define STR_TABLEDESIGN_UNDO_PRIMKEY RID_STR_TBL_START + 1 -#define STR_VALUE_YES RID_STR_TBL_START + 2 -#define STR_VALUE_NO RID_STR_TBL_START + 3 -#define STR_VALUE_ASC RID_STR_TBL_START + 4 -#define STR_VALUE_DESC RID_STR_TBL_START + 5 -#define STR_VALUE_NONE RID_STR_TBL_START + 6 -#define STR_TAB_FIELD_NAME RID_STR_TBL_START + 7 -#define STR_TAB_FIELD_DATATYPE RID_STR_TBL_START + 8 -#define STR_TAB_FIELD_LENGTH RID_STR_TBL_START + 9 -#define STR_TAB_HELP_TEXT RID_STR_TBL_START + 10 -#define STR_TAB_FIELD_NULLABLE RID_STR_TBL_START + 11 -#define STR_FIELD_AUTOINCREMENT RID_STR_TBL_START + 12 -#define STR_TAB_PROPERTIES RID_STR_TBL_START + 13 -#define STR_TABPAGE_GENERAL RID_STR_TBL_START + 14 -#define STR_TAB_TABLE_DESCRIPTION RID_STR_TBL_START + 15 -#define STR_TAB_TABLE_PROPERTIES RID_STR_TBL_START + 16 -#define STR_TABED_UNDO_TYPE_CHANGED RID_STR_TBL_START + 17 -#define STR_TABED_UNDO_ROWDELETED RID_STR_TBL_START + 18 -#define STR_TABED_UNDO_ROWINSERTED RID_STR_TBL_START + 19 -#define STR_TABED_UNDO_NEWROWINSERTED RID_STR_TBL_START + 20 -#define STR_TABED_UNDO_PRIMKEY RID_STR_TBL_START + 21 -#define STR_HELP_AUTOINCREMENT RID_STR_TBL_START + 22 -#define STR_HELP_FORMAT_CODE RID_STR_TBL_START + 23 -#define STR_HELP_SCALE RID_STR_TBL_START + 24 -#define STR_HELP_LENGTH RID_STR_TBL_START + 25 -#define STR_HELP_NUMERIC_TYPE RID_STR_TBL_START + 26 -#define STR_HELP_TEXT_LENGTH RID_STR_TBL_START + 27 -#define STR_HELP_FIELD_REQUIRED RID_STR_TBL_START + 28 -#define STR_HELP_DEFAULT_VALUE RID_STR_TBL_START + 29 -#define STR_HELP_BOOL_DEFAULT RID_STR_TBL_START + 30 -#define STR_FORMAT RID_STR_TBL_START + 31 -#define STR_SCALE RID_STR_TBL_START + 32 -#define STR_LENGTH RID_STR_TBL_START + 33 -#define STR_NUMERIC_TYPE RID_STR_TBL_START + 34 -#define STR_TEXT_LENGTH RID_STR_TBL_START + 35 -#define STR_FIELD_REQUIRED RID_STR_TBL_START + 36 -#define STR_DEFAULT_VALUE RID_STR_TBL_START + 37 -#define STR_TABED_UNDO_CELLMODIFIED RID_STR_TBL_START + 38 -#define STR_TAB_FIELD_COLUMN_NAME RID_STR_TBL_START + 39 -#define STR_TBL_COLUMN_IS_KEYCOLUMN RID_STR_TBL_START + 40 -#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE RID_STR_TBL_START + 41 -#define STR_TABLEDESIGN_ALTER_ERROR RID_STR_TBL_START + 42 -#define STR_AUTOINCREMENT_VALUE RID_STR_TBL_START + 43 -#define STR_HELP_FORMAT_BUTTON RID_STR_TBL_START + 44 -#define STR_TABLEDESIGN_CONNECTION_MISSING RID_STR_TBL_START + 45 -#define STR_TAB_FIELD_COLUMN_DATATYPE RID_STR_TBL_START + 46 -#define STR_TABLEDESIGN_TITLE RID_STR_TBL_START + 47 -#define STR_NO_TYPE_INFO_AVAILABLE RID_STR_TBL_START + 48 +#define STR_HELP_AUTOINCREMENT_VALUE RID_STR_TBL_START +#define STR_TABLEDESIGN_UNDO_PRIMKEY RID_STR_TBL_START + 1 +#define STR_VALUE_YES RID_STR_TBL_START + 2 +#define STR_VALUE_NO RID_STR_TBL_START + 3 +#define STR_VALUE_ASC RID_STR_TBL_START + 4 +#define STR_VALUE_DESC RID_STR_TBL_START + 5 +#define STR_VALUE_NONE RID_STR_TBL_START + 6 +#define STR_TAB_FIELD_NAME RID_STR_TBL_START + 7 +#define STR_TAB_FIELD_DATATYPE RID_STR_TBL_START + 8 +#define STR_TAB_FIELD_LENGTH RID_STR_TBL_START + 9 +#define STR_TAB_HELP_TEXT RID_STR_TBL_START + 10 +#define STR_TAB_FIELD_NULLABLE RID_STR_TBL_START + 11 +#define STR_FIELD_AUTOINCREMENT RID_STR_TBL_START + 12 +#define STR_TAB_PROPERTIES RID_STR_TBL_START + 13 +#define STR_TABPAGE_GENERAL RID_STR_TBL_START + 14 +#define STR_TAB_TABLE_DESCRIPTION RID_STR_TBL_START + 15 +#define STR_TAB_TABLE_PROPERTIES RID_STR_TBL_START + 16 +#define STR_TABED_UNDO_TYPE_CHANGED RID_STR_TBL_START + 17 +#define STR_TABED_UNDO_ROWDELETED RID_STR_TBL_START + 18 +#define STR_TABED_UNDO_ROWINSERTED RID_STR_TBL_START + 19 +#define STR_TABED_UNDO_NEWROWINSERTED RID_STR_TBL_START + 20 +#define STR_TABED_UNDO_PRIMKEY RID_STR_TBL_START + 21 +#define STR_HELP_AUTOINCREMENT RID_STR_TBL_START + 22 +#define STR_HELP_FORMAT_CODE RID_STR_TBL_START + 23 +#define STR_HELP_SCALE RID_STR_TBL_START + 24 +#define STR_HELP_LENGTH RID_STR_TBL_START + 25 +#define STR_HELP_NUMERIC_TYPE RID_STR_TBL_START + 26 +#define STR_HELP_TEXT_LENGTH RID_STR_TBL_START + 27 +#define STR_HELP_FIELD_REQUIRED RID_STR_TBL_START + 28 +#define STR_HELP_DEFAULT_VALUE RID_STR_TBL_START + 29 +#define STR_HELP_BOOL_DEFAULT RID_STR_TBL_START + 30 +#define STR_FORMAT RID_STR_TBL_START + 31 +#define STR_SCALE RID_STR_TBL_START + 32 +#define STR_LENGTH RID_STR_TBL_START + 33 +#define STR_NUMERIC_TYPE RID_STR_TBL_START + 34 +#define STR_TEXT_LENGTH RID_STR_TBL_START + 35 +#define STR_FIELD_REQUIRED RID_STR_TBL_START + 36 +#define STR_DEFAULT_VALUE RID_STR_TBL_START + 37 +#define STR_TABED_UNDO_CELLMODIFIED RID_STR_TBL_START + 38 +#define STR_TAB_FIELD_COLUMN_NAME RID_STR_TBL_START + 39 +#define STR_TBL_COLUMN_IS_KEYCOLUMN RID_STR_TBL_START + 40 +#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE RID_STR_TBL_START + 41 +#define STR_TABLEDESIGN_ALTER_ERROR RID_STR_TBL_START + 42 +#define STR_AUTOINCREMENT_VALUE RID_STR_TBL_START + 43 +#define STR_HELP_FORMAT_BUTTON RID_STR_TBL_START + 44 +#define STR_TABLEDESIGN_CONNECTION_MISSING RID_STR_TBL_START + 45 +#define STR_TAB_FIELD_COLUMN_DATATYPE RID_STR_TBL_START + 46 +#define STR_TABLEDESIGN_TITLE RID_STR_TBL_START + 47 +#define STR_NO_TYPE_INFO_AVAILABLE RID_STR_TBL_START + 48 #define STR_CHANGE_COLUMN_NAME RID_STR_TBL_START + 49 #define STR_CHANGE_COLUMN_TYPE RID_STR_TBL_START + 50 #define STR_CHANGE_COLUMN_DESCRIPTION RID_STR_TBL_START + 51 #define STR_CHANGE_COLUMN_ATTRIBUTE RID_STR_TBL_START + 52 #define STR_TABLEDESIGN_SAVE_ERROR RID_STR_TBL_START + 53 #define STR_TABLEDESIGN_COULD_NOT_DROP_COL RID_STR_TBL_START + 54 -#define STR_COLUMN_DESCRIPTION RID_STR_TBL_START + 55 +#define STR_COLUMN_DESCRIPTION RID_STR_TBL_START + 55 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/inc/dbu_uno.hrc b/dbaccess/source/ui/inc/dbu_uno.hrc index f60fd615ec9e..f76c46cfbc7e 100644 --- a/dbaccess/source/ui/inc/dbu_uno.hrc +++ b/dbaccess/source/ui/inc/dbu_uno.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "dbu_resource.hrc" #endif -#define STR_REMEMBERPASSWORD_PERSISTENT ( RID_STR_UNO_START + 0 ) +#define STR_REMEMBERPASSWORD_PERSISTENT ( RID_STR_UNO_START + 0 ) #define STR_CTW_NO_VIEWS_SUPPORT ( RID_STR_UNO_START + 1 ) #define STR_CTW_NO_PRIMARY_KEY_SUPPORT ( RID_STR_UNO_START + 2 ) #define STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ( RID_STR_UNO_START + 3 ) @@ -40,9 +40,9 @@ #define STR_CTW_UNSUPPORTED_COLUMN_TYPE ( RID_STR_UNO_START + 6 ) #define STR_CTW_ILLEGAL_PARAMETER_COUNT ( RID_STR_UNO_START + 7 ) #define STR_CTW_ERROR_DURING_INITIALIZATION ( RID_STR_UNO_START + 8 ) -#define STR_CTW_ERROR_UNSUPPORTED_SETTING ( RID_STR_UNO_START + 9 ) -#define STR_CTW_ERROR_NO_QUERY ( RID_STR_UNO_START + 10 ) -#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ( RID_STR_UNO_START + 11 ) +#define STR_CTW_ERROR_UNSUPPORTED_SETTING ( RID_STR_UNO_START + 9 ) +#define STR_CTW_ERROR_NO_QUERY ( RID_STR_UNO_START + 10 ) +#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ( RID_STR_UNO_START + 11 ) // please adjust when inserting new strings: #define RID_STR_UNO_LAST_USED STR_CTW_ERROR_INVALID_INTERACTIONHANDLER diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 882f78b806de..26fe862cd059 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,15 +61,15 @@ class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, pub { private: OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; - SfxItemSet* m_pOutSet; - ::dbaccess::ODsnTypeCollection* - m_pCollection; /// the DSN type collection instance + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + SfxItemSet* m_pOutSet; + ::dbaccess::ODsnTypeCollection* + m_pCollection; /// the DSN type collection instance ::rtl::OUString m_eType; - sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages - sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing - sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> + sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages + sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing + sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed @@ -88,7 +88,7 @@ public: // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); @@ -97,16 +97,16 @@ public: protected: /// to override to create new pages - virtual TabPage* createPage(WizardState _nState); - virtual WizardState determineNextState(WizardState _nCurrentState) const; - virtual sal_Bool leaveState(WizardState _nState); + virtual TabPage* createPage(WizardState _nState); + virtual WizardState determineNextState(WizardState _nCurrentState) const; + virtual sal_Bool leaveState(WizardState _nState); virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const; virtual sal_Bool onFinish(); protected: - inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } - inline void disabledUI() { m_bUIEnabled = sal_False; } + inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } + inline void disabledUI() { m_bUIEnabled = sal_False; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. void implSelectDatasource(const ::rtl::OUString& _rRegisteredName); @@ -114,20 +114,20 @@ protected: enum ApplyResult { - AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed - AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed + AR_LEAVE_UNCHANGED, // no changes were made + AR_KEEP // don't leave the page (e.g. because an error occured) }; /** apply all changes made */ - ApplyResult implApplyChanges(); + ApplyResult implApplyChanges(); private: DECL_LINK(OnTypeSelected, OGeneralPage*); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBWIZ_HXX diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index ad8c6fb07eef..f416cbf6d8e9 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,13 +64,13 @@ class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, private: OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; - SfxItemSet* m_pOutSet; + ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + SfxItemSet* m_pOutSet; ::rtl::OUString m_sURL; ::rtl::OUString m_sOldURL; - sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages - sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing - sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> + sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages + sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing + sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> sal_Bool m_bIsConnectable : 1; String m_sRM_IntroText; String m_sRM_dBaseText; @@ -90,9 +90,9 @@ private: INetURLObject m_aDocURL; String m_sWorkPath; OGeneralPage* m_pGeneralPage; - OMySQLIntroPageSetup* m_pMySQLIntroPage; - ::dbaccess::ODsnTypeCollection* - m_pCollection; /// the DSN type collection instance + OMySQLIntroPageSetup* m_pMySQLIntroPage; + ::dbaccess::ODsnTypeCollection* + m_pCollection; /// the DSN type collection instance @@ -113,7 +113,7 @@ public: // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual void setTitle(const ::rtl::OUString& _sTitle); @@ -131,15 +131,15 @@ public: protected: /// to override to create new pages - virtual TabPage* createPage(WizardState _nState); - virtual sal_Bool leaveState(WizardState _nState); + virtual TabPage* createPage(WizardState _nState); + virtual sal_Bool leaveState(WizardState _nState); virtual void enterState(WizardState _nState); virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const; virtual sal_Bool onFinish(); protected: - inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } - inline void disabledUI() { m_bUIEnabled = sal_False; } + inline sal_Bool isUIEnabled() const { return m_bUIEnabled; } + inline void disabledUI() { m_bUIEnabled = sal_False; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. void implSelectDatasource(const ::rtl::OUString& _rRegisteredName); @@ -147,9 +147,9 @@ protected: enum ApplyResult { - AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed - AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed + AR_LEAVE_UNCHANGED, // no changes were made + AR_KEEP // don't leave the page (e.g. because an error occured) }; private: @@ -189,7 +189,7 @@ private: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBWIZ2_HXX diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index c84b1dcdfd69..4914cc7a23f8 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index dcb9ec5f96c1..fa4463374f01 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,26 +56,26 @@ namespace dbaui { protected: OModuleClient m_aModuleClient; - ::osl::Mutex m_aMutex; - - FixedLine m_aFrame; - FixedText m_aSQLLabel; - MultiLineEditSyntaxHighlight m_aSQL; - PushButton m_aExecute; - FixedText m_aHistoryLabel; - ListBox* m_pSQLHistory; - FixedLine m_aStatusFrame; - MultiLineEdit m_aStatus; - FixedLine m_aButtonSeparator; - HelpButton m_aHelp; - PushButton m_aClose; - - typedef ::std::deque< String > StringQueue; - StringQueue m_aStatementHistory; // previous statements - StringQueue m_aNormalizedHistory; // previous statements, normalized to be used in the list box - - sal_Int32 m_nHistoryLimit; - sal_Int32 m_nStatusCount; + ::osl::Mutex m_aMutex; + + FixedLine m_aFrame; + FixedText m_aSQLLabel; + MultiLineEditSyntaxHighlight m_aSQL; + PushButton m_aExecute; + FixedText m_aHistoryLabel; + ListBox* m_pSQLHistory; + FixedLine m_aStatusFrame; + MultiLineEdit m_aStatus; + FixedLine m_aButtonSeparator; + HelpButton m_aHelp; + PushButton m_aClose; + + typedef ::std::deque< String > StringQueue; + StringQueue m_aStatementHistory; // previous statements + StringQueue m_aNormalizedHistory; // previous statements, normalized to be used in the list box + + sal_Int32 m_nHistoryLimit; + sal_Int32 m_nStatusCount; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; @@ -122,18 +122,18 @@ namespace dbaui //==================================================================== #ifdef DBG_UTIL -#define CHECK_INVARIANTS(methodname) \ - { \ - const sal_Char* pError = impl_CheckInvariants(); \ - if (pError) \ - OSL_ENSURE(sal_False, (ByteString(methodname) += ByteString(": ") += ByteString(pError)).GetBuffer()); \ +#define CHECK_INVARIANTS(methodname) \ + { \ + const sal_Char* pError = impl_CheckInvariants(); \ + if (pError) \ + OSL_ENSURE(sal_False, (ByteString(methodname) += ByteString(": ") += ByteString(pError)).GetBuffer()); \ } #else #define CHECK_INVARIANTS(methodname) #endif //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // _DBACCESS_UI_DIRECTSQL_HXX_ diff --git a/dbaccess/source/ui/inc/dlgattr.hrc b/dbaccess/source/ui/inc/dlgattr.hrc index c26d7ae92280..f2649fc3e782 100644 --- a/dbaccess/source/ui/inc/dlgattr.hrc +++ b/dbaccess/source/ui/inc/dlgattr.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,10 +28,10 @@ #ifndef DBAUI_SBATTRDLG_HRC #define DBAUI_SBATTRDLG_HRC -#define TP_ATTR_CHAR 1 -#define TP_ATTR_NUMBER 2 -#define TP_ATTR_ALIGN 4 -#define ST_ROW 5 +#define TP_ATTR_CHAR 1 +#define TP_ATTR_NUMBER 2 +#define TP_ATTR_ALIGN 4 +#define ST_ROW 5 #endif//DBAUI_SBATTRDLG_HRC diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index a1a3c82ec76a..1191360415db 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace dbaui virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif//DBAUI_SBATTRDLG_HXX diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 315aad0e7aa5..2a9f49f32d6b 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/msgbox.hxx> -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace container { class XNameAccess; class XHierarchicalNameAccess; @@ -46,12 +46,12 @@ namespace com { namespace sun { namespace star { }}} -#define SAD_DEFAULT 0x0000 -#define SAD_ADDITIONAL_DESCRIPTION 0x0001 +#define SAD_DEFAULT 0x0000 +#define SAD_ADDITIONAL_DESCRIPTION 0x0001 -#define SAD_TITLE_STORE_AS 0x0000 -#define SAD_TITLE_PASTE_AS 0x0100 -#define SAD_TITLE_RENAME 0x0200 +#define SAD_TITLE_STORE_AS 0x0000 +#define SAD_TITLE_PASTE_AS 0x0100 +#define SAD_TITLE_RENAME 0x0200 class Button; class Edit; @@ -65,14 +65,14 @@ namespace dbaui OSaveAsDlgImpl* m_pImpl; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; public: - OSaveAsDlg( Window * pParent,const sal_Int32& _rType, + OSaveAsDlg( Window * pParent,const sal_Int32& _rType, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); - OSaveAsDlg( Window* _pParent, + OSaveAsDlg( Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const String& _rDefault, const String& _sLabel, diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 3617c72e4a47..30b581b83f01 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,18 +44,18 @@ namespace dbaui class DlgSize : public ModalDialog { private: - sal_Int32 m_nPrevValue, m_nStandard; - void SetValue( sal_Int32 nVal ); + sal_Int32 m_nPrevValue, m_nStandard; + void SetValue( sal_Int32 nVal ); protected: DECL_LINK( CbClickHdl, Button * ); - FixedText aFT_VALUE; - MetricField aMF_VALUE; - CheckBox aCB_STANDARD; - OKButton aPB_OK; - CancelButton aPB_CANCEL; - HelpButton aPB_HELP; + FixedText aFT_VALUE; + MetricField aMF_VALUE; + CheckBox aCB_STANDARD; + OKButton aPB_OK; + CancelButton aPB_CANCEL; + HelpButton aPB_HELP; public: DlgSize( Window * pParent, sal_Int32 nVal, BOOL bRow, sal_Int32 _nAlternativeStandard = -1 ); @@ -64,7 +64,7 @@ namespace dbaui sal_Int32 GetValue(); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DLGSIZE_HXX diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx index 7437d8b54b6c..40595ac7119f 100644 --- a/dbaccess/source/ui/inc/dsitems.hxx +++ b/dbaccess/source/ui/inc/dsitems.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,56 +34,56 @@ typedef sal_Int32 ItemID; //======================================================================== //= item ids for the data source administration dialog -#define DSID_NAME 1 // name of a data source, SfxStringItem -#define DSID_ORIGINALNAME 2 // orginal name, internal, SfxStringItem -#define DSID_CONNECTURL 3 // connection URL, SfxStringItem -#define DSID_TABLEFILTER 4 // table filter, OStringListItem -#define DSID_TYPECOLLECTION 5 // collection of data source types, ODsnTypeCollection -#define DSID_INVALID_SELECTION 6 // is the selection (thus the set data) invalid?, SfxBoolItem -#define DSID_READONLY 7 // is the selection (thus the set data) readonly?, SfxBoolItem -#define DSID_USER 8 // the user name used for logon, SfxStringItem -#define DSID_PASSWORD 9 // the password used for logon, SfxStringItem -#define DSID_ADDITIONALOPTIONS 10 // additional options used for connecting, SfxStringItem -#define DSID_CHARSET 11 // character set to use, SfxStringItem by now -#define DSID_PASSWORDREQUIRED 12 // is the password required to connect?, SfxBoolItem -#define DSID_SHOWDELETEDROWS 13 // show deleted rows?, SfxBoolItem -#define DSID_ALLOWLONGTABLENAMES 14 // allow tables names longer than 8.3?, SfxBoolItem -#define DSID_JDBCDRIVERCLASS 15 // JDBC driver class, SfxStringItem -#define DSID_FIELDDELIMITER 16 // field delimiter, SfxUInt16Item -#define DSID_TEXTDELIMITER 17 // text delimiter, SfxUInt16Item -#define DSID_DECIMALDELIMITER 18 // decimal delimiter, SfxUInt16Item -#define DSID_THOUSANDSDELIMITER 19 // thousands delimiter, SfxUInt16Item -#define DSID_TEXTFILEEXTENSION 20 // extension for text files, SfxStringItem -#define DSID_TEXTFILEHEADER 21 // the text file contains a header?, SfxBoolItem -#define DSID_PARAMETERNAMESUBST 22 -#define DSID_CONN_PORTNUMBER 23 -#define DSID_SUPPRESSVERSIONCL 24 // meta data: sal_True if the data source described by the set is to-be-deleted -#define DSID_DATASOURCE_UNO 25 // meta data: OPropertySetItem, the data source the set represents -#define DSID_CONN_SHUTSERVICE 26 -#define DSID_CONN_DATAINC 27 -#define DSID_CONN_CACHESIZE 28 -#define DSID_CONN_CTRLUSER 29 -#define DSID_CONN_CTRLPWD 30 -#define DSID_USECATALOG 31 // should the driver use the catalog name when the database is filebased -#define DSID_CONN_HOSTNAME 32 -#define DSID_CONN_LDAP_BASEDN 33 -#define DSID_CONN_LDAP_PORTNUMBER 34 -#define DSID_CONN_LDAP_ROWCOUNT 35 -#define DSID_SQL92CHECK 36 -#define DSID_AUTOINCREMENTVALUE 37 -#define DSID_AUTORETRIEVEVALUE 38 -#define DSID_AUTORETRIEVEENABLED 39 -#define DSID_APPEND_TABLE_ALIAS 40 -#define DSID_MYSQL_PORTNUMBER 41 -#define DSID_IGNOREDRIVER_PRIV 42 -#define DSID_BOOLEANCOMPARISON 43 -#define DSID_ORACLE_PORTNUMBER 44 -#define DSID_ENABLEOUTERJOIN 45 -#define DSID_CATALOG 46 -#define DSID_SCHEMA 47 -#define DSID_INDEXAPPENDIX 48 -#define DSID_CONN_LDAP_USESSL 49 -#define DSID_DOCUMENT_URL 50 +#define DSID_NAME 1 // name of a data source, SfxStringItem +#define DSID_ORIGINALNAME 2 // orginal name, internal, SfxStringItem +#define DSID_CONNECTURL 3 // connection URL, SfxStringItem +#define DSID_TABLEFILTER 4 // table filter, OStringListItem +#define DSID_TYPECOLLECTION 5 // collection of data source types, ODsnTypeCollection +#define DSID_INVALID_SELECTION 6 // is the selection (thus the set data) invalid?, SfxBoolItem +#define DSID_READONLY 7 // is the selection (thus the set data) readonly?, SfxBoolItem +#define DSID_USER 8 // the user name used for logon, SfxStringItem +#define DSID_PASSWORD 9 // the password used for logon, SfxStringItem +#define DSID_ADDITIONALOPTIONS 10 // additional options used for connecting, SfxStringItem +#define DSID_CHARSET 11 // character set to use, SfxStringItem by now +#define DSID_PASSWORDREQUIRED 12 // is the password required to connect?, SfxBoolItem +#define DSID_SHOWDELETEDROWS 13 // show deleted rows?, SfxBoolItem +#define DSID_ALLOWLONGTABLENAMES 14 // allow tables names longer than 8.3?, SfxBoolItem +#define DSID_JDBCDRIVERCLASS 15 // JDBC driver class, SfxStringItem +#define DSID_FIELDDELIMITER 16 // field delimiter, SfxUInt16Item +#define DSID_TEXTDELIMITER 17 // text delimiter, SfxUInt16Item +#define DSID_DECIMALDELIMITER 18 // decimal delimiter, SfxUInt16Item +#define DSID_THOUSANDSDELIMITER 19 // thousands delimiter, SfxUInt16Item +#define DSID_TEXTFILEEXTENSION 20 // extension for text files, SfxStringItem +#define DSID_TEXTFILEHEADER 21 // the text file contains a header?, SfxBoolItem +#define DSID_PARAMETERNAMESUBST 22 +#define DSID_CONN_PORTNUMBER 23 +#define DSID_SUPPRESSVERSIONCL 24 // meta data: sal_True if the data source described by the set is to-be-deleted +#define DSID_DATASOURCE_UNO 25 // meta data: OPropertySetItem, the data source the set represents +#define DSID_CONN_SHUTSERVICE 26 +#define DSID_CONN_DATAINC 27 +#define DSID_CONN_CACHESIZE 28 +#define DSID_CONN_CTRLUSER 29 +#define DSID_CONN_CTRLPWD 30 +#define DSID_USECATALOG 31 // should the driver use the catalog name when the database is filebased +#define DSID_CONN_HOSTNAME 32 +#define DSID_CONN_LDAP_BASEDN 33 +#define DSID_CONN_LDAP_PORTNUMBER 34 +#define DSID_CONN_LDAP_ROWCOUNT 35 +#define DSID_SQL92CHECK 36 +#define DSID_AUTOINCREMENTVALUE 37 +#define DSID_AUTORETRIEVEVALUE 38 +#define DSID_AUTORETRIEVEENABLED 39 +#define DSID_APPEND_TABLE_ALIAS 40 +#define DSID_MYSQL_PORTNUMBER 41 +#define DSID_IGNOREDRIVER_PRIV 42 +#define DSID_BOOLEANCOMPARISON 43 +#define DSID_ORACLE_PORTNUMBER 44 +#define DSID_ENABLEOUTERJOIN 45 +#define DSID_CATALOG 46 +#define DSID_SCHEMA 47 +#define DSID_INDEXAPPENDIX 48 +#define DSID_CONN_LDAP_USESSL 49 +#define DSID_DOCUMENT_URL 50 #define DSID_DOSLINEENDS 51 #define DSID_DATABASENAME 52 #define DSID_AS_BEFORE_CORRNAME 53 @@ -99,8 +99,8 @@ typedef sal_Int32 ItemID; //======================================================================== //= item range. Adjust this if you introduce new items above -#define DSID_FIRST_ITEM_ID DSID_NAME -#define DSID_LAST_ITEM_ID DSID_PRIMARY_KEY_SUPPORT +#define DSID_FIRST_ITEM_ID DSID_NAME +#define DSID_LAST_ITEM_ID DSID_PRIMARY_KEY_SUPPORT #endif // _DBAUI_DATASOURCEITEMS_HXX_ diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index a7a0d5c6c80b..f354126b8256 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index 2fbd64bc99d5..531e7e382db3 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,10 +45,10 @@ namespace dbaui :public SbaXDataBrowserController ,public ::com::sun::star::util::XModifyBroadcaster { - ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::cppu::OInterfaceContainerHelper m_aModifyListeners; // for multiplexing the modify events - SbaXFormAdapter* m_pDataSourceImpl; - sal_Bool m_bInQueryDispatch; + SbaXFormAdapter* m_pDataSourceImpl; + sal_Bool m_bInQueryDispatch; // our queryDispatch will ask our frame, which first will ask our queryDispatch, so we need to protect against // recursion @@ -62,10 +62,10 @@ namespace dbaui // UNO DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, OGenericUnoController); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); - // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void); - // static ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getStaticIdlClass(); + // static ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getStaticIdlClass(); // ::com::sun::star::frame::XDispatch virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index f85cc2bd62e9..0d4d2f7d4d75 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,55 +75,55 @@ namespace dbaui // SbaXFormAdapter //================================================================== - typedef ::cppu::WeakImplHelper12< ::com::sun::star::sdbc::XResultSetMetaDataSupplier - , ::com::sun::star::sdb::XResultSetAccess - , ::com::sun::star::sdbc::XResultSetUpdate - , ::com::sun::star::sdbc::XRowSet - , ::com::sun::star::sdb::XRowSetApproveBroadcaster - , ::com::sun::star::sdbcx::XRowLocate - , ::com::sun::star::sdbc::XRowUpdate - , ::com::sun::star::sdbc::XRow - , ::com::sun::star::sdbcx::XColumnsSupplier - , ::com::sun::star::sdbc::XColumnLocate + typedef ::cppu::WeakImplHelper12< ::com::sun::star::sdbc::XResultSetMetaDataSupplier + , ::com::sun::star::sdb::XResultSetAccess + , ::com::sun::star::sdbc::XResultSetUpdate + , ::com::sun::star::sdbc::XRowSet + , ::com::sun::star::sdb::XRowSetApproveBroadcaster + , ::com::sun::star::sdbcx::XRowLocate + , ::com::sun::star::sdbc::XRowUpdate + , ::com::sun::star::sdbc::XRow + , ::com::sun::star::sdbcx::XColumnsSupplier + , ::com::sun::star::sdbc::XColumnLocate // --- stardiv::one::form::component::DatabaseForm --- - , ::com::sun::star::sdbc::XParameters - , ::com::sun::star::sdbcx::XDeleteRows - > SbaXFormAdapter_BASE1; - typedef ::cppu::ImplHelper12 < ::com::sun::star::sdbc::XWarningsSupplier - , ::com::sun::star::sdbc::XCloseable - , ::com::sun::star::form::XLoadable - , ::com::sun::star::sdb::XSQLErrorBroadcaster - , ::com::sun::star::form::XDatabaseParameterBroadcaster - // --- stardiv::one::form::component::Form --- - , ::com::sun::star::form::XForm - , ::com::sun::star::form::XSubmit - , ::com::sun::star::awt::XTabControllerModel + , ::com::sun::star::sdbc::XParameters + , ::com::sun::star::sdbcx::XDeleteRows + > SbaXFormAdapter_BASE1; + typedef ::cppu::ImplHelper12 < ::com::sun::star::sdbc::XWarningsSupplier + , ::com::sun::star::sdbc::XCloseable + , ::com::sun::star::form::XLoadable + , ::com::sun::star::sdb::XSQLErrorBroadcaster + , ::com::sun::star::form::XDatabaseParameterBroadcaster + // --- stardiv::one::form::component::Form --- + , ::com::sun::star::form::XForm + , ::com::sun::star::form::XSubmit + , ::com::sun::star::awt::XTabControllerModel // --- stardiv::one::form::FormComponent --- - , ::com::sun::star::lang::XComponent - , ::com::sun::star::beans::XFastPropertySet + , ::com::sun::star::lang::XComponent + , ::com::sun::star::beans::XFastPropertySet // already present : ::com::sun::star::form::XFormComponent (base of ::com::sun::star::form::XForm) - , ::com::sun::star::beans::XMultiPropertySet - , ::com::sun::star::container::XNamed - > SbaXFormAdapter_BASE2; - typedef ::cppu::ImplHelper10 < ::com::sun::star::io::XPersistObject - , ::com::sun::star::beans::XPropertySet + , ::com::sun::star::beans::XMultiPropertySet + , ::com::sun::star::container::XNamed + > SbaXFormAdapter_BASE2; + typedef ::cppu::ImplHelper10 < ::com::sun::star::io::XPersistObject + , ::com::sun::star::beans::XPropertySet // --- stardiv::one::data::DatabaseCursor --- - , ::com::sun::star::util::XCancellable + , ::com::sun::star::util::XCancellable // already present : ::com::sun::star::beans::XPropertySet // --- stardiv::one::data::DatabaseComponent --- // already present : ::com::sun::star::lang::XComponent // already present : ::com::sun::star::container::XChild (base of ::com::sun::star::form::XForm) // interfaces I don't know the service which they belong to ;) // (they are supported by FmXDatabaseForm, se we support it, too) - , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::form::XReset - , ::com::sun::star::container::XNameContainer - , ::com::sun::star::container::XIndexContainer - , ::com::sun::star::container::XContainer - , ::com::sun::star::container::XEnumerationAccess + , ::com::sun::star::beans::XPropertyState + , ::com::sun::star::form::XReset + , ::com::sun::star::container::XNameContainer + , ::com::sun::star::container::XIndexContainer + , ::com::sun::star::container::XContainer + , ::com::sun::star::container::XEnumerationAccess // interfaces we need because of other reasons - , ::com::sun::star::beans::XPropertyChangeListener - > SbaXFormAdapter_BASE3; + , ::com::sun::star::beans::XPropertyChangeListener + > SbaXFormAdapter_BASE3; class SbaXFormAdapter :public SbaXFormAdapter_BASE1 @@ -132,32 +132,32 @@ namespace dbaui { private: OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xMainForm; - ::osl::Mutex m_aMutex; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xMainForm; + ::osl::Mutex m_aMutex; - SbaXLoadMultiplexer m_aLoadListeners; - SbaXRowSetMultiplexer m_aRowSetListeners; - SbaXRowSetApproveMultiplexer m_aRowSetApproveListeners; - SbaXSQLErrorMultiplexer m_aErrorListeners; - SbaXParameterMultiplexer m_aParameterListeners; - SbaXSubmitMultiplexer m_aSubmitListeners; - SbaXResetMultiplexer m_aResetListeners; + SbaXLoadMultiplexer m_aLoadListeners; + SbaXRowSetMultiplexer m_aRowSetListeners; + SbaXRowSetApproveMultiplexer m_aRowSetApproveListeners; + SbaXSQLErrorMultiplexer m_aErrorListeners; + SbaXParameterMultiplexer m_aParameterListeners; + SbaXSubmitMultiplexer m_aSubmitListeners; + SbaXResetMultiplexer m_aResetListeners; - SbaXPropertyChangeMultiplexer m_aPropertyChangeListeners; - SbaXVetoableChangeMultiplexer m_aVetoablePropertyChangeListeners; - SbaXPropertiesChangeMultiplexer m_aPropertiesChangeListeners; + SbaXPropertyChangeMultiplexer m_aPropertyChangeListeners; + SbaXVetoableChangeMultiplexer m_aVetoablePropertyChangeListeners; + SbaXPropertiesChangeMultiplexer m_aPropertiesChangeListeners; - ::cppu::OInterfaceContainerHelper m_aDisposeListeners; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::cppu::OInterfaceContainerHelper m_aDisposeListeners; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; // hierarchy administration - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > > m_aChildren; - ::std::vector< ::rtl::OUString > m_aChildNames; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > > m_aChildren; + ::std::vector< ::rtl::OUString > m_aChildNames; // properties - ::rtl::OUString m_sName; - sal_Int32 m_nNamePropHandle; + ::rtl::OUString m_sName; + sal_Int32 m_nNamePropHandle; public: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getAttachedForm() const { return m_xMainForm; } @@ -166,14 +166,14 @@ namespace dbaui SbaXFormAdapter(); ~SbaXFormAdapter(); - // ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getIdlClass(); - // ::com::sun::star::uno::Sequence<::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(); + // ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getIdlClass(); + // ::com::sun::star::uno::Sequence<::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(); void AttachForm(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xNewMaster); // UNO DECLARE_UNO3_DEFAULTS(SbaXFormAdapter, SbaXFormAdapter_BASE1); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -260,7 +260,7 @@ namespace dbaui virtual sal_Bool SAL_CALL rowDeleted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // ::com::sun::star::sdbc::XResultSetUpdate + // ::com::sun::star::sdbc::XResultSetUpdate virtual void SAL_CALL insertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL deleteRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -326,7 +326,7 @@ namespace dbaui // ::com::sun::star::form::XDatabaseParameterBroadcaster virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); @@ -382,7 +382,7 @@ namespace dbaui virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XCancellable - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index fd1c479917f1..1ad4678d5559 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index 7e01de118b72..a7a7daaf8b26 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,13 +49,13 @@ namespace dbaui m_xIndexes; // cached information - Indexes m_aIndexes; + Indexes m_aIndexes; public: // construction OIndexCollection(); OIndexCollection(const OIndexCollection& _rSource); - // OIndexCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); + // OIndexCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); const OIndexCollection& operator=(const OIndexCollection& _rSource); @@ -94,14 +94,14 @@ namespace dbaui void detach(); // is the object valid? - sal_Bool isValid() const { return m_xIndexes.is(); } + sal_Bool isValid() const { return m_xIndexes.is(); } // number of contained indexes - sal_Int32 size() const { return m_aIndexes.size(); } + sal_Int32 size() const { return m_aIndexes.size(); } /// drop an index, and remove it from the collection - sal_Bool drop(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); + sal_Bool drop(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); /// simply drop the index described by the name, but don't remove the descriptor from the collection - sal_Bool dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); + sal_Bool dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); protected: void implConstructFrom(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); @@ -111,7 +111,7 @@ namespace dbaui //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_INDEXCOLLECTION_HXX_ diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index f7d4c41a45fb..965407e4ed14 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ namespace dbaui { protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - Link m_aSelectHdl; - Link m_aEndEditHdl; - sal_Bool m_bSuspendSelectHdl; + Link m_aSelectHdl; + Link m_aEndEditHdl; + sal_Bool m_bSuspendSelectHdl; public: DbaIndexList(Window* _pParent, const ResId& _rId); @@ -92,27 +92,27 @@ namespace dbaui //================================================================== class IndexFieldsControl; class OIndexCollection; - class DbaIndexDialog : public ModalDialog, + class DbaIndexDialog : public ModalDialog, public OToolBoxHelper { protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - SvtViewOptions m_aGeometrySettings; - - ToolBox m_aActions; - DbaIndexList m_aIndexes; - FixedLine m_aIndexDetails; - FixedText m_aDescriptionLabel; - FixedText m_aDescription; - CheckBox m_aUnique; - FixedText m_aFieldsLabel; - IndexFieldsControl* m_pFields; - PushButton m_aClose; - HelpButton m_aHelp; - - OIndexCollection* m_pIndexes; - SvLBoxEntry* m_pPreviousSelection; - sal_Bool m_bEditAgain; + SvtViewOptions m_aGeometrySettings; + + ToolBox m_aActions; + DbaIndexList m_aIndexes; + FixedLine m_aIndexDetails; + FixedText m_aDescriptionLabel; + FixedText m_aDescription; + CheckBox m_aUnique; + FixedText m_aFieldsLabel; + IndexFieldsControl* m_pFields; + PushButton m_aClose; + HelpButton m_aHelp; + + OIndexCollection* m_pIndexes; + SvLBoxEntry* m_pPreviousSelection; + sal_Bool m_bEditAgain; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; @@ -131,9 +131,9 @@ namespace dbaui virtual void DataChanged( const DataChangedEvent& rDCEvt ); /** will be called whenthe id of the image list is needed. - @param _eBitmapSet + @param _eBitmapSet <svtools/imgdef.hxx> - @param _bHiContast + @param _bHiContast <TRUE/> when in high contrast mode. */ virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const; @@ -177,7 +177,7 @@ namespace dbaui }; //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_INDEXDIALOG_HXX_ diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index 18e8f4ff0b5c..5457ec8bd17e 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace dbaui //================================================================== struct OIndexField { - String sFieldName; - sal_Bool bSortAscending; + String sFieldName; + sal_Bool bSortAscending; OIndexField() : bSortAscending(sal_True) { } }; @@ -63,15 +63,15 @@ namespace dbaui struct OIndex { protected: - ::rtl::OUString sOriginalName; - sal_Bool bModified; + ::rtl::OUString sOriginalName; + sal_Bool bModified; public: - ::rtl::OUString sName; - ::rtl::OUString sDescription; - sal_Bool bPrimaryKey; - sal_Bool bUnique; - IndexFields aFields; + ::rtl::OUString sName; + ::rtl::OUString sDescription; + sal_Bool bPrimaryKey; + sal_Bool bUnique; + IndexFields aFields; public: OIndex(const ::rtl::OUString& _rOriginalName) @@ -81,23 +81,23 @@ namespace dbaui const ::rtl::OUString& getOriginalName() const { return sOriginalName; } - sal_Bool isModified() const { return bModified; } - void setModified(sal_Bool _bModified) { bModified = _bModified; } - void clearModified() { setModified(sal_False); } - - sal_Bool isNew() const { return 0 == getOriginalName().getLength(); } - void flagAsNew(const GrantIndexAccess&) { sOriginalName = ::rtl::OUString(); } - void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; } + sal_Bool isModified() const { return bModified; } + void setModified(sal_Bool _bModified) { bModified = _bModified; } + void clearModified() { setModified(sal_False); } + sal_Bool isNew() const { return 0 == getOriginalName().getLength(); } + void flagAsNew(const GrantIndexAccess&) { sOriginalName = ::rtl::OUString(); } + void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; } + private: - OIndex(); // not implemented + OIndex(); // not implemented }; DECLARE_STL_VECTOR( OIndex, Indexes ); //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_INDEXES_HXX_ diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index d3802b03746d..4b622baa92f5 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,20 +46,20 @@ namespace dbaui { OModuleClient m_aModuleClient; protected: - IndexFields m_aSavedValue; - - IndexFields m_aFields; // !! order matters !! - ConstIndexFieldsIterator m_aSeekRow; // !! + IndexFields m_aSavedValue; - Link m_aModifyHdl; + IndexFields m_aFields; // !! order matters !! + ConstIndexFieldsIterator m_aSeekRow; // !! - ::svt::ListBoxControl* m_pSortingCell; - ::svt::ListBoxControl* m_pFieldNameCell; + Link m_aModifyHdl; - String m_sAscendingText; - String m_sDescendingText; + ::svt::ListBoxControl* m_pSortingCell; + ::svt::ListBoxControl* m_pFieldNameCell; - sal_Int32 m_nMaxColumnsInIndex; + String m_sAscendingText; + String m_sDescendingText; + + sal_Int32 m_nMaxColumnsInIndex; sal_Bool m_bAddIndexAppendix; public: @@ -74,8 +74,8 @@ namespace dbaui sal_Bool SaveModified(); sal_Bool IsModified() const; - const IndexFields& GetSavedValue() const { return m_aSavedValue; } - void SaveValue() { m_aSavedValue = m_aFields; } + const IndexFields& GetSavedValue() const { return m_aSavedValue; } + void SaveValue() { m_aSavedValue = m_aFields; } void SetModifyHdl(const Link& _rHdl) { m_aModifyHdl = _rHdl; } Link GetModifyHdl() const { return m_aModifyHdl; } @@ -88,8 +88,8 @@ namespace dbaui virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; - ::svt::CellController* GetController(long _nRow, sal_uInt16 _nColumnId); - void InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId); + ::svt::CellController* GetController(long _nRow, sal_uInt16 _nColumnId); + void InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId); protected: String GetRowCellText(const ConstIndexFieldsIterator& _rRow,sal_uInt16 nColId) const; @@ -104,7 +104,7 @@ namespace dbaui }; //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_INDEXFIELDSCONTROL_HXX_ diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index 84609bb1e5d2..7439bb7a56b9 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,11 @@ namespace dbaui m_xDocumentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > m_xDocumentUI; - Window* m_pDialogParent; - String m_sCurrentlyEditing; - ::rtl::OUString + Window* m_pDialogParent; + String m_sCurrentlyEditing; + ::rtl::OUString m_sDataSourceName; public: @@ -133,7 +133,7 @@ namespace dbaui }; //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... #endif // _DBAUI_LINKEDDOCUMENTS_HXX_ diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index 6d5394667111..05d5492f9f77 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,14 +36,14 @@ namespace dbaui { //........................................................................ - #define SV_ITEM_ID_BOLDLBSTRING SV_ITEM_ID_LBOXSTRING + #define SV_ITEM_ID_BOLDLBSTRING SV_ITEM_ID_LBOXSTRING //==================================================================== //= OBoldListboxString //==================================================================== class OBoldListboxString : public SvLBoxString { - sal_Bool m_bEmphasized; + sal_Bool m_bEmphasized; public: OBoldListboxString(SvLBoxEntry* _pEntry, sal_uInt16 _nFlags, const XubString& _rStr) @@ -57,12 +57,12 @@ namespace dbaui virtual void Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); virtual void InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData); - sal_Bool isEmphasized() const { return m_bEmphasized; } - void emphasize(sal_Bool _bEmphasize) { m_bEmphasized = _bEmphasize; } + sal_Bool isEmphasized() const { return m_bEmphasized; } + void emphasize(sal_Bool _bEmphasize) { m_bEmphasized = _bEmphasize; } }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // _DBAUI_LISTVIEWITEMS_HXX_ diff --git a/dbaccess/source/ui/inc/localresaccess.hxx b/dbaccess/source/ui/inc/localresaccess.hxx index 9760ac354aac..f288666dc303 100644 --- a/dbaccess/source/ui/inc/localresaccess.hxx +++ b/dbaccess/source/ui/inc/localresaccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_LOCALRESACCESS_HXX_ diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index cc5f10791b2f..018e1c5bab45 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,8 +47,8 @@ namespace dbaui */ class OMarkableTreeListBox : public DBTreeListBox { - SvLBoxButtonData* m_pCheckButton; - Link m_aCheckButtonHandler; + SvLBoxButtonData* m_pCheckButton; + Link m_aCheckButtonHandler; public: OMarkableTreeListBox( Window* pParent @@ -60,8 +60,8 @@ public: ~OMarkableTreeListBox(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void CheckButtonHdl(); - void CheckButtons(); // make the button states consistent (bottom-up) + virtual void CheckButtonHdl(); + void CheckButtons(); // make the button states consistent (bottom-up) /// the handler given is called whenever the check state of one or more items changed void SetCheckHandler(const Link& _rHdl) { m_aCheckButtonHandler = _rHdl; } @@ -70,7 +70,7 @@ protected: virtual void Paint(const Rectangle& _rRect); virtual void checkedButton_noBroadcast(SvLBoxEntry* _pEntry); - SvButtonState implDetermineState(SvLBoxEntry* _pEntry); + SvButtonState implDetermineState(SvLBoxEntry* _pEntry); // determines the check state of the given entry, by analyzing the states of all descendants private: @@ -78,7 +78,7 @@ private: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_MARKTREE_HXX_ diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx index a57513f6c5e7..2b915f6fb70a 100644 --- a/dbaccess/source/ui/inc/moduledbu.hxx +++ b/dbaccess/source/ui/inc/moduledbu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,19 +53,19 @@ private: // not implemented. OModule is a static class protected: - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered + static ::osl::Mutex s_aMutex; /// access safety + static sal_Int32 s_nClients; /// number of registered clients + static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered public: /// get the vcl res manager of the module - static ResMgr* getResManager(); + static ResMgr* getResManager(); protected: /// register a client for the module - static void registerClient(); + static void registerClient(); /// revoke a client for the module - static void revokeClient(); + static void revokeClient(); private: /** ensure that the impl class exists @@ -77,13 +77,13 @@ private: //========================================================================= //= OModuleClient //========================================================================= -/** base class for objects which uses any global module-specific ressources +/** base class for objects which uses any global module-specific ressources */ class OModuleClient { public: - OModuleClient() { OModule::registerClient(); } - ~OModuleClient() { OModule::revokeClient(); } + OModuleClient() { OModule::registerClient(); } + ~OModuleClient() { OModule::revokeClient(); } }; //========================================================================= @@ -98,7 +98,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_MODULE_DBU_HXX_ diff --git a/dbaccess/source/ui/inc/objectnamecheck.hxx b/dbaccess/source/ui/inc/objectnamecheck.hxx index 144877d56d62..55c490a465cd 100644 --- a/dbaccess/source/ui/inc/objectnamecheck.hxx +++ b/dbaccess/source/ui/inc/objectnamecheck.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace dbaui @param _out_rErrorToDisplay output parameter taking an error message describing why the name is not valid, if applicable. - + @return <TRUE/> if and only if the given name is valid. */ diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 3e0e53e2d653..72900b49cfb8 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 73d9107b6176..fb9b9df2d5e6 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,15 +65,15 @@ namespace dbaui { protected: // the controls - FixedLine m_aNamesFrame; - ListBox m_aAllParams; - FixedText m_aValueFrame; - Edit m_aParam; - PushButton m_aTravelNext; - OKButton m_aOKBtn; - CancelButton m_aCancelBtn; + FixedLine m_aNamesFrame; + ListBox m_aAllParams; + FixedText m_aValueFrame; + Edit m_aParam; + PushButton m_aTravelNext; + OKButton m_aOKBtn; + CancelButton m_aCancelBtn; - sal_uInt16 m_nCurrentlySelected; + sal_uInt16 m_nCurrentlySelected; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xParams; @@ -85,13 +85,13 @@ namespace dbaui m_aPredicateInput; ByteVector m_aVisitedParams; - Timer m_aResetVisitFlag; + Timer m_aResetVisitFlag; // we reset the "visited flag" 1 second after and entry has been selected - sal_Bool m_bNeedErrorOnCurrent; + sal_Bool m_bNeedErrorOnCurrent; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - m_aFinalValues; /// the final values as entered by the user + m_aFinalValues; /// the final values as entered by the user public: OParameterDialog(Window* _pParent, @@ -118,7 +118,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_PARAMDIALOG_HXX_ diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index fa678989c06f..463d1449ae96 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace dbaui */ class OPropertySetItem : public SfxPoolItem { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSet; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSet; public: TYPEINFO(); @@ -53,15 +53,15 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet); OPropertySetItem(const OPropertySetItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; + virtual int operator==(const SfxPoolItem& _rItem) const; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getPropertySet() const { return m_xSet; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_PROPERTYSETITEM_HXX_ diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx index ef88f585631e..ec2d6122b180 100644 --- a/dbaccess/source/ui/inc/propertystorage.hxx +++ b/dbaccess/source/ui/inc/propertystorage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 7146b8306cfb..f439b40306bc 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ namespace dbaui //===================================================================== class OQueryContainerWindow : public ODataView { - OQueryViewSwitch* m_pViewSwitch; - OBeamer* m_pBeamer; - Splitter* m_pSplitter; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBeamer; + OQueryViewSwitch* m_pViewSwitch; + OBeamer* m_pBeamer; + Splitter* m_pSplitter; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBeamer; DECL_LINK( SplitHdl, void* ); public: @@ -69,38 +69,38 @@ namespace dbaui virtual void Construct(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); // show the beamer - void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); + void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); // called when the beamer has been disposed - void disposingPreview(); + void disposingPreview(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getPreviewFrame() const { return m_xBeamer; } - OQueryDesignView* getDesignView() { return m_pViewSwitch->getDesignView(); } + OQueryDesignView* getDesignView() { return m_pViewSwitch->getDesignView(); } - sal_Bool isCutAllowed() { return m_pViewSwitch->isCutAllowed(); } - sal_Bool isPasteAllowed() { return m_pViewSwitch->isPasteAllowed(); } - sal_Bool isCopyAllowed() { return m_pViewSwitch->isCopyAllowed(); } - void copy() { m_pViewSwitch->copy(); } - void cut() { m_pViewSwitch->cut(); } - void paste() { m_pViewSwitch->paste(); } + sal_Bool isCutAllowed() { return m_pViewSwitch->isCutAllowed(); } + sal_Bool isPasteAllowed() { return m_pViewSwitch->isPasteAllowed(); } + sal_Bool isCopyAllowed() { return m_pViewSwitch->isCopyAllowed(); } + void copy() { m_pViewSwitch->copy(); } + void cut() { m_pViewSwitch->cut(); } + void paste() { m_pViewSwitch->paste(); } - void clear() { m_pViewSwitch->clear(); } - sal_Bool isSlotEnabled( sal_Int32 _nSlotId ) { return m_pViewSwitch->isSlotEnabled( _nSlotId ); } - void setSlotEnabled( sal_Int32 _nSlotId, sal_Bool _bEnable ) { m_pViewSwitch->setSlotEnabled( _nSlotId, _bEnable ); } - void setNoneVisbleRow(sal_Int32 _nRows) { m_pViewSwitch->setNoneVisbleRow( _nRows); } + void clear() { m_pViewSwitch->clear(); } + sal_Bool isSlotEnabled( sal_Int32 _nSlotId ) { return m_pViewSwitch->isSlotEnabled( _nSlotId ); } + void setSlotEnabled( sal_Int32 _nSlotId, sal_Bool _bEnable ) { m_pViewSwitch->setSlotEnabled( _nSlotId, _bEnable ); } + void setNoneVisbleRow(sal_Int32 _nRows) { m_pViewSwitch->setNoneVisbleRow( _nRows); } - void setReadOnly( sal_Bool _bReadOnly ) { m_pViewSwitch->setReadOnly( _bReadOnly ); } + void setReadOnly( sal_Bool _bReadOnly ) { m_pViewSwitch->setReadOnly( _bReadOnly ); } - sal_Bool checkStatement() { return m_pViewSwitch->checkStatement( ); } - ::rtl::OUString getStatement() { return m_pViewSwitch->getStatement( ); } - void setStatement( const ::rtl::OUString& _rsStatement ) { m_pViewSwitch->setStatement( _rsStatement ); } + sal_Bool checkStatement() { return m_pViewSwitch->checkStatement( ); } + ::rtl::OUString getStatement() { return m_pViewSwitch->getStatement( ); } + void setStatement( const ::rtl::OUString& _rsStatement ) { m_pViewSwitch->setStatement( _rsStatement ); } - void initialize() { m_pViewSwitch->initialize(); } - void SaveUIConfig() { m_pViewSwitch->SaveUIConfig(); } + void initialize() { m_pViewSwitch->initialize(); } + void SaveUIConfig() { m_pViewSwitch->SaveUIConfig(); } bool reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) { return m_pViewSwitch->reset( _pErrorInfo ); } bool switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo ); @@ -118,7 +118,7 @@ namespace dbaui // end of temp classes //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_QUERYCONTAINERWINDOW_HXX diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 0f2813cd0b05..522dd44cfdbd 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,35 +77,35 @@ namespace dbaui ,public OQueryController_PBase ,public OQueryController_PABase { - OTableFields m_vTableFieldDesc; - OTableFields m_vUnUsedFieldsDesc; // contains fields which aren't visible and don't have any criteria + OTableFields m_vTableFieldDesc; + OTableFields m_vUnUsedFieldsDesc; // contains fields which aren't visible and don't have any criteria ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aFieldInformation; - ::svxform::OSystemParseContext* m_pParseContext; + ::svxform::OSystemParseContext* m_pParseContext; ::connectivity::OSQLParser m_aSqlParser; ::connectivity::OSQLParseTreeIterator* m_pSqlIterator; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer > m_xComposer; + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer > m_xComposer; /// if we're editing an existing view, this is non-NULL ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAlterView > m_xAlterView; - ::rtl::OUString m_sStatement; // contains the current sql statement - ::rtl::OUString m_sUpdateCatalogName; // catalog for update data - ::rtl::OUString m_sUpdateSchemaName; // schema for update data - ::rtl::OUString m_sUpdateTableName; // table for update data - mutable ::rtl::OUString - m_sName; // name of the query + ::rtl::OUString m_sStatement; // contains the current sql statement + ::rtl::OUString m_sUpdateCatalogName; // catalog for update data + ::rtl::OUString m_sUpdateSchemaName; // schema for update data + ::rtl::OUString m_sUpdateTableName; // table for update data + mutable ::rtl::OUString + m_sName; // name of the query - sal_Int32 m_nVisibleRows; // which rows the selection browse should show - sal_Int32 m_nSplitPos; // the position of the splitter + sal_Int32 m_nVisibleRows; // which rows the selection browse should show + sal_Int32 m_nSplitPos; // the position of the splitter sal_Int32 m_nCommandType; // the type of the object we're designing - sal_Bool m_bGraphicalDesign; // are we in the graphical design mode (TRUE) or in the text design (FALSE)? - sal_Bool m_bDistinct; // true when you want "select distinct" otherwise false - sal_Bool m_bViewAlias; // show the alias row in the design view - sal_Bool m_bViewTable; // show the table row in the design view - sal_Bool m_bViewFunction; // show the function row in the design view - sal_Bool m_bEscapeProcessing;// is true when we shouldn't parse the statement + sal_Bool m_bGraphicalDesign; // are we in the graphical design mode (TRUE) or in the text design (FALSE)? + sal_Bool m_bDistinct; // true when you want "select distinct" otherwise false + sal_Bool m_bViewAlias; // show the alias row in the design view + sal_Bool m_bViewTable; // show the table row in the design view + sal_Bool m_bViewFunction; // show the function row in the design view + sal_Bool m_bEscapeProcessing;// is true when we shouldn't parse the statement /** returns the container of queries, views, or command definitions, depending on what object type @@ -120,7 +120,7 @@ namespace dbaui inline bool editingQuery() const { return m_nCommandType == ::com::sun::star::sdb::CommandType::QUERY; } inline bool editingCommand() const { return m_nCommandType == ::com::sun::star::sdb::CommandType::COMMAND; } - sal_Bool askForNewName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xElements, + sal_Bool askForNewName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xElements, sal_Bool _bSaveAs); // creates the querycomposer void setQueryComposer(); @@ -136,13 +136,13 @@ namespace dbaui protected: // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); - virtual void reconnect( sal_Bool _bUI ); + virtual void reconnect( sal_Bool _bUI ); virtual ::rtl::OUString getPrivateTitle( ) const; OQueryContainerWindow* getContainer() const { return static_cast< OQueryContainerWindow* >( getView() ); } @@ -151,25 +151,25 @@ namespace dbaui OQueryController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM); virtual ~OQueryController(); - OTableFields& getTableFieldDesc() { return m_vTableFieldDesc; } - OTableFields& getUnUsedFields() { return m_vUnUsedFieldsDesc; } + OTableFields& getTableFieldDesc() { return m_vTableFieldDesc; } + OTableFields& getUnUsedFields() { return m_vUnUsedFieldsDesc; } - void clearFields(); + void clearFields(); virtual void impl_onModifyChanged(); - + // should the statement be parsed by our own sql parser - sal_Bool isEsacpeProcessing() const { return m_bEscapeProcessing; } - sal_Bool isGraphicalDesign() const { return m_bGraphicalDesign; } - sal_Bool isDistinct() const { return m_bDistinct; } - - ::rtl::OUString getStatement() const { return m_sStatement; } - sal_Int32 getSplitPos() const { return m_nSplitPos;} - sal_Int32 getVisibleRows() const { return m_nVisibleRows; } - - void setDistinct(sal_Bool _bDistinct) { m_bDistinct = _bDistinct;} - void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} - void setVisibleRows(sal_Int32 _nVisibleRows) { m_nVisibleRows = _nVisibleRows;} + sal_Bool isEsacpeProcessing() const { return m_bEscapeProcessing; } + sal_Bool isGraphicalDesign() const { return m_bGraphicalDesign; } + sal_Bool isDistinct() const { return m_bDistinct; } + + ::rtl::OUString getStatement() const { return m_sStatement; } + sal_Int32 getSplitPos() const { return m_nSplitPos;} + sal_Int32 getVisibleRows() const { return m_nVisibleRows; } + + void setDistinct(sal_Bool _bDistinct) { m_bDistinct = _bDistinct;} + void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} + void setVisibleRows(sal_Int32 _nVisibleRows) { m_nVisibleRows = _nVisibleRows;} sal_Int32 getColWidth(sal_uInt16 _nColPos) const; @@ -177,7 +177,7 @@ namespace dbaui getFieldInformation() const { return m_aFieldInformation; } ::connectivity::OSQLParser& getParser() { return m_aSqlParser; } - ::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; } + ::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; } virtual sal_Bool Construct(Window* pParent); @@ -191,7 +191,7 @@ namespace dbaui virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index bfb10cae1924..0a72392ae920 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,56 +78,56 @@ namespace com //================================================================== namespace dbaui { - class DlgFilterCrit :public ModalDialog + class DlgFilterCrit :public ModalDialog ,public ::svxform::OParseContextClient { private: - ListBox aLB_WHEREFIELD1; - ListBox aLB_WHERECOMP1; - Edit aET_WHEREVALUE1; - ListBox aLB_WHERECOND2; - ListBox aLB_WHEREFIELD2; - ListBox aLB_WHERECOMP2; - Edit aET_WHEREVALUE2; - ListBox aLB_WHERECOND3; - ListBox aLB_WHEREFIELD3; - ListBox aLB_WHERECOMP3; - Edit aET_WHEREVALUE3; - FixedText aFT_WHEREFIELD; - FixedText aFT_WHERECOMP; - FixedText aFT_WHEREVALUE; - FixedText aFT_WHEREOPER; + ListBox aLB_WHEREFIELD1; + ListBox aLB_WHERECOMP1; + Edit aET_WHEREVALUE1; + ListBox aLB_WHERECOND2; + ListBox aLB_WHEREFIELD2; + ListBox aLB_WHERECOMP2; + Edit aET_WHEREVALUE2; + ListBox aLB_WHERECOND3; + ListBox aLB_WHEREFIELD3; + ListBox aLB_WHERECOMP3; + Edit aET_WHEREVALUE3; + FixedText aFT_WHEREFIELD; + FixedText aFT_WHERECOMP; + FixedText aFT_WHEREVALUE; + FixedText aFT_WHEREOPER; FixedLine aFL_FIELDS; - OKButton aBT_OK; - CancelButton aBT_CANCEL; - HelpButton aBT_HELP; - String aSTR_NOENTRY; - String aSTR_COMPARE_OPERATORS; + OKButton aBT_OK; + CancelButton aBT_CANCEL; + HelpButton aBT_HELP; + String aSTR_NOENTRY; + String aSTR_COMPARE_OPERATORS; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; - ::dbtools::OPredicateInputController m_aPredicateInput; + ::dbtools::OPredicateInputController m_aPredicateInput; - void SelectField( ListBox& rBox, const String& rField ); + void SelectField( ListBox& rBox, const String& rField ); DECL_LINK( ListSelectHdl, ListBox * ); DECL_LINK( ListSelectCompHdl, ListBox * ); - void SetLine( USHORT nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,sal_Bool _bOr ); - void EnableLines(); - sal_Int32 GetOSQLPredicateType( const String& _rSelectedPredicate ) const; - USHORT GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const; - sal_Bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const; - void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues); + void SetLine( USHORT nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,sal_Bool _bOr ); + void EnableLines(); + sal_Int32 GetOSQLPredicateType( const String& _rSelectedPredicate ) const; + USHORT GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const; + sal_Bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const; + void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getMatchingColumn( const Edit& _rValueInput ) const; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getColumn( const ::rtl::OUString& _rFieldName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const ::rtl::OUString& _rFieldName ) const; public: - DlgFilterCrit( Window * pParent, + DlgFilterCrit( Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 86dc874197d8..7c2bab9caa40 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <vcl/button.hxx> -#define DOG_ROWS 3 +#define DOG_ROWS 3 namespace rtl { @@ -79,46 +79,46 @@ namespace dbaui class DlgOrderCrit : public ModalDialog { protected: - ListBox aLB_ORDERFIELD1; - ListBox aLB_ORDERVALUE1; - ListBox aLB_ORDERFIELD2; - ListBox aLB_ORDERVALUE2; - ListBox aLB_ORDERFIELD3; - ListBox aLB_ORDERVALUE3; - FixedText aFT_ORDERFIELD; - FixedText aFT_ORDERAFTER1; - FixedText aFT_ORDERAFTER2; - FixedText aFT_ORDEROPER; - FixedText aFT_ORDERDIR; - OKButton aBT_OK; - CancelButton aBT_CANCEL; - HelpButton aBT_HELP; + ListBox aLB_ORDERFIELD1; + ListBox aLB_ORDERVALUE1; + ListBox aLB_ORDERFIELD2; + ListBox aLB_ORDERVALUE2; + ListBox aLB_ORDERFIELD3; + ListBox aLB_ORDERVALUE3; + FixedText aFT_ORDERFIELD; + FixedText aFT_ORDERAFTER1; + FixedText aFT_ORDERAFTER2; + FixedText aFT_ORDEROPER; + FixedText aFT_ORDERDIR; + OKButton aBT_OK; + CancelButton aBT_CANCEL; + HelpButton aBT_HELP; FixedLine aFL_ORDER; - String aSTR_NOENTRY; - ::rtl::OUString m_sOrgOrder; + String aSTR_NOENTRY; + ::rtl::OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ListBox* m_aColumnList[DOG_ROWS]; - ListBox* m_aValueList[DOG_ROWS]; + ListBox* m_aColumnList[DOG_ROWS]; + ListBox* m_aValueList[DOG_ROWS]; DECL_LINK( FieldListSelectHdl, ListBox * ); - void EnableLines(); + void EnableLines(); public: - DlgOrderCrit( Window * pParent, + DlgOrderCrit( Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols); ~DlgOrderCrit(); - void BuildOrderPart(); + void BuildOrderPart(); - ::rtl::OUString GetOrderList( ) const; - ::rtl::OUString GetOrignalOrder() const { return m_sOrgOrder; } + ::rtl::OUString GetOrderList( ) const; + ::rtl::OUString GetOrignalOrder() const { return m_sOrgOrder; } private: void impl_initializeOrderList_nothrow(); diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index b1ead2c6c031..d7e5f728f036 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,12 +39,12 @@ namespace dbaui OQueryView(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); virtual ~OQueryView(); - virtual sal_Bool isCutAllowed() = 0; - virtual sal_Bool isPasteAllowed() = 0; - virtual sal_Bool isCopyAllowed() = 0; - virtual void copy() = 0; - virtual void cut() = 0; - virtual void paste() = 0; + virtual sal_Bool isCutAllowed() = 0; + virtual sal_Bool isPasteAllowed() = 0; + virtual sal_Bool isCopyAllowed() = 0; + virtual void copy() = 0; + virtual void cut() = 0; + virtual void paste() = 0; // clears the whole query virtual void clear() = 0; // set the view readonly or not diff --git a/dbaccess/source/ui/inc/sbagrid.hrc b/dbaccess/source/ui/inc/sbagrid.hrc index f10de1b90b68..52b1d1a65029 100644 --- a/dbaccess/source/ui/inc/sbagrid.hrc +++ b/dbaccess/source/ui/inc/sbagrid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,77 +30,77 @@ //----------------Menueitems------------------------------------------------- // Tabelle -#define SBA_WHICHID_START 100 +#define SBA_WHICHID_START 100 // Zeilenhoehe -#define SBA_DEF_ROWHEIGHT (SBA_WHICHID_START+131) // SbaColRowSizeItem +#define SBA_DEF_ROWHEIGHT (SBA_WHICHID_START+131) // SbaColRowSizeItem -#define SBA_DEF_RANGEFONT (SBA_WHICHID_START+132) // RangeItem -#define SBA_DEF_FONT (SBA_WHICHID_START+133) // SvxFontItem -#define SBA_DEF_FONTHEIGHT (SBA_WHICHID_START+134) // SvxFontHeightItem -#define SBA_DEF_FONTCOLOR (SBA_WHICHID_START+135) // SvxColorItem -#define SBA_DEF_FONTWEIGHT (SBA_WHICHID_START+136) // SvxWeightItem +#define SBA_DEF_RANGEFONT (SBA_WHICHID_START+132) // RangeItem +#define SBA_DEF_FONT (SBA_WHICHID_START+133) // SvxFontItem +#define SBA_DEF_FONTHEIGHT (SBA_WHICHID_START+134) // SvxFontHeightItem +#define SBA_DEF_FONTCOLOR (SBA_WHICHID_START+135) // SvxColorItem +#define SBA_DEF_FONTWEIGHT (SBA_WHICHID_START+136) // SvxWeightItem #define SBA_DEF_POSTURE (SBA_WHICHID_START+137) // SvxPostureItem #define SBA_DEF_SHADOWED (SBA_WHICHID_START+138) // SvxShadowedItem #define SBA_DEF_CONTOUR (SBA_WHICHID_START+139) // SvxContourItem #define SBA_DEF_CROSSEDOUT (SBA_WHICHID_START+140) // SvxCrossedOutItem #define SBA_DEF_UNDERLINE (SBA_WHICHID_START+141) // SvxUnderlineItem -#define SBA_DEF_LANGUAGE (SBA_WHICHID_START+142) // SvxLanguageItem +#define SBA_DEF_LANGUAGE (SBA_WHICHID_START+142) // SvxLanguageItem // Spalten // Formatierung -#define SBA_DEF_RANGEFORMAT (SBA_WHICHID_START+143) // RangeItem -#define SBA_DEF_FMTVALUE (SBA_WHICHID_START+144) // SfxULONG, Format +#define SBA_DEF_RANGEFORMAT (SBA_WHICHID_START+143) // RangeItem +#define SBA_DEF_FMTVALUE (SBA_WHICHID_START+144) // SfxULONG, Format // Ausrichtung -#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) // SvxHorJustifyItem +#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) // SvxHorJustifyItem // Spaltenbreite -#define SBA_DEF_FLTCOLWIDTH (SBA_WHICHID_START + 146) // SbaColRowSizeItem +#define SBA_DEF_FLTCOLWIDTH (SBA_WHICHID_START + 146) // SbaColRowSizeItem // Feldtyp -#define SBA_DEF_FLTTYPE (SBA_WHICHID_START + 147) // DataFieldTypeItem +#define SBA_DEF_FLTTYPE (SBA_WHICHID_START + 147) // DataFieldTypeItem // Feldlänge -#define SBA_DEF_FLTLENGTH (SBA_WHICHID_START + 148) // SfxUInt32Item +#define SBA_DEF_FLTLENGTH (SBA_WHICHID_START + 148) // SfxUInt32Item // Eingabe erforderlich -#define SBA_DEF_FLTREQUIRED (SBA_WHICHID_START + 149) // SfxBoolItem +#define SBA_DEF_FLTREQUIRED (SBA_WHICHID_START + 149) // SfxBoolItem // Position in der Tabelle, Abfrage -#define SBA_DEF_FLTPOS (SBA_WHICHID_START + 150) // SfxUInt16Item +#define SBA_DEF_FLTPOS (SBA_WHICHID_START + 150) // SfxUInt16Item // Name der zugehoerigen Tabelle -#define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem +#define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem // Spalte ausblenden -#define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem +#define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem // Ausrichtung -#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) // SvxHorJustifyItem +#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) // SvxHorJustifyItem // Spaltenbreite -#define SBA_DEF_FLTCOLWIDTH (SBA_WHICHID_START + 146) // SbaColRowSizeItem +#define SBA_DEF_FLTCOLWIDTH (SBA_WHICHID_START + 146) // SbaColRowSizeItem // Feldtyp -#define SBA_DEF_FLTTYPE (SBA_WHICHID_START + 147) // DataFieldTypeItem +#define SBA_DEF_FLTTYPE (SBA_WHICHID_START + 147) // DataFieldTypeItem // Feldlänge -#define SBA_DEF_FLTLENGTH (SBA_WHICHID_START + 148) // SfxUInt32Item +#define SBA_DEF_FLTLENGTH (SBA_WHICHID_START + 148) // SfxUInt32Item // Eingabe erforderlich -#define SBA_DEF_FLTREQUIRED (SBA_WHICHID_START + 149) // SfxBoolItem +#define SBA_DEF_FLTREQUIRED (SBA_WHICHID_START + 149) // SfxBoolItem // Position in der Tabelle, Abfrage -#define SBA_DEF_FLTPOS (SBA_WHICHID_START + 150) // SfxUInt16Item +#define SBA_DEF_FLTPOS (SBA_WHICHID_START + 150) // SfxUInt16Item // Name der zugehoerigen Tabelle -#define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem +#define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem // Spalte ausblenden -#define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem +#define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem // Kommentar zum Feld -#define SBA_DEF_FLTCOMMENT (SBA_WHICHID_START + 153) // SfxStringItem +#define SBA_DEF_FLTCOMMENT (SBA_WHICHID_START + 153) // SfxStringItem // default wert -#define SBA_DEF_FLTDEFAULT (SBA_WHICHID_START + 154) // SfxStringItem +#define SBA_DEF_FLTDEFAULT (SBA_WHICHID_START + 154) // SfxStringItem // Primärschluessel -#define SBA_DEF_FLTPRIMARY (SBA_WHICHID_START + 155) // SfxBoolItem +#define SBA_DEF_FLTPRIMARY (SBA_WHICHID_START + 155) // SfxBoolItem // table properties -#define SBA_DEF_TABLEPROP (SBA_WHICHID_START + 156) // SfxString -#define SBA_DEF_SORT (SBA_WHICHID_START + 157) // SfxString -#define SBA_DEF_FILTER (SBA_WHICHID_START + 158) // SfxString -#define SBA_DEF_FILTERAPPLIED (SBA_WHICHID_START + 159) // SfxBool -#define SBA_DEF_ROWHEIGHT_DEFAULT (SBA_WHICHID_START + 160) // SfxBool +#define SBA_DEF_TABLEPROP (SBA_WHICHID_START + 156) // SfxString +#define SBA_DEF_SORT (SBA_WHICHID_START + 157) // SfxString +#define SBA_DEF_FILTER (SBA_WHICHID_START + 158) // SfxString +#define SBA_DEF_FILTERAPPLIED (SBA_WHICHID_START + 159) // SfxBool +#define SBA_DEF_ROWHEIGHT_DEFAULT (SBA_WHICHID_START + 160) // SfxBool // the col has a default width ? -#define SBA_DEF_FLTCOLWIDTH_DEFAULT (SBA_WHICHID_START + 161) // SfxBool -#define SBA_DEF_WORDLINEMODE (SBA_WHICHID_START + 162) // SfxBool +#define SBA_DEF_FLTCOLWIDTH_DEFAULT (SBA_WHICHID_START + 161) // SfxBool +#define SBA_DEF_WORDLINEMODE (SBA_WHICHID_START + 162) // SfxBool diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 857c32d8f010..5e8a7c4470c6 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #ifndef _SBA_GRID_HXX #define _SBA_GRID_HXX -// #include <sdb/tools.hxx> +// #include <sdb/tools.hxx> #include <svx/fmgridcl.hxx> @@ -62,7 +62,7 @@ namespace dbaui // SbaXGridControl //================================================================== - // class ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ; + // class ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ; FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory) class SbaXStatusMultiplexer; @@ -71,7 +71,7 @@ namespace dbaui ,public ::com::sun::star::frame::XDispatch { DECLARE_STL_MAP(::com::sun::star::util::URL, SbaXStatusMultiplexer*, SbaURLCompare,StatusMultiplexerArray); - StatusMultiplexerArray m_aStatusMultiplexer; + StatusMultiplexerArray m_aStatusMultiplexer; public: SbaXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -79,7 +79,7 @@ namespace dbaui // UNO DECLARE_UNO3_DEFAULTS(SbaXGridControl, FmXGridControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -105,7 +105,7 @@ namespace dbaui virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( ::com::sun::star::uno::RuntimeException ); protected: - virtual FmXGridPeer* imp_CreatePeer(Window* pParent); + virtual FmXGridPeer* imp_CreatePeer(Window* pParent); }; //================================================================== @@ -116,7 +116,7 @@ namespace dbaui :public FmXGridPeer ,public ::com::sun::star::frame::XDispatch { - ::cppu::OMultiTypeInterfaceContainerHelperVar< ::com::sun::star::util::URL,SbaURLHash , SbaURLCompare> m_aStatusListeners; + ::cppu::OMultiTypeInterfaceContainerHelperVar< ::com::sun::star::util::URL,SbaURLHash , SbaURLCompare> m_aStatusListeners; public: SbaXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -125,7 +125,7 @@ namespace dbaui // UNO virtual void SAL_CALL acquire() throw() { FmXGridPeer::acquire(); } virtual void SAL_CALL release() throw() { FmXGridPeer::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); @@ -145,7 +145,7 @@ namespace dbaui virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); protected: - virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle); + virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle); #if defined(_MSC_VER) && (_MSC_VER >= 1310 ) typedef ::com::sun::star::frame::XStatusListener xstlist_type; typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type; @@ -158,10 +158,10 @@ namespace dbaui // for asny execution of XDispatch::dispatch struct DispatchArgs { - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; - ::std::queue< DispatchArgs > m_aDispatchArgs; + ::std::queue< DispatchArgs > m_aDispatchArgs; DECL_LINK( OnDispatchEvent, void* ); // for dynamic states of our 4 dispatchable URLs @@ -177,7 +177,7 @@ namespace dbaui DispatchType classifyDispatchURL( const ::com::sun::star::util::URL& _rURL ); DECLARE_STL_STDKEY_MAP( DispatchType, sal_Bool, MapDispatchToBool ); - MapDispatchToBool m_aDispatchStates; + MapDispatchToBool m_aDispatchStates; }; //================================================================== @@ -194,8 +194,8 @@ namespace dbaui protected: // FmGridHeader overridables - virtual void PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu); - virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult); + virtual void PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu); + virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult); private: // DragSourceHelper overridables @@ -216,13 +216,13 @@ namespace dbaui class SbaGridListener { public: - virtual void RowChanged() = 0; - virtual void ColumnChanged() = 0; - virtual void SelectionChanged() = 0; - virtual void CellActivated() = 0; - virtual void CellDeactivated() = 0; - virtual void BeforeDrop() = 0; - virtual void AfterDrop() = 0; + virtual void RowChanged() = 0; + virtual void ColumnChanged() = 0; + virtual void SelectionChanged() = 0; + virtual void CellActivated() = 0; + virtual void CellDeactivated() = 0; + virtual void BeforeDrop() = 0; + virtual void AfterDrop() = 0; }; //================================================================== @@ -237,19 +237,19 @@ namespace dbaui // Attributes protected: - ::svx::ODataAccessDescriptor m_aDataDescriptor; - SbaGridListener* m_pMasterListener; + ::svx::ODataAccessDescriptor m_aDataDescriptor; + SbaGridListener* m_pMasterListener; - sal_Int32 m_nAsyncDropEvent; + sal_Int32 m_nAsyncDropEvent; USHORT m_nCurrentActionColId; // ui actions (e.g. a context menu) may be performed on columns which aren't the current one // and aren't selected, so we have to track this column id - sal_Bool m_bActivatingForDrop; + sal_Bool m_bActivatingForDrop; // Attribute Access public: - sal_uInt16 GetCurrentActionColumn() const { return m_nCurrentActionColId; } + sal_uInt16 GetCurrentActionColumn() const { return m_nCurrentActionColId; } public: SbaGridControl(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP); @@ -258,9 +258,9 @@ namespace dbaui virtual void Command( const CommandEvent& rCEvt ); virtual void Select(); - void SetMasterListener(SbaGridListener* pListener) { m_pMasterListener = pListener; } + void SetMasterListener(SbaGridListener* pListener) { m_pMasterListener = pListener; } - virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True); + virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True); virtual void DeactivateCell(sal_Bool bUpdate = sal_True); void ActivateCell() { FmGridControl::ActivateCell(); } @@ -269,9 +269,9 @@ namespace dbaui HeaderBar* GetHeaderBar() const { return FmGridControl::GetHeaderBar(); } /** return the description of the specified object. - @param eObjType + @param eObjType The type to ask for - @param _nPosition + @param _nPosition The position of a tablecell (index position), header bar colum/row cell @return The description of the specified object. @@ -291,10 +291,10 @@ namespace dbaui virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); // BrowseBox overridables - virtual void CursorMoved(); + virtual void CursorMoved(); virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); - virtual void MouseButtonDown( const BrowserMouseEvent& rMEvt); + virtual void MouseButtonDown( const BrowserMouseEvent& rMEvt); // EditBrowseBox overridables virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent); @@ -333,7 +333,7 @@ namespace dbaui DECL_LINK(AsynchDropEvent, void*); private: - sal_Bool IsReadOnlyDB() const; + sal_Bool IsReadOnlyDB() const; void implTransferSelectedRows( sal_Int16 nRowPos, bool _bTrueIfClipboardFalseIfDrag ); private: diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 0fe8ba96aae6..23d5035f0594 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace dbaui class OSbaWeakSubObject : public ::cppu::OWeakObject { protected: - ::cppu::OWeakObject& m_rParent; + ::cppu::OWeakObject& m_rParent; public: OSbaWeakSubObject(::cppu::OWeakObject& rParent) : m_rParent(rParent) { } @@ -72,132 +72,132 @@ namespace dbaui //------------------------------------------------------------------ // declaration of a listener multiplexer class - #define BEGIN_DECLARE_LISTENER_MULTIPLEXER(classname, listenerclass) \ - class classname \ - :public OSbaWeakSubObject \ - ,public listenerclass \ - ,public ::cppu::OInterfaceContainerHelper \ - { \ - public: \ - classname( ::cppu::OWeakObject& rSource, \ - ::osl::Mutex& rMutex); \ - DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ + #define BEGIN_DECLARE_LISTENER_MULTIPLEXER(classname, listenerclass) \ + class classname \ + :public OSbaWeakSubObject \ + ,public listenerclass \ + ,public ::cppu::OInterfaceContainerHelper \ + { \ + public: \ + classname( ::cppu::OWeakObject& rSource, \ + ::osl::Mutex& rMutex); \ + DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); \ \ - /* ::com::sun::star::lang::XEventListener */ \ - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \ + /* ::com::sun::star::lang::XEventListener */ \ + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \ - #define DECLARE_MULTIPLEXER_VOID_METHOD(methodname, eventtype) \ + #define DECLARE_MULTIPLEXER_VOID_METHOD(methodname, eventtype) \ virtual void SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \ - #define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype) \ - virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \ + #define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype) \ + virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \ - #define END_DECLARE_LISTENER_MULTIPLEXER() \ - /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators */ \ - void * SAL_CALL operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); } \ - void SAL_CALL operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); } \ - }; \ + #define END_DECLARE_LISTENER_MULTIPLEXER() \ + /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators */ \ + void * SAL_CALL operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); } \ + void SAL_CALL operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); } \ + }; \ //------------------------------------------------------------------ // implementation of a listener multiplexer class - #define IMPLEMENT_LISTENER_MULTIPLEXER_CORE(classname, listenerclass) \ + #define IMPLEMENT_LISTENER_MULTIPLEXER_CORE(classname, listenerclass) \ \ - /*................................................................*/ \ - classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex) \ - :OSbaWeakSubObject(rSource) \ - ,OInterfaceContainerHelper(_rMutex) \ - { \ - } \ + /*................................................................*/ \ + classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex) \ + :OSbaWeakSubObject(rSource) \ + ,OInterfaceContainerHelper(_rMutex) \ + { \ + } \ \ - ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ + ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Any aReturn = \ - OSbaWeakSubObject::queryInterface(_rType); \ - if (!aReturn.hasValue()) \ - aReturn = ::cppu::queryInterface(_rType, \ - static_cast< listenerclass* >(this), \ - static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ - ); \ + { \ + ::com::sun::star::uno::Any aReturn = \ + OSbaWeakSubObject::queryInterface(_rType); \ + if (!aReturn.hasValue()) \ + aReturn = ::cppu::queryInterface(_rType, \ + static_cast< listenerclass* >(this), \ + static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ + ); \ \ - return aReturn; \ - } \ - /*................................................................*/ \ + return aReturn; \ + } \ + /*................................................................*/ \ void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)\ - { \ - } \ - - - #define IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(classname, listenerclass, methodname, eventtype) \ - void SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ - { \ - eventtype aMulti(e); \ - aMulti.Source = &m_rParent; \ - ::cppu::OInterfaceIteratorHelper aIt(*this); \ - while (aIt.hasMoreElements()) \ - static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ - } \ - - #define IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(classname, listenerclass, methodname, eventtype) \ - /*................................................................*/ \ - sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ - { \ - eventtype aMulti(e); \ - aMulti.Source = &m_rParent; \ - ::cppu::OInterfaceIteratorHelper aIt(*this); \ - sal_Bool bResult = sal_True; \ - while (bResult && aIt.hasMoreElements()) \ - bResult = static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ - return bResult; \ - } \ + { \ + } \ + + + #define IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(classname, listenerclass, methodname, eventtype) \ + void SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ + { \ + eventtype aMulti(e); \ + aMulti.Source = &m_rParent; \ + ::cppu::OInterfaceIteratorHelper aIt(*this); \ + while (aIt.hasMoreElements()) \ + static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ + } \ + + #define IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(classname, listenerclass, methodname, eventtype) \ + /*................................................................*/ \ + sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ + { \ + eventtype aMulti(e); \ + aMulti.Source = &m_rParent; \ + ::cppu::OInterfaceIteratorHelper aIt(*this); \ + sal_Bool bResult = sal_True; \ + while (bResult && aIt.hasMoreElements()) \ + bResult = static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ + return bResult; \ + } \ //------------------------------------------------------------------ // helper for classes which do event multiplexing #define IMPLEMENT_LISTENER_ADMINISTRATION(classname, listenernamespace, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - /*................................................................*/ \ + /*................................................................*/ \ void SAL_CALL classname::add##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException)\ - { \ - multiplexer.addInterface(l); \ - if (multiplexer.getLength() == 1) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(&multiplexer); \ - } \ - } \ - /*................................................................*/ \ + { \ + multiplexer.addInterface(l); \ + if (multiplexer.getLength() == 1) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->add##listenerdesc(&multiplexer); \ + } \ + } \ + /*................................................................*/ \ void SAL_CALL classname::remove##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException)\ - { \ - if (multiplexer.getLength() == 1) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(&multiplexer); \ - } \ - multiplexer.removeInterface(l); \ - } \ + { \ + if (multiplexer.getLength() == 1) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->remove##listenerdesc(&multiplexer); \ + } \ + multiplexer.removeInterface(l); \ + } \ #define STOP_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - if (multiplexer.getLength()) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(&multiplexer); \ - } \ + if (multiplexer.getLength()) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->remove##listenerdesc(&multiplexer); \ + } \ #define START_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - if (multiplexer.getLength()) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(&multiplexer); \ - } \ + if (multiplexer.getLength()) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->add##listenerdesc(&multiplexer); \ + } \ @@ -205,160 +205,160 @@ namespace dbaui // declaration of property listener multiplexers // (with support for specialized and unspecialized property listeners) - #define DECLARE_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \ - class classname \ - :public OSbaWeakSubObject \ - ,public listenerclass \ - { \ - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< \ - ::rtl::OUString, ::comphelper::UStringHash, ::comphelper::UStringEqual > ListenerContainerMap; \ - ListenerContainerMap m_aListeners; \ + #define DECLARE_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \ + class classname \ + :public OSbaWeakSubObject \ + ,public listenerclass \ + { \ + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< \ + ::rtl::OUString, ::comphelper::UStringHash, ::comphelper::UStringEqual > ListenerContainerMap; \ + ListenerContainerMap m_aListeners; \ \ - public: \ - classname( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); \ - DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ + public: \ + classname( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); \ + DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); \ \ - /* ::com::sun::star::lang::XEventListener */ \ - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \ + /* ::com::sun::star::lang::XEventListener */ \ + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \ \ - virtual void SAL_CALL methodname(const eventtype& e) throw exceptions; \ + virtual void SAL_CALL methodname(const eventtype& e) throw exceptions; \ \ - public: \ - void addInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ - void removeInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ + public: \ + void addInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ + void removeInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ \ - void disposeAndClear(); \ + void disposeAndClear(); \ \ - sal_Int32 getOverallLen() const; \ + sal_Int32 getOverallLen() const; \ \ - ::cppu::OInterfaceContainerHelper* getContainer(const ::rtl::OUString& rName) \ - { return m_aListeners.getContainer(rName); } \ + ::cppu::OInterfaceContainerHelper* getContainer(const ::rtl::OUString& rName) \ + { return m_aListeners.getContainer(rName); } \ \ - protected: \ - void Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e); \ - }; \ + protected: \ + void Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e); \ + }; \ //------------------------------------------------------------------ // implementation of property listener multiplexers - #define IMPLEMENT_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \ - /*................................................................*/ \ - classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex) \ - :OSbaWeakSubObject(rSource) \ - ,m_aListeners(rMutex) \ - { \ - } \ + #define IMPLEMENT_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \ + /*................................................................*/ \ + classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex) \ + :OSbaWeakSubObject(rSource) \ + ,m_aListeners(rMutex) \ + { \ + } \ \ - ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ + ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Any aReturn = \ - OSbaWeakSubObject::queryInterface(_rType); \ - if (!aReturn.hasValue()) \ - aReturn = ::cppu::queryInterface(_rType, \ - static_cast< listenerclass* >(this), \ - static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ - ); \ + { \ + ::com::sun::star::uno::Any aReturn = \ + OSbaWeakSubObject::queryInterface(_rType); \ + if (!aReturn.hasValue()) \ + aReturn = ::cppu::queryInterface(_rType, \ + static_cast< listenerclass* >(this), \ + static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ + ); \ \ - return aReturn; \ - } \ - /*................................................................*/ \ + return aReturn; \ + } \ + /*................................................................*/ \ void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)\ - { \ - } \ + { \ + } \ \ - void SAL_CALL classname::methodname(const eventtype& e) throw exceptions \ - { \ - ::cppu::OInterfaceContainerHelper* pListeners = m_aListeners.getContainer(e.PropertyName); \ - if (pListeners) \ - Notify(*pListeners, e); \ + void SAL_CALL classname::methodname(const eventtype& e) throw exceptions \ + { \ + ::cppu::OInterfaceContainerHelper* pListeners = m_aListeners.getContainer(e.PropertyName); \ + if (pListeners) \ + Notify(*pListeners, e); \ \ - /* do the notification for the unspecialized listeners, too */ \ - pListeners = m_aListeners.getContainer(::rtl::OUString()); \ - if (pListeners) \ - Notify(*pListeners, e); \ - } \ + /* do the notification for the unspecialized listeners, too */ \ + pListeners = m_aListeners.getContainer(::rtl::OUString()); \ + if (pListeners) \ + Notify(*pListeners, e); \ + } \ \ - void classname::addInterface(const ::rtl::OUString& rName, \ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ - { \ - m_aListeners.addInterface(rName, rListener); \ - } \ + void classname::addInterface(const ::rtl::OUString& rName, \ + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ + { \ + m_aListeners.addInterface(rName, rListener); \ + } \ \ - void classname::removeInterface(const ::rtl::OUString& rName, \ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ - { \ - m_aListeners.removeInterface(rName, rListener); \ - } \ + void classname::removeInterface(const ::rtl::OUString& rName, \ + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ + { \ + m_aListeners.removeInterface(rName, rListener); \ + } \ \ - void classname::disposeAndClear() \ - { \ - ::com::sun::star::lang::EventObject aEvt(m_rParent); \ - m_aListeners.disposeAndClear(aEvt); \ - } \ + void classname::disposeAndClear() \ + { \ + ::com::sun::star::lang::EventObject aEvt(m_rParent); \ + m_aListeners.disposeAndClear(aEvt); \ + } \ \ - sal_Int32 classname::getOverallLen() const \ - { \ - sal_Int32 nLen = 0; \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aContained = m_aListeners.getContainedTypes(); \ - const ::rtl::OUString* pContained = aContained.getConstArray(); \ - for ( sal_Int32 i=0; i<aContained.getLength(); ++i, ++pContained) \ - nLen += m_aListeners.getContainer(*pContained)->getLength(); \ - return nLen; \ - } \ + sal_Int32 classname::getOverallLen() const \ + { \ + sal_Int32 nLen = 0; \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aContained = m_aListeners.getContainedTypes(); \ + const ::rtl::OUString* pContained = aContained.getConstArray(); \ + for ( sal_Int32 i=0; i<aContained.getLength(); ++i, ++pContained) \ + nLen += m_aListeners.getContainer(*pContained)->getLength(); \ + return nLen; \ + } \ \ - void classname::Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e) \ - { \ - eventtype aMulti(e); \ - aMulti.Source = &m_rParent; \ - ::cppu::OInterfaceIteratorHelper aIt(rListeners); \ - while (aIt.hasMoreElements()) \ - static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ - } \ + void classname::Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e) \ + { \ + eventtype aMulti(e); \ + aMulti.Source = &m_rParent; \ + ::cppu::OInterfaceIteratorHelper aIt(rListeners); \ + while (aIt.hasMoreElements()) \ + static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ + } \ //------------------------------------------------------------------ // helper for classes which do property event multiplexing #define IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(classname, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - /*................................................................*/ \ + /*................................................................*/ \ void SAL_CALL classname::add##listenerdesc(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ - { \ - multiplexer.addInterface(rName, l); \ - if (multiplexer.getOverallLen() == 1) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ - } \ - } \ - /*................................................................*/ \ + { \ + multiplexer.addInterface(rName, l); \ + if (multiplexer.getOverallLen() == 1) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ + } \ + } \ + /*................................................................*/ \ void SAL_CALL classname::remove##listenerdesc(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ - { \ - if (multiplexer.getOverallLen() == 1) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ - } \ - multiplexer.removeInterface(rName, l); \ - } \ + { \ + if (multiplexer.getOverallLen() == 1) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ + } \ + multiplexer.removeInterface(rName, l); \ + } \ #define STOP_PROPERTY_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - if (multiplexer.getOverallLen()) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ - } \ + if (multiplexer.getOverallLen()) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ + } \ #define START_PROPERTY_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - if (multiplexer.getOverallLen()) \ - { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ - if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ - } \ + if (multiplexer.getOverallLen()) \ + { \ + ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + if (xBroadcaster.is()) \ + xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ + } \ @@ -370,8 +370,8 @@ namespace dbaui DECLARE_MULTIPLEXER_VOID_METHOD(statusChanged, ::com::sun::star::frame::FeatureStateEvent) private: - ::com::sun::star::frame::FeatureStateEvent m_aLastKnownStatus; - public: \ + ::com::sun::star::frame::FeatureStateEvent m_aLastKnownStatus; + public: \ inline ::com::sun::star::frame::FeatureStateEvent getLastEvent( ) const { return m_aLastKnownStatus; } END_DECLARE_LISTENER_MULTIPLEXER() @@ -404,19 +404,19 @@ namespace dbaui BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXRowSetMultiplexer, ::com::sun::star::sdbc::XRowSetListener) DECLARE_MULTIPLEXER_VOID_METHOD(cursorMoved, ::com::sun::star::lang::EventObject) DECLARE_MULTIPLEXER_VOID_METHOD(rowChanged, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_VOID_METHOD(rowSetChanged, ::com::sun::star::lang::EventObject) + DECLARE_MULTIPLEXER_VOID_METHOD(rowSetChanged, ::com::sun::star::lang::EventObject) END_DECLARE_LISTENER_MULTIPLEXER() // ::com::sun::star::sdb::XRowSetApproveListener BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXRowSetApproveMultiplexer, ::com::sun::star::sdb::XRowSetApproveListener) DECLARE_MULTIPLEXER_BOOL_METHOD(approveCursorMove, ::com::sun::star::lang::EventObject) DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowChange, ::com::sun::star::sdb::RowChangeEvent) - DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowSetChange, ::com::sun::star::lang::EventObject) + DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowSetChange, ::com::sun::star::lang::EventObject) END_DECLARE_LISTENER_MULTIPLEXER() // ::com::sun::star::sdb::XSQLErrorListener BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXSQLErrorMultiplexer, ::com::sun::star::sdb::XSQLErrorListener) - DECLARE_MULTIPLEXER_VOID_METHOD(errorOccured, ::com::sun::star::sdb::SQLErrorEvent) + DECLARE_MULTIPLEXER_VOID_METHOD(errorOccured, ::com::sun::star::sdb::SQLErrorEvent) END_DECLARE_LISTENER_MULTIPLEXER() // ::com::sun::star::beans::XPropertyChangeListener diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 3ad5a4d93460..99ac2dbf1769 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,21 +39,21 @@ namespace dbaui class OSqlEdit : public MultiLineEditSyntaxHighlight, utl::ConfigurationListener { private: - Timer m_timerInvalidate; - Timer m_timerUndoActionCreation; - Link m_lnkTextModifyHdl; - String m_strOrigText; // wird beim Undo wiederhergestellt - OQueryTextView* m_pView; - BOOL m_bAccelAction; // Wird bei Cut, Copy, Paste gesetzt - BOOL m_bStopTimer; + Timer m_timerInvalidate; + Timer m_timerUndoActionCreation; + Link m_lnkTextModifyHdl; + String m_strOrigText; // wird beim Undo wiederhergestellt + OQueryTextView* m_pView; + BOOL m_bAccelAction; // Wird bei Cut, Copy, Paste gesetzt + BOOL m_bStopTimer; utl::SourceViewConfig m_SourceViewConfig; - svtools::ColorConfig m_ColorConfig; + svtools::ColorConfig m_ColorConfig; DECL_LINK(OnUndoActionTimer, void*); DECL_LINK(OnInvalidateTimer, void*); private: - void ImplSetFont(); + void ImplSetFont(); protected: virtual void KeyInput( const KeyEvent& rKEvt ); diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 554310078fb2..e7aaa6f8912f 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,9 +58,9 @@ namespace dbaui struct SQLMessageBox_Impl; class OSQLMessageBox : public ButtonDialog { - FixedImage m_aInfoImage; - FixedText m_aTitle; - FixedText m_aMessage; + FixedImage m_aInfoImage; + FixedText m_aTitle; + FixedText m_aMessage; ::rtl::OUString m_sHelpURL; ::std::auto_ptr< SQLMessageBox_Impl > m_pImpl; @@ -77,7 +77,7 @@ public: }; public: - /** display an SQLException with auto-recognizing a main and a detailed message + /** display an SQLException with auto-recognizing a main and a detailed message The first two messages from the exception chain are used as main and detailed message (recognizing the detailed field of an <type scope="com::sun::star::sdb">SQLContext</type>). @@ -89,10 +89,10 @@ public: const ::rtl::OUString& _rHelpURL = ::rtl::OUString() ); - /** display a database related error message + /** display a database related error message - @param rTitle the title to display - @param rMessage the detailed message to display + @param rTitle the title to display + @param rMessage the detailed message to display @param _eType determines the image to use. AUTO is disallowed in this constructor version */ OSQLMessageBox(Window* pParent, @@ -129,7 +129,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_SQLMESSAGE_HXX_ diff --git a/dbaccess/source/ui/inc/statusbarontroller.hxx b/dbaccess/source/ui/inc/statusbarontroller.hxx index 57d82d317605..e96616066898 100644 --- a/dbaccess/source/ui/inc/statusbarontroller.hxx +++ b/dbaccess/source/ui/inc/statusbarontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace dbaui { - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> OStatusbarController_BASE; + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> OStatusbarController_BASE; class OStatusbarController : public ::svt::StatusbarController, public OStatusbarController_BASE { diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 713026625d6f..88d02acde2f9 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,21 +46,21 @@ namespace dbaui */ class OStringListItem : public SfxPoolItem { - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aList; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aList; public: TYPEINFO(); OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rList); OStringListItem(const OStringListItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; + virtual int operator==(const SfxPoolItem& _rItem) const; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getList() const { return m_aList; } + ::com::sun::star::uno::Sequence< ::rtl::OUString > getList() const { return m_aList; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_STRINGLISTITEM_HXX_ diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 3b70a0324d46..6efcee71b872 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ protected: m_xConnection; // the connection we're working for, set in implOnNewConnection, called by UpdateTableList ::std::auto_ptr< ImageProvider > m_pImageProvider; // provider for our images - sal_Bool m_bVirtualRoot; // should the first entry be visible + sal_Bool m_bVirtualRoot; // should the first entry be visible bool m_bNoEmptyFolders; // should empty catalogs/schematas be prevented from being displayed? public: @@ -75,12 +75,12 @@ public: ~OTableTreeListBox(); - typedef ::std::pair< ::rtl::OUString,sal_Bool> TTableViewName; - typedef ::std::vector< TTableViewName > TNames; + typedef ::std::pair< ::rtl::OUString,sal_Bool> TTableViewName; + typedef ::std::vector< TTableViewName > TNames; void suppressEmptyFolders() { m_bNoEmptyFolders = true; } - /** call when HiContrast change. + /** call when HiContrast change. */ void notifyHiContrastChanged(); @@ -103,16 +103,16 @@ public: */ void UpdateTableList( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection - ) throw(::com::sun::star::sdbc::SQLException); + ) throw(::com::sun::star::sdbc::SQLException); /** fill the table list with the tables and views determined by the two given containers. The views sequence is used to determine which table is of type view. - @param _rxConnection the connection where you got the object names from. Must not be NULL. + @param _rxConnection the connection where you got the object names from. Must not be NULL. Used to split the full qualified names into it's parts. - @param _rTables table/view sequence - @param _rViews view sequence + @param _rTables table/view sequence + @param _rViews view sequence */ - void UpdateTableList( + void UpdateTableList( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _rTables, const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _rViews @@ -129,29 +129,29 @@ public: /** to be used if a foreign instance removed a table */ - void removedTable( const ::rtl::OUString& _rName ); + void removedTable( const ::rtl::OUString& _rName ); /** returns the fully qualified name of a table entry - @param _pEntry + @param _pEntry the entry whose name is to be obtained. Must not denote a folder entry. */ String getQualifiedTableName( SvLBoxEntry* _pEntry ) const; - SvLBoxEntry* getEntryByQualifiedName( const ::rtl::OUString& _rName ); + SvLBoxEntry* getEntryByQualifiedName( const ::rtl::OUString& _rName ); - SvLBoxEntry* getAllObjectsEntry() const; + SvLBoxEntry* getAllObjectsEntry() const; /** does a wildcard check of the given entry <p>There are two different 'checked' states: If the user checks all children of an entry, this is different from checking the entry itself. The second is called 'wildcard' checking, 'cause in the resulting table filter it's represented by a wildcard.</p> */ - void checkWildcard(SvLBoxEntry* _pEntry); + void checkWildcard(SvLBoxEntry* _pEntry); /** determine if the given entry is 'wildcard checked' @see checkWildcard */ - sal_Bool isWildcardChecked(SvLBoxEntry* _pEntry) const; + sal_Bool isWildcardChecked(SvLBoxEntry* _pEntry) const; protected: virtual void InitEntry(SvLBoxEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind); @@ -180,11 +180,11 @@ protected: sal_Bool haveVirtualRoot() const { return m_bVirtualRoot; } /** fill the table list with the tables and views determined by the two given containers - @param _rxConnection the connection where you got the object names from. Must not be NULL. + @param _rxConnection the connection where you got the object names from. Must not be NULL. Used to split the full qualified names into it's parts. - @param _rTables table/view sequence, the second argument is <TRUE/> if it is a table, otherwise it is a view. + @param _rTables table/view sequence, the second argument is <TRUE/> if it is a table, otherwise it is a view. */ - void UpdateTableList( + void UpdateTableList( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const TNames& _rTables ); @@ -192,7 +192,7 @@ protected: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_TABLETREE_HXX_ diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index dcda4a3acdb3..08af3e9d5809 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace dbaui */ static void bindItemStorages( SfxItemSet& _rSet, PropertyValues& _rValues ); - virtual short Execute(); + virtual short Execute(); private: ::std::auto_ptr< OTextConnectionHelper > m_pTextConnectionHelper; diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc index dfd035d42500..1706cdbffa6a 100644 --- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc +++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,49 +33,49 @@ #define MID_SBA_QRY_REFRESH \ Identifier = ID_BROWSER_REFRESH ; \ Text [ en-US ] = "Refresh"; \ - Text [ x-comment ] = " "; \ + Text [ x-comment ] = " "; \ #define MID_NEW_VIEW_DESIGN \ - Identifier = ID_NEW_VIEW_DESIGN; \ + Identifier = ID_NEW_VIEW_DESIGN; \ HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ; \ Text [ en-US ] = "New ~View Design" ; \ #define MID_NEW_TABLE_DESIGN \ - Identifier = ID_NEW_TABLE_DESIGN; \ + Identifier = ID_NEW_TABLE_DESIGN; \ HelpId = HID_BROWSER_TABLE_CREATE_DESIGN ; \ Text [ en-US ] = "New ~Table Design" ;\ - -#define MID_QUERY_WIZARD \ - Identifier = ID_NEW_QUERY_WIZARD; \ + +#define MID_QUERY_WIZARD \ + Identifier = ID_NEW_QUERY_WIZARD; \ HelpId = HID_BROWSER_QUERY_WIZARD ; \ - Text[ en-US ] = "Query AutoPilot..."; \ + Text[ en-US ] = "Query AutoPilot..."; \ -#define MID_QUERY_NEW_DESIGN \ - Identifier = ID_NEW_QUERY_DESIGN; \ +#define MID_QUERY_NEW_DESIGN \ + Identifier = ID_NEW_QUERY_DESIGN; \ HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ; \ Text [ en-US ] = "New ~Query (Design View)" ; \ -#define MID_QUERY_EDIT_DESIGN \ - Identifier = ID_EDIT_QUERY_DESIGN; \ +#define MID_QUERY_EDIT_DESIGN \ + Identifier = ID_EDIT_QUERY_DESIGN; \ HelpId = HID_BROWSER_QUERY_EDIT ; \ Text [ en-US ] = "~Edit Query" ; \ -#define MID_QUERY_NEW_SQL \ - Identifier = ID_NEW_QUERY_SQL; \ +#define MID_QUERY_NEW_SQL \ + Identifier = ID_NEW_QUERY_SQL; \ HelpId = HID_BROWSER_QUERY_CREATE_TEXT ; \ Text [ en-US ] = "New Query (~SQL View)" ; \ -#define MID_DBUI_QUERY_EDIT_JOINCONNECTION \ - Identifier = ID_QUERY_EDIT_JOINCONNECTION; \ - HelpId = HID_QUERY_EDIT_JOINCONNECTION ; \ - Text [ en-US ] = "Edit..."; \ +#define MID_DBUI_QUERY_EDIT_JOINCONNECTION \ + Identifier = ID_QUERY_EDIT_JOINCONNECTION; \ + HelpId = HID_QUERY_EDIT_JOINCONNECTION ; \ + Text [ en-US ] = "Edit..."; \ #define MID_COLUMN_WIDTH\ @@ -87,14 +87,14 @@ #define MID_DOCUMENT_CREATE_REPWIZ\ Identifier = ID_DOCUMENT_CREATE_REPWIZ ;\ HelpID = HID_DOCUMENT_CREATE_REPWIZ ;\ - Text [ en-US ] = "Report Wizard..."; \ + Text [ en-US ] = "Report Wizard..."; \ -#define MID_DOCUMENT_NEW_AUTOPILOT \ - Identifier = SID_DB_FORM_NEW_PILOT; \ +#define MID_DOCUMENT_NEW_AUTOPILOT \ + Identifier = SID_DB_FORM_NEW_PILOT; \ HelpID = SID_DB_FORM_NEW_PILOT ;\ - Text [ en-US ] = "Form AutoPilot..."; \ - + Text [ en-US ] = "Form AutoPilot..."; \ -#endif // DBAUI_TOOLBOX_HXX +#endif // DBAUI_TOOLBOX_HXX + diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index 96ab7e3175d6..8779c351c34e 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,15 +39,15 @@ class PopupMenu; namespace dbaui { - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> TToolboxController_BASE; + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> TToolboxController_BASE; class OToolboxController : public ::svt::ToolboxController ,public TToolboxController_BASE { DECLARE_STL_USTRINGACCESS_MAP(sal_Bool,TCommandState); - OModuleClient m_aModuleClient; - TCommandState m_aStates; - sal_uInt16 m_nToolBoxId; + OModuleClient m_aModuleClient; + TCommandState m_aStates; + sal_uInt16 m_nToolBoxId; ::std::auto_ptr<PopupMenu> getMenu(); public: diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index 0bcbcdabe095..f8bb1541d02f 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,11 +40,11 @@ namespace dbaui class OSqlEditUndoAct : public OCommentUndoAction { protected: - OSqlEdit* m_pOwner; - String m_strNextText; + OSqlEdit* m_pOwner; + String m_strNextText; - virtual void Undo() { ToggleText(); } - virtual void Redo() { ToggleText(); } + virtual void Undo() { ToggleText(); } + virtual void Redo() { ToggleText(); } void ToggleText(); public: diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 3ad794e9c52e..2d2ab40bfdba 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,13 +54,13 @@ class ODatabaseAdministrationDialog { OModuleClient m_aModuleClient; protected: - SfxItemSet* m_pDatasourceItems; // item set for the dialog - SfxItemPool* m_pItemPool; // item pool for the item set for the dialog - SfxPoolItem** m_pItemPoolDefaults; // pool defaults - ::dbaccess::ODsnTypeCollection* - m_pCollection; // datasource type collection + SfxItemSet* m_pDatasourceItems; // item set for the dialog + SfxItemPool* m_pItemPool; // item pool for the item set for the dialog + SfxPoolItem** m_pItemPoolDefaults; // pool defaults + ::dbaccess::ODsnTypeCollection* + m_pCollection; // datasource type collection - ::com::sun::star::uno::Any m_aInitialSelection; + ::com::sun::star::uno::Any m_aInitialSelection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; protected: @@ -73,7 +73,7 @@ protected: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_UNOADMIN_ diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index deb68c99b6a0..0d6ef5da40c5 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,12 +70,12 @@ namespace dbaui class ImageProvider; // ===================================================================== - typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XStatusListener - , ::com::sun::star::view::XSelectionSupplier + typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XStatusListener + , ::com::sun::star::view::XSelectionSupplier , ::com::sun::star::document::XScriptInvocationContext , ::com::sun::star::ui::XContextMenuInterception , ::com::sun::star::sdb::XDatabaseRegistrationsListener - > SbaTableQueryBrowser_Base; + > SbaTableQueryBrowser_Base; class SbaTableQueryBrowser :public SbaXDataBrowserController ,public SbaTableQueryBrowser_Base @@ -85,8 +85,8 @@ namespace dbaui protected: // --------------------------- - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xCurrentFrameParent; + ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xCurrentFrameParent; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMainToolbar; // --------------------------- @@ -104,30 +104,30 @@ namespace dbaui typedef ::std::map< sal_uInt16, ExternalFeature, ::std::less< sal_uInt16 > > ExternalFeaturesMap; ExternalFeaturesMap m_aExternalFeatures; - ::svx::ODataAccessDescriptor m_aDocumentDataSource; + ::svx::ODataAccessDescriptor m_aDocumentDataSource; // if we're part of a document, this is the state of the DocumentDataSource slot - ::cppu::OInterfaceContainerHelper m_aSelectionListeners; - ::cppu::OInterfaceContainerHelper m_aContextMenuInterceptors; + ::cppu::OInterfaceContainerHelper m_aSelectionListeners; + ::cppu::OInterfaceContainerHelper m_aContextMenuInterceptors; OTableCopyHelper::DropDescriptor m_aAsyncDrop; OTableCopyHelper m_aTableCopyHelper; - ::rtl::OUString m_sQueryCommand; // the command of the query currently loaded (if any) + ::rtl::OUString m_sQueryCommand; // the command of the query currently loaded (if any) //::rtl::OUString m_sToBeLoaded; // contains the element name which should be loaded if any - DBTreeView* m_pTreeView; - Splitter* m_pSplitter; - SvLBoxTreeList* m_pTreeModel; // contains the datasources of the registry - SvLBoxEntry* m_pCurrentlyDisplayed; - ULONG m_nAsyncDrop; + DBTreeView* m_pTreeView; + Splitter* m_pSplitter; + SvLBoxTreeList* m_pTreeModel; // contains the datasources of the registry + SvLBoxEntry* m_pCurrentlyDisplayed; + ULONG m_nAsyncDrop; - sal_Int16 m_nBorder; // TRUE when border should be shown + sal_Int16 m_nBorder; // TRUE when border should be shown - sal_Bool m_bQueryEscapeProcessing : 1; // the escape processing flag of the query currently loaded (if any) - sal_Bool m_bShowMenu; // if TRUE the menu should be visible otherwise not - sal_Bool m_bInSuspend; - sal_Bool m_bEnableBrowser; + sal_Bool m_bQueryEscapeProcessing : 1; // the escape processing flag of the query currently loaded (if any) + sal_Bool m_bShowMenu; // if TRUE the menu should be visible otherwise not + sal_Bool m_bInSuspend; + sal_Bool m_bEnableBrowser; ::boost::optional< bool > m_aDocScriptSupport; // relevant if and only if we are associated with exactly one DBDoc @@ -166,7 +166,7 @@ namespace dbaui // late construction virtual sal_Bool Construct(Window* pParent); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -180,7 +180,7 @@ namespace dbaui virtual void SAL_CALL attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw(::com::sun::star::uno::RuntimeException); @@ -226,7 +226,7 @@ namespace dbaui virtual sal_Bool InitializeGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid); virtual sal_Bool preReloadForm(); - virtual void postReloadForm(); + virtual void postReloadForm(); virtual void addModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); virtual void removeModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); @@ -238,15 +238,15 @@ namespace dbaui virtual void criticalFail(); - virtual void describeSupportedFeatures(); - virtual FeatureState GetState(sal_uInt16 nId) const; - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void describeSupportedFeatures(); + virtual FeatureState GetState(sal_uInt16 nId) const; + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); // IControlActionListener overridables virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const; - virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); - virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); - virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); + virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); + virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); // IContextMenuProvider virtual PopupMenu* getContextMenu( Control& _rControl ) const; @@ -264,18 +264,18 @@ namespace dbaui virtual void SelectionChanged(); // methods for showing/hiding the explorer part - sal_Bool haveExplorer() const; - void hideExplorer(); - void showExplorer(); - void toggleExplorer() { if (haveExplorer()) hideExplorer(); else showExplorer(); } + sal_Bool haveExplorer() const; + void hideExplorer(); + void showExplorer(); + void toggleExplorer() { if (haveExplorer()) hideExplorer(); else showExplorer(); } // methods for handling the 'selection' (paintin them bold) of SvLBoxEntries // returns <TRUE/> if the entry is selected (which means it's part of the selected path) - sal_Bool isSelected(SvLBoxEntry* _pEntry) const; + sal_Bool isSelected(SvLBoxEntry* _pEntry) const; // select the entry (and only the entry, not the whole path) - void select(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); + void select(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); // select the path of the entry (which must be an entry without children) - void selectPath(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); + void selectPath(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); @@ -290,7 +290,7 @@ namespace dbaui <p>The slot is available if an external dispatcher is responsible for it, _and_ if this dispatcher told us the slot is available.</p> */ - sal_Bool getExternalSlotState( sal_uInt16 _nId ) const; + sal_Bool getExternalSlotState( sal_uInt16 _nId ) const; /** add an entry (including the subentries for queries/tables) to the list model @@ -320,17 +320,17 @@ namespace dbaui void unloadAndCleanup( sal_Bool _bDisposeConnection = sal_True ); // disposes the connection associated with the given entry (which must represent a data source) - void disposeConnection( SvLBoxEntry* _pDSEntry ); + void disposeConnection( SvLBoxEntry* _pDSEntry ); /// flushs and disposes the given connection, and de-registers as listener void impl_releaseConnection( SharedConnection& _rxConnection ); /** close the connection (and collapse the list entries) of the given list entries */ - void closeConnection(SvLBoxEntry* _pEntry,sal_Bool _bDisposeConnection = sal_True); + void closeConnection(SvLBoxEntry* _pEntry,sal_Bool _bDisposeConnection = sal_True); void populateTree(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xNameAccess, SvLBoxEntry* _pParent, EntryType _eEntryType); - void initializeTreeModel(); + void initializeTreeModel(); /** search in the tree for query- or tablecontainer equal to this interface and return this container entry @@ -346,22 +346,22 @@ namespace dbaui ::std::auto_ptr< ImageProvider > getImageProviderFor( SvLBoxEntry* _pAnyEntry ); - void implAdministrate( SvLBoxEntry* _pApplyTo ); + void implAdministrate( SvLBoxEntry* _pApplyTo ); TransferableHelper* implCopyObject( SvLBoxEntry* _pApplyTo, sal_Int32 _nCommandType, sal_Bool _bAllowConnection = sal_True ); - EntryType getEntryType( SvLBoxEntry* _pEntry ) const; - EntryType getChildType( SvLBoxEntry* _pEntry ) const; - sal_Bool isObject( EntryType _eType ) const { return ( etTableOrView== _eType ) || ( etQuery == _eType ); } - sal_Bool isContainer( EntryType _eType ) const { return (etTableContainer == _eType) || (etQueryContainer == _eType); } - sal_Bool isContainer( SvLBoxEntry* _pEntry ) const { return isContainer( getEntryType( _pEntry ) ); } + EntryType getEntryType( SvLBoxEntry* _pEntry ) const; + EntryType getChildType( SvLBoxEntry* _pEntry ) const; + sal_Bool isObject( EntryType _eType ) const { return ( etTableOrView== _eType ) || ( etQuery == _eType ); } + sal_Bool isContainer( EntryType _eType ) const { return (etTableContainer == _eType) || (etQueryContainer == _eType); } + sal_Bool isContainer( SvLBoxEntry* _pEntry ) const { return isContainer( getEntryType( _pEntry ) ); } // ensure that the xObject for the given entry is set on the user data - sal_Bool ensureEntryObject( SvLBoxEntry* _pEntry ); + sal_Bool ensureEntryObject( SvLBoxEntry* _pEntry ); // get the display text of the entry given - String GetEntryText( SvLBoxEntry* _pEntry ) const; + String GetEntryText( SvLBoxEntry* _pEntry ) const; // is called when a table or a query was selected DECL_LINK( OnSelectionChange, void* ); @@ -448,7 +448,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connectWithStatus( const ::rtl::OUString& _rDataSourceName, - void* _pTreeListUserData // in rela a DBTreeListUserData*, but we do not know this class here .... + void* _pTreeListUserData // in rela a DBTreeListUserData*, but we do not know this class here .... ); #ifdef DBG_UTIL @@ -475,9 +475,9 @@ namespace dbaui /** checks if the currently displayed entry changed - @param _sName + @param _sName Name of the changed entry - @param _pContainer + @param _pContainer The container of the displayed entry @return <TRUE/> if it is the currently displayed otherwise <FALSE/> @@ -491,7 +491,7 @@ namespace dbaui }; // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... #endif // _SBA_UNODATBR_HXX_ diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 0022ab64af77..c5c7078d599d 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ class OSQLMessageDialog OModuleClient m_aModuleClient; protected: // <properties> - ::com::sun::star::uno::Any m_aException; + ::com::sun::star::uno::Any m_aException; ::rtl::OUString m_sHelpURL; // </properties> @@ -78,11 +78,11 @@ protected: virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& _rConvertedValue, com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const com::sun::star::uno::Any& _rValue) throw(com::sun::star::lang::IllegalArgumentException); // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_UNOSQLMESSAGE_HXX_ diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 4473031808fe..ce0e28f7b165 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows, ,m_bAppendFirstLine(false) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ODatabaseExport" ); - DBG_CTOR(ODatabaseExport,NULL); + DBG_CTOR(ODatabaseExport,NULL); m_nRows += nRows; sal_Int32 nCount = 0; @@ -182,7 +182,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, ,m_bAppendFirstLine(false) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ODatabaseExport" ); - DBG_CTOR(ODatabaseExport,NULL); + DBG_CTOR(ODatabaseExport,NULL); try { SvtSysLocale aSysLocale; @@ -232,53 +232,53 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); sal_Int32 nType = aValue; ++nPos; - + if( nType == DataType::VARCHAR ) { - m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); - - m_pTypeInfo->aTypeName = sTypeName; - m_pTypeInfo->nType = nType; - + m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); + + m_pTypeInfo->aTypeName = sTypeName; + m_pTypeInfo->nType = nType; + OSL_ENSURE((nPos) < static_cast<sal_Int32>(aTypes.size()),"aTypes: Illegal index for vector"); aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->nPrecision = aValue; + m_pTypeInfo->nPrecision = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->aLiteralPrefix = aValue; + m_pTypeInfo->aLiteralPrefix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->aLiteralSuffix = aValue; + m_pTypeInfo->aLiteralSuffix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->aCreateParams = aValue; + m_pTypeInfo->aCreateParams = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; + m_pTypeInfo->bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bCaseSensitive = (sal_Bool)aValue; + m_pTypeInfo->bCaseSensitive = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->nSearchType = aValue; + m_pTypeInfo->nSearchType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bUnsigned = (sal_Bool)aValue; + m_pTypeInfo->bUnsigned = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bCurrency = (sal_Bool)aValue; + m_pTypeInfo->bCurrency = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->bAutoIncrement = (sal_Bool)aValue; + m_pTypeInfo->bAutoIncrement = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->aLocalTypeName = aValue; + m_pTypeInfo->aLocalTypeName = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->nMinimumScale = aValue; + m_pTypeInfo->nMinimumScale = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - m_pTypeInfo->nMaximumScale = aValue; + m_pTypeInfo->nMaximumScale = aValue; // check if values are less than zero like it happens in a oracle jdbc driver if( m_pTypeInfo->nPrecision < 0) @@ -292,13 +292,13 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, } } // if(xSet.is()) if ( !m_pTypeInfo ) - m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); + m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); SetColumnTypes(pList,_pInfoMap); } //--------------------------------------------------------------------------- ODatabaseExport::~ODatabaseExport() { - DBG_DTOR(ODatabaseExport,NULL); + DBG_DTOR(ODatabaseExport,NULL); m_pFormatter = NULL; ODatabaseExport::TColumns::iterator aIter = m_aDestColumns.begin(); ODatabaseExport::TColumns::iterator aEnd = m_aDestColumns.end(); @@ -306,7 +306,7 @@ ODatabaseExport::~ODatabaseExport() for(;aIter != aEnd;++aIter) delete aIter->second; m_vDestVector.clear(); - m_aDestColumns.clear(); + m_aDestColumns.clear(); } // ----------------------------------------------------------------------------- void ODatabaseExport::insertValueIntoColumn() @@ -357,7 +357,7 @@ void ODatabaseExport::insertValueIntoColumn() { Reference< XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); Reference<XNumberFormatTypes> xNumType(xSupplier->getNumberFormats(),UNO_QUERY); - sal_Int16 nFormats[] = { + sal_Int16 nFormats[] = { NumberFormat::DATETIME ,NumberFormat::DATE ,NumberFormat::TIME @@ -454,7 +454,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl xProp->getPropertyValue(PROPERTY_TYPE) >>= nNumberFormat; } else - { + { Reference<XNumberFormatTypes> xNumType(xFormats,UNO_QUERY); sal_Int32 nFormatKey = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::ALL,m_aLocale),aCheckToken); fOutNumber = m_xFormatter->convertStringToNumber(nFormatKey,aCheckToken); @@ -462,7 +462,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl Reference<XPropertySet> xProp = xFormats->getByKey(nFormatKey); sal_Int16 nType = 0; xProp->getPropertyValue(PROPERTY_TYPE) >>= nType; - + switch(nType) { case NumberFormat::ALL: @@ -590,15 +590,15 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo sal_Int32 nDataType; sal_Int32 nLength(0),nScale(0); sal_Int16 nType = m_vNumberFormat[i] & ~NumberFormat::DEFINED; - + switch ( nType ) { case NumberFormat::ALL: nDataType = DataType::DOUBLE; break; case NumberFormat::DEFINED: - nDataType = DataType::VARCHAR; - nLength = ((m_vColumnSize[i] % 10 ) ? m_vColumnSize[i]/ 10 + 1: m_vColumnSize[i]/ 10) * 10; + nDataType = DataType::VARCHAR; + nLength = ((m_vColumnSize[i] % 10 ) ? m_vColumnSize[i]/ 10 + 1: m_vColumnSize[i]/ 10) * 10; break; case NumberFormat::DATE: nDataType = DataType::DATE; @@ -611,8 +611,8 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo break; case NumberFormat::CURRENCY: nDataType = DataType::NUMERIC; - nScale = 4; - nLength = 19; + nScale = 4; + nLength = 19; break; case NumberFormat::NUMBER: case NumberFormat::SCIENTIFIC: @@ -625,7 +625,7 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo case NumberFormat::LOGICAL: default: nDataType = DataType::VARCHAR; - nLength = ((m_vColumnSize[i] % 10 ) ? m_vColumnSize[i]/ 10 + 1: m_vColumnSize[i]/ 10) * 10; + nLength = ((m_vColumnSize[i] % 10 ) ? m_vColumnSize[i]/ 10 + 1: m_vColumnSize[i]/ 10) * 10; break; } OTypeInfoMap::const_iterator aFind = _pInfoMap->find(nDataType); @@ -651,7 +651,7 @@ void ODatabaseExport::CreateDefaultColumn(const ::rtl::OUString& _rColumnName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::CreateDefaultColumn" ); DBG_CHKTHIS(ODatabaseExport,NULL); - Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData()); + Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData()); sal_Int32 nMaxNameLen(xDestMetaData->getMaxColumnNameLength()); ::rtl::OUString aAlias = _rColumnName; if ( isSQL92CheckEnabled(m_xConnection) ) @@ -659,7 +659,7 @@ void ODatabaseExport::CreateDefaultColumn(const ::rtl::OUString& _rColumnName) if(nMaxNameLen && aAlias.getLength() > nMaxNameLen) aAlias = aAlias.copy(0, ::std::min<sal_Int32>( nMaxNameLen-1, aAlias.getLength() ) ); - + ::rtl::OUString sName(aAlias); if(m_aDestColumns.find(sName) != m_aDestColumns.end()) { @@ -747,10 +747,10 @@ sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _rTableName,const if(_aTextColor.hasValue()) m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,_aTextColor); } - m_bIsAutoIncrement = aWizard.shouldCreatePrimaryKey(); - m_vColumns = aWizard.GetColumnPositions(); - m_vColumnTypes = aWizard.GetColumnTypes(); - m_bAppendFirstLine = !aWizard.UseHeaderLine(); + m_bIsAutoIncrement = aWizard.shouldCreatePrimaryKey(); + m_vColumns = aWizard.GetColumnPositions(); + m_vColumnTypes = aWizard.GetColumnTypes(); + m_bAppendFirstLine = !aWizard.UseHeaderLine(); } break; default: @@ -763,9 +763,9 @@ sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _rTableName,const if(!bError) bError = !createRowSet(); } - catch( const SQLException&) + catch( const SQLException&) { - ::dbaui::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), &aWizard, m_xFactory ); + ::dbaui::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), &aWizard, m_xFactory ); bError = sal_True; } catch( const Exception& ) diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 2764d2fc6116..0ddc53d92d58 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,20 +75,20 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; -#define DBAUI_HTML_FONTSIZES 8 // wie Export, HTML-Options -#define HTML_META_NONE 0 -#define HTML_META_AUTHOR 1 -#define HTML_META_DESCRIPTION 2 -#define HTML_META_KEYWORDS 3 -#define HTML_META_REFRESH 4 +#define DBAUI_HTML_FONTSIZES 8 // wie Export, HTML-Options +#define HTML_META_NONE 0 +#define HTML_META_AUTHOR 1 +#define HTML_META_DESCRIPTION 2 +#define HTML_META_KEYWORDS 3 +#define HTML_META_REFRESH 4 #define HTML_META_CLASSIFICATION 5 -#define HTML_META_CREATED 6 -#define HTML_META_CHANGEDBY 7 -#define HTML_META_CHANGED 8 -#define HTML_META_GENERATOR 9 -#define HTML_META_SDFOOTNOTE 10 -#define HTML_META_SDENDNOTE 11 -#define HTML_META_CONTENT_TYPE 12 +#define HTML_META_CREATED 6 +#define HTML_META_CHANGEDBY 7 +#define HTML_META_CHANGED 8 +#define HTML_META_GENERATOR 9 +#define HTML_META_SDFOOTNOTE 10 +#define HTML_META_SDENDNOTE 11 +#define HTML_META_CONTENT_TYPE 12 // ========================================================================== DBG_NAME(OHTMLReader) @@ -99,7 +99,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, - const OTypeInfoMap* _pInfoMap) + const OTypeInfoMap* _pInfoMap) :HTMLParser(rIn) ,ODatabaseExport( _rxConnection, _rxNumberF, _rM, pList, _pInfoMap, rIn ) ,m_nTableCount(0) @@ -161,13 +161,13 @@ void OHTMLReader::NextToken( int nToken ) if ( nToken == HTML_META ) setTextEncoding(); - if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll + if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll { switch(nToken) { case HTML_TABLE_ON: ++m_nTableCount; - { // es kann auch TD oder TH sein, wenn es vorher kein TABLE gab + { // es kann auch TD oder TH sein, wenn es vorher kein TABLE gab const HTMLOptions* pHtmlOptions = GetOptions(); sal_Int16 nArrLen = pHtmlOptions->Count(); for ( sal_Int16 i = 0; i < nArrLen; i++ ) @@ -176,7 +176,7 @@ void OHTMLReader::NextToken( int nToken ) switch( pOption->GetToken() ) { case HTML_O_WIDTH: - { // Prozent: von Dokumentbreite bzw. aeusserer Zelle + { // Prozent: von Dokumentbreite bzw. aeusserer Zelle m_nColumnWidth = GetWidthPixel( pOption ); } break; @@ -187,7 +187,7 @@ void OHTMLReader::NextToken( int nToken ) case HTML_TBODY_ON: { sal_uInt32 nTell = rInput.Tell(); // verändert vielleicht die Position des Streams - if ( !m_xTable.is() ) + if ( !m_xTable.is() ) {// erste Zeile als Header verwenden m_bError = !CreateTable(nToken); if ( m_bAppendFirstLine ) @@ -406,7 +406,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor) String aFontName; xub_StrLen nPos = 0; while( nPos != STRING_NOTFOUND ) - { // Fontliste, VCL: Semikolon als Separator, HTML: Komma + { // Fontliste, VCL: Semikolon als Separator, HTML: Komma String aFName = rFace.GetToken( 0, ',', nPos ); aFName.EraseTrailingChars().EraseLeadingChars(); if( aFontName.Len() ) @@ -438,19 +438,19 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption* pOption ) DBG_CHKTHIS(OHTMLReader,NULL); const String& rOptVal = pOption->GetString(); if ( rOptVal.Search('%') != STRING_NOTFOUND ) - { // Prozent + { // Prozent DBG_ASSERT( m_nColumnWidth, "WIDTH Option: m_nColumnWidth==0 und Width%" ); return (sal_Int16)((pOption->GetNumber() * m_nColumnWidth) / 100); } else { if ( rOptVal.Search('*') != STRING_NOTFOUND ) - { // relativ zu was?!? + { // relativ zu was?!? //2do: ColArray aller relativen Werte sammeln und dann MakeCol return 0; } else - return (sal_Int16)pOption->GetNumber(); // Pixel + return (sal_Int16)pOption->GetNumber(); // Pixel } } // --------------------------------------------------------------------------- @@ -559,13 +559,13 @@ sal_Bool OHTMLReader::CreateTable(int nToken) CreateDefaultColumn(aColumnName); if ( m_vDestVector.empty() ) - return sal_False; + return sal_False; if(!aTableName.Len()) aTableName = aTempName; - m_bInTbl = sal_False; - m_bFoundTable = sal_True; + m_bInTbl = sal_False; + m_bFoundTable = sal_True; if ( isCheckEnabled() ) return sal_True; diff --git a/dbaccess/source/ui/misc/ModuleHelper.cxx b/dbaccess/source/ui/misc/ModuleHelper.cxx index 7a38e3df08eb..59f432022dbd 100644 --- a/dbaccess/source/ui/misc/ModuleHelper.cxx +++ b/dbaccess/source/ui/misc/ModuleHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace dbaui return s_aModule; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 386c17312221..4fc81391ebec 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,16 +48,16 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::lang; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; // export data -ORowSetImportExport::ORowSetImportExport( Window* _pParent, +ORowSetImportExport::ORowSetImportExport( Window* _pParent, const Reference< XResultSetUpdate >& _xResultSetUpdate, const ::svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XMultiServiceFactory >& _rM, const String& rExchange - ) - : ODatabaseImportExport(_aDataDescriptor,_rM,NULL,rExchange) + ) + : ODatabaseImportExport(_aDataDescriptor,_rM,NULL,rExchange) ,m_xTargetResultSetUpdate(_xResultSetUpdate) ,m_xTargetRowUpdate(_xResultSetUpdate,UNO_QUERY) ,m_pParent(_pParent) @@ -70,15 +70,15 @@ ORowSetImportExport::ORowSetImportExport( Window* _pParent, void ORowSetImportExport::initialize() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::initialize" ); - ODatabaseImportExport::initialize(); - // do namemapping + ODatabaseImportExport::initialize(); + // do namemapping Reference<XColumnLocate> xColumnLocate(m_xResultSet,UNO_QUERY); OSL_ENSURE(xColumnLocate.is(),"The rowset normally should support this"); m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData(); if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() ) throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); - + sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount(); m_aColumnMapping.reserve(nCount); m_aColumnTypes.reserve(nCount); @@ -97,7 +97,7 @@ void ORowSetImportExport::initialize() if(m_xTargetResultSetMetaData->isNullable(i)) nPos = 0; // column doesn't exists but we could set it to null } - } + } m_aColumnMapping.push_back(nPos); if(nPos > 0) @@ -126,7 +126,7 @@ BOOL ORowSetImportExport::Read() if(m_aSelection.getLength()) { const Any* pBegin = m_aSelection.getConstArray(); - const Any* pEnd = pBegin + m_aSelection.getLength(); + const Any* pEnd = pBegin + m_aSelection.getLength(); for(;pBegin != pEnd && bContinue;++pBegin) { sal_Int32 nPos = -1; @@ -161,7 +161,7 @@ BOOL ORowSetImportExport::Read() if(!m_pRowMarker || m_pRowMarker[nRowFilterIndex] == nCurrentRow) { ++nRowFilterIndex; - bContinue = insertNewRow(); + bContinue = insertNewRow(); } } } diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index f4f1ae4013cb..725b82297a5e 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,13 +69,13 @@ DBG_NAME(ORTFReader) // ========================================================================== // ORTFReader // ========================================================================== -ORTFReader::ORTFReader( SvStream& rIn, +ORTFReader::ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap) - :SvRTFParser(rIn) + :SvRTFParser(rIn) ,ODatabaseExport( _rxConnection, _rxNumberF, _rM, pList, _pInfoMap, rIn ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" ); @@ -91,7 +91,7 @@ ORTFReader::ORTFReader(SvStream& rIn, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, sal_Bool _bAutoIncrementEnabled) - :SvRTFParser(rIn) + :SvRTFParser(rIn) ,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rM, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" ); @@ -122,7 +122,7 @@ void ORTFReader::NextToken( int nToken ) if(m_bError || !m_nRows) // falls Fehler oder keine Rows mehr zur "Uberpr"ufung dann gleich zur"uck return; - if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll + if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll { switch(nToken) { @@ -138,9 +138,9 @@ void ORTFReader::NextToken( int nToken ) { switch(nTmpToken2) { - case RTF_RED: aColor.SetRed((sal_uInt8)nTokenValue); break; - case RTF_BLUE: aColor.SetBlue((sal_uInt8)nTokenValue); break; - case RTF_GREEN: aColor.SetGreen((sal_uInt8)nTokenValue); break; + case RTF_RED: aColor.SetRed((sal_uInt8)nTokenValue); break; + case RTF_BLUE: aColor.SetBlue((sal_uInt8)nTokenValue); break; + case RTF_GREEN: aColor.SetGreen((sal_uInt8)nTokenValue); break; default: bNext = sal_False; } @@ -278,7 +278,7 @@ sal_Bool ORTFReader::CreateTable(int nToken) String aTableName(ModuleRes(STR_TBL_TITLE)); aTableName = aTableName.GetToken(0,' '); aTableName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTableName))); - + int nTmpToken2 = nToken; String aColumnName; @@ -315,8 +315,8 @@ sal_Bool ORTFReader::CreateTable(int nToken) } break; case RTF_CF: - // if(nTokenValue < m_vecColor.size()) - // m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,makeAny(m_vecColor[nTokenValue])); + // if(nTokenValue < m_vecColor.size()) + // m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,makeAny(m_vecColor[nTokenValue])); break; case RTF_B: aFont.Weight = ::com::sun::star::awt::FontWeight::BOLD; @@ -344,15 +344,15 @@ sal_Bool ORTFReader::CreateTable(int nToken) CreateDefaultColumn(aColumnName); } - m_bInTbl = sal_False; - m_bFoundTable = sal_True; + m_bInTbl = sal_False; + m_bFoundTable = sal_True; if ( isCheckEnabled() ) return sal_True; Any aTextColor; if(!m_vecColor.empty()) aTextColor <<= m_vecColor[0]; - + bOk = !executeWizard(aTableName,aTextColor,aFont) && m_xTable.is(); } return bOk; diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 8cca42ddf1b4..eb031d074420 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -197,7 +197,7 @@ void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteDa // ----------------------------------------------------------------------------- void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId - ,const TransferableDataHelper& _rTransData + ,const TransferableDataHelper& _rTransData ,const ::rtl::OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { @@ -219,8 +219,8 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId else const_cast<TransferableDataHelper&>(_rTransData).GetSotStorageStream(SOT_FORMAT_RTF,aTrans.aHtmlRtfStorage); - aTrans.nType = E_TABLE; - aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId; + aTrans.nType = E_TABLE; + aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !copyTagTable(aTrans,sal_False,_xConnection) ) m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString::createFromAscii("S1000") ,0,Any())); @@ -239,7 +239,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId } // ----------------------------------------------------------------------------- -void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData +void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData ,const ::rtl::OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { @@ -269,17 +269,17 @@ sal_Bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc //dyf add 20070601 //set the selected tablename pImport->setSTableName(_rDesc.sDefaultTableName); - //dyf add end + //dyf add end pImport->setStream(pStream); return pImport->Read(); } // ----------------------------------------------------------------------------- sal_Bool OTableCopyHelper::isTableFormat(const TransferableDataHelper& _rClipboard) const { - sal_Bool bTableFormat = _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE) - || _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) - || _rClipboard.HasFormat(SOT_FORMAT_RTF) - || _rClipboard.HasFormat(SOT_FORMATSTR_ID_HTML); + sal_Bool bTableFormat = _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE) + || _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) + || _rClipboard.HasFormat(SOT_FORMAT_RTF) + || _rClipboard.HasFormat(SOT_FORMATSTR_ID_HTML); return bTableFormat; } @@ -297,8 +297,8 @@ sal_Bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedD else const_cast<TransferableDataHelper&>(_aDroppedData).GetSotStorageStream(SOT_FORMAT_RTF,_rAsyncDrop.aHtmlRtfStorage); - _rAsyncDrop.bHtml = bHtml; - _rAsyncDrop.bError = !copyTagTable(_rAsyncDrop,sal_True,_xConnection); + _rAsyncDrop.bHtml = bHtml; + _rAsyncDrop.bError = !copyTagTable(_rAsyncDrop,sal_True,_xConnection); bRet = ( !_rAsyncDrop.bError && _rAsyncDrop.aHtmlRtfStorage.Is() ); if ( bRet ) @@ -339,7 +339,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index e165df1c7b1b..82d2bfddb827 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,12 +87,12 @@ const char __FAR_DATA ODatabaseImportExport::sNewLine = '\012'; const char __FAR_DATA ODatabaseImportExport::sNewLine[] = "\015\012"; #endif -const static char __FAR_DATA sMyBegComment[] = "<!-- "; -const static char __FAR_DATA sMyEndComment[] = " -->"; -const static char __FAR_DATA sFontFamily[] = "font-family: "; -const static char __FAR_DATA sFontSize[] = "font-size: "; +const static char __FAR_DATA sMyBegComment[] = "<!-- "; +const static char __FAR_DATA sMyEndComment[] = " -->"; +const static char __FAR_DATA sFontFamily[] = "font-family: "; +const static char __FAR_DATA sFontSize[] = "font-size: "; -#define SBA_FORMAT_SELECTION_COUNT 4 +#define SBA_FORMAT_SELECTION_COUNT 4 #define CELL_X 1437 DBG_NAME(ODatabaseImportExport) @@ -202,7 +202,7 @@ void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) thro dispose(); m_bNeedToReInitialize = true; //if(!m_bInInitialize) - // initialize(); + // initialize(); } } // ----------------------------------------------------------------------------- @@ -221,7 +221,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor { m_sDataSourceName = _aDataDescriptor.getDataSource(); _aDataDescriptor[daCommandType] >>= m_nCommandType; - _aDataDescriptor[daCommand] >>= m_sName; + _aDataDescriptor[daCommand] >>= m_sName; // some additonal information if(_aDataDescriptor.has(daConnection)) { @@ -284,7 +284,7 @@ void ODatabaseImportExport::initialize() m_bNeedToReInitialize = false; if ( !m_xConnection.is() ) - { // we need a connection + { // we need a connection OSL_ENSURE(m_sDataSourceName.getLength(),"There must be a datsource name!"); Reference<XNameAccess> xDatabaseContext = Reference< XNameAccess >(m_xFactory->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY); Reference< XEventListener> xEvt((::cppu::OWeakObject*)this,UNO_QUERY); @@ -400,8 +400,8 @@ BOOL ORTFImportExport::Write() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFImportExport::Write" ); ODatabaseImportExport::Write(); - (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_RTF; - (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << ODatabaseImportExport::sNewLine; + (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_RTF; + (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << ODatabaseImportExport::sNewLine; rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252; /* @@ -452,14 +452,14 @@ BOOL ORTFImportExport::Write() } */ - BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); - BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); - BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); - BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); + BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); + BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); + BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); + BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); sal_Int32 nColor = 0; if(m_xObject.is()) - m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; + m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; ::Color aColor(nColor); ByteString aFonts(String(m_aFont.Name),eDestEnc); @@ -471,7 +471,7 @@ BOOL ORTFImportExport::Write() ::rtl::OString aFormat("\\fcharset0\\fnil "); ByteString aFontNr; - (*m_pStream) << "{\\fonttbl"; + (*m_pStream) << "{\\fonttbl"; xub_StrLen nTokenCount = aFonts.GetTokenCount(); for(xub_StrLen j=0;j<nTokenCount;++j) { @@ -549,10 +549,10 @@ BOOL ORTFImportExport::Write() const char* pChar; switch( nAlign ) { - case 1: pChar = OOO_STRING_SVTOOLS_RTF_QC; break; - case 2: pChar = OOO_STRING_SVTOOLS_RTF_QR; break; + case 1: pChar = OOO_STRING_SVTOOLS_RTF_QC; break; + case 2: pChar = OOO_STRING_SVTOOLS_RTF_QR; break; case 0: - default:pChar = OOO_STRING_SVTOOLS_RTF_QL; break; + default:pChar = OOO_STRING_SVTOOLS_RTF_QL; break; } pHorzChar[i-1] = pChar; // um sp"ater nicht immer im ITEMSET zuw"uhlen @@ -561,10 +561,10 @@ BOOL ORTFImportExport::Write() (*m_pStream) << '{'; (*m_pStream) << OOO_STRING_SVTOOLS_RTF_QC; // column header always centered - if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B; - if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I; - if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL; - if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE; + if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B; + if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I; + if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL; + if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE; (*m_pStream) << aFS; (*m_pStream) << ' '; @@ -573,7 +573,7 @@ BOOL ORTFImportExport::Write() (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL; (*m_pStream) << '}'; (*m_pStream) << ODatabaseImportExport::sNewLine; - (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; + (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; } (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ROW; @@ -587,7 +587,7 @@ BOOL ORTFImportExport::Write() if ( m_aSelection.getLength() ) { const Any* pSelIter = m_aSelection.getConstArray(); - const Any* pEnd = pSelIter + m_aSelection.getLength(); + const Any* pEnd = pSelIter + m_aSelection.getLength(); sal_Bool bContinue = sal_True; for( ; pSelIter != pEnd && bContinue; ++pSelIter ) @@ -642,10 +642,10 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou (*m_pStream) << ODatabaseImportExport::sNewLine; } - const BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); - const BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); - const BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); - const BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); + const BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); + const BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); + const BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); + const BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); static const ::rtl::OString aFS2("\\fs20\\f1\\cf0\\cb1"); ::comphelper::ComponentContext aContext(m_xFactory); Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY); @@ -658,10 +658,10 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou (*m_pStream) << '{'; (*m_pStream) << pHorzChar[i-1]; - if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B; - if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I; - if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL; - if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE; + if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B; + if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I; + if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL; + if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE; (*m_pStream) << aFS2; (*m_pStream) << ' '; @@ -684,7 +684,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL; (*m_pStream) << '}'; (*m_pStream) << ODatabaseImportExport::sNewLine; - (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; + (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; } (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ROW << ODatabaseImportExport::sNewLine; (*m_pStream) << '}'; @@ -726,17 +726,17 @@ const char __FAR_DATA OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t //======================================================================== // Makros fuer HTML-Export //======================================================================== -#define OUT_PROLOGUE() ((*m_pStream) << sHTML30_Prologue << ODatabaseImportExport::sNewLine << ODatabaseImportExport::sNewLine) -#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag ) -#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, FALSE ) -#define OUT_STR( str ) HTMLOutFuncs::Out_String( (*m_pStream), str ) -#define OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine << GetIndentStr() -#define lcl_OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine -#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) -#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) -#define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule ) -#define OUT_COMMENT( comment ) ((*m_pStream) << sMyBegComment, OUT_STR( comment ) << sMyEndComment << ODatabaseImportExport::sNewLine << GetIndentStr()) -#define lcl_OUT_COMMENT( comment ) ((*m_pStream) << sMyBegComment, OUT_STR( comment ) << sMyEndComment << ODatabaseImportExport::sNewLine) +#define OUT_PROLOGUE() ((*m_pStream) << sHTML30_Prologue << ODatabaseImportExport::sNewLine << ODatabaseImportExport::sNewLine) +#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag ) +#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, FALSE ) +#define OUT_STR( str ) HTMLOutFuncs::Out_String( (*m_pStream), str ) +#define OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine << GetIndentStr() +#define lcl_OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine +#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) +#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) +#define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule ) +#define OUT_COMMENT( comment ) ((*m_pStream) << sMyBegComment, OUT_STR( comment ) << sMyEndComment << ODatabaseImportExport::sNewLine << GetIndentStr()) +#define lcl_OUT_COMMENT( comment ) ((*m_pStream) << sMyBegComment, OUT_STR( comment ) << sMyEndComment << ODatabaseImportExport::sNewLine) //------------------------------------------------------------------- OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor, @@ -839,7 +839,7 @@ void OHTMLImportExport::WriteBody() (*m_pStream) << '<' << OOO_STRING_SVTOOLS_HTML_body << ' ' << OOO_STRING_SVTOOLS_HTML_O_text << '='; sal_Int32 nColor = 0; if(m_xObject.is()) - m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; + m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; ::Color aColor(nColor); HTMLOutFuncs::Out_Color( (*m_pStream), aColor ); @@ -883,21 +883,21 @@ void OHTMLImportExport::WriteTables() } } - aStrOut = aStrOut + " "; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_align; - aStrOut = aStrOut + "="; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_AL_left; - aStrOut = aStrOut + " "; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cellspacing; - aStrOut = aStrOut + "="; - aStrOut = aStrOut + ::rtl::OString::valueOf((sal_Int32)nCellSpacing); - aStrOut = aStrOut + " "; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cols; - aStrOut = aStrOut + "="; - aStrOut = aStrOut + ::rtl::OString::valueOf(aNames.getLength()); - aStrOut = aStrOut + " "; - aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_border; - aStrOut = aStrOut + "=1"; + aStrOut = aStrOut + " "; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_align; + aStrOut = aStrOut + "="; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_AL_left; + aStrOut = aStrOut + " "; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cellspacing; + aStrOut = aStrOut + "="; + aStrOut = aStrOut + ::rtl::OString::valueOf((sal_Int32)nCellSpacing); + aStrOut = aStrOut + " "; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cols; + aStrOut = aStrOut + "="; + aStrOut = aStrOut + ::rtl::OString::valueOf(aNames.getLength()); + aStrOut = aStrOut + " "; + aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_border; + aStrOut = aStrOut + "=1"; IncIndent(1); TAG_ON( aStrOut ); @@ -907,7 +907,7 @@ void OHTMLImportExport::WriteTables() TAG_ON( OOO_STRING_SVTOOLS_HTML_caption ); TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); - (*m_pStream) << ::rtl::OString(m_sName,m_sName.getLength(), gsl_getSystemTextEncoding()); + (*m_pStream) << ::rtl::OString(m_sName,m_sName.getLength(), gsl_getSystemTextEncoding()); // TODO : think about the encoding of the name TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption ); @@ -953,9 +953,9 @@ void OHTMLImportExport::WriteTables() switch( nAlign ) { - case 1: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_center; break; - case 2: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_right; break; - default: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_left; break; + case 1: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_center; break; + case 2: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_right; break; + default: pHorJustify[i] = OOO_STRING_SVTOOLS_HTML_AL_left; break; } if(i == aNames.getLength()-1) @@ -1036,8 +1036,8 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteCell" ); ::rtl::OString aStrTD = pHtmlTag; - nWidthPixel = nWidthPixel ? nWidthPixel : 86; - nHeightPixel = nHeightPixel ? nHeightPixel : 17; + nWidthPixel = nWidthPixel ? nWidthPixel : 86; + nHeightPixel = nHeightPixel ? nHeightPixel : 17; // trotz der <TABLE COLS=n> und <COL WIDTH=x> Angaben noetig, // da die nicht von Netscape beachtet werden.. @@ -1081,26 +1081,26 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I FontOn(); - BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); - BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); - BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); - BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); + BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); + BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); + BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); + BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); - if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); - if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic ); - if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline ); - if ( bStrikeout ) TAG_ON( OOO_STRING_SVTOOLS_HTML_strike ); + if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); + if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic ); + if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline ); + if ( bStrikeout ) TAG_ON( OOO_STRING_SVTOOLS_HTML_strike ); if ( !rValue.Len() ) - TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle + TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle else HTMLOutFuncs::Out_String( (*m_pStream), rValue ,m_eDestEnc); + - - if ( bStrikeout ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_strike ); - if ( bUnderline ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline ); - if ( bItalic ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic ); - if ( bBold ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); + if ( bStrikeout ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_strike ); + if ( bUnderline ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline ); + if ( bItalic ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic ); + if ( bBold ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); FontOff(); @@ -1131,7 +1131,7 @@ void OHTMLImportExport::FontOn() sal_Int32 nColor = 0; if(m_xObject.is()) - m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; + m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; ::Color aColor(nColor); HTMLOutFuncs::Out_Color( (*m_pStream), aColor ); diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 43e5883b86db..78b4fb71a589 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,21 +56,21 @@ namespace dbaui SvtMiscOptions().RemoveListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); DBG_DTOR(OToolBoxHelper,NULL); - } - + } + // ----------------------------------------------------------------------------- void OToolBoxHelper::checkImageList() { if ( m_pToolBox ) { sal_Int16 nCurSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); - if ( nCurSymbolsSize != m_nSymbolsSize || + if ( nCurSymbolsSize != m_nSymbolsSize || m_bIsHiContrast != m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode() ) { - m_nSymbolsSize = nCurSymbolsSize; + m_nSymbolsSize = nCurSymbolsSize; m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); - + m_pToolBox->SetImageList( getImageList(m_nSymbolsSize,m_bIsHiContrast) ); Size aTbOldSize = m_pToolBox->GetSizePixel(); adjustToolBoxSize(m_pToolBox); @@ -101,11 +101,11 @@ namespace dbaui if ( m_pToolBox && _pEvt && _pEvt->GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { DataChangedEvent* pData = reinterpret_cast<DataChangedEvent*>(_pEvt->GetData()); - if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) || - ( pData->GetType() == DATACHANGED_DISPLAY )) && - ( pData->GetFlags() & SETTINGS_STYLE ))) + if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) || + ( pData->GetType() == DATACHANGED_DISPLAY )) && + ( pData->GetFlags() & SETTINGS_STYLE ))) // check if imagelist changed - checkImageList(); + checkImageList(); } return 0L; @@ -117,7 +117,7 @@ namespace dbaui m_pToolBox = _pTB; if ( m_pToolBox ) { - // m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); + // m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); ConfigOptionsChanged(NULL); if ( bFirstTime ) adjustToolBoxSize(m_pToolBox); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 089025b511f7..83bbc4cc82ee 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,11 +84,11 @@ #include <svx/svxids.hrc> -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN -#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO +#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY +#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY +#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK +#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN +#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO #include <svl/itempool.hxx> #include <tools/string.hxx> @@ -151,7 +151,7 @@ using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING; using ::com::sun::star::frame::XModel; // ----------------------------------------------------------------------------- -SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, +SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, const Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF, Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, @@ -170,7 +170,7 @@ SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, return createConnection(xProp,_rMF,_rEvtLst,_rOUTConnection); } // ----------------------------------------------------------------------------- -SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource, +SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource, const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF, Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ) @@ -199,14 +199,14 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP try { if(bPwdReq && !sPwd.getLength()) - { // password required, but empty -> connect using an interaction handler + { // password required, but empty -> connect using an interaction handler Reference<XCompletedConnection> xConnectionCompletion(_xDataSource, UNO_QUERY); if (!xConnectionCompletion.is()) { OSL_ENSURE(0,"createConnection: missing an interface ... need an error message here!"); } else - { // instantiate the default SDB interaction handler + { // instantiate the default SDB interaction handler Reference< XInteractionHandler > xHandler(_rMF->createInstance(SERVICE_TASK_INTERACTION_HANDLER), UNO_QUERY); if (!xHandler.is()) { @@ -233,7 +233,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP catch(SQLException& e) { aInfo = SQLExceptionInfo(e); } catch(Exception&) { OSL_ENSURE(0,"SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); } - // showError(aInfo); + // showError(aInfo); return aInfo; } @@ -366,24 +366,24 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, { // search the best matching type #ifdef DBG_UTIL - ::rtl::OUString sDBTypeName = aIter->second->aTypeName; (void)sDBTypeName; - sal_Int32 nDBTypePrecision = aIter->second->nPrecision; (void)nDBTypePrecision; - sal_Int32 nDBTypeScale = aIter->second->nMaximumScale; (void)nDBTypeScale; - sal_Bool bDBAutoIncrement = aIter->second->bAutoIncrement; (void)bDBAutoIncrement; + ::rtl::OUString sDBTypeName = aIter->second->aTypeName; (void)sDBTypeName; + sal_Int32 nDBTypePrecision = aIter->second->nPrecision; (void)nDBTypePrecision; + sal_Int32 nDBTypeScale = aIter->second->nMaximumScale; (void)nDBTypeScale; + sal_Bool bDBAutoIncrement = aIter->second->bAutoIncrement; (void)bDBAutoIncrement; #endif - if ( ( + if ( ( !_sTypeName.getLength() - || (aIter->second->aTypeName.equalsIgnoreAsciiCase(_sTypeName)) + || (aIter->second->aTypeName.equalsIgnoreAsciiCase(_sTypeName)) ) - && ( + && ( ( !aIter->second->aCreateParams.getLength() - && !_sCreateParams.getLength() + && !_sCreateParams.getLength() ) - || ( - (aIter->second->nPrecision >= _nPrecision) - && (aIter->second->nMaximumScale >= _nScale) - && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) + || ( + (aIter->second->nPrecision >= _nPrecision) + && (aIter->second->nMaximumScale >= _nScale) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) ) ) @@ -397,33 +397,33 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, sal_Int32 nPrec = aIter->second->nPrecision; sal_Int32 nScale = aIter->second->nMaximumScale; // search the best matching type (now comparing the local names) - if ( (aIter->second->aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName)) - && (nPrec >= _nPrecision) - && (nScale >= _nScale) - && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) + if ( (aIter->second->aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName)) + && (nPrec >= _nPrecision) + && (nScale >= _nScale) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) { OSL_ENSURE(sal_False, - ( ::rtl::OString("getTypeInfoFromType: assuming column type ") - += ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding()) - += ::rtl::OString("\" (expected type name ") - += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) - += ::rtl::OString(" matches the type's local name).")).getStr()); + ( ::rtl::OString("getTypeInfoFromType: assuming column type ") + += ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString("\" (expected type name ") + += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString(" matches the type's local name).")).getStr()); break; } } } if (aIter == aPair.second) - { // no match for the names, no match for the local names + { // no match for the names, no match for the local names // -> drop the precision and the scale restriction, accept any type with the property // type id (nType) //OSL_ENSURE(sal_False, - // ( ::rtl::OString("getTypeInfoFromType: did not find a matching type") - // += ::rtl::OString(" (expected type name: ") - // += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) - // += ::rtl::OString(")! Defaulting to the first matching type.")).getStr()); + // ( ::rtl::OString("getTypeInfoFromType: did not find a matching type") + // += ::rtl::OString(" (expected type name: ") + // += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) + // += ::rtl::OString(")! Defaulting to the first matching type.")).getStr()); for(aIter = aPair.first; aIter != aPair.second; ++aIter) { // search the best matching type (now comparing the local names) @@ -432,9 +432,9 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, #endif sal_Int32 nPrec = aIter->second->nPrecision; sal_Int32 nScale = aIter->second->nMaximumScale; - if ( (nPrec >= _nPrecision) - && (nScale >= _nScale) - && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) + if ( (nPrec >= _nPrecision) + && (nScale >= _nScale) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) break; } @@ -450,8 +450,8 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, ::rtl::OUString sDBTypeName = aIter->second->aTypeName; #endif sal_Int32 nScale = aIter->second->nMaximumScale; - if ( (nScale >= _nScale) - && (aIter->second->bAutoIncrement == _bAutoIncrement) + if ( (nScale >= _nScale) + && (aIter->second->bAutoIncrement == _bAutoIncrement) ) break; } @@ -499,7 +499,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, return pTypeInfo; } // ----------------------------------------------------------------------------- -void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, +void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const String& _rsTypeNames, OTypeInfoMap& _rTypeInfoMap, ::std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters) @@ -538,49 +538,49 @@ void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo } aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aTypeName = aValue; + pInfo->aTypeName = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nType = aValue; + pInfo->nType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nPrecision = aValue; + pInfo->nPrecision = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aLiteralPrefix = aValue; + pInfo->aLiteralPrefix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aLiteralSuffix = aValue; + pInfo->aLiteralSuffix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aCreateParams = aValue; + pInfo->aCreateParams = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; + pInfo->bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bCaseSensitive = (sal_Bool)aValue; + pInfo->bCaseSensitive = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nSearchType = aValue; + pInfo->nSearchType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bUnsigned = (sal_Bool)aValue; + pInfo->bUnsigned = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bCurrency = (sal_Bool)aValue; + pInfo->bCurrency = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->bAutoIncrement = (sal_Bool)aValue; + pInfo->bAutoIncrement = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->aLocalTypeName = aValue; + pInfo->aLocalTypeName = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nMinimumScale = aValue; + pInfo->nMinimumScale = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - pInfo->nMaximumScale = aValue; + pInfo->nMaximumScale = aValue; nPos = 18; aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); @@ -800,9 +800,9 @@ sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment) switch (_eAlignment) { case SVX_HOR_JUSTIFY_STANDARD: - case SVX_HOR_JUSTIFY_LEFT: nAlignment = ::com::sun::star::awt::TextAlign::LEFT; break; - case SVX_HOR_JUSTIFY_CENTER: nAlignment = ::com::sun::star::awt::TextAlign::CENTER; break; - case SVX_HOR_JUSTIFY_RIGHT: nAlignment = ::com::sun::star::awt::TextAlign::RIGHT; break; + case SVX_HOR_JUSTIFY_LEFT: nAlignment = ::com::sun::star::awt::TextAlign::LEFT; break; + case SVX_HOR_JUSTIFY_CENTER: nAlignment = ::com::sun::star::awt::TextAlign::CENTER; break; + case SVX_HOR_JUSTIFY_RIGHT: nAlignment = ::com::sun::star::awt::TextAlign::RIGHT; break; default: OSL_ENSURE(0,"Invalid TextAlign!"); } @@ -814,9 +814,9 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment) SvxCellHorJustify eJustify = SVX_HOR_JUSTIFY_LEFT; switch (_nAlignment) { - case ::com::sun::star::awt::TextAlign::LEFT : eJustify = SVX_HOR_JUSTIFY_LEFT; break; - case ::com::sun::star::awt::TextAlign::CENTER : eJustify = SVX_HOR_JUSTIFY_CENTER; break; - case ::com::sun::star::awt::TextAlign::RIGHT : eJustify = SVX_HOR_JUSTIFY_RIGHT; break; + case ::com::sun::star::awt::TextAlign::LEFT : eJustify = SVX_HOR_JUSTIFY_LEFT; break; + case ::com::sun::star::awt::TextAlign::CENTER : eJustify = SVX_HOR_JUSTIFY_CENTER; break; + case ::com::sun::star::awt::TextAlign::RIGHT : eJustify = SVX_HOR_JUSTIFY_RIGHT; break; default: OSL_ENSURE(0,"Invalid TextAlign!"); } @@ -880,24 +880,24 @@ float ConvertFontWidth( ::FontWidth eWidth ) ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const Font& rFont ) { ::com::sun::star::awt::FontDescriptor aFD; - aFD.Name = rFont.GetName(); - aFD.StyleName = rFont.GetStyleName(); - aFD.Height = (sal_Int16)rFont.GetSize().Height(); - aFD.Width = (sal_Int16)rFont.GetSize().Width(); - aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamily()); - aFD.CharSet = rFont.GetCharSet(); - aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch()); - aFD.CharacterWidth = ConvertFontWidth( rFont.GetWidthType() ); - aFD.Weight = ConvertFontWeight( rFont.GetWeight() ); - aFD.Slant = (::com::sun::star::awt::FontSlant)rFont.GetItalic(); - aFD.Underline = sal::static_int_cast< sal_Int16 >( + aFD.Name = rFont.GetName(); + aFD.StyleName = rFont.GetStyleName(); + aFD.Height = (sal_Int16)rFont.GetSize().Height(); + aFD.Width = (sal_Int16)rFont.GetSize().Width(); + aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamily()); + aFD.CharSet = rFont.GetCharSet(); + aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch()); + aFD.CharacterWidth = ConvertFontWidth( rFont.GetWidthType() ); + aFD.Weight = ConvertFontWeight( rFont.GetWeight() ); + aFD.Slant = (::com::sun::star::awt::FontSlant)rFont.GetItalic(); + aFD.Underline = sal::static_int_cast< sal_Int16 >( rFont.GetUnderline()); - aFD.Strikeout = sal::static_int_cast< sal_Int16 >( + aFD.Strikeout = sal::static_int_cast< sal_Int16 >( rFont.GetStrikeout()); - aFD.Orientation = rFont.GetOrientation(); - aFD.Kerning = rFont.IsKerning(); - aFD.WordLineMode = rFont.IsWordLineMode(); - aFD.Type = 0; // ??? => Nur an Metric... + aFD.Orientation = rFont.GetOrientation(); + aFD.Kerning = rFont.IsKerning(); + aFD.WordLineMode = rFont.IsWordLineMode(); + aFD.Type = 0; // ??? => Nur an Metric... return aFD; } // ----------------------------------------------------------------------------- @@ -943,7 +943,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, sal_Int32 _nDataType, sal_Int32& _nFormatKey, SvxCellHorJustify& _eJustify, - sal_uInt16& _nFlags, + sal_uInt16& _nFlags, sal_Bool _bHasFormat) { sal_Bool bRet = sal_False; @@ -958,10 +958,10 @@ sal_Bool callColumnFormatDialog(Window* _pParent, static SfxItemInfo aItemInfos[] = { { 0, 0 }, - { SID_ATTR_NUMBERFORMAT_VALUE, SFX_ITEM_POOLABLE }, - { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, - { SID_ATTR_NUMBERFORMAT_ONE_AREA, SFX_ITEM_POOLABLE }, - { SID_ATTR_NUMBERFORMAT_INFO, SFX_ITEM_POOLABLE } + { SID_ATTR_NUMBERFORMAT_VALUE, SFX_ITEM_POOLABLE }, + { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, + { SID_ATTR_NUMBERFORMAT_ONE_AREA, SFX_ITEM_POOLABLE }, + { SID_ATTR_NUMBERFORMAT_INFO, SFX_ITEM_POOLABLE } }; static sal_uInt16 aAttrMap[] = { @@ -981,8 +981,8 @@ sal_Bool callColumnFormatDialog(Window* _pParent, }; SfxItemPool* pPool = new SfxItemPool(String::CreateFromAscii("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); - pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why - pPool->FreezeIdRanges(); // the same + pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why + pPool->FreezeIdRanges(); // the same SfxItemSet* pFormatDescriptor = new SfxItemSet(*pPool, aAttrMap); // fill it @@ -1010,7 +1010,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, pFormatDescriptor->Put(aFormatter); } - { // want the dialog to be destroyed before our set + { // want the dialog to be destroyed before our set SbaSbAttrDlg aDlg(_pParent, pFormatDescriptor, _pFormatter, _nFlags); if (RET_OK == aDlg.Execute()) { @@ -1154,7 +1154,7 @@ sal_Bool isHiContrast(Window* _pWindow) { OSL_ENSURE(_pWindow,"Window must be not null!"); Window* pIter = _pWindow; - // while( pIter && pIter->GetBackground().GetColor().GetColor() == COL_TRANSPARENT ) + // while( pIter && pIter->GetBackground().GetColor().GetColor() == COL_TRANSPARENT ) while( pIter ) { if ( pIter->GetBackground().GetColor().GetColor() == COL_TRANSPARENT ) @@ -1183,7 +1183,7 @@ void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId { sal_Int32 nValue = aColumnSizeDlg.GetValue(); if ( -1 == nValue ) - { // default width + { // default width nValue = _pBox->GetDefaultColumnWidth( _pBox->GetColumnTitle( _nColId ) ); } else @@ -1330,7 +1330,7 @@ namespace } // annonymous // ......................................................................... // ----------------------------------------------------------------------------- -::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId) +::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId) { ::com::sun::star::util::URL aURL; aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) ); @@ -1382,8 +1382,8 @@ TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo) // because we don't have the possiblity to know how to create // such auto increment column later on // so until we know how to do it, we create a column without autoincrement - // if ( !aIter->second->bAutoIncrement ) - { // therefor we have searched + // if ( !aIter->second->bAutoIncrement ) + { // therefor we have searched if ( aIter->second->nType == DataType::INTEGER ) { pTypeInfo = aIter->second; // alternative @@ -1631,7 +1631,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XMultiService // here we have everything needed to create a new query object ... HierarchicalNameCheck aNameChecker( _xNames.get(), sName ); // ... ehm, except a new name - OSaveAsDlg aAskForName( _pParent, + OSaveAsDlg aAskForName( _pParent, _rxORB, sTargetName, sLabel, diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx index cff3c9f11a72..e6b52dee98a7 100644 --- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx +++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace dbaui { class ORowUpdateHelper : public IUpdateHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xResultSetUpdate; // + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xResultSetUpdate; // public: ORowUpdateHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _xRowSet) :m_xRowUpdate(_xRowSet,::com::sun::star::uno::UNO_QUERY) diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 905846ba9892..841b00a1d077 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,17 +69,17 @@ DBG_NAME(OCopyTable) //------------------------------------------------------------------------ OCopyTable::OCopyTable( Window * pParent ) :OWizardPage( pParent, ModuleRes(TAB_WIZ_COPYTABLE) ) - ,m_ftTableName( this, ModuleRes( FT_TABLENAME ) ) - ,m_edTableName( this, ModuleRes( ET_TABLENAME ) ) + ,m_ftTableName( this, ModuleRes( FT_TABLENAME ) ) + ,m_edTableName( this, ModuleRes( ET_TABLENAME ) ) ,m_aFL_Options( this, ModuleRes( FL_OPTIONS ) ) - ,m_aRB_DefData( this, ModuleRes( RB_DEFDATA ) ) - ,m_aRB_Def( this, ModuleRes( RB_DEF ) ) - ,m_aRB_View( this, ModuleRes( RB_VIEW ) ) - ,m_aRB_AppendData( this, ModuleRes( RB_APPENDDATA ) ) - ,m_aCB_UseHeaderLine( this, ModuleRes( CB_USEHEADERLINE ) ) - ,m_aCB_PrimaryColumn( this, ModuleRes( CB_PRIMARY_COLUMN ) ) - ,m_aFT_KeyName( this, ModuleRes( FT_KEYNAME ) ) - ,m_edKeyName( this, ModuleRes( ET_KEYNAME ) ) + ,m_aRB_DefData( this, ModuleRes( RB_DEFDATA ) ) + ,m_aRB_Def( this, ModuleRes( RB_DEF ) ) + ,m_aRB_View( this, ModuleRes( RB_VIEW ) ) + ,m_aRB_AppendData( this, ModuleRes( RB_APPENDDATA ) ) + ,m_aCB_UseHeaderLine( this, ModuleRes( CB_USEHEADERLINE ) ) + ,m_aCB_PrimaryColumn( this, ModuleRes( CB_PRIMARY_COLUMN ) ) + ,m_aFT_KeyName( this, ModuleRes( FT_KEYNAME ) ) + ,m_edKeyName( this, ModuleRes( ET_KEYNAME ) ) ,m_pPage2(NULL) ,m_pPage3(NULL) ,m_bUseHeaderAllowed(TRUE) @@ -98,11 +98,11 @@ OCopyTable::OCopyTable( Window * pParent ) m_aCB_PrimaryColumn.Enable(m_bPKeyAllowed); - m_aRB_AppendData.SetClickHdl( LINK( this, OCopyTable, AppendDataClickHdl ) ); + m_aRB_AppendData.SetClickHdl( LINK( this, OCopyTable, AppendDataClickHdl ) ); - m_aRB_DefData.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); - m_aRB_Def.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); - m_aRB_View.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); + m_aRB_DefData.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); + m_aRB_Def.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); + m_aRB_View.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) ); m_aCB_PrimaryColumn.SetClickHdl(LINK( this, OCopyTable, KeyClickHdl ) ); @@ -178,12 +178,12 @@ IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ ) sal_Bool OCopyTable::LeavePage() { DBG_CHKTHIS(OCopyTable,NULL); - m_pParent->m_bCreatePrimaryKeyColumn = (m_bPKeyAllowed && m_aCB_PrimaryColumn.IsEnabled()) ? m_aCB_PrimaryColumn.IsChecked() : sal_False; - m_pParent->m_aKeyName = m_pParent->m_bCreatePrimaryKeyColumn ? m_edKeyName.GetText() : String(); + m_pParent->m_bCreatePrimaryKeyColumn = (m_bPKeyAllowed && m_aCB_PrimaryColumn.IsEnabled()) ? m_aCB_PrimaryColumn.IsChecked() : sal_False; + m_pParent->m_aKeyName = m_pParent->m_bCreatePrimaryKeyColumn ? m_edKeyName.GetText() : String(); m_pParent->setUseHeaderLine( m_aCB_UseHeaderLine.IsChecked() ); // first check if the table already exists in the database - if( m_pParent->getOperation() != CopyTableOperation::AppendData ) + if( m_pParent->getOperation() != CopyTableOperation::AppendData ) { m_pParent->clearDestColumns(); DynamicTableOrQueryNameCheck aNameCheck( m_pParent->m_xDestConnection, CommandType::TABLE ); @@ -192,7 +192,7 @@ sal_Bool OCopyTable::LeavePage() { aErrorInfo.append( SQLExceptionInfo::SQL_CONTEXT, String( ModuleRes( STR_SUGGEST_APPEND_TABLE_DATA ) ) ); m_pParent->showError(aErrorInfo.get()); - + return sal_False; } @@ -201,7 +201,7 @@ sal_Bool OCopyTable::LeavePage() ::rtl::OUString sCatalog; ::rtl::OUString sSchema; ::rtl::OUString sTable; - ::dbtools::qualifiedNameComponents( xMeta, + ::dbtools::qualifiedNameComponents( xMeta, m_edTableName.GetText(), sCatalog, sSchema, @@ -214,10 +214,10 @@ sal_Bool OCopyTable::LeavePage() m_pParent->showError(sError); return sal_False; } - + // now we have to check if the name of the primary key already exists - if ( m_pParent->m_bCreatePrimaryKeyColumn - && m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) ) + if ( m_pParent->m_bCreatePrimaryKeyColumn + && m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) ) { String aInfoString( ModuleRes(STR_WIZ_PKEY_ALREADY_DEFINED) ); aInfoString += String(' '); @@ -270,10 +270,10 @@ void OCopyTable::ActivatePage() m_aCB_UseHeaderLine.Check(m_pParent->UseHeaderLine()); } //------------------------------------------------------------------------ -String OCopyTable::GetTitle() const -{ +String OCopyTable::GetTitle() const +{ DBG_CHKTHIS(OCopyTable,NULL); - return String(ModuleRes(STR_WIZ_TABLE_COPY)); + return String(ModuleRes(STR_WIZ_TABLE_COPY)); } //------------------------------------------------------------------------ void OCopyTable::Reset() @@ -306,9 +306,9 @@ sal_Bool OCopyTable::checkAppendData() ObjectCopySource aTableCopySource( m_pParent->m_xDestConnection, xTable ); m_pParent->loadData( aTableCopySource, m_pParent->m_vDestColumns, m_pParent->m_aDestVec ); // #90027# - const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); - ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); - ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end(); + const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); + ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); + ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end(); const sal_uInt32 nDestSize = pDestColumns->size(); sal_Bool bNotConvert; sal_uInt32 i = 0; @@ -322,13 +322,13 @@ sal_Bool OCopyTable::checkAppendData() m_pParent->showColumnTypeNotSupported((*aDestIter)->first); return sal_False; } - + if ( pTypeInfo.get() ) m_pParent->m_vColumnTypes[i] = pTypeInfo->nType; else m_pParent->m_vColumnTypes[i] = DataType::VARCHAR; } - + } if ( !xTable.is() ) diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 11095d00f660..d86e3e0170fd 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -161,7 +161,7 @@ sal_Bool OWizColumnSelect::LeavePage() { DBG_CHKTHIS(OWizColumnSelect,NULL); - // m_pParent->getColumns()->clear(); + // m_pParent->getColumns()->clear(); m_pParent->clearDestColumns(); for(sal_uInt16 i=0 ; i< m_lbNewColumnNames.GetEntryCount();++i) @@ -214,7 +214,7 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton ) Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() ); ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); - sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); + sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::TStringMixEqualFunctor aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); ::std::vector< ::rtl::OUString> aRightColumns; @@ -264,7 +264,7 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, MultiListBox *, pListBox ) // Wenn Datenbank PrimaryKeys verarbeiten kann, PrimaryKey anlegen Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() ); ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); - sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); + sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::TStringMixEqualFunctor aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); ::std::vector< ::rtl::OUString> aRightColumns; @@ -295,12 +295,12 @@ void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< ::rtl::OUStrin _rRightColumns.push_back(pRight->GetEntry(i)); } // ----------------------------------------------------------------------------- -void OWizColumnSelect::createNewColumn( ListBox* _pListbox, +void OWizColumnSelect::createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase) { ::rtl::OUString sConvertedName = m_pParent->convertColumnName(TMultiListBoxEntryFindFunctor(&_rRightColumns,_aCase), @@ -321,12 +321,12 @@ void OWizColumnSelect::createNewColumn( ListBox* _pListbox, m_pParent->showColumnTypeNotSupported(sConvertedName); } // ----------------------------------------------------------------------------- -void OWizColumnSelect::moveColumn( ListBox* _pRight, +void OWizColumnSelect::moveColumn( ListBox* _pRight, ListBox* _pLeft, ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase) { if(_pRight == &m_lbNewColumnNames) @@ -366,10 +366,10 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, // ----------------------------------------------------------------------------- // Simply returning fields back to their original position is // not enough. We need to take into acccount what fields have -// been removed earlier and adjust accordingly. Based on the +// been removed earlier and adjust accordingly. Based on the // algorithm employed in moveColumn(). USHORT OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, - const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::TStringMixEqualFunctor& _aCase) { diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 4ab963777312..0bdeb744bfde 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ using namespace dbtools; namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation; -#define MAX_PAGES 4 // max. Pages die angezeigt werden +#define MAX_PAGES 4 // max. Pages die angezeigt werden DBG_NAME(OCopyTableWizard) namespace @@ -193,8 +193,8 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _ ::rtl::OUString sStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); sStatement += sTargetName; sStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE 0=1")); - - + + for ( i=0; i < SAL_N_ELEMENTS( aProperties ); ++i ) { if ( m_xObjectPSI->hasPropertyByName( aProperties[i].first ) ) @@ -212,7 +212,7 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _ } } } - + _xConnection->createStatement()->executeQuery(sStatement); if ( m_xObjectPSI->hasPropertyByName( PROPERTY_APPLYFILTER ) ) @@ -633,7 +633,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD ::rtl::OUString sCatalog; ::rtl::OUString sSchema; ::rtl::OUString sTable; - ::dbtools::qualifiedNameComponents( xSrcMeta, + ::dbtools::qualifiedNameComponents( xSrcMeta, m_sName, sCatalog, sSchema, @@ -659,7 +659,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD // ----------------------------------------------------------------------------- OCopyTableWizard::OCopyTableWizard( Window* pParent, const ::rtl::OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rSourceColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, - const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter, + const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const Reference< XMultiServiceFactory >& _rM ) :WizardDialog( pParent, ModuleRes(WIZ_RTFCOPYTABLE)) ,m_vSourceColumns(_rSourceColumns) @@ -843,7 +843,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) } if ( bContainsColumns ) - { // we have dest columns so look for the matching column + { // we have dest columns so look for the matching column ODatabaseExport::TColumnVector::const_iterator aSrcIter = m_vSourceVec.begin(); ODatabaseExport::TColumnVector::const_iterator aSrcEnd = m_vSourceVec.end(); for(;aSrcIter != aSrcEnd;++aSrcIter) @@ -868,7 +868,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) { Reference< XDatabaseMetaData > xMetaData( m_xDestConnection->getMetaData() ); ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); - sal_Int32 nMaxNameLen = getMaxColumnNameLength(); + sal_Int32 nMaxNameLen = getMaxColumnNameLength(); ODatabaseExport::TColumnVector::const_iterator aSrcIter = m_vSourceVec.begin(); ODatabaseExport::TColumnVector::const_iterator aSrcEnd = m_vSourceVec.end(); @@ -880,7 +880,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) pField->SetType(pType); if ( !bPKeyAllowed ) pField->SetPrimaryKey(sal_False); - + // now create a column insertColumn(m_vDestColumns.size(),pField); m_vColumnPos.push_back(ODatabaseExport::TPositions::value_type(m_vDestColumns.size(),m_vDestColumns.size())); @@ -905,10 +905,10 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) case CopyTableOperation::CopyDefinitionOnly: { sal_Bool bOnFirstPage = GetCurLevel() == 0; - if ( bOnFirstPage ) + if ( bOnFirstPage ) { // we came from the first page so we have to clear - // all column information already collected + // all column information already collected clearDestColumns(); m_mNameMapping.clear(); } @@ -920,7 +920,7 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) OWizTypeSelect* pPage = static_cast<OWizTypeSelect*>(GetPage(3)); if ( pPage ) { - m_mNameMapping.clear(); + m_mNameMapping.clear(); pPage->setDisplayRow(nBreakPos); ShowPage(3); return 0; @@ -1049,7 +1049,7 @@ void OCopyTableWizard::CheckButtons() void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::EnableButton" ); -// CheckButtons(); +// CheckButtons(); Button* pButton; if(eStyle == WIZARD_NEXT) pButton = &m_pbNext; @@ -1103,7 +1103,7 @@ void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField, m_vDestColumns.erase(_sOldName); OSL_ENSURE( m_vDestColumns.find(_pField->GetName()) == m_vDestColumns.end(),"Column with that name already exist!"); - m_aDestVec[_nPos] = + m_aDestVec[_nPos] = m_vDestColumns.insert(ODatabaseExport::TColumns::value_type(_pField->GetName(),_pField)).first; } } @@ -1145,9 +1145,9 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, if ( !pActFieldDescr ) continue; - sal_Int32 nType = pActFieldDescr->GetType(); - sal_Int32 nScale = pActFieldDescr->GetScale(); - sal_Int32 nPrecision = pActFieldDescr->GetPrecision(); + sal_Int32 nType = pActFieldDescr->GetType(); + sal_Int32 nScale = pActFieldDescr->GetScale(); + sal_Int32 nPrecision = pActFieldDescr->GetPrecision(); sal_Bool bAutoIncrement = pActFieldDescr->IsAutoIncrement(); ::rtl::OUString sTypeName = pActFieldDescr->GetTypeName(); @@ -1331,7 +1331,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() if(xAppend.is()) xAppend->appendByDescriptor(xTable); - // xTable = NULL; + // xTable = NULL; // we need to reget the table because after appending it it is no longer valid if(xTables->hasByName(m_sName)) xTables->getByName(m_sName) >>= xTable; @@ -1361,7 +1361,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() Reference<XNameAccess> xNameAccess = xSuppDestinationColumns->getColumns(); Sequence< ::rtl::OUString> aSeq = xNameAccess->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); ::std::vector<int> aAlreadyFound(m_vColumnPos.size(),0); @@ -1485,10 +1485,10 @@ sal_Int16 OCopyTableWizard::getOperation() const return m_nOperation; } // ----------------------------------------------------------------------------- -::rtl::OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFunctor, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, - sal_Int32 _nMaxNameLen) +::rtl::OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFunctor, + const ::rtl::OUString& _sColumnName, + const ::rtl::OUString& _sExtraChars, + sal_Int32 _nMaxNameLen) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::convertColumnName" ); ::rtl::OUString sAlias = _sColumnName; diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx index 3b00f2289359..9b2d8686aa42 100644 --- a/dbaccess/source/ui/misc/WExtendPages.cxx +++ b/dbaccess/source/ui/misc/WExtendPages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 20a4177e3e3a..12a6744a7da6 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,17 +45,17 @@ using namespace ::dbaui; DBG_NAME(OWizNameMatching) //======================================================================== OWizNameMatching::OWizNameMatching( Window* pParent) - :OWizardPage( pParent, ModuleRes( TAB_WIZ_NAME_MATCHING ) ) - ,m_FT_TABLE_LEFT( this, ModuleRes( FT_TABLE_LEFT ) ) - ,m_FT_TABLE_RIGHT( this, ModuleRes( FT_TABLE_RIGHT ) ) - ,m_CTRL_LEFT( this, ModuleRes( CTRL_LEFT ) ) - ,m_CTRL_RIGHT( this, ModuleRes( CTRL_RIGHT ) ) + :OWizardPage( pParent, ModuleRes( TAB_WIZ_NAME_MATCHING ) ) + ,m_FT_TABLE_LEFT( this, ModuleRes( FT_TABLE_LEFT ) ) + ,m_FT_TABLE_RIGHT( this, ModuleRes( FT_TABLE_RIGHT ) ) + ,m_CTRL_LEFT( this, ModuleRes( CTRL_LEFT ) ) + ,m_CTRL_RIGHT( this, ModuleRes( CTRL_RIGHT ) ) ,m_ibColumn_up( this, ModuleRes( IB_COLUMN_UP ) ) ,m_ibColumn_down( this, ModuleRes( IB_COLUMN_DOWN ) ) ,m_ibColumn_up_right( this, ModuleRes( IB_COLUMN_UP_RIGHT ) ) ,m_ibColumn_down_right( this, ModuleRes( IB_COLUMN_DOWN_RIGHT ) ) - ,m_pbAll( this, ModuleRes( PB_ALL ) ) - ,m_pbNone( this, ModuleRes( PB_NONE ) ) + ,m_pbAll( this, ModuleRes( PB_ALL ) ) + ,m_pbNone( this, ModuleRes( PB_NONE ) ) { DBG_CTOR(OWizNameMatching,NULL); @@ -76,9 +76,9 @@ OWizNameMatching::OWizNameMatching( Window* pParent) m_CTRL_LEFT.SetWindowBits( WB_FORCE_MAKEVISIBLE ); m_CTRL_RIGHT.SetWindowBits( WB_FORCE_MAKEVISIBLE ); - m_sSourceText = m_FT_TABLE_LEFT.GetText(); + m_sSourceText = m_FT_TABLE_LEFT.GetText(); m_sSourceText.AppendAscii("\n"); - m_sDestText = m_FT_TABLE_RIGHT.GetText(); + m_sDestText = m_FT_TABLE_RIGHT.GetText(); m_sDestText.AppendAscii("\n"); // set hiContrast @@ -107,11 +107,11 @@ void OWizNameMatching::Reset() m_CTRL_RIGHT.SetEntryHeight(m_CTRL_LEFT.GetEntryHeight()); m_CTRL_RIGHT.SetIndent(m_CTRL_LEFT.GetIndent()); m_CTRL_RIGHT.SetSpaceBetweenEntries(m_CTRL_LEFT.GetSpaceBetweenEntries()); - + m_bFirstTime = sal_False; } - - // m_CTRL_LEFT.Clear(); + + // m_CTRL_LEFT.Clear(); } // ----------------------------------------------------------------------- void OWizNameMatching::ActivatePage( ) @@ -121,7 +121,7 @@ void OWizNameMatching::ActivatePage( ) // set source table name String aName = m_sSourceText; aName += String(m_pParent->m_sSourceName); - + m_FT_TABLE_LEFT.SetText(aName); // set dest table name @@ -129,7 +129,7 @@ void OWizNameMatching::ActivatePage( ) aName += String(m_pParent->m_sName); m_FT_TABLE_RIGHT.SetText(aName); - + m_CTRL_LEFT.FillListBox(*m_pParent->getSrcVector()); m_CTRL_RIGHT.FillListBox(*m_pParent->getDestVector()); @@ -138,7 +138,7 @@ void OWizNameMatching::ActivatePage( ) m_ibColumn_up_right.Enable( m_CTRL_RIGHT.GetEntryCount() > 1 ); m_ibColumn_down_right.Enable( m_CTRL_RIGHT.GetEntryCount() > 1 ); - + m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_False); m_CTRL_LEFT.GrabFocus(); @@ -149,13 +149,13 @@ sal_Bool OWizNameMatching::LeavePage() DBG_CHKTHIS(OWizNameMatching,NULL); const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector(); - + m_pParent->m_vColumnPos.clear(); m_pParent->m_vColumnTypes.clear(); m_pParent->m_vColumnPos.resize( pSrcColumns->size(), ODatabaseExport::TPositions::value_type( COLUMN_POSITION_NOT_FOUND, COLUMN_POSITION_NOT_FOUND ) ); m_pParent->m_vColumnTypes.resize( pSrcColumns->size(), COLUMN_POSITION_NOT_FOUND ); - + sal_Int32 nParamPos = 0; SvLBoxEntry* pLeftEntry = m_CTRL_LEFT.GetModel()->First(); SvLBoxEntry* pRightEntry = m_CTRL_RIGHT.GetModel()->First(); @@ -164,26 +164,26 @@ sal_Bool OWizNameMatching::LeavePage() OFieldDescription* pSrcField = static_cast<OFieldDescription*>(pLeftEntry->GetUserData()); DBG_ASSERT(pSrcField,"OWizNameMatching: OColumn can not be null!"); - ODatabaseExport::TColumnVector::const_iterator aSrcIter = pSrcColumns->begin(); - ODatabaseExport::TColumnVector::const_iterator aSrcEnd = pSrcColumns->end(); + ODatabaseExport::TColumnVector::const_iterator aSrcIter = pSrcColumns->begin(); + ODatabaseExport::TColumnVector::const_iterator aSrcEnd = pSrcColumns->end(); for(;aSrcIter != aSrcEnd && (*aSrcIter)->second != pSrcField;++aSrcIter) ; const sal_Int32 nPos = ::std::distance(pSrcColumns->begin(),aSrcIter); - // sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pLeftEntry); + // sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pLeftEntry); if(m_CTRL_LEFT.GetCheckButtonState(pLeftEntry) == SV_BUTTON_CHECKED) { OFieldDescription* pDestField = static_cast<OFieldDescription*>(pRightEntry->GetUserData()); DBG_ASSERT(pDestField,"OWizNameMatching: OColumn can not be null!"); - const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); - ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); - ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end(); + const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); + ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); + ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end(); for(;aDestIter != aDestEnd && (*aDestIter)->second != pDestField;++aDestIter) ; OSL_ENSURE((nPos) < static_cast<sal_Int32>(m_pParent->m_vColumnPos.size()),"m_pParent->m_vColumnPos: Illegal index for vector"); - m_pParent->m_vColumnPos[nPos].first = ++nParamPos; + m_pParent->m_vColumnPos[nPos].first = ++nParamPos; m_pParent->m_vColumnPos[nPos].second = ::std::distance(pDestColumns->begin(),aDestIter) + 1; sal_Bool bNotConvert = sal_True; TOTypeInfoSP pTypeInfo = m_pParent->convertType((*aDestIter)->second->getSpecialTypeInfo(),bNotConvert); @@ -212,7 +212,7 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton ) SvLBoxEntry* pEntry = m_CTRL_LEFT.FirstSelected(); if ( pEntry ) { - sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); + sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); if(pButton == &m_ibColumn_up && nPos) --nPos; else if(pButton == &m_ibColumn_down) @@ -222,13 +222,13 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton ) m_CTRL_LEFT.GetModel()->Move(pEntry,NULL,nPos); m_CTRL_LEFT.ModelHasMoved(pEntry); - long nThumbPos = m_CTRL_LEFT.GetVScroll()->GetThumbPos(); - long nVisibleSize = m_CTRL_LEFT.GetVScroll()->GetVisibleSize(); + long nThumbPos = m_CTRL_LEFT.GetVScroll()->GetThumbPos(); + long nVisibleSize = m_CTRL_LEFT.GetVScroll()->GetVisibleSize(); if(pButton == &m_ibColumn_down && (nThumbPos+nVisibleSize+1) < nPos) { m_CTRL_LEFT.GetVScroll()->DoScrollAction(SCROLL_LINEDOWN); - // m_CTRL_LEFT.MakeVisible(pEntry,sal_True); + // m_CTRL_LEFT.MakeVisible(pEntry,sal_True); } TableListClickHdl(&m_CTRL_LEFT); @@ -243,7 +243,7 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) SvLBoxEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); if ( pEntry ) { - sal_Int32 nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); + sal_Int32 nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); if(pButton == &m_ibColumn_up_right && nPos) --nPos; else if(pButton == &m_ibColumn_down_right) @@ -252,8 +252,8 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) m_CTRL_RIGHT.ModelIsMoving(pEntry,NULL,nPos); m_CTRL_RIGHT.GetModel()->Move(pEntry,NULL,nPos); m_CTRL_RIGHT.ModelHasMoved(pEntry); - long nThumbPos = m_CTRL_RIGHT.GetVScroll()->GetThumbPos(); - long nVisibleSize = m_CTRL_RIGHT.GetVScroll()->GetVisibleSize(); + long nThumbPos = m_CTRL_RIGHT.GetVScroll()->GetThumbPos(); + long nVisibleSize = m_CTRL_RIGHT.GetVScroll()->GetVisibleSize(); if(pButton == &m_ibColumn_down_right && (nThumbPos+nVisibleSize+1) < nPos) m_CTRL_RIGHT.GetVScroll()->DoScrollAction(SCROLL_LINEDOWN); @@ -267,7 +267,7 @@ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ ) SvLBoxEntry* pEntry = m_CTRL_LEFT.FirstSelected(); if(pEntry) { - ULONG nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); + ULONG nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); SvLBoxEntry* pOldEntry = m_CTRL_RIGHT.FirstSelected(); if(pOldEntry && nPos != m_CTRL_RIGHT.GetModel()->GetAbsPos(pOldEntry)) { @@ -301,7 +301,7 @@ IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/ SvLBoxEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); if(pEntry) { - ULONG nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); + ULONG nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); SvLBoxEntry* pOldEntry = m_CTRL_LEFT.FirstSelected(); if(pOldEntry && nPos != m_CTRL_LEFT.GetModel()->GetAbsPos(pOldEntry)) { diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index efc94d56524b..ea928c91e742 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; //======================================================================== // OWizTypeSelectControl @@ -107,7 +107,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) sal_uInt16 nPos = aListBox.GetEntryPos( String( pCurFieldDescr->GetName() ) ); pCurFieldDescr = static_cast< OFieldDescription* >( aListBox.GetEntryData( nPos ) ); - OSL_ENSURE( pCurFieldDescr, "OWizTypeSelectControl::CellModified: Columnname/type not found in the listbox!" ); + OSL_ENSURE( pCurFieldDescr, "OWizTypeSelectControl::CellModified: Columnname/type not found in the listbox!" ); if ( !pCurFieldDescr ) return; setCurrentFieldDescData( pCurFieldDescr ); @@ -117,7 +117,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) const OPropColumnEditCtrl* pColumnName = getColumnCtrl(); if ( pColumnName ) sNewName = pColumnName->GetText(); - + switch(nColId) { case FIELD_PRPOERTY_COLUMNNAME: @@ -139,10 +139,10 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) bDoubleName = sNewName.equalsIgnoreAsciiCase(pWiz->getPrimaryKeyName()); } - else + else bDoubleName = ((aListBox.GetEntryPos(String(sNewName)) != LISTBOX_ENTRY_NOTFOUND) - || ( pWiz->shouldCreatePrimaryKey() - && pWiz->getPrimaryKeyName() == sNewName) ); + || ( pWiz->shouldCreatePrimaryKey() + && pWiz->getPrimaryKeyName() == sNewName) ); if ( bDoubleName ) { @@ -176,7 +176,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) aListBox.RemoveEntry(nPos); aListBox.InsertEntry(pCurFieldDescr->GetName(),nPos); aListBox.SetEntryData(nPos,pCurFieldDescr); - + pWiz->replaceColumn(nPos,pCurFieldDescr,sOldName); } break; @@ -184,7 +184,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) saveCurrentFieldDescData(); } // ----------------------------------------------------------------------------- -::com::sun::star::lang::Locale OWizTypeSelectControl::GetLocale() const +::com::sun::star::lang::Locale OWizTypeSelectControl::GetLocale() const { return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->GetLocale(); } @@ -194,12 +194,12 @@ Reference< XNumberFormatter > OWizTypeSelectControl::GetFormatter() const return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->GetFormatter(); } // ----------------------------------------------------------------------------- -TOTypeInfoSP OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos) +TOTypeInfoSP OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos) { return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->getDestTypeInfo(_nPos); } // ----------------------------------------------------------------------------- -const OTypeInfoMap* OWizTypeSelectControl::getTypeInfo() const +const OTypeInfoMap* OWizTypeSelectControl::getTypeInfo() const { return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->getDestTypeInfo(); } diff --git a/dbaccess/source/ui/misc/WizardPages.hrc b/dbaccess/source/ui/misc/WizardPages.hrc index 224071b529ec..e1c2dd3326b6 100644 --- a/dbaccess/source/ui/misc/WizardPages.hrc +++ b/dbaccess/source/ui/misc/WizardPages.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,53 +28,53 @@ #define DBAUI_WIZARD_PAGES_HRC -#define LB_ORG_COLUMN_NAMES 1 -#define LB_NEW_COLUMN_NAMES 2 +#define LB_ORG_COLUMN_NAMES 1 +#define LB_NEW_COLUMN_NAMES 2 #define IB_COLUMN_RH 1 #define IB_COLUMN_LH 2 #define IB_COLUMNS_RH 3 #define IB_COLUMNS_LH 4 -#define PB_AUTO 5 -#define PB_OK 6 -#define PB_CANCEL 7 -#define PB_HELP 8 -#define PB_NEXT 9 -#define PB_PREV 10 -#define PB_UNDO 11 +#define PB_AUTO 5 +#define PB_OK 6 +#define PB_CANCEL 7 +#define PB_HELP 8 +#define PB_NEXT 9 +#define PB_PREV 10 +#define PB_UNDO 11 #define IB_COLUMN_UP 12 #define IB_COLUMN_DOWN 13 #define IB_COLUMN_UP_RIGHT 14 #define IB_COLUMN_DOWN_RIGHT 15 -#define PB_ALL 16 -#define PB_NONE 17 +#define PB_ALL 16 +#define PB_NONE 17 -#define ET_AUTO 1 -#define ET_TABLENAME 2 -#define ET_KEYNAME 3 +#define ET_AUTO 1 +#define ET_TABLENAME 2 +#define ET_KEYNAME 3 -#define FT_AUTO 1 -#define FT_TABLE_LEFT 2 -#define FT_TABLE_RIGHT 3 -#define FT_TABLENAME 4 -#define FT_KEYNAME 5 +#define FT_AUTO 1 +#define FT_TABLE_LEFT 2 +#define FT_TABLE_RIGHT 3 +#define FT_TABLENAME 4 +#define FT_KEYNAME 5 #define FL_COLUMN_SELECT 1 #define FL_COLUMN_NAME 2 #define FL_AUTO_TYPE 3 #define FL_OPTIONS 5 -#define RB_DEFDATA 1 -#define RB_DEF 2 -#define RB_VIEW 3 -#define RB_APPENDDATA 4 -#define CB_PRIMARY_COLUMN 5 +#define RB_DEFDATA 1 +#define RB_DEF 2 +#define RB_VIEW 3 +#define RB_APPENDDATA 4 +#define CB_PRIMARY_COLUMN 5 #define CB_USEHEADERLINE 6 -#define CONTROL_CONTAINER 1 +#define CONTROL_CONTAINER 1 // controls -#define CTRL_LEFT 1 -#define CTRL_RIGHT 2 +#define CTRL_LEFT 1 +#define CTRL_RIGHT 2 #endif // DBAUI_WIZARD_PAGES_HRC diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src index 9871c3f7d810..7afd2888cba1 100644 --- a/dbaccess/source/ui/misc/WizardPages.src +++ b/dbaccess/source/ui/misc/WizardPages.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,13 +37,13 @@ #define WINDOW_SIZE_X 276 -#define WINDOW_SIZE_Y 185 +#define WINDOW_SIZE_Y 185 -#define WINDOW_BORDER_X 12 -#define WINDOW_BORDER_Y 14 +#define WINDOW_BORDER_X 12 +#define WINDOW_BORDER_Y 14 -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 String STR_WIZ_COLUMN_SELECT_TITEL { @@ -62,7 +62,7 @@ String STR_WIZ_PKEY_ALREADY_DEFINED String STR_WIZ_NAME_MATCHING_TITEL { - Text [ en-US ] = "Assign columns" ; + Text [ en-US ] = "Assign columns" ; }; ModalDialog WIZ_RTFCOPYTABLE @@ -71,40 +71,40 @@ ModalDialog WIZ_RTFCOPYTABLE Text [ en-US ] = "Copy RTF Table" ; - OutputSize = TRUE ; - SVLook = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE; + OutputSize = TRUE ; + SVLook = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + Hide = TRUE; HelpButton PB_HELP { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "~Help"; }; CancelButton PB_CANCEL { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "~Cancel"; }; PushButton PB_PREV { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "< ~Back"; }; PushButton PB_NEXT { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "~Next>"; }; OKButton PB_OK { - TabStop = TRUE ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "C~reate"; }; @@ -115,36 +115,36 @@ ModalDialog WIZ_RTFCOPYTABLE //================================================================== TabPage TAB_WIZ_COLUMN_SELECT { - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; - HelpId = HID_TAB_WIZ_COLUMN_SELECT; - Hide = TRUE; + HelpId = HID_TAB_WIZ_COLUMN_SELECT; + Hide = TRUE; FixedLine FL_COLUMN_SELECT { - Pos = MAP_APPFONT ( 6 , 3 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ; Text [ en-US ] = "Existing columns" ; }; MultiListBox LB_ORG_COLUMN_NAMES { - Border = TRUE ; - Pos = MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ; + Border = TRUE ; + Pos = MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ; Size = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ; - TabStop = TRUE ; + TabStop = TRUE ; HScroll = TRUE; VScroll = TRUE; - AutoHScroll = TRUE; - SimpleMode = TRUE; - Sort = FALSE; + AutoHScroll = TRUE; + SimpleMode = TRUE; + Sort = FALSE; }; ImageButton IB_COLUMN_RH { Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 25 ) ; - Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + Size = MAP_APPFONT ( 20 , 14 ) ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -162,8 +162,8 @@ TabPage TAB_WIZ_COLUMN_SELECT ImageButton IB_COLUMNS_RH { Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 45 ) ; - Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE; + Size = MAP_APPFONT ( 20 , 14 ) ; + TabStop = TRUE; DefButton = TRUE; ButtonImage = Image { @@ -182,8 +182,8 @@ TabPage TAB_WIZ_COLUMN_SELECT ImageButton IB_COLUMN_LH { Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 65) ; - Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + Size = MAP_APPFONT ( 20 , 14 ) ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -201,8 +201,8 @@ TabPage TAB_WIZ_COLUMN_SELECT ImageButton IB_COLUMNS_LH { Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 85) ; - Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + Size = MAP_APPFONT ( 20 , 14 ) ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -220,15 +220,15 @@ TabPage TAB_WIZ_COLUMN_SELECT MultiListBox LB_NEW_COLUMN_NAMES { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( WINDOW_BORDER_X + 157, WINDOW_BORDER_Y) ; Size = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ; - TabStop = TRUE ; + TabStop = TRUE ; HScroll = TRUE; VScroll = TRUE; - AutoHScroll = TRUE; - SimpleMode = TRUE; - Sort = FALSE; + AutoHScroll = TRUE; + SimpleMode = TRUE; + Sort = FALSE; }; }; @@ -237,42 +237,42 @@ TabPage TAB_WIZ_COLUMN_SELECT //================================================================== TabPage TAB_WIZ_TYPE_SELECT { - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; - HelpId = HID_TAB_WIZ_TYPE_SELECT; - Hide = TRUE; + HelpId = HID_TAB_WIZ_TYPE_SELECT; + Hide = TRUE; MultiListBox LB_NEW_COLUMN_NAMES { - Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 87 , WINDOW_SIZE_Y - 12 ) ; - TabStop = TRUE ; + Border = TRUE ; + Pos = MAP_APPFONT ( 6 , 6 ) ; + Size = MAP_APPFONT ( 87 , WINDOW_SIZE_Y - 12 ) ; + TabStop = TRUE ; HScroll = TRUE; VScroll = TRUE; - AutoHScroll = TRUE; - SimpleMode = TRUE; + AutoHScroll = TRUE; + SimpleMode = TRUE; }; FixedLine FL_COLUMN_NAME { - Pos = MAP_APPFONT ( 99 , 3 ) ; + Pos = MAP_APPFONT ( 99 , 3 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 105, 8 ) ; Text [ en-US ] = "Column information" ; }; TabPage CONTROL_CONTAINER { - Pos = MAP_APPFONT ( 102 , WINDOW_BORDER_Y ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 111, WINDOW_SIZE_Y - WINDOW_BORDER_Y - 67 ); + Pos = MAP_APPFONT ( 102 , WINDOW_BORDER_Y ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 111, WINDOW_SIZE_Y - WINDOW_BORDER_Y - 67 ); SVLook = TRUE; DialogControl = TRUE; }; FixedLine FL_AUTO_TYPE { - Pos = MAP_APPFONT ( 99 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 41 ) ; + Pos = MAP_APPFONT ( 99 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 41 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 105, 8 ) ; Text [ en-US ] = "Automatic type recognition" ; }; @@ -286,18 +286,18 @@ TabPage TAB_WIZ_TYPE_SELECT NumericField ET_AUTO { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 151 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 29) ; - Size = MAP_APPFONT ( 40 , 12 ) ; - TabStop = TRUE ; + Size = MAP_APPFONT ( 40 , 12 ) ; + TabStop = TRUE ; }; PushButton PB_AUTO { Pos = MAP_APPFONT ( WINDOW_SIZE_X - 62 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 30 ) ; - Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; - TabStop = TRUE ; - Text = "~Auto" ; + Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; + TabStop = TRUE ; + Text = "~Auto" ; }; }; @@ -307,9 +307,9 @@ Menu RID_SBA_RTF_PKEYPOPUP { MenuItem { - Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - Checkable = TRUE ; + Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + Checkable = TRUE ; Text [ en-US ] = "Primary Key" ; }; }; @@ -319,42 +319,42 @@ Menu RID_SBA_RTF_PKEYPOPUP //================================================================== TabPage TAB_WIZ_NAME_MATCHING { - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; - Hide = TRUE; + Hide = TRUE; FixedText FT_TABLE_LEFT { - Pos = MAP_APPFONT ( 52 , 6 ) ; - Size = MAP_APPFONT ( 75 , 20) ; + Pos = MAP_APPFONT ( 52 , 6 ) ; + Size = MAP_APPFONT ( 75 , 20) ; Text [ en-US ] = "Source table: \n"; }; FixedText FT_TABLE_RIGHT { Pos = MAP_APPFONT ( 144, 6 ) ; - Size = MAP_APPFONT ( 75 , 20) ; + Size = MAP_APPFONT ( 75 , 20) ; Text [ en-US ] = "Destination table: \n"; }; Control CTRL_LEFT { - Border = TRUE; - Pos = MAP_APPFONT ( 52, 28) ; + Border = TRUE; + Pos = MAP_APPFONT ( 52, 28) ; Size = MAP_APPFONT ( 82 , WINDOW_SIZE_Y - 34 ) ; - TabStop = TRUE; - HelpId = HID_TAB_NAMEMATCHING_COLS_AVAIL; + TabStop = TRUE; + HelpId = HID_TAB_NAMEMATCHING_COLS_AVAIL; /*DialogControl = TRUE;*/ }; Control CTRL_RIGHT { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 144, 28) ; Size = MAP_APPFONT ( 82 , WINDOW_SIZE_Y - 34 ) ; - TabStop = TRUE; - HelpId = HID_TAB_NAMEMATCHING_COLS_ASSIGN; + TabStop = TRUE; + HelpId = HID_TAB_NAMEMATCHING_COLS_ASSIGN; /*DialogControl = TRUE;*/ }; @@ -362,7 +362,7 @@ TabPage TAB_WIZ_NAME_MATCHING { Pos = MAP_APPFONT ( 19 , 45 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; - TabStop = TRUE; + TabStop = TRUE; DefButton = TRUE; ButtonImage = Image { @@ -382,7 +382,7 @@ TabPage TAB_WIZ_NAME_MATCHING { Pos = MAP_APPFONT ( 19 , 63 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; - TabStop = TRUE; + TabStop = TRUE; ButtonImage = Image { ImageBitmap = Bitmap @@ -401,7 +401,7 @@ TabPage TAB_WIZ_NAME_MATCHING { Pos = MAP_APPFONT ( WINDOW_SIZE_X - 33, 45 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; - TabStop = TRUE; + TabStop = TRUE; DefButton = TRUE; ButtonImage = Image { @@ -421,7 +421,7 @@ TabPage TAB_WIZ_NAME_MATCHING { Pos = MAP_APPFONT ( WINDOW_SIZE_X - 33, 63) ; Size = MAP_APPFONT ( 14 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -440,26 +440,26 @@ TabPage TAB_WIZ_NAME_MATCHING PushButton PB_ALL { Pos = MAP_APPFONT ( 6, 83) ; - Size = MAP_APPFONT ( 40 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~All" ; + Size = MAP_APPFONT ( 40 , 14 ) ; + TabStop = TRUE ; + Text [ en-US ] = "~All" ; }; PushButton PB_NONE { Pos = MAP_APPFONT ( 6, 103) ; - Size = MAP_APPFONT ( 40 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Non~e" ; + Size = MAP_APPFONT ( 40 , 14 ) ; + TabStop = TRUE ; + Text [ en-US ] = "Non~e" ; }; }; TabPage TAB_WIZ_COPYTABLE { - SVLook = TRUE ; + SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ; - HelpId = HID_TAB_WIZ_COPYTABLE; - Hide = TRUE; + HelpId = HID_TAB_WIZ_COPYTABLE; + Hide = TRUE; FixedText FT_TABLENAME { @@ -470,11 +470,11 @@ TabPage TAB_WIZ_COPYTABLE Edit ET_TABLENAME { - HelpId = HID_TAB_WIZ_TABLENAME_EDIT; - Border = TRUE ; + HelpId = HID_TAB_WIZ_TABLENAME_EDIT; + Border = TRUE ; Pos = MAP_APPFONT ( 80 , 9) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 92 , 12 ) ; - TabStop = TRUE ; + TabStop = TRUE ; }; FixedLine FL_OPTIONS @@ -486,41 +486,41 @@ TabPage TAB_WIZ_COPYTABLE RadioButton RB_DEFDATA { Pos = MAP_APPFONT ( 12 , 35 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; + Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "De~finition and data" ; }; RadioButton RB_DEF { Pos = MAP_APPFONT ( 12, 49 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; + Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "Def~inition" ; }; RadioButton RB_VIEW { Pos = MAP_APPFONT ( 12, 63 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; + Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "A~s table view"; }; RadioButton RB_APPENDDATA { Pos = MAP_APPFONT ( 12, 77 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; + Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "Append ~data" ; }; CheckBox CB_USEHEADERLINE { Pos = MAP_APPFONT ( 12, 93 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 18, 10 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 18, 10 ) ; Text [ en-US ] = "Use first ~line as column names" ; }; CheckBox CB_PRIMARY_COLUMN { Pos = MAP_APPFONT ( 12, 107 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Crea~te primary key"; }; FixedText FT_KEYNAME @@ -533,9 +533,9 @@ TabPage TAB_WIZ_COPYTABLE Edit ET_KEYNAME { Pos = MAP_APPFONT ( 80, 120 ) ; - Size = MAP_APPFONT ( 65 , 12 ) ; - TabStop = TRUE ; - Border = TRUE ; + Size = MAP_APPFONT ( 65 , 12 ) ; + TabStop = TRUE ; + Border = TRUE ; }; }; diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index 5d866839748e..80823313b782 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 2ce044be43c9..ff3ee96f3555 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,7 +156,7 @@ namespace dbaui } //------------------------------------------------------------------------- - const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator++() + const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator++() { DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::end(), "OCharsetDisplay::ExtendedCharsetIterator::operator++ : invalid position!"); if ( m_aPosition != m_pContainer->OCharsetDisplay_Base::end() ) @@ -165,7 +165,7 @@ namespace dbaui } //------------------------------------------------------------------------- - const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator--() + const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator--() { DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::begin(), "OCharsetDisplay::ExtendedCharsetIterator::operator-- : invalid position!"); if ( m_aPosition != m_pContainer->OCharsetDisplay_Base::begin() ) @@ -180,7 +180,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 23a336d76266..39a5027b9082 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -183,7 +183,7 @@ namespace dbaui Reference< XWindow2 > xWindow( _rxFrame->getContainerWindow(), UNO_QUERY_THROW ); bIsActive = xWindow->isActive(); } - + } catch( const Exception& ) { @@ -325,38 +325,38 @@ namespace dbaui { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowClosing( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowClosed( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowMinimized( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowNormalized( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowActivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { impl_checkDisposed_throw(); lcl_updateActive_nothrow( *m_pData, true ); } - + //-------------------------------------------------------------------- void SAL_CALL FrameWindowActivationListener::windowDeactivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException) { diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 9e0e5d352cc4..f95e0db8f212 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ namespace dbaui //= DatabaseObjectView //====================================================================== DatabaseObjectView::DatabaseObjectView( const Reference< XMultiServiceFactory >& _rxORB, - const Reference< XDatabaseDocumentUI >& _rxApplication, + const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame, const ::rtl::OUString& _rComponentURL ) :m_xORB ( _rxORB ) @@ -143,7 +143,7 @@ namespace dbaui aProp.Name = ::rtl::OUString::createFromAscii("TopWindow"); aProp.Value <<= sal_True; lArgs[nArg++] <<= aProp; - + m_xFrameLoader.set(xFact->createInstanceWithArguments(lArgs), UNO_QUERY_THROW); // everything we load can be considered a "top level document", so set the respective bit at the window. @@ -330,7 +330,7 @@ namespace dbaui i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_UPDATE_TABLENAME, sTable ); } } - + //====================================================================== //= RelationDesigner //====================================================================== @@ -340,7 +340,7 @@ namespace dbaui { } // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index abd0aceb9433..3d7bd63d5881 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,7 +139,7 @@ namespace dbaui try { if (bPwdRequired && !sPassword.getLength()) - { // password required, but empty -> connect using an interaction handler + { // password required, but empty -> connect using an interaction handler Reference< XCompletedConnection > xConnectionCompletion( _xDataSource, UNO_QUERY_THROW ); Reference< XModel > xModel( getDataSourceOrModel( _xDataSource ), UNO_QUERY_THROW ); @@ -229,7 +229,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/dbumiscres.hrc b/dbaccess/source/ui/misc/dbumiscres.hrc index 81b72e5dda87..9a415c47aad4 100644 --- a/dbaccess/source/ui/misc/dbumiscres.hrc +++ b/dbaccess/source/ui/misc/dbumiscres.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,32 +31,32 @@ //======================================================================== // string ids (relative to other resources, that's why not unique) -#define STR_MYSQL_ODBC 1 -#define STR_MYSQL_JDBC 2 -#define STR_ADABAS 3 -#define STR_ORACLE_JDBC 4 -#define STR_JDBC 5 -#define STR_ODBC 6 -#define STR_DBASE 7 -#define STR_MSACCESS 8 +#define STR_MYSQL_ODBC 1 +#define STR_MYSQL_JDBC 2 +#define STR_ADABAS 3 +#define STR_ORACLE_JDBC 4 +#define STR_JDBC 5 +#define STR_ODBC 6 +#define STR_DBASE 7 +#define STR_MSACCESS 8 #define STR_MSACCESS2007 9 -#define STR_ADO 10 -#define STR_FLAT 11 -#define STR_CALC 12 -#define STR_MOZILLA 13 -#define STR_LDAP 14 -#define STR_OUTLOOK 15 -#define STR_OUTLOOKEXP 16 -#define STR_EVOLUTION 17 -#define STR_EVOLUTION_GROUPWISE 18 -#define STR_EVOLUTION_LDAP 19 -#define STR_KAB 20 -#define STR_MACAB 21 +#define STR_ADO 10 +#define STR_FLAT 11 +#define STR_CALC 12 +#define STR_MOZILLA 13 +#define STR_LDAP 14 +#define STR_OUTLOOK 15 +#define STR_OUTLOOKEXP 16 +#define STR_EVOLUTION 17 +#define STR_EVOLUTION_GROUPWISE 18 +#define STR_EVOLUTION_LDAP 19 +#define STR_KAB 20 +#define STR_MACAB 21 #define STR_EMBEDDED_HSQLDB 22 -#define STR_THUNDERBIRD 23 -#define STR_MYSQL_NATIVE 24 - -#define STR_END STR_MYSQL_NATIVE + 1 - -#endif // _DBU_MISCRES_HRC_ +#define STR_THUNDERBIRD 23 +#define STR_MYSQL_NATIVE 24 + +#define STR_END STR_MYSQL_NATIVE + 1 + +#endif // _DBU_MISCRES_HRC_ diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src index 552a076147d5..8deda3fde2ae 100644 --- a/dbaccess/source/ui/misc/dbumiscres.src +++ b/dbaccess/source/ui/misc/dbumiscres.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,12 +66,12 @@ String STR_BUTTON_TEXT_ALL String STR_UNDO_COLON { - Text [ en-US ] = "Undo:"; + Text [ en-US ] = "Undo:"; }; String STR_REDO_COLON { - Text [ en-US ] = "Redo:"; + Text [ en-US ] = "Redo:"; }; String STR_UNKNOWN_TYPE_FOUND diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index bac5dfbaa5f6..40e21ba74e1a 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index 8bb505e5332f..f65d3c04b8d7 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,7 +115,7 @@ namespace dbaui { FeatureSet aCurrentSet; const ::comphelper::NamedValueCollection aCurrentFeatures( aDriverConfig.getFeatures( *pattern ).getNamedValues() ); - + const FeatureMapping* pFeatureMapping = lcl_getFeatureMappings(); while ( pFeatureMapping->pAsciiFeatureName ) { diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 8147e2bd242a..f3a9af1112bb 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index 137f9eeb696e..ddead23b0bb4 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,10 +65,10 @@ namespace dbaui } //------------------------------------------------------------------ -// OIndexCollection::OIndexCollection(const Reference< XNameAccess >& _rxIndexes) -// { -// implConstructFrom(_rxIndexes); -// } +// OIndexCollection::OIndexCollection(const Reference< XNameAccess >& _rxIndexes) +// { +// implConstructFrom(_rxIndexes); +// } //------------------------------------------------------------------ const OIndexCollection& OIndexCollection::operator=(const OIndexCollection& _rSource) @@ -190,7 +190,7 @@ namespace dbaui xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName)); // the fields - for ( ConstIndexFieldsIterator aFieldLoop = _rPos->aFields.begin(); + for ( ConstIndexFieldsIterator aFieldLoop = _rPos->aFields.begin(); aFieldLoop != _rPos->aFields.end(); ++aFieldLoop ) @@ -213,7 +213,7 @@ namespace dbaui _rPos->clearModified(); } catch(SQLException&) - { // allowed to pass + { // allowed to pass throw; } catch( const Exception& ) @@ -239,7 +239,7 @@ namespace dbaui xDropIndex->dropByName(_rPos->getOriginalName()); } catch(SQLException&) - { // allowed to pass + { // allowed to pass throw; } catch( const Exception& ) @@ -350,7 +350,7 @@ namespace dbaui _rPos->flagAsCommitted(GrantIndexAccess()); } catch(SQLException&) - { // allowed to pass + { // allowed to pass throw; } catch( const Exception& ) @@ -364,10 +364,10 @@ namespace dbaui { OSL_ENSURE(end() == find(_rName), "OIndexCollection::insert: invalid new name!"); String tmpName; - OIndex aNewIndex(tmpName); // the empty string indicates the index is a new one + OIndex aNewIndex(tmpName); // the empty string indicates the index is a new one aNewIndex.sName = _rName; m_aIndexes.push_back(aNewIndex); - return m_aIndexes.end() - 1; // the last element is the new one ... + return m_aIndexes.end() - 1; // the last element is the new one ... } //------------------------------------------------------------------ @@ -402,7 +402,7 @@ namespace dbaui } //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 8d470332158e..58e920c88493 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -123,7 +123,7 @@ namespace dbaui //================================================================== //= OLinkedDocumentsAccess //================================================================== - DBG_NAME(OLinkedDocumentsAccess) + DBG_NAME(OLinkedDocumentsAccess) //------------------------------------------------------------------ OLinkedDocumentsAccess::OLinkedDocumentsAccess( Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, const Reference< XMultiServiceFactory >& _rxORB, const Reference< XNameAccess >& _rxContainer, @@ -135,14 +135,14 @@ namespace dbaui ,m_pDialogParent(_pDialogParent) ,m_sDataSourceName(_sDataSourceName) { - DBG_CTOR(OLinkedDocumentsAccess,NULL); + DBG_CTOR(OLinkedDocumentsAccess,NULL); OSL_ENSURE(m_xORB.is(), "OLinkedDocumentsAccess::OLinkedDocumentsAccess: invalid service factory!"); OSL_ENSURE(m_pDialogParent, "OLinkedDocumentsAccess::OLinkedDocumentsAccess: really need a dialog parent!"); } //------------------------------------------------------------------ OLinkedDocumentsAccess::~OLinkedDocumentsAccess() { - DBG_DTOR(OLinkedDocumentsAccess,NULL); + DBG_DTOR(OLinkedDocumentsAccess,NULL); } //------------------------------------------------------------------ Reference< XComponent> OLinkedDocumentsAccess::impl_open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, @@ -180,7 +180,7 @@ namespace dbaui aArguments.put( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); try - { + { Reference<XHierarchicalNameContainer> xHier(m_xDocumentContainer,UNO_QUERY); if ( xHier.is() && xHier->hasByHierarchicalName(_rLinkName) ) { @@ -191,7 +191,7 @@ namespace dbaui xRet = xComponentLoader->loadComponentFromURL( _rLinkName, ::rtl::OUString(), 0, aArguments.getPropertyValues() ); } - catch(Exception& e) + catch(Exception& e) { (void)e; throw; @@ -218,7 +218,7 @@ namespace dbaui } aArgs.put( "DocumentUI", m_xDocumentUI ); - + Reference< XJobExecutor > xWizard; { WaitObject aWaitCursor( m_pDialogParent ); @@ -251,7 +251,7 @@ namespace dbaui void OLinkedDocumentsAccess::newTableWithPilot() { impl_newWithPilot( "com.sun.star.wizards.table.CallTableWizard", -1, ::rtl::OUString() ); - } + } //------------------------------------------------------------------ void OLinkedDocumentsAccess::newQueryWithPilot() { @@ -298,8 +298,8 @@ namespace dbaui // load the document as template Reference< XComponent > xNewDocument; try - { // get the desktop object - + { // get the desktop object + Reference<XMultiServiceFactory> xORB(m_xDocumentContainer,UNO_QUERY); if ( xORB.is() ) { @@ -347,10 +347,10 @@ namespace dbaui //------------------------------------------------------------------ Reference< XComponent > OLinkedDocumentsAccess::open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs ) - { + { dbtools::SQLExceptionInfo aInfo; Reference< XComponent > xRet; - try + try { xRet = impl_open( _rLinkName, _xDefinition, _eOpenMode, _rAdditionalArgs ); if ( !xRet.is() ) @@ -366,7 +366,7 @@ namespace dbaui return xRet; } catch (com::sun::star::io::WrongFormatException e) - { + { com::sun::star::sdbc::SQLException aSQLException; aSQLException.Message = e.Message; aSQLException.Context = e.Context; @@ -379,9 +379,9 @@ namespace dbaui String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); - aInfo.prepend(sMessage); + aInfo.prepend(sMessage); } - catch(Exception& e) + catch(Exception& e) { Any aAny = ::cppu::getCaughtException(); com::sun::star::sdbc::SQLException a; @@ -391,10 +391,10 @@ namespace dbaui aSQLException.Message = e.Message; aSQLException.Context = e.Context; aInfo = dbtools::SQLExceptionInfo(aSQLException); - + // more like a hack, insert an empty message aInfo.prepend(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \n"))); - + String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); aInfo.prepend(sMessage); @@ -406,10 +406,10 @@ namespace dbaui } return xRet; } - + //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index 3e8457361222..070bc53f85f9 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,10 @@ #include <svl/solar.hrc> #include <tools/debug.hxx> -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ +#define ENTER_MOD_METHOD() \ + ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() - + //......................................................................... namespace dbaui { @@ -51,7 +51,7 @@ namespace dbaui */ class OModuleImpl { - ResMgr* m_pRessources; + ResMgr* m_pRessources; public: /// ctor @@ -59,7 +59,7 @@ public: ~OModuleImpl(); /// get the manager for the ressources of the module - ResMgr* getResManager(); + ResMgr* getResManager(); }; DBG_NAME(OModuleImpl) @@ -81,7 +81,7 @@ OModuleImpl::~OModuleImpl() } //------------------------------------------------------------------------- -ResMgr* OModuleImpl::getResManager() +ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -97,11 +97,11 @@ ResMgr* OModuleImpl::getResManager() //========================================================================= //= OModule //========================================================================= -::osl::Mutex OModule::s_aMutex; -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = NULL; +::osl::Mutex OModule::s_aMutex; +sal_Int32 OModule::s_nClients = 0; +OModuleImpl* OModule::s_pImpl = NULL; //------------------------------------------------------------------------- -ResMgr* OModule::getResManager() +ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); @@ -134,7 +134,7 @@ void OModule::ensureImpl() } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx index 817b4a68aee8..e10d48634d44 100644 --- a/dbaccess/source/ui/misc/propertysetitem.cxx +++ b/dbaccess/source/ui/misc/propertysetitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index fc65cb18d670..d28ac662bc20 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index d6cc403765bf..aa2c7ed5de07 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,14 +149,14 @@ namespace dbaui SharedConnection m_xConnection; ::dbtools::DatabaseMetaData m_aSdbMetaData; // </properties> - ::rtl::OUString m_sDataSourceName; // the data source we're working for + ::rtl::OUString m_sDataSourceName; // the data source we're working for DataSourceHolder m_aDataSource; Reference< XModel > m_xDocument; - Reference< XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + Reference< XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier sal_Int32 m_nDocStartNumber; - sal_Bool m_bSuspended; // is true when the controller was already suspended - sal_Bool m_bEditable; // is the control readonly or not - sal_Bool m_bModified; // is the data modified + sal_Bool m_bSuspended; // is true when the controller was already suspended + sal_Bool m_bEditable; // is the control readonly or not + sal_Bool m_bModified; // is the data modified bool m_bNotAttached; OSingleDocumentControllerImpl( ::osl::Mutex& i_rMutex ) @@ -242,7 +242,7 @@ namespace dbaui return OSingleDocumentController_Base::queryInterface( _rType ); } - + //-------------------------------------------------------------------- Sequence< Type > SAL_CALL OSingleDocumentController::getTypes( ) throw (RuntimeException) { @@ -260,7 +260,7 @@ namespace dbaui } return aTypes; } - + //-------------------------------------------------------------------- void OSingleDocumentController::initializeConnection( const Reference< XConnection >& _rxForeignConn ) { @@ -394,9 +394,9 @@ namespace dbaui if ( _rSource.Source == getConnection() ) { if ( !m_pImpl->m_bSuspended // when already suspended then we don't have to reconnect - && !getBroadcastHelper().bInDispose - && !getBroadcastHelper().bDisposed - && isConnected() + && !getBroadcastHelper().bInDispose + && !getBroadcastHelper().bDisposed + && isConnected() ) { losingConnection(); @@ -450,7 +450,7 @@ namespace dbaui if ( !bSuspend && !isConnected() ) reconnect(sal_True); - + return sal_True; } @@ -549,12 +549,12 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString OSingleDocumentController::getDataSourceName() const - { + { ::rtl::OUString sName; Reference< XPropertySet > xDataSourceProps( m_pImpl->m_aDataSource.getDataSourceProps() ); if ( xDataSourceProps.is() ) xDataSourceProps->getPropertyValue(PROPERTY_NAME) >>= sName; - return sName; + return sName; } // ----------------------------------------------------------------------------- void OSingleDocumentController::connectionLostMessage() const @@ -566,13 +566,13 @@ namespace dbaui pWin = VCLUnoHelper::GetWindow(xWindow); if ( !pWin ) pWin = getView()->Window::GetParent(); - + InfoBox(pWin, aMessage).Execute(); } // ----------------------------------------------------------------------------- - const Reference< XConnection >& OSingleDocumentController::getConnection() const - { - return m_pImpl->m_xConnection; + const Reference< XConnection >& OSingleDocumentController::getConnection() const + { + return m_pImpl->m_xConnection; } // ----------------------------------------------------------------------------- @@ -606,7 +606,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - Reference< XDatabaseMetaData > OSingleDocumentController::getMetaData( ) const + Reference< XDatabaseMetaData > OSingleDocumentController::getMetaData( ) const { Reference< XDatabaseMetaData > xMeta; try @@ -658,7 +658,7 @@ namespace dbaui ::osl::MutexGuard aGuard( getMutex() ); if ( m_bExternalTitle ) return impl_getTitleHelper_throw()->getTitle (); - + ::rtl::OUStringBuffer sTitle; Reference< XTitle > xTitle(getPrivateModel(),UNO_QUERY); if ( xTitle.is() ) @@ -674,7 +674,7 @@ namespace dbaui // sTitle.appendAscii(" : "); // sTitle.append(nCurrentView); //} - + return sTitle.makeStringAndClear(); } // ----------------------------------------------------------------------------- @@ -745,7 +745,7 @@ namespace dbaui } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 655dce15c4e8..d1ad52675cd0 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ SfxPoolItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 8ea14059692c..e014d6e8e45d 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,8 +109,8 @@ extern "C" void SAL_CALL createRegistryInfo_DBU() //--------------------------------------------------------------------------------------- extern "C" DBACCESS_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_DBU(); diff --git a/dbaccess/source/ui/querydesign/ConnectionData.hxx b/dbaccess/source/ui/querydesign/ConnectionData.hxx index 67a768e79f40..72764da1317b 100644 --- a/dbaccess/source/ui/querydesign/ConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/ConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,13 +32,13 @@ namespace dbaui { //================================================================== - // ConnData ---------->* ConnLineData - // ^1 ^1 - // | | - // Conn ---------->* ConnLine + // ConnData ---------->* ConnLineData + // ^1 ^1 + // | | + // Conn ---------->* ConnLine //================================================================== - + } #endif // DBAUI_CONNECTIONDATA_HXX @@ -54,7 +54,7 @@ DECLARE_LIST( OConnectionLineList, OConnectionLine* ); DECLARE_LIST( OTableConnectionDataList, OTableConnectionData* ); //================================================================== -const USHORT MAX_CONN_COUNT = 2; +const USHORT MAX_CONN_COUNT = 2; class SbaJoinTabWin; class SbaJoinTabWinCont; diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 4c119ca15c78..04018dec54d0 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ const long HIT_SENSITIVE_RADIUS = 5; namespace { /** calcRect creates a new rectangle with the given points - @param _rBase the base point - @param _aVector the vector which will be added + @param _rBase the base point + @param _aVector the vector which will be added */ inline Rectangle calcRect(const Point& _rBase,const Point& _aVector) { @@ -57,9 +57,9 @@ namespace } // ----------------------------------------------------------------------------- /** GetTextPos calculate the rectangle for the connection to be drawn - @param _pWin the table window where to draw it - @param _aConnPos the connection point - @param _aDescrLinePos the description line pos + @param _pWin the table window where to draw it + @param _aConnPos the connection point + @param _aDescrLinePos the description line pos */ Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos) { @@ -88,10 +88,10 @@ namespace } // ----------------------------------------------------------------------------- /** calcPointsYValue calculate the points Y value in relation to the listbox entry - @param _pWin the corresponding window - @param _pEntry the source or dest entry - @param _rNewConPos (in/out) the connection pos - @param _rNewDescrPos (in/out) the description pos + @param _pWin the corresponding window + @param _pEntry the source or dest entry + @param _rNewConPos (in/out) the connection pos + @param _rNewDescrPos (in/out) the description pos */ void calcPointsYValue(const OTableWindow* _pWin,SvLBoxEntry* _pEntry,Point& _rNewConPos,Point& _rNewDescrPos) { @@ -254,20 +254,20 @@ BOOL OConnectionLine::RecalcLine() aSourceCenter.X() = pSourceWin->GetPosPixel().X() + (long)( 0.5*pSourceWin->GetSizePixel().Width() ); aDestCenter.X() = pDestWin->GetPosPixel().X() + (long)( 0.5*pDestWin->GetSizePixel().Width() ); - const OTableWindow* pFirstWin = pDestWin; - const OTableWindow* pSecondWin = pSourceWin; - Point* pFirstConPos = &m_aDestConnPos; - Point* pFirstDescrPos = &m_aDestDescrLinePos; - Point* pSecondConPos = &m_aSourceConnPos; - Point* pSecondDescrPos = &m_aSourceDescrLinePos; + const OTableWindow* pFirstWin = pDestWin; + const OTableWindow* pSecondWin = pSourceWin; + Point* pFirstConPos = &m_aDestConnPos; + Point* pFirstDescrPos = &m_aDestDescrLinePos; + Point* pSecondConPos = &m_aSourceConnPos; + Point* pSecondDescrPos = &m_aSourceDescrLinePos; if( aDestCenter.X() > aSourceCenter.X() ) { - pFirstWin = pSourceWin; - pSecondWin = pDestWin; - pFirstConPos = &m_aSourceConnPos; - pFirstDescrPos = &m_aSourceDescrLinePos; - pSecondConPos = &m_aDestConnPos; - pSecondDescrPos = &m_aDestDescrLinePos; + pFirstWin = pSourceWin; + pSecondWin = pDestWin; + pFirstConPos = &m_aSourceConnPos; + pFirstDescrPos = &m_aSourceDescrLinePos; + pSecondConPos = &m_aDestConnPos; + pSecondDescrPos = &m_aDestDescrLinePos; } if ( pFirstWin == pSecondWin && pSourceEntry != pDestEntry ) @@ -279,7 +279,7 @@ BOOL OConnectionLine::RecalcLine() ////////////////////////////////////////////////////////////////////// // aSourceConnPosY bestimmen calcPointsYValue(pSourceWin,pSourceEntry,m_aSourceConnPos,m_aSourceDescrLinePos); - + ////////////////////////////////////////////////////////////////////// // aDestConnPosY bestimmen calcPointsYValue(pDestWin,pDestEntry,m_aDestConnPos,m_aDestDescrLinePos); @@ -337,7 +337,7 @@ double dist_Euklid(const Point &p1, const Point& p2,const Point& pM, Point& q) double l = (v.X() * w.Y() - v.Y() * w.X()) / a; double a2 = w.X()*v.X()+w.Y()*v.Y(); a = a2 / (a * a); - q.X() = long(p1.X() + a * v.X()); + q.X() = long(p1.X() + a * v.X()); q.Y() = long(p1.Y() + a * v.Y()); return l; } @@ -361,14 +361,14 @@ bool OConnectionLine::CheckHit( const Point& rMousePos ) const return false; } // ----------------------------------------------------------------------------- -Rectangle OConnectionLine::GetSourceTextPos() const -{ - return GetTextPos(m_pTabConn->GetSourceWin(),m_aSourceConnPos,m_aSourceDescrLinePos); +Rectangle OConnectionLine::GetSourceTextPos() const +{ + return GetTextPos(m_pTabConn->GetSourceWin(),m_aSourceConnPos,m_aSourceDescrLinePos); } // ----------------------------------------------------------------------------- -Rectangle OConnectionLine::GetDestTextPos() const -{ - return GetTextPos(m_pTabConn->GetDestWin(),m_aDestConnPos,m_aDestDescrLinePos); +Rectangle OConnectionLine::GetDestTextPos() const +{ + return GetTextPos(m_pTabConn->GetDestWin(),m_aDestConnPos,m_aDestDescrLinePos); } // ----------------------------------------------------------------------------- Point OConnectionLine::getMidPoint() const diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 8f532687e72c..ba68d702ef41 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; - // using namespace ::com::sun::star::awt; + // using namespace ::com::sun::star::awt; using namespace ::com::sun::star; OConnectionLineAccess::OConnectionLineAccess(OTableConnection* _pLine) - : VCLXAccessibleComponent(_pLine->GetComponentInterface().is() ? _pLine->GetWindowPeer() : NULL) + : VCLXAccessibleComponent(_pLine->GetComponentInterface().is() ? _pLine->GetWindowPeer() : NULL) ,m_pLine(_pLine) { } @@ -206,7 +206,7 @@ namespace dbaui aSeq[0] = m_pLine->GetSourceWin()->GetAccessible(); aSeq[1] = m_pLine->GetDestWin()->GetAccessible(); } - + return AccessibleRelation(AccessibleRelationType::CONTROLLED_BY,aSeq); } // ----------------------------------------------------------------------------- @@ -232,7 +232,7 @@ namespace dbaui DBG_DTOR(OTableConnection,NULL); ////////////////////////////////////////////////////////////////////// // clear vector - clearLineData(); + clearLineData(); } // ----------------------------------------------------------------------------- sal_Bool OConnectionLineAccess::isEditable() const diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx index 49360b0959b5..9140d6effec2 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ namespace dbaui //------------------------------------------------------------------------- bool operator==(const OConnectionLineData& lhs, const OConnectionLineData& rhs) { - return (lhs.m_aSourceFieldName == rhs.m_aSourceFieldName) + return (lhs.m_aSourceFieldName == rhs.m_aSourceFieldName) && (lhs.m_aDestFieldName == rhs.m_aDestFieldName); } } diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 155aac4c27da..beb41dee8ca2 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 3f3059967447..77b31a8a4fd9 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include "precompiled_dbaccess.hxx" #include <sfx2/sfxsids.hrc> #include "dbu_qry.hrc" -#include "browserids.hxx" +#include "browserids.hxx" #include <comphelper/types.hxx> #include "dbustrings.hrc" #include <connectivity/dbtools.hxx> @@ -175,12 +175,12 @@ OJoinController::OJoinController(const Reference< XMultiServiceFactory >& _rM) :OJoinController_BASE(_rM) ,m_pAddTableDialog(NULL) { - DBG_CTOR(OJoinController,NULL); + DBG_CTOR(OJoinController,NULL); } // ----------------------------------------------------------------------------- OJoinController::~OJoinController() { - DBG_DTOR(OJoinController,NULL); + DBG_DTOR(OJoinController,NULL); } // ----------------------------------------------------------------------------- @@ -291,7 +291,7 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& return; case RET_NO: reset(); - setModified(sal_False); // and we are not modified yet + setModified(sal_False); // and we are not modified yet break; default: break; diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 85c5a9eb9120..17ad8bd84b50 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include <comphelper/extract.hxx> #include "UITools.hxx" #include "JoinTableView.hxx" -// #include <com/sun/star/util/URL.hdl> +// #include <com/sun/star/util/URL.hdl> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -87,7 +87,7 @@ void OJoinDesignView::Construct() m_pScrollWindow->setTableView(m_pTableView); m_pScrollWindow->Show(); m_pTableView->Show(); - + SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); ODataView::Construct(); @@ -95,7 +95,7 @@ void OJoinDesignView::Construct() // ----------------------------------------------------------------------------- void OJoinDesignView::initialize() { - // getAddTableDialog()->Update(); + // getAddTableDialog()->Update(); } // ------------------------------------------------------------------------- void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground) diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 75d69afa5b09..b984201492e9 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ namespace dbaui sal_Bool OJoinExchObj::isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID) { DataFlavorExVector::const_iterator aCheckEnd = _rFormats.end(); - for ( DataFlavorExVector::const_iterator aCheck = _rFormats.begin(); + for ( DataFlavorExVector::const_iterator aCheck = _rFormats.begin(); aCheck != aCheckEnd; ++aCheck ) @@ -174,6 +174,6 @@ namespace dbaui } -} // namespace dbaui +} // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 60099ed9999d..1437a57c4d59 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,14 +64,14 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -#define LINE_SIZE 50 +#define LINE_SIZE 50 //////////////////////////////////////////////////////////////// // Konstanten fuer das Fensterlayout -#define TABWIN_SPACING_X 17 -#define TABWIN_SPACING_Y 17 +#define TABWIN_SPACING_X 17 +#define TABWIN_SPACING_Y 17 -#define TABWIN_WIDTH_STD 120 -#define TABWIN_HEIGHT_STD 120 +#define TABWIN_WIDTH_STD 120 +#define TABWIN_HEIGHT_STD 120 DBG_NAME(OScrollWindowHelper) OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent) @@ -105,7 +105,7 @@ OScrollWindowHelper::~OScrollWindowHelper() DBG_DTOR(OScrollWindowHelper,NULL); ::std::auto_ptr<Window> aTemp(m_pCornerWindow); m_pCornerWindow = NULL; - m_pTableView = NULL; + m_pTableView = NULL; } // ----------------------------------------------------------------------------- @@ -207,7 +207,7 @@ OJoinTableView::~OJoinTableView() } ////////////////////////////////////////////////////////////////////// // Listen loeschen - clearLayoutInformation(); + clearLayoutInformation(); } //------------------------------------------------------------------------------ IMPL_LINK( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar ) @@ -274,7 +274,7 @@ bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,sal_Bool _bDelet modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, makeAny(_pConn->GetAccessible()), Any()); if ( _bDelete ) @@ -359,7 +359,7 @@ void OJoinTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rt modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(pNewTabWin->GetAccessible())); } @@ -384,7 +384,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) { OTableConnection* pTabConn = (*aIter); if( - ( pData == pTabConn->GetData()->getReferencingTable()) || + ( pData == pTabConn->GetData()->getReferencingTable()) || ( pData == pTabConn->GetData()->getReferencedTable()) ) { @@ -400,7 +400,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) if ( bRemove ) { if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, makeAny(pTabWin->GetAccessible()),Any() ); @@ -444,7 +444,7 @@ namespace long nOldThumbPos = pBar->GetThumbPos(); long nNewThumbPos = nOldThumbPos + nDelta; if( nNewThumbPos < 0 ) - nNewThumbPos = 0;// bRet = FALSE; + nNewThumbPos = 0;// bRet = FALSE; else if( nNewThumbPos > pBar->GetRangeMax() ) nNewThumbPos = pBar->GetRangeMax();// bRet = FALSE; @@ -466,7 +466,7 @@ namespace Point aUpperLeft = _rPoint; // normalize with respect to visibility aUpperLeft -= _pView->GetScrollOffset(); - // aUpperLeft.Y() -= _pView->GetScrollOffset().Y(); + // aUpperLeft.Y() -= _pView->GetScrollOffset().Y(); Point aLowerRight(aUpperLeft.X() + _rSize.Width(), aUpperLeft.Y() + _rSize.Height()); // data about ourself @@ -485,7 +485,7 @@ namespace _nScrollX = aLowerRight.X() - aSize.Width() + TABWIN_SPACING_X; // ensure the visibility of the left border (higher priority) - // if ( (aUpperLeft.X() - _nScrollX) < 0 ) + // if ( (aUpperLeft.X() - _nScrollX) < 0 ) if ( aUpperLeft.X() < 0 ) _nScrollX = aUpperLeft.X() - TABWIN_SPACING_X; } @@ -496,7 +496,7 @@ namespace if ( aLowerRight.Y() > aSize.Height() ) _nScrollY = aLowerRight.Y() - aSize.Height() + TABWIN_SPACING_Y; // upper border - // if ( (aUpperLeft.Y() - _nScrollY) < 0 ) + // if ( (aUpperLeft.Y() - _nScrollY) < 0 ) if ( aUpperLeft.Y() < 0 ) _nScrollY = aUpperLeft.Y() - TABWIN_SPACING_Y; } @@ -534,7 +534,7 @@ void OJoinTableView::EnsureVisible(const OTableWindow* _pWin) { // data about the tab win TTableWindowData::value_type pData = _pWin->GetData(); - // Point aUpperLeft = pData->GetPosition(); + // Point aUpperLeft = pData->GetPosition(); EnsureVisible( pData->GetPosition() , pData->GetSize()); Invalidate(INVALIDATE_NOCHILDREN); } @@ -1051,14 +1051,14 @@ void OJoinTableView::DrawConnections( const Rectangle& rRect ) //------------------------------------------------------------------------------ ::std::vector<OTableConnection*>::const_iterator OJoinTableView::getTableConnections(const OTableWindow* _pFromWin) const { - return ::std::find_if( m_vTableConnection.begin(), + return ::std::find_if( m_vTableConnection.begin(), m_vTableConnection.end(), ::std::bind2nd(::std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); } // ----------------------------------------------------------------------------- sal_Int32 OJoinTableView::getConnectionCount(const OTableWindow* _pFromWin) const { - return ::std::count_if( m_vTableConnection.begin(), + return ::std::count_if( m_vTableConnection.begin(), m_vTableConnection.end(), ::std::bind2nd(::std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); } @@ -1083,8 +1083,8 @@ void OJoinTableView::ClearAll() RemoveConnection( *aIter ,sal_True); m_vTableConnection.clear(); - m_pLastFocusTabWin = NULL; - m_pSelectedConn = NULL; + m_pLastFocusTabWin = NULL; + m_pSelectedConn = NULL; // scroll to the upper left ScrollPane(-GetScrollOffset().X(), TRUE, TRUE); @@ -1229,8 +1229,8 @@ BOOL OJoinTableView::IsAddAllowed() } // nicht wenn keine Joins moeglich -// if (!GetDatabase()->IsCapable(SDB_CAP_JOIN) && nMax <= GetTabWinCount()) -// return FALSE; +// if (!GetDatabase()->IsCapable(SDB_CAP_JOIN) && nMax <= GetTabWinCount()) +// return FALSE; return TRUE; } @@ -1316,14 +1316,14 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab { OTableConnection* pData = *aIter; - if ( ( (pData->GetSourceWin() == pLhs) - && ( (pData->GetDestWin() == pRhs) - || (NULL == pRhs) + if ( ( (pData->GetSourceWin() == pLhs) + && ( (pData->GetDestWin() == pRhs) + || (NULL == pRhs) ) ) - || ( (pData->GetSourceWin() == pRhs) - && ( (pData->GetDestWin() == pLhs) - || (NULL == pLhs) + || ( (pData->GetSourceWin() == pRhs) + && ( (pData->GetDestWin() == pLhs) + || (NULL == pLhs) ) ) ) @@ -1381,7 +1381,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) // no tab wins -> no conns -> no traveling break; - const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); if (!pKeyEvent->GetKeyCode().IsMod1()) { switch (pKeyEvent->GetKeyCode().GetCode()) @@ -1403,7 +1403,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) OTableConnection* pNextConn = NULL; if (aIter != m_aTableMap.end()) - { // there is a currently active tab win + { // there is a currently active tab win // check if there is an "overflow" and we should select a conn instead of a win if (!m_vTableConnection.empty()) { @@ -1441,7 +1441,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) } } else - { // no active tab win -> travel the connections + { // no active tab win -> travel the connections // find the currently selected conn within the conn list sal_Int32 i(0); for ( ::std::vector<OTableConnection*>::iterator connectionIter = m_vTableConnection.begin(); @@ -1467,7 +1467,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) // there is a currently active conn pNextConn = m_vTableConnection[(i + (bForward ? 1 : m_vTableConnection.size() - 1)) % m_vTableConnection.size()]; else - { // no tab win selected, no conn selected + { // no tab win selected, no conn selected if (!m_vTableConnection.empty()) pNextConn = m_vTableConnection[bForward ? 0 : m_vTableConnection.size() - 1]; else if (!m_aTableMap.empty()) @@ -1634,8 +1634,8 @@ void OJoinTableView::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ // ----------------------------------------------------------------------------- void OJoinTableView::clearLayoutInformation() { - m_pLastFocusTabWin = NULL; - m_pSelectedConn = NULL; + m_pLastFocusTabWin = NULL; + m_pSelectedConn = NULL; ////////////////////////////////////////////////////////////////////// // Listen loeschen OTableWindowMapIterator aIter = m_aTableMap.begin(); @@ -1705,7 +1705,7 @@ void OJoinTableView::addConnection(OTableConnection* _pConnection,sal_Bool _bAdd modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(_pConnection->GetAccessible())); } diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx index 4bba1b75eaaa..3720e53a2326 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,13 +82,13 @@ sal_Bool OQueryTableConnection::operator==(const OQueryTableConnection& rCompare OQueryTableConnectionData* pCompData = static_cast<OQueryTableConnectionData*>(rCompare.GetData().get()); // Connections werden als gleich angesehen, wenn sie in Source-/Dest-Fenstername und Source-/Dest-FieldIndex uebereinstimmen ... - return ( ( (pMyData->getReferencedTable() == pCompData->getReferencedTable()) && + return ( ( (pMyData->getReferencedTable() == pCompData->getReferencedTable()) && (pMyData->getReferencingTable() == pCompData->getReferencingTable()) && (pMyData->GetFieldIndex(JTCS_TO) == pCompData->GetFieldIndex(JTCS_TO)) && (pMyData->GetFieldIndex(JTCS_FROM) == pCompData->GetFieldIndex(JTCS_FROM)) ) - || // ... oder diese Uebereinstimmung ueber Kreuz besteht - ( (pMyData->getReferencingTable() == pCompData->getReferencedTable()) && + || // ... oder diese Uebereinstimmung ueber Kreuz besteht + ( (pMyData->getReferencingTable() == pCompData->getReferencedTable()) && (pMyData->getReferencedTable() == pCompData->getReferencingTable()) && (pMyData->GetFieldIndex(JTCS_TO) == pCompData->GetFieldIndex(JTCS_FROM)) && (pMyData->GetFieldIndex(JTCS_FROM) == pCompData->GetFieldIndex(JTCS_TO)) diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx index a2402acab43b..9e49ded4088a 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace dbaui class OQueryTableView; class OQueryTableConnection : public OTableConnection { - sal_Bool m_bVisited; // is true if the conn was already visited through the join algorithm + sal_Bool m_bVisited; // is true if the conn was already visited through the join algorithm public: OQueryTableConnection(OQueryTableView* pContainer, const TTableConnectionData::value_type& pTabConnData); OQueryTableConnection(const OQueryTableConnection& rConn); @@ -47,10 +47,10 @@ namespace dbaui OQueryTableConnection& operator=(const OQueryTableConnection& rConn); sal_Bool operator==(const OQueryTableConnection& rCompare); - inline ::rtl::OUString GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); } + inline ::rtl::OUString GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); } - inline sal_Bool IsVisited() const { return m_bVisited; } - inline void SetVisited(sal_Bool bVisited) { m_bVisited = bVisited; } + inline sal_Bool IsVisited() const { return m_bVisited; } + inline void SetVisited(sal_Bool bVisited) { m_bVisited = bVisited; } }; } diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx index a15714a299cc..40111be03592 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,8 +156,8 @@ void OQueryTableConnectionData::InitFromDrag(const OTableFieldDescRef& rDragLeft } // ----------------------------------------------------------------------------- OTableConnectionData* OQueryTableConnectionData::NewInstance() const -{ - return new OQueryTableConnectionData(); +{ + return new OQueryTableConnectionData(); } // ----------------------------------------------------------------------------- BOOL OQueryTableConnectionData::Update() diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index f7d2173907b1..061541663229 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,13 +37,13 @@ namespace dbaui { class OQueryTableConnectionData : public OTableConnectionData { - sal_Int32 m_nFromEntryIndex; - sal_Int32 m_nDestEntryIndex; - EJoinType m_eJoinType; + sal_Int32 m_nFromEntryIndex; + sal_Int32 m_nDestEntryIndex; + EJoinType m_eJoinType; bool m_bNatural; - ETableFieldType m_eFromType; - ETableFieldType m_eDestType; + ETableFieldType m_eFromType; + ETableFieldType m_eDestType; protected: // fuer das Anlegen und Duplizieren von Lines vom eigenen Typ @@ -61,25 +61,25 @@ namespace dbaui virtual void CopyFrom(const OTableConnectionData& rSource); virtual OTableConnectionData* NewInstance() const; - + /** Update create a new connection @return true if successful */ virtual BOOL Update(); - ::rtl::OUString GetAliasName(EConnectionSide nWhich) const; + ::rtl::OUString GetAliasName(EConnectionSide nWhich) const; - sal_Int32 GetFieldIndex(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_nDestEntryIndex : m_nFromEntryIndex; } - void SetFieldIndex(EConnectionSide nWhich, sal_Int32 nVal) { if (nWhich==JTCS_TO) m_nDestEntryIndex=nVal; else m_nFromEntryIndex=nVal; } + sal_Int32 GetFieldIndex(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_nDestEntryIndex : m_nFromEntryIndex; } + void SetFieldIndex(EConnectionSide nWhich, sal_Int32 nVal) { if (nWhich==JTCS_TO) m_nDestEntryIndex=nVal; else m_nFromEntryIndex=nVal; } - ETableFieldType GetFieldType(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_eDestType : m_eFromType; } - void SetFieldType(EConnectionSide nWhich, ETableFieldType eType) { if (nWhich==JTCS_TO) m_eDestType=eType; else m_eFromType=eType; } + ETableFieldType GetFieldType(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_eDestType : m_eFromType; } + void SetFieldType(EConnectionSide nWhich, ETableFieldType eType) { if (nWhich==JTCS_TO) m_eDestType=eType; else m_eFromType=eType; } - void InitFromDrag(const OTableFieldDescRef& rDragLeft, const OTableFieldDescRef& rDragRight); + void InitFromDrag(const OTableFieldDescRef& rDragLeft, const OTableFieldDescRef& rDragRight); - EJoinType GetJoinType() const { return m_eJoinType; }; - void SetJoinType(const EJoinType& eJT) { m_eJoinType = eJT; }; + EJoinType GetJoinType() const { return m_eJoinType; }; + void SetJoinType(const EJoinType& eJT) { m_eJoinType = eJT; }; inline void setNatural(bool _bNatural) { m_bNatural = _bNatural; } inline bool isNatural() const { return m_bNatural; } diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 45135346cde9..4700ebfff613 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,9 +124,9 @@ sal_Bool OQueryTableWindow::Init() m_aTitle.SetText( pWinData->GetWinName() ); m_aTitle.Show(); - // sal_Bool bSuccess(sal_True); + // sal_Bool bSuccess(sal_True); if (!bSuccess) - { // es soll nur ein Dummy-Window aufgemacht werden ... + { // es soll nur ein Dummy-Window aufgemacht werden ... DBG_ASSERT(GetAliasName().getLength(), "OQueryTableWindow::Init : kein Alias- UND kein Tabellenname geht nicht !"); // .. aber das braucht wenigstens einen Alias diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index deaad8621808..b1fe23703c4a 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,52 +38,52 @@ namespace dbaui //================================================================== class OQueryTableWindow : public OTableWindow { - sal_Int32 m_nAliasNum; - ::rtl::OUString m_strInitialAlias; + sal_Int32 m_nAliasNum; + ::rtl::OUString m_strInitialAlias; public: OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL ); virtual ~OQueryTableWindow(); - ::rtl::OUString GetAliasName() const - { - return static_cast<OQueryTableWindowData*>(GetData().get())->GetAliasName(); + ::rtl::OUString GetAliasName() const + { + return static_cast<OQueryTableWindowData*>(GetData().get())->GetAliasName(); } - void SetAliasName(const ::rtl::OUString& strNewAlias) - { - static_cast<OQueryTableWindowData*>(GetData().get())->SetAliasName(strNewAlias); + void SetAliasName(const ::rtl::OUString& strNewAlias) + { + static_cast<OQueryTableWindowData*>(GetData().get())->SetAliasName(strNewAlias); } // spaeter Constructor, die Basisklasse ERZEUGT beim ersten Aufruf die Listbox - virtual BOOL Init(); + virtual BOOL Init(); - inline sal_Int32 GetAliasNum() const { return m_nAliasNum; } + inline sal_Int32 GetAliasNum() const { return m_nAliasNum; } - BOOL ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo); - BOOL ExistsAVisitedConn() const; + BOOL ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo); + BOOL ExistsAVisitedConn() const; - virtual ::rtl::OUString GetName() const { return GetWinName(); } + virtual ::rtl::OUString GetName() const { return GetWinName(); } protected: - virtual void KeyInput( const KeyEvent& rEvt ); + virtual void KeyInput( const KeyEvent& rEvt ); - virtual void OnEntryDoubleClicked(SvLBoxEntry* pEntry); + virtual void OnEntryDoubleClicked(SvLBoxEntry* pEntry); // wird aus dem DoubleClickHdl der ListBox heraus aufgerufen /** delete the user data with the equal type as created within createUserData - @param _pUserData + @param _pUserData The user data store in the listbox entries. Created with a call to createUserData. _pUserData may be <NULL/>. */ virtual void deleteUserData(void*& _pUserData); /** creates user information that will be append at the ListBoxentry - @param _xColumn + @param _xColumn The corresponding column, can be <NULL/>. - @param _bPrimaryKey + @param _bPrimaryKey <TRUE/> when the column belongs to the primary key @return the user data which will be append at the listbox entry, may be <NULL/> */ - virtual void* createUserData(const ::com::sun::star::uno::Reference< + virtual void* createUserData(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bPrimaryKey); }; diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx index 5fc047a9fbcf..142f8badde70 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index 9a54e738a764..da13c287b1ed 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/Query.hrc b/dbaccess/source/ui/querydesign/Query.hrc index 6fb9bb9ac5d0..d529b048d3a7 100644 --- a/dbaccess/source/ui/querydesign/Query.hrc +++ b/dbaccess/source/ui/querydesign/Query.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,8 +27,8 @@ #ifndef DBAUI_QUERY_HRC #define DBAUI_QUERY_HRC -#define IMG_PRIMARY_KEY 1 -#define IMG_FOREIGN_KEY 2 +#define IMG_PRIMARY_KEY 1 +#define IMG_FOREIGN_KEY 2 #endif // DBAUI_QUERY_HRC diff --git a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx index c0ef7d5ef1ef..c847b8c56d6d 100644 --- a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index 6cccdbcf9c34..c94bc1e390d3 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,23 +38,23 @@ namespace dbaui // ================================================================================================ // OQueryDesignFieldUndoAct - Basisklasse fuer Undos in der Feldauflistung im Abfrageentwurf - + class OQueryDesignFieldUndoAct : public OCommentUndoAction { protected: - OSelectionBrowseBox* pOwner; - USHORT m_nColumnPostion; + OSelectionBrowseBox* pOwner; + USHORT m_nColumnPostion; - virtual void Undo() = 0; - virtual void Redo() = 0; + virtual void Undo() = 0; + virtual void Redo() = 0; public: OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID); virtual ~OQueryDesignFieldUndoAct(); - inline void SetColumnPosition(USHORT _nColumnPostion) - { - m_nColumnPostion = _nColumnPostion; + inline void SetColumnPosition(USHORT _nColumnPostion) + { + m_nColumnPostion = _nColumnPostion; OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!"); OSL_ENSURE(m_nColumnPostion < pOwner->GetColumnCount(),"Position outside the column count!"); } @@ -66,16 +66,16 @@ namespace dbaui class OTabFieldCellModifiedUndoAct : public OQueryDesignFieldUndoAct { protected: - String m_strNextCellContents; - sal_Int32 m_nCellIndex; + String m_strNextCellContents; + sal_Int32 m_nCellIndex; public: - OTabFieldCellModifiedUndoAct(OSelectionBrowseBox* pSelBrwBox) - : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_MODIFY_CELL) + OTabFieldCellModifiedUndoAct(OSelectionBrowseBox* pSelBrwBox) + : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_MODIFY_CELL) ,m_nCellIndex(BROWSER_INVALIDID){ } - inline void SetCellContents(const String& str) { m_strNextCellContents = str; } - inline void SetCellIndex(sal_Int32 nIndex) { m_nCellIndex = nIndex; } + inline void SetCellContents(const String& str) { m_strNextCellContents = str; } + inline void SetCellIndex(sal_Int32 nIndex) { m_nCellIndex = nIndex; } virtual void Undo(); virtual void Redo() { Undo(); } @@ -87,7 +87,7 @@ namespace dbaui class OTabFieldSizedUndoAct : public OQueryDesignFieldUndoAct { protected: - long m_nNextWidth; + long m_nNextWidth; public: OTabFieldSizedUndoAct(OSelectionBrowseBox* pSelBrwBox) : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_SIZE_COLUMN), m_nNextWidth(0) { } @@ -104,7 +104,7 @@ namespace dbaui class OTabFieldUndoAct : public OQueryDesignFieldUndoAct { protected: - OTableFieldDescRef pDescr; // geloeschte Spaltenbeschreibung + OTableFieldDescRef pDescr; // geloeschte Spaltenbeschreibung public: OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { } @@ -145,8 +145,8 @@ namespace dbaui { protected: virtual void Undo(); - virtual void Redo() - { + virtual void Redo() + { Undo(); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx index 557a94c14204..21f37bb16407 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace dbaui class OQueryDesignUndoAction : public OCommentUndoAction { protected: - OJoinTableView* m_pOwner; // in diesem Container spielt sich alles ab + OJoinTableView* m_pOwner; // in diesem Container spielt sich alles ab public: OQueryDesignUndoAction(OJoinTableView* pOwner, USHORT nCommentID) : OCommentUndoAction(nCommentID), m_pOwner(pOwner) { } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 60e71a4a8e7d..27a3c9c1c38a 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ +#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e1) || \ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e2))) @@ -87,14 +87,14 @@ namespace static const ::rtl::OUString C_OR = ::rtl::OUString::createFromAscii(" OR "); // forward declarations - sal_Bool InsertJoin( const OQueryDesignView* _pView, + sal_Bool InsertJoin( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode *pNode); SqlParseError InstallFields(OQueryDesignView* _pView, const ::connectivity::OSQLParseNode* pNode, OJoinTableView::OTableWindowMap* pTabList ); - SqlParseError GetGroupCriteria( OQueryDesignView* _pView, + SqlParseError GetGroupCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pSelectRoot ); @@ -103,7 +103,7 @@ namespace const ::connectivity::OSQLParseNode* pSelectRoot, sal_uInt16& rLevel ); - SqlParseError GetOrderCriteria( OQueryDesignView* _pView, + SqlParseError GetOrderCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pParseRoot ); @@ -161,12 +161,12 @@ namespace Reference<XNameAccess> xReferencedTableColumns(aInfoData->getReferencedTable()->getColumns()); Sequence< ::rtl::OUString> aSeq = aInfoData->getReferencingTable()->getColumns()->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( xReferencedTableColumns->hasByName(*pIter) ) aInfoData->AppendConnLine(*pIter,*pIter); - } + } } catch( const Exception& ) { @@ -193,7 +193,7 @@ namespace pConn->GetData()->AppendConnLine( aSourceFieldName,aDestFieldName); pConn->UpdateLineList(); // Modified-Flag - // SetModified(); + // SetModified(); // und neu zeichnen pConn->RecalcLines(); // fuer das unten folgende Invalidate muss ich dieser neuen Connection erst mal die Moeglichkeit geben, @@ -202,13 +202,13 @@ namespace } } //------------------------------------------------------------------------------ - ::rtl::OUString ParseCondition( OQueryController& rController + ::rtl::OUString ParseCondition( OQueryController& rController ,const ::connectivity::OSQLParseNode* pCondition ,const ::rtl::OUString _sDecimal ,const ::com::sun::star::lang::Locale& _rLocale ,sal_uInt32 _nStartIndex) { - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; Reference< XConnection> xConnection = rController.getConnection(); if ( xConnection.is() ) { @@ -237,8 +237,8 @@ namespace if ( SQL_ISRULE( pParseNode, qualified_join ) || SQL_ISRULE( pParseNode, joined_table ) || SQL_ISRULE( pParseNode, cross_union ) ) pJoinNode = pParseNode; - else if( SQL_ISRULE(pParseNode,table_ref) - && pParseNode->count() == 4 ) // '{' SQL_TOKEN_OJ joined_table '}' + else if( SQL_ISRULE(pParseNode,table_ref) + && pParseNode->count() == 4 ) // '{' SQL_TOKEN_OJ joined_table '}' pJoinNode = pParseNode->getChild(2); if ( pJoinNode ) @@ -258,7 +258,7 @@ namespace /** FillDragInfo fills the field description out of the table */ //------------------------------------------------------------------------------ - SqlParseError FillDragInfo( const OQueryDesignView* _pView, + SqlParseError FillDragInfo( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode* pColumnRef, OTableFieldDescRef& _rDragInfo) { @@ -273,7 +273,7 @@ namespace if ( aTableRange.getLength() ) { - OQueryTableWindow* pSTW = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( aTableRange ); + OQueryTableWindow* pSTW = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( aTableRange ); bErg = (pSTW && pSTW->ExistsField( aColumnName, _rDragInfo ) ); } if ( !bErg ) @@ -303,7 +303,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoinCriteria( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoinCriteria( const Reference< XConnection>& _xConnection, OConnectionLineDataVec* pLineDataList, OQueryTableConnectionData* pData) { @@ -340,12 +340,12 @@ namespace } //------------------------------------------------------------------------------ /** JoinCycle looks for a join cycle and append it to the string - @param _xConnection the connection - @param _pEntryConn the table connection which holds the data - @param _pEntryTabTo the corresponding table window - @param _rJoin the String which will contain the resulting string + @param _xConnection the connection + @param _pEntryConn the table connection which holds the data + @param _pEntryTabTo the corresponding table window + @param _rJoin the String which will contain the resulting string */ - void JoinCycle( const Reference< XConnection>& _xConnection, + void JoinCycle( const Reference< XConnection>& _xConnection, OQueryTableConnection* _pEntryConn, const OQueryTableWindow* _pEntryTabTo, ::rtl::OUString& _rJoin ) @@ -368,14 +368,14 @@ namespace } } //------------------------------------------------------------------------------ - ::rtl::OUString BuildTable( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildTable( const Reference< XConnection>& _xConnection, const OQueryTableWindow* pEntryTab, bool _bForce = false ) { ::rtl::OUString aDBName(pEntryTab->GetComposedName()); - // Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); + // Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); if( _xConnection.is() ) { try @@ -404,7 +404,7 @@ namespace return aDBName; } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, const ::rtl::OUString& rLh, const ::rtl::OUString& rRh, OQueryTableConnectionData* pData) @@ -444,7 +444,7 @@ namespace return aErg; } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, OQueryTableWindow* pLh, OQueryTableWindow* pRh, OQueryTableConnectionData* pData @@ -454,7 +454,7 @@ namespace return BuildJoin(_xConnection,BuildTable(_xConnection,pLh,bForce),BuildTable(_xConnection,pRh,bForce),pData); } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, const ::rtl::OUString &rLh, OQueryTableWindow* pRh, OQueryTableConnectionData* pData @@ -463,7 +463,7 @@ namespace return BuildJoin(_xConnection,rLh,BuildTable(_xConnection,pRh),pData); } //------------------------------------------------------------------------------ - ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, + ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection, OQueryTableWindow* pLh, const ::rtl::OUString &rRh, OQueryTableConnectionData* pData @@ -472,7 +472,7 @@ namespace return BuildJoin(_xConnection,BuildTable(_xConnection,pLh),rRh,pData); } //------------------------------------------------------------------------------ - void GetNextJoin( const Reference< XConnection>& _xConnection, + void GetNextJoin( const Reference< XConnection>& _xConnection, OQueryTableConnection* pEntryConn, OQueryTableWindow* pEntryTabTo, ::rtl::OUString &aJoin) @@ -481,7 +481,7 @@ namespace if ( pEntryConnData->GetJoinType() == INNER_JOIN && !pEntryConnData->isNatural() ) return; - // Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); + // Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); if(!aJoin.getLength()) { @@ -536,20 +536,20 @@ namespace } } //------------------------------------------------------------------------------ - SqlParseError InsertJoinConnection( const OQueryDesignView* _pView, + SqlParseError InsertJoinConnection( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode *pNode, const EJoinType& _eJoinType, const ::connectivity::OSQLParseNode *pLeftTable, const ::connectivity::OSQLParseNode *pRightTable) { SqlParseError eErrorCode = eOk; - if (pNode->count() == 3 && // Ausdruck is geklammert + if (pNode->count() == 3 && // Ausdruck is geklammert SQL_ISPUNCTUATION(pNode->getChild(0),"(") && SQL_ISPUNCTUATION(pNode->getChild(2),")")) { eErrorCode = InsertJoinConnection(_pView,pNode->getChild(1), _eJoinType,pLeftTable,pRightTable); } - else if (SQL_ISRULEOR2(pNode,search_condition,boolean_term) && // AND/OR-Verknuepfung: + else if (SQL_ISRULEOR2(pNode,search_condition,boolean_term) && // AND/OR-Verknuepfung: pNode->count() == 3) { // nur AND Verknüpfung zulassen @@ -579,8 +579,8 @@ namespace if ( pLeftTable ) { - OQueryTableWindow* pLeftWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pLeftTable->getByRule(OSQLParseNode::table_ref) )); - // OQueryTableWindow* pRightWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pRightTable->getByRule(OSQLParseNode::table_ref) )); + OQueryTableWindow* pLeftWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pLeftTable->getByRule(OSQLParseNode::table_ref) )); + // OQueryTableWindow* pRightWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pRightTable->getByRule(OSQLParseNode::table_ref) )); if ( pLeftWindow == aDragLeft->GetTabWindow() ) insertConnection(_pView,_eJoinType,aDragLeft,aDragRight); else @@ -594,14 +594,14 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - sal_Bool GetInnerJoinCriteria( const OQueryDesignView* _pView, + sal_Bool GetInnerJoinCriteria( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode *pCondition) { return InsertJoinConnection(_pView,pCondition, INNER_JOIN,NULL,NULL) != eOk; } //------------------------------------------------------------------------------ - ::rtl::OUString GenerateSelectList( const OQueryDesignView* _pView, - OTableFields& _rFieldList, + ::rtl::OUString GenerateSelectList( const OQueryDesignView* _pView, + OTableFields& _rFieldList, sal_Bool bAlias) { Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection(); @@ -656,7 +656,7 @@ namespace { // we have to look if we have alias.* here but before we have to check if the column doesn't already exist String sTemp = rFieldName; - OTableFieldDescRef aInfo = new OTableFieldDesc(); + OTableFieldDescRef aInfo = new OTableFieldDesc(); OJoinTableView::OTableWindowMap::iterator tableIter = pTabList->begin(); OJoinTableView::OTableWindowMap::iterator tableEnd = pTabList->end(); sal_Bool bFound = sal_False; @@ -689,9 +689,9 @@ namespace aTmpStr = aTmpStr2; } - if (rFieldAlias.getLength() && - (rFieldName.toChar() != '*' || - pEntryField->isNumericOrAggreateFunction() || + if (rFieldAlias.getLength() && + (rFieldName.toChar() != '*' || + pEntryField->isNumericOrAggreateFunction() || pEntryField->isOtherFunction())) { aTmpStr.append(s_sAs); @@ -711,14 +711,14 @@ namespace return aFieldListStr.makeStringAndClear(); } //------------------------------------------------------------------------------ - sal_Bool GenerateCriterias( OQueryDesignView* _pView, + sal_Bool GenerateCriterias( OQueryDesignView* _pView, ::rtl::OUStringBuffer& rRetStr, ::rtl::OUStringBuffer& rHavingStr, OTableFields& _rFieldList, sal_Bool bMulti ) { // * darf keine Filter enthalten : habe ich die entsprechende Warnung schon angezeigt ? - sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS ** + sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS ** ::rtl::OUString aFieldName,aCriteria,aWhereStr,aHavingStr,aWork/*,aOrderStr*/; // Zeilenweise werden die Ausdr"ucke mit AND verknuepft @@ -744,7 +744,7 @@ namespace for(aIter = _rFieldList.begin();aIter != aEnd;++aIter) { - OTableFieldDescRef pEntryField = *aIter; + OTableFieldDescRef pEntryField = *aIter; aFieldName = pEntryField->GetField(); if (!aFieldName.getLength()) @@ -773,8 +773,8 @@ namespace if ( pEntryField->isAggreateFunction() || pEntryField->IsGroupBy() ) { - if (!aHavingStr.getLength()) // noch keine Kriterien - aHavingStr += ::rtl::OUString('('); // Klammern + if (!aHavingStr.getLength()) // noch keine Kriterien + aHavingStr += ::rtl::OUString('('); // Klammern else aHavingStr += C_AND; @@ -782,9 +782,9 @@ namespace { OSL_ENSURE(pEntryField->GetFunction().getLength(),"No function name for aggregate given!"); aHavingStr += pEntryField->GetFunction(); - aHavingStr += ::rtl::OUString('('); // Klammern + aHavingStr += ::rtl::OUString('('); // Klammern aHavingStr += aWork; - aHavingStr += ::rtl::OUString(')'); // Klammern + aHavingStr += ::rtl::OUString(')'); // Klammern } else aHavingStr += aWork; @@ -798,10 +798,10 @@ namespace if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*'))) pParseNode->replaceNodeValue(pEntryField->GetAlias(),aFieldName); ::rtl::OUString sHavingStr = aHavingStr; - + sal_uInt32 nCount = pParseNode->count(); for( sal_uInt32 node = 1 ; node < nCount ; ++node) - pParseNode->getChild(node)->parseNodeToStr( sHavingStr, + pParseNode->getChild(node)->parseNodeToStr( sHavingStr, xConnection, &rContext, sal_False, @@ -813,8 +813,8 @@ namespace } else { - if ( !aWhereStr.getLength() ) // noch keine Kriterien - aWhereStr += ::rtl::OUString('('); // Klammern + if ( !aWhereStr.getLength() ) // noch keine Kriterien + aWhereStr += ::rtl::OUString('('); // Klammern else aWhereStr += C_AND; @@ -829,7 +829,7 @@ namespace if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*'))) pParseNode->replaceNodeValue(pEntryField->GetAlias(),aFieldName); ::rtl::OUString aWhere = aWhereStr; - pParseNode->parseNodeToStr( aWhere, + pParseNode->parseNodeToStr( aWhere, xConnection, &rContext, sal_False, @@ -847,8 +847,8 @@ namespace // nur einmal für jedes Feld else if ( !i && pEntryField->isCondition() ) { - if (!aWhereStr.getLength()) // noch keine Kriterien - aWhereStr += ::rtl::OUString('('); // Klammern + if (!aWhereStr.getLength()) // noch keine Kriterien + aWhereStr += ::rtl::OUString('('); // Klammern else aWhereStr += C_AND; aWhereStr += pEntryField->GetField(); @@ -856,28 +856,28 @@ namespace } if (aWhereStr.getLength()) { - aWhereStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig - if (rRetStr.getLength()) // schon Feldbedingungen ? + aWhereStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig + if (rRetStr.getLength()) // schon Feldbedingungen ? rRetStr.append(C_OR); - else // Klammern auf fuer 'OR' Zweig + else // Klammern auf fuer 'OR' Zweig rRetStr.append(sal_Unicode('(')); rRetStr.append(aWhereStr); } if (aHavingStr.getLength()) { - aHavingStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig - if (rHavingStr.getLength()) // schon Feldbedingungen ? + aHavingStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig + if (rHavingStr.getLength()) // schon Feldbedingungen ? rHavingStr.append(C_OR); - else // Klammern auf fuer 'OR' Zweig + else // Klammern auf fuer 'OR' Zweig rHavingStr.append(sal_Unicode('(')); rHavingStr.append(aHavingStr); } } if (rRetStr.getLength()) - rRetStr.append(sal_Unicode(')')); // Klammern zu fuer 'OR' Zweig + rRetStr.append(sal_Unicode(')')); // Klammern zu fuer 'OR' Zweig if (rHavingStr.getLength()) - rHavingStr.append(sal_Unicode(')')); // Klammern zu fuer 'OR' Zweig + rHavingStr.append(sal_Unicode(')')); // Klammern zu fuer 'OR' Zweig } catch(SQLException&) { @@ -886,7 +886,7 @@ namespace return sal_True; } //------------------------------------------------------------------------------ - SqlParseError GenerateOrder( OQueryDesignView* _pView, + SqlParseError GenerateOrder( OQueryDesignView* _pView, OTableFields& _rFieldList, sal_Bool bMulti, ::rtl::OUString& _rsRet) @@ -906,12 +906,12 @@ namespace Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString(); // * darf keine Filter enthalten : habe ich die entsprechende Warnung schon angezeigt ? - sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS ** + sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS ** OTableFields::iterator aIter = _rFieldList.begin(); OTableFields::iterator aEnd = _rFieldList.end(); for(;aIter != aEnd;++aIter) { - OTableFieldDescRef pEntryField = *aIter; + OTableFieldDescRef pEntryField = *aIter; EOrderDir eOrder = pEntryField->GetOrderDir(); // nur wenn eine Sortierung und ein Tabellenname vorhanden ist-> erzeugen @@ -1024,9 +1024,9 @@ namespace } } //------------------------------------------------------------------------------ - ::rtl::OUString GenerateFromClause( const Reference< XConnection>& _xConnection, - const OQueryTableView::OTableWindowMap* pTabList, - const ::std::vector<OTableConnection*>* pConnList + ::rtl::OUString GenerateFromClause( const Reference< XConnection>& _xConnection, + const OQueryTableView::OTableWindowMap* pTabList, + const ::std::vector<OTableConnection*>* pConnList ) { @@ -1169,7 +1169,7 @@ namespace OTableFields::iterator aEnd = _rFieldList.end(); for(;aIter != aEnd;++aIter) { - OTableFieldDescRef pEntryField = *aIter; + OTableFieldDescRef pEntryField = *aIter; if ( pEntryField->IsGroupBy() ) { DBG_ASSERT(pEntryField->GetField().getLength(),"Kein FieldName vorhanden!;-("); @@ -1189,7 +1189,7 @@ namespace if (pParseNode.get()) { ::rtl::OUString sGroupBy; - pParseNode->getChild(0)->parseNodeToStr( sGroupBy, + pParseNode->getChild(0)->parseNodeToStr( sGroupBy, xConnection, &rController.getParser().getContext(), sal_False, @@ -1229,7 +1229,7 @@ namespace sal_Bool bHaving = sal_False, bool bAddOrOnOneLine = false); // ----------------------------------------------------------------------------- - SqlParseError GetSelectionCriteria( OQueryDesignView* _pView, + SqlParseError GetSelectionCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pNode, sal_uInt16& rLevel ) @@ -1265,7 +1265,7 @@ namespace GetInnerJoinCriteria(_pView,pNodeTmp); // now simplify again, join are checked in ComparisonPredicate ::connectivity::OSQLParseNode::absorptions(pNodeTmp); - pNodeTmp = pNode->getChild(1); + pNodeTmp = pNode->getChild(1); // it could happen that pCondition is not more valid eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pNodeTmp, rLevel); @@ -1273,7 +1273,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - SqlParseError GetANDCriteria( OQueryDesignView* _pView, + SqlParseError GetANDCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode * pCondition, sal_uInt16& nLevel, @@ -1348,14 +1348,14 @@ namespace return bRet; } //-------------------------------------------------------------------------------------------------- - SqlParseError GetANDCriteria( OQueryDesignView* _pView, + SqlParseError GetANDCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode * pCondition, sal_uInt16& nLevel, sal_Bool bHaving, bool bAddOrOnOneLine) { - const ::com::sun::star::lang::Locale aLocale = _pView->getLocale(); + const ::com::sun::star::lang::Locale aLocale = _pView->getLocale(); const ::rtl::OUString sDecimal = _pView->getDecimalSeparator(); // ich werde ein paar Mal einen gecasteten Pointer auf meinen ::com::sun::star::sdbcx::Container brauchen @@ -1371,7 +1371,7 @@ namespace if ( SQL_ISRULE( pSearchCondition, search_condition) ) // we have a or { _pSelectionBrw->DuplicateConditionLevel( nLevel); - eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition->getChild(0), nLevel,bHaving,bMustAddOrOnOneLine ); + eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition->getChild(0), nLevel,bHaving,bMustAddOrOnOneLine ); ++nLevel; eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition->getChild(2), nLevel,bHaving,bMustAddOrOnOneLine ); } @@ -1396,7 +1396,7 @@ namespace if (SQL_ISRULE(pValueExp, column_ref ) ) { ::rtl::OUString aColumnName; - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; Reference< XConnection> xConnection = rController.getConnection(); if ( xConnection.is() ) { @@ -1409,7 +1409,7 @@ namespace static_cast<sal_Char>(sDecimal.toChar()), &rController.getParser().getContext()); - pValueExp->parseNodeToPredicateStr( aColumnName, + pValueExp->parseNodeToPredicateStr( aColumnName, xConnection, rController.getNumberFormatter(), aLocale, @@ -1429,12 +1429,12 @@ namespace _pSelectionBrw->AddCondition(aDragLeft, aCondition, nLevel,bAddOrOnOneLine); } } - else if(SQL_ISRULEOR2(pValueExp,general_set_fct ,set_fct_spec) || - SQL_ISRULEOR2(pValueExp,position_exp,extract_exp) || - SQL_ISRULEOR2(pValueExp,fold,char_substring_fct) || + else if(SQL_ISRULEOR2(pValueExp,general_set_fct ,set_fct_spec) || + SQL_ISRULEOR2(pValueExp,position_exp,extract_exp) || + SQL_ISRULEOR2(pValueExp,fold,char_substring_fct) || SQL_ISRULEOR2(pValueExp,length_exp,char_value_fct)) { - AddFunctionCondition( _pView, + AddFunctionCondition( _pView, _pSelectionBrw, pCondition, nLevel, @@ -1448,12 +1448,12 @@ namespace _pView->getController().appendError( sError ); } } - else if( SQL_ISRULEOR2(pCondition,test_for_null,in_predicate) - || SQL_ISRULEOR2(pCondition,all_or_any_predicate,between_predicate)) + else if( SQL_ISRULEOR2(pCondition,test_for_null,in_predicate) + || SQL_ISRULEOR2(pCondition,all_or_any_predicate,between_predicate)) { if ( SQL_ISRULEOR2(pCondition->getChild(0), set_fct_spec , general_set_fct ) ) { - AddFunctionCondition( _pView, + AddFunctionCondition( _pView, _pSelectionBrw, pCondition, nLevel, @@ -1464,7 +1464,7 @@ namespace { // parse condition ::rtl::OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1); - OTableFieldDescRef aDragLeft = new OTableFieldDesc(); + OTableFieldDescRef aDragLeft = new OTableFieldDesc(); if ( eOk == ( eErrorCode = FillDragInfo(_pView,pCondition->getChild(0),aDragLeft)) ) { if ( bHaving ) @@ -1475,7 +1475,7 @@ namespace else { // Funktions-Bedingung parsen - ::rtl::OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1); + ::rtl::OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1); Reference< XConnection> xConnection = rController.getConnection(); Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); // the international doesn't matter I have a string @@ -1499,7 +1499,7 @@ namespace else if( SQL_ISRULEOR2(pCondition,existence_test,unique_test) ) { // Funktions-Bedingung parsen - ::rtl::OUString aCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,0); + ::rtl::OUString aCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,0); OTableFieldDescRef aDragLeft = new OTableFieldDesc(); aDragLeft->SetField(aCondition); @@ -1525,11 +1525,11 @@ namespace OSQLParseNode* pFunction = pCondition->getChild(0); - OSL_ENSURE(SQL_ISRULEOR2(pFunction,general_set_fct ,set_fct_spec) || - SQL_ISRULEOR2(pFunction,position_exp,extract_exp) || - SQL_ISRULEOR2(pFunction,fold,char_substring_fct) || + OSL_ENSURE(SQL_ISRULEOR2(pFunction,general_set_fct ,set_fct_spec) || + SQL_ISRULEOR2(pFunction,position_exp,extract_exp) || + SQL_ISRULEOR2(pFunction,fold,char_substring_fct) || SQL_ISRULEOR2(pFunction,length_exp,char_value_fct),"Illegal call!"); - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; OTableFieldDescRef aDragLeft = new OTableFieldDesc(); ::rtl::OUString aColumnName; @@ -1544,18 +1544,18 @@ namespace static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), &rController.getParser().getContext()); - pFunction->parseNodeToStr( aColumnName, + pFunction->parseNodeToStr( aColumnName, xConnection, &rController.getParser().getContext(), sal_True, sal_True); // quote is to true because we need quoted elements inside the function // i75557 //pFunction->parseNodeToPredicateStr(aColumnName, - // xConnection, - // rController.getNumberFormatter(), - // _pView->getLocale(), - // static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), - // &rController.getParser().getContext()); + // xConnection, + // rController.getNumberFormatter(), + // _pView->getLocale(), + // static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), + // &rController.getParser().getContext()); // don't display the column name aCondition = aCondition.copy(aColumnName.getLength()); aCondition = aCondition.trim(); @@ -1587,7 +1587,7 @@ namespace && SQL_ISRULE(pParamNode,num_value_exp) ) { ::rtl::OUString sParameterValue; - pParamNode->parseNodeToStr( sParameterValue, + pParamNode->parseNodeToStr( sParameterValue, xConnection, &rController.getParser().getContext()); nFunctionType |= FKT_NUMERIC; @@ -1618,7 +1618,7 @@ namespace OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode * pCondition, const sal_uInt16 nLevel, - sal_Bool bHaving + sal_Bool bHaving ,bool bAddOrOnOneLine) { SqlParseError eErrorCode = eOk; @@ -1628,7 +1628,7 @@ namespace if ( SQL_ISRULE(pCondition->getChild(0), column_ref ) || SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref) ) { - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; OTableFieldDescRef aDragLeft = new OTableFieldDesc(); if ( SQL_ISRULE(pCondition->getChild(0), column_ref ) && SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref ) ) @@ -1726,7 +1726,7 @@ namespace } // else ??? - + if( eOk == ( eErrorCode = FillDragInfo(_pView,pCondition->getChild(nPos),aDragLeft))) { if(bHaving) @@ -1736,7 +1736,7 @@ namespace } else if( SQL_ISRULEOR2(pCondition->getChild(0), set_fct_spec , general_set_fct ) ) { - AddFunctionCondition( _pView, + AddFunctionCondition( _pView, _pSelectionBrw, pCondition, nLevel, @@ -1833,21 +1833,21 @@ namespace _raInfo->SetTable(::rtl::OUString()); _raInfo->SetAlias(::rtl::OUString()); _raInfo->SetField(aColumnName); - _raInfo->SetFieldAlias(aColumnAlias); // nyi : hier ein fortlaufendes Expr_1, Expr_2 ... + _raInfo->SetFieldAlias(aColumnAlias); // nyi : hier ein fortlaufendes Expr_1, Expr_2 ... _raInfo->SetFunctionType(FKT_OTHER); } } //----------------------------------------------------------------------------- - sal_Bool checkJoinConditions( const OQueryDesignView* _pView, + sal_Bool checkJoinConditions( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode* _pNode ) { const ::connectivity::OSQLParseNode* pJoinNode = NULL; sal_Bool bRet = sal_True; if (SQL_ISRULE(_pNode,qualified_join)) pJoinNode = _pNode; - else if (SQL_ISRULE(_pNode,table_ref) - && _pNode->count() == 3 - && SQL_ISPUNCTUATION(_pNode->getChild(0),"(") + else if (SQL_ISRULE(_pNode,table_ref) + && _pNode->count() == 3 + && SQL_ISPUNCTUATION(_pNode->getChild(0),"(") && SQL_ISPUNCTUATION(_pNode->getChild(2),")") ) // '(' joined_table ')' pJoinNode = _pNode->getChild(1); else if (! ( SQL_ISRULE(_pNode, table_ref) && _pNode->count() == 2) ) // table_node table_primary_as_range_column @@ -1894,7 +1894,7 @@ namespace } else { - if (SQL_ISRULE(pJoinType,join_type)) // eine Ebene tiefer + if (SQL_ISRULE(pJoinType,join_type)) // eine Ebene tiefer pJoinType = pJoinType->getChild(0); if (SQL_ISTOKEN(pJoinType->getChild(0),LEFT)) @@ -1921,8 +1921,8 @@ namespace if ( eJoinType == CROSS_JOIN || bNatural ) { - OQueryTableWindow* pLeftWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pNode->getChild(0)) ); - OQueryTableWindow* pRightWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pRightTableRef) ); + OQueryTableWindow* pLeftWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pNode->getChild(0)) ); + OQueryTableWindow* pRightWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pRightTableRef) ); OSL_ENSURE(pLeftWindow && pRightWindow,"Table Windows could not be found!"); if ( !pLeftWindow || !pRightWindow ) return sal_False; @@ -1939,7 +1939,7 @@ namespace insertConnection(_pView,eJoinType,aDragLeft,aDragRight,bNatural); } - + return sal_True; } @@ -2048,7 +2048,7 @@ namespace } // find the existent window for this alias - OQueryTableWindow* pExistentWin = pTableView->FindTable( sAlias ); + OQueryTableWindow* pExistentWin = pTableView->FindTable( sAlias ); if ( !pExistentWin ) { pTableView->AddTabWin( sComposedName, sAlias, sal_False ); // don't create data here @@ -2068,8 +2068,8 @@ namespace OJoinTableView::OTableWindowMap::iterator aIterTableEnd = aTableMap.end(); for(;aIterTableMap != aIterTableEnd;++aIterTableMap) { - if(aMap.find(aIterTableMap->second->GetComposedName()) == aMap.end() && - aMap.find(aIterTableMap->first) == aMap.end()) + if(aMap.find(aIterTableMap->second->GetComposedName()) == aMap.end() && + aMap.find(aIterTableMap->first) == aMap.end()) pTableView->RemoveTabWin(aIterTableMap->second); } @@ -2118,7 +2118,7 @@ namespace <TRUE/> when columns could be inserted otherwise <FALSE/> */ //------------------------------------------------------------------------------ - SqlParseError fillSelectSubList( OQueryDesignView* _pView, + SqlParseError fillSelectSubList( OQueryDesignView* _pView, OJoinTableView::OTableWindowMap* _pTabList) { SqlParseError eErrorCode = eOk; @@ -2129,7 +2129,7 @@ namespace for(;aIter != aEnd && eOk == eErrorCode ;++aIter) { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second); - OTableFieldDescRef aInfo = new OTableFieldDesc(); + OTableFieldDescRef aInfo = new OTableFieldDesc(); if (pTabWin->ExistsField( sAsterix, aInfo )) { eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField); @@ -2147,7 +2147,7 @@ namespace return eNoSelectStatement; ::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2); // selection - sal_Bool bFirstField = sal_True; // bei der Initialisierung muß auf alle Faelle das erste Feld neu aktiviert werden + sal_Bool bFirstField = sal_True; // bei der Initialisierung muß auf alle Faelle das erste Feld neu aktiviert werden SqlParseError eErrorCode = eOk; @@ -2181,7 +2181,7 @@ namespace pColumnRef = pColumnRef->getChild(0); OTableFieldDescRef aInfo = new OTableFieldDesc(); - if ( pColumnRef->count() == 3 && + if ( pColumnRef->count() == 3 && SQL_ISPUNCTUATION(pColumnRef->getChild(0),"(") && SQL_ISPUNCTUATION(pColumnRef->getChild(2),")") ) @@ -2193,9 +2193,9 @@ namespace eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField); bFirstField = sal_False; } - else if(SQL_ISRULEOR2(pColumnRef,general_set_fct ,set_fct_spec) || - SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) || - SQL_ISRULEOR2(pColumnRef,fold,char_substring_fct) || + else if(SQL_ISRULEOR2(pColumnRef,general_set_fct ,set_fct_spec) || + SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) || + SQL_ISRULEOR2(pColumnRef,fold,char_substring_fct) || SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct)) { ::rtl::OUString aColumns; @@ -2205,11 +2205,11 @@ namespace _pView->getLocale(), static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), &rController.getParser().getContext()); - //pColumnRef->parseNodeToStr( aColumns, - // xConnection, - // &rController.getParser().getContext(), - // sal_True, - // sal_True); // quote is to true because we need quoted elements inside the function + //pColumnRef->parseNodeToStr( aColumns, + // xConnection, + // &rController.getParser().getContext(), + // sal_True, + // sal_True); // quote is to true because we need quoted elements inside the function sal_Int32 nFunctionType = FKT_NONE; ::connectivity::OSQLParseNode* pParamRef = NULL; @@ -2217,8 +2217,8 @@ namespace if ( nColumnRefPos >= 0 && static_cast<sal_uInt32>(nColumnRefPos) < pColumnRef->count() ) pParamRef = pColumnRef->getChild(nColumnRefPos); - if ( SQL_ISRULE(pColumnRef,general_set_fct) - && SQL_ISRULE(pParamRef,column_ref) ) + if ( SQL_ISRULE(pColumnRef,general_set_fct) + && SQL_ISRULE(pParamRef,column_ref) ) { // Parameter auf Columnref pr"ufen InsertColumnRef(_pView,pParamRef,aColumnName,aColumnAlias,aTableRange,aInfo,pTabList); @@ -2244,11 +2244,11 @@ namespace { ::rtl::OUString sFieldName = aColumns; if ( pParamRef ) - { // we got an aggregate function but without column name inside + { // we got an aggregate function but without column name inside // so we set the whole argument of the function as field name nFunctionType |= FKT_NUMERIC; sFieldName = ::rtl::OUString(); - pParamRef->parseNodeToStr( sFieldName, + pParamRef->parseNodeToStr( sFieldName, xConnection, &rController.getParser().getContext(), sal_True, @@ -2279,10 +2279,10 @@ namespace eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField); bFirstField = sal_False; } - else //if(SQL_ISRULE(pColumnRef,num_value_exp) || SQL_ISRULE(pColumnRef,term)) + else //if(SQL_ISRULE(pColumnRef,num_value_exp) || SQL_ISRULE(pColumnRef,term)) { ::rtl::OUString aColumns; - pColumnRef->parseNodeToStr( aColumns, + pColumnRef->parseNodeToStr( aColumns, xConnection, &rController.getParser().getContext(), sal_True, @@ -2323,7 +2323,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - SqlParseError GetOrderCriteria( OQueryDesignView* _pView, + SqlParseError GetOrderCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pParseRoot ) { @@ -2339,13 +2339,13 @@ namespace for( sal_uInt32 i=0 ; i<pNode->count() ; i++ ) { eOrderDir = ORDER_ASC; - ::connectivity::OSQLParseNode* pChild = pNode->getChild( i ); + ::connectivity::OSQLParseNode* pChild = pNode->getChild( i ); if (SQL_ISTOKEN( pChild->getChild(1), DESC ) ) eOrderDir = ORDER_DESC; ::connectivity::OSQLParseNode* pArgument = pChild->getChild(0); - + if(SQL_ISRULE(pArgument,column_ref)) { if( eOk == FillDragInfo(_pView,pArgument,aDragLeft)) @@ -2373,7 +2373,7 @@ namespace _pSelectionBrw->AddOrder( aDragLeft, eOrderDir, i ); else if( SQL_ISRULE(pArgument, set_fct_spec ) ) { - + Reference< XConnection> xConnection = rController.getConnection(); if(xConnection.is()) { @@ -2400,7 +2400,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - SqlParseError GetHavingCriteria( OQueryDesignView* _pView, + SqlParseError GetHavingCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pSelectRoot, sal_uInt16& rLevel ) @@ -2411,7 +2411,7 @@ namespace return eErrorCode; } //------------------------------------------------------------------------------ - SqlParseError GetGroupCriteria( OQueryDesignView* _pView, + SqlParseError GetGroupCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pSelectRoot ) { @@ -2441,12 +2441,12 @@ namespace _pSelectionBrw->AddGroupBy( aDragInfo, i ); } else if( SQL_ISRULE(pArgument, set_fct_spec ) ) - { + { Reference< XConnection> xConnection = rController.getConnection(); if(xConnection.is()) { ::rtl::OUString sGroupByExpression; - pArgument->parseNodeToStr( sGroupByExpression, + pArgument->parseNodeToStr( sGroupByExpression, xConnection, &rController.getParser().getContext(), sal_True, @@ -2521,7 +2521,7 @@ namespace // end of anonymouse namespace DBG_NAME(OQueryDesignView) -OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent, +OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent, OQueryController& _rController, const Reference< XMultiServiceFactory >& _rFactory) :OQueryView( _pParent, _rController, _rFactory ) @@ -2603,8 +2603,8 @@ void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) sal_Int32 nSplitPos = static_cast<OQueryController&>(getController()).getSplitPos(); if ( 0 != aPlaygroundSize.Height() ) { - if ( ( -1 == nSplitPos ) - || ( nSplitPos >= aPlaygroundSize.Height() ) + if ( ( -1 == nSplitPos ) + || ( nSplitPos >= aPlaygroundSize.Height() ) ) { // let the selection browse box determine an optimal size @@ -2618,7 +2618,7 @@ void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) } if ( !m_bInSplitHandler ) - { // the resize is triggered by something else than the split handler + { // the resize is triggered by something else than the split handler // our main focus is to try to preserve the size of the selectionbrowse box Size aSelBoxSize = m_pSelectionBox->GetSizePixel(); if ( aSelBoxSize.Height() ) @@ -2639,8 +2639,8 @@ void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) } // normalize the split pos - Point aSplitPos = Point( _rPlayground.Left(), nSplitPos ); - Size aSplitSize = Size( _rPlayground.GetSize().Width(), m_aSplitter.GetSizePixel().Height() ); + Point aSplitPos = Point( _rPlayground.Left(), nSplitPos ); + Size aSplitSize = Size( _rPlayground.GetSize().Width(), m_aSplitter.GetSizePixel().Height() ); if( ( aSplitPos.Y() + aSplitSize.Height() ) > ( aPlaygroundSize.Height() )) aSplitPos.Y() = aPlaygroundSize.Height() - aSplitSize.Height(); @@ -2742,7 +2742,7 @@ void OQueryDesignView::TableDeleted(const ::rtl::OUString& rAliasName) { // Nachricht, dass Tabelle aus dem Fenster gel"oscht wurde DeleteFields(rAliasName); - static_cast<OQueryController&>(getController()).InvalidateFeature(ID_BROWSER_ADDTABLE); // view nochmal bescheid sagen + static_cast<OQueryController&>(getController()).InvalidateFeature(ID_BROWSER_ADDTABLE); // view nochmal bescheid sagen } //------------------------------------------------------------------------------ void OQueryDesignView::DeleteFields( const ::rtl::OUString& rAliasName ) @@ -2861,24 +2861,24 @@ sal_Bool OQueryDesignView::checkStatement() OTableFieldDescRef pEntryField = *aIter; if ( pEntryField->GetField().getLength() && pEntryField->IsVisible() ) ++nFieldcount; - else if (pEntryField->GetField().getLength() && - !pEntryField->HasCriteria() && - pEntryField->isNoneFunction() && - pEntryField->GetOrderDir() == ORDER_NONE && + else if (pEntryField->GetField().getLength() && + !pEntryField->HasCriteria() && + pEntryField->isNoneFunction() && + pEntryField->GetOrderDir() == ORDER_NONE && !pEntryField->IsGroupBy() && !pEntryField->GetFunction().getLength() ) rUnUsedFields.push_back(pEntryField); } - if ( !nFieldcount ) // keine Felder sichtbar also zur"uck + if ( !nFieldcount ) // keine Felder sichtbar also zur"uck { rUnUsedFields = rFieldList; return ::rtl::OUString(); } OQueryTableView::OTableWindowMap* pTabList = m_pTableView->GetTabWinMap(); - sal_uInt32 nTabcount = pTabList->size(); + sal_uInt32 nTabcount = pTabList->size(); - ::rtl::OUString aFieldListStr(GenerateSelectList(this,rFieldList,nTabcount>1)); + ::rtl::OUString aFieldListStr(GenerateSelectList(this,rFieldList,nTabcount>1)); if( !aFieldListStr.getLength() ) return ::rtl::OUString(); // Ausnahmebehandlung, wenn keine Felder angegeben worden sind @@ -2887,7 +2887,7 @@ sal_Bool OQueryDesignView::checkStatement() // und eine Errormeldung erzeugt // ----------------- Tabellenliste aufbauen ---------------------- - const ::std::vector<OTableConnection*>* pConnList = m_pTableView->getTableConnections(); + const ::std::vector<OTableConnection*>* pConnList = m_pTableView->getTableConnections(); Reference< XConnection> xConnection = rController.getConnection(); ::rtl::OUString aTableListStr(GenerateFromClause(xConnection,pTabList,pConnList)); DBG_ASSERT(aTableListStr.getLength(), "OQueryDesignView::getStatement() : unerwartet : habe Felder, aber keine Tabellen !"); @@ -3029,7 +3029,7 @@ void OQueryDesignView::SaveUIConfig() { OQueryController& rCtrl = static_cast<OQueryController&>(getController()); rCtrl.SaveTabWinsPosSize( m_pTableView->GetTabWinMap(), m_pScrollWindow->GetHScrollBar()->GetThumbPos(), m_pScrollWindow->GetVScrollBar()->GetThumbPos() ); - // rCtrl.SaveTabFieldsWidth( m_pSelectionBox ); + // rCtrl.SaveTabFieldsWidth( m_pSelectionBox ); rCtrl.setVisibleRows( m_pSelectionBox->GetNoneVisibleRows() ); if ( m_aSplitter.GetSplitPosPixel() != 0 ) rCtrl.setSplitPos( m_aSplitter.GetSplitPosPixel() ); @@ -3091,7 +3091,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE } Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); - parse::OParseColumn* pColumn = new parse::OParseColumn( pEntry->GetField(), + parse::OParseColumn* pColumn = new parse::OParseColumn( pEntry->GetField(), ::rtl::OUString(), ::rtl::OUString(), ::rtl::OUString(), @@ -3116,7 +3116,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE } } - OSQLParseNode* pParseNode = rParser.predicateTree( _rsErrorMessage, + OSQLParseNode* pParseNode = rParser.predicateTree( _rsErrorMessage, sTest, static_cast<OQueryController&>(getController()).getNumberFormatter(), _rxColumn); diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx index fb662a8b7438..c402bd70c466 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx index 692bd3946fda..73b1a6671e4b 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace dbaui class OTableWindow; class OJoinMoveTabWinUndoAct : public OQueryDesignUndoAction { - Point m_ptNextPosition; - OTableWindow* m_pTabWin; + Point m_ptNextPosition; + OTableWindow* m_pTabWin; protected: void TogglePosition(); @@ -50,8 +50,8 @@ namespace dbaui public: OJoinMoveTabWinUndoAct(OJoinTableView* pOwner, const Point& ptOriginalPosition, OTableWindow* pTabWin); - virtual void Undo() { TogglePosition(); } - virtual void Redo() { TogglePosition(); } + virtual void Undo() { TogglePosition(); } + virtual void Redo() { TogglePosition(); } }; // ------------------------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx index 11a2fc0412de..83bbafa6affc 100644 --- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ namespace dbaui class OTableWindow; class OJoinSizeTabWinUndoAct : public OQueryDesignUndoAction { - Point m_ptNextPosition; - Size m_szNextSize; - OTableWindow* m_pTabWin; + Point m_ptNextPosition; + Size m_szNextSize; + OTableWindow* m_pTabWin; protected: inline void ToggleSizePosition(); @@ -52,8 +52,8 @@ namespace dbaui // hier sind physische, nicht logische Koordinaten // (im Gegensatz zur QueryMoveTabWinUndoAct) - virtual void Undo() { ToggleSizePosition(); } - virtual void Redo() { ToggleSizePosition(); } + virtual void Undo() { ToggleSizePosition(); } + virtual void Redo() { ToggleSizePosition(); } }; //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx index 93775a1be43e..7e11cddc796a 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ OQueryTabConnUndoAction::~OQueryTabConnUndoAction() { DBG_DTOR(OQueryTabConnUndoAction,NULL); if (m_bOwnerOfConn) - { // ich besitze die Connection -> loeschen + { // ich besitze die Connection -> loeschen m_pOwner->DeselectConn(m_pConnection); delete m_pConnection; } @@ -59,80 +59,80 @@ OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, USHORT DBG_CTOR(OQueryTabConnUndoAction,NULL); } // ----------------------------------------------------------------------------- -OQueryAddTabConnUndoAction::OQueryAddTabConnUndoAction(OQueryTableView* pOwner) - : OQueryTabConnUndoAction(pOwner, STR_QUERY_UNDO_INSERTCONNECTION) -{ +OQueryAddTabConnUndoAction::OQueryAddTabConnUndoAction(OQueryTableView* pOwner) + : OQueryTabConnUndoAction(pOwner, STR_QUERY_UNDO_INSERTCONNECTION) +{ } // ----------------------------------------------------------------------------- -void OQueryAddTabConnUndoAction::Undo() -{ - static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); - SetOwnership(TRUE); +void OQueryAddTabConnUndoAction::Undo() +{ + static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); + SetOwnership(TRUE); } // ----------------------------------------------------------------------------- -void OQueryAddTabConnUndoAction::Redo() -{ - static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); - SetOwnership(FALSE); +void OQueryAddTabConnUndoAction::Redo() +{ + static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); + SetOwnership(FALSE); } // ----------------------------------------------------------------------------- -OQueryDelTabConnUndoAction::OQueryDelTabConnUndoAction(OQueryTableView* pOwner) - : OQueryTabConnUndoAction(pOwner, STR_QUERY_UNDO_REMOVECONNECTION) -{ +OQueryDelTabConnUndoAction::OQueryDelTabConnUndoAction(OQueryTableView* pOwner) + : OQueryTabConnUndoAction(pOwner, STR_QUERY_UNDO_REMOVECONNECTION) +{ } // ----------------------------------------------------------------------------- -void OQueryDelTabConnUndoAction::Undo() -{ - static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); - SetOwnership(FALSE); +void OQueryDelTabConnUndoAction::Undo() +{ + static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); + SetOwnership(FALSE); } // ----------------------------------------------------------------------------- -void OQueryDelTabConnUndoAction::Redo() -{ - static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); - SetOwnership(TRUE); +void OQueryDelTabConnUndoAction::Redo() +{ + static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); + SetOwnership(TRUE); } // ----------------------------------------------------------------------------- -OQueryTabWinShowUndoAct::OQueryTabWinShowUndoAct(OQueryTableView* pOwner) - : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINSHOW) -{ +OQueryTabWinShowUndoAct::OQueryTabWinShowUndoAct(OQueryTableView* pOwner) + : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINSHOW) +{ } // ----------------------------------------------------------------------------- OQueryTabWinShowUndoAct::~OQueryTabWinShowUndoAct() { } // ----------------------------------------------------------------------------- -void OQueryTabWinShowUndoAct::Undo() -{ - static_cast<OQueryTableView*>(m_pOwner)->HideTabWin(m_pTabWin, this); - SetOwnership(TRUE); +void OQueryTabWinShowUndoAct::Undo() +{ + static_cast<OQueryTableView*>(m_pOwner)->HideTabWin(m_pTabWin, this); + SetOwnership(TRUE); } // ----------------------------------------------------------------------------- -void OQueryTabWinShowUndoAct::Redo() -{ - static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin(m_pTabWin, this,sal_True); - SetOwnership(FALSE); +void OQueryTabWinShowUndoAct::Redo() +{ + static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin(m_pTabWin, this,sal_True); + SetOwnership(FALSE); } // ----------------------------------------------------------------------------- -OQueryTabWinDelUndoAct::OQueryTabWinDelUndoAct(OQueryTableView* pOwner) - : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINDELETE) -{ +OQueryTabWinDelUndoAct::OQueryTabWinDelUndoAct(OQueryTableView* pOwner) + : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINDELETE) +{ } // ----------------------------------------------------------------------------- OQueryTabWinDelUndoAct::~OQueryTabWinDelUndoAct() { } // ----------------------------------------------------------------------------- -void OQueryTabWinDelUndoAct::Undo() -{ - static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin( m_pTabWin, this,sal_True ); - SetOwnership(FALSE); +void OQueryTabWinDelUndoAct::Undo() +{ + static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin( m_pTabWin, this,sal_True ); + SetOwnership(FALSE); } // ----------------------------------------------------------------------------- -void OQueryTabWinDelUndoAct::Redo() -{ - static_cast<OQueryTableView*>(m_pOwner)->HideTabWin( m_pTabWin, this ); - SetOwnership(TRUE); +void OQueryTabWinDelUndoAct::Redo() +{ + static_cast<OQueryTableView*>(m_pOwner)->HideTabWin( m_pTabWin, this ); + SetOwnership(TRUE); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx index 42a2e738bc53..3dcfa4cacfa6 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ namespace dbaui class OQueryTabConnUndoAction : public OQueryDesignUndoAction { protected: - OQueryTableConnection* m_pConnection; - BOOL m_bOwnerOfConn; + OQueryTableConnection* m_pConnection; + BOOL m_bOwnerOfConn; // bin ich alleiniger Eigentuemer der Connection ? (aendert sich mit jedem Redo oder Undo) public: diff --git a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx index f5988bd65786..0a64becdcd55 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ namespace dbaui OQueryTabWinShowUndoAct(OQueryTableView* pOwner); ~OQueryTabWinShowUndoAct(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ================================================================================================ @@ -55,8 +55,8 @@ namespace dbaui OQueryTabWinDelUndoAct(OQueryTableView* pOwner); ~OQueryTabWinDelUndoAct(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; } #endif // DBAUI_QUERYTABWINSHOWUNDOACT_HXX diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx index 953cab5fa552..21c4d3aad0f4 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,23 +39,23 @@ using namespace dbaui; -DBG_NAME(OQueryDesignFieldUndoAct) -OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) +DBG_NAME(OQueryDesignFieldUndoAct) +OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OCommentUndoAction(nCommentID) , pOwner(pSelBrwBox) - , m_nColumnPostion(BROWSER_INVALIDID) -{ + , m_nColumnPostion(BROWSER_INVALIDID) +{ DBG_CTOR(OQueryDesignFieldUndoAct,NULL); } // ----------------------------------------------------------------------------- -OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct() -{ +OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct() +{ DBG_DTOR(OQueryDesignFieldUndoAct,NULL); - pOwner = NULL; + pOwner = NULL; } // ----------------------------------------------------------------------------- -DBG_NAME(OQueryTabWinUndoAct ) +DBG_NAME(OQueryTabWinUndoAct ) // ------------------------------------------------------------------------------------------------ OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, USHORT nCommentID) :OQueryDesignUndoAction(pOwner, nCommentID) @@ -66,9 +66,9 @@ OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, USHORT nCommen //============================================================================== OQueryTabWinUndoAct::~OQueryTabWinUndoAct() { - DBG_DTOR(OQueryTabWinUndoAct ,NULL); + DBG_DTOR(OQueryTabWinUndoAct ,NULL); if (m_bOwnerOfObjects) - { // wenn ich der alleinige Owner des Fenster bin, muss ich dafuer sorgen, dass es geloescht wird + { // wenn ich der alleinige Owner des Fenster bin, muss ich dafuer sorgen, dass es geloescht wird OSL_ENSURE(m_pTabWin != NULL, "OQueryTabWinUndoAct::~OQueryTabWinUndoAct() : m_pTabWin sollte nicht NULL sein"); OSL_ENSURE(!m_pTabWin->IsVisible(), "OQueryTabWinUndoAct::~OQueryTabWinUndoAct() : *m_pTabWin sollte nicht sichtbar sein"); @@ -118,8 +118,8 @@ void OTabFieldSizedUndoAct::Undo() pOwner->LeaveUndoMode(); } // ----------------------------------------------------------------------------- -void OTabFieldMovedUndoAct::Undo() -{ +void OTabFieldMovedUndoAct::Undo() +{ pOwner->EnterUndoMode(); OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!"); if ( m_nColumnPostion != BROWSER_INVALIDID ) @@ -127,7 +127,7 @@ void OTabFieldMovedUndoAct::Undo() sal_uInt16 nId = pDescr->GetColumnId(); USHORT nOldPos = pOwner->GetColumnPos(nId); pOwner->SetColumnPos(nId,m_nColumnPostion); - pOwner->ColumnMoved(nId,FALSE); + pOwner->ColumnMoved(nId,FALSE); m_nColumnPostion = nOldPos; } pOwner->LeaveUndoMode(); diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index 1fa0df1f3a01..e1e055ce272a 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ namespace dbaui { protected: ::std::vector<OTableConnection*> m_vTableConnection; - OQueryTableWindow* m_pTabWin; - BOOL m_bOwnerOfObjects; + OQueryTableWindow* m_pTabWin; + BOOL m_bOwnerOfObjects; // bin ich alleiniger Eigentuemer der verwalteten Objekte ? (aendert sich mit jedem Redo oder Undo) public: @@ -67,18 +67,18 @@ namespace dbaui // anschliessend sollte das SetOwnership aufgerufen werden // Zugriff auf die verwalteten Connections - USHORT ConnCount() { return (USHORT)m_vTableConnection.size(); } + USHORT ConnCount() { return (USHORT)m_vTableConnection.size(); } - ::std::vector<OTableConnection*>* GetTabConnList() { return &m_vTableConnection; } + ::std::vector<OTableConnection*>* GetTabConnList() { return &m_vTableConnection; } void InsertConnection( OTableConnection* pConnection ) { m_vTableConnection.push_back(pConnection); } - void RemoveConnection( OTableConnection* pConnection ) - { + void RemoveConnection( OTableConnection* pConnection ) + { m_vTableConnection.erase(::std::remove(m_vTableConnection.begin(),m_vTableConnection.end(),pConnection),m_vTableConnection.end()); } }; - + } #endif // DBAUI_QUERYTABWINUNDOACT_HXX diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index b4b0506950ca..faef87de1c7d 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::accessibility; //------------------------------------------------------------------------------ -namespace +namespace { // ----------------------------------------------------------------------------- sal_Bool isColumnInKeyType(const Reference<XIndexAccess>& _rxKeys,const ::rtl::OUString& _rColumnName,sal_Int32 _nKeyType) @@ -109,13 +109,13 @@ namespace } // ----------------------------------------------------------------------------- /** appends a new TabAdd Undo action at controller - @param _pView the view which we use - @param _pUndoAction the undo action which should be added - @param _pConnection the connection for which the undo action should be appended - @param _bOwner is the undo action the owner + @param _pView the view which we use + @param _pUndoAction the undo action which should be added + @param _pConnection the connection for which the undo action should be appended + @param _bOwner is the undo action the owner */ // ----------------------------------------------------------------------------- - void addUndoAction( OQueryTableView* _pView, + void addUndoAction( OQueryTableView* _pView, OQueryTabConnUndoAction* _pUndoAction, OQueryTableConnection* _pConnection, sal_Bool _bOwner = sal_False) @@ -126,10 +126,10 @@ namespace } // ----------------------------------------------------------------------------- /** openJoinDialog opens the join dialog with this connection data - @param _pView the view which we use - @param _pConnectionData the connection data + @param _pView the view which we use + @param _pConnectionData the connection data - @return true when OK was pressed otherwise false + @return true when OK was pressed otherwise false */ sal_Bool openJoinDialog(OQueryTableView* _pView,const TTableConnectionData::value_type& _pConnectionData,BOOL _bSelectableTables) { @@ -147,9 +147,9 @@ namespace } // ----------------------------------------------------------------------------- /** connectionModified adds an undo action for the modified connection and forces an redraw - @param _pView the view which we use - @param _pConnection the connection which was modified - @param _bAddUndo true when an undo action should be appended + @param _pView the view which we use + @param _pConnection the connection which was modified + @param _bAddUndo true when an undo action should be appended */ void connectionModified(OQueryTableView* _pView, OTableConnection* _pConnection, @@ -160,7 +160,7 @@ namespace // add an undo action if ( _bAddUndo ) - addUndoAction( _pView, + addUndoAction( _pView, new OQueryAddTabConnUndoAction(_pView), static_cast< OQueryTableConnection*>(_pConnection)); // redraw @@ -180,7 +180,7 @@ namespace // nothing to do if one of both denotes a query return; - // we found a table in our view where we can insert some connections + // we found a table in our view where we can insert some connections // the key columns have a property called RelatedColumn // OQueryTableConnectionData aufbauen OQueryTableConnectionData* pNewConnData = new OQueryTableConnectionData( _rSource.GetData(), _rDest.GetData() ); @@ -214,7 +214,7 @@ namespace else OSL_ENSURE(0,"Column not found!"); } - // get the position inside the tabe + // get the position inside the tabe Reference<XNameAccess> xRefColumns = _rDest.GetOriginalColumns(); if(xRefColumns.is()) { @@ -293,7 +293,7 @@ void OQueryTableView::ReSync() TTableWindowData::reverse_iterator aIter = pTabWinDataList->rbegin(); // Fenster kreieren und einfuegen - + for(;aIter != pTabWinDataList->rend();++aIter) { OQueryTableWindowData* pData = static_cast<OQueryTableWindowData*>(aIter->get()); @@ -314,7 +314,7 @@ void OQueryTableView::ReSync() continue; } - (*GetTabWinMap())[pData->GetAliasName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe + (*GetTabWinMap())[pData->GetAliasName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe // wenn in den Daten keine Position oder Groesse steht -> Default if (!pData->HasPosition() && !pData->HasSize()) SetDefaultTabWinPosSize(pTabWin); @@ -325,7 +325,7 @@ void OQueryTableView::ReSync() // Verbindungen einfuegen TTableConnectionData* pTabConnDataList = m_pView->getController().getTableConnectionData(); TTableConnectionData::reverse_iterator aConIter = pTabConnDataList->rbegin(); - + for(;aConIter != pTabConnDataList->rend();++aConIter) { OQueryTableConnectionData* pTabConnData = static_cast<OQueryTableConnectionData*>(aConIter->get()); @@ -337,7 +337,7 @@ void OQueryTableView::ReSync() bInvalid = bInvalid && ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) - { // nein -> Pech gehabt, die Connection faellt weg + { // nein -> Pech gehabt, die Connection faellt weg pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter) ,pTabConnDataList->end()); continue; } @@ -369,9 +369,9 @@ void OQueryTableView::NotifyTabConnection(const OQueryTableConnection& rNewConn, DBG_CHKTHIS(OQueryTableView,NULL); // erst mal schauen, ob ich diese Connection schon habe OQueryTableConnection* pTabConn = NULL; - const ::std::vector<OTableConnection*>* pConnections = getTableConnections(); + const ::std::vector<OTableConnection*>* pConnections = getTableConnections(); ::std::vector<OTableConnection*>::const_iterator aEnd = pConnections->end(); - ::std::vector<OTableConnection*>::const_iterator aIter = ::std::find( pConnections->begin(), + ::std::vector<OTableConnection*>::const_iterator aIter = ::std::find( pConnections->begin(), aEnd, static_cast<const OTableConnection*>(&rNewConn) ); @@ -427,8 +427,8 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl: ::rtl::OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents(xMetaData, _rTableName, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); ::rtl::OUString sRealName(sSchema); @@ -444,7 +444,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl: } } // ----------------------------------------------------------------------------- -// find the table which has a foreign key with this referencedTable name +// find the table which has a foreign key with this referencedTable name Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKeys,const ::rtl::OUString& _rReferencedTable) { if(!_rxKeys.is()) @@ -505,12 +505,12 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r // Neue UndoAction OQueryTabWinShowUndoAct* pUndoAction = new OQueryTabWinShowUndoAct(this); - pUndoAction->SetTabWin(pNewTabWin); // Fenster + pUndoAction->SetTabWin(pNewTabWin); // Fenster sal_Bool bSuccess = ShowTabWin(pNewTabWin, pUndoAction,bAppend); if(!bSuccess) { // reset table window - pUndoAction->SetTabWin(NULL); + pUndoAction->SetTabWin(NULL); pUndoAction->SetOwnership(sal_False); delete pUndoAction; @@ -523,7 +523,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r { modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(pNewTabWin->GetAccessible()) ); @@ -558,7 +558,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r switch ( nKeyType ) { case KeyType::FOREIGN: - { // our new table has a foreign key + { // our new table has a foreign key // so look if the referenced table is already in our list xProp->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= aReferencedTable; OSL_ENSURE(aReferencedTable.getLength(),"Foreign key without referencedTableName"); @@ -634,8 +634,8 @@ void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJ OQueryTableWindow* pDestWin = static_cast< OQueryTableWindow*>(jxdDest.pListBox->GetTabWin()); String aSourceFieldName, aDestFieldName; - aSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); - aDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry); + aSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); + aDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry); OTableConnection* pConn = GetTabConn(pSourceWin,pDestWin,true); if ( !pConn ) @@ -644,8 +644,8 @@ void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJ OQueryTableConnectionData* pNewConnectionData = new OQueryTableConnectionData(pSourceWin->GetData(), pDestWin->GetData()); TTableConnectionData::value_type aNewConnectionData(pNewConnectionData); - sal_uInt32 nSourceFieldIndex, nDestFieldIndex; - ETableFieldType eSourceFieldType, eDestFieldType; + sal_uInt32 nSourceFieldIndex, nDestFieldIndex; + ETableFieldType eSourceFieldType, eDestFieldType; // Namen/Position/Typ der beiden betroffenen Felder besorgen ... // Source @@ -704,8 +704,8 @@ void OQueryTableView::createNewConnection() if( openJoinDialog(this,pData,TRUE) ) { OTableWindowMap* pMap = GetTabWinMap(); - OQueryTableWindow* pSourceWin = static_cast< OQueryTableWindow*>((*pMap)[pData->getReferencingTable()->GetWinName()]); - OQueryTableWindow* pDestWin = static_cast< OQueryTableWindow*>((*pMap)[pData->getReferencedTable()->GetWinName()]); + OQueryTableWindow* pSourceWin = static_cast< OQueryTableWindow*>((*pMap)[pData->getReferencingTable()->GetWinName()]); + OQueryTableWindow* pDestWin = static_cast< OQueryTableWindow*>((*pMap)[pData->getReferencedTable()->GetWinName()]); // first we have to look if the this connection already exists OTableConnection* pConn = GetTabConn(pSourceWin,pDestWin,true); sal_Bool bNew = sal_True; @@ -735,7 +735,7 @@ bool OQueryTableView::RemoveConnection( OTableConnection* _pConnection,sal_Bool bool bRet = OJoinTableView::RemoveConnection( _pConnection,sal_False); // add undo action - addUndoAction( this, + addUndoAction( this, new OQueryDelTabConnUndoAction(this), static_cast< OQueryTableConnection*>(_pConnection), sal_True); @@ -810,9 +810,9 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin) modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, makeAny(pTabWin->GetAccessible()), - Any() + Any() ); } @@ -820,7 +820,7 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin) void OQueryTableView::EnsureVisible(const OTableWindow* pWin) { DBG_CHKTHIS(OQueryTableView,NULL); - + Invalidate(INVALIDATE_NOCHILDREN); OJoinTableView::EnsureVisible(pWin); } @@ -830,10 +830,10 @@ void OQueryTableView::GetConnection(OQueryTableConnection* pConn) { DBG_CHKTHIS(OQueryTableView,NULL); // bei mir und dem Dokument einfuegen - + addConnection( pConn ); // invalidieren (damit es neu gezeichnet wird) - // pConn->Invalidate(); + // pConn->Invalidate(); } //------------------------------------------------------------------------ @@ -868,7 +868,7 @@ void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc break; } - pTabWin->Hide(); // nicht zerstoeren, steht im Undo!! + pTabWin->Hide(); // nicht zerstoeren, steht im Undo!! // die Daten zum TabWin muessen auch aus meiner Verantwortung entlassen werden TTableWindowData* pTabWinDataList = m_pView->getController().getTableWindowData(); @@ -964,8 +964,8 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn addConnection(*aIter); // add all connections from the undo action // each connection should invalidated inside addConnection so we don't need this here any longer -// if ( !pOwnList->empty() ) -// InvalidateConnections(); +// if ( !pOwnList->empty() ) +// InvalidateConnections(); pTableCon->clear(); // und die Daten des Fensters ebenfalls in Liste (des Docs) @@ -992,7 +992,7 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn // damit habe ich das Doc natuerlich modifiziert if(!m_pView->getController().isReadOnly()) m_pView->getController().setModified( sal_True ); - + m_pView->getController().InvalidateFeature(SID_BROWSER_CLEAR_QUERY); return bSuccess; diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index cd2e92a4d2cd..5644e889505e 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,14 +62,14 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent) m_pEdit->SaveValue(); m_pEdit->SetPosPixel( Point( 0, 0 ) ); m_pEdit->Show(); - // m_pEdit->GrabFocus(); + // m_pEdit->GrabFocus(); } // ----------------------------------------------------------------------------- OQueryTextView::~OQueryTextView() { DBG_DTOR(OQueryTextView,NULL); ::std::auto_ptr<Window> aTemp(m_pEdit); - m_pEdit = NULL; + m_pEdit = NULL; } // ----------------------------------------------------------------------------- void OQueryTextView::GetFocus() diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 792d283ee8a3..7fee959e767d 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ using namespace ::com::sun::star::lang; DBG_NAME(OQueryViewSwitch) OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory) : m_bAddTableDialogWasVisible(sal_False) -{ +{ DBG_CTOR(OQueryViewSwitch,NULL); - - m_pTextView = new OQueryTextView(_pParent); - m_pDesignView = new OQueryDesignView( _pParent, _rController, _rFactory ); + + m_pTextView = new OQueryTextView(_pParent); + m_pDesignView = new OQueryDesignView( _pParent, _rController, _rFactory ); } // ----------------------------------------------------------------------------- OQueryViewSwitch::~OQueryViewSwitch() @@ -63,7 +63,7 @@ OQueryViewSwitch::~OQueryViewSwitch() { ::std::auto_ptr<Window> aTemp(m_pDesignView); m_pDesignView = NULL; - } + } } // ------------------------------------------------------------------------- void OQueryViewSwitch::Construct() @@ -82,7 +82,7 @@ void OQueryViewSwitch::resizeDocumentView(Rectangle& _rPlayground) { m_pTextView->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() ); m_pDesignView->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() ); - + // just for completeness: there is no space left, we occupied it all ... _rPlayground.SetPos( _rPlayground.BottomRight() ); _rPlayground.SetSize( Size( 0, 0 ) ); @@ -266,8 +266,8 @@ bool OQueryViewSwitch::impl_postViewSwitch( const bool i_bGraphicalDesign, const { if ( i_bSuccess ) { - m_pTextView->Show ( !i_bGraphicalDesign ); - m_pDesignView->Show ( i_bGraphicalDesign ); + m_pTextView->Show ( !i_bGraphicalDesign ); + m_pDesignView->Show ( i_bGraphicalDesign ); OAddTableDlg* pAddTabDialog( getAddTableDialog() ); if ( pAddTabDialog ) if ( i_bGraphicalDesign && m_bAddTableDialogWasVisible ) @@ -296,12 +296,12 @@ OAddTableDlg* OQueryViewSwitch::getAddTableDialog() // ----------------------------------------------------------------------------- sal_Bool OQueryViewSwitch::isSlotEnabled(sal_Int32 _nSlotId) { - return m_pDesignView->isSlotEnabled(_nSlotId); + return m_pDesignView->isSlotEnabled(_nSlotId); } // ----------------------------------------------------------------------------- void OQueryViewSwitch::setSlotEnabled(sal_Int32 _nSlotId,sal_Bool _bEnable) { - m_pDesignView->setSlotEnabled(_nSlotId,_bEnable); + m_pDesignView->setSlotEnabled(_nSlotId,_bEnable); } // ----------------------------------------------------------------------------- void OQueryViewSwitch::SaveUIConfig() @@ -317,9 +317,9 @@ void OQueryViewSwitch::SetPosSizePixel( Point _rPt,Size _rSize) m_pTextView->SetPosSizePixel( _rPt,_rSize); } // ----------------------------------------------------------------------------- -Reference< XMultiServiceFactory > OQueryViewSwitch::getORB() const -{ - return m_pDesignView->getORB(); +Reference< XMultiServiceFactory > OQueryViewSwitch::getORB() const +{ + return m_pDesignView->getORB(); } // ----------------------------------------------------------------------------- bool OQueryViewSwitch::reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) @@ -337,7 +337,7 @@ bool OQueryViewSwitch::reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) void OQueryViewSwitch::setNoneVisbleRow(sal_Int32 _nRows) { if(m_pDesignView) - m_pDesignView->setNoneVisbleRow(_nRows); + m_pDesignView->setNoneVisbleRow(_nRows); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 9ff9b6133430..6b10e23a4340 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,13 +65,13 @@ using namespace ::com::sun::star::accessibility; const String g_strOne = String::CreateFromAscii("1"); const String g_strZero = String::CreateFromAscii("0"); -#define DEFAULT_QUERY_COLS 20 -#define DEFAULT_SIZE GetTextWidth(g_strZero) * 30 -#define CHECKBOX_SIZE 10 -#define HANDLE_ID 0 -#define HANDLE_COLUMN_WITDH 70 +#define DEFAULT_QUERY_COLS 20 +#define DEFAULT_SIZE GetTextWidth(g_strZero) * 30 +#define CHECKBOX_SIZE 10 +#define HANDLE_ID 0 +#define HANDLE_COLUMN_WITDH 70 -#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ +#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e1) || \ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e2))) @@ -86,8 +86,8 @@ namespace { String sName = _sFieldName; xub_StrLen nTokenCount = sName.GetTokenCount('.'); - if ( (nTokenCount == 2 && sName.GetToken(1,'.').GetChar(0) == '*' ) - || (nTokenCount == 3 && sName.GetToken(2,'.').GetChar(0) == '*' ) ) + if ( (nTokenCount == 2 && sName.GetToken(1,'.').GetChar(0) == '*' ) + || (nTokenCount == 3 && sName.GetToken(2,'.').GetChar(0) == '*' ) ) { bAsterix = sal_True; } @@ -116,7 +116,7 @@ namespace DBG_NAME(OSelectionBrowseBox) //------------------------------------------------------------------------------ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) - :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION | BROWSER_HIDESELECT | + :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION | BROWSER_HIDESELECT | BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL ) ,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS)) ,m_nVisibleCount(0) @@ -130,18 +130,18 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) DBG_CTOR(OSelectionBrowseBox,NULL); SetHelpId(HID_CTL_QRYDGNCRIT); - m_nMode = BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT - | BROWSER_KEEPSELECTION | BROWSER_HIDECURSOR - | BROWSER_HLINESFULL | BROWSER_VLINESFULL - | BROWSER_HEADERBAR_NEW ; + m_nMode = BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT + | BROWSER_KEEPSELECTION | BROWSER_HIDECURSOR + | BROWSER_HLINESFULL | BROWSER_VLINESFULL + | BROWSER_HEADERBAR_NEW ; - m_pTextCell = new Edit(&GetDataWindow(), 0); - // m_pTextCell->EnableSpecialCheck(sal_False); - m_pVisibleCell = new CheckBoxControl(&GetDataWindow()); - m_pTableCell = new ListBoxControl(&GetDataWindow()); m_pTableCell->SetDropDownLineCount( 20 ); - m_pFieldCell = new ComboBoxControl(&GetDataWindow()); m_pFieldCell->SetDropDownLineCount( 20 ); - m_pOrderCell = new ListBoxControl(&GetDataWindow()); - m_pFunctionCell = new ListBoxControl(&GetDataWindow()); m_pFunctionCell->SetDropDownLineCount( 20 ); + m_pTextCell = new Edit(&GetDataWindow(), 0); + // m_pTextCell->EnableSpecialCheck(sal_False); + m_pVisibleCell = new CheckBoxControl(&GetDataWindow()); + m_pTableCell = new ListBoxControl(&GetDataWindow()); m_pTableCell->SetDropDownLineCount( 20 ); + m_pFieldCell = new ComboBoxControl(&GetDataWindow()); m_pFieldCell->SetDropDownLineCount( 20 ); + m_pOrderCell = new ListBoxControl(&GetDataWindow()); + m_pFunctionCell = new ListBoxControl(&GetDataWindow()); m_pFunctionCell->SetDropDownLineCount( 20 ); m_pVisibleCell->SetHelpId(HID_QRYDGN_ROW_VISIBLE); m_pTableCell->SetHelpId(HID_QRYDGN_ROW_TABLE); @@ -153,8 +153,8 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) // TriState der ::com::sun::star::form::CheckBox abschalten m_pVisibleCell->GetBox().EnableTriState( sal_False ); -// m_pEmptyEntry = new OTableFieldDesc(); -// m_pEmptyEntry->SetColWidth(DEFAULT_SIZE); +// m_pEmptyEntry = new OTableFieldDesc(); +// m_pEmptyEntry->SetColWidth(DEFAULT_SIZE); Font aTitleFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE,Window::GetSettings().GetLanguage(),DEFAULTFONT_FLAGS_ONLYONE); aTitleFont.SetSize(Size(0, 6)); @@ -180,7 +180,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) OSelectionBrowseBox::~OSelectionBrowseBox() { DBG_DTOR(OSelectionBrowseBox,NULL); - + delete m_pTextCell; delete m_pVisibleCell; delete m_pFieldCell; @@ -208,23 +208,23 @@ void OSelectionBrowseBox::initialize() ,IParseContext::KEY_FUSION ,IParseContext::KEY_INTERSECTION }; - + String sGroup = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount() - 1); m_aFunctionStrings = m_aFunctionStrings.GetToken(0); - + for (size_t i = 0; i < SAL_N_ELEMENTS(eFunctions); ++i) { m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); m_aFunctionStrings += String(ByteString(rContext.getIntlKeywordAscii(eFunctions[i])),RTL_TEXTENCODING_UTF8); - + } // for (sal_Int32 i = 0; i < SAL_N_ELEMENTS(eFunctions) ; ++i) m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); m_aFunctionStrings += sGroup; - + // Diese Funktionen stehen nur unter CORE zur Verfügung if ( lcl_SupportsCoreSQLGrammar(xConnection) ) { - xub_StrLen nCount = m_aFunctionStrings.GetTokenCount(); + xub_StrLen nCount = m_aFunctionStrings.GetTokenCount(); for (xub_StrLen nIdx = 0; nIdx < nCount; nIdx++) m_pFunctionCell->InsertEntry(m_aFunctionStrings.GetToken(nIdx)); } @@ -273,7 +273,7 @@ namespace public: OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent); }; - OSelectionBrwBoxHeader::OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent) + OSelectionBrwBoxHeader::OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent) : ::svt::EditBrowserHeader(pParent,WB_BUTTONSTYLE|WB_DRAG) ,m_pBrowseBox(pParent) { @@ -334,7 +334,7 @@ void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo ) OTabFieldMovedUndoAct* pUndoAct = new OTabFieldMovedUndoAct(this); pUndoAct->SetColumnPosition( nOldPos + 1); pUndoAct->SetTabFieldDescr(pOldEntry); - + getDesignView()->getController().addUndoActionAndInvalidate(pUndoAct); } // if ( !m_bInUndoMode && _bCreateUndo ) } @@ -355,8 +355,8 @@ void OSelectionBrowseBox::Init() SetHeaderBar(pNewHeaderBar); SetMode(m_nMode); - - Font aFont( GetDataWindow().GetFont() ); + + Font aFont( GetDataWindow().GetFont() ); aFont.SetWeight( WEIGHT_NORMAL ); GetDataWindow().SetFont( aFont ); @@ -384,9 +384,9 @@ void OSelectionBrowseBox::Init() { Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); m_nMaxColumns = xMetaData.is() ? xMetaData->getMaxColumnsInSelect() : 0; - + } - else + else m_nMaxColumns = 0; } catch(const SQLException&) @@ -405,7 +405,7 @@ void OSelectionBrowseBox::PreFill() if (GetCurRow() != 0) GoToRow(0); - + static_cast< OQueryController& >( getDesignView()->getController() ).clearFields(); DeactivateCell(); @@ -419,7 +419,7 @@ void OSelectionBrowseBox::ClearAll() { DBG_CHKTHIS(OSelectionBrowseBox,NULL); SetUpdateMode(sal_False); - + OTableFields::reverse_iterator aIter = getFields().rbegin(); for ( ;aIter != getFields().rend(); ++aIter ) { @@ -514,7 +514,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon aField.AppendAscii(".*"); } m_pFieldCell->SetText(aField); - } break; + } break; case BROW_TABLE_ROW: { m_pTableCell->Clear(); @@ -537,7 +537,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon m_pTableCell->SelectEntry(String(ModuleRes(STR_QUERY_NOTABLE))); } } - } break; + } break; case BROW_VIS_ROW: { m_pVisibleCell->GetBox().Check(pEntry->IsVisible()); @@ -557,7 +557,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon OQueryDesignView* paDView = getDesignView(); InfoBox(paDView, aMessage).Execute(); } - } break; + } break; case BROW_ORDER_ROW: m_pOrderCell->SelectEntryPos( sal::static_int_cast< USHORT >(pEntry->GetOrderDir())); @@ -571,7 +571,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon break; default: { - sal_uInt16 nIdx = sal_uInt16(nCellIndex - BROW_CRIT1_ROW); + sal_uInt16 nIdx = sal_uInt16(nCellIndex - BROW_CRIT1_ROW); setTextCellContext(pEntry,pEntry->GetCriteria( nIdx ),HID_QRYDGN_ROW_CRIT); } } @@ -624,7 +624,7 @@ sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName, sal_Bool bError = sal_False; ::comphelper::UStringMixEqual bCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); // check if the table name is the same - if ( _sTableRange.getLength() && (bCase(_pEntry->GetTable(),_sTableRange) || bCase(_pEntry->GetAlias(),_sTableRange)) ) + if ( _sTableRange.getLength() && (bCase(_pEntry->GetTable(),_sTableRange) || bCase(_pEntry->GetAlias(),_sTableRange)) ) { // a table was already inserted and the tables contains that column name if ( !_pEntry->GetTabWindow() ) @@ -681,7 +681,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes clearEntryFunctionField(_sFieldName,_pEntry,_bListAction,_pEntry->GetColumnId()); return bError; } - + Reference<XConnection> xConnection( rController.getConnection() ); Reference< XDatabaseMetaData > xMetaData; if ( xConnection.is() ) @@ -713,7 +713,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), _sFieldName ); else sSql += _sFieldName; - + if ( _pEntry->isAggreateFunction() ) { DBG_ASSERT(_pEntry->GetFunction().getLength(),"Functionname darf hier nicht leer sein! ;-("); @@ -752,8 +752,8 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes { _pEntry->SetField(_sFieldName); clearEntryFunctionField(_sFieldName,_pEntry,_bListAction,_pEntry->GetColumnId()); - } // travel through the select column parse node - else + } // travel through the select column parse node + else { ::comphelper::UStringMixEqual bCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); @@ -791,7 +791,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes } ::connectivity::OSQLParseNode* pColumnRef = pChild->getChild(0); - if ( + if ( pColumnRef->count() == 3 && SQL_ISPUNCTUATION(pColumnRef->getChild(0),"(") && SQL_ISPUNCTUATION(pColumnRef->getChild(2),")") @@ -851,24 +851,24 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes } else OSL_ENSURE(0,"Unsupported function inserted!"); - + } else { // so we first clear the function field clearEntryFunctionField(_sFieldName,aSelEntry,_bListAction,nColumnId); ::rtl::OUString sFunction; - pColumnRef->parseNodeToStr( sFunction, + pColumnRef->parseNodeToStr( sFunction, xConnection, &rController.getParser().getContext(), sal_True, sal_True); // quote is to true because we need quoted elements inside the function getDesignView()->fillFunctionInfo(pColumnRef,sFunction,aSelEntry); - + if( SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) || SQL_ISRULEOR2(pColumnRef,fold,char_substring_fct) || - SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) ) + SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) ) // a calculation has been found ( can be calc and function ) { // now parse the whole statement @@ -882,7 +882,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes aSelEntry->SetFunctionType(nNewFunctionType); aSelEntry->SetField(sParameters); } - else + else { aSelEntry->SetFieldAlias(sColumnAlias); if ( SQL_ISRULE(pColumnRef,set_fct_spec) ) @@ -898,11 +898,11 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes aSelEntry->SetFunctionType(FKT_NUMERIC | FKT_OTHER); } } - + aSelEntry->SetAlias(::rtl::OUString()); notifyTableFieldChanged(sOldAlias,aSelEntry->GetAlias(),_bListAction, nColumnId); } - + } if ( i > 0 && !InsertField(aSelEntry,BROWSER_INVALIDID,sal_True,sal_False).is() ) // may we have to append more than one field { // the field could not be isnerted @@ -928,8 +928,8 @@ sal_Bool OSelectionBrowseBox::SaveModified() pEntry = getEntry(nCurrentColumnPos - 1); sal_Bool bWasEmpty = pEntry.is() ? pEntry->IsEmpty() : sal_False; - sal_Bool bError = sal_False; - sal_Bool bListAction = sal_False; + sal_Bool bError = sal_False; + sal_Bool bListAction = sal_False; if (pEntry.is() && Controller().Is() && Controller()->IsModified()) { @@ -943,9 +943,9 @@ sal_Bool OSelectionBrowseBox::SaveModified() { sal_Bool bOldValue = m_pVisibleCell->GetBox().GetSavedValue() != STATE_NOCHECK; strOldCellContents = bOldValue ? g_strOne : g_strZero; - sNewValue = !bOldValue ? g_strOne : g_strZero; + sNewValue = !bOldValue ? g_strOne : g_strZero; } - if((m_bOrderByUnRelated || pEntry->GetOrderDir() == ORDER_NONE) && + if((m_bOrderByUnRelated || pEntry->GetOrderDir() == ORDER_NONE) && (m_bGroupByUnRelated || !pEntry->IsGroupBy())) { pEntry->SetVisible(m_pVisibleCell->GetBox().IsChecked()); @@ -968,7 +968,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() pNewEntry->SetColumnId( pEntry->GetColumnId() ); ::std::replace(getFields().begin(),getFields().end(),pEntry,pNewEntry); sal_uInt16 nCol = GetCurColumnId(); - for (int i = 0; i < m_nVisibleCount; i++) // Spalte neu zeichnen + for (int i = 0; i < m_nVisibleCount; i++) // Spalte neu zeichnen RowModified(i,nCol); } else @@ -1021,7 +1021,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() if ( m_pTableCell->GetSelectEntryPos() != 0 ) { pEntry->SetAlias(aAliasName); - // we have to set the table name as well as the table window + // we have to set the table name as well as the table window OJoinTableView::OTableWindowMap* pTabWinList = getDesignView()->getTableView()->GetTabWinMap(); if (pTabWinList) { @@ -1044,8 +1044,8 @@ sal_Bool OSelectionBrowseBox::SaveModified() pEntry->SetTabWindow(NULL); } sNewValue = pEntry->GetAlias(); - - } break; + + } break; case BROW_ORDER_ROW: { @@ -1061,7 +1061,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() RowModified(GetBrowseRow(BROW_VIS_ROW), GetCurColumnId()); } sNewValue = String::CreateFromInt32((sal_uInt16)pEntry->GetOrderDir()); - } break; + } break; case BROW_COLUMNALIAS_ROW: strOldCellContents = pEntry->GetFieldAlias(); @@ -1073,14 +1073,14 @@ sal_Bool OSelectionBrowseBox::SaveModified() strOldCellContents = pEntry->GetFunction(); sal_uInt16 nPos = m_pFunctionCell->GetSelectEntryPos(); // Diese Funktionen stehen nur unter CORE zur Verfügung - String sFunctionName = m_pFunctionCell->GetEntry(nPos); - String sGroupFunctionName = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1); + String sFunctionName = m_pFunctionCell->GetEntry(nPos); + String sGroupFunctionName = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1); sal_Bool bGroupBy = sal_False; if ( sGroupFunctionName.Equals(sFunctionName) ) // check if the function name is GROUP { bGroupBy = sal_True; - - if ( !m_bGroupByUnRelated && !pEntry->IsVisible() ) + + if ( !m_bGroupByUnRelated && !pEntry->IsVisible() ) { // we have to change the visblie flag, so we must append also an undo action pEntry->SetVisible(sal_True); @@ -1103,9 +1103,9 @@ sal_Bool OSelectionBrowseBox::SaveModified() pEntry->SetFunction(String()); pEntry->SetFunctionType(pEntry->GetFunctionType() & ~FKT_AGGREGATE ); } - + pEntry->SetGroupBy(bGroupBy); - + sNewValue = sFunctionName; } break; @@ -1115,7 +1115,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() if(!xConnection.is()) break; - sal_uInt16 nIdx = sal_uInt16(nRow - BROW_CRIT1_ROW); + sal_uInt16 nIdx = sal_uInt16(nRow - BROW_CRIT1_ROW); String aText = m_pTextCell->GetText(); aText.EraseLeadingChars(); @@ -1125,12 +1125,12 @@ sal_Bool OSelectionBrowseBox::SaveModified() ::rtl::OUString aErrorMsg; Reference<XPropertySet> xColumn; OSQLParseNode* pParseNode = getDesignView()->getPredicateTreeFromEntry(pEntry,aText,aErrorMsg,xColumn); - + if (pParseNode) { pParseNode->parseNodeToPredicateStr(aCrit, xConnection, - static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), + static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), xColumn, getDesignView()->getLocale(), static_cast<sal_Char>(getDesignView()->getDecimalSeparator().toChar()), @@ -1138,7 +1138,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() delete pParseNode; } else - { + { if(xColumn.is()) { sal_Int32 nType = 0; @@ -1161,16 +1161,16 @@ sal_Bool OSelectionBrowseBox::SaveModified() ; } ::connectivity::OSQLParser& rParser = static_cast<OQueryController&>(getDesignView()->getController()).getParser(); - pParseNode = rParser.predicateTree(aErrorMsg, - aText, - static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), + pParseNode = rParser.predicateTree(aErrorMsg, + aText, + static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), xColumn); if (pParseNode) { - pParseNode->parseNodeToPredicateStr(aCrit, + pParseNode->parseNodeToPredicateStr(aCrit, xConnection, - static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), - xColumn, + static_cast<OQueryController&>(getDesignView()->getController()).getNumberFormatter(), + xColumn, getDesignView()->getLocale(), static_cast<sal_Char>(getDesignView()->getDecimalSeparator().toChar()), &(static_cast<OQueryController&>(getDesignView()->getController()).getParser().getContext())); @@ -1194,7 +1194,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() bError = sal_True; } } - // } + // } } strOldCellContents = pEntry->GetCriteria(nIdx); pEntry->SetCriteria(nIdx, aCrit); @@ -1219,7 +1219,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() { // und noch die Undo-Action fuer das Ganze appendUndoAction(strOldCellContents,sNewValue,nRow); - + } } @@ -1284,7 +1284,7 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& r DBG_CHKTHIS(OSelectionBrowseBox,NULL); Rectangle aRect(rRect); aRect.TopLeft().Y() -= 2; - String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); + String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); // ab BROW_CRIT2_ROW werden alle Zeilen mit "oder" angegeben xub_StrLen nToken = (xub_StrLen) (m_nSeekRow >= GetBrowseRow(BROW_CRIT2_ROW)) @@ -1338,7 +1338,7 @@ void OSelectionBrowseBox::RemoveField(sal_uInt16 nColumnId ) OSL_ENSURE(getFields().size() > sal_uInt16(nPos-1),"ID is to great!"); OTableFieldDescRef pDesc = getEntry((sal_uInt32)(nPos - 1)) ; - pDesc->SetColWidth( (sal_uInt16)GetColumnWidth(nColumnId) ); // hat er sich vorher leider nicht gemerkt + pDesc->SetColWidth( (sal_uInt16)GetColumnWidth(nColumnId) ); // hat er sich vorher leider nicht gemerkt // UndoAction erzeugen if ( !m_bInUndoMode ) @@ -1410,7 +1410,7 @@ void OSelectionBrowseBox::KeyInput( const KeyEvent& rEvt ) DBG_CHKTHIS(OSelectionBrowseBox,NULL); if (IsColumnSelected(GetCurColumnId())) { - if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows + if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows !rEvt.GetKeyCode().IsShift() && !rEvt.GetKeyCode().IsMod1()) { @@ -1427,7 +1427,7 @@ sal_Int8 OSelectionBrowseBox::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); sal_Int8 nDropAction = DND_ACTION_NONE; - if ( rEvt.GetRow() >= -1 ) + if ( rEvt.GetRow() >= -1 ) { if ( IsEditing() ) { @@ -1478,7 +1478,7 @@ OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt) getFields().push_back(pEmptyEntry); USHORT nColumnId = sal::static_int_cast< USHORT >(getFields().size()); pEmptyEntry->SetColumnId( nColumnId ); - + InsertDataColumn( nColumnId , String(), DEFAULT_SIZE, HIB_STDSTYLE, HEADERBAR_APPEND); } @@ -1545,7 +1545,7 @@ Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId ) ////////////////////////////////////////////////////////////////////// // Dann wird die linke Seite angepasst - Rectangle aFieldRect(GetCellRect( 0, nColId )); // used instead of GetFieldRectPixel + Rectangle aFieldRect(GetCellRect( 0, nColId )); // used instead of GetFieldRectPixel aInvalidRect.Left() = aFieldRect.Left(); return aInvalidRect; @@ -1567,9 +1567,9 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu // remember the column id of the current positon USHORT nColumnId = GetColumnId(_nColumnPostion); // Wenn zu klein oder zu gross, auf Ende der Liste setzen - if ((_nColumnPostion == BROWSER_INVALIDID) || (_nColumnPostion >= getFields().size())) // Anhaengen des Feldes + if ((_nColumnPostion == BROWSER_INVALIDID) || (_nColumnPostion >= getFields().size())) // Anhaengen des Feldes { - if (FindFirstFreeCol(_nColumnPostion) == NULL) // keine freie Column mehr + if (FindFirstFreeCol(_nColumnPostion) == NULL) // keine freie Column mehr { AppendNewCol(1); _nColumnPostion = sal::static_int_cast< USHORT >( @@ -1581,7 +1581,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu pEntry->SetColumnId( nColumnId ); getFields()[ _nColumnPostion - 1] = pEntry; } - + // check if the column ids are identical, if not we have to move if ( pEntry->GetColumnId() != nColumnId ) { @@ -1731,7 +1731,7 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt const Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); const ::comphelper::UStringMixEqual bCase(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers()); //sal_Bool bAppend = sal_False; - + OTableFields& rFields = getFields(); OTableFields::iterator aIter = rFields.begin(); OTableFields::iterator aEnd = rFields.end(); @@ -1740,11 +1740,11 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt pEntry = *aIter; OSL_ENSURE(pEntry.is(),"OTableFieldDescRef was null!"); - const ::rtl::OUString aField = pEntry->GetField(); - const ::rtl::OUString aAlias = pEntry->GetAlias(); + const ::rtl::OUString aField = pEntry->GetField(); + const ::rtl::OUString aAlias = pEntry->GetAlias(); - if (bCase(aField,rInfo->GetField()) && - bCase(aAlias,rInfo->GetAlias()) && + if (bCase(aField,rInfo->GetField()) && + bCase(aAlias,rInfo->GetAlias()) && pEntry->GetFunctionType() == rInfo->GetFunctionType() && pEntry->GetFunction() == rInfo->GetFunction()) { @@ -1764,7 +1764,7 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt break; } } - + } } @@ -1820,20 +1820,20 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S for(;aIter != aEnd;++aIter) { OTableFieldDescRef pEntry = *aIter; - const ::rtl::OUString aField = pEntry->GetField(); - const ::rtl::OUString aAlias = pEntry->GetAlias(); + const ::rtl::OUString aField = pEntry->GetField(); + const ::rtl::OUString aAlias = pEntry->GetAlias(); - if (bCase(aField,rInfo->GetField()) && - bCase(aAlias,rInfo->GetAlias()) && + if (bCase(aField,rInfo->GetField()) && + bCase(aAlias,rInfo->GetAlias()) && pEntry->GetFunctionType() == rInfo->GetFunctionType() && - pEntry->GetFunction() == rInfo->GetFunction() && + pEntry->GetFunction() == rInfo->GetFunction() && pEntry->IsGroupBy() == rInfo->IsGroupBy() ) { if ( pEntry->isNumericOrAggreateFunction() && rInfo->IsGroupBy() ) pEntry->SetGroupBy(sal_False); else { -// pEntry->SetGroupBy(rInfo->IsGroupBy()); +// pEntry->SetGroupBy(rInfo->IsGroupBy()); if(!m_bGroupByUnRelated && pEntry->IsGroupBy()) pEntry->SetVisible(sal_True); } @@ -1914,10 +1914,10 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef& rInfo, const EOrde for(;aIter != aEnd;++aIter) { pEntry = *aIter; - ::rtl::OUString aField = pEntry->GetField(); - ::rtl::OUString aAlias = pEntry->GetAlias(); + ::rtl::OUString aField = pEntry->GetField(); + ::rtl::OUString aAlias = pEntry->GetAlias(); - if (bCase(aField,rInfo->GetField()) && + if (bCase(aField,rInfo->GetField()) && bCase(aAlias,rInfo->GetAlias())) { sal_uInt32 nPos = aIter - rFields.begin(); @@ -1972,12 +1972,12 @@ void OSelectionBrowseBox::CellModified() { case BROW_VIS_ROW: { - OTableFieldDescRef pEntry = getEntry(GetColumnPos(GetCurColumnId()) - 1); + OTableFieldDescRef pEntry = getEntry(GetColumnPos(GetCurColumnId()) - 1); sal_uInt16 nIdx = m_pOrderCell->GetSelectEntryPos(); - if(!m_bOrderByUnRelated && nIdx > 0 && - nIdx != sal_uInt16(-1) && - !pEntry->IsEmpty() && + if(!m_bOrderByUnRelated && nIdx > 0 && + nIdx != sal_uInt16(-1) && + !pEntry->IsEmpty() && pEntry->GetOrderDir() != ORDER_NONE) { m_pVisibleCell->GetBox().Check(); @@ -2008,7 +2008,7 @@ Size OSelectionBrowseBox::CalcOptimalSize( const Size& _rAvailable ) Size aReturn( _rAvailable.Width(), GetTitleHeight() ); aReturn.Height() += ( m_nVisibleCount ? m_nVisibleCount : 15 ) * GetDataRowHeight(); - aReturn.Height() += 40; // just some space + aReturn.Height() += 40; // just some space return aReturn; } @@ -2025,7 +2025,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt) if (!rEvt.IsMouseEvent()) { - if ( 1 == GetSelectColumnCount() ) + if ( 1 == GetSelectColumnCount() ) { sal_uInt16 nSelId = GetColumnId( sal::static_int_cast< USHORT >( @@ -2233,7 +2233,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const case BROW_FIELD_ROW: { String aField = pEntry->GetField(); - if (aField.GetChar(0) == '*') // * durch alias.* ersetzen + if (aField.GetChar(0) == '*') // * durch alias.* ersetzen { aField = pEntry->GetAlias(); if(aField.Len()) @@ -2241,7 +2241,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const aField += '*'; } aText = aField; - } break; + } break; case BROW_ORDER_ROW: if (pEntry->GetOrderDir() != ORDER_NONE) aText = String(ModuleRes(STR_QUERY_SORTTEXT) ).GetToken(sal::static_int_cast< USHORT >(pEntry->GetOrderDir())); @@ -2339,7 +2339,7 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,Strin String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); - // DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross"); + // DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross"); if ( GetCurColumnId() == nColId && !m_bInUndoMode ) SaveModified(); @@ -2375,7 +2375,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S OTableFieldDescRef pEntry = getEntry(nPos - 1); DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::SetCellContents : invalid column id, prepare for GPF ... "); - + switch (nRow) { case BROW_VIS_ROW: @@ -2391,7 +2391,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S { sal_uInt16 nIdx = (sal_uInt16)strNewText.ToInt32(); pEntry->SetOrderDir(EOrderDir(nIdx)); - } break; + } break; case BROW_COLUMNALIAS_ROW: pEntry->SetFieldAlias(strNewText); break; @@ -2406,8 +2406,8 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S pEntry->SetFunctionType(nFunctionType); if ( pEntry->IsGroupBy() && !sGroupFunctionName.EqualsIgnoreCaseAscii(strNewText) ) pEntry->SetGroupBy(sal_False); - - + + if ( sGroupFunctionName.EqualsIgnoreCaseAscii(strNewText) ) pEntry->SetGroupBy(sal_True); else if ( strNewText.Len() ) @@ -2415,7 +2415,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S nFunctionType |= FKT_AGGREGATE; pEntry->SetFunctionType(nFunctionType); } - } break; + } break; default: pEntry->SetCriteria(sal_uInt16(nRow - BROW_CRIT1_ROW), strNewText); } @@ -2632,7 +2632,7 @@ void OSelectionBrowseBox::stopTimer() { m_bStopTimer = sal_True; if (m_timerInvalidate.IsActive()) - m_timerInvalidate.Stop(); + m_timerInvalidate.Stop(); } // ----------------------------------------------------------------------------- void OSelectionBrowseBox::startTimer() @@ -2661,7 +2661,7 @@ void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,c m_pTextCell->ClearModifyFlag(); if (!m_pTextCell->HasFocus()) m_pTextCell->GrabFocus(); - + enableControl(_rEntry,m_pTextCell); if (m_pTextCell->GetHelpId() != _nHelpId) @@ -2712,7 +2712,7 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) // ----------------------------------------------------------------------------- ::rtl::OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const { - String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); + String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); // ab BROW_CRIT2_ROW werden alle Zeilen mit "oder" angegeben xub_StrLen nToken = (xub_StrLen) (_nRow >= GetBrowseRow(BROW_CRIT2_ROW)) @@ -2721,7 +2721,7 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) return ::rtl::OUString(aLabel.GetToken(nToken)); } // ----------------------------------------------------------------------------- -::rtl::OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const +::rtl::OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const { ::rtl::OUString sRetText; switch( _eObjType ) diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 4ecb2e8e0245..5fa263b85f13 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,151 +42,151 @@ namespace connectivity } namespace dbaui -{ +{ //================================================================== -#define SIZ_NONE 0 -#define SIZ_TOP 1 -#define SIZ_BOTTOM 2 -#define SIZ_LEFT 4 -#define SIZ_RIGHT 8 - -#define BROW_FIELD_ROW 0 -#define BROW_COLUMNALIAS_ROW 1 -#define BROW_TABLE_ROW 2 -#define BROW_ORDER_ROW 3 -#define BROW_VIS_ROW 4 -#define BROW_FUNCTION_ROW 5 -#define BROW_CRIT1_ROW 6 -#define BROW_CRIT2_ROW 7 -#define BROW_CRIT3_ROW 8 -#define BROW_CRIT4_ROW 9 -#define BROW_CRIT5_ROW 10 -#define BROW_CRIT6_ROW 11 -#define BROW_ROW_CNT 12 +#define SIZ_NONE 0 +#define SIZ_TOP 1 +#define SIZ_BOTTOM 2 +#define SIZ_LEFT 4 +#define SIZ_RIGHT 8 + +#define BROW_FIELD_ROW 0 +#define BROW_COLUMNALIAS_ROW 1 +#define BROW_TABLE_ROW 2 +#define BROW_ORDER_ROW 3 +#define BROW_VIS_ROW 4 +#define BROW_FUNCTION_ROW 5 +#define BROW_CRIT1_ROW 6 +#define BROW_CRIT2_ROW 7 +#define BROW_CRIT3_ROW 8 +#define BROW_CRIT4_ROW 9 +#define BROW_CRIT5_ROW 10 +#define BROW_CRIT6_ROW 11 +#define BROW_ROW_CNT 12 //================================================================== class OQueryDesignView; class OSelectionBrowseBox : public ::svt::EditBrowseBox { friend class OQueryDesignView; - ::std::vector<bool> m_bVisibleRow; // an Pos steht die RowId - Timer m_timerInvalidate; - - long m_nSeekRow; - BrowserMode m_nMode; // Merken des BrowseModes - Edit* m_pTextCell; - ::svt::CheckBoxControl* m_pVisibleCell; - ::svt::ComboBoxControl* m_pFieldCell; - ::svt::ListBoxControl* m_pFunctionCell; - ::svt::ListBoxControl* m_pTableCell; - ::svt::ListBoxControl* m_pOrderCell; - - OTableFieldDescRef m_pEmptyEntry; // default entry in the list may reference more than once - - sal_Int32 m_nMaxColumns; // maximale Anzahl der Spalten in einem Select-Statement - - String m_aFunctionStrings; - sal_uInt16 m_nVisibleCount; // Anzahl der max sichtbaren Zeilen - sal_Bool m_bOrderByUnRelated; - sal_Bool m_bGroupByUnRelated; - sal_Bool m_bStopTimer; - sal_Bool m_bWasEditing; - sal_Bool m_bDisableErrorBox; - sal_Bool m_bInUndoMode; + ::std::vector<bool> m_bVisibleRow; // an Pos steht die RowId + Timer m_timerInvalidate; + + long m_nSeekRow; + BrowserMode m_nMode; // Merken des BrowseModes + Edit* m_pTextCell; + ::svt::CheckBoxControl* m_pVisibleCell; + ::svt::ComboBoxControl* m_pFieldCell; + ::svt::ListBoxControl* m_pFunctionCell; + ::svt::ListBoxControl* m_pTableCell; + ::svt::ListBoxControl* m_pOrderCell; + + OTableFieldDescRef m_pEmptyEntry; // default entry in the list may reference more than once + + sal_Int32 m_nMaxColumns; // maximale Anzahl der Spalten in einem Select-Statement + + String m_aFunctionStrings; + sal_uInt16 m_nVisibleCount; // Anzahl der max sichtbaren Zeilen + sal_Bool m_bOrderByUnRelated; + sal_Bool m_bGroupByUnRelated; + sal_Bool m_bStopTimer; + sal_Bool m_bWasEditing; + sal_Bool m_bDisableErrorBox; + sal_Bool m_bInUndoMode; DECL_LINK(OnInvalidateTimer, void*); - public: OSelectionBrowseBox( Window* pParent ); + public: OSelectionBrowseBox( Window* pParent ); ~OSelectionBrowseBox(); - void initialize(); - OTableFieldDescRef InsertField( const OJoinExchangeData& jxdSource, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True ); - OTableFieldDescRef InsertField( const OTableFieldDescRef& rInfo, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True ); - void InsertColumn( OTableFieldDescRef pEntry, USHORT& _nColumnPostion ); - void RemoveColumn( USHORT _nColumnId ); - void DeleteFields( const String& rAliasName ); + void initialize(); + OTableFieldDescRef InsertField( const OJoinExchangeData& jxdSource, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True ); + OTableFieldDescRef InsertField( const OTableFieldDescRef& rInfo, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True ); + void InsertColumn( OTableFieldDescRef pEntry, USHORT& _nColumnPostion ); + void RemoveColumn( USHORT _nColumnId ); + void DeleteFields( const String& rAliasName ); bool HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const; // AddGroupBy:: F"ugt ein Feld mit Funktion == Grupierung. Falls das Feld schon vorhanden ist und ein Aggregate Funktion // benutzt, wird das Flag nicht gesetzt - void AddGroupBy( const OTableFieldDescRef& rInfo,sal_uInt32 _nCurrentPos); - void AddCondition( const OTableFieldDescRef& rInfo, + void AddGroupBy( const OTableFieldDescRef& rInfo,sal_uInt32 _nCurrentPos); + void AddCondition( const OTableFieldDescRef& rInfo, const String& rValue, const sal_uInt16 nLevel, bool _bAddOrOnOneLine ); - void DuplicateConditionLevel( const sal_uInt16 nLevel); - void AddOrder(const OTableFieldDescRef& rInfo, const EOrderDir eDir, sal_uInt32 _nCurrentPos); - void ClearAll(); - OTableFieldDescRef AppendNewCol( sal_uInt16 nCnt=1 ); - sal_Bool Save(); - OQueryDesignView* getDesignView(); - OQueryDesignView* getDesignView() const; - sal_uInt16 FieldsCount(); - - void SetColWidth(sal_uInt16 nColId, long lNewWidth); + void DuplicateConditionLevel( const sal_uInt16 nLevel); + void AddOrder(const OTableFieldDescRef& rInfo, const EOrderDir eDir, sal_uInt32 _nCurrentPos); + void ClearAll(); + OTableFieldDescRef AppendNewCol( sal_uInt16 nCnt=1 ); + sal_Bool Save(); + OQueryDesignView* getDesignView(); + OQueryDesignView* getDesignView() const; + sal_uInt16 FieldsCount(); + + void SetColWidth(sal_uInt16 nColId, long lNewWidth); // beachtet im Gegensatz zum SetColumnWidth der Basisklasse auch eine eventuell aktive Zelle in dieser Spalte - String GetCellContents(sal_Int32 nCellIndex, USHORT nColId); - void SetCellContents(sal_Int32 nCellIndex, USHORT nColId, const String& strNewText); + String GetCellContents(sal_Int32 nCellIndex, USHORT nColId); + void SetCellContents(sal_Int32 nCellIndex, USHORT nColId, const String& strNewText); // Zelleninhalt (als String formatiert) setzen/liefern - sal_Int32 GetNoneVisibleRows() const; - void SetNoneVisbleRow(long nRows); - sal_Bool IsRowVisible(sal_uInt16 _nWhich) const; - void SetRowVisible(sal_uInt16 _nWhich, sal_Bool _bVis); + sal_Int32 GetNoneVisibleRows() const; + void SetNoneVisbleRow(long nRows); + sal_Bool IsRowVisible(sal_uInt16 _nWhich) const; + void SetRowVisible(sal_uInt16 _nWhich, sal_Bool _bVis); - void SetReadOnly(sal_Bool bRO); + void SetReadOnly(sal_Bool bRO); // calculate an optimal size. Basically, this takes into account the number of visible rows. - Size CalcOptimalSize( const Size& _rAvailable ); + Size CalcOptimalSize( const Size& _rAvailable ); // can the current content be cut - sal_Bool isPasteAllowed(); - sal_Bool isCutAllowed(); - sal_Bool isCopyAllowed(); - void cut(); - void paste(); - void copy(); - - virtual void GetFocus(); - virtual void DeactivateCell(sal_Bool bUpdate = sal_True); - virtual void ColumnMoved( USHORT nColId ) { ColumnMoved(nColId,TRUE); } - void ColumnMoved( USHORT nColId,BOOL _bCreateUndo); - - void Fill(); - void PreFill(); - + sal_Bool isPasteAllowed(); + sal_Bool isCutAllowed(); + sal_Bool isCopyAllowed(); + void cut(); + void paste(); + void copy(); + + virtual void GetFocus(); + virtual void DeactivateCell(sal_Bool bUpdate = sal_True); + virtual void ColumnMoved( USHORT nColId ) { ColumnMoved(nColId,TRUE); } + void ColumnMoved( USHORT nColId,BOOL _bCreateUndo); + + void Fill(); + void PreFill(); + /** Disables the generation of undo actions */ - inline void EnterUndoMode() { m_bInUndoMode = sal_True; } + inline void EnterUndoMode() { m_bInUndoMode = sal_True; } /** Enables the generation of undo actions */ - inline void LeaveUndoMode() { m_bInUndoMode = sal_False; } + inline void LeaveUndoMode() { m_bInUndoMode = sal_False; } /** GetCellText returns the text at the given position - @param _nRow + @param _nRow the number of the row - @param _nColId + @param _nColId the ID of the column @return the text out of the cell */ - virtual String GetCellText(long _nRow, USHORT _nColId) const; + virtual String GetCellText(long _nRow, USHORT _nColId) const; /** returns the description of the row. - @param _nRow + @param _nRow The row number. - @return - The header text of the specified row. + @return + The header text of the specified row. */ - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; - /** return the name of the specified object. - @param eObjType + /** return the name of the specified object. + @param eObjType The type to ask for - @param _nPosition + @param _nPosition The position of a tablecell (index position), header bar colum/row cell - @return - The name of the specified object. + @return + The name of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; // IAccessibleTableProvider /** Creates the accessible object of a data table cell. @@ -194,102 +194,102 @@ namespace dbaui @param nColumnId The column ID of the cell. @return The XAccessible interface of the specified cell. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ); - + protected: - virtual sal_Bool SeekRow( long nRow ); + virtual sal_Bool SeekRow( long nRow ); - virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, + virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const; + virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; - virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); - virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); - virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ); - virtual void KeyInput( const KeyEvent& rEvt ); - virtual void Command(const CommandEvent& rEvt); - virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); - - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); - virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); - virtual void CellModified(); - virtual sal_Bool SaveModified(); - virtual void Init(); - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const; - virtual void ColumnResized( sal_uInt16 nColId ); - - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); - - virtual sal_uInt16 GetDefaultColumnWidth(const String& rName) const; + virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); + virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); + virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ); + virtual void KeyInput( const KeyEvent& rEvt ); + virtual void Command(const CommandEvent& rEvt); + virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); + + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); + virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); + virtual void CellModified(); + virtual sal_Bool SaveModified(); + virtual void Init(); + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const; + virtual void ColumnResized( sal_uInt16 nColId ); + + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); + + virtual sal_uInt16 GetDefaultColumnWidth(const String& rName) const; // if you want to have an own header ... - virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent); + virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent); - void stopTimer(); - void startTimer(); + void stopTimer(); + void startTimer(); private: - OTableFieldDescRef FindFirstFreeCol(USHORT& _rColumnPosition); + OTableFieldDescRef FindFirstFreeCol(USHORT& _rColumnPosition); // rCol enthaelt die Nummer (in pOTableFieldDescList) der ersten Spalte, die von sich sagt, dass sie leer ist // wenn es keine solche gibt, ist rCol undefiniert und der Rueckgabewert NULL - void CheckFreeColumns(USHORT& _rColumnPosition); + void CheckFreeColumns(USHORT& _rColumnPosition); // testet, ob es noch freie Spalten gibt, wenn nicht, wird ein neuer Packen angefuegt // rCol enthaelt die Nummer der ersten freien Spalte (in pOTableFieldDescList) - void RemoveField( sal_uInt16 nId ); - Rectangle GetInvalidRect( sal_uInt16 nColId ); - long GetRealRow(long nRow) const; - long GetBrowseRow(long nRowId) const; - sal_Bool GetFunctionName(sal_uInt32 _nFunctionTokenId,String& rFkt); - void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow,sal_Bool& _bListAction); - void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow); - OTableFields& getFields() const; - void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); - void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId); - void invalidateUndoRedo(); + void RemoveField( sal_uInt16 nId ); + Rectangle GetInvalidRect( sal_uInt16 nColId ); + long GetRealRow(long nRow) const; + long GetBrowseRow(long nRowId) const; + sal_Bool GetFunctionName(sal_uInt32 _nFunctionTokenId,String& rFkt); + void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow,sal_Bool& _bListAction); + void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow); + OTableFields& getFields() const; + void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); + void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId); + void invalidateUndoRedo(); OTableFieldDescRef getEntry(OTableFields::size_type _nPos); - void adjustSelectionMode( sal_Bool _bClickedOntoHeader, sal_Bool _bClickedOntoHandleCol ); + void adjustSelectionMode( sal_Bool _bClickedOntoHeader, sal_Bool _bClickedOntoHandleCol ); /** save the filed change in save modified - @param _sFieldName + @param _sFieldName The field name inserted by the user. - @param _pEntry + @param _pEntry The entry which will contain the nescessary entries. - @param _bListAction + @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> @return <TRUE/> if an error occured otherwise <FALSE/> */ - sal_Bool saveField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction); + sal_Bool saveField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction); /** sets the table window at the _pEntry - @param _pEntry + @param _pEntry The entry where the window should be set. - @param _sTableName + @param _sTableName The table name to search for. - @return + @return <TRUE/> if the table name was set otherwise <FALSE/> */ - sal_Bool fillEntryTable(OTableFieldDescRef& _pEntry,const ::rtl::OUString& _sTableName); + sal_Bool fillEntryTable(OTableFieldDescRef& _pEntry,const ::rtl::OUString& _sTableName); /** uses the parse node to fill all information into the field - @param _pColumnRef + @param _pColumnRef The parse node used to fill the info into the field. - @param _xMetaData + @param _xMetaData Use to parse the node to a string. - @param _pEntry + @param _pEntry The entry which will contain the nescessary entries. - @param _bListAction + @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> @return <TRUE/> if an error occured otherwise <FALSE/> */ - sal_Bool fillColumnRef( const ::connectivity::OSQLParseNode* _pColumnRef, + sal_Bool fillColumnRef( const ::connectivity::OSQLParseNode* _pColumnRef, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, OTableFieldDescRef& _pEntry, sal_Bool& _bListAction); - sal_Bool fillColumnRef( const ::rtl::OUString& _sColumnName, + sal_Bool fillColumnRef( const ::rtl::OUString& _sColumnName, const ::rtl::OUString& _sTableRange, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, OTableFieldDescRef& _pEntry, @@ -297,41 +297,41 @@ namespace dbaui /** append an undo action for the table field - @param _sOldAlias + @param _sOldAlias The old table alias. - @param _sAlias + @param _sAlias The new alias name. - @param _bListAction + @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> */ - void notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,USHORT _nColumnId); + void notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,USHORT _nColumnId); /** append an undo action for the function field - @param _sOldFunctionName + @param _sOldFunctionName The old value. - @param _sFunctionName + @param _sFunctionName The new function name. - @param _bListAction + @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> */ - void notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,USHORT _nColumnId); + void notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,USHORT _nColumnId); /** clears the function fields of the submitted entry if it doesn't match the SQL standard and append an undo action. E.q. AGGREGATE functions are only valid when the field name isn't an asterix - @param _sFieldName + @param _sFieldName The field name. - @param _pEntry + @param _pEntry The entry to be cleared - @param _bListAction + @param _bListAction When <TRUE/> an list action will be created. */ - void clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,USHORT _nColumnId); + void clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,USHORT _nColumnId); /** remove or insert the necessary function types - @param _pEntry + @param _pEntry The currently edited entry. */ - void setFunctionCell(OTableFieldDescRef& _pEntry); + void setFunctionCell(OTableFieldDescRef& _pEntry); private: using ::svt::EditBrowseBox::AcceptDrop; diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index 964b54d00f25..8909fad0fd76 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -181,7 +181,7 @@ namespace dbaui //------------------------------------------------------------------------ BOOL OTableConnection::CheckHit( const Point& rMousePos ) const - { + { ////////////////////////////////////////////////////////////////////// // check if the point hit our line ::std::vector<OConnectionLine*>::const_iterator aIter = ::std::find_if(m_vConnLine.begin(), diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index f097c35eb6f1..27d4f7300c8f 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ OTableConnectionData::~OTableConnectionData() DBG_DTOR(OTableConnectionData,NULL); // LineDataList loeschen OConnectionLineDataVec().swap(m_vConnLineData); - //ResetConnLines(FALSE); + //ResetConnLines(FALSE); } //------------------------------------------------------------------------ @@ -101,7 +101,7 @@ OTableConnectionData& OTableConnectionData::operator=( const OTableConnectionDat // und kopieren OConnectionLineDataVec* pLineData = const_cast<OTableConnectionData*>(&rConnData)->GetConnLineDataList(); - + OConnectionLineDataVec::const_iterator aIter = pLineData->begin(); OConnectionLineDataVec::const_iterator aEnd = pLineData->end(); for(;aIter != aEnd;++aIter) @@ -168,9 +168,9 @@ OConnectionLineDataRef OTableConnectionData::CreateLineDataObj( const OConnectio return new OConnectionLineData( rConnLineData ); } // ----------------------------------------------------------------------------- -OTableConnectionData* OTableConnectionData::NewInstance() const -{ - return new OTableConnectionData(); +OTableConnectionData* OTableConnectionData::NewInstance() const +{ + return new OTableConnectionData(); } // ----------------------------------------------------------------------------- void OTableConnectionData::normalizeLines() diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 8edf83464b96..c318eb88c61d 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ OTableFieldDesc::OTableFieldDesc(const ::rtl::OUString& rT, const ::rtl::OUStrin ,m_bVisible(sal_False) { DBG_CTOR(OTableFieldDesc,NULL); - SetField( rF ); SetTable( rT ); + SetField( rF ); SetTable( rT ); } //------------------------------------------------------------------------------ @@ -93,10 +93,10 @@ OTableFieldDesc& OTableFieldDesc::operator=( const OTableFieldDesc& rRS ) m_aCriteria = rRS.GetCriteria(); m_aTableName = rRS.GetTable(); - m_aAliasName = rRS.GetAlias(); // table range - m_aFieldName = rRS.GetField(); // column - m_aFieldAlias = rRS.GetFieldAlias(); // column alias - m_aFunctionName = rRS.GetFunction(); // Funktionsname + m_aAliasName = rRS.GetAlias(); // table range + m_aFieldName = rRS.GetField(); // column + m_aFieldAlias = rRS.GetFieldAlias(); // column alias + m_aFunctionName = rRS.GetFunction(); // Funktionsname m_pTabWindow = rRS.GetTabWindow(); m_eDataType = rRS.GetDataType(); m_eFunctionType = rRS.GetFunctionType(); @@ -115,14 +115,14 @@ sal_Bool OTableFieldDesc::operator==( const OTableFieldDesc& rDesc ) { DBG_CHKTHIS(OTableFieldDesc,NULL); - return ( m_eOrderDir != rDesc.GetOrderDir() || - m_eDataType != rDesc.GetDataType() || - m_aAliasName != rDesc.GetAlias() || - m_aFunctionName != rDesc.GetFunction() || - m_aFieldName != rDesc.GetField() || - m_aTableName != rDesc.GetTable() || - m_bGroupBy != rDesc.IsGroupBy() || - m_aCriteria != rDesc.GetCriteria() || + return ( m_eOrderDir != rDesc.GetOrderDir() || + m_eDataType != rDesc.GetDataType() || + m_aAliasName != rDesc.GetAlias() || + m_aFunctionName != rDesc.GetFunction() || + m_aFieldName != rDesc.GetField() || + m_aTableName != rDesc.GetTable() || + m_bGroupBy != rDesc.IsGroupBy() || + m_aCriteria != rDesc.GetCriteria() || m_bVisible != rDesc.IsVisible() ); } diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx index 7ef432c32bd8..d86ab904c7d2 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx index 090d71735665..e3191777f7f7 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,17 +36,17 @@ namespace dbaui class OTableFieldInfo { private: - ETableFieldType m_eFieldType; - sal_Int32 m_eDataType; + ETableFieldType m_eFieldType; + sal_Int32 m_eDataType; public: OTableFieldInfo(); ~OTableFieldInfo(); - inline ETableFieldType GetKeyType() const { return m_eFieldType; } - inline void SetKey(ETableFieldType bKey=TAB_NORMAL_FIELD) { m_eFieldType = bKey; } - inline sal_Int32 GetDataType() const { return m_eDataType; } - inline void SetDataType(sal_Int32 eTyp) { m_eDataType = eTyp; } + inline ETableFieldType GetKeyType() const { return m_eFieldType; } + inline void SetKey(ETableFieldType bKey=TAB_NORMAL_FIELD) { m_eFieldType = bKey; } + inline sal_Int32 GetDataType() const { return m_eDataType; } + inline void SetDataType(sal_Int32 eTyp) { m_eDataType = eTyp; } }; } #endif // DBAUI_TABLEFIELDINFO_HXX diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 1c0dd80e93f8..3e44c65f5685 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,12 +67,12 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -#define TABWIN_SIZING_AREA 4 -#define LISTBOX_SCROLLING_AREA 6 -#define SCROLLING_TIMESPAN 500 +#define TABWIN_SIZING_AREA 4 +#define LISTBOX_SCROLLING_AREA 6 +#define SCROLLING_TIMESPAN 500 -#define TABWIN_WIDTH_MIN 90 -#define TABWIN_HEIGHT_MIN 80 +#define TABWIN_WIDTH_MIN 90 +#define TABWIN_HEIGHT_MIN 80 //======================================================================== // class OTableWindow @@ -124,7 +124,7 @@ OTableWindow::~OTableWindow() } // if (m_pListBox) if ( m_pContainerListener.is() ) m_pContainerListener->dispose(); - + m_pAccessible = NULL; } // ----------------------------------------------------------------------------- @@ -399,7 +399,7 @@ Rectangle OTableWindow::getSizingRect(const Point& _rPos,const Size& _rOutputSiz // ----------------------------------------------------------------------------- void OTableWindow::setSizingFlag(const Point& _rPos) { - Size aOutSize = GetOutputSizePixel(); + Size aOutSize = GetOutputSizePixel(); ////////////////////////////////////////////////////////////////////// // Flags anpassen, wenn Mauszeiger in sizingArea m_nSizingFlags = SIZING_NONE; @@ -425,9 +425,9 @@ void OTableWindow::MouseMove( const MouseEvent& rEvt ) if (pCont->getDesignView()->getController().isReadOnly()) return; - Point aPos = rEvt.GetPosPixel(); + Point aPos = rEvt.GetPosPixel(); setSizingFlag(aPos); - Pointer aPointer; + Pointer aPointer; ////////////////////////////////////////////////////////////////////// @@ -477,7 +477,7 @@ void OTableWindow::Resize() { ////////////////////////////////////////////////////////////////////// // Das Fenster darf nicht verschwinden, deshalb min. Groesse setzen - Size aOutSize = GetOutputSizePixel(); + Size aOutSize = GetOutputSizePixel(); aOutSize = Size(CalcZoom(aOutSize.Width()),CalcZoom(aOutSize.Height())); long nTitleHeight = CalcZoom( GetTextHeight() )+ CalcZoom( 4 ); @@ -657,7 +657,7 @@ long OTableWindow::PreNotify(NotifyEvent& rNEvt) if ( getDesignView()->getController().isReadOnly() ) break; - const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const KeyCode& rCode = pKeyEvent->GetKeyCode(); if ( rCode.IsMod1() ) { @@ -737,40 +737,40 @@ long OTableWindow::PreNotify(NotifyEvent& rNEvt) } else { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } else { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } resetSizingFlag(); } else { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } else { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } break; case EVENT_KEYUP: { - const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const KeyCode& rCode = pKeyEvent->GetKeyCode(); USHORT nKeyCode = rCode.GetCode(); if ( rCode.IsMod2() && nKeyCode != KEY_UP && nKeyCode != KEY_DOWN && nKeyCode != KEY_LEFT && nKeyCode != KEY_RIGHT ) { - m_nMoveCount = 0; // reset our movement count - m_nMoveIncrement = 1; + m_nMoveCount = 0; // reset our movement count + m_nMoveIncrement = 1; } } break; diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index aad8a07fa4cc..71a044fa24e1 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,11 +49,11 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; - // using namespace ::com::sun::star::awt; + // using namespace ::com::sun::star::awt; using namespace ::com::sun::star; OTableWindowAccess::OTableWindowAccess(OTableWindow* _pTable) - :VCLXAccessibleComponent(_pTable->GetComponentInterface().is() ? _pTable->GetWindowPeer() : NULL) + :VCLXAccessibleComponent(_pTable->GetComponentInterface().is() ? _pTable->GetWindowPeer() : NULL) ,m_pTable(_pTable) { } @@ -208,7 +208,7 @@ namespace dbaui } } return xReturn; - } + } // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL OTableWindowAccess::getRelationCount( ) throw (RuntimeException) @@ -238,8 +238,8 @@ namespace dbaui sal_Bool SAL_CALL OTableWindowAccess::containsRelation( sal_Int16 aRelationType ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - return AccessibleRelationType::CONTROLLER_FOR == aRelationType - && m_pTable && m_pTable->getTableView()->ExistsAConn(m_pTable); + return AccessibleRelationType::CONTROLLER_FOR == aRelationType + && m_pTable && m_pTable->getTableView()->ExistsAConn(m_pTable); } // ----------------------------------------------------------------------------- AccessibleRelation SAL_CALL OTableWindowAccess::getRelationByType( sal_Int16 aRelationType ) throw (RuntimeException) @@ -249,14 +249,14 @@ namespace dbaui { OJoinTableView* pView = m_pTable->getTableView(); const ::std::vector<OTableConnection*>* pConnectionList = pView->getTableConnections(); - + ::std::vector<OTableConnection*>::const_iterator aIter = pView->getTableConnections(m_pTable); ::std::vector<OTableConnection*>::const_iterator aEnd = pConnectionList->end(); ::std::vector< Reference<XInterface> > aRelations; aRelations.reserve(5); // just guessing for (; aIter != aEnd ; ++aIter ) aRelations.push_back(getParentChild(aIter - pConnectionList->begin())); - + Reference<XInterface> *pRelations = aRelations.empty() ? 0 : &aRelations[0]; Sequence< Reference<XInterface> > aSeq(pRelations, aRelations.size()); return AccessibleRelation(AccessibleRelationType::CONTROLLER_FOR,aSeq); diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index 6a9d63372a88..41457eaa3a54 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ void OTableWindowData::_disposing( const ::com::sun::star::lang::EventObject& /* // it doesn't matter which one was disposed m_xColumns.clear(); m_xKeys.clear(); - m_xTable.clear(); + m_xTable.clear(); } // ----------------------------------------------------------------------------- bool OTableWindowData::init(const Reference< XConnection >& _xConnection,bool _bAllowQueries) diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 936148c5ed93..e6f8965d9828 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,9 +44,9 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; -OJoinExchangeData::OJoinExchangeData(OTableWindowListBox* pBox) +OJoinExchangeData::OJoinExchangeData(OTableWindowListBox* pBox) : pListBox(pBox) - , pEntry(pBox->FirstSelected()) + , pEntry(pBox->FirstSelected()) { } const ULONG SCROLLING_TIMESPAN = 500; @@ -158,15 +158,15 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) { case EVENT_KEYINPUT: { - const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const KeyCode& rCode = pKeyEvent->GetKeyCode(); - + if (rCode.GetCode() != KEY_RETURN) { if(m_pTabWin) { bHandled = m_pTabWin->HandleKeyInput(*pKeyEvent); - // bHandled = TRUE; + // bHandled = TRUE; } break; } @@ -196,7 +196,7 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) ScrollOutputArea( -1 ); pEntry = GetEntry( m_aMousePos ); Select( pEntry, TRUE ); -// m_aScrollTimer.Start(); +// m_aScrollTimer.Start(); } return 0; @@ -214,7 +214,7 @@ IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ ) ScrollOutputArea( 1 ); pEntry = GetEntry( m_aMousePos ); Select( pEntry, TRUE ); -// m_aScrollTimer.Start(); +// m_aScrollTimer.Start(); } return 0; @@ -245,9 +245,9 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) // check the format if ( !OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_TABID) // this means that the first entry is to be draged && OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_JOIN) ) - { // don't drop into the window if it's the drag source itself - + { // don't drop into the window if it's the drag source itself + // remove the selection if the dragging operation is leaving the window if (_rEvt.mbLeaving) SelectAll(FALSE); @@ -335,9 +335,9 @@ sal_Int8 OTableWindowListBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { TransferableDataHelper aDropped(_rEvt.maDropEvent.Transferable); if ( OJoinExchObj::isFormatAvailable(aDropped.GetDataFlavorExVector())) - { // don't drop into the window if it's the drag source itself - m_aDropInfo.aSource = OJoinExchangeData(this); - m_aDropInfo.aDest = OJoinExchObj::GetSourceDescription(_rEvt.maDropEvent.Transferable); + { // don't drop into the window if it's the drag source itself + m_aDropInfo.aSource = OJoinExchangeData(this); + m_aDropInfo.aDest = OJoinExchObj::GetSourceDescription(_rEvt.maDropEvent.Transferable); if (m_nDropEvent) Application::RemoveUserEvent(m_nDropEvent); @@ -373,7 +373,7 @@ void OTableWindowListBox::GetFocus() else ShowFocusRect(FirstSelected()); } - SvTreeListBox::GetFocus(); + SvTreeListBox::GetFocus(); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 48e9865dd1ce..55b141b85e79 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) : OTableWindowTitle::~OTableWindowTitle() { DBG_DTOR(OTableWindowTitle,NULL); - m_pTabWin = NULL; + m_pTabWin = NULL; } //------------------------------------------------------------------------------ @@ -131,10 +131,10 @@ void OTableWindowTitle::Command( const CommandEvent& rEvt ) //------------------------------------------------------------------------------ //void OTableWindowTitle::Paint( const Rectangle& rRect ) //{ -// ////////////////////////////////////////////////////////////////////// -// // Ausgabe des Textes in der Titelzeile -// Rectangle aWinRect( Point(0,0), GetSizePixel() ); -// DrawText( aWinRect, GetText(), TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER|TEXT_DRAW_ENDELLIPSIS ); +// ////////////////////////////////////////////////////////////////////// +// // Ausgabe des Textes in der Titelzeile +// Rectangle aWinRect( Point(0,0), GetSizePixel() ); +// DrawText( aWinRect, GetText(), TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER|TEXT_DRAW_ENDELLIPSIS ); //} //------------------------------------------------------------------------------ @@ -149,7 +149,7 @@ void OTableWindowTitle::MouseButtonDown( const MouseEvent& rEvt ) { if( rEvt.IsLeft() ) { - if( rEvt.GetClicks() == 2) + if( rEvt.GetClicks() == 2) { Size aSize(GetTextWidth(GetText()) + 20, m_pTabWin->GetSizePixel().Height() - m_pTabWin->GetListBox()->GetSizePixel().Height()); diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index d8a2162e1d14..3dd1180d8704 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 56343b778e0a..1744e0602f36 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,14 +56,14 @@ namespace dbaui //= OQueryContainerWindow //===================================================================== DBG_NAME(OQueryContainerWindow) - OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory) + OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory) :ODataView( pParent, _rController, _rFactory ) ,m_pViewSwitch(NULL) ,m_pBeamer(NULL) { DBG_CTOR(OQueryContainerWindow,NULL); m_pViewSwitch = new OQueryViewSwitch( this, _rController, _rFactory ); - + m_pSplitter = new Splitter(this,WB_VSCROLL); m_pSplitter->Hide(); m_pSplitter->SetSplitHdl( LINK( this, OQueryContainerWindow, SplitHdl ) ); @@ -72,7 +72,7 @@ namespace dbaui // ----------------------------------------------------------------------------- OQueryContainerWindow::~OQueryContainerWindow() { - DBG_DTOR(OQueryContainerWindow,NULL); + DBG_DTOR(OQueryContainerWindow,NULL); { ::std::auto_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch); m_pViewSwitch = NULL; @@ -86,7 +86,7 @@ namespace dbaui m_xBeamer = NULL; if(xCloseable.is()) xCloseable->close(sal_False); // false - holds the owner ship of this frame - // m_xBeamer->setComponent(NULL,NULL); + // m_xBeamer->setComponent(NULL,NULL); } { ::std::auto_ptr<Window> aTemp(m_pSplitter); @@ -113,8 +113,8 @@ namespace dbaui if ( m_pBeamer && m_pBeamer->IsVisible() ) { // calc pos and size of the splitter - Point aSplitPos = m_pSplitter->GetPosPixel(); - Size aSplitSize = m_pSplitter->GetOutputSizePixel(); + Point aSplitPos = m_pSplitter->GetPosPixel(); + Size aSplitSize = m_pSplitter->GetOutputSizePixel(); aSplitSize.Width() = aPlayground.GetWidth(); if ( aSplitPos.Y() <= aPlayground.Top() ) @@ -125,7 +125,7 @@ namespace dbaui // set pos and size of the splitter m_pSplitter->SetPosSizePixel( aSplitPos, aSplitSize ); - m_pSplitter->SetDragRectPixel( aPlayground ); + m_pSplitter->SetDragRectPixel( aPlayground ); // set pos and size of the beamer Size aBeamerSize( aPlayground.GetWidth(), aSplitPos.Y() ); @@ -218,7 +218,7 @@ namespace dbaui { const ::rtl::OUString aLayoutManager( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )); Reference < XPropertySet > xLMPropSet(xPropSet->getPropertyValue( aLayoutManager ),UNO_QUERY); - + if ( xLMPropSet.is() ) { const ::rtl::OUString aAutomaticToolbars( RTL_CONSTASCII_USTRINGPARAM( "AutomaticToolbars" )); @@ -239,7 +239,7 @@ namespace dbaui Size aSize = GetOutputSizePixel(); Size aBeamer(aSize.Width(),sal_Int32(aSize.Height()*0.33)); - const long nFrameHeight = LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height(); + const long nFrameHeight = LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height(); Point aPos(0,aBeamer.Height()+nFrameHeight); m_pBeamer->SetPosSizePixel(Point(0,0),aBeamer); @@ -253,13 +253,13 @@ namespace dbaui m_pSplitter->Show(); Resize(); - } + } } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 82122c97aed1..66afd048ca76 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -188,7 +188,7 @@ namespace dbaui case SQL_NODE_COMPARISON: {rString+= ::rtl::OUString::createFromAscii("SQL_COMPARISON:"); - rString += _pNode->getTokenValue(); // haenge Nodevalue an + rString += _pNode->getTokenValue(); // haenge Nodevalue an // und beginne neu Zeile break;} @@ -217,12 +217,12 @@ namespace dbaui case SQL_NODE_PUNCTUATION: {rString += ::rtl::OUString::createFromAscii("SQL_PUNCTUATION:"); - rString += _pNode->getTokenValue(); // haenge Nodevalue an + rString += _pNode->getTokenValue(); // haenge Nodevalue an break;} case SQL_NODE_AMMSC: {rString += ::rtl::OUString::createFromAscii("SQL_AMMSC:"); - rString += _pNode->getTokenValue(); // haenge Nodevalue an + rString += _pNode->getTokenValue(); // haenge Nodevalue an break;} @@ -694,7 +694,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& if(m_bGraphicalDesign) InvalidateFeature(ID_BROWSER_ADDTABLE); } - // InvalidateFeature(ID_BROWSER_QUERY_EXECUTE); + // InvalidateFeature(ID_BROWSER_QUERY_EXECUTE); break; case SID_QUERY_VIEW_FUNCTIONS: case SID_QUERY_VIEW_TABLES: @@ -734,15 +734,15 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& break; case ID_QUERY_ZOOM_IN: { -// m_aZoom *= Fraction(1,10); -// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom); +// m_aZoom *= Fraction(1,10); +// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom); } break; case ID_QUERY_ZOOM_OUT: { -// if(m_aZoom != Fraction(1,1)) -// m_aZoom /= Fraction(1,10); -// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom); +// if(m_aZoom != Fraction(1,1)) +// m_aZoom /= Fraction(1,10); +// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom); } break; #if OSL_DEBUG_LEVEL > 1 @@ -783,7 +783,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& ::rtl::OUString sTemp; pNode->parseNodeToStr(sTemp,getConnection()); getContainer()->setStatement(sTemp); - + } } @@ -961,7 +961,7 @@ void OQueryController::impl_initialize() // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°° if ( !ensureConnected( sal_False ) ) - { // we have no connection so what else should we do + { // we have no connection so what else should we do m_bGraphicalDesign = sal_False; if ( editingView() ) { @@ -979,7 +979,7 @@ void OQueryController::impl_initialize() xViews = xViewsSup->getViews(); if ( !xViews.is() ) - { // we can't create views so we ask if the user wants to create a query instead + { // we can't create views so we ask if the user wants to create a query instead m_nCommandType = CommandType::QUERY; sal_Bool bClose = sal_False; { @@ -1037,7 +1037,7 @@ void OQueryController::impl_initialize() impl_showAutoSQLViewError( aError.get() ); } } - + getUndoMgr()->Clear(); if ( ( m_bGraphicalDesign ) @@ -1165,7 +1165,7 @@ void SAL_CALL OQueryController::disposing( const EventObject& Source ) throw(Run if ( getContainer() && Source.Source.is() ) { if ( Source.Source == m_aCurrentFrame.getFrame() ) - { // our frame is beeing disposed -> close the preview window (if we have one) + { // our frame is beeing disposed -> close the preview window (if we have one) Reference< XFrame > xPreviewFrame( getContainer()->getPreviewFrame() ); ::comphelper::disposeComponent( xPreviewFrame ); } @@ -1402,8 +1402,8 @@ sal_Bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElement m_sName = aDlg.getName(); if ( editingView() ) { - m_sUpdateCatalogName = aDlg.getCatalog(); - m_sUpdateSchemaName = aDlg.getSchema(); + m_sUpdateCatalogName = aDlg.getCatalog(); + m_sUpdateSchemaName = aDlg.getSchema(); } } } @@ -1560,7 +1560,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs) setModified( sal_False ); bSuccess = true; - + } catch( const SQLException& ) { diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index f7348dd25294..ca02d527d836 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ using namespace ::com::sun::star::sdbc; namespace dbaui { -class OJoinControl : public Window +class OJoinControl : public Window { public: - FixedLine aFL_Join; - FixedText aFT_Title; - ListBox aLB_JoinType; + FixedLine aFL_Join; + FixedText aFT_Title; + ListBox aLB_JoinType; CheckBox m_aCBNatural; OJoinControl(Window* _pParent,const ResId& _rResId); @@ -73,7 +73,7 @@ OJoinControl::OJoinControl(Window* _pParent,const ResId& _rResId) DBG_NAME(DlgQryJoin) DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, const TTableConnectionData::value_type& _pData, - OJoinTableView::OTableWindowMap* _pTableMap, + OJoinTableView::OTableWindowMap* _pTableMap, const Reference< XConnection >& _xConnection, BOOL _bAllowTableSelect) :ModalDialog( pParent, ModuleRes(DLG_QRY_JOIN) ) @@ -104,7 +104,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, m_pJoinControl->Show(); m_pJoinControl->m_aCBNatural.Check(static_cast<OQueryTableConnectionData*>(m_pConnData.get())->isNatural()); m_pTableControl->Show(); - + if( _bAllowTableSelect ) { m_pTableControl->Init( m_pConnData ); @@ -166,7 +166,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, m_pTableControl->NotifyCellChange(); m_pTableControl->enableRelation(!static_cast<OQueryTableConnectionData*>(m_pConnData.get())->isNatural() && eJoinType != CROSS_JOIN ); - } + } FreeResource(); } @@ -176,7 +176,7 @@ DlgQryJoin::~DlgQryJoin() { DBG_DTOR(DlgQryJoin,NULL); delete m_pJoinControl; - delete m_pTableControl; + delete m_pTableControl; } // ----------------------------------------------------------------------------- IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) @@ -184,14 +184,14 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) DBG_CHKTHIS(DlgQryJoin,NULL); if (m_pJoinControl->aLB_JoinType.GetSelectEntryPos() == m_pJoinControl->aLB_JoinType.GetSavedValue() ) return 1; - + m_pJoinControl->aLB_JoinType.SaveValue(); aML_HelpText.SetText(String()); m_pTableControl->enableRelation(true); - String sFirstWinName = m_pConnData->getReferencingTable()->GetWinName(); - String sSecondWinName = m_pConnData->getReferencedTable()->GetWinName(); + String sFirstWinName = m_pConnData->getReferencingTable()->GetWinName(); + String sSecondWinName = m_pConnData->getReferencedTable()->GetWinName(); const EJoinType eOldJoinType = eJoinType; USHORT nResId = 0; const USHORT nPos = m_pJoinControl->aLB_JoinType.GetSelectEntryPos(); @@ -203,7 +203,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) case ID_INNER_JOIN: nResId = STR_QUERY_INNER_JOIN; bAddHint = sal_False; - eJoinType = INNER_JOIN; + eJoinType = INNER_JOIN; break; case ID_LEFT_JOIN: nResId = STR_QUERY_LEFTRIGHT_JOIN; @@ -226,7 +226,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) { nResId = STR_QUERY_CROSS_JOIN; eJoinType = CROSS_JOIN; - + m_pConnData->ResetConnLines(); m_pTableControl->lateInit(); m_pJoinControl->m_aCBNatural.Check(FALSE); @@ -272,7 +272,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, /*pButton*/ ) { DBG_CHKTHIS(DlgQryJoin,NULL); - + m_pConnData->Update(); m_pOrigConnData->CopyFrom( *m_pConnData ); @@ -295,12 +295,12 @@ IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) Reference<XNameAccess> xReferencedTableColumns(m_pConnData->getReferencedTable()->getColumns()); Sequence< ::rtl::OUString> aSeq = m_pConnData->getReferencingTable()->getColumns()->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( xReferencedTableColumns->hasByName(*pIter) ) m_pConnData->AppendConnLine(*pIter,*pIter); - } + } } catch( const Exception& ) { @@ -309,7 +309,7 @@ IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) m_pTableControl->NotifyCellChange(); m_pTableControl->Invalidate(); } - + return 1; } // ----------------------------------------------------------------------------- @@ -367,7 +367,7 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType) break; } } - + LBChangeHdl(&m_pJoinControl->aLB_JoinType); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/querydlg.hrc b/dbaccess/source/ui/querydesign/querydlg.hrc index 0112fe1ffa56..f5acfd0d5266 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hrc +++ b/dbaccess/source/ui/querydesign/querydlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,18 +33,18 @@ #endif #define FL_JOIN 1 -#define FT_LISTBOXTITLE 2 +#define FT_LISTBOXTITLE 2 -#define LB_JOINTYPE 1 +#define LB_JOINTYPE 1 -#define GB_FIELDS 1 +#define GB_FIELDS 1 #define CB_NATURAL 1 -#define PB_OK 1 -#define PB_CANCEL 2 -#define PB_HELP 3 -#define ML_HELPTEXT 4 +#define PB_OK 1 +#define PB_CANCEL 2 +#define PB_HELP 3 +#define ML_HELPTEXT 4 #define WND_JOIN_CONTROL 1 #define WND_CONTROL 2 diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 2e0b331fb13e..f18fde0309d7 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,23 +46,23 @@ namespace dbaui class OTableListBoxControl; class OQueryTableView; class OJoinControl; - class DlgQryJoin : public ModalDialog + class DlgQryJoin : public ModalDialog ,public IRelationControlInterface { protected: - FixedText aML_HelpText; - OKButton aPB_OK; - CancelButton aPB_CANCEL; - HelpButton aPB_HELP; + FixedText aML_HelpText; + OKButton aPB_OK; + CancelButton aPB_CANCEL; + HelpButton aPB_HELP; OJoinControl* m_pJoinControl; - OTableListBoxControl* m_pTableControl; - OJoinTableView::OTableWindowMap* m_pTableMap; + OTableListBoxControl* m_pTableControl; + OJoinTableView::OTableWindowMap* m_pTableMap; OQueryTableView* m_pTableView; - EJoinType eJoinType; - TTableConnectionData::value_type m_pConnData; // enth"alt linke und rechte Tabelle - TTableConnectionData::value_type m_pOrigConnData; + EJoinType eJoinType; + TTableConnectionData::value_type m_pConnData; // enth"alt linke und rechte Tabelle + TTableConnectionData::value_type m_pOrigConnData; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; @@ -71,13 +71,13 @@ namespace dbaui DECL_LINK( NaturalToggleHdl, CheckBox* ); /** setJoinType enables and set the new join type - @param _eNewJoinType the new jointype + @param _eNewJoinType the new jointype */ void setJoinType(EJoinType _eNewJoinType); public: - DlgQryJoin( OQueryTableView * pParent, + DlgQryJoin( OQueryTableView * pParent, const TTableConnectionData::value_type& pData, - OJoinTableView::OTableWindowMap* _pTableMap, + OJoinTableView::OTableWindowMap* _pTableMap, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, BOOL _bAllowTableSelect); virtual ~DlgQryJoin(); @@ -89,14 +89,14 @@ namespace dbaui virtual TTableConnectionData::value_type getConnectionData() const; /** setValid set the valid inside, can be used for OK buttons - @param _bValid true when the using control allows an update + @param _bValid true when the using control allows an update */ virtual void setValid(sal_Bool _bValid); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() { return m_xConnection; } /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists - @param _pConnectionData the connection which exists between the new tables + @param _pConnectionData the connection which exists between the new tables */ virtual void notifyConnectionChange(); }; diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src index 687df3159186..30bc059c412a 100644 --- a/dbaccess/source/ui/querydesign/querydlg.src +++ b/dbaccess/source/ui/querydesign/querydlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ ModalDialog DLG_QRY_JOIN Size = MAP_APPFONT ( 90 , 60 ) ; HelpId = HID_DLG_QRY_JOINTYPE ; - DropDown = TRUE; - DDExtraWidth = TRUE; + DropDown = TRUE; + DDExtraWidth = TRUE; StringList [ en-US ] = { < "Inner join" ; ID_INNER_JOIN; > ; @@ -137,7 +137,7 @@ ModalDialog DLG_QRY_JOIN Size = MAP_APPFONT ( 179 , 49 ) ; UniqueId = HID_DLG_QRY_HELPTEXT ; SVLook = TRUE; - WordBreak = TRUE; + WordBreak = TRUE; }; OKButton PB_OK diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx index dea455795484..ea7c76ba32a7 100644 --- a/dbaccess/source/ui/querydesign/queryview.cxx +++ b/dbaccess/source/ui/querydesign/queryview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index 9cc6a42b4fe8..a0f3f422fe53 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ using namespace dbaui; //======================================================================== DBG_NAME(ORelationTableConnection) //------------------------------------------------------------------------ -ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContainer, +ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContainer, const TTableConnectionData::value_type& pTabConnData ) :OTableConnection( pContainer, pTabConnData ) { @@ -91,8 +91,8 @@ void ORelationTableConnection::Draw( const Rectangle& rRect ) const OConnectionLine* pTopLine = NULL; const ::std::vector<OConnectionLine*>* pConnLineList = GetConnLineList(); - ::std::vector<OConnectionLine*>::const_iterator aIter = pConnLineList->begin(); - ::std::vector<OConnectionLine*>::const_iterator aEnd = pConnLineList->end(); + ::std::vector<OConnectionLine*>::const_iterator aIter = pConnLineList->begin(); + ::std::vector<OConnectionLine*>::const_iterator aEnd = pConnLineList->end(); for(;aIter != aEnd;++aIter) { if( (*aIter)->IsValid() ) diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx index c9be2d46cc9e..73793dcff2e1 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace dbaui ORelationTableConnection& operator=( const ORelationTableConnection& rConn ); - virtual void Draw( const Rectangle& rRect ); + virtual void Draw( const Rectangle& rRect ); using OTableConnection::Draw; }; } diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index db145f75664f..86a1dcdef3d6 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowDa { DBG_CTOR(ORelationTableConnectionData,NULL); m_aConnName = rConnName; - + if ( m_aConnName.Len() ) SetCardinality(); } @@ -178,13 +178,13 @@ void ORelationTableConnectionData::SetCardinality() BOOL ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const { // check if Table has the primary key column dependig on _eEConnectionSide - USHORT nPrimKeysCount = 0, - nValidLinesCount = 0; + USHORT nPrimKeysCount = 0, + nValidLinesCount = 0; const Reference< XNameAccess> xKeyColumns = dbtools::getPrimaryKeyColumns_throw(i_xTable); if ( xKeyColumns.is() ) { Sequence< ::rtl::OUString> aKeyColumns = xKeyColumns->getElementNames(); - const ::rtl::OUString* pKeyIter = aKeyColumns.getConstArray(); + const ::rtl::OUString* pKeyIter = aKeyColumns.getConstArray(); const ::rtl::OUString* pKeyEnd = pKeyIter + aKeyColumns.getLength(); for(;pKeyIter != pKeyEnd;++pKeyIter) @@ -260,14 +260,14 @@ namespace dbaui //------------------------------------------------------------------------- bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs) { - bool bEqual = (lhs.m_nUpdateRules == rhs.m_nUpdateRules) + bool bEqual = (lhs.m_nUpdateRules == rhs.m_nUpdateRules) && (lhs.m_nDeleteRules == rhs.m_nDeleteRules) && (lhs.m_nCardinality == rhs.m_nCardinality) && (lhs.getReferencingTable() == rhs.getReferencingTable()) && (lhs.getReferencedTable() == rhs.getReferencedTable()) && (lhs.m_aConnName == rhs.m_aConnName) && (lhs.m_vConnLineData.size() == rhs.m_vConnLineData.size()); - + if ( bEqual ) { std::vector< OConnectionLineDataRef >::const_iterator aIter = lhs.m_vConnLineData.begin(); @@ -297,7 +297,7 @@ BOOL ORelationTableConnectionData::Update() // reassign the keys because the orientaion could be changed Reference<XPropertySet> xTableProp(getReferencingTable()->getTable()); Reference< XIndexAccess> xKeys ( getReferencingTable()->getKeys()); - + if ( !xKeys.is() ) return FALSE; //////////////////////////////////////////////////////////// @@ -348,7 +348,7 @@ BOOL ORelationTableConnectionData::Update() } } } - + if ( xColumns->hasElements() ) xAppend->appendByDescriptor(xKey); } @@ -384,14 +384,14 @@ xKey.clear(); for ( ; pIter != pEnd ; ++pIter ) { xColumn.set(xColumns->getByName(*pIter),UNO_QUERY_THROW); - xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; - xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn; + xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; + xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn; OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin(); OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end(); for(;aIter != aEnd;++aIter) { - if( (*aIter)->GetSourceFieldName() == sName + if( (*aIter)->GetSourceFieldName() == sName && (*aIter)->GetDestFieldName() == sRelatedColumn ) { break; @@ -411,8 +411,8 @@ xKey.clear(); } } catch(Exception&) - { - } + { + } } } xKey.clear(); @@ -424,7 +424,7 @@ xKey.clear(); ::dbtools::throwGenericSQLException(sError,NULL); } -// OSL_ENSURE(xKey.is(),"No key found have insertion!"); +// OSL_ENSURE(xKey.is(),"No key found have insertion!"); // The fields the relation marks may not be the same as our LineDatas mark after the relation has been updated if ( xColSup.is() ) @@ -446,8 +446,8 @@ xKey.clear(); { OConnectionLineDataRef pNewData = CreateLineDataObj(); - xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; - xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn; + xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; + xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn; pNewData->SetSourceFieldName(sName); pNewData->SetDestFieldName(sRelatedColumn); diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index 12c7b51e5b42..e1b11aa9af61 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,14 +35,14 @@ namespace dbaui class ORelationTableWindow : public OTableWindow { public: - ORelationTableWindow( Window* pParent,const TTableWindowData::value_type& pTabWinData) + ORelationTableWindow( Window* pParent,const TTableWindowData::value_type& pTabWinData) : OTableWindow(pParent, pTabWinData) {} - + /** returns the name which should be used when displaying join or relations @return The composed name or the window name. */ - virtual ::rtl::OUString GetName() const { return GetComposedName(); } + virtual ::rtl::OUString GetName() const { return GetComposedName(); } }; } #endif //DBAUI_RELTABLEWINDOW_HXX diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 43400cb2c6a9..bd4269f413af 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <sfx2/sfxsids.hrc> #include "dbu_rel.hrc" #include <vcl/svapp.hxx> -#include "browserids.hxx" +#include "browserids.hxx" #include <comphelper/types.hxx> #include "dbustrings.hrc" #include <connectivity/dbtools.hxx> @@ -96,8 +96,8 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::util; -// using namespace ::com::sun::star::sdbcx; -// using namespace ::connectivity; +// using namespace ::com::sun::star::sdbcx; +// using namespace ::connectivity; using namespace ::dbtools; using namespace ::dbaui; using namespace ::comphelper; @@ -133,7 +133,7 @@ Reference< XInterface > SAL_CALL ORelationController::Create(const Reference<XMu } DBG_NAME(ORelationController); // ----------------------------------------------------------------------------- -ORelationController::ORelationController(const Reference< XMultiServiceFactory >& _rM) +ORelationController::ORelationController(const Reference< XMultiServiceFactory >& _rM) : OJoinController(_rM) ,m_nThreadEvent(0) ,m_bRelationsPossible(sal_True) @@ -182,7 +182,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue else { // now we save the layout information - // create the output stream + // create the output stream try { if ( haveDataSource() && getDataSource()->getPropertySetInfo()->hasPropertyByName(PROPERTY_LAYOUTINFORMATION) ) @@ -218,7 +218,7 @@ void ORelationController::impl_initialize() {// check if this database supports relations setEditable(sal_False); - m_bRelationsPossible = sal_False; + m_bRelationsPossible = sal_False; { String sTitle(ModuleRes(STR_RELATIONDESIGN)); sTitle.Erase(0,3); @@ -251,7 +251,7 @@ void ORelationController::impl_initialize() { DBG_UNHANDLED_EXCEPTION(); } - + } // ----------------------------------------------------------------------------- ::rtl::OUString ORelationController::getPrivateTitle( ) const @@ -295,17 +295,17 @@ namespace const Sequence< ::rtl::OUString> m_aTableList; ORelationController* m_pParent; const Reference< XDatabaseMetaData> m_xMetaData; - const Reference< XNameAccess > m_xTables; + const Reference< XNameAccess > m_xTables; const sal_Int32 m_nStartIndex; const sal_Int32 m_nEndIndex; - + public: RelationLoader(ORelationController* _pParent ,const Reference< XDatabaseMetaData>& _xMetaData ,const Reference< XNameAccess >& _xTables ,const Sequence< ::rtl::OUString>& _aTableList ,const sal_Int32 _nStartIndex - ,const sal_Int32 _nEndIndex) + ,const sal_Int32 _nEndIndex) :m_aTableData(_xMetaData.is() && _xMetaData->supportsMixedCaseQuotedIdentifiers()) ,m_aTableList(_aTableList) ,m_pParent(_pParent) @@ -320,8 +320,8 @@ namespace virtual void SAL_CALL run(); virtual void SAL_CALL onTerminated(); protected: - virtual ~RelationLoader(){} - + virtual ~RelationLoader(){} + void loadTableData(const Any& _aTable); }; @@ -333,8 +333,8 @@ namespace ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, *pIter, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); Any aCatalog; @@ -377,14 +377,14 @@ namespace TTableWindowData::value_type pReferencingTable = aFind->second; Reference<XIndexAccess> xKeys = pReferencingTable->getKeys(); const Reference<XKeysSupplier> xKeySup(xTableProp,UNO_QUERY); - + if ( !xKeys.is() && xKeySup.is() ) { xKeys = xKeySup->getKeys(); } - + if ( xKeys.is() ) - { + { Reference<XPropertySet> xKey; const sal_Int32 nCount = xKeys->getCount(); for(sal_Int32 i = 0 ; i < nCount ; ++i) @@ -423,10 +423,10 @@ namespace // insert columns const Reference<XColumnsSupplier> xColsSup(xKey,UNO_QUERY); OSL_ENSURE(xColsSup.is(),"Key is no XColumnsSupplier!"); - const Reference<XNameAccess> xColumns = xColsSup->getColumns(); - const Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const Reference<XNameAccess> xColumns = xColsSup->getColumns(); + const Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); ::rtl::OUString sColumnName,sRelatedName; for(sal_uInt16 j=0;pIter != pEnd;++pIter,++j) { @@ -434,18 +434,18 @@ namespace OSL_ENSURE(xPropSet.is(),"Invalid column found in KeyColumns!"); if ( xPropSet.is() ) { - xPropSet->getPropertyValue(PROPERTY_NAME) >>= sColumnName; - xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedName; + xPropSet->getPropertyValue(PROPERTY_NAME) >>= sColumnName; + xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedName; } pTabConnData->SetConnLine( j, sColumnName, sRelatedName ); } ////////////////////////////////////////////////////////////////////// // Update/Del-Flags setzen - sal_Int32 nUpdateRule = 0; - sal_Int32 nDeleteRule = 0; + sal_Int32 nUpdateRule = 0; + sal_Int32 nDeleteRule = 0; xKey->getPropertyValue(PROPERTY_UPDATERULE) >>= nUpdateRule; xKey->getPropertyValue(PROPERTY_DELETERULE) >>= nDeleteRule; - + pTabConnData->SetUpdateRules( nUpdateRule ); pTabConnData->SetDeleteRules( nDeleteRule ); @@ -493,11 +493,11 @@ IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ ) ::osl::MutexGuard aGuard( getMutex() ); try { - getView()->initialize(); // show the windows and fill with our informations + getView()->initialize(); // show the windows and fill with our informations getView()->Invalidate(INVALIDATE_NOERASE); - getUndoMgr()->Clear(); // clear all undo redo things - setModified(sal_False); // and we are not modified yet - + getUndoMgr()->Clear(); // clear all undo redo things + setModified(sal_False); // and we are not modified yet + if(m_vTableData.empty()) Execute(ID_BROWSER_ADDTABLE,Sequence<PropertyValue>()); } @@ -551,7 +551,7 @@ void ORelationController::loadData() catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); - } + } } // ----------------------------------------------------------------------------- TTableWindowData::value_type ORelationController::existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 4030abfb46a2..ea775a8b822e 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ ORelationDesignView::~ORelationDesignView() // ------------------------------------------------------------------------- void ORelationDesignView::Construct() { - m_pTableView = new ORelationTableView(m_pScrollWindow,this); + m_pTableView = new ORelationTableView(m_pScrollWindow,this); OJoinDesignView::Construct(); } // ----------------------------------------------------------------------------- @@ -79,7 +79,7 @@ void ORelationDesignView::initialize() m_pTableView->clearLayoutInformation(); m_pTableView->ReSync(); - OJoinDesignView::initialize(); + OJoinDesignView::initialize(); } // ----------------------------------------------------------------------------- long ORelationDesignView::PreNotify( NotifyEvent& rNEvt ) @@ -93,7 +93,7 @@ long ORelationDesignView::PreNotify( NotifyEvent& rNEvt ) nDone = 1L; } } - if(!nDone) + if(!nDone) nDone = OJoinDesignView::PreNotify(rNEvt); return nDone; } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index d608ee531d25..ed62b881b849 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pV , ::comphelper::OContainerListener(m_aMutex) ,m_pExistingConnection(NULL) ,m_bInRemove(false) - + { DBG_CTOR(ORelationTableView,NULL); SetHelpId(HID_CTL_RELATIONTAB); @@ -152,7 +152,7 @@ void ORelationTableView::ReSync() continue; } - (*GetTabWinMap())[pData->GetComposedName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe + (*GetTabWinMap())[pData->GetComposedName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe // wenn in den Daten keine Position oder Groesse steht -> Default if (!pData->HasPosition() && !pData->HasSize()) SetDefaultTabWinPosSize(pTabWin); @@ -176,12 +176,12 @@ void ORelationTableView::ReSync() bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) - { // nein -> Pech gehabt, die Connection faellt weg + { // nein -> Pech gehabt, die Connection faellt weg pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() ); continue; } } // if ( !arrInvalidTables.empty() ) - + addConnection( new ORelationTableConnection(this, *aConIter), sal_False ); // don't add the data again } @@ -218,7 +218,7 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const } // insert table connection into view - TTableConnectionData::value_type pTabConnData(new ORelationTableConnectionData(pSourceWin->GetData(), + TTableConnectionData::value_type pTabConnData(new ORelationTableConnectionData(pSourceWin->GetData(), pDestWin->GetData())); // die Namen der betroffenen Felder @@ -343,7 +343,7 @@ void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ////////////////////////////////////////////////////////////////// // Neue Datenstruktur in DocShell eintragen TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName )); - pNewTabWinData->ShowAll(FALSE); + pNewTabWinData->ShowAll(FALSE); ////////////////////////////////////////////////////////////////// // Neues Fenster in Fensterliste eintragen @@ -360,7 +360,7 @@ void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const modified(); if ( m_pAccessible ) - m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, + m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(pNewTabWin->GetAccessible())); } @@ -378,7 +378,7 @@ void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin ) { m_pView->getController().getUndoMgr()->Clear(); OJoinTableView::RemoveTabWin( pTabWin ); - + m_pView->getController().InvalidateFeature(SID_RELATION_ADD_RELATION); m_pView->getController().InvalidateFeature(ID_BROWSER_UNDO); m_pView->getController().InvalidateFeature(ID_BROWSER_REDO); @@ -389,14 +389,14 @@ void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin ) //{ // class OReleationAskDialog : public ButtonDialog // { -// FixedImage m_aInfoImage; -// FixedText m_aTitle; -// FixedText m_aMessage; +// FixedImage m_aInfoImage; +// FixedText m_aTitle; +// FixedText m_aMessage; // public: // OReleationDialog(Window* _pParent) : ButtonDialog(_pParent,WB_HORZ | WB_STDDIALOG) // ,m_aInfoImage(this) // ,m_aTitle(this,WB_WORDBREAK | WB_LEFT) -// ,m_aMessage(this,WB_WORDBREAK | WB_LEFT) +// ,m_aMessage(this,WB_WORDBREAK | WB_LEFT) // { // m_aMessage.SetText(ModuleRes(STR_QUERY_REL_EDIT_RELATION)); // m_aMessage.Show(); @@ -458,7 +458,7 @@ bool ORelationTableView::allowQueries() const // ----------------------------------------------------------------------------- void ORelationTableView::_elementInserted( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException) { - + } // ----------------------------------------------------------------------------- void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) @@ -472,7 +472,7 @@ void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEve { m_pView->getController().getUndoMgr()->Clear(); OJoinTableView::RemoveTabWin( pTableWindow ); - + m_pView->getController().InvalidateFeature(SID_RELATION_ADD_RELATION); m_pView->getController().InvalidateFeature(ID_BROWSER_UNDO); m_pView->getController().InvalidateFeature(ID_BROWSER_REDO); diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src index e3c555debd79..0a5f3e00f137 100644 --- a/dbaccess/source/ui/relationdesign/relation.src +++ b/dbaccess/source/ui/relationdesign/relation.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 22756f48a909..05384fdd44c7 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl() //------------------------------------------------------------------------------ //short OFieldDescGenWin::GetFormatCategory(OFieldDescription* pFieldDescr) //{ -// return m_pFieldControl->GetFormatCategory(pFieldDescr); +// return m_pFieldControl->GetFormatCategory(pFieldDescr); //} //------------------------------------------------------------------------------ void OFieldDescGenWin::SaveData( OFieldDescription* pFieldDescr ) diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index 87cbbe9fb928..366fd36fb666 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace dbaui ,public IClipboardTest { - OTableFieldControl *m_pFieldControl; + OTableFieldControl *m_pFieldControl; protected: virtual void Resize(); @@ -62,7 +62,7 @@ namespace dbaui #if OSL_DEBUG_LEVEL > 0 OTableEditorCtrl* GetEditorCtrl(); #endif - // short GetFormatCategory(OFieldDescription* pFieldDescr); + // short GetFormatCategory(OFieldDescription* pFieldDescr); // liefert zum am Feld eingestellten Format einen der CAT_xxx-Werte (CAT_NUMBER, CAT_DATE ...) String BoolStringPersistent(const String& rUIString) const; @@ -78,7 +78,7 @@ namespace dbaui virtual void cut(); virtual void paste(); - inline OTableFieldControl* getFieldControl() const { return m_pFieldControl; } + inline OTableFieldControl* getFieldControl() const { return m_pFieldControl; } }; } #endif // DBAUI_TABLEFIELDDESCGENPAGE_HXX diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 0f7ef63d5d94..f4cf44643ac7 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,10 +39,10 @@ #include "UITools.hxx" #include <com/sun/star/util/NumberFormat.hpp> -#define DEFAULT_VARCHAR_PRECSION 50 -#define DEFAULT_OTHER_PRECSION 16 -#define DEFAULT_NUMERIC_PRECSION 5 -#define DEFAULT_NUMERIC_SCALE 0 +#define DEFAULT_VARCHAR_PRECSION 50 +#define DEFAULT_OTHER_PRECSION 16 +#define DEFAULT_NUMERIC_PRECSION 5 +#define DEFAULT_NUMERIC_SCALE 0 using namespace dbaui; @@ -235,7 +235,7 @@ void OFieldDescription::FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bF nPrec = GetPrecision(); break; } - + if ( _pType->nPrecision ) SetPrecision(::std::min<sal_Int32>(nPrec ? nPrec : DEFAULT_NUMERIC_PRECSION,_pType->nPrecision)); if ( _pType->nMaximumScale ) @@ -487,7 +487,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetName() const +::rtl::OUString OFieldDescription::GetName() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_NAME) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_NAME)); @@ -495,7 +495,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sName; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetDescription() const +::rtl::OUString OFieldDescription::GetDescription() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_DESCRIPTION) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_DESCRIPTION)); @@ -503,7 +503,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sDescription; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetHelpText() const +::rtl::OUString OFieldDescription::GetHelpText() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_HELPTEXT) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_HELPTEXT)); @@ -511,7 +511,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sHelpText; } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Any OFieldDescription::GetControlDefault() const +::com::sun::star::uno::Any OFieldDescription::GetControlDefault() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_CONTROLDEFAULT) ) return m_xDest->getPropertyValue(PROPERTY_CONTROLDEFAULT); @@ -519,7 +519,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_aControlDefault; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetAutoIncrementValue() const +::rtl::OUString OFieldDescription::GetAutoIncrementValue() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_AUTOINCREMENTCREATION) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_AUTOINCREMENTCREATION)); @@ -527,7 +527,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sAutoIncrementValue; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetType() const +sal_Int32 OFieldDescription::GetType() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_TYPE) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_TYPE)); @@ -535,7 +535,7 @@ sal_Int32 OFieldDescription::GetType() const return m_pType.get() ? m_pType->nType : m_nType; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetTypeName() const +::rtl::OUString OFieldDescription::GetTypeName() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_TYPENAME) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_TYPENAME)); @@ -543,7 +543,7 @@ sal_Int32 OFieldDescription::GetType() const return m_pType.get() ? m_pType->aTypeName : m_sTypeName; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetPrecision() const +sal_Int32 OFieldDescription::GetPrecision() const { sal_Int32 nPrec = m_nPrecision; if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_PRECISION) ) @@ -563,11 +563,11 @@ sal_Int32 OFieldDescription::GetPrecision() const break; } // switch ( pTypeInfo->nType ) } - + return nPrec; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetScale() const +sal_Int32 OFieldDescription::GetScale() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_SCALE) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_SCALE)); @@ -575,7 +575,7 @@ sal_Int32 OFieldDescription::GetScale() const return m_nScale; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetIsNullable() const +sal_Int32 OFieldDescription::GetIsNullable() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISNULLABLE) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_ISNULLABLE)); @@ -583,7 +583,7 @@ sal_Int32 OFieldDescription::GetIsNullable() const return m_nIsNullable; } // ----------------------------------------------------------------------------- -sal_Int32 OFieldDescription::GetFormatKey() const +sal_Int32 OFieldDescription::GetFormatKey() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_FORMATKEY) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_FORMATKEY)); @@ -591,7 +591,7 @@ sal_Int32 OFieldDescription::GetFormatKey() const return m_nFormatKey; } // ----------------------------------------------------------------------------- -SvxCellHorJustify OFieldDescription::GetHorJustify() const +SvxCellHorJustify OFieldDescription::GetHorJustify() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ALIGN) ) return ::dbaui::mapTextJustify(::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_ALIGN))); @@ -599,12 +599,12 @@ SvxCellHorJustify OFieldDescription::GetHorJustify() const return m_eHorJustify; } // ----------------------------------------------------------------------------- -TOTypeInfoSP OFieldDescription::getTypeInfo() const +TOTypeInfoSP OFieldDescription::getTypeInfo() const { return m_pType; } // ----------------------------------------------------------------------------- -TOTypeInfoSP OFieldDescription::getSpecialTypeInfo() const +TOTypeInfoSP OFieldDescription::getSpecialTypeInfo() const { TOTypeInfoSP pSpecialType( new OTypeInfo() ); *pSpecialType = *m_pType; @@ -613,7 +613,7 @@ TOTypeInfoSP OFieldDescription::getSpecialTypeInfo() const return pSpecialType; } // ----------------------------------------------------------------------------- -sal_Bool OFieldDescription::IsAutoIncrement() const +sal_Bool OFieldDescription::IsAutoIncrement() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISAUTOINCREMENT) ) return ::cppu::any2bool(m_xDest->getPropertyValue(PROPERTY_ISAUTOINCREMENT)); @@ -621,17 +621,17 @@ sal_Bool OFieldDescription::IsAutoIncrement() const return m_bIsAutoIncrement; } // ----------------------------------------------------------------------------- -sal_Bool OFieldDescription::IsPrimaryKey() const +sal_Bool OFieldDescription::IsPrimaryKey() const { return m_bIsPrimaryKey; } // ----------------------------------------------------------------------------- -sal_Bool OFieldDescription::IsCurrency() const +sal_Bool OFieldDescription::IsCurrency() const { return m_bIsCurrency; } // ----------------------------------------------------------------------------- -sal_Bool OFieldDescription::IsNullable() const +sal_Bool OFieldDescription::IsNullable() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISNULLABLE) ) return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_ISNULLABLE)) == ::com::sun::star::sdbc::ColumnValue::NULLABLE; diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 06bd03125f51..86c5dc6cf035 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,29 +76,29 @@ namespace dbaui } //============================================================================== -// TYPEINIT1(OTableEditorCtrl, DBView); +// TYPEINIT1(OTableEditorCtrl, DBView); DBG_NAME(OTableEditorCtrl) //============================================================================== -#define HANDLE_ID 0 +#define HANDLE_ID 0 // default Spaltenbreiten -#define FIELDNAME_WIDTH 100 -#define FIELDTYPE_WIDTH 150 -#define FIELDDESCR_WIDTH 300 +#define FIELDNAME_WIDTH 100 +#define FIELDTYPE_WIDTH 150 +#define FIELDDESCR_WIDTH 300 // Maximale Eingabelaenge im Beschreibungsfeld -#define MAX_DESCR_LEN 256 +#define MAX_DESCR_LEN 256 -#define CONTROL_SPACING_X 18 // 6 -#define CONTROL_SPACING_Y 5 -#define CONTROL_HEIGHT 20 -#define CONTROL_WIDTH_1 140 // 100 -#define CONTROL_WIDTH_2 100 // 60 -#define CONTROL_WIDTH_3 250 -#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) +#define CONTROL_SPACING_X 18 // 6 +#define CONTROL_SPACING_Y 5 +#define CONTROL_HEIGHT 20 +#define CONTROL_WIDTH_1 140 // 100 +#define CONTROL_WIDTH_2 100 // 60 +#define CONTROL_WIDTH_3 250 +#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) //================================================================== @@ -242,13 +242,13 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead ) ////////////////////////////////////////////////////////////////////// // ::com::sun::star::beans::Property Controls disablen -// if (pDescrWin) -// pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly()); +// if (pDescrWin) +// pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly()); ////////////////////////////////////////////////////////////////////// // Cursor des Browsers anpassen BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | - BROWSER_HLINESFULL | BROWSER_VLINESFULL|BROWSER_AUTOSIZE_LASTCOL); + BROWSER_HLINESFULL | BROWSER_VLINESFULL|BROWSER_AUTOSIZE_LASTCOL); if( !bReadOnly ) nMode |= BROWSER_HIDECURSOR; SetMode(nMode); @@ -274,7 +274,7 @@ void OTableEditorCtrl::InitCellController() nMaxTextLen = ((xub_StrLen)xMetaData.is() ? static_cast<xub_StrLen>(xMetaData->getMaxColumnNameLength()) : 0); if( nMaxTextLen == 0 ) - nMaxTextLen = EDIT_NOLIMIT; + nMaxTextLen = EDIT_NOLIMIT; sExtraNameChars = xMetaData.is() ? xMetaData->getExtraNameCharacters() : ::rtl::OUString(); } @@ -402,8 +402,8 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, if (rDev.IsClipRegion()) rDev.SetClipRegion(); -// rDev.DrawText(rRect.TopLeft(), aText); -// rDev.SetClipRegion( ); +// rDev.DrawText(rRect.TopLeft(), aText); +// rDev.SetClipRegion( ); } //------------------------------------------------------------------------------ @@ -413,8 +413,8 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) ////////////////////////////////////////////////////////////////////// // Wenn EditorCtrl ReadOnly ist, darf nicht editiert werden Reference<XPropertySet> xTable = GetView()->getController().getTable(); - if (IsReadOnly() || ( xTable.is() && - xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && + if (IsReadOnly() || ( xTable.is() && + xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) return NULL; @@ -436,12 +436,12 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) case HELP_TEXT: if (pActFieldDescr && (pActFieldDescr->GetName().getLength() != 0)) return new EditCellController( pHelpTextCell ); - else + else return NULL; case COLUMN_DESCRIPTION: if (pActFieldDescr && (pActFieldDescr->GetName().getLength() != 0)) return new EditCellController( pDescrCell ); - else + else return NULL; default: return NULL; @@ -474,7 +474,7 @@ void OTableEditorCtrl::InitController(CellControllerRef&, long nRow, sal_uInt16 pTypeCell->Clear(); if( !pActFieldDescr ) break; - + const OTypeInfoMap* pTypeInfo = GetView()->getController().getTypeInfo(); OTypeInfoMap::const_iterator aIter = pTypeInfo->begin(); OTypeInfoMap::const_iterator aEnd = pTypeInfo->end(); @@ -660,7 +660,7 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId) pHelpTextCell->SetText(String()); pHelpTextCell->ClearModifyFlag(); } - else + else pActFieldDescr->SetHelpText( pHelpTextCell->GetText() ); break; } @@ -832,7 +832,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) GetUndoManager()->AddUndoAction(new OTableEditorTypeSelUndoAct(this, GetCurRow(), nColId, GetFieldDescr(GetCurRow())->getTypeInfo())); resetType(); } - + SaveData(nRow,nColId); // SaveData could create a undo action as well GetUndoManager()->LeaveListAction(); @@ -840,7 +840,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) CellControllerRef xController(Controller()); if(xController.Is()) xController->SetModified(); - + ////////////////////////////////////////////////////////////////////// // Das ModifyFlag setzen GetView()->getController().setModified( sal_True ); @@ -1011,7 +1011,7 @@ void OTableEditorCtrl::DeleteRows() ////////////////////////////////////////////////////////////////////// // Undo-Action erzeugen GetUndoManager()->AddUndoAction( new OTableEditorDelUndoAct(this) ); - + ////////////////////////////////////////////////////////////////////// // Alle markierten Zeilen loeschen @@ -1151,7 +1151,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s OFieldDescription* pFieldDescr = GetFieldDescr( nRow ); if( !pFieldDescr && nColId != FIELD_TYPE) return; - + String sValue; ////////////////////////////////////////////////////////////////////// // Einzelne Felder setzen @@ -1191,7 +1191,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s break; case FIELD_PROPERTY_NUMTYPE: - // pFieldDescr->SetNumType( _rNewData ); + // pFieldDescr->SetNumType( _rNewData ); OSL_ENSURE(sal_False, "OTableEditorCtrl::SetCellData: invalid column!"); break; @@ -1276,7 +1276,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) case FIELD_PROPERTY_NUMTYPE: OSL_ENSURE(sal_False, "OTableEditorCtrl::GetCellData: invalid column!"); - // return pFieldDescr->GetNumType(); + // return pFieldDescr->GetNumType(); case FIELD_PROPERTY_AUTOINC: sValue = pFieldDescr->IsAutoIncrement() ? strYes : strNo; @@ -1335,7 +1335,7 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow ) sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); - sal_Bool bIsCutAllowed = (GetView()->getController().isAddAllowed() && GetView()->getController().isDropAllowed()) || + sal_Bool bIsCutAllowed = (GetView()->getController().isAddAllowed() && GetView()->getController().isDropAllowed()) || GetView()->getController().isAlterAllowed(); if(bIsCutAllowed) @@ -1357,14 +1357,14 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow ) default: bIsCutAllowed = sal_False; break; - } + } } -// Reference<XPropertySet> xTable = GetView()->getController().getTable(); -// if( !IsCopyAllowed(nRow) || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) -// return sal_False; +// Reference<XPropertySet> xTable = GetView()->getController().getTable(); +// if( !IsCopyAllowed(nRow) || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) +// return sal_False; - // return bCutAllowed && IsDeleteAllowed( nRow ); + // return bCutAllowed && IsDeleteAllowed( nRow ); return bIsCutAllowed; } @@ -1400,7 +1400,7 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ ) bIsCopyAllowed = sal_True; } - + return bIsCopyAllowed; } @@ -1597,7 +1597,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) Point aMenuPos( rEvt.GetMousePosPixel() ); if (!rEvt.IsMouseEvent()) { - if ( 1 == GetSelectColumnCount() ) + if ( 1 == GetSelectColumnCount() ) { sal_uInt16 nSelId = GetColumnId( sal::static_int_cast< USHORT >( @@ -1606,7 +1606,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) aMenuPos = aColRect.TopCenter(); } - else if ( GetSelectRowCount() > 0 ) + else if ( GetSelectRowCount() > 0 ) { ::Rectangle aColRect( GetFieldRectPixel( FirstSelectedRow(), HANDLE_ID, sal_True ) ); @@ -1629,9 +1629,9 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) if ( HANDLE_ID != nColId ) { if ( nRow < 0 && nColId != BROWSER_INVALIDID ) - { // hit the header + { // hit the header if ( 3 != nColId ) - { // 3 would mean the last column, and this last column is auto-sized + { // 3 would mean the last column, and this last column is auto-sized if ( !IsColumnSelected( nColId ) ) SelectColumnId( nColId ); @@ -1724,16 +1724,16 @@ IMPL_LINK( OTableEditorCtrl, DelayedPaste, void*, /*EMPTYTAG*/ ) nPastePosition = GetSelectRowCount() ? FirstSelectedRow() : GetCurRow(); if (!IsInsertNewAllowed(nPastePosition)) - { // kein Einfuegen erlaubt, sondern nur anhaengen, also testen, ob hinter der PastePosition noch + { // kein Einfuegen erlaubt, sondern nur anhaengen, also testen, ob hinter der PastePosition noch // belegte Zeilen erscheinen - sal_Int32 nFreeFromPos; // ab da nur freie Zeilen + sal_Int32 nFreeFromPos; // ab da nur freie Zeilen ::std::vector< ::boost::shared_ptr<OTableRow> >::reverse_iterator aIter = m_pRowList->rbegin(); for(nFreeFromPos = m_pRowList->size(); aIter != m_pRowList->rend() && (!(*aIter) || !(*aIter)->GetActFieldDescr() || !(*aIter)->GetActFieldDescr()->GetName().getLength()); --nFreeFromPos, ++aIter) ; - if (nPastePosition < nFreeFromPos) // es gibt mindestens eine belegte hinter PastePosition -> ganz nach hinten + if (nPastePosition < nFreeFromPos) // es gibt mindestens eine belegte hinter PastePosition -> ganz nach hinten nPastePosition = nFreeFromPos; } @@ -1768,7 +1768,7 @@ IMPL_LINK( OTableEditorCtrl, DelayedInsNewRows, void*, /*EMPTYTAG*/ ) return 0; } // ----------------------------------------------------------------------------- -void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc, +void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc, MultiSelection& _rMultiSel, sal_Int32 _nPos, sal_Bool _bSet, @@ -1954,7 +1954,7 @@ long OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt ) else m_eChildFocus = ROW; } - + return OTableRowView::PreNotify(rNEvt); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 1d154ee5be0d..69d611c4ddad 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,25 +52,25 @@ namespace dbaui NONE }; - ::std::vector< ::boost::shared_ptr<OTableRow> > m_aUndoList; - ::std::vector< ::boost::shared_ptr<OTableRow> >* m_pRowList; - - OSQLNameEdit* pNameCell; - ::svt::ListBoxControl* pTypeCell; - Edit* pHelpTextCell; - Edit* pDescrCell; - OTableFieldDescWin* pDescrWin; // properties of one column + ::std::vector< ::boost::shared_ptr<OTableRow> > m_aUndoList; + ::std::vector< ::boost::shared_ptr<OTableRow> >* m_pRowList; + OSQLNameEdit* pNameCell; + ::svt::ListBoxControl* pTypeCell; + Edit* pHelpTextCell; + Edit* pDescrCell; + OTableFieldDescWin* pDescrWin; // properties of one column + ::boost::shared_ptr<OTableRow> pActRow; - ULONG nIndexEvent; - ULONG nCutEvent; - ULONG nPasteEvent; - ULONG nDeleteEvent; - ULONG nInsNewRowsEvent; - ULONG nInvalidateTypeEvent; - ULONG nEntryNotFoundEvent; - ChildFocusState m_eChildFocus; + ULONG nIndexEvent; + ULONG nCutEvent; + ULONG nPasteEvent; + ULONG nDeleteEvent; + ULONG nInsNewRowsEvent; + ULONG nInvalidateTypeEvent; + ULONG nEntryNotFoundEvent; + ChildFocusState m_eChildFocus; long nOldDataPos; @@ -81,7 +81,7 @@ namespace dbaui class ClipboardInvalidator { private: - AutoTimer m_aInvalidateTimer; + AutoTimer m_aInvalidateTimer; OTableEditorCtrl* m_pOwner; public: @@ -93,7 +93,7 @@ namespace dbaui }; friend class OTableEditorCtrl::ClipboardInvalidator; - ClipboardInvalidator m_aInvalidate; + ClipboardInvalidator m_aInvalidate; protected: virtual void Command( const CommandEvent& rEvt ); @@ -108,7 +108,7 @@ namespace dbaui virtual void InitController(::svt::CellControllerRef& rController, long nRow, USHORT nCol); virtual void CellModified(); - virtual BOOL SaveModified(); // wird aufgerufen vor einem Zellenwechsel + virtual BOOL SaveModified(); // wird aufgerufen vor einem Zellenwechsel // return FALSE, verhindert Zellenwechsel virtual void Undo(); virtual void Redo(); @@ -124,26 +124,26 @@ namespace dbaui virtual sal_Bool IsInsertNewAllowed( long nRow ); virtual sal_Bool IsDeleteAllowed( long nRow ); - void ClearModified(); + void ClearModified(); - void SetPrimaryKey( BOOL bSet ); - BOOL IsPrimaryKey(); + void SetPrimaryKey( BOOL bSet ); + BOOL IsPrimaryKey(); DECL_LINK(ControlPreNotifyHdl, NotifyEvent*); public: - // TYPEINFO(); + // TYPEINFO(); OTableEditorCtrl(Window* pParentWin); - virtual ~OTableEditorCtrl(); - virtual BOOL CursorMoving(long nNewRow, USHORT nNewCol); - virtual void UpdateAll(); + virtual ~OTableEditorCtrl(); + virtual BOOL CursorMoving(long nNewRow, USHORT nNewCol); + virtual void UpdateAll(); SfxUndoManager* GetUndoManager() const; + + void SetDescrWin( OTableFieldDescWin* pWin ){ pDescrWin = pWin; if (pDescrWin && pActRow) pDescrWin->DisplayData(pActRow->GetActFieldDescr()); } + BOOL SaveCurRow(); + void SwitchType( const TOTypeInfoSP& _pType ); - void SetDescrWin( OTableFieldDescWin* pWin ){ pDescrWin = pWin; if (pDescrWin && pActRow) pDescrWin->DisplayData(pActRow->GetActFieldDescr()); } - BOOL SaveCurRow(); - void SwitchType( const TOTypeInfoSP& _pType ); - - void DisplayData( long nRow, BOOL bGrabFocus = TRUE ); + void DisplayData( long nRow, BOOL bGrabFocus = TRUE ); // erzwingt das Anzeigen der genannten Zeile (selbst wenn es eigentlich schon die aktuelle ist) virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ); @@ -158,7 +158,7 @@ namespace dbaui ::boost::shared_ptr<OTableRow> GetActRow(){ return pActRow; } void CellModified( long nRow, sal_uInt16 nColId ); - void SetReadOnly( BOOL bRead=TRUE ); + void SetReadOnly( BOOL bRead=TRUE ); virtual void Init(); virtual void DeactivateCell(sal_Bool bUpdate = sal_True); @@ -170,7 +170,7 @@ namespace dbaui OFieldDescription* GetFieldDescr( long nRow ); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); // IClipboardTest virtual sal_Bool isCutAllowed() { return IsCutAllowed(); } @@ -194,16 +194,16 @@ namespace dbaui INT32 HasFieldName( const String& rFieldName ); String GenerateName( const String& rName ); BOOL SetDataPtr( long nRow ); - + BOOL SaveData(long nRow, USHORT nColumnId); /** AdjustFieldDescription set the needed values for the description - @param _pFieldDesc the field description where to set the values - @param _rMultiSel contains the postions which changed for undo/redo - @param _nPos the current position - @param _bSet should a key be set - @param _bPrimaryKey which value should the pkey have + @param _pFieldDesc the field description where to set the values + @param _rMultiSel contains the postions which changed for undo/redo + @param _nPos the current position + @param _bSet should a key be set + @param _bPrimaryKey which value should the pkey have */ - void AdjustFieldDescription( OFieldDescription* _pFieldDesc, + void AdjustFieldDescription( OFieldDescription* _pFieldDesc, MultiSelection& _rMultiSel, sal_Int32 _nPos, sal_Bool _bSet, diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 3336906c21aa..702d2c677b02 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include "TableRow.hxx" #include "TypeInfo.hxx" #include "UITools.hxx" -#include "browserids.hxx" +#include "browserids.hxx" #include "dbu_reghelper.hxx" #include "dbu_tbl.hrc" #include "dbustrings.hrc" @@ -110,7 +110,7 @@ using namespace ::dbaui; using namespace ::comphelper; // Anzahl Spalten beim Neuanlegen -#define NEWCOLS 128 +#define NEWCOLS 128 namespace { @@ -127,7 +127,7 @@ namespace //------------------------------------------------------------------------------ struct OTableRowCompare : public ::std::binary_function< ::boost::shared_ptr<OTableRow> , ::rtl::OUString, bool> { - bool operator() (const ::boost::shared_ptr<OTableRow> lhs, const ::rtl::OUString& rhs) const + bool operator() (const ::boost::shared_ptr<OTableRow> lhs, const ::rtl::OUString& rhs) const { OFieldDescription* pField = lhs->GetActFieldDescr(); return pField && pField->GetName() == rhs; @@ -245,7 +245,7 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = aIter != m_vRowList.end(); } break; - + case ID_BROWSER_CUT: aReturn.bEnabled = isEditable() && m_aCurrentFrame.isActive() && getView() && static_cast<OTableDesignView*>(getView())->isCutAllowed(); break; @@ -257,10 +257,10 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const break; case SID_INDEXDESIGN: aReturn.bEnabled = - ( ( ((!m_bNew && impl_isModified()) || impl_isModified()) - || Reference< XIndexesSupplier >(m_xTable, UNO_QUERY).is() + ( ( ((!m_bNew && impl_isModified()) || impl_isModified()) + || Reference< XIndexesSupplier >(m_xTable, UNO_QUERY).is() ) - && isConnected() + && isConnected() ); if ( aReturn.bEnabled ) { @@ -360,7 +360,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) m_sName = aDlg.getName(); sCatalog = aDlg.getCatalog(); - sSchema = aDlg.getSchema(); + sSchema = aDlg.getSchema(); } // did we get a name @@ -414,10 +414,10 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) assignTable(); if(!m_xTable.is()) // correct name and try again - { + { // it can be that someone inserted new data for us m_sName = ::dbtools::composeTableName( getConnection()->getMetaData(), xTable, ::dbtools::eInDataManipulation, false, false, false ); - assignTable(); + assignTable(); } // now check if our datasource has set a tablefilter and if append the new table name to it ::dbaui::appendToFilter(getConnection(),m_sName,getORB(),getView()); // we are not interessted in the return value @@ -436,17 +436,17 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) } reSyncRows(); } - catch(const SQLContext& e) - { - aInfo = SQLExceptionInfo(e); + catch(const SQLContext& e) + { + aInfo = SQLExceptionInfo(e); } catch(const SQLWarning& e) - { - aInfo = SQLExceptionInfo(e); + { + aInfo = SQLExceptionInfo(e); } catch(const SQLException& e) - { - aInfo = SQLExceptionInfo(e); + { + aInfo = SQLExceptionInfo(e); } catch(const ElementExistException& ) { @@ -475,7 +475,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) stopTableListening(); m_xTable = NULL; } - // reload(); // a error occured so we have to reload + // reload(); // a error occured so we have to reload } return ! (aInfo.isValid() || bError); } @@ -496,8 +496,8 @@ void OTableController::doEditIndexes() OSL_ENSURE(!m_bNew && !isModified(), "OTableController::doEditIndexes: what the hell did doSaveDoc do?"); } - Reference< XNameAccess > xIndexes; // will be the keys of the table - Sequence< ::rtl::OUString > aFieldNames; // will be the column names of the table + Reference< XNameAccess > xIndexes; // will be the keys of the table + Sequence< ::rtl::OUString > aFieldNames; // will be the column names of the table try { // get the keys @@ -555,10 +555,10 @@ void OTableController::impl_initialize() { DBG_UNHANDLED_EXCEPTION(); } - + try { - ::dbaui::fillTypeInfo(getConnection(),m_sTypeNames,m_aTypeInfo,m_aTypeInfoIndex); // fill the needed type information + ::dbaui::fillTypeInfo(getConnection(),m_sTypeNames,m_aTypeInfo,m_aTypeInfoIndex); // fill the needed type information } catch(const SQLException&) { @@ -567,10 +567,10 @@ void OTableController::impl_initialize() } try { - loadData(); // fill the column information form the table - getView()->initialize(); // show the windows and fill with our informations - getUndoMgr()->Clear(); // clear all undo redo things - setModified(sal_False); // and we are not modified yet + loadData(); // fill the column information form the table + getView()->initialize(); // show the windows and fill with our informations + getUndoMgr()->Clear(); // clear all undo redo things + setModified(sal_False); // and we are not modified yet } catch( const Exception& ) { @@ -582,8 +582,8 @@ sal_Bool OTableController::Construct(Window* pParent) { setView( * new OTableDesignView( pParent, getORB(), *this ) ); OTableController_BASE::Construct(pParent); -// m_pView->Construct(); -// m_pView->Show(); +// m_pView->Construct(); +// m_pView->Show(); return sal_True; } // ----------------------------------------------------------------------------- @@ -681,10 +681,10 @@ void OTableController::impl_onModifyChanged() void SAL_CALL OTableController::disposing( const EventObject& _rSource ) throw(RuntimeException) { if ( _rSource.Source == m_xTable ) - { // some deleted our table so we have a new one + { // some deleted our table so we have a new one stopTableListening(); - m_xTable = NULL; - m_bNew = sal_True; + m_xTable = NULL; + m_bNew = sal_True; setModified(sal_True); } else @@ -716,18 +716,18 @@ void OTableController::losingConnection( ) xComponent->removeEventListener(xEvtL); } stopTableListening(); - m_xTable = NULL; + m_xTable = NULL; assignTable(); if(!m_xTable.is()) { - m_bNew = sal_True; + m_bNew = sal_True; setModified(sal_True); } InvalidateAll(); } // ----------------------------------------------------------------------------- -TOTypeInfoSP OTableController::getTypeInfoByType(sal_Int32 _nDataType) const -{ +TOTypeInfoSP OTableController::getTypeInfoByType(sal_Int32 _nDataType) const +{ return queryTypeInfoByType(_nDataType,m_aTypeInfo); } // ----------------------------------------------------------------------------- @@ -754,7 +754,7 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_ OFieldDescription* pField = (*aIter)->GetActFieldDescr(); if ( !pField || (!_bNew && (*aIter)->IsReadOnly() && !_bKeyColumns) ) continue; - + Reference<XPropertySet> xColumn; if(pField->IsPrimaryKey() || !_bKeyColumns) xColumn = xColumnFactory->createDataDescriptor(); @@ -778,7 +778,7 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_ { OSL_ENSURE(sal_False, "OTableController::appendColumns: invalid field name!"); } - + } } } @@ -854,47 +854,47 @@ void OTableController::loadData() // Bei Drop darf keine Zeile editierbar sein. // Bei Add duerfen nur die leeren Zeilen editierbar sein. // Bei Add und Drop koennen alle Zeilen editiert werden. - // sal_Bool bReadOldRow = xMetaData->supportsAlterTableWithAddColumn() && xMetaData->supportsAlterTableWithDropColumn(); + // sal_Bool bReadOldRow = xMetaData->supportsAlterTableWithAddColumn() && xMetaData->supportsAlterTableWithDropColumn(); sal_Bool bIsAlterAllowed = isAlterAllowed(); Sequence< ::rtl::OUString> aColumns = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aColumns.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); + const ::rtl::OUString* pIter = aColumns.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xColumn; xColumns->getByName(*pIter) >>= xColumn; - sal_Int32 nType = 0; - sal_Int32 nScale = 0; - sal_Int32 nPrecision = 0; - sal_Int32 nNullable = 0; - sal_Int32 nFormatKey = 0; - sal_Int32 nAlign = 0; + sal_Int32 nType = 0; + sal_Int32 nScale = 0; + sal_Int32 nPrecision = 0; + sal_Int32 nNullable = 0; + sal_Int32 nFormatKey = 0; + sal_Int32 nAlign = 0; sal_Bool bIsAutoIncrement = false, bIsCurrency = false; ::rtl::OUString sName,sDescription,sTypeName,sHelpText; Any aControlDefault; // get the properties from the column - xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; - xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; - xColumn->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullable; - xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bIsAutoIncrement; - xColumn->getPropertyValue(PROPERTY_ISCURRENCY) >>= bIsCurrency; - xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; - xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; - xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; - xColumn->getPropertyValue(PROPERTY_DESCRIPTION) >>= sDescription; + xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; + xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; + xColumn->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullable; + xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bIsAutoIncrement; + xColumn->getPropertyValue(PROPERTY_ISCURRENCY) >>= bIsCurrency; + xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; + xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; + xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; + xColumn->getPropertyValue(PROPERTY_DESCRIPTION) >>= sDescription; if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_HELPTEXT)) - xColumn->getPropertyValue(PROPERTY_HELPTEXT) >>= sHelpText; - + xColumn->getPropertyValue(PROPERTY_HELPTEXT) >>= sHelpText; + if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_CONTROLDEFAULT)) aControlDefault = xColumn->getPropertyValue(PROPERTY_CONTROLDEFAULT); if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_FORMATKEY)) - xColumn->getPropertyValue(PROPERTY_FORMATKEY) >>= nFormatKey; + xColumn->getPropertyValue(PROPERTY_FORMATKEY) >>= nFormatKey; if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_ALIGN)) - xColumn->getPropertyValue(PROPERTY_ALIGN) >>= nAlign; + xColumn->getPropertyValue(PROPERTY_ALIGN) >>= nAlign; pTabEdRow.reset(new OTableRow()); pTabEdRow->SetReadOnly(!bIsAlterAllowed); @@ -912,7 +912,7 @@ void OTableController::loadData() { pActFieldDescr->SetName(sName); pActFieldDescr->SetFormatKey(nFormatKey); - // pActFieldDescr->SetPrimaryKey(pPrimary->GetValue()); + // pActFieldDescr->SetPrimaryKey(pPrimary->GetValue()); pActFieldDescr->SetDescription(sDescription); pActFieldDescr->SetHelpText(sHelpText); pActFieldDescr->SetAutoIncrement(bIsAutoIncrement); @@ -929,12 +929,12 @@ void OTableController::loadData() m_vRowList.push_back( pTabEdRow); } // fill the primary key information - Reference<XNameAccess> xKeyColumns = getKeyColumns(); + Reference<XNameAccess> xKeyColumns = getKeyColumns(); if(xKeyColumns.is()) { Sequence< ::rtl::OUString> aKeyColumns = xKeyColumns->getElementNames(); - const ::rtl::OUString* pKeyBegin = aKeyColumns.getConstArray(); - const ::rtl::OUString* pKeyEnd = pKeyBegin + aKeyColumns.getLength(); + const ::rtl::OUString* pKeyBegin = aKeyColumns.getConstArray(); + const ::rtl::OUString* pKeyEnd = pKeyBegin + aKeyColumns.getLength(); for(;pKeyBegin != pKeyEnd;++pKeyBegin) { @@ -951,7 +951,7 @@ void OTableController::loadData() } } } - + ////////////////////////////////////////////////////////////////////// // Leere Zeilen fuellen @@ -1053,11 +1053,11 @@ void OTableController::alterColumns() OSL_ENSURE(xColumns.is(),"No columns"); if ( !xColumns.is() ) return; - Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY); // can be null + Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY); // can be null sal_Int32 nColumnCount = xIdxColumns->getCount(); - Reference<XDrop> xDrop(xColumns,UNO_QUERY); // can be null - Reference<XAppend> xAppend(xColumns,UNO_QUERY); // can be null + Reference<XDrop> xDrop(xColumns,UNO_QUERY); // can be null + Reference<XAppend> xAppend(xColumns,UNO_QUERY); // can be null Reference<XDataDescriptorFactory> xColumnFactory(xColumns,UNO_QUERY); // can be null sal_Bool bReload = sal_False; // refresh the data @@ -1081,24 +1081,24 @@ void OTableController::alterColumns() aColumns[pField->GetName()] = sal_True; continue; } - + Reference<XPropertySet> xColumn; if ( xColumns->hasByName(pField->GetName()) ) { aColumns[pField->GetName()] = sal_True; xColumns->getByName(pField->GetName()) >>= xColumn; OSL_ENSURE(xColumn.is(),"Column is null!"); - + sal_Int32 nType=0,nPrecision=0,nScale=0,nNullable=0; sal_Bool bAutoIncrement = false; ::rtl::OUString sTypeName,sDescription; - xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; - xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; - xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; - xColumn->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullable; + xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; + xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; + xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; + xColumn->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullable; xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement; - xColumn->getPropertyValue(PROPERTY_DESCRIPTION) >>= sDescription; + xColumn->getPropertyValue(PROPERTY_DESCRIPTION) >>= sDescription; try { xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; } catch( const Exception& ) @@ -1110,15 +1110,15 @@ void OTableController::alterColumns() // Normally, sdbcx::Column objects are expected to have a TypeName property } - // xColumn->getPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(pField->IsCurrency())); + // xColumn->getPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(pField->IsCurrency())); // check if something changed - if((nType != pField->GetType() || + if((nType != pField->GetType() || sTypeName != pField->GetTypeName() || - (nPrecision != pField->GetPrecision() && nPrecision ) || - nScale != pField->GetScale() || - nNullable != pField->GetIsNullable() || - sDescription != pField->GetDescription() || - bAutoIncrement != pField->IsAutoIncrement())&& + (nPrecision != pField->GetPrecision() && nPrecision ) || + nScale != pField->GetScale() || + nNullable != pField->GetIsNullable() || + sDescription != pField->GetDescription() || + bAutoIncrement != pField->IsAutoIncrement())&& xColumnFactory.is()) { Reference<XPropertySet> xNewColumn; @@ -1167,8 +1167,8 @@ void OTableController::alterColumns() xColumns->getByName(pField->GetName()) >>= xColumn; bReload = sal_True; } - - + + } else if(xColumnFactory.is() && xAlter.is() && nPos < nColumnCount) { // we can't find the column so we could try it with the index before we drop and append a new column @@ -1179,7 +1179,7 @@ void OTableController::alterColumns() ::dbaui::setColumnProperties(xNewColumn,pField); xAlter->alterColumnByIndex(nPos,xNewColumn); if(xColumns->hasByName(pField->GetName())) - { // ask for the append by name + { // ask for the append by name aColumns[pField->GetName()] = sal_True; xColumns->getByName(pField->GetName()) >>= xColumn; if(xColumn.is()) @@ -1217,7 +1217,7 @@ void OTableController::alterColumns() } // for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos) // alter column settings aIter = m_vRowList.begin(); - + // first look for columns where something other than the name changed for(nPos = 0;aIter != aEnd;++aIter,++nPos) { @@ -1230,7 +1230,7 @@ void OTableController::alterColumns() aColumns[pField->GetName()] = sal_True; continue; } - + Reference<XPropertySet> xColumn; if ( xColumns->hasByName(pField->GetName()) ) { @@ -1238,7 +1238,7 @@ void OTableController::alterColumns() Reference<XPropertySetInfo> xInfo = xColumn->getPropertySetInfo(); if ( xInfo->hasPropertyByName(PROPERTY_HELPTEXT) ) xColumn->setPropertyValue(PROPERTY_HELPTEXT,makeAny(pField->GetHelpText())); - + if(xInfo->hasPropertyByName(PROPERTY_CONTROLDEFAULT)) xColumn->setPropertyValue(PROPERTY_CONTROLDEFAULT,pField->GetControlDefault()); if(xInfo->hasPropertyByName(PROPERTY_FORMATKEY)) @@ -1248,7 +1248,7 @@ void OTableController::alterColumns() } // if ( xColumns->hasByName(pField->GetName()) ) } // second drop all columns which could be found by name - Reference<XNameAccess> xKeyColumns = getKeyColumns(); + Reference<XNameAccess> xKeyColumns = getKeyColumns(); // now we have to look for the columns who could be deleted if ( xDrop.is() ) { @@ -1315,7 +1315,7 @@ void OTableController::alterColumns() ::dbaui::setColumnProperties(xColumn,pField); xAppend->appendByDescriptor(xColumn); if(xColumns->hasByName(pField->GetName())) - { // ask for the append by name + { // ask for the append by name aColumns[pField->GetName()] = sal_True; xColumns->getByName(pField->GetName()) >>= xColumn; if(xColumn.is()) @@ -1329,7 +1329,7 @@ void OTableController::alterColumns() } } - + // check if we have to do something with the primary key sal_Bool bNeedDropKey = sal_False; sal_Bool bNeedAppendKey = sal_False; @@ -1342,25 +1342,25 @@ void OTableController::alterColumns() OFieldDescription* pField = (*aIter)->GetActFieldDescr(); if ( !pField ) continue; - - if ( pField->IsPrimaryKey() - && !xKeyColumns->hasByName( pField->GetName() ) + + if ( pField->IsPrimaryKey() + && !xKeyColumns->hasByName( pField->GetName() ) ) - { // new primary key column inserted which isn't already in the columns selection + { // new primary key column inserted which isn't already in the columns selection bNeedDropKey = bNeedAppendKey = sal_True; break; } - else if ( !pField->IsPrimaryKey() - && xKeyColumns->hasByName( pField->GetName() ) + else if ( !pField->IsPrimaryKey() + && xKeyColumns->hasByName( pField->GetName() ) ) - { // found a column which currently is in the primary key, but is marked not to be anymore + { // found a column which currently is in the primary key, but is marked not to be anymore bNeedDropKey = bNeedAppendKey = sal_True; break; } } } else - { // no primary key available so we check if we should create one + { // no primary key available so we check if we should create one bNeedAppendKey = sal_True; } @@ -1406,17 +1406,17 @@ void OTableController::dropPrimaryKey() } } } - catch(const SQLContext& e) - { - aInfo = SQLExceptionInfo(e); + catch(const SQLContext& e) + { + aInfo = SQLExceptionInfo(e); } catch(const SQLWarning& e) - { - aInfo = SQLExceptionInfo(e); + { + aInfo = SQLExceptionInfo(e); } catch(const SQLException& e) - { - aInfo = SQLExceptionInfo(e); + { + aInfo = SQLExceptionInfo(e); } catch( const Exception& ) { @@ -1426,7 +1426,7 @@ void OTableController::dropPrimaryKey() showError(aInfo); } // ----------------------------------------------------------------------------- -void OTableController::assignTable() +void OTableController::assignTable() { ::rtl::OUString sComposedName; // get the table @@ -1440,7 +1440,7 @@ void OTableController::assignTable() OSL_ENSURE(xNameAccess.is(),"no nameaccess for the queries!"); Reference<XPropertySet> xProp; - if(xNameAccess->hasByName(m_sName) && ::cppu::extractInterface(xProp,xNameAccess->getByName(m_sName)) && xProp.is()) + if(xNameAccess->hasByName(m_sName) && ::cppu::extractInterface(xProp,xNameAccess->getByName(m_sName)) && xProp.is()) { m_xTable = xProp; startTableListening(); @@ -1456,7 +1456,7 @@ void OTableController::assignTable() // be notified when the table is in disposing InvalidateAll(); } - } + } } //updateTitle(); } @@ -1506,8 +1506,8 @@ sal_Bool OTableController::isAlterAllowed() const // ----------------------------------------------------------------------------- void OTableController::reSyncRows() { - sal_Bool bAlterAllowed = isAlterAllowed(); - sal_Bool bAddAllowed = isAddAllowed(); + sal_Bool bAlterAllowed = isAlterAllowed(); + sal_Bool bAddAllowed = isAddAllowed(); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end(); for(;aIter != aEnd;++aIter) @@ -1518,12 +1518,12 @@ void OTableController::reSyncRows() (*aIter)->SetReadOnly(!bAlterAllowed); else (*aIter)->SetReadOnly(!bAddAllowed); - + } - static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our informations + static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our informations - getUndoMgr()->Clear(); // clear all undo redo things - setModified(sal_False); // and we are not modified yet + getUndoMgr()->Clear(); // clear all undo redo things + setModified(sal_False); // and we are not modified yet } // ----------------------------------------------------------------------------- ::rtl::OUString OTableController::createUniqueName(const ::rtl::OUString& _rName) @@ -1551,7 +1551,7 @@ void OTableController::reSyncRows() { ::rtl::OUString sTitle; try - { + { // get the table if ( m_sName.getLength() && getConnection().is() ) { @@ -1576,10 +1576,10 @@ void OTableController::reSyncRows() // ----------------------------------------------------------------------------- void OTableController::reload() { - loadData(); // fill the column information form the table - static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our informations - getUndoMgr()->Clear(); // clear all undo redo things - setModified(sal_False); // and we are not modified yet + loadData(); // fill the column information form the table + static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our informations + getUndoMgr()->Clear(); // clear all undo redo things + setModified(sal_False); // and we are not modified yet static_cast<OTableDesignView*>(getView())->Invalidate(); } // ----------------------------------------------------------------------------- @@ -1602,7 +1602,7 @@ sal_Int32 OTableController::getFirstEmptyRowPosition() ::boost::shared_ptr<OTableRow> pTabEdRow(new OTableRow()); pTabEdRow->SetReadOnly(bReadRow); nRet = m_vRowList.size(); - m_vRowList.push_back( pTabEdRow); + m_vRowList.push_back( pTabEdRow); } return nRet; } diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 97de4f457d62..826f65c032b2 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,8 +75,8 @@ void OTableRowView::Init() { EditBrowseBox::Init(); -// SetMapMode( MapMode(MAP_TWIP) ); -// GetDataWindow().SetMapMode( GetMapMode() ); +// SetMapMode( MapMode(MAP_TWIP) ); +// GetDataWindow().SetMapMode( GetMapMode() ); Font aFont( GetDataWindow().GetFont() ); aFont.SetWeight( WEIGHT_NORMAL ); @@ -103,7 +103,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt ) { if (IsDeleteAllowed(0)) { - if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows + if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows !rEvt.GetKeyCode().IsShift() && !rEvt.GetKeyCode().IsMod1()) { diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 7279c1ec1fca..8b44d4e8fe13 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include "dbaccess_helpid.hrc" #include <memory> using namespace dbaui; -#define STANDARD_MARGIN 6 +#define STANDARD_MARGIN 6 //================================================================== // class OTableDesignHelpBar //================================================================== diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 66b5d8c621f3..e42d31b59595 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD ImplInitSettings( sal_True, sal_True, sal_True ); ////////////////////////////////////////////////////////////////////// // Childs erzeugen - m_pEditorCtrl = new OTableEditorCtrl( this); + m_pEditorCtrl = new OTableEditorCtrl( this); m_pFieldDescWin = new OTableFieldDescWin( this ); m_pFieldDescWin->SetHelpId(HID_TAB_DESIGN_DESCWIN); @@ -80,7 +80,7 @@ OTableBorderWindow::~OTableBorderWindow() { ////////////////////////////////////////////////////////////////////// // Childs zerstoeren - // ::dbaui::notifySystemWindow(this,m_pFieldDescWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); + // ::dbaui::notifySystemWindow(this,m_pFieldDescWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); m_pEditorCtrl->Hide(); m_pFieldDescWin->Hide(); @@ -103,9 +103,9 @@ void OTableBorderWindow::Resize() ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); - long nSplitPos = m_aHorzSplitter.GetSplitPosPixel(); + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); + long nSplitPos = m_aHorzSplitter.GetSplitPosPixel(); ////////////////////////////////////////////////////////////////////// // Verschiebebereich Splitter mittleres Drittel des Outputs @@ -124,7 +124,7 @@ void OTableBorderWindow::Resize() // Fenster setzen m_pEditorCtrl->SetPosSizePixel( Point(0, 0), Size(nOutputWidth , nSplitPos) ); - m_pFieldDescWin->SetPosSizePixel( Point(0, nSplitPos+nSplitterHeight), + m_pFieldDescWin->SetPosSizePixel( Point(0, nSplitPos+nSplitterHeight), Size(nOutputWidth, nOutputHeight-nSplitPos-nSplitterHeight) ); } //------------------------------------------------------------------------------ @@ -148,7 +148,7 @@ void OTableBorderWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, if ( IsControlFont() ) aFont.Merge( GetControlFont() ); SetPointFont( aFont ); -// Set/*Zoomed*/PointFont( aFont ); +// Set/*Zoomed*/PointFont( aFont ); } if ( bFont || bForeground ) @@ -213,7 +213,7 @@ OTableDesignView::OTableDesignView( Window* pParent, } m_pWin = new OTableBorderWindow(this); - m_pWin->Show(); + m_pWin->Show(); } //------------------------------------------------------------------------------ @@ -234,10 +234,10 @@ void OTableDesignView::initialize() GetEditorCtrl()->Init(); GetDescWin()->Init(); // first call after the editctrl has been set - + GetEditorCtrl()->Show(); GetDescWin()->Show(); - + GetEditorCtrl()->DisplayData(0); } //------------------------------------------------------------------------------ @@ -290,7 +290,7 @@ long OTableDesignView::PreNotify( NotifyEvent& rNEvt ) m_eChildFocus = NONE; break; } - + return bHandled ? 1L : ODataView::PreNotify(rNEvt); } // ----------------------------------------------------------------------------- @@ -302,7 +302,7 @@ IClipboardTest* OTableDesignView::getActiveChild() const case DESCRIPTION: pTest = GetDescWin(); break; - case EDITOR: + case EDITOR: pTest = GetEditorCtrl(); break; case NONE: @@ -332,21 +332,21 @@ sal_Bool OTableDesignView::isPasteAllowed() void OTableDesignView::copy() { IClipboardTest* pTest = getActiveChild(); - if ( pTest ) + if ( pTest ) pTest->copy(); } // ----------------------------------------------------------------------------- void OTableDesignView::cut() { IClipboardTest* pTest = getActiveChild(); - if ( pTest ) + if ( pTest ) pTest->cut(); } // ----------------------------------------------------------------------------- void OTableDesignView::paste() { IClipboardTest* pTest = getActiveChild(); - if ( pTest ) + if ( pTest ) pTest->paste(); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 14ef3955eebe..8c3492ef7699 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace dbaui; -OTableFieldControl::OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar) +OTableFieldControl::OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar) { } //------------------------------------------------------------------ @@ -122,7 +122,7 @@ void OTableFieldControl::SetModified(BOOL bModified) return xCon->getMetaData(); } // ----------------------------------------------------------------------------- -Reference< XNumberFormatter > OTableFieldControl::GetFormatter() const +Reference< XNumberFormatter > OTableFieldControl::GetFormatter() const { return GetCtrl()->GetView()->getController().getNumberFormatter(); } @@ -132,7 +132,7 @@ TOTypeInfoSP OTableFieldControl::getTypeInfo(sal_Int32 _nPos) return GetCtrl()->GetView()->getController().getTypeInfo(_nPos); } // ----------------------------------------------------------------------------- -const OTypeInfoMap* OTableFieldControl::getTypeInfo() const +const OTypeInfoMap* OTableFieldControl::getTypeInfo() const { return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController().getTypeInfo(); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index a45d2928889c..d34d77a5fa8b 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,22 +39,22 @@ namespace dbaui //================================================================== class OTableFieldControl : public OFieldDescControl { - OTableEditorCtrl* GetCtrl() const; + OTableEditorCtrl* GetCtrl() const; protected: - virtual void ActivateAggregate( EControlType eType ); - virtual void DeactivateAggregate( EControlType eType ); + virtual void ActivateAggregate( EControlType eType ); + virtual void DeactivateAggregate( EControlType eType ); // Sind von den abgeleiteten Klassen zu impl. - virtual void CellModified(long nRow, USHORT nColId ); - virtual BOOL IsReadOnly(); - virtual void SetModified(BOOL bModified); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; - - virtual ::com::sun::star::lang::Locale GetLocale() const; + virtual void CellModified(long nRow, USHORT nColId ); + virtual BOOL IsReadOnly(); + virtual void SetModified(BOOL bModified); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; + + virtual ::com::sun::star::lang::Locale GetLocale() const; - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); - virtual const OTypeInfoMap* getTypeInfo() const; - virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); + virtual const OTypeInfoMap* getTypeInfo() const; + virtual sal_Bool isAutoIncrementValueEnabled() const; + virtual ::rtl::OUString getAutoIncrementValue() const; public: OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index c6e810353794..d5dab9793443 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,21 +40,21 @@ #include "moduledbu.hxx" #include <memory> -#define STANDARD_MARGIN 6 -#define DETAILS_HEADER_HEIGHT 25 -#define CONTROL_SPACING_X 18 // 6 -#define CONTROL_SPACING_Y 5 -#define CONTROL_HEIGHT 20 -#define CONTROL_WIDTH_1 140 // 100 -#define CONTROL_WIDTH_2 100 // 60 -#define CONTROL_WIDTH_3 250 -#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) -#define DETAILS_OPT_PAGE_WIDTH (CONTROL_WIDTH_1 + CONTROL_SPACING_X + CONTROL_WIDTH_4 + 50) -#define DETAILS_OPT_PAGE_HEIGHT ((CONTROL_HEIGHT + CONTROL_SPACING_Y) * 5) -#define DETAILS_MIN_HELP_WIDTH 100 -#define DETAILS_OPT_HELP_WIDTH 200 -#define DETAILS_MIN_HELP_HEIGHT 50 -#define DETAILS_OPT_HELP_HEIGHT 100 +#define STANDARD_MARGIN 6 +#define DETAILS_HEADER_HEIGHT 25 +#define CONTROL_SPACING_X 18 // 6 +#define CONTROL_SPACING_Y 5 +#define CONTROL_HEIGHT 20 +#define CONTROL_WIDTH_1 140 // 100 +#define CONTROL_WIDTH_2 100 // 60 +#define CONTROL_WIDTH_3 250 +#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) +#define DETAILS_OPT_PAGE_WIDTH (CONTROL_WIDTH_1 + CONTROL_SPACING_X + CONTROL_WIDTH_4 + 50) +#define DETAILS_OPT_PAGE_HEIGHT ((CONTROL_HEIGHT + CONTROL_SPACING_Y) * 5) +#define DETAILS_MIN_HELP_WIDTH 100 +#define DETAILS_OPT_HELP_WIDTH 200 +#define DETAILS_MIN_HELP_HEIGHT 50 +#define DETAILS_OPT_HELP_HEIGHT 100 using namespace dbaui; @@ -69,7 +69,7 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent) DBG_CTOR(OTableFieldDescWin,NULL); ////////////////////////////////////////////////////////////////////// // Header - m_pHeader = new FixedText( this, WB_CENTER | WB_INFO ); // | WB_3DLOOK + m_pHeader = new FixedText( this, WB_CENTER | WB_INFO ); // | WB_3DLOOK m_pHeader->SetText( String(ModuleRes(STR_TAB_PROPERTIES)) ); m_pHeader->Show(); @@ -173,11 +173,11 @@ void OTableFieldDescWin::Resize() // passen beide nebeneinander (Rand + Page + Rand + Help) ? if (STANDARD_MARGIN + DETAILS_OPT_PAGE_WIDTH + STANDARD_MARGIN + DETAILS_MIN_HELP_WIDTH <= nOutputWidth) - { // ja -> dann ist die Frage, ob man der Hilfe ihre Optimal-Breite geben kann + { // ja -> dann ist die Frage, ob man der Hilfe ihre Optimal-Breite geben kann nHelpWidth = DETAILS_OPT_HELP_WIDTH; nPageWidth = nOutputWidth - nHelpWidth - STANDARD_MARGIN - STANDARD_MARGIN; if (nPageWidth < DETAILS_OPT_PAGE_WIDTH) - { // dann doch lieber die Hilfe von ihrer optimalen in Richtung auf die minimale Groesse + { // dann doch lieber die Hilfe von ihrer optimalen in Richtung auf die minimale Groesse long nTransfer = DETAILS_OPT_PAGE_WIDTH - nPageWidth; nPageWidth += nTransfer; nHelpWidth -= nTransfer; @@ -189,26 +189,26 @@ void OTableFieldDescWin::Resize() nPageHeight = nOutputHeight - STANDARD_MARGIN - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN; } else - { // nebeneinander geht nicht, also untereinander (Rand + Header + Page + Help) + { // nebeneinander geht nicht, also untereinander (Rand + Header + Page + Help) if (STANDARD_MARGIN + DETAILS_HEADER_HEIGHT + DETAILS_OPT_PAGE_HEIGHT + DETAILS_MIN_HELP_HEIGHT <= nOutputHeight) - { // es reicht zumindest, um beide untereinander (Page optimal, Help minimal) unterzubringen + { // es reicht zumindest, um beide untereinander (Page optimal, Help minimal) unterzubringen nHelpHeight = DETAILS_OPT_HELP_HEIGHT; nPageHeight = nOutputHeight - nHelpHeight - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN; if (nPageHeight < DETAILS_OPT_PAGE_HEIGHT) - { // wie oben : Page optimal, Hilfe soviel wie eben bleibt (das ist groesser/gleich ihrem Minimum) + { // wie oben : Page optimal, Hilfe soviel wie eben bleibt (das ist groesser/gleich ihrem Minimum) long nTransfer = DETAILS_OPT_PAGE_HEIGHT - nPageHeight; nPageHeight += nTransfer; nHelpHeight -= nTransfer; } nHelpY = nOutputHeight - nHelpHeight; // und ueber die ganze Breite - nHelpX = 0; // ohne Margin, da das HelpCtrl einen eigenen hat - nHelpWidth = nOutputWidth; // dito + nHelpX = 0; // ohne Margin, da das HelpCtrl einen eigenen hat + nHelpWidth = nOutputWidth; // dito nPageWidth = nOutputWidth - STANDARD_MARGIN - STANDARD_MARGIN; } else - { // dummerweise reicht es nicht mal, um Page optimal und Help minimal zu zeigen - nHelpX = nHelpY = nHelpWidth = nHelpHeight = 0; // -> kein Help-Fenster + { // dummerweise reicht es nicht mal, um Page optimal und Help minimal zu zeigen + nHelpX = nHelpY = nHelpWidth = nHelpHeight = 0; // -> kein Help-Fenster nPageWidth = nOutputWidth - STANDARD_MARGIN - STANDARD_MARGIN; nPageHeight = nOutputHeight - STANDARD_MARGIN - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN; } @@ -216,20 +216,20 @@ void OTableFieldDescWin::Resize() m_pHeader->SetPosSizePixel( Point(0, STANDARD_MARGIN), Size(nOutputWidth, 15) ); - getGenPage()->SetPosSizePixel(Point ( STANDARD_MARGIN, + getGenPage()->SetPosSizePixel(Point ( STANDARD_MARGIN, STANDARD_MARGIN + DETAILS_HEADER_HEIGHT ), - Size ( nPageWidth, + Size ( nPageWidth, nPageHeight ) ); if (nHelpHeight) { m_pHelpBar->Show(); - m_pHelpBar->SetPosSizePixel(Point ( nHelpX, + m_pHelpBar->SetPosSizePixel(Point ( nHelpX, nHelpY ), - Size ( nHelpWidth, + Size ( nHelpWidth, nHelpHeight ) ); @@ -249,7 +249,7 @@ IClipboardTest* OTableFieldDescWin::getActiveChild() const case DESCRIPTION: pTest = getGenPage(); break; - default: + default: pTest = getHelpBar(); break; } @@ -290,15 +290,15 @@ void OTableFieldDescWin::paste() } // ----------------------------------------------------------------------------- void OTableFieldDescWin::GetFocus() -{ +{ if ( getGenPage() ) - getGenPage()->GetFocus(); + getGenPage()->GetFocus(); } // ----------------------------------------------------------------------------- void OTableFieldDescWin::LoseFocus() -{ +{ if ( getGenPage() ) - getGenPage()->LoseFocus(); + getGenPage()->LoseFocus(); } // ----------------------------------------------------------------------------- long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) @@ -313,7 +313,7 @@ long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) m_eChildFocus = HELP; break; } - + return bHandled ? 1L : TabPage::PreNotify(rNEvt); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index aa2a05482211..0ecd0de11032 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,10 +51,10 @@ namespace dbaui NONE }; private: - OTableDesignHelpBar* m_pHelpBar; - OFieldDescGenWin* m_pGenPage; - FixedText* m_pHeader; - ChildFocusState m_eChildFocus; + OTableDesignHelpBar* m_pHelpBar; + OFieldDescGenWin* m_pGenPage; + FixedText* m_pHeader; + ChildFocusState m_eChildFocus; IClipboardTest* getActiveChild() const; @@ -82,11 +82,11 @@ namespace dbaui String GetControlText( USHORT nControlId ) { return m_pGenPage->GetControlText(nControlId); } - // short GetFormatCategory(OFieldDescription* pFieldDescr) { return m_pGenPage ? m_pGenPage->GetFormatCategory(pFieldDescr) : -1; } + // short GetFormatCategory(OFieldDescription* pFieldDescr) { return m_pGenPage ? m_pGenPage->GetFormatCategory(pFieldDescr) : -1; } // liefert zum am Feld eingestellten Format einen der CAT_xxx-Werte (CAT_NUMBER, CAT_DATE ...) - String BoolStringPersistent(const String& rUIString) const { return m_pGenPage->BoolStringPersistent(rUIString); } - String BoolStringUI(const String& rPersistentString) const { return m_pGenPage->BoolStringUI(rPersistentString); } + String BoolStringPersistent(const String& rUIString) const { return m_pGenPage->BoolStringPersistent(rUIString); } + String BoolStringUI(const String& rPersistentString) const { return m_pGenPage->BoolStringUI(rPersistentString); } // IClipboardTest virtual sal_Bool isCutAllowed(); @@ -99,7 +99,7 @@ namespace dbaui virtual void paste(); inline OFieldDescGenWin* getGenPage() const { return m_pGenPage; } - inline OTableDesignHelpBar* getHelpBar() const { return m_pHelpBar; } + inline OTableDesignHelpBar* getHelpBar() const { return m_pHelpBar; } }; } diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 84c5f293a125..568e7c39f94e 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,14 +44,14 @@ using namespace ::com::sun::star::beans; //======================================================================== DBG_NAME(OTableRow) //------------------------------------------------------------------------------ -OTableRow::OTableRow() +OTableRow::OTableRow() :m_pActFieldDescr( NULL ) ,m_nPos( -1 ) ,m_bReadOnly( false ) ,m_bOwnsDescriptions(false) { DBG_CTOR(OTableRow,NULL); -} +} //------------------------------------------------------------------------------ OTableRow::OTableRow(const Reference< XPropertySet >& xAffectedCol) :m_pActFieldDescr( NULL ) @@ -84,7 +84,7 @@ OTableRow::~OTableRow() { DBG_DTOR(OTableRow,NULL); if(m_bOwnsDescriptions) - delete m_pActFieldDescr; + delete m_pActFieldDescr; } //------------------------------------------------------------------------------ @@ -140,7 +140,7 @@ namespace dbaui _rStr << sal_Int32(1); _rStr << nValue; } - else + else { _rStr << sal_Int32(2); _rStr.WriteByteString(::comphelper::getString(aValue)); @@ -168,13 +168,13 @@ namespace dbaui sal_Int32 nValue = 0; _rStr >> nValue; if ( nValue ) - { + { OFieldDescription* pFieldDesc = new OFieldDescription(); _rRow.m_pActFieldDescr = pFieldDesc; String sValue; _rStr.ReadByteString(sValue); pFieldDesc->SetName(sValue); - + _rStr.ReadByteString(sValue); pFieldDesc->SetDescription(sValue); _rStr.ReadByteString(sValue); @@ -199,7 +199,7 @@ namespace dbaui pFieldDesc->SetControlDefault(aControlDefault); - + _rStr >> nValue; pFieldDesc->SetTypeValue(nValue); diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index 516fcaf0fac4..6eabff95fc9e 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index 5d7e1da08c81..98bb3157a3df 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -241,7 +241,7 @@ OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) : OTableEditorDelUndoAct::~OTableEditorDelUndoAct() { DBG_DTOR(OTableEditorDelUndoAct,NULL); - m_aDeletedRows.clear(); + m_aDeletedRows.clear(); } //------------------------------------------------------------------------- @@ -252,7 +252,7 @@ void OTableEditorDelUndoAct::Undo() ULONG nPos; ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end(); - + ::boost::shared_ptr<OTableRow> pNewOrigRow; ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); @@ -294,9 +294,9 @@ void OTableEditorDelUndoAct::Redo() // class OTableEditorInsUndoAct //============================================================================== DBG_NAME(OTableEditorInsUndoAct); -OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, +OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition , - const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows) + const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows) :OTableEditorUndoAct( pOwner,STR_TABED_UNDO_ROWINSERTED ) ,m_vInsertedRows(_vInsertedRows) ,m_nInsPos( nInsertPosition ) @@ -308,7 +308,7 @@ OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, OTableEditorInsUndoAct::~OTableEditorInsUndoAct() { DBG_DTOR(OTableEditorInsUndoAct,NULL); - m_vInsertedRows.clear(); + m_vInsertedRows.clear(); } //------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index ff744b2f0d57..5f096d87ae92 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ namespace dbaui protected: OTableRowView* m_pTabDgnCtrl; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableDesignUndoAct( OTableRowView* pOwner ,USHORT nCommentID); @@ -72,13 +72,13 @@ namespace dbaui class OTableDesignCellUndoAct : public OTableDesignUndoAct { protected: - USHORT m_nCol; - long m_nRow; - ::com::sun::star::uno::Any m_sOldText; - ::com::sun::star::uno::Any m_sNewText; + USHORT m_nCol; + long m_nRow; + ::com::sun::star::uno::Any m_sOldText; + ::com::sun::star::uno::Any m_sNewText; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, USHORT nColumn ); @@ -90,13 +90,13 @@ namespace dbaui class OTableEditorTypeSelUndoAct : public OTableEditorUndoAct { protected: - USHORT m_nCol; - long m_nRow; - TOTypeInfoSP m_pOldType; - TOTypeInfoSP m_pNewType; + USHORT m_nCol; + long m_nRow; + TOTypeInfoSP m_pOldType; + TOTypeInfoSP m_pNewType; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, USHORT nColumn, const TOTypeInfoSP& _pOldType ); @@ -107,10 +107,10 @@ namespace dbaui class OTableEditorDelUndoAct : public OTableEditorUndoAct { protected: - ::std::vector< ::boost::shared_ptr<OTableRow> > m_aDeletedRows; + ::std::vector< ::boost::shared_ptr<OTableRow> > m_aDeletedRows; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableEditorDelUndoAct( OTableEditorCtrl* pOwner ); @@ -121,14 +121,14 @@ namespace dbaui class OTableEditorInsUndoAct : public OTableEditorUndoAct { protected: - ::std::vector< ::boost::shared_ptr<OTableRow> > m_vInsertedRows; - long m_nInsPos; + ::std::vector< ::boost::shared_ptr<OTableRow> > m_vInsertedRows; + long m_nInsPos; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); - OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, + OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows); virtual ~OTableEditorInsUndoAct(); @@ -141,8 +141,8 @@ namespace dbaui long m_nInsPos; long m_nInsRows; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows ); @@ -153,13 +153,13 @@ namespace dbaui class OPrimKeyUndoAct : public OTableEditorUndoAct { protected: - MultiSelection m_aDelKeys, + MultiSelection m_aDelKeys, m_aInsKeys; - BOOL m_bActPrimKeySet; + BOOL m_bActPrimKeySet; OTableEditorCtrl* m_pEditorCtrl; - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); public: TYPEINFO(); OPrimKeyUndoAct( OTableEditorCtrl* pOwner, MultiSelection aDeletedKeys, MultiSelection aInsertedKeys ); diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src index e2a73292ec8d..974dd5602d40 100644 --- a/dbaccess/source/ui/tabledesign/table.src +++ b/dbaccess/source/ui/tabledesign/table.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,12 +44,12 @@ #include "toolbox.hrc" #endif -#define MN_EDIT 20 -#define MN_VIEW 21 -#define MN_EXTRA 22 -#define MN_INDEX 23 -#define MN_WIN 30 -#define MN_HELP 31 +#define MN_EDIT 20 +#define MN_VIEW 21 +#define MN_EXTRA 22 +#define MN_INDEX 23 +#define MN_WIN 30 +#define MN_HELP 31 String STR_TABLEDESIGN_DBFIELDTYPES { diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx index d138782392da..3b7daaf065b1 100644 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,14 +116,14 @@ Reference<XPropertySetInfo> SAL_CALL OAdabasSettingsDialog::getPropertySetInfo( return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* OAdabasSettingsDialog::createDialog(Window* _pParent) +Dialog* OAdabasSettingsDialog::createDialog(Window* _pParent) { OAdabasStatPageDlg* pDlg = new OAdabasStatPageDlg(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx index f102ba02c39d..1a82443f43b0 100644 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ADABASSETTINGSDLG_HXX diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index ce30b85d57cc..ba04a306ddbf 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ namespace dbaui virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //========================================================================= @@ -144,14 +144,14 @@ namespace dbaui return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ - Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent) + Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent) { AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog() diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index c98e3ffa6d21..77a4c50e60db 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ OColumnControl::OColumnControl(const Reference<XMultiServiceFactory>& _rxFactory // ----------------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO2_STATIC(OColumnControl,SERVICE_CONTROLDEFAULT,"com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl") // ----------------------------------------------------------------------------- -::rtl::OUString OColumnControl::GetComponentServiceName() +::rtl::OUString OColumnControl::GetComponentServiceName() { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ColumnDescriptorControl")); } @@ -83,7 +83,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit UnoControlComponentInfos aComponentInfos(maComponentInfos); Reference< XGraphics > xGraphics( mxGraphics ); Reference< XView > xV(getPeer(), UNO_QUERY); - Reference< XWindow > xW(getPeer(), UNO_QUERY); + Reference< XWindow > xW(getPeer(), UNO_QUERY); aGuard.clear(); @@ -101,7 +101,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit pPeer->setColumn(xColumn); sal_Int32 nWidth = 50; xProp->getPropertyValue(PROPERTY_EDIT_WIDTH) >>= nWidth; - pPeer->setEditWidth(nWidth); + pPeer->setEditWidth(nWidth); } if (aComponentInfos.bVisible) @@ -136,7 +136,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit } } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 08ef5e8f5fe5..c2add8b72b5a 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,14 +33,14 @@ namespace dbaui { - class OColumnControl : public UnoControl + class OColumnControl : public UnoControl { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; public: OColumnControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); // UnoControl - virtual ::rtl::OUString GetComponentServiceName(); + virtual ::rtl::OUString GetComponentServiceName(); // XServiceInfo DECLARE_SERVICE_INFO_STATIC(); @@ -49,7 +49,7 @@ namespace dbaui virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent) throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_COLUMNCONTROL_HXX diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 6957f4c8e300..3700fc1c0897 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ OColumnControlModel::OColumnControlModel(const Reference<XMultiServiceFactory>& ,m_nWidth(50) { DBG_CTOR(OColumnControlModel,NULL); - registerProperties(); + registerProperties(); } // ----------------------------------------------------------------------------- OColumnControlModel::OColumnControlModel(const OColumnControlModel* _pSource,const Reference<XMultiServiceFactory>& _rxFactory) @@ -96,7 +96,7 @@ OColumnControlModel::~OColumnControlModel() { acquire(); dispose(); - } + } } // ----------------------------------------------------------------------------- void OColumnControlModel::registerProperties() @@ -105,8 +105,8 @@ void OColumnControlModel::registerProperties() &m_xConnection, ::getCppuType( &m_xConnection ) ); Any a; a <<= m_xColumn; -// registerMayBeVoidProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND| PropertyAttribute::MAYBEVOID, -// &a, ::getCppuType( &m_xColumn ) ); +// registerMayBeVoidProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND| PropertyAttribute::MAYBEVOID, +// &a, ::getCppuType( &m_xColumn ) ); registerProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND, &m_xColumn, ::getCppuType( &m_xColumn ) ); @@ -125,7 +125,7 @@ void OColumnControlModel::registerProperties() //------------------------------------------------------------------------------ Reference< XCloneable > SAL_CALL OColumnControlModel::createClone( ) throw (RuntimeException) { - return new OColumnControlModel( this, getORB() ); + return new OColumnControlModel( this, getORB() ); } //------------------------------------------------------------------------------ IMPLEMENT_TYPEPROVIDER2(OColumnControlModel,OColumnControlModel_BASE,comphelper::OPropertyContainer) @@ -134,7 +134,7 @@ IMPLEMENT_SERVICE_INFO2_STATIC(OColumnControlModel,"com.sun.star.comp.dbu.OColum IMPLEMENT_FORWARD_REFCOUNT( OColumnControlModel, OColumnControlModel_BASE ) //------------------------------------------------------------------------------ Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType ) throw (RuntimeException) -{ +{ return OColumnControlModel_BASE::queryInterface( _rType ); } // ----------------------------------------------------------------------------- @@ -164,7 +164,7 @@ void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStrea } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index 734933a35dc0..79ba39b0021d 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ namespace dbaui //================================================================== // OColumnControlModel //================================================================== -typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::awt::XControlModel - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::util::XCloneable - , ::com::sun::star::io::XPersistObject - > OColumnControlModel_BASE; - +typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::awt::XControlModel + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::util::XCloneable + , ::com::sun::star::io::XPersistObject + > OColumnControlModel_BASE; + class OColumnControlModel; class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper @@ -64,13 +64,13 @@ class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; // [properties] - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xColumn; - ::rtl::OUString m_sDefaultControl; - ::com::sun::star::uno::Any m_aTabStop; - sal_Bool m_bEnable; - sal_Int16 m_nBorder; - sal_Int32 m_nWidth; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xColumn; + ::rtl::OUString m_sDefaultControl; + ::com::sun::star::uno::Any m_aTabStop; + sal_Bool m_bEnable; + sal_Int16 m_nBorder; + sal_Int32 m_nWidth; // [properties] inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> getORB() const { return m_xORB; } @@ -108,7 +108,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_COLUMNMODEL_HXX diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index faf090402297..4212a8ef1e7d 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,20 +82,20 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) } if ( _xColumn.is() ) { - sal_Int32 nType = 0; - sal_Int32 nScale = 0; - sal_Int32 nPrecision = 0; + sal_Int32 nType = 0; + sal_Int32 nScale = 0; + sal_Int32 nPrecision = 0; sal_Bool bAutoIncrement = sal_False; ::rtl::OUString sTypeName; try { // get the properties from the column - _xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; - _xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; - _xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; - _xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; - _xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement; + _xColumn->getPropertyValue(PROPERTY_TYPENAME) >>= sTypeName; + _xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; + _xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; + _xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; + _xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement; } catch(Exception) { @@ -159,7 +159,7 @@ Any OColumnPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( Run return aProp; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index e469e4997083..34473a1be915 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ namespace dbaui { //......................................................................... class OFieldDescription; - class OColumnPeer : public VCLXWindow + class OColumnPeer : public VCLXWindow { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; - OFieldDescription* m_pActFieldDescr; + OFieldDescription* m_pActFieldDescr; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xColumn; public: @@ -56,7 +56,7 @@ namespace dbaui virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif //DBAUI_COLUMNPEER_HXX diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index ef214bf1a8d0..fb94ea4fdbfa 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,14 +115,14 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo() thr return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) +Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) { ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index d34ed1b61c9b..8f7ea65ca1bc 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBTYPEWIZDLG_HXX diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 6d5a2fb5ecd9..4d0e6b1c1452 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ using namespace dbaui; namespace css = ::com::sun::star; - + extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup() { static OMultiInstanceAutoRegistration< ODBTypeWizDialogSetup > aAutoRegistration; @@ -130,7 +130,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo( return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent) +Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent) { return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(), m_aInitialSelection); } @@ -146,7 +146,7 @@ void ODBTypeWizDialogSetup::executedDialog(sal_Int16 _nExecutionResult) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index 2b91f9566992..3214b1ef34cb 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,12 +73,12 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); virtual void executedDialog(sal_Int16 _nExecutionResult); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBTYPEWIZDLG_HXX diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 4f0cc4d0196d..6ccc0100b6ec 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,14 +116,14 @@ Reference<XPropertySetInfo> SAL_CALL OTableFilterDialog::getPropertySetInfo() t return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* OTableFilterDialog::createDialog(Window* _pParent) +Dialog* OTableFilterDialog::createDialog(Window* _pParent) { OTableSubscriptionDialog* pDlg = new OTableSubscriptionDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 3168c4d98751..76ef653f3488 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_TABLEFILTERDLG_HXX diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index e30a06037b50..92d97a18d691 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,14 +116,14 @@ Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo() return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* OUserSettingsDialog::createDialog(Window* _pParent) +Dialog* OUserSettingsDialog::createDialog(Window* _pParent) { OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection,m_xActiveConnection); return pDlg; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index e46d1505ac6c..18cd0b775ed4 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_USERSETTINGSDLG_HXX diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index fd751e807c40..baf429393fd2 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,9 +116,9 @@ Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetI return new ::cppu::OPropertyArrayHelper(aProps); } //------------------------------------------------------------------------------ -Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) +Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) { - + ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory()); // the initial selection @@ -129,7 +129,7 @@ Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 3b0fc5d8c367..a7727997887b 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,11 +70,11 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ADMINDLG_HXX diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index f816faf95777..45a7dba5a391 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,11 +53,11 @@ namespace dbaui { //......................................................................... -#define PROPERTY_ID_QUERYCOMPOSER 100 -#define PROPERTY_ID_ROWSET 101 +#define PROPERTY_ID_QUERYCOMPOSER 100 +#define PROPERTY_ID_ROWSET 101 - IMPLEMENT_CONSTASCII_USTRING( PROPERTY_QUERYCOMPOSER, "QueryComposer" ); - IMPLEMENT_CONSTASCII_USTRING( PROPERTY_ROWSET, "RowSet" ); + IMPLEMENT_CONSTASCII_USTRING( PROPERTY_QUERYCOMPOSER, "QueryComposer" ); + IMPLEMENT_CONSTASCII_USTRING( PROPERTY_ROWSET, "RowSet" ); using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -86,7 +86,7 @@ namespace dbaui //--------------------------------------------------------------------- ComposerDialog::~ComposerDialog() { - + DBG_DTOR(ComposerDialog,NULL); } @@ -97,7 +97,7 @@ namespace dbaui IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ComposerDialog ) //--------------------------------------------------------------------- - Dialog* ComposerDialog::createDialog(Window* _pParent) + Dialog* ComposerDialog::createDialog(Window* _pParent) { // obtain all the objects needed for the dialog Reference< XConnection > xConnection; @@ -204,7 +204,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index acc82ae93cf2..3439291739b2 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 65315cd0e738..083acbf6725a 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -202,7 +202,7 @@ namespace dbaui ~CopyTableWizard(); // OGenericUnoDialog overridables - virtual Dialog* createDialog( Window* _pParent ); + virtual Dialog* createDialog( Window* _pParent ); virtual void executedDialog( sal_Int16 _nExecutionResult ); private: @@ -286,7 +286,7 @@ namespace dbaui All errors are handled with the InteractionHandler associated with the data source, if there is one. Else, they will be silenced (but asserted in non-product builds). - + @param _rxDataSourceDescriptor the data access descriptor describing the data source whose connection should be obtained. Must not be <NULL/>. @@ -1249,7 +1249,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou // otherwise we don't get the correct value when only the 2nd source column was selected continue; } - + if ( bAutoIncrement && bInsertAutoIncrement ) { xStatementParams->setInt( 1, nRowCount ); @@ -1279,7 +1279,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou case DataType::DECIMAL: case DataType::NUMERIC: aTransfer.transferComplexValue( &XRow::getString, &XParameters::setString ); - break; + break; case DataType::BIGINT: aTransfer.transferValue( &XRow::getLong, &XParameters::setLong ); @@ -1307,7 +1307,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou case DataType::TIMESTAMP: aTransfer.transferComplexValue( &XRow::getTimestamp, &XParameters::setTimestamp ); break; - + case DataType::BOOLEAN: aTransfer.transferValue( &XRow::getBoolean, &XParameters::setBoolean ); break; @@ -1512,7 +1512,7 @@ void CopyTableWizard::impl_doCopy_nothrow() sSql.appendAscii(" ) ( "); sSql.append( m_pSourceObject->getSelectStatement()); sSql.appendAscii(" )"); - + return sSql.makeStringAndClear(); } //------------------------------------------------------------------------- @@ -1584,7 +1584,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) } //------------------------------------------------------------------------------ -Dialog* CopyTableWizard::createDialog( Window* _pParent ) +Dialog* CopyTableWizard::createDialog( Window* _pParent ) { OSL_PRECOND( isInitialized(), "CopyTableWizard::createDialog: not initialized!" ); // this should have been prevented in ::execute already diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src index fc6d00804607..c153b79d1a59 100644 --- a/dbaccess/source/ui/uno/copytablewizard.src +++ b/dbaccess/source/ui/uno/copytablewizard.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 390f339384f7..bb4bff9b6318 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -268,7 +268,7 @@ namespace dbaui // fragen, ob gespeichert werden soll nRet = ExecuteQuerySaveDocument(NULL,_rDocuRequest.Name); } - + if ( RET_CANCEL == nRet ) { if (-1 != nAbortPos) @@ -278,7 +278,7 @@ namespace dbaui else if ( RET_YES == nRet ) { sal_Int32 nDocuPos = getContinuation(SUPPLY_DOCUMENTSAVE, _rContinuations); - + if (-1 != nDocuPos) { Reference< XInteractionDocumentSave > xCallback(_rContinuations[nDocuPos], UNO_QUERY); @@ -383,7 +383,7 @@ namespace dbaui IMPLEMENT_SERVICE_INFO1_STATIC( LegacyInteractionHandler, "com.sun.star.comp.dbaccess.LegacyInteractionHandler", "com.sun.star.sdb.InteractionHandler" ); //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 09d6ef37ac11..9dcc520c82d6 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,9 +56,9 @@ namespace dbaui //========================================================================= //= BasicInteractionHandler //========================================================================= - typedef ::cppu::WeakImplHelper2 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::task::XInteractionHandler2 - > BasicInteractionHandler_Base; + typedef ::cppu::WeakImplHelper2 < ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::task::XInteractionHandler2 + > BasicInteractionHandler_Base; /** implements an <type scope="com.sun.star.task">XInteractionHandler</type> for database related interaction requests. <p/> @@ -95,17 +95,17 @@ namespace dbaui impl_handle_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_Request ); /// handle SQLExceptions (and derived classes) - void implHandle( + void implHandle( const ::dbtools::SQLExceptionInfo& _rSqlInfo, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); /// handle parameter requests - void implHandle( + void implHandle( const ::com::sun::star::sdb::ParametersRequest& _rParamRequest, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); /// handle document save requests - void implHandle( + void implHandle( const ::com::sun::star::sdb::DocumentSaveRequest& _rParamRequest, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); @@ -124,7 +124,7 @@ namespace dbaui SUPPLY_DOCUMENTSAVE }; /** check if a given continuation sequence contains a given continuation type<p/> - @return the index within <arg>_rContinuations</arg> of the first occurence of a continuation + @return the index within <arg>_rContinuations</arg> of the first occurence of a continuation of the requested type, -1 of no such continuation exists */ sal_Int32 getContinuation( @@ -180,7 +180,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_INTERACTION_HXX_ diff --git a/dbaccess/source/ui/uno/dbinteraction.src b/dbaccess/source/ui/uno/dbinteraction.src index 3d4c33d8a06d..67f72b20fed8 100644 --- a/dbaccess/source/ui/uno/dbinteraction.src +++ b/dbaccess/source/ui/uno/dbinteraction.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 23658530be71..83431b50efd7 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -193,7 +193,7 @@ namespace dbaui } //--------------------------------------------------------------------- - Dialog* OTextConnectionSettingsDialog::createDialog(Window* _pParent) + Dialog* OTextConnectionSettingsDialog::createDialog(Window* _pParent) { return new TextConnectionSettingsDialog( _pParent, *m_pDatasourceItems ); } @@ -217,7 +217,7 @@ namespace dbaui OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); } } - + //-------------------------------------------------------------------- sal_Bool SAL_CALL OTextConnectionSettingsDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw(IllegalArgumentException) { @@ -238,7 +238,7 @@ namespace dbaui return bModified; } - + //-------------------------------------------------------------------- void SAL_CALL OTextConnectionSettingsDialog::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 998b79a136ad..a40d38181328 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ DBG_NAME(ODirectSQLDialog) //--------------------------------------------------------------------- ODirectSQLDialog::~ODirectSQLDialog() { - + DBG_DTOR(ODirectSQLDialog,NULL); } @@ -88,12 +88,12 @@ DBG_NAME(ODirectSQLDialog) IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ODirectSQLDialog ) //--------------------------------------------------------------------- - Dialog* ODirectSQLDialog::createDialog(Window* _pParent) + Dialog* ODirectSQLDialog::createDialog(Window* _pParent) { // obtain all the objects needed for the dialog Reference< XConnection > xConnection = m_xActiveConnection; if ( !xConnection.is() ) - { + { try { // the connection the row set is working with @@ -132,7 +132,7 @@ DBG_NAME(ODirectSQLDialog) ODirectSQLDialog_BASE::implInitialize(_rValue); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 1f7dde873282..652c774b71b5 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ namespace dbaui //= ODirectSQLDialog //===================================================================== class ODirectSQLDialog; - typedef ::svt::OGenericUnoDialog ODirectSQLDialog_BASE; - typedef ::comphelper::OPropertyArrayUsageHelper< ODirectSQLDialog > ODirectSQLDialog_PBASE; + typedef ::svt::OGenericUnoDialog ODirectSQLDialog_BASE; + typedef ::comphelper::OPropertyArrayUsageHelper< ODirectSQLDialog > ODirectSQLDialog_PBASE; class ODirectSQLDialog :public ODirectSQLDialog_BASE @@ -69,12 +69,12 @@ namespace dbaui protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); virtual void implInitialize(const com::sun::star::uno::Any& _rValue); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_UNODIRECTSQL_HXX diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index c48a2e54a250..8ede6217e125 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ #include <vcl/svapp.hxx> // --- -#define THISREF() static_cast< XServiceInfo* >(this) +#define THISREF() static_cast< XServiceInfo* >(this) //......................................................................... namespace dbaui @@ -119,7 +119,7 @@ void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 1396cbcf6495..d7084a98b287 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -150,7 +150,7 @@ Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo() th } //------------------------------------------------------------------------------ -Dialog* OSQLMessageDialog::createDialog(Window* _pParent) +Dialog* OSQLMessageDialog::createDialog(Window* _pParent) { if ( m_aException.hasValue() ) return new OSQLMessageBox( _pParent, SQLExceptionInfo( m_aException ), WB_OK | WB_DEF_OK, m_sHelpURL ); @@ -160,7 +160,7 @@ Dialog* OSQLMessageDialog::createDialog(Window* _pParent) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml index ad003449cedd..e4cfb0361719 100644 --- a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml +++ b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml @@ -2,7 +2,7 @@ <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar"> <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:text="" toolbar:style="dropdown" /> + <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:text="" toolbar:style="dropdown" /> <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" toolbar:text="" /> <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" /> <toolbar:toolbarseparator/> diff --git a/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml b/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml index 54bfcda90988..9ab5ac428b7e 100644 --- a/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml +++ b/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml @@ -3,7 +3,7 @@ <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar"> <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="helpid:38991" toolbar:text="" /> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" /> + <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" /> <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" /> @@ -23,7 +23,7 @@ <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="helpid:10723" toolbar:text="" toolbar:style="" /> <toolbar:toolbaritem xlink:href=".uno:FilterCrit" toolbar:helpid="helpid:10715" toolbar:text="" /> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" /> + <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:DSBInsertColumns" toolbar:helpid="helpid:12202" toolbar:text="" /> <toolbar:toolbaritem xlink:href=".uno:DSBInsertContent" toolbar:helpid="helpid:12201" toolbar:text="" /> diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index d1beb43c743f..79fe68a2d7d8 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -67,7 +67,6 @@ <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowCredits"/> <menu:menuitem menu:id=".uno:About"/> diff --git a/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml b/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml index 09b143b04c1d..511fc045b2f9 100644 --- a/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml +++ b/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml @@ -3,7 +3,7 @@ <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar"> <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="helpid:38991" toolbar:text="" /> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" /> + <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" /> <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" /> @@ -23,5 +23,5 @@ <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="helpid:10723" toolbar:text="" toolbar:style="" /> <toolbar:toolbaritem xlink:href=".uno:FilterCrit" toolbar:helpid="helpid:10715" toolbar:text="" /> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" /> + <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" /> </toolbar:toolbar> diff --git a/dbaccess/util/hidother.src b/dbaccess/util/hidother.src index bc49f49b87e6..e0f0d2a26c54 100644 --- a/dbaccess/util/hidother.src +++ b/dbaccess/util/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,324 +31,324 @@ #include <svx/svxids.hrc> #endif -hidspecial HID_DLG_FILTERCRIT { HelpId = HID_DLG_FILTERCRIT; }; -hidspecial HID_DLG_ORDERCRIT { HelpId = HID_DLG_ORDERCRIT; }; -hidspecial HID_DATABROWSE_HEADER { HelpId = HID_DATABROWSE_HEADER; }; -hidspecial HID_CTL_TABBROWSER { HelpId = HID_CTL_TABBROWSER; }; -hidspecial UID_DATABROWSE_DATAWINDOW { HelpId = UID_DATABROWSE_DATAWINDOW; }; -hidspecial HID_CTL_TREEVIEW { HelpId = HID_CTL_TREEVIEW; }; -hidspecial UID_CTL_CONTENT { HelpId = UID_CTL_CONTENT; }; -hidspecial HID_TLB_TABBROWSER { HelpId = HID_TLB_TABBROWSER; }; -hidspecial HID_TLB_TREELISTBOX { HelpId = HID_TLB_TREELISTBOX; }; - -hidspecial HID_DSADMIN_DIALOG { HelpId = HID_DSADMIN_DIALOG; }; -hidspecial HID_DSADMIN_CHARSET { HelpId = HID_DSADMIN_CHARSET; }; -hidspecial HID_DSADMIN_TABCONTROL { HelpId = HID_DSADMIN_TABCONTROL; }; -hidspecial HID_DSADMIN_PAGE_GENERAL { HelpId = HID_DSADMIN_PAGE_GENERAL; }; -hidspecial HID_DSADMIN_PAGE_DBASE { HelpId = HID_DSADMIN_PAGE_DBASE; }; -hidspecial HID_DSADMIN_PAGE_JDBC { HelpId = HID_DSADMIN_PAGE_JDBC; }; -hidspecial HID_DSADMIN_PAGE_ODBC { HelpId = HID_DSADMIN_PAGE_ODBC; }; -hidspecial HID_DSADMIN_PAGE_ADABAS { HelpId = HID_DSADMIN_PAGE_ADABAS; }; -hidspecial HID_DSADMIN_PAGE_TEXT { HelpId = HID_DSADMIN_PAGE_TEXT; }; -hidspecial HID_DSADMIN_TABLE_SUBSCRIPTION { HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION; }; -hidspecial HID_DSADMIN_DSACTIONS_NEWDS { HelpId = HID_DSADMIN_DSACTIONS_NEWDS; }; -hidspecial HID_DSADMIN_DSACTIONS_DELETEDS { HelpId = HID_DSADMIN_DSACTIONS_DELETEDS; }; -hidspecial HID_DSADMIN_DSACTIONS_RESTOREDS { HelpId = HID_DSADMIN_DSACTIONS_RESTOREDS; }; -hidspecial HID_DSADMIN_DSNAME { HelpId = HID_DSADMIN_DSNAME; }; -hidspecial HID_DSADMIN_DSTYPE { HelpId = HID_DSADMIN_DSTYPE; }; -hidspecial HID_DSADMIN_URL_GENERAL { HelpId = HID_DSADMIN_URL_GENERAL; }; -hidspecial HID_DSADMIN_BROWSECONN { HelpId = HID_DSADMIN_BROWSECONN; }; -hidspecial HID_DSADMIN_LOGINTIMEOUT_NUMBER { HelpId = HID_DSADMIN_LOGINTIMEOUT_NUMBER; }; -hidspecial HID_DSADMIN_LOGINTIMEOUT_UNIT { HelpId = HID_DSADMIN_LOGINTIMEOUT_UNIT; }; -hidspecial HID_DSADMIN_SHOWDELETED { HelpId = HID_DSADMIN_SHOWDELETED; }; -hidspecial HID_DSADMIN_ALLOWLONG { HelpId = HID_DSADMIN_ALLOWLONG; }; -hidspecial HID_DSADMIN_DBASE_INDICIES { HelpId = HID_DSADMIN_DBASE_INDICIES; }; -hidspecial HID_DSADMIN_DRIVERCLASS { HelpId = HID_DSADMIN_DRIVERCLASS; }; -hidspecial HID_DSADMIN_ODBC_OPTIONS { HelpId = HID_DSADMIN_ODBC_OPTIONS; }; -hidspecial HID_DSADMIN_TEXT_HEADER { HelpId = HID_DSADMIN_TEXT_HEADER; }; -hidspecial HID_DSADMIN_FIELD_SEPARATOR { HelpId = HID_DSADMIN_FIELD_SEPARATOR; }; -hidspecial HID_DSADMIN_TEXT_SEPARATOR { HelpId = HID_DSADMIN_TEXT_SEPARATOR; }; -hidspecial HID_DSADMIN_DECIMAL_SEPARATOR { HelpId = HID_DSADMIN_DECIMAL_SEPARATOR; }; -hidspecial HID_DSADMIN_THOUSANDS_SEPARATOR { HelpId = HID_DSADMIN_THOUSANDS_SEPARATOR; }; -hidspecial HID_DSADMIN_EXTENSION { HelpId = HID_DSADMIN_EXTENSION; }; -hidspecial HID_DSADMIN_ALL_TABLES { HelpId = HID_DSADMIN_ALL_TABLES; }; -hidspecial HID_DSADMIN_NO_TABLES { HelpId = HID_DSADMIN_NO_TABLES; }; -hidspecial HID_DSADMIN_SELECT_TABLES { HelpId = HID_DSADMIN_SELECT_TABLES; }; -hidspecial HID_DSADMIN_TABLE_SELECTOR { HelpId = HID_DSADMIN_TABLE_SELECTOR; }; -hidspecial HID_DSADMIN_SUPPRESS_VERSIONCL { HelpId = HID_DSADMIN_SUPPRESS_VERSIONCL; }; -hidspecial HID_GENERIC_SQL_ERROR { HelpId = HID_GENERIC_SQL_ERROR; }; -hidspecial HID_BROWSER_COLUMNFORMAT { HelpId = HID_BROWSER_COLUMNFORMAT; }; -hidspecial HID_BROWSER_COLUMNWIDTH { HelpId = HID_BROWSER_COLUMNWIDTH; }; -hidspecial HID_BROWSER_TABLEFORMAT { HelpId = HID_BROWSER_TABLEFORMAT; }; -hidspecial HID_BROWSER_ROWHEIGHT { HelpId = HID_BROWSER_ROWHEIGHT; }; +hidspecial HID_DLG_FILTERCRIT { HelpId = HID_DLG_FILTERCRIT; }; +hidspecial HID_DLG_ORDERCRIT { HelpId = HID_DLG_ORDERCRIT; }; +hidspecial HID_DATABROWSE_HEADER { HelpId = HID_DATABROWSE_HEADER; }; +hidspecial HID_CTL_TABBROWSER { HelpId = HID_CTL_TABBROWSER; }; +hidspecial UID_DATABROWSE_DATAWINDOW { HelpId = UID_DATABROWSE_DATAWINDOW; }; +hidspecial HID_CTL_TREEVIEW { HelpId = HID_CTL_TREEVIEW; }; +hidspecial UID_CTL_CONTENT { HelpId = UID_CTL_CONTENT; }; +hidspecial HID_TLB_TABBROWSER { HelpId = HID_TLB_TABBROWSER; }; +hidspecial HID_TLB_TREELISTBOX { HelpId = HID_TLB_TREELISTBOX; }; + +hidspecial HID_DSADMIN_DIALOG { HelpId = HID_DSADMIN_DIALOG; }; +hidspecial HID_DSADMIN_CHARSET { HelpId = HID_DSADMIN_CHARSET; }; +hidspecial HID_DSADMIN_TABCONTROL { HelpId = HID_DSADMIN_TABCONTROL; }; +hidspecial HID_DSADMIN_PAGE_GENERAL { HelpId = HID_DSADMIN_PAGE_GENERAL; }; +hidspecial HID_DSADMIN_PAGE_DBASE { HelpId = HID_DSADMIN_PAGE_DBASE; }; +hidspecial HID_DSADMIN_PAGE_JDBC { HelpId = HID_DSADMIN_PAGE_JDBC; }; +hidspecial HID_DSADMIN_PAGE_ODBC { HelpId = HID_DSADMIN_PAGE_ODBC; }; +hidspecial HID_DSADMIN_PAGE_ADABAS { HelpId = HID_DSADMIN_PAGE_ADABAS; }; +hidspecial HID_DSADMIN_PAGE_TEXT { HelpId = HID_DSADMIN_PAGE_TEXT; }; +hidspecial HID_DSADMIN_TABLE_SUBSCRIPTION { HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION; }; +hidspecial HID_DSADMIN_DSACTIONS_NEWDS { HelpId = HID_DSADMIN_DSACTIONS_NEWDS; }; +hidspecial HID_DSADMIN_DSACTIONS_DELETEDS { HelpId = HID_DSADMIN_DSACTIONS_DELETEDS; }; +hidspecial HID_DSADMIN_DSACTIONS_RESTOREDS { HelpId = HID_DSADMIN_DSACTIONS_RESTOREDS; }; +hidspecial HID_DSADMIN_DSNAME { HelpId = HID_DSADMIN_DSNAME; }; +hidspecial HID_DSADMIN_DSTYPE { HelpId = HID_DSADMIN_DSTYPE; }; +hidspecial HID_DSADMIN_URL_GENERAL { HelpId = HID_DSADMIN_URL_GENERAL; }; +hidspecial HID_DSADMIN_BROWSECONN { HelpId = HID_DSADMIN_BROWSECONN; }; +hidspecial HID_DSADMIN_LOGINTIMEOUT_NUMBER { HelpId = HID_DSADMIN_LOGINTIMEOUT_NUMBER; }; +hidspecial HID_DSADMIN_LOGINTIMEOUT_UNIT { HelpId = HID_DSADMIN_LOGINTIMEOUT_UNIT; }; +hidspecial HID_DSADMIN_SHOWDELETED { HelpId = HID_DSADMIN_SHOWDELETED; }; +hidspecial HID_DSADMIN_ALLOWLONG { HelpId = HID_DSADMIN_ALLOWLONG; }; +hidspecial HID_DSADMIN_DBASE_INDICIES { HelpId = HID_DSADMIN_DBASE_INDICIES; }; +hidspecial HID_DSADMIN_DRIVERCLASS { HelpId = HID_DSADMIN_DRIVERCLASS; }; +hidspecial HID_DSADMIN_ODBC_OPTIONS { HelpId = HID_DSADMIN_ODBC_OPTIONS; }; +hidspecial HID_DSADMIN_TEXT_HEADER { HelpId = HID_DSADMIN_TEXT_HEADER; }; +hidspecial HID_DSADMIN_FIELD_SEPARATOR { HelpId = HID_DSADMIN_FIELD_SEPARATOR; }; +hidspecial HID_DSADMIN_TEXT_SEPARATOR { HelpId = HID_DSADMIN_TEXT_SEPARATOR; }; +hidspecial HID_DSADMIN_DECIMAL_SEPARATOR { HelpId = HID_DSADMIN_DECIMAL_SEPARATOR; }; +hidspecial HID_DSADMIN_THOUSANDS_SEPARATOR { HelpId = HID_DSADMIN_THOUSANDS_SEPARATOR; }; +hidspecial HID_DSADMIN_EXTENSION { HelpId = HID_DSADMIN_EXTENSION; }; +hidspecial HID_DSADMIN_ALL_TABLES { HelpId = HID_DSADMIN_ALL_TABLES; }; +hidspecial HID_DSADMIN_NO_TABLES { HelpId = HID_DSADMIN_NO_TABLES; }; +hidspecial HID_DSADMIN_SELECT_TABLES { HelpId = HID_DSADMIN_SELECT_TABLES; }; +hidspecial HID_DSADMIN_TABLE_SELECTOR { HelpId = HID_DSADMIN_TABLE_SELECTOR; }; +hidspecial HID_DSADMIN_SUPPRESS_VERSIONCL { HelpId = HID_DSADMIN_SUPPRESS_VERSIONCL; }; +hidspecial HID_GENERIC_SQL_ERROR { HelpId = HID_GENERIC_SQL_ERROR; }; +hidspecial HID_BROWSER_COLUMNFORMAT { HelpId = HID_BROWSER_COLUMNFORMAT; }; +hidspecial HID_BROWSER_COLUMNWIDTH { HelpId = HID_BROWSER_COLUMNWIDTH; }; +hidspecial HID_BROWSER_TABLEFORMAT { HelpId = HID_BROWSER_TABLEFORMAT; }; +hidspecial HID_BROWSER_ROWHEIGHT { HelpId = HID_BROWSER_ROWHEIGHT; }; hidspecial HID_BROWSER_EDIT_DATABASE { HelpId = HID_BROWSER_EDIT_DATABASE; }; -hidspecial HID_BROWSER_CLOSECONN { HelpId = HID_BROWSER_CLOSECONN; }; -hidspecial HID_BROWSER_REFRESHCONN { HelpId = HID_BROWSER_REFRESHCONN; }; -hidspecial HID_DSADMIN_SPECIAL_MESSAGE { HelpId = HID_DSADMIN_SPECIAL_MESSAGE; }; - -hidspecial HID_DLG_ROWHEIGHT { HelpId = HID_DLG_ROWHEIGHT; }; -hidspecial HID_DLG_COLWIDTH { HelpId = HID_DLG_COLWIDTH; }; -hidspecial HID_TLB_QUERYDESIGN { HelpId = HID_TLB_QUERYDESIGN; }; -hidspecial HID_CTL_QRYSQLEDIT { HelpId = HID_CTL_QRYSQLEDIT; }; - -hidspecial HID_DSADMIN_SPECIAL_MESSAGE { HelpId = HID_DSADMIN_SPECIAL_MESSAGE; }; - -hidspecial HID_BROWSER_QUERY_CREATE_DESIGN { HelpId = HID_BROWSER_QUERY_CREATE_DESIGN; }; -hidspecial HID_BROWSER_QUERY_CREATE_TEXT { HelpId = HID_BROWSER_QUERY_CREATE_TEXT; }; - -hidspecial HID_DLG_ERROR { HelpId = HID_DLG_ERROR; }; -hidspecial HID_DLG_TEXT { HelpId = HID_DLG_TEXT; }; -hidspecial UID_SQLERROR_BUTTONMORE { HelpId = UID_SQLERROR_BUTTONMORE; }; -hidspecial HID_DLG_SAVE_AS { HelpId = HID_DLG_SAVE_AS; }; -hidspecial HID_BROWSER_QUERY_EDIT { HelpId = HID_BROWSER_QUERY_EDIT; }; -hidspecial HID_BROWSER_QUERY_DELETE { HelpId = HID_BROWSER_QUERY_DELETE; }; - -hidspecial HID_DSADMIN_USER_ADO { HelpId = HID_DSADMIN_USER_ADO; }; -hidspecial HID_DSADMIN_PWDREC_ADO { HelpId = HID_DSADMIN_PWDREC_ADO; }; -hidspecial HID_DSADMIN_CONNURL_ADOPAGE { HelpId = HID_DSADMIN_CONNURL_ADOPAGE; }; -hidspecial HID_DSADMIN_PAGE_ADO { HelpId = HID_DSADMIN_PAGE_ADO; }; - -hidspecial HID_JOINSH_ADDTAB_CLOSE { HelpId = HID_JOINSH_ADDTAB_CLOSE; }; -hidspecial HID_JOINSH_ADDTAB_TABLELIST { HelpId = HID_JOINSH_ADDTAB_TABLELIST; }; +hidspecial HID_BROWSER_CLOSECONN { HelpId = HID_BROWSER_CLOSECONN; }; +hidspecial HID_BROWSER_REFRESHCONN { HelpId = HID_BROWSER_REFRESHCONN; }; +hidspecial HID_DSADMIN_SPECIAL_MESSAGE { HelpId = HID_DSADMIN_SPECIAL_MESSAGE; }; + +hidspecial HID_DLG_ROWHEIGHT { HelpId = HID_DLG_ROWHEIGHT; }; +hidspecial HID_DLG_COLWIDTH { HelpId = HID_DLG_COLWIDTH; }; +hidspecial HID_TLB_QUERYDESIGN { HelpId = HID_TLB_QUERYDESIGN; }; +hidspecial HID_CTL_QRYSQLEDIT { HelpId = HID_CTL_QRYSQLEDIT; }; + +hidspecial HID_DSADMIN_SPECIAL_MESSAGE { HelpId = HID_DSADMIN_SPECIAL_MESSAGE; }; + +hidspecial HID_BROWSER_QUERY_CREATE_DESIGN { HelpId = HID_BROWSER_QUERY_CREATE_DESIGN; }; +hidspecial HID_BROWSER_QUERY_CREATE_TEXT { HelpId = HID_BROWSER_QUERY_CREATE_TEXT; }; + +hidspecial HID_DLG_ERROR { HelpId = HID_DLG_ERROR; }; +hidspecial HID_DLG_TEXT { HelpId = HID_DLG_TEXT; }; +hidspecial UID_SQLERROR_BUTTONMORE { HelpId = UID_SQLERROR_BUTTONMORE; }; +hidspecial HID_DLG_SAVE_AS { HelpId = HID_DLG_SAVE_AS; }; +hidspecial HID_BROWSER_QUERY_EDIT { HelpId = HID_BROWSER_QUERY_EDIT; }; +hidspecial HID_BROWSER_QUERY_DELETE { HelpId = HID_BROWSER_QUERY_DELETE; }; + +hidspecial HID_DSADMIN_USER_ADO { HelpId = HID_DSADMIN_USER_ADO; }; +hidspecial HID_DSADMIN_PWDREC_ADO { HelpId = HID_DSADMIN_PWDREC_ADO; }; +hidspecial HID_DSADMIN_CONNURL_ADOPAGE { HelpId = HID_DSADMIN_CONNURL_ADOPAGE; }; +hidspecial HID_DSADMIN_PAGE_ADO { HelpId = HID_DSADMIN_PAGE_ADO; }; + +hidspecial HID_JOINSH_ADDTAB_CLOSE { HelpId = HID_JOINSH_ADDTAB_CLOSE; }; +hidspecial HID_JOINSH_ADDTAB_TABLELIST { HelpId = HID_JOINSH_ADDTAB_TABLELIST; }; hidspecial HID_JOINSH_ADDTAB_QUERYLIST { HelpId = HID_JOINSH_ADDTAB_QUERYLIST; }; -hidspecial HID_CTL_QRYDGNTAB { HelpId = HID_CTL_QRYDGNTAB; }; -hidspecial HID_DLG_QRY_JOIN { HelpId = HID_DLG_QRY_JOIN; }; -hidspecial HID_DLG_QRY_JOINTYPE { HelpId = HID_DLG_QRY_JOINTYPE; }; -hidspecial HID_DLG_QRY_HELPTEXT { HelpId = HID_DLG_QRY_HELPTEXT; }; - -hidspecial HID_CTL_QRYDGNCRIT { HelpId = HID_CTL_QRYDGNCRIT; }; -hidspecial HID_QRYDGN_ROW_VISIBLE { HelpId = HID_QRYDGN_ROW_VISIBLE; }; -hidspecial HID_QRYDGN_ROW_TABLE { HelpId = HID_QRYDGN_ROW_TABLE; }; -hidspecial HID_QRYDGN_ROW_FIELD { HelpId = HID_QRYDGN_ROW_FIELD; }; -hidspecial HID_QRYDGN_ROW_ORDER { HelpId = HID_QRYDGN_ROW_ORDER; }; -hidspecial HID_QRYDGN_ROW_FUNCTION { HelpId = HID_QRYDGN_ROW_FUNCTION; }; -hidspecial HID_QRYDGN_ROW_ALIAS { HelpId = HID_QRYDGN_ROW_ALIAS; }; -hidspecial HID_QRYDGN_ROW_CRIT { HelpId = HID_QRYDGN_ROW_CRIT; }; - -hidspecial HID_QUERY_FUNCTION { HelpId = HID_QUERY_FUNCTION; }; -hidspecial HID_QUERY_TABLENAME { HelpId = HID_QUERY_TABLENAME; }; -hidspecial HID_QUERY_ALIASNAME { HelpId = HID_QUERY_ALIASNAME; }; -hidspecial HID_QUERY_DISTINCT { HelpId = HID_QUERY_DISTINCT; }; - -hidspecial HID_DSADMIN_QUERYADMINISTRATION { HelpId = HID_DSADMIN_QUERYADMINISTRATION; }; -hidspecial HID_DSADMIN_QUERIES { HelpId = HID_DSADMIN_QUERIES; }; -hidspecial HID_DSADMIN_QUERIES_NEW { HelpId = HID_DSADMIN_QUERIES_NEW; }; -hidspecial HID_DSADMIN_QUERIES_EDIT { HelpId = HID_DSADMIN_QUERIES_EDIT; }; -hidspecial HID_DSADMIN_QUERIES_DELETE { HelpId = HID_DSADMIN_QUERIES_DELETE; }; - -hidspecial HID_TAB_DESIGN_TABLE_DESC { HelpId = HID_TAB_DESIGN_TABLE_DESC; }; -hidspecial HID_TAB_DESIGN_FIELDCONTROL { HelpId = HID_TAB_DESIGN_FIELDCONTROL; }; -hidspecial HID_TABLE_DESIGN_HELP_WINDOW { HelpId = HID_TABLE_DESIGN_HELP_WINDOW; }; -hidspecial HID_TAB_DESIGN_DESCWIN { HelpId = HID_TAB_DESIGN_DESCWIN; }; -hidspecial HID_TAB_DESIGN_TABLE_PROPS { HelpId = HID_TAB_DESIGN_TABLE_PROPS; }; -hidspecial HID_TABDESIGN_BACKGROUND { HelpId = HID_TABDESIGN_BACKGROUND; }; -hidspecial HID_CTL_TABLEEDIT { HelpId = HID_CTL_TABLEEDIT; }; -hidspecial HID_TABDESIGN_NAMECELL { HelpId = HID_TABDESIGN_NAMECELL; }; -hidspecial HID_TABDESIGN_TYPECELL { HelpId = HID_TABDESIGN_TYPECELL; }; -hidspecial HID_TABDESIGN_COMMENTCELL { HelpId = HID_TABDESIGN_COMMENTCELL; }; -hidspecial HID_TABDESIGN_HELPTEXT { HelpId = HID_TABDESIGN_HELPTEXT; }; - -hidspecial SID_TABLEDESIGN_INSERTROWS { HelpId = SID_TABLEDESIGN_INSERTROWS; }; -hidspecial SID_TABLEDESIGN_TABED_PRIMARYKEY { HelpId = SID_TABLEDESIGN_TABED_PRIMARYKEY; }; -hidspecial HID_TLB_TABLEDESIGN { HelpId = HID_TLB_TABLEDESIGN; }; -hidspecial HID_TAB_DESIGN_HELP_TEXT_FRAME { HelpId = HID_TAB_DESIGN_HELP_TEXT_FRAME; }; -hidspecial HID_TABLE_DESIGN_TABPAGE_GENERAL { HelpId = HID_TABLE_DESIGN_TABPAGE_GENERAL; }; -hidspecial HID_TAB_ENT_DEFAULT { HelpId = HID_TAB_ENT_DEFAULT; }; -hidspecial HID_TAB_ENT_FORMAT_SAMPLE { HelpId = HID_TAB_ENT_FORMAT_SAMPLE; }; -hidspecial HID_TAB_ENT_FORMAT { HelpId = HID_TAB_ENT_FORMAT; }; -hidspecial HID_TAB_ENT_BOOL_DEFAULT { HelpId = HID_TAB_ENT_BOOL_DEFAULT; }; -hidspecial HID_TAB_ENT_REQUIRED { HelpId = HID_TAB_ENT_REQUIRED; }; -hidspecial HID_TAB_ENT_AUTOINCREMENT { HelpId = HID_TAB_ENT_AUTOINCREMENT; }; -hidspecial HID_TAB_ENT_TEXT_LEN { HelpId = HID_TAB_ENT_TEXT_LEN; }; -hidspecial HID_TAB_ENT_TYPE { HelpId = HID_TAB_ENT_TYPE; }; -hidspecial HID_TAB_ENT_COLUMNNAME { HelpId = HID_TAB_ENT_COLUMNNAME; }; -hidspecial HID_TAB_ENT_NUMTYP { HelpId = HID_TAB_ENT_NUMTYP; }; -hidspecial HID_TAB_ENT_LEN { HelpId = HID_TAB_ENT_LEN; }; -hidspecial HID_TAB_ENT_SCALE { HelpId = HID_TAB_ENT_SCALE; }; -hidspecial HID_BROWSER_TABLE_CREATE_DESIGN { HelpId = HID_BROWSER_TABLE_CREATE_DESIGN; }; -hidspecial HID_BROWSER_TABLE_EDIT { HelpId = HID_BROWSER_TABLE_EDIT; }; -hidspecial HID_BROWSER_TABLE_DELETE { HelpId = HID_BROWSER_TABLE_DELETE; }; -hidspecial HID_SQLERROR_EXCHAIN_ERRORS { HelpId = HID_SQLERROR_EXCHAIN_ERRORS; }; -hidspecial HID_DBACCESS_START { HelpId = HID_DBACCESS_START; }; -hidspecial HID_SQLERROR_EXCHAIN_TEXT { HelpId = HID_SQLERROR_EXCHAIN_TEXT; }; -hidspecial HID_TAB_WIZ_COLUMN_SELECT { HelpId = HID_TAB_WIZ_COLUMN_SELECT; }; -hidspecial HID_TAB_WIZ_TYPE_SELECT { HelpId = HID_TAB_WIZ_TYPE_SELECT; }; -hidspecial HID_TAB_NAMEMATCHING_COLS_AVAIL { HelpId = HID_TAB_NAMEMATCHING_COLS_AVAIL; }; -hidspecial HID_TAB_NAMEMATCHING_COLS_ASSIGN { HelpId = HID_TAB_NAMEMATCHING_COLS_ASSIGN; }; -hidspecial HID_TAB_WIZ_COPYTABLE { HelpId = HID_TAB_WIZ_COPYTABLE; }; -hidspecial HID_TAB_WIZ_TABLENAME_EDIT { HelpId = HID_TAB_WIZ_TABLENAME_EDIT; }; -hidspecial HID_CTL_RELATIONTAB { HelpId = HID_CTL_RELATIONTAB; }; -hidspecial HID_TLB_RELATIONDESIGN { HelpId = HID_TLB_RELATIONDESIGN ; }; -hidspecial HID_RELATIONDIALOG_LEFTFIELDCELL { HelpId = HID_RELATIONDIALOG_LEFTFIELDCELL ; }; -hidspecial HID_RELATIONDIALOG_RIGHTFIELDCELL { HelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL ; }; -hidspecial HID_RELDLG_KEYFIELDS { HelpId = HID_RELDLG_KEYFIELDS ; }; -hidspecial HID_BROWSER_RELATION_DESIGN { HelpId = HID_BROWSER_RELATION_DESIGN ; }; -hidspecial HID_TABLE_DESIGN_NO_CONNECTION { HelpId = HID_TABLE_DESIGN_NO_CONNECTION ; }; -hidspecial HID_DSADMIN_CREATEDATABASE { HelpId = HID_DSADMIN_CREATEDATABASE ; }; -hidspecial HID_BROWSER_COLUMNINFO { HelpId = HID_BROWSER_COLUMNINFO ; }; -hidspecial HID_DSADMIN_USECATALOG { HelpId = HID_DSADMIN_USECATALOG ; }; -hidspecial HID_BROWSER_VIEW_CREATE_DESIGN { HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ; }; -hidspecial HID_DSADMIN_DOCUMENTS { HelpId = HID_DSADMIN_DOCUMENTS ; }; -hidspecial HID_DSADMIN_DOCUMENTLINKS { HelpId = HID_DSADMIN_DOCUMENTLINKS ; }; - -hidspecial HID_DSADMIN_FILTER_EXPLANATION { HelpId = HID_DSADMIN_FILTER_EXPLANATION ; }; -hidspecial HID_CONFIRM_DROP_BUTTON_ALL { HelpId = HID_CONFIRM_DROP_BUTTON_ALL ; }; -hidspecial HID_DSBROWSER_BOOKMARK_SELECTED { HelpId = HID_DSBROWSER_BOOKMARK_SELECTED ; }; -hidspecial HID_DSADMIN_TABLE_TOOLBOX { HelpId = HID_DSADMIN_TABLE_TOOLBOX ; }; -hidspecial HID_DSADMIN_QUERY_TOOLBOX { HelpId = HID_DSADMIN_QUERY_TOOLBOX ; }; -hidspecial HID_DSADMIN_BOOKMARK_TOOLBOX { HelpId = HID_DSADMIN_BOOKMARK_TOOLBOX ; }; -hidspecial HID_DSADMIN_PAGE_LDAP { HelpId = HID_DSADMIN_PAGE_LDAP ; }; -hidspecial HID_DSADMIN_LDAP_HOSTNAME { HelpId = HID_DSADMIN_LDAP_HOSTNAME ; }; -hidspecial HID_DSADMIN_LDAP_BASEDN { HelpId = HID_DSADMIN_LDAP_BASEDN ; }; -hidspecial HID_DSADMIN_LDAP_PORTNUMBER { HelpId = HID_DSADMIN_LDAP_PORTNUMBER ; }; -hidspecial HID_DSADMIN_PAGE_MOZILLA { HelpId = HID_DSADMIN_PAGE_MOZILLA ; }; -hidspecial HID_DSADMIN_MOZILLA_PROFILE_NAME { HelpId = HID_DSADMIN_MOZILLA_PROFILE_NAME ; }; - -hidspecial HID_TAB_PAGE_USERADMIN { HelpId = HID_TAB_PAGE_USERADMIN ; }; -hidspecial HID_TAB_PAGE_PBUSER { HelpId = HID_TAB_PAGE_PBUSER ; }; -hidspecial HID_TAB_PAGE_PBCHGPWD { HelpId = HID_TAB_PAGE_PBCHGPWD ; }; -hidspecial HID_TAB_PAGE_PBUSERDELETE { HelpId = HID_TAB_PAGE_PBUSERDELETE ; }; -hidspecial HID_TAB_PAGE_TBLGRANTS { HelpId = HID_TAB_PAGE_TBLGRANTS ; }; -hidspecial HID_TAB_PAGE_LBUSER { HelpId = HID_TAB_PAGE_LBUSER ; }; -hidspecial HID_DSBROWSER_BOOKMARKSELECTED { HelpId = HID_DSBROWSER_BOOKMARKSELECTED ; }; -hidspecial HID_DSBROWSER_DISCONNECTING { HelpId = HID_DSBROWSER_DISCONNECTING ; }; -hidspecial HID_DSBROWSER_DIRECTSQL { HelpId = HID_DSBROWSER_DIRECTSQL ; }; -hidspecial HID_DSADMIN_LDAP_ROWCOUNT { HelpId = HID_DSADMIN_LDAP_ROWCOUNT ; }; -hidspecial HID_DLG_PASSWORD { HelpId = HID_DLG_PASSWORD ; }; -hidspecial HID_BROWSER_QUERY_EDITSQL { HelpId = HID_BROWSER_QUERY_EDITSQL ; }; -hidspecial HID_BROWSER_OPEN_DOCUMENT { HelpId = HID_BROWSER_OPEN_DOCUMENT ; }; -hidspecial HID_BROWSER_EDIT_DOCUMENT { HelpId = HID_BROWSER_EDIT_DOCUMENT ; }; -hidspecial HID_BROWSER_BEW_DOCUMENT { HelpId = HID_BROWSER_BEW_DOCUMENT ; }; - -hidspecial HID_DLGIDX_NEWINDEX { HelpId = HID_DLGIDX_NEWINDEX; } -hidspecial HID_DLGIDX_DROPINDEX { HelpId = HID_DLGIDX_DROPINDEX; } -hidspecial HID_DLGIDX_RENAMEINDEX { HelpId = HID_DLGIDX_RENAMEINDEX; } -hidspecial HID_DLGIDX_SAVEINDEX { HelpId = HID_DLGIDX_SAVEINDEX; } -hidspecial HID_DLGIDX_RESETINDEX { HelpId = HID_DLGIDX_RESETINDEX; } -hidspecial HID_DLGIDX_INDEXLIST { HelpId = HID_DLGIDX_INDEXLIST; } -hidspecial UID_DLGINDEX_INDEXDETAILS_BACK { HelpId = UID_DLGINDEX_INDEXDETAILS_BACK; } -hidspecial UID_DLGINDEX_INDEXDETAILS_MAIN { HelpId = UID_DLGINDEX_INDEXDETAILS_MAIN; } -hidspecial HID_DLGINDEX_INDEXDETAILS_FIELD { HelpId = HID_DLGINDEX_INDEXDETAILS_FIELD; } -hidspecial HID_DLGINDEX_INDEXDETAILS_SORTORDER { HelpId = HID_DLGINDEX_INDEXDETAILS_SORTORDER; } -hidspecial HID_DOCLINKEDIT_URL { HelpId = HID_DOCLINKEDIT_URL; } - -hidspecial HID_QUERY_SQLMODE { HelpId = HID_QUERY_SQLMODE ; }; -hidspecial HID_BROWSER_REFRESH_REBUILDVIEW { HelpId = HID_BROWSER_REFRESH_REBUILDVIEW ; }; -hidspecial HID_BROWSER_RENAME_ENTRY { HelpId = HID_BROWSER_RENAME_ENTRY ; }; - -hidspecial HID_QUERY_EDIT_JOINCONNECTION { HelpId = HID_QUERY_EDIT_JOINCONNECTION ; }; - -hidspecial HID_DLG_QRY_WINDOW_CONTROL { HelpId = HID_DLG_QRY_WINDOW_CONTROL ; }; -hidspecial HID_DLG_QRY_LEFT_TABLE { HelpId = HID_DLG_QRY_LEFT_TABLE ; }; -hidspecial HID_DLG_QRY_RIGHT_TABLE { HelpId = HID_DLG_QRY_RIGHT_TABLE ; }; - -hidspecial HID_DLG_REL_CASC_DEL { HelpId = HID_DLG_REL_CASC_DEL ; }; -hidspecial HID_DLG_REL_NO_CASC_DEL { HelpId = HID_DLG_REL_NO_CASC_DEL ; }; -hidspecial HID_DLG_REL_CASC_DEL_NULL { HelpId = HID_DLG_REL_CASC_DEL_NULL ; }; -hidspecial HID_DLG_REL_CASC_DEL_DEFAULT { HelpId = HID_DLG_REL_CASC_DEL_DEFAULT ; }; - -hidspecial HID_DLG_REL_CASC_UPD { HelpId = HID_DLG_REL_CASC_UPD ; }; -hidspecial HID_DLG_REL_NO_CASC_UPD { HelpId = HID_DLG_REL_NO_CASC_UPD ; }; -hidspecial HID_DLG_REL_CASC_UPD_NULL { HelpId = HID_DLG_REL_CASC_UPD_NULL ; }; -hidspecial HID_DLG_REL_CASC_UPD_DEFAULT { HelpId = HID_DLG_REL_CASC_UPD_DEFAULT ; }; -hidspecial HID_BROWSER_SAVE_RECORD { HelpId = HID_BROWSER_SAVE_RECORD ; }; -hidspecial HID_BROWSER_UNDO_RECORD { HelpId = HID_BROWSER_UNDO_RECORD ; }; +hidspecial HID_CTL_QRYDGNTAB { HelpId = HID_CTL_QRYDGNTAB; }; +hidspecial HID_DLG_QRY_JOIN { HelpId = HID_DLG_QRY_JOIN; }; +hidspecial HID_DLG_QRY_JOINTYPE { HelpId = HID_DLG_QRY_JOINTYPE; }; +hidspecial HID_DLG_QRY_HELPTEXT { HelpId = HID_DLG_QRY_HELPTEXT; }; + +hidspecial HID_CTL_QRYDGNCRIT { HelpId = HID_CTL_QRYDGNCRIT; }; +hidspecial HID_QRYDGN_ROW_VISIBLE { HelpId = HID_QRYDGN_ROW_VISIBLE; }; +hidspecial HID_QRYDGN_ROW_TABLE { HelpId = HID_QRYDGN_ROW_TABLE; }; +hidspecial HID_QRYDGN_ROW_FIELD { HelpId = HID_QRYDGN_ROW_FIELD; }; +hidspecial HID_QRYDGN_ROW_ORDER { HelpId = HID_QRYDGN_ROW_ORDER; }; +hidspecial HID_QRYDGN_ROW_FUNCTION { HelpId = HID_QRYDGN_ROW_FUNCTION; }; +hidspecial HID_QRYDGN_ROW_ALIAS { HelpId = HID_QRYDGN_ROW_ALIAS; }; +hidspecial HID_QRYDGN_ROW_CRIT { HelpId = HID_QRYDGN_ROW_CRIT; }; + +hidspecial HID_QUERY_FUNCTION { HelpId = HID_QUERY_FUNCTION; }; +hidspecial HID_QUERY_TABLENAME { HelpId = HID_QUERY_TABLENAME; }; +hidspecial HID_QUERY_ALIASNAME { HelpId = HID_QUERY_ALIASNAME; }; +hidspecial HID_QUERY_DISTINCT { HelpId = HID_QUERY_DISTINCT; }; + +hidspecial HID_DSADMIN_QUERYADMINISTRATION { HelpId = HID_DSADMIN_QUERYADMINISTRATION; }; +hidspecial HID_DSADMIN_QUERIES { HelpId = HID_DSADMIN_QUERIES; }; +hidspecial HID_DSADMIN_QUERIES_NEW { HelpId = HID_DSADMIN_QUERIES_NEW; }; +hidspecial HID_DSADMIN_QUERIES_EDIT { HelpId = HID_DSADMIN_QUERIES_EDIT; }; +hidspecial HID_DSADMIN_QUERIES_DELETE { HelpId = HID_DSADMIN_QUERIES_DELETE; }; + +hidspecial HID_TAB_DESIGN_TABLE_DESC { HelpId = HID_TAB_DESIGN_TABLE_DESC; }; +hidspecial HID_TAB_DESIGN_FIELDCONTROL { HelpId = HID_TAB_DESIGN_FIELDCONTROL; }; +hidspecial HID_TABLE_DESIGN_HELP_WINDOW { HelpId = HID_TABLE_DESIGN_HELP_WINDOW; }; +hidspecial HID_TAB_DESIGN_DESCWIN { HelpId = HID_TAB_DESIGN_DESCWIN; }; +hidspecial HID_TAB_DESIGN_TABLE_PROPS { HelpId = HID_TAB_DESIGN_TABLE_PROPS; }; +hidspecial HID_TABDESIGN_BACKGROUND { HelpId = HID_TABDESIGN_BACKGROUND; }; +hidspecial HID_CTL_TABLEEDIT { HelpId = HID_CTL_TABLEEDIT; }; +hidspecial HID_TABDESIGN_NAMECELL { HelpId = HID_TABDESIGN_NAMECELL; }; +hidspecial HID_TABDESIGN_TYPECELL { HelpId = HID_TABDESIGN_TYPECELL; }; +hidspecial HID_TABDESIGN_COMMENTCELL { HelpId = HID_TABDESIGN_COMMENTCELL; }; +hidspecial HID_TABDESIGN_HELPTEXT { HelpId = HID_TABDESIGN_HELPTEXT; }; + +hidspecial SID_TABLEDESIGN_INSERTROWS { HelpId = SID_TABLEDESIGN_INSERTROWS; }; +hidspecial SID_TABLEDESIGN_TABED_PRIMARYKEY { HelpId = SID_TABLEDESIGN_TABED_PRIMARYKEY; }; +hidspecial HID_TLB_TABLEDESIGN { HelpId = HID_TLB_TABLEDESIGN; }; +hidspecial HID_TAB_DESIGN_HELP_TEXT_FRAME { HelpId = HID_TAB_DESIGN_HELP_TEXT_FRAME; }; +hidspecial HID_TABLE_DESIGN_TABPAGE_GENERAL { HelpId = HID_TABLE_DESIGN_TABPAGE_GENERAL; }; +hidspecial HID_TAB_ENT_DEFAULT { HelpId = HID_TAB_ENT_DEFAULT; }; +hidspecial HID_TAB_ENT_FORMAT_SAMPLE { HelpId = HID_TAB_ENT_FORMAT_SAMPLE; }; +hidspecial HID_TAB_ENT_FORMAT { HelpId = HID_TAB_ENT_FORMAT; }; +hidspecial HID_TAB_ENT_BOOL_DEFAULT { HelpId = HID_TAB_ENT_BOOL_DEFAULT; }; +hidspecial HID_TAB_ENT_REQUIRED { HelpId = HID_TAB_ENT_REQUIRED; }; +hidspecial HID_TAB_ENT_AUTOINCREMENT { HelpId = HID_TAB_ENT_AUTOINCREMENT; }; +hidspecial HID_TAB_ENT_TEXT_LEN { HelpId = HID_TAB_ENT_TEXT_LEN; }; +hidspecial HID_TAB_ENT_TYPE { HelpId = HID_TAB_ENT_TYPE; }; +hidspecial HID_TAB_ENT_COLUMNNAME { HelpId = HID_TAB_ENT_COLUMNNAME; }; +hidspecial HID_TAB_ENT_NUMTYP { HelpId = HID_TAB_ENT_NUMTYP; }; +hidspecial HID_TAB_ENT_LEN { HelpId = HID_TAB_ENT_LEN; }; +hidspecial HID_TAB_ENT_SCALE { HelpId = HID_TAB_ENT_SCALE; }; +hidspecial HID_BROWSER_TABLE_CREATE_DESIGN { HelpId = HID_BROWSER_TABLE_CREATE_DESIGN; }; +hidspecial HID_BROWSER_TABLE_EDIT { HelpId = HID_BROWSER_TABLE_EDIT; }; +hidspecial HID_BROWSER_TABLE_DELETE { HelpId = HID_BROWSER_TABLE_DELETE; }; +hidspecial HID_SQLERROR_EXCHAIN_ERRORS { HelpId = HID_SQLERROR_EXCHAIN_ERRORS; }; +hidspecial HID_DBACCESS_START { HelpId = HID_DBACCESS_START; }; +hidspecial HID_SQLERROR_EXCHAIN_TEXT { HelpId = HID_SQLERROR_EXCHAIN_TEXT; }; +hidspecial HID_TAB_WIZ_COLUMN_SELECT { HelpId = HID_TAB_WIZ_COLUMN_SELECT; }; +hidspecial HID_TAB_WIZ_TYPE_SELECT { HelpId = HID_TAB_WIZ_TYPE_SELECT; }; +hidspecial HID_TAB_NAMEMATCHING_COLS_AVAIL { HelpId = HID_TAB_NAMEMATCHING_COLS_AVAIL; }; +hidspecial HID_TAB_NAMEMATCHING_COLS_ASSIGN { HelpId = HID_TAB_NAMEMATCHING_COLS_ASSIGN; }; +hidspecial HID_TAB_WIZ_COPYTABLE { HelpId = HID_TAB_WIZ_COPYTABLE; }; +hidspecial HID_TAB_WIZ_TABLENAME_EDIT { HelpId = HID_TAB_WIZ_TABLENAME_EDIT; }; +hidspecial HID_CTL_RELATIONTAB { HelpId = HID_CTL_RELATIONTAB; }; +hidspecial HID_TLB_RELATIONDESIGN { HelpId = HID_TLB_RELATIONDESIGN ; }; +hidspecial HID_RELATIONDIALOG_LEFTFIELDCELL { HelpId = HID_RELATIONDIALOG_LEFTFIELDCELL ; }; +hidspecial HID_RELATIONDIALOG_RIGHTFIELDCELL { HelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL ; }; +hidspecial HID_RELDLG_KEYFIELDS { HelpId = HID_RELDLG_KEYFIELDS ; }; +hidspecial HID_BROWSER_RELATION_DESIGN { HelpId = HID_BROWSER_RELATION_DESIGN ; }; +hidspecial HID_TABLE_DESIGN_NO_CONNECTION { HelpId = HID_TABLE_DESIGN_NO_CONNECTION ; }; +hidspecial HID_DSADMIN_CREATEDATABASE { HelpId = HID_DSADMIN_CREATEDATABASE ; }; +hidspecial HID_BROWSER_COLUMNINFO { HelpId = HID_BROWSER_COLUMNINFO ; }; +hidspecial HID_DSADMIN_USECATALOG { HelpId = HID_DSADMIN_USECATALOG ; }; +hidspecial HID_BROWSER_VIEW_CREATE_DESIGN { HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ; }; +hidspecial HID_DSADMIN_DOCUMENTS { HelpId = HID_DSADMIN_DOCUMENTS ; }; +hidspecial HID_DSADMIN_DOCUMENTLINKS { HelpId = HID_DSADMIN_DOCUMENTLINKS ; }; + +hidspecial HID_DSADMIN_FILTER_EXPLANATION { HelpId = HID_DSADMIN_FILTER_EXPLANATION ; }; +hidspecial HID_CONFIRM_DROP_BUTTON_ALL { HelpId = HID_CONFIRM_DROP_BUTTON_ALL ; }; +hidspecial HID_DSBROWSER_BOOKMARK_SELECTED { HelpId = HID_DSBROWSER_BOOKMARK_SELECTED ; }; +hidspecial HID_DSADMIN_TABLE_TOOLBOX { HelpId = HID_DSADMIN_TABLE_TOOLBOX ; }; +hidspecial HID_DSADMIN_QUERY_TOOLBOX { HelpId = HID_DSADMIN_QUERY_TOOLBOX ; }; +hidspecial HID_DSADMIN_BOOKMARK_TOOLBOX { HelpId = HID_DSADMIN_BOOKMARK_TOOLBOX ; }; +hidspecial HID_DSADMIN_PAGE_LDAP { HelpId = HID_DSADMIN_PAGE_LDAP ; }; +hidspecial HID_DSADMIN_LDAP_HOSTNAME { HelpId = HID_DSADMIN_LDAP_HOSTNAME ; }; +hidspecial HID_DSADMIN_LDAP_BASEDN { HelpId = HID_DSADMIN_LDAP_BASEDN ; }; +hidspecial HID_DSADMIN_LDAP_PORTNUMBER { HelpId = HID_DSADMIN_LDAP_PORTNUMBER ; }; +hidspecial HID_DSADMIN_PAGE_MOZILLA { HelpId = HID_DSADMIN_PAGE_MOZILLA ; }; +hidspecial HID_DSADMIN_MOZILLA_PROFILE_NAME { HelpId = HID_DSADMIN_MOZILLA_PROFILE_NAME ; }; + +hidspecial HID_TAB_PAGE_USERADMIN { HelpId = HID_TAB_PAGE_USERADMIN ; }; +hidspecial HID_TAB_PAGE_PBUSER { HelpId = HID_TAB_PAGE_PBUSER ; }; +hidspecial HID_TAB_PAGE_PBCHGPWD { HelpId = HID_TAB_PAGE_PBCHGPWD ; }; +hidspecial HID_TAB_PAGE_PBUSERDELETE { HelpId = HID_TAB_PAGE_PBUSERDELETE ; }; +hidspecial HID_TAB_PAGE_TBLGRANTS { HelpId = HID_TAB_PAGE_TBLGRANTS ; }; +hidspecial HID_TAB_PAGE_LBUSER { HelpId = HID_TAB_PAGE_LBUSER ; }; +hidspecial HID_DSBROWSER_BOOKMARKSELECTED { HelpId = HID_DSBROWSER_BOOKMARKSELECTED ; }; +hidspecial HID_DSBROWSER_DISCONNECTING { HelpId = HID_DSBROWSER_DISCONNECTING ; }; +hidspecial HID_DSBROWSER_DIRECTSQL { HelpId = HID_DSBROWSER_DIRECTSQL ; }; +hidspecial HID_DSADMIN_LDAP_ROWCOUNT { HelpId = HID_DSADMIN_LDAP_ROWCOUNT ; }; +hidspecial HID_DLG_PASSWORD { HelpId = HID_DLG_PASSWORD ; }; +hidspecial HID_BROWSER_QUERY_EDITSQL { HelpId = HID_BROWSER_QUERY_EDITSQL ; }; +hidspecial HID_BROWSER_OPEN_DOCUMENT { HelpId = HID_BROWSER_OPEN_DOCUMENT ; }; +hidspecial HID_BROWSER_EDIT_DOCUMENT { HelpId = HID_BROWSER_EDIT_DOCUMENT ; }; +hidspecial HID_BROWSER_BEW_DOCUMENT { HelpId = HID_BROWSER_BEW_DOCUMENT ; }; + +hidspecial HID_DLGIDX_NEWINDEX { HelpId = HID_DLGIDX_NEWINDEX; } +hidspecial HID_DLGIDX_DROPINDEX { HelpId = HID_DLGIDX_DROPINDEX; } +hidspecial HID_DLGIDX_RENAMEINDEX { HelpId = HID_DLGIDX_RENAMEINDEX; } +hidspecial HID_DLGIDX_SAVEINDEX { HelpId = HID_DLGIDX_SAVEINDEX; } +hidspecial HID_DLGIDX_RESETINDEX { HelpId = HID_DLGIDX_RESETINDEX; } +hidspecial HID_DLGIDX_INDEXLIST { HelpId = HID_DLGIDX_INDEXLIST; } +hidspecial UID_DLGINDEX_INDEXDETAILS_BACK { HelpId = UID_DLGINDEX_INDEXDETAILS_BACK; } +hidspecial UID_DLGINDEX_INDEXDETAILS_MAIN { HelpId = UID_DLGINDEX_INDEXDETAILS_MAIN; } +hidspecial HID_DLGINDEX_INDEXDETAILS_FIELD { HelpId = HID_DLGINDEX_INDEXDETAILS_FIELD; } +hidspecial HID_DLGINDEX_INDEXDETAILS_SORTORDER { HelpId = HID_DLGINDEX_INDEXDETAILS_SORTORDER; } +hidspecial HID_DOCLINKEDIT_URL { HelpId = HID_DOCLINKEDIT_URL; } + +hidspecial HID_QUERY_SQLMODE { HelpId = HID_QUERY_SQLMODE ; }; +hidspecial HID_BROWSER_REFRESH_REBUILDVIEW { HelpId = HID_BROWSER_REFRESH_REBUILDVIEW ; }; +hidspecial HID_BROWSER_RENAME_ENTRY { HelpId = HID_BROWSER_RENAME_ENTRY ; }; + +hidspecial HID_QUERY_EDIT_JOINCONNECTION { HelpId = HID_QUERY_EDIT_JOINCONNECTION ; }; + +hidspecial HID_DLG_QRY_WINDOW_CONTROL { HelpId = HID_DLG_QRY_WINDOW_CONTROL ; }; +hidspecial HID_DLG_QRY_LEFT_TABLE { HelpId = HID_DLG_QRY_LEFT_TABLE ; }; +hidspecial HID_DLG_QRY_RIGHT_TABLE { HelpId = HID_DLG_QRY_RIGHT_TABLE ; }; + +hidspecial HID_DLG_REL_CASC_DEL { HelpId = HID_DLG_REL_CASC_DEL ; }; +hidspecial HID_DLG_REL_NO_CASC_DEL { HelpId = HID_DLG_REL_NO_CASC_DEL ; }; +hidspecial HID_DLG_REL_CASC_DEL_NULL { HelpId = HID_DLG_REL_CASC_DEL_NULL ; }; +hidspecial HID_DLG_REL_CASC_DEL_DEFAULT { HelpId = HID_DLG_REL_CASC_DEL_DEFAULT ; }; + +hidspecial HID_DLG_REL_CASC_UPD { HelpId = HID_DLG_REL_CASC_UPD ; }; +hidspecial HID_DLG_REL_NO_CASC_UPD { HelpId = HID_DLG_REL_NO_CASC_UPD ; }; +hidspecial HID_DLG_REL_CASC_UPD_NULL { HelpId = HID_DLG_REL_CASC_UPD_NULL ; }; +hidspecial HID_DLG_REL_CASC_UPD_DEFAULT { HelpId = HID_DLG_REL_CASC_UPD_DEFAULT ; }; +hidspecial HID_BROWSER_SAVE_RECORD { HelpId = HID_BROWSER_SAVE_RECORD ; }; +hidspecial HID_BROWSER_UNDO_RECORD { HelpId = HID_BROWSER_UNDO_RECORD ; }; // missing pre processor for helpids so we have to include them here -hidspecial SID_RELATION_ADD_RELATION { HelpId = SID_RELATION_ADD_RELATION ; }; -hidspecial SID_FM_NATIVESQL { HelpId = SID_FM_NATIVESQL ; }; -hidspecial SID_FM_ADDTABLE { HelpId = SID_FM_ADDTABLE ; }; -hidspecial SID_FM_EXECUTE { HelpId = SID_FM_EXECUTE ; }; - -hidspecial HID_DSADMIN_SQL92CHECK { HelpId = HID_DSADMIN_SQL92CHECK ; }; -hidspecial HID_DSADMIN_AUTOINCREMENTVALUE { HelpId = HID_DSADMIN_AUTOINCREMENTVALUE ; }; -hidspecial HID_TAB_AUTOINCREMENTVALUE { HelpId = HID_TAB_AUTOINCREMENTVALUE ; }; -hidspecial HID_DOCUMENT_CREATE_REPWIZ { HelpId = HID_DOCUMENT_CREATE_REPWIZ ; }; -hidspecial HID_DSADMIN_RETRIEVE_AUTO { HelpId = HID_DSADMIN_RETRIEVE_AUTO ; }; -hidspecial HID_DSADMIN_AUTORETRIEVEENABLED { HelpId = HID_DSADMIN_AUTORETRIEVEENABLED ; }; - -hidspecial HID_DSADMIN_PAGE_MYSQL_ODBC { HelpId = HID_DSADMIN_PAGE_MYSQL_ODBC ; }; -hidspecial HID_DSADMIN_PAGE_MYSQL_JDBC { HelpId = HID_DSADMIN_PAGE_MYSQL_JDBC ; }; -hidspecial HID_TAB_PAGE_TABLEPRIVILEGES { HelpId = HID_TAB_PAGE_TABLEPRIVILEGES ; }; - -hidspecial HID_DSADMIN_PAGE_USERDRIVER { HelpId = HID_DSADMIN_PAGE_USERDRIVER ; }; -hidspecial HID_DSADMIN_USER_DEFINED { HelpId = HID_DSADMIN_USER_DEFINED ; }; -hidspecial HID_DSADMIN_USERDEF_OPTIONS { HelpId = HID_DSADMIN_USERDEF_OPTIONS ; }; -hidspecial HID_DSADMIN_CHARSET_USERDEF { HelpId = HID_DSADMIN_CHARSET_USERDEF ; }; - -hidspecial HID_DLG_RENAME { HelpId = HID_DLG_RENAME ; }; - -hidspecial HID_DSADMIN_DBASE_PATH { HelpId = HID_DSADMIN_DBASE_PATH ; }; -hidspecial HID_DSADMIN_MYSQL_DATABASE { HelpId = HID_DSADMIN_MYSQL_DATABASE ; }; -hidspecial HID_DSADMIN_MYSQL_ODBC_DATASOURCE { HelpId = HID_DSADMIN_MYSQL_ODBC_DATASOURCE ; }; -hidspecial HID_DSADMIN_ODBC_DATASOURCE { HelpId = HID_DSADMIN_ODBC_DATASOURCE ; }; -hidspecial HID_DSADMIN_ADABAS_DATABASE { HelpId = HID_DSADMIN_ADABAS_DATABASE ; }; -hidspecial HID_DSADMIN_MSACCESS_MDB_FILE { HelpId = HID_DSADMIN_MSACCESS_MDB_FILE ; }; -hidspecial HID_DSADMIN_PAGE_MSACCESS { HelpId = HID_DSADMIN_PAGE_MSACCESS ; }; -hidspecial HID_DSADMIN_FLAT_PATH { HelpId = HID_DSADMIN_FLAT_PATH ; }; -hidspecial HID_DSADMIN_CALC_PATH { HelpId = HID_DSADMIN_CALC_PATH ; }; -hidspecial HID_DSADMIN_ADVANCED { HelpId = HID_DSADMIN_ADVANCED ; }; -hidspecial HID_DSADMIN_BOOLEANCOMPARISON { HelpId = HID_DSADMIN_BOOLEANCOMPARISON ; }; -hidspecial HID_DSADMIN_ORACLE_DATABASE { HelpId = HID_DSADMIN_ORACLE_DATABASE ; }; - -hidspecial UID_APP_VIEW { HelpId = UID_APP_VIEW ; }; -hidspecial HID_APP_TABLE_TREE { HelpId = HID_APP_TABLE_TREE ; }; -hidspecial HID_APP_FORM_TREE { HelpId = HID_APP_FORM_TREE ; }; -hidspecial HID_APP_QUERY_TREE { HelpId = HID_APP_QUERY_TREE ; }; -hidspecial HID_APP_REPORT_TREE { HelpId = HID_APP_REPORT_TREE ; }; -hidspecial UID_APP_DETAIL_VIEW { HelpId = UID_APP_DETAIL_VIEW; }; -hidspecial UID_APP_VIEW_VERT_SPLIT { HelpId = UID_APP_VIEW_VERT_SPLIT ; }; -hidspecial UID_APP_VIEW_BORDER_WIN { HelpId = UID_APP_VIEW_BORDER_WIN ; }; -hidspecial HID_APP_CREATION_LIST { HelpId = HID_APP_CREATION_LIST ; }; -hidspecial UID_APP_SWAP_VIEW { HelpId = UID_APP_SWAP_VIEW ; }; -hidspecial UID_DLG_TABLE_FILTER { HelpId = UID_DLG_TABLE_FILTER ; }; -hidspecial HID_APP_SWAP_ICONCONTROL { HelpId = HID_APP_SWAP_ICONCONTROL ; }; - -hidspecial HID_DSADMIN_APPENDTABLEALIAS { HelpId = HID_DSADMIN_APPENDTABLEALIAS ; }; -hidspecial HID_DSADMIN_AS_BEFORE_CORRELATION_NAME { HelpId = HID_DSADMIN_AS_BEFORE_CORRELATION_NAME ; }; -hidspecial HID_DSADMIN_CHECK_REQUIRED_FIELDS { HelpId = HID_DSADMIN_CHECK_REQUIRED_FIELDS ; }; -hidspecial HID_DSADMIN_PARAMETERNAMESUBST { HelpId = HID_DSADMIN_PARAMETERNAMESUBST ; }; -hidspecial HID_DSADMIN_IGNOREDRIVER_PRIV { HelpId = HID_DSADMIN_IGNOREDRIVER_PRIV ; }; -hidspecial HID_DSADMIN_HOSTNAME { HelpId = HID_DSADMIN_HOSTNAME ; }; -hidspecial HID_DSADMIN_PORTNUMBER { HelpId = HID_DSADMIN_PORTNUMBER ; }; - -hidspecial HID_APP_HELP_TEXT { HelpId = HID_APP_HELP_TEXT ; }; -hidspecial HID_EXPLORERDLG_COLLECTION { HelpId = HID_EXPLORERDLG_COLLECTION ; }; -hidspecial UID_APP_DATABASE_VIEW { HelpId = UID_APP_DATABASE_VIEW ; }; -hidspecial UID_APP_TASKS_VIEW { HelpId = UID_APP_TASKS_VIEW ; }; -hidspecial UID_APP_CONTAINER_VIEW { HelpId = UID_APP_CONTAINER_VIEW ; }; -hidspecial UID_APP_TASKS_WINDOW { HelpId = UID_APP_TASKS_WINDOW ; }; -hidspecial HID_APP_DESCRIPTION_TEXT { HelpId = HID_APP_DESCRIPTION_TEXT ; }; -hidspecial UID_APP_DETAILPAGE_HELPER { HelpId = UID_APP_DETAILPAGE_HELPER ; }; - -hidspecial HID_APP_VIEW_PREVIEW_CB { HelpId = HID_APP_VIEW_PREVIEW_CB ; }; -hidspecial HID_APP_VIEW_PREVIEW_1 { HelpId = HID_APP_VIEW_PREVIEW_1 ; }; -hidspecial HID_APP_VIEW_PREVIEW_2 { HelpId = HID_APP_VIEW_PREVIEW_2 ; }; -hidspecial UID_APP_VIEW_HORZ_SPLIT { HelpId = UID_APP_VIEW_HORZ_SPLIT ; }; -hidspecial UID_APP_VIEW_PREVIEW_1 { HelpId = UID_APP_VIEW_PREVIEW_1 ; }; -hidspecial HID_APP_VIEW_PREVIEW_3 { HelpId = HID_APP_VIEW_PREVIEW_3 ; }; - -hidspecial HID_DSADMIN_TYPE_DIALOG { HelpId = HID_DSADMIN_TYPE_DIALOG ; }; -hidspecial HID_DSADMIN_ENABLEOUTERJOIN { HelpId = HID_DSADMIN_ENABLEOUTERJOIN ; }; -hidspecial HID_DSADMIN_ADABASADMIN { HelpId = HID_DSADMIN_ADABASADMIN ; }; -hidspecial HID_DSADMIN_USERADMIN { HelpId = HID_DSADMIN_USERADMIN ; }; - -hidspecial HID_DBWIZ_PREVIOUS { HelpId = HID_DBWIZ_PREVIOUS ; }; -hidspecial HID_DBWIZ_NEXT { HelpId = HID_DBWIZ_NEXT ; }; -hidspecial HID_DBWIZ_CANCEL { HelpId = HID_DBWIZ_CANCEL ; }; -hidspecial HID_DBWIZ_FINISH { HelpId = HID_DBWIZ_FINISH ; }; -hidspecial UID_DBWIZ_HELP { HelpId = UID_DBWIZ_HELP ; }; - -hidspecial HID_DSADMIN_CATALOG { HelpId = HID_DSADMIN_CATALOG ; }; -hidspecial HID_DSADMIN_SCHEMA { HelpId = HID_DSADMIN_SCHEMA ; }; -hidspecial HID_DSADMIN_IGNOREINDEXAPPENDIX { HelpId = HID_DSADMIN_IGNOREINDEXAPPENDIX ; }; - -hidspecial HID_PAGE_DBWIZARD_GENERALPAGE { HelpId = HID_PAGE_DBWIZARD_GENERALPAGE ; }; -hidspecial HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE { HelpId = HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE ; }; -hidspecial HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE { HelpId = HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE ; }; - -hidspecial HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION { HelpId = HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION ; }; -hidspecial HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION { HelpId = HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION ; }; +hidspecial SID_RELATION_ADD_RELATION { HelpId = SID_RELATION_ADD_RELATION ; }; +hidspecial SID_FM_NATIVESQL { HelpId = SID_FM_NATIVESQL ; }; +hidspecial SID_FM_ADDTABLE { HelpId = SID_FM_ADDTABLE ; }; +hidspecial SID_FM_EXECUTE { HelpId = SID_FM_EXECUTE ; }; + +hidspecial HID_DSADMIN_SQL92CHECK { HelpId = HID_DSADMIN_SQL92CHECK ; }; +hidspecial HID_DSADMIN_AUTOINCREMENTVALUE { HelpId = HID_DSADMIN_AUTOINCREMENTVALUE ; }; +hidspecial HID_TAB_AUTOINCREMENTVALUE { HelpId = HID_TAB_AUTOINCREMENTVALUE ; }; +hidspecial HID_DOCUMENT_CREATE_REPWIZ { HelpId = HID_DOCUMENT_CREATE_REPWIZ ; }; +hidspecial HID_DSADMIN_RETRIEVE_AUTO { HelpId = HID_DSADMIN_RETRIEVE_AUTO ; }; +hidspecial HID_DSADMIN_AUTORETRIEVEENABLED { HelpId = HID_DSADMIN_AUTORETRIEVEENABLED ; }; + +hidspecial HID_DSADMIN_PAGE_MYSQL_ODBC { HelpId = HID_DSADMIN_PAGE_MYSQL_ODBC ; }; +hidspecial HID_DSADMIN_PAGE_MYSQL_JDBC { HelpId = HID_DSADMIN_PAGE_MYSQL_JDBC ; }; +hidspecial HID_TAB_PAGE_TABLEPRIVILEGES { HelpId = HID_TAB_PAGE_TABLEPRIVILEGES ; }; + +hidspecial HID_DSADMIN_PAGE_USERDRIVER { HelpId = HID_DSADMIN_PAGE_USERDRIVER ; }; +hidspecial HID_DSADMIN_USER_DEFINED { HelpId = HID_DSADMIN_USER_DEFINED ; }; +hidspecial HID_DSADMIN_USERDEF_OPTIONS { HelpId = HID_DSADMIN_USERDEF_OPTIONS ; }; +hidspecial HID_DSADMIN_CHARSET_USERDEF { HelpId = HID_DSADMIN_CHARSET_USERDEF ; }; + +hidspecial HID_DLG_RENAME { HelpId = HID_DLG_RENAME ; }; + +hidspecial HID_DSADMIN_DBASE_PATH { HelpId = HID_DSADMIN_DBASE_PATH ; }; +hidspecial HID_DSADMIN_MYSQL_DATABASE { HelpId = HID_DSADMIN_MYSQL_DATABASE ; }; +hidspecial HID_DSADMIN_MYSQL_ODBC_DATASOURCE { HelpId = HID_DSADMIN_MYSQL_ODBC_DATASOURCE ; }; +hidspecial HID_DSADMIN_ODBC_DATASOURCE { HelpId = HID_DSADMIN_ODBC_DATASOURCE ; }; +hidspecial HID_DSADMIN_ADABAS_DATABASE { HelpId = HID_DSADMIN_ADABAS_DATABASE ; }; +hidspecial HID_DSADMIN_MSACCESS_MDB_FILE { HelpId = HID_DSADMIN_MSACCESS_MDB_FILE ; }; +hidspecial HID_DSADMIN_PAGE_MSACCESS { HelpId = HID_DSADMIN_PAGE_MSACCESS ; }; +hidspecial HID_DSADMIN_FLAT_PATH { HelpId = HID_DSADMIN_FLAT_PATH ; }; +hidspecial HID_DSADMIN_CALC_PATH { HelpId = HID_DSADMIN_CALC_PATH ; }; +hidspecial HID_DSADMIN_ADVANCED { HelpId = HID_DSADMIN_ADVANCED ; }; +hidspecial HID_DSADMIN_BOOLEANCOMPARISON { HelpId = HID_DSADMIN_BOOLEANCOMPARISON ; }; +hidspecial HID_DSADMIN_ORACLE_DATABASE { HelpId = HID_DSADMIN_ORACLE_DATABASE ; }; + +hidspecial UID_APP_VIEW { HelpId = UID_APP_VIEW ; }; +hidspecial HID_APP_TABLE_TREE { HelpId = HID_APP_TABLE_TREE ; }; +hidspecial HID_APP_FORM_TREE { HelpId = HID_APP_FORM_TREE ; }; +hidspecial HID_APP_QUERY_TREE { HelpId = HID_APP_QUERY_TREE ; }; +hidspecial HID_APP_REPORT_TREE { HelpId = HID_APP_REPORT_TREE ; }; +hidspecial UID_APP_DETAIL_VIEW { HelpId = UID_APP_DETAIL_VIEW; }; +hidspecial UID_APP_VIEW_VERT_SPLIT { HelpId = UID_APP_VIEW_VERT_SPLIT ; }; +hidspecial UID_APP_VIEW_BORDER_WIN { HelpId = UID_APP_VIEW_BORDER_WIN ; }; +hidspecial HID_APP_CREATION_LIST { HelpId = HID_APP_CREATION_LIST ; }; +hidspecial UID_APP_SWAP_VIEW { HelpId = UID_APP_SWAP_VIEW ; }; +hidspecial UID_DLG_TABLE_FILTER { HelpId = UID_DLG_TABLE_FILTER ; }; +hidspecial HID_APP_SWAP_ICONCONTROL { HelpId = HID_APP_SWAP_ICONCONTROL ; }; + +hidspecial HID_DSADMIN_APPENDTABLEALIAS { HelpId = HID_DSADMIN_APPENDTABLEALIAS ; }; +hidspecial HID_DSADMIN_AS_BEFORE_CORRELATION_NAME { HelpId = HID_DSADMIN_AS_BEFORE_CORRELATION_NAME ; }; +hidspecial HID_DSADMIN_CHECK_REQUIRED_FIELDS { HelpId = HID_DSADMIN_CHECK_REQUIRED_FIELDS ; }; +hidspecial HID_DSADMIN_PARAMETERNAMESUBST { HelpId = HID_DSADMIN_PARAMETERNAMESUBST ; }; +hidspecial HID_DSADMIN_IGNOREDRIVER_PRIV { HelpId = HID_DSADMIN_IGNOREDRIVER_PRIV ; }; +hidspecial HID_DSADMIN_HOSTNAME { HelpId = HID_DSADMIN_HOSTNAME ; }; +hidspecial HID_DSADMIN_PORTNUMBER { HelpId = HID_DSADMIN_PORTNUMBER ; }; + +hidspecial HID_APP_HELP_TEXT { HelpId = HID_APP_HELP_TEXT ; }; +hidspecial HID_EXPLORERDLG_COLLECTION { HelpId = HID_EXPLORERDLG_COLLECTION ; }; +hidspecial UID_APP_DATABASE_VIEW { HelpId = UID_APP_DATABASE_VIEW ; }; +hidspecial UID_APP_TASKS_VIEW { HelpId = UID_APP_TASKS_VIEW ; }; +hidspecial UID_APP_CONTAINER_VIEW { HelpId = UID_APP_CONTAINER_VIEW ; }; +hidspecial UID_APP_TASKS_WINDOW { HelpId = UID_APP_TASKS_WINDOW ; }; +hidspecial HID_APP_DESCRIPTION_TEXT { HelpId = HID_APP_DESCRIPTION_TEXT ; }; +hidspecial UID_APP_DETAILPAGE_HELPER { HelpId = UID_APP_DETAILPAGE_HELPER ; }; + +hidspecial HID_APP_VIEW_PREVIEW_CB { HelpId = HID_APP_VIEW_PREVIEW_CB ; }; +hidspecial HID_APP_VIEW_PREVIEW_1 { HelpId = HID_APP_VIEW_PREVIEW_1 ; }; +hidspecial HID_APP_VIEW_PREVIEW_2 { HelpId = HID_APP_VIEW_PREVIEW_2 ; }; +hidspecial UID_APP_VIEW_HORZ_SPLIT { HelpId = UID_APP_VIEW_HORZ_SPLIT ; }; +hidspecial UID_APP_VIEW_PREVIEW_1 { HelpId = UID_APP_VIEW_PREVIEW_1 ; }; +hidspecial HID_APP_VIEW_PREVIEW_3 { HelpId = HID_APP_VIEW_PREVIEW_3 ; }; + +hidspecial HID_DSADMIN_TYPE_DIALOG { HelpId = HID_DSADMIN_TYPE_DIALOG ; }; +hidspecial HID_DSADMIN_ENABLEOUTERJOIN { HelpId = HID_DSADMIN_ENABLEOUTERJOIN ; }; +hidspecial HID_DSADMIN_ADABASADMIN { HelpId = HID_DSADMIN_ADABASADMIN ; }; +hidspecial HID_DSADMIN_USERADMIN { HelpId = HID_DSADMIN_USERADMIN ; }; + +hidspecial HID_DBWIZ_PREVIOUS { HelpId = HID_DBWIZ_PREVIOUS ; }; +hidspecial HID_DBWIZ_NEXT { HelpId = HID_DBWIZ_NEXT ; }; +hidspecial HID_DBWIZ_CANCEL { HelpId = HID_DBWIZ_CANCEL ; }; +hidspecial HID_DBWIZ_FINISH { HelpId = HID_DBWIZ_FINISH ; }; +hidspecial UID_DBWIZ_HELP { HelpId = UID_DBWIZ_HELP ; }; + +hidspecial HID_DSADMIN_CATALOG { HelpId = HID_DSADMIN_CATALOG ; }; +hidspecial HID_DSADMIN_SCHEMA { HelpId = HID_DSADMIN_SCHEMA ; }; +hidspecial HID_DSADMIN_IGNOREINDEXAPPENDIX { HelpId = HID_DSADMIN_IGNOREINDEXAPPENDIX ; }; + +hidspecial HID_PAGE_DBWIZARD_GENERALPAGE { HelpId = HID_PAGE_DBWIZARD_GENERALPAGE ; }; +hidspecial HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE { HelpId = HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE ; }; +hidspecial HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE { HelpId = HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE ; }; + +hidspecial HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION { HelpId = HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION ; }; +hidspecial HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION { HelpId = HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION ; }; hidspecial SID_INDEXDESIGN { HelpId = SID_INDEXDESIGN; }; hidspecial SID_DOCUMENT_DATA_SOURCE { HelpId = SID_DOCUMENT_DATA_SOURCE; }; @@ -425,94 +425,94 @@ hidspecial SID_DB_APP_SENDREPORTASMAIL { HelpId = SID_DB_APP_SENDREPORTASMAIL; } hidspecial SID_DB_APP_SENDREPORTTOWRITER { HelpId = SID_DB_APP_SENDREPORTTOWRITER; }; hidspecial SID_DB_NEW_VIEW_SQL { HelpId = SID_DB_NEW_VIEW_SQL; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE ; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE { HelpId = HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE { HelpId = HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE ; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES ; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES ; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES ; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION ; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR ; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR ; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR ; }; -hidspecial HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR ; }; +hidspecial HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR ; }; -hidspecial HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION { HelpId = HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION ; }; -hidspecial HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION { HelpId = HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION ; }; +hidspecial HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION { HelpId = HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION ; }; +hidspecial HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION { HelpId = HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION ; }; -hidspecial HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER ; }; -hidspecial HID_PAGE_DBWIZARD_LDAP_ET_BASEDN { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_BASEDN ; }; -hidspecial HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER ; }; -hidspecial HID_PAGE_DBWIZARD_LDAP_CB_USESSL { HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ; }; -hidspecial HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION { HelpId = HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION ; }; +hidspecial HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER ; }; +hidspecial HID_PAGE_DBWIZARD_LDAP_ET_BASEDN { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_BASEDN ; }; +hidspecial HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER ; }; +hidspecial HID_PAGE_DBWIZARD_LDAP_CB_USESSL { HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ; }; +hidspecial HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION { HelpId = HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION ; }; -hidspecial HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME { HelpId = HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME ; }; -hidspecial HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME { HelpId = HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME ; }; +hidspecial HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME { HelpId = HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME ; }; +hidspecial HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME { HelpId = HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME ; }; -hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC ; }; -hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC ; }; +hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC ; }; +hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC ; }; -hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME ; }; -hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER ; }; -hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT ; }; -hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS ; }; -hidspecial HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS { HelpId = HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS ; }; +hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME ; }; +hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER ; }; +hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT ; }; +hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS ; }; +hidspecial HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS { HelpId = HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS ; }; -hidspecial HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL ; }; -hidspecial HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL { HelpId = HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL ; }; +hidspecial HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL ; }; +hidspecial HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL { HelpId = HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL ; }; -hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME ; }; -hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER ; }; -hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT ; }; -hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS ; }; -hidspecial HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS { HelpId = HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS ; }; +hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME ; }; +hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER ; }; +hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT ; }; +hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS ; }; +hidspecial HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS { HelpId = HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS ; }; -hidspecial HID_PAGE_DBWIZARD_ADO_ET_ADOURL { HelpId = HID_PAGE_DBWIZARD_ADO_ET_ADOURL ; }; -hidspecial HID_PAGE_DBWIZARD_ADO_PB_ADOURL { HelpId = HID_PAGE_DBWIZARD_ADO_PB_ADOURL ; }; -hidspecial HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION { HelpId = HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION ; }; +hidspecial HID_PAGE_DBWIZARD_ADO_ET_ADOURL { HelpId = HID_PAGE_DBWIZARD_ADO_ET_ADOURL ; }; +hidspecial HID_PAGE_DBWIZARD_ADO_PB_ADOURL { HelpId = HID_PAGE_DBWIZARD_ADO_PB_ADOURL ; }; +hidspecial HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION { HelpId = HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION ; }; -hidspecial HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE { HelpId = HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE ; }; -hidspecial HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE { HelpId = HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE ; }; +hidspecial HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE { HelpId = HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE ; }; +hidspecial HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE { HelpId = HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE ; }; -hidspecial HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH { HelpId = HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH ; }; -hidspecial HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH { HelpId = HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH ; }; -hidspecial HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED { HelpId = HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED ; }; +hidspecial HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH { HelpId = HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH ; }; +hidspecial HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH { HelpId = HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH ; }; +hidspecial HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED { HelpId = HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED ; }; -hidspecial HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED { HelpId = HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED ; }; -hidspecial HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME { HelpId = HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME ; }; +hidspecial HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED { HelpId = HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED ; }; +hidspecial HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME { HelpId = HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME ; }; hidspecial HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE { HelpId = HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE ; }; hidspecial HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE { HelpId = HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE ; }; -hidspecial HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD { HelpId = HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD ; }; -hidspecial HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS { HelpId = HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS ; }; -hidspecial HID_DSADMIN_USESSL_LDAP { HelpId = HID_DSADMIN_USESSL_LDAP ; }; -hidspecial HID_DSADMIN_DOSLINEENDS { HelpId = HID_DSADMIN_DOSLINEENDS ; }; -hidspecial SID_DB_QUERY_PREVIEW { HelpId = SID_DB_QUERY_PREVIEW ; }; -hidspecial HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE ; }; -hidspecial HID_PAGE_DBWIZARD_USERDEFINED_BROWSE { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_BROWSE ; }; -hidspecial HID_DLG_DATABASE_WIZARD { HelpId = HID_DLG_DATABASE_WIZARD ; }; -hidspecial HID_BROWSER_ADMINISTRATE { HelpId = HID_BROWSER_ADMINISTRATE ; }; -hidspecial HID_DSADMIN_IGNORECURRENCY { HelpId = HID_DSADMIN_IGNORECURRENCY ; }; -hidspecial HID_DLG_QRY_JOIN_CONTROL { HelpId = HID_DLG_QRY_JOIN_CONTROL ; }; -hidspecial HID_EXTENSION_NOT_PRESENT_DLG { HelpId = HID_EXTENSION_NOT_PRESENT_DLG ; }; -hidspecial HID_DLG_ADABAS_NEWDB { HelpId = HID_DLG_ADABAS_NEWDB; }; -hidspecial HID_DLG_ADABAS_DBNAME { HelpId = HID_DLG_ADABAS_DBNAME ; }; -hidspecial HID_DLG_ADABAS_SYSUSR { HelpId = HID_DLG_ADABAS_SYSUSR ; }; -hidspecial HID_DLG_ADABAS_SYSPWD { HelpId = HID_DLG_ADABAS_SYSPWD ; }; -hidspecial HID_DLG_ADABAS_CONUSR { HelpId = HID_DLG_ADABAS_CONUSR ; }; -hidspecial HID_DLG_ADABAS_CONPWD { HelpId = HID_DLG_ADABAS_CONPWD ; }; -hidspecial HID_DLG_ADABAS_DATADEVSPACE_SIZE { HelpId = HID_DLG_ADABAS_DATADEVSPACE_SIZE ; }; -hidspecial HID_DLG_ADABAS_CACHE_SIZE { HelpId = HID_DLG_ADABAS_CACHE_SIZE ; }; -hidspecial HID_DLG_ADABAS_USR { HelpId = HID_DLG_ADABAS_USR ; }; -hidspecial HID_DLG_ADABAS_DOMAINPWD { HelpId = HID_DLG_ADABAS_DOMAINPWD ; }; -hidspecial HID_DLG_ADABAS_RESTORE { HelpId = HID_DLG_ADABAS_RESTORE ; }; -hidspecial HID_DLG_ADABAS_PBRESTORE { HelpId = HID_DLG_ADABAS_PBRESTORE ; }; -hidspecial HID_DLG_ADABAS_SYSDEVSPACE { HelpId = HID_DLG_ADABAS_SYSDEVSPACE ; }; -hidspecial HID_DLG_ADABAS_PBSYSDEVSPACE { HelpId = HID_DLG_ADABAS_PBSYSDEVSPACE ; }; -hidspecial HID_DLG_ADABAS_TRANSACTIONLOG { HelpId = HID_DLG_ADABAS_TRANSACTIONLOG ; }; -hidspecial HID_DLG_ADABAS_PBTRANSACTIONLOG { HelpId = HID_DLG_ADABAS_PBTRANSACTIONLOG ; }; -hidspecial HID_DLG_ADABAS_DATADEVSPACE { HelpId = HID_DLG_ADABAS_DATADEVSPACE ; }; -hidspecial HID_DLG_ADABAS_PBDATADEVSPACE { HelpId = HID_DLG_ADABAS_PBDATADEVSPACE ; }; -hidspecial HID_DLG_ADABAS_TRANSACTIONLOG_SIZE { HelpId = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE; }; +hidspecial HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD { HelpId = HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD ; }; +hidspecial HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS { HelpId = HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS ; }; +hidspecial HID_DSADMIN_USESSL_LDAP { HelpId = HID_DSADMIN_USESSL_LDAP ; }; +hidspecial HID_DSADMIN_DOSLINEENDS { HelpId = HID_DSADMIN_DOSLINEENDS ; }; +hidspecial SID_DB_QUERY_PREVIEW { HelpId = SID_DB_QUERY_PREVIEW ; }; +hidspecial HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE ; }; +hidspecial HID_PAGE_DBWIZARD_USERDEFINED_BROWSE { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_BROWSE ; }; +hidspecial HID_DLG_DATABASE_WIZARD { HelpId = HID_DLG_DATABASE_WIZARD ; }; +hidspecial HID_BROWSER_ADMINISTRATE { HelpId = HID_BROWSER_ADMINISTRATE ; }; +hidspecial HID_DSADMIN_IGNORECURRENCY { HelpId = HID_DSADMIN_IGNORECURRENCY ; }; +hidspecial HID_DLG_QRY_JOIN_CONTROL { HelpId = HID_DLG_QRY_JOIN_CONTROL ; }; +hidspecial HID_EXTENSION_NOT_PRESENT_DLG { HelpId = HID_EXTENSION_NOT_PRESENT_DLG ; }; +hidspecial HID_DLG_ADABAS_NEWDB { HelpId = HID_DLG_ADABAS_NEWDB; }; +hidspecial HID_DLG_ADABAS_DBNAME { HelpId = HID_DLG_ADABAS_DBNAME ; }; +hidspecial HID_DLG_ADABAS_SYSUSR { HelpId = HID_DLG_ADABAS_SYSUSR ; }; +hidspecial HID_DLG_ADABAS_SYSPWD { HelpId = HID_DLG_ADABAS_SYSPWD ; }; +hidspecial HID_DLG_ADABAS_CONUSR { HelpId = HID_DLG_ADABAS_CONUSR ; }; +hidspecial HID_DLG_ADABAS_CONPWD { HelpId = HID_DLG_ADABAS_CONPWD ; }; +hidspecial HID_DLG_ADABAS_DATADEVSPACE_SIZE { HelpId = HID_DLG_ADABAS_DATADEVSPACE_SIZE ; }; +hidspecial HID_DLG_ADABAS_CACHE_SIZE { HelpId = HID_DLG_ADABAS_CACHE_SIZE ; }; +hidspecial HID_DLG_ADABAS_USR { HelpId = HID_DLG_ADABAS_USR ; }; +hidspecial HID_DLG_ADABAS_DOMAINPWD { HelpId = HID_DLG_ADABAS_DOMAINPWD ; }; +hidspecial HID_DLG_ADABAS_RESTORE { HelpId = HID_DLG_ADABAS_RESTORE ; }; +hidspecial HID_DLG_ADABAS_PBRESTORE { HelpId = HID_DLG_ADABAS_PBRESTORE ; }; +hidspecial HID_DLG_ADABAS_SYSDEVSPACE { HelpId = HID_DLG_ADABAS_SYSDEVSPACE ; }; +hidspecial HID_DLG_ADABAS_PBSYSDEVSPACE { HelpId = HID_DLG_ADABAS_PBSYSDEVSPACE ; }; +hidspecial HID_DLG_ADABAS_TRANSACTIONLOG { HelpId = HID_DLG_ADABAS_TRANSACTIONLOG ; }; +hidspecial HID_DLG_ADABAS_PBTRANSACTIONLOG { HelpId = HID_DLG_ADABAS_PBTRANSACTIONLOG ; }; +hidspecial HID_DLG_ADABAS_DATADEVSPACE { HelpId = HID_DLG_ADABAS_DATADEVSPACE ; }; +hidspecial HID_DLG_ADABAS_PBDATADEVSPACE { HelpId = HID_DLG_ADABAS_PBDATADEVSPACE ; }; +hidspecial HID_DLG_ADABAS_TRANSACTIONLOG_SIZE { HelpId = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE; }; hidspecial HID_MACRO_MIGRATION_BACKUP_LOCATION { HelpId = HID_MACRO_MIGRATION_BACKUP_LOCATION; }; diff --git a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx index 64360c2a72b0..b5f11e7930ee 100644 --- a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx +++ b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ typedef SQLRETURN (SQL_API* TSQLManageDataSource) (SQLHWND hwndParent); // displays the error text for the last error (GetLastError), and returns this error value int displayLastError() { - DWORD dwError = GetLastError(); + DWORD dwError = GetLastError(); LPVOID lpMsgBuf; FormatMessage( diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index cf3ccafded7d..2ea495990045 100644 --- a/reportdesign/inc/ModuleHelper.hxx +++ b/reportdesign/inc/ModuleHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,18 +50,18 @@ namespace rptui // 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 @@ -73,13 +73,13 @@ namespace rptui //========================================================================= //= OModuleClient //========================================================================= - /** base class for objects which uses any global module-specific ressources + /** base class for objects which uses any global module-specific ressources */ class REPORTDESIGN_DLLPUBLIC OModuleClient { public: - inline OModuleClient() { OModule::registerClient(); } - inline ~OModuleClient() { OModule::revokeClient(); } + inline OModuleClient() { OModule::registerClient(); } + inline ~OModuleClient() { OModule::revokeClient(); } }; //========================================================================= @@ -93,7 +93,7 @@ namespace rptui inline ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { } }; //......................................................................... -} // namespace rptui +} // namespace rptui //......................................................................... #endif // _RPTUI_MODULE_HELPER_RPT_HXX_ diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index bec7eb21c0a6..5a99848ede31 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +41,9 @@ namespace rptui { //........................................................................ - typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::beans::XPropertyChangeListener - > OPropertyForward_Base; - + typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::beans::XPropertyChangeListener + > OPropertyForward_Base; + /** \class OPropertyMediator * \brief This class ensures the communication between two XPropertySet instances. * Identical properties will be set at the other propertyset. @@ -52,12 +52,12 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OPropertyMediator : public ::cppu::BaseMutex ,public OPropertyForward_Base { - TPropertyNamePair m_aNameMap; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSource; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xSourceInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo; - sal_Bool m_bInChange; + TPropertyNamePair m_aNameMap; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSource; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xSourceInfo; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo; + sal_Bool m_bInChange; OPropertyMediator(OPropertyMediator&); void operator =(OPropertyMediator&); protected: @@ -87,7 +87,7 @@ namespace rptui void startListening(); }; //........................................................................ -} // namespace rptui +} // namespace rptui //........................................................................ #endif // RPTUI_PROPERTYSETFORWARD_HXX diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index 79582a215b3f..d3e3450b8936 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,23 +82,23 @@ namespace reportdesign * \ingroup reportdesign_api * */ - class REPORTDESIGN_DLLPUBLIC OReportDefinition : public ::cppu::BaseMutex, + class REPORTDESIGN_DLLPUBLIC OReportDefinition : public ::cppu::BaseMutex, public ReportDefinitionBase, public ReportDefinitionPropertySet, public ::comphelper::IEmbeddedHelper { - ::boost::shared_ptr<OReportComponentProperties> m_aProps; + ::boost::shared_ptr<OReportComponentProperties> m_aProps; ::boost::shared_ptr<OReportDefinitionImpl> m_pImpl; private: OReportDefinition(const OReportDefinition&); OReportDefinition& operator=(const OReportDefinition&); - void setSection( const ::rtl::OUString& _sProperty + void setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -116,8 +116,8 @@ namespace reportdesign /// the component we export const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> & xComponent, - const sal_Char* pStreamName, /// the stream name - const sal_Char* pServiceName, /// service name of the component + const sal_Char* pStreamName, /// the stream name + const sal_Char* pServiceName, /// service name of the component /// the argument (XInitialization) const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> & rArguments, @@ -125,7 +125,7 @@ namespace reportdesign const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc, sal_Bool bPlainStream - , const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo); /// neither compress nor encrypt + , const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo); /// neither compress nor encrypt /// write a single output stream /// (to be called either directly or by WriteThroughComponent(...)) @@ -178,7 +178,7 @@ namespace reportdesign /** return the SdrModel of the real model * - * \return + * \return */ ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const; @@ -257,12 +257,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } @@ -328,7 +328,7 @@ namespace reportdesign // document::XEventBroadcaster virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - + // document::XEventListener virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx index 2e6165f175b9..8f1090efd0cc 100644 --- a/reportdesign/inc/ReportHelperDefines.hxx +++ b/reportdesign/inc/ReportHelperDefines.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -190,7 +190,7 @@ virtual ::com::sun::star::lang::Locale SAL_CALL getCharLocaleComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharLocaleComplex( const ::com::sun::star::lang::Locale& _charlocalecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - + #endif // INCLUDED_REPORTHELPERDEFINES_HXX diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx index 13c080fd0a26..1496542c7635 100644 --- a/reportdesign/inc/ReportVisitor.hxx +++ b/reportdesign/inc/ReportVisitor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace reportdesign virtual void traverseReportFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; virtual void traversePageHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; virtual void traversePageFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; - + virtual void traverseGroups(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups>& _xGroups) = 0; virtual void traverseGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup) = 0; virtual void traverseGroupFunctions(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions>& _xFunctions) = 0; diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 2e86a5d80e04..50dc41493594 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ FORWARD_DECLARE_INTERFACE(beans,XPropertySet) namespace rptui { // not all used at the moment -#define RPT_LAYER_FRONT 0 -#define RPT_LAYER_BACK 1 +#define RPT_LAYER_FRONT 0 +#define RPT_LAYER_BACK 1 #define RPT_LAYER_HIDDEN 2 @@ -90,13 +90,13 @@ public: } }; /** returns teh object type depending on the service name - @param _xComponent the report component + @param _xComponent the report component */ REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); typedef ::std::pair< ::rtl::OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter; DECLARE_STL_USTRINGACCESS_MAP(TPropertyConverter , TPropertyNamePair); /** returns the property name map for the givern property id - @param _nObjectId the object id + @param _nObjectId the object id */ REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId); REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport); diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 544e1a6e251e..47b952949795 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +56,8 @@ class REPORTDESIGN_DLLPUBLIC OReportModel : public SdrModel friend class OReportPage; private: - OXUndoEnvironment* m_pUndoEnv; - ::dbaui::OSingleDocumentController* m_pController; + OXUndoEnvironment* m_pUndoEnv; + ::dbaui::OSingleDocumentController* m_pController; ::reportdesign::OReportDefinition* m_pReportDefinition; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); @@ -88,7 +88,7 @@ public: /** returns the page which belongs to a section * - * \param _xSection + * \param _xSection * \return The page or <NULL/> when t´no page could be found. */ OReportPage* getPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 0b16890ef982..c77678ef9002 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +61,8 @@ typedef ::std::multimap< sal_Int16, ::rtl::OUString, ::std::less< sal_Int16 > > class REPORTDESIGN_DLLPUBLIC DlgEdHint: public SfxHint { private: - DlgEdHintKind eHintKind; - OUnoObject* pDlgEdObj; + DlgEdHintKind eHintKind; + OUnoObject* pDlgEdObj; DlgEdHint(DlgEdHint&); void operator =(DlgEdHint&); @@ -71,8 +71,8 @@ typedef ::std::multimap< sal_Int16, ::rtl::OUString, ::std::less< sal_Int16 > > DlgEdHint( DlgEdHintKind eHint ); virtual ~DlgEdHint(); - inline DlgEdHintKind GetKind() const { return eHintKind; } - inline OUnoObject* GetObject() const { return pDlgEdObj; } + inline DlgEdHintKind GetKind() const { return eHintKind; } + inline OUnoObject* GetObject() const { return pDlgEdObj; } }; @@ -87,20 +87,20 @@ public: protected: mutable TMediator m_xMediator; mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener; - //mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> - mutable ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xReportComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection; + //mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> + mutable ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xReportComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xKeepShapeAlive; ::rtl::OUString m_sComponentName; - sal_Bool m_bIsListening; + sal_Bool m_bIsListening; OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); OObjectBase(const ::rtl::OUString& _sComponentName); - virtual ~OObjectBase(); - - inline sal_Bool isListening() const { return m_bIsListening; } + virtual ~OObjectBase(); + + inline sal_Bool isListening() const { return m_bIsListening; } void SetPropsFromRect(const Rectangle& _rRect); @@ -124,7 +124,7 @@ public: virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); virtual void initializeOle() {} - sal_Bool supportsService( const ::rtl::OUString& _sServiceName ) const; + sal_Bool supportsService( const ::rtl::OUString& _sServiceName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); @@ -171,8 +171,8 @@ public: TYPEINFO(); virtual ~OCustomShape(); - - virtual sal_Int32 GetStep() const; + + virtual sal_Int32 GetStep() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); @@ -199,7 +199,7 @@ public: protected: OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,UINT16 _nType); OOle2Obj(const ::rtl::OUString& _sComponentName,UINT16 _nType); - + virtual void NbcMove( const Size& rSize ); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -213,8 +213,8 @@ public: TYPEINFO(); virtual ~OOle2Obj(); - - virtual sal_Int32 GetStep() const; + + virtual sal_Int32 GetStep() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); @@ -241,12 +241,12 @@ protected: OUnoObject(const ::rtl::OUString& _sComponentName ,const ::rtl::OUString& rModelName ,sal_uInt16 _nObjectType); - OUnoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent + OUnoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent ,const ::rtl::OUString& rModelName ,sal_uInt16 _nObjectType); virtual ~OUnoObject(); - + virtual void NbcMove( const Size& rSize ); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcSetLogicRect(const Rectangle& rRect); @@ -258,11 +258,11 @@ protected: public: TYPEINFO(); - virtual sal_Int32 GetStep() const; + virtual sal_Int32 GetStep() const; virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); /** creates the m_xMediator when it doesn't already exist. - @param _bReverse when set to <TRUE/> then the properties from the uno control will be copied into report control + @param _bReverse when set to <TRUE/> then the properties from the uno control will be copied into report control */ void CreateMediator(sal_Bool _bReverse = sal_False); diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index ca90ae3b2521..1313184d0da1 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage std::vector<SdrObject*> m_aTemporaryObjectList; OReportPage(const OReportPage&); - + // methode to remove temporary objects, created by 'special mode' // (BegDragObj) void removeTempObject(SdrObject *_pToRemoveObj); @@ -65,7 +65,7 @@ public: OReportPage( OReportModel& rModel ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,bool bMasterPage = false ); - + virtual SdrPage* Clone() const; using SdrPage::Clone; @@ -74,12 +74,12 @@ public: virtual SdrObject* RemoveObject(ULONG nObjNum); /** returns the index inside the object list which belongs to the report component. - @param _xObject the report component + @param _xObject the report component */ ULONG getIndexOf(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); /** removes the SdrObject which belongs to the report component. - @param _xObject the report component + @param _xObject the report component */ void removeSdrObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); @@ -89,7 +89,7 @@ public: void resetSpecialMode(); /** insert a new SdrObject which belongs to the report component. - @param _xObject the report component + @param _xObject the report component */ void insertObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 3c5920f37a59..1fecb756972f 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.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,187 +28,187 @@ #ifndef _RPTUI_DLGRESID_HRC #define _RPTUI_DLGRESID_HRC -// include ----------------------------------------------------------- +// include ----------------------------------------------------------- #ifndef _SOLAR_HRC #include <svl/solar.hrc> #endif -#define RID_DIALOG_START RID_RPT_START -#define RID_PAGE_START RID_RPT_START -#define RID_ERRORBOX_START RID_RPT_START -#define RID_QUERYBOX_START RID_RPT_START -#define RID_TOOLBOX_START RID_RPT_START -#define RID_BITMAP_START RID_RPT_START -#define RID_IMAGE_START RID_RPT_START -#define RID_IMAGELIST_START RID_RPT_START -#define RID_MENU_START RID_RPT_START -#define RID_STRING_START RID_RPT_START -#define RID_UNTYPED_START RID_RPT_START -#define RID_WARN_START RID_RPT_START -#define RID_CONTROL_START RID_RPT_START +#define RID_DIALOG_START RID_RPT_START +#define RID_PAGE_START RID_RPT_START +#define RID_ERRORBOX_START RID_RPT_START +#define RID_QUERYBOX_START RID_RPT_START +#define RID_TOOLBOX_START RID_RPT_START +#define RID_BITMAP_START RID_RPT_START +#define RID_IMAGE_START RID_RPT_START +#define RID_IMAGELIST_START RID_RPT_START +#define RID_MENU_START RID_RPT_START +#define RID_STRING_START RID_RPT_START +#define RID_UNTYPED_START RID_RPT_START +#define RID_WARN_START RID_RPT_START +#define RID_CONTROL_START RID_RPT_START #define RID_MISC_START RID_RPT_START // Dialog Control Id's ----------------------------------------------------------- -#define RID_GROUPS_SORTING ( RID_DIALOG_START + 0 ) -#define RID_PAGENUMBERS ( RID_DIALOG_START + 1 ) -#define RID_DATETIME_DLG ( RID_DIALOG_START + 2 ) -#define RID_CONDFORMAT ( RID_DIALOG_START + 3 ) -#define WIN_CONDITION ( RID_DIALOG_START + 4 ) -#define RID_NAVIGATOR ( RID_DIALOG_START + 5 ) +#define RID_GROUPS_SORTING ( RID_DIALOG_START + 0 ) +#define RID_PAGENUMBERS ( RID_DIALOG_START + 1 ) +#define RID_DATETIME_DLG ( RID_DIALOG_START + 2 ) +#define RID_CONDFORMAT ( RID_DIALOG_START + 3 ) +#define WIN_CONDITION ( RID_DIALOG_START + 4 ) +#define RID_NAVIGATOR ( RID_DIALOG_START + 5 ) // strings -#define RID_STR_CLASS_FORMATTEDFIELD ( RID_STRING_START + 1 ) -#define RID_STR_CLASS_FIXEDTEXT ( RID_STRING_START + 2 ) -#define RID_STR_CLASS_IMAGECONTROL ( RID_STRING_START + 3 ) -#define RID_STR_PROPTITLE_FIXEDTEXT ( RID_STRING_START + 4 ) -#define RID_STR_PROPTITLE_FORMATTED ( RID_STRING_START + 5 ) -#define RID_STR_PROPTITLE_SHAPE ( RID_STRING_START + 6 ) -#define RID_STR_PROPTITLE_IMAGECONTROL ( RID_STRING_START + 7 ) -#define RID_STR_PROPTITLE_REPORT ( RID_STRING_START + 8 ) -#define RID_STR_PROPTITLE_SECTION ( RID_STRING_START + 9 ) -#define RID_STR_PROPTITLE_FUNCTION ( RID_STRING_START + 10 ) +#define RID_STR_CLASS_FORMATTEDFIELD ( RID_STRING_START + 1 ) +#define RID_STR_CLASS_FIXEDTEXT ( RID_STRING_START + 2 ) +#define RID_STR_CLASS_IMAGECONTROL ( RID_STRING_START + 3 ) +#define RID_STR_PROPTITLE_FIXEDTEXT ( RID_STRING_START + 4 ) +#define RID_STR_PROPTITLE_FORMATTED ( RID_STRING_START + 5 ) +#define RID_STR_PROPTITLE_SHAPE ( RID_STRING_START + 6 ) +#define RID_STR_PROPTITLE_IMAGECONTROL ( RID_STRING_START + 7 ) +#define RID_STR_PROPTITLE_REPORT ( RID_STRING_START + 8 ) +#define RID_STR_PROPTITLE_SECTION ( RID_STRING_START + 9 ) +#define RID_STR_PROPTITLE_FUNCTION ( RID_STRING_START + 10 ) // undo strings -#define RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER ( RID_STRING_START + 11 ) -#define RID_STR_UNDO_ADD_REPORTHEADERFOOTER ( RID_STRING_START + 12 ) -#define RID_STR_UNDO_REMOVE_PAGEHEADERFOOTER ( RID_STRING_START + 13 ) -#define RID_STR_UNDO_ADD_PAGEHEADERFOOTER ( RID_STRING_START + 14 ) -#define RID_STR_UNDO_PROPERTY ( RID_STRING_START + 15 ) -#define RID_STR_UNDO_REMOVE_GROUP ( RID_STRING_START + 16 ) -#define RID_STR_UNDO_APPEND_GROUP ( RID_STRING_START + 17 ) -#define RID_STR_UNDO_MOVE_GROUP ( RID_STRING_START + 18 ) -#define RID_STR_UNDO_CONDITIONAL_FORMATTING ( RID_STRING_START + 19 ) -#define RID_STR_UNDO_REMOVE_SELECTION ( RID_STRING_START + 20 ) -#define RID_STR_UNDO_PASTE ( RID_STRING_START + 21 ) -#define RID_STR_UNDO_CHANGE_SIZE ( RID_STRING_START + 22 ) -#define RID_STR_UNDO_INSERT_CONTROL ( RID_STRING_START + 23 ) -#define RID_STR_UNDO_DELETE_CONTROL ( RID_STRING_START + 24 ) -#define RID_STR_UNDO_GROUP ( RID_STRING_START + 25 ) -#define RID_STR_UNDO_UNGROUP ( RID_STRING_START + 26 ) -#define RID_STR_UNDO_CHANGEPOSITION ( RID_STRING_START + 27 ) -#define RID_STR_UNDO_ADDFUNCTION ( RID_STRING_START + 28 ) -#define RID_STR_UNDO_DELETEFUNCTION ( RID_STRING_START + 29 ) +#define RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER ( RID_STRING_START + 11 ) +#define RID_STR_UNDO_ADD_REPORTHEADERFOOTER ( RID_STRING_START + 12 ) +#define RID_STR_UNDO_REMOVE_PAGEHEADERFOOTER ( RID_STRING_START + 13 ) +#define RID_STR_UNDO_ADD_PAGEHEADERFOOTER ( RID_STRING_START + 14 ) +#define RID_STR_UNDO_PROPERTY ( RID_STRING_START + 15 ) +#define RID_STR_UNDO_REMOVE_GROUP ( RID_STRING_START + 16 ) +#define RID_STR_UNDO_APPEND_GROUP ( RID_STRING_START + 17 ) +#define RID_STR_UNDO_MOVE_GROUP ( RID_STRING_START + 18 ) +#define RID_STR_UNDO_CONDITIONAL_FORMATTING ( RID_STRING_START + 19 ) +#define RID_STR_UNDO_REMOVE_SELECTION ( RID_STRING_START + 20 ) +#define RID_STR_UNDO_PASTE ( RID_STRING_START + 21 ) +#define RID_STR_UNDO_CHANGE_SIZE ( RID_STRING_START + 22 ) +#define RID_STR_UNDO_INSERT_CONTROL ( RID_STRING_START + 23 ) +#define RID_STR_UNDO_DELETE_CONTROL ( RID_STRING_START + 24 ) +#define RID_STR_UNDO_GROUP ( RID_STRING_START + 25 ) +#define RID_STR_UNDO_UNGROUP ( RID_STRING_START + 26 ) +#define RID_STR_UNDO_CHANGEPOSITION ( RID_STRING_START + 27 ) +#define RID_STR_UNDO_ADDFUNCTION ( RID_STRING_START + 28 ) +#define RID_STR_UNDO_DELETEFUNCTION ( RID_STRING_START + 29 ) // title of tab pages -#define RID_STR_DESIGN_VIEW ( RID_STRING_START + 30 ) -#define RID_STR_PREVIEW_VIEW ( RID_STRING_START + 31 ) +#define RID_STR_DESIGN_VIEW ( RID_STRING_START + 30 ) +#define RID_STR_PREVIEW_VIEW ( RID_STRING_START + 31 ) // other -#define STR_RPT_TITLE ( RID_STRING_START + 32 ) -#define STR_RPT_LABEL ( RID_STRING_START + 33 ) -#define STR_RPT_EXPRESSION ( RID_STRING_START + 34 ) -#define STR_RPT_SORTING ( RID_STRING_START + 35 ) -#define STR_RPT_PN_PAGE ( RID_STRING_START + 36 ) -#define STR_RPT_PN_PAGE_OF ( RID_STRING_START + 37 ) -#define STR_RPT_PREFIXCHARS ( RID_STRING_START + 38 ) -#define STR_RPT_YEAR ( RID_STRING_START + 39 ) -#define STR_RPT_QUARTER ( RID_STRING_START + 40 ) -#define STR_RPT_MONTH ( RID_STRING_START + 41 ) -#define STR_RPT_WEEK ( RID_STRING_START + 42 ) -#define STR_RPT_DAY ( RID_STRING_START + 43 ) -#define STR_RPT_HOUR ( RID_STRING_START + 44 ) -#define STR_RPT_MINUTE ( RID_STRING_START + 45 ) -#define STR_RPT_INTERVAL ( RID_STRING_START + 46 ) -#define STR_RPT_HELP_FIELD ( RID_STRING_START + 47 ) -#define STR_RPT_HELP_HEADER ( RID_STRING_START + 48 ) -#define STR_RPT_HELP_FOOTER ( RID_STRING_START + 49 ) -#define STR_RPT_HELP_GROUPON ( RID_STRING_START + 50 ) -#define STR_RPT_HELP_INTERVAL ( RID_STRING_START + 51 ) -#define STR_RPT_HELP_KEEP ( RID_STRING_START + 52 ) -#define STR_RPT_HELP_SORT ( RID_STRING_START + 53 ) -#define RID_STR_GROUPHEADER ( RID_STRING_START + 54 ) -#define RID_STR_GROUPFOOTER ( RID_STRING_START + 55 ) -#define RID_STR_UNDO_REMOVE_FUNCTION ( RID_STRING_START + 56 ) +#define STR_RPT_TITLE ( RID_STRING_START + 32 ) +#define STR_RPT_LABEL ( RID_STRING_START + 33 ) +#define STR_RPT_EXPRESSION ( RID_STRING_START + 34 ) +#define STR_RPT_SORTING ( RID_STRING_START + 35 ) +#define STR_RPT_PN_PAGE ( RID_STRING_START + 36 ) +#define STR_RPT_PN_PAGE_OF ( RID_STRING_START + 37 ) +#define STR_RPT_PREFIXCHARS ( RID_STRING_START + 38 ) +#define STR_RPT_YEAR ( RID_STRING_START + 39 ) +#define STR_RPT_QUARTER ( RID_STRING_START + 40 ) +#define STR_RPT_MONTH ( RID_STRING_START + 41 ) +#define STR_RPT_WEEK ( RID_STRING_START + 42 ) +#define STR_RPT_DAY ( RID_STRING_START + 43 ) +#define STR_RPT_HOUR ( RID_STRING_START + 44 ) +#define STR_RPT_MINUTE ( RID_STRING_START + 45 ) +#define STR_RPT_INTERVAL ( RID_STRING_START + 46 ) +#define STR_RPT_HELP_FIELD ( RID_STRING_START + 47 ) +#define STR_RPT_HELP_HEADER ( RID_STRING_START + 48 ) +#define STR_RPT_HELP_FOOTER ( RID_STRING_START + 49 ) +#define STR_RPT_HELP_GROUPON ( RID_STRING_START + 50 ) +#define STR_RPT_HELP_INTERVAL ( RID_STRING_START + 51 ) +#define STR_RPT_HELP_KEEP ( RID_STRING_START + 52 ) +#define STR_RPT_HELP_SORT ( RID_STRING_START + 53 ) +#define RID_STR_GROUPHEADER ( RID_STRING_START + 54 ) +#define RID_STR_GROUPFOOTER ( RID_STRING_START + 55 ) +#define RID_STR_UNDO_REMOVE_FUNCTION ( RID_STRING_START + 56 ) #define STR_NUMBERED_CONDITION ( RID_STRING_START + 57 ) // Property Browser Headline Id's ----------------------------------------------------------- -#define RID_STR_BRWTITLE_PROPERTIES ( RID_STRING_START + 60 ) -#define RID_STR_BRWTITLE_NO_PROPERTIES ( RID_STRING_START + 61 ) -#define RID_STR_BRWTITLE_MULTISELECT ( RID_STRING_START + 62 ) -#define STR_SHOW_RULER ( RID_STRING_START + 63 ) -#define STR_SHOW_GRID ( RID_STRING_START + 64 ) +#define RID_STR_BRWTITLE_PROPERTIES ( RID_STRING_START + 60 ) +#define RID_STR_BRWTITLE_NO_PROPERTIES ( RID_STRING_START + 61 ) +#define RID_STR_BRWTITLE_MULTISELECT ( RID_STRING_START + 62 ) +#define STR_SHOW_RULER ( RID_STRING_START + 63 ) +#define STR_SHOW_GRID ( RID_STRING_START + 64 ) -#define STR_COLOR_WHITE ( RID_STRING_START + 65 ) -#define STR_CHARCOLOR ( RID_STRING_START + 66 ) -#define STR_CHARBACKGROUND ( RID_STRING_START + 67 ) -#define STR_TRANSPARENT ( RID_STRING_START + 68 ) -#define RID_STR_FIELDSELECTION ( RID_STRING_START + 69 ) +#define STR_COLOR_WHITE ( RID_STRING_START + 65 ) +#define STR_CHARCOLOR ( RID_STRING_START + 66 ) +#define STR_CHARBACKGROUND ( RID_STRING_START + 67 ) +#define STR_TRANSPARENT ( RID_STRING_START + 68 ) +#define RID_STR_FIELDSELECTION ( RID_STRING_START + 69 ) -#define RID_STR_UNDO_ADD_GROUP_HEADER ( RID_STRING_START + 70 ) -#define RID_STR_UNDO_REMOVE_GROUP_HEADER ( RID_STRING_START + 71 ) -#define RID_STR_UNDO_ADD_GROUP_FOOTER ( RID_STRING_START + 72 ) -#define RID_STR_UNDO_REMOVE_GROUP_FOOTER ( RID_STRING_START + 73 ) +#define RID_STR_UNDO_ADD_GROUP_HEADER ( RID_STRING_START + 70 ) +#define RID_STR_UNDO_REMOVE_GROUP_HEADER ( RID_STRING_START + 71 ) +#define RID_STR_UNDO_ADD_GROUP_FOOTER ( RID_STRING_START + 72 ) +#define RID_STR_UNDO_REMOVE_GROUP_FOOTER ( RID_STRING_START + 73 ) -#define RID_STR_PROPPAGE_DEFAULT ( RID_STRING_START + 74 ) -#define RID_STR_PROPPAGE_DATA ( RID_STRING_START + 75 ) +#define RID_STR_PROPPAGE_DEFAULT ( RID_STRING_START + 74 ) +#define RID_STR_PROPPAGE_DATA ( RID_STRING_START + 75 ) -#define RID_STR_FILTER ( RID_STRING_START + 76 ) +#define RID_STR_FILTER ( RID_STRING_START + 76 ) // free -#define RID_STR_FORCENEWPAGE (RID_STRING_START + 78) -#define RID_STR_NEWROWORCOL (RID_STRING_START + 79) -#define RID_STR_KEEPTOGETHER (RID_STRING_START + 80) -#define RID_STR_CANGROW (RID_STRING_START + 81) -#define RID_STR_CANSHRINK (RID_STRING_START + 82) -#define RID_STR_REPEATSECTION (RID_STRING_START + 83) +#define RID_STR_FORCENEWPAGE (RID_STRING_START + 78) +#define RID_STR_NEWROWORCOL (RID_STRING_START + 79) +#define RID_STR_KEEPTOGETHER (RID_STRING_START + 80) +#define RID_STR_CANGROW (RID_STRING_START + 81) +#define RID_STR_CANSHRINK (RID_STRING_START + 82) +#define RID_STR_REPEATSECTION (RID_STRING_START + 83) -#define RID_STR_PROPTITLE_GROUP (RID_STRING_START + 84) -#define RID_STR_PROPTITLE_FIXEDLINE (RID_STRING_START + 85) -#define RID_STR_CLASS_FIXEDLINE (RID_STRING_START + 86) -#define RID_STR_BACKTRANSPARENT (RID_STRING_START + 87) +#define RID_STR_PROPTITLE_GROUP (RID_STRING_START + 84) +#define RID_STR_PROPTITLE_FIXEDLINE (RID_STRING_START + 85) +#define RID_STR_CLASS_FIXEDLINE (RID_STRING_START + 86) +#define RID_STR_BACKTRANSPARENT (RID_STRING_START + 87) #define RID_STR_CONTROLBACKGROUNDTRANSPARENT (RID_STRING_START + 88) #define RID_STR_OVERLAP_OTHER_CONTROL (RID_STRING_START + 89) #define RID_STR_ILLEGAL_POSITION (RID_STRING_START + 90) -#define RID_STR_PAGEHEADERFOOTER_INSERT (RID_STRING_START + 91) -#define RID_STR_PAGEHEADERFOOTER_DELETE (RID_STRING_START + 92) -#define RID_STR_BACKCOLOR (RID_STRING_START + 93) -#define RID_STR_PRINTREPEATEDVALUES (RID_STRING_START + 94) -#define RID_STR_CONDITIONALPRINTEXPRESSION (RID_STRING_START + 95) -#define RID_STR_COLUMNHEADERFOOTER_INSERT (RID_STRING_START + 96) -#define RID_STR_STARTNEWCOLUMN (RID_STRING_START + 97) -#define RID_STR_STARTNEWPAGE (RID_STRING_START + 98) -#define RID_STR_RESETPAGENUMBER (RID_STRING_START + 99) -#define RID_STR_COLUMNHEADERFOOTER_DELETE (RID_STRING_START + 100) -#define RID_STR_MINHEIGHTNEWPAGE (RID_STRING_START + 101) -#define RID_STR_PRINTWHENGROUPCHANGE (RID_STRING_START + 102) -#define RID_STR_REPORTHEADERFOOTER_INSERT (RID_STRING_START + 103) -#define RID_STR_REPORTHEADERFOOTER_DELETE (RID_STRING_START + 104) -#define RID_STR_VISIBLE (RID_STRING_START + 105) +#define RID_STR_PAGEHEADERFOOTER_INSERT (RID_STRING_START + 91) +#define RID_STR_PAGEHEADERFOOTER_DELETE (RID_STRING_START + 92) +#define RID_STR_BACKCOLOR (RID_STRING_START + 93) +#define RID_STR_PRINTREPEATEDVALUES (RID_STRING_START + 94) +#define RID_STR_CONDITIONALPRINTEXPRESSION (RID_STRING_START + 95) +#define RID_STR_COLUMNHEADERFOOTER_INSERT (RID_STRING_START + 96) +#define RID_STR_STARTNEWCOLUMN (RID_STRING_START + 97) +#define RID_STR_STARTNEWPAGE (RID_STRING_START + 98) +#define RID_STR_RESETPAGENUMBER (RID_STRING_START + 99) +#define RID_STR_COLUMNHEADERFOOTER_DELETE (RID_STRING_START + 100) +#define RID_STR_MINHEIGHTNEWPAGE (RID_STRING_START + 101) +#define RID_STR_PRINTWHENGROUPCHANGE (RID_STRING_START + 102) +#define RID_STR_REPORTHEADERFOOTER_INSERT (RID_STRING_START + 103) +#define RID_STR_REPORTHEADERFOOTER_DELETE (RID_STRING_START + 104) +#define RID_STR_VISIBLE (RID_STRING_START + 105) -#define RID_STR_DETAIL (RID_STRING_START + 106) -#define RID_STR_PAGE_HEADER (RID_STRING_START + 107) -#define RID_STR_GROUPKEEPTOGETHER (RID_STRING_START + 108) -#define RID_STR_PAGE_FOOTER (RID_STRING_START + 109) -#define RID_STR_PAGEHEADEROPTION (RID_STRING_START + 110) -#define RID_STR_PAGEFOOTEROPTION (RID_STRING_START + 111) -#define RID_STR_REPORT_HEADER (RID_STRING_START + 112) -#define RID_STR_REPORT_FOOTER (RID_STRING_START + 113) +#define RID_STR_DETAIL (RID_STRING_START + 106) +#define RID_STR_PAGE_HEADER (RID_STRING_START + 107) +#define RID_STR_GROUPKEEPTOGETHER (RID_STRING_START + 108) +#define RID_STR_PAGE_FOOTER (RID_STRING_START + 109) +#define RID_STR_PAGEHEADEROPTION (RID_STRING_START + 110) +#define RID_STR_PAGEFOOTEROPTION (RID_STRING_START + 111) +#define RID_STR_REPORT_HEADER (RID_STRING_START + 112) +#define RID_STR_REPORT_FOOTER (RID_STRING_START + 113) #define RID_STR_SCOPE_GROUP (RID_STRING_START + 114) -#define RID_APP_TITLE (RID_STRING_START + 115) -#define RID_APP_NEW_DOC (RID_STRING_START + 116) -#define RID_STR_UNDO_ALIGNMENT (RID_STRING_START + 117) -#define RID_STR_HEADER (RID_STRING_START + 118) -#define RID_STR_FOOTER (RID_STRING_START + 119) -#define RID_STR_DATAFIELD (RID_STRING_START + 120) -#define RID_STR_FONT (RID_STRING_START + 121) -#define RID_STR_COULD_NOT_CREATE_REPORT (RID_STRING_START + 122) -#define RID_STR_PRESERVEIRI (RID_STRING_START + 123) -#define RID_STR_IMPORT_GRAPHIC (RID_STRING_START + 124) -#define RID_STR_POSITIONX (RID_STRING_START + 125) -#define RID_STR_POSITIONY (RID_STRING_START + 126) -#define RID_STR_WIDTH (RID_STRING_START + 127) -#define RID_STR_HEIGHT (RID_STRING_START + 128) -#define RID_STR_DELETE (RID_STRING_START + 129) -#define RID_STR_DEEPTRAVERSING (RID_STRING_START + 130) -#define RID_STR_PREEVALUATED (RID_STRING_START + 131) -#define RID_STR_FUNCTIONS (RID_STRING_START + 132) -#define RID_STR_GROUPS (RID_STRING_START + 133) -#define RID_STR_FUNCTION (RID_STRING_START + 134) -#define RID_STR_FORMULA (RID_STRING_START + 135) -#define RID_STR_INITIALFORMULA (RID_STRING_START + 136) -#define RID_STR_UNDO_CHANGEFONT (RID_STRING_START + 137) -#define RID_STR_UNDO_CHANGEPAGE (RID_STRING_START + 138) +#define RID_APP_TITLE (RID_STRING_START + 115) +#define RID_APP_NEW_DOC (RID_STRING_START + 116) +#define RID_STR_UNDO_ALIGNMENT (RID_STRING_START + 117) +#define RID_STR_HEADER (RID_STRING_START + 118) +#define RID_STR_FOOTER (RID_STRING_START + 119) +#define RID_STR_DATAFIELD (RID_STRING_START + 120) +#define RID_STR_FONT (RID_STRING_START + 121) +#define RID_STR_COULD_NOT_CREATE_REPORT (RID_STRING_START + 122) +#define RID_STR_PRESERVEIRI (RID_STRING_START + 123) +#define RID_STR_IMPORT_GRAPHIC (RID_STRING_START + 124) +#define RID_STR_POSITIONX (RID_STRING_START + 125) +#define RID_STR_POSITIONY (RID_STRING_START + 126) +#define RID_STR_WIDTH (RID_STRING_START + 127) +#define RID_STR_HEIGHT (RID_STRING_START + 128) +#define RID_STR_DELETE (RID_STRING_START + 129) +#define RID_STR_DEEPTRAVERSING (RID_STRING_START + 130) +#define RID_STR_PREEVALUATED (RID_STRING_START + 131) +#define RID_STR_FUNCTIONS (RID_STRING_START + 132) +#define RID_STR_GROUPS (RID_STRING_START + 133) +#define RID_STR_FUNCTION (RID_STRING_START + 134) +#define RID_STR_FORMULA (RID_STRING_START + 135) +#define RID_STR_INITIALFORMULA (RID_STRING_START + 136) +#define RID_STR_UNDO_CHANGEFONT (RID_STRING_START + 137) +#define RID_STR_UNDO_CHANGEPAGE (RID_STRING_START + 138) #define RID_STR_CAUGHT_FOREIGN_EXCEPTION (RID_STRING_START + 139) #define RID_STR_FORMULALIST (RID_STRING_START + 140) #define RID_STR_SCOPE (RID_STRING_START + 141) @@ -225,65 +225,65 @@ #define RID_ERR_NO_OBJECTS (RID_STRING_START + 152) #define RID_STR_AREA (RID_STRING_START + 153) #define RID_STR_INSERT (RID_STRING_START + 154) -#define RID_STR_UNDO_SHRINK (RID_STRING_START + 155) -#define RID_STR_F_COUNTER (RID_STRING_START + 156) -#define RID_STR_F_ACCUMULATION (RID_STRING_START + 157) -#define RID_STR_F_MINIMUM (RID_STRING_START + 158) -#define RID_STR_F_MAXIMUM (RID_STRING_START + 159) +#define RID_STR_UNDO_SHRINK (RID_STRING_START + 155) +#define RID_STR_F_COUNTER (RID_STRING_START + 156) +#define RID_STR_F_ACCUMULATION (RID_STRING_START + 157) +#define RID_STR_F_MINIMUM (RID_STRING_START + 158) +#define RID_STR_F_MAXIMUM (RID_STRING_START + 159) #define RID_STR_VERTICALALIGN (RID_STRING_START + 160) #define RID_STR_PARAADJUST (RID_STRING_START + 161) -// #define RID_STR_ (RID_STRING_START + 130) +// #define RID_STR_ (RID_STRING_START + 130) // ----------------------------------------------------------------------- -#define RID_PAGEDIALOG_PAGE ( RID_PAGE_START + 1 ) -#define RID_PAGEDIALOG_BACKGROUND ( RID_PAGE_START + 2 ) -#define RID_PAGEDIALOG_CHAR ( RID_PAGE_START + 3 ) -#define RID_PAGE_CHAR ( RID_PAGE_START + 4 ) -#define RID_PAGE_EFFECTS ( RID_PAGE_START + 5 ) -#define RID_PAGE_POSITION ( RID_PAGE_START + 6 ) -#define RID_PAGE_BACKGROUND ( RID_PAGE_START + 7 ) -#define RID_PAGE_TWOLN ( RID_PAGE_START + 8 ) -#define RID_PAGEDIALOG_LINE ( RID_PAGE_START + 9 ) -#define RID_PAGE_LINE ( RID_PAGE_START + 10 ) -#define RID_PAGE_ALIGNMENT ( RID_PAGE_START + 11 ) +#define RID_PAGEDIALOG_PAGE ( RID_PAGE_START + 1 ) +#define RID_PAGEDIALOG_BACKGROUND ( RID_PAGE_START + 2 ) +#define RID_PAGEDIALOG_CHAR ( RID_PAGE_START + 3 ) +#define RID_PAGE_CHAR ( RID_PAGE_START + 4 ) +#define RID_PAGE_EFFECTS ( RID_PAGE_START + 5 ) +#define RID_PAGE_POSITION ( RID_PAGE_START + 6 ) +#define RID_PAGE_BACKGROUND ( RID_PAGE_START + 7 ) +#define RID_PAGE_TWOLN ( RID_PAGE_START + 8 ) +#define RID_PAGEDIALOG_LINE ( RID_PAGE_START + 9 ) +#define RID_PAGE_LINE ( RID_PAGE_START + 10 ) +#define RID_PAGE_ALIGNMENT ( RID_PAGE_START + 11 ) // ----------------------------------------------------------------------- -#define RID_IMG_TREENODE_COLLAPSED ( RID_IMAGE_START + 1 ) -#define RID_IMG_TREENODE_EXPANDED ( RID_IMAGE_START + 2 ) -#define RID_IMG_TREENODE_COLLAPSED_HC ( RID_IMAGE_START + 3 ) -#define RID_IMG_TREENODE_EXPANDED_HC ( RID_IMAGE_START + 4 ) -#define REPORT_TREE_ICON ( RID_IMAGE_START + 5 ) +#define RID_IMG_TREENODE_COLLAPSED ( RID_IMAGE_START + 1 ) +#define RID_IMG_TREENODE_EXPANDED ( RID_IMAGE_START + 2 ) +#define RID_IMG_TREENODE_COLLAPSED_HC ( RID_IMAGE_START + 3 ) +#define RID_IMG_TREENODE_EXPANDED_HC ( RID_IMAGE_START + 4 ) +#define REPORT_TREE_ICON ( RID_IMAGE_START + 5 ) // menu ----------------------------------------------------------------------- -#define RID_MENU_REPORT ( RID_MENU_START + 0 ) -#define RID_GROUPSROWPOPUPMENU ( RID_MENU_START + 1 ) -#define RID_MENU_NAVIGATOR ( RID_MENU_START + 2 ) -#define RID_TB_SORTING ( RID_MENU_START + 3 ) +#define RID_MENU_REPORT ( RID_MENU_START + 0 ) +#define RID_GROUPSROWPOPUPMENU ( RID_MENU_START + 1 ) +#define RID_MENU_NAVIGATOR ( RID_MENU_START + 2 ) +#define RID_TB_SORTING ( RID_MENU_START + 3 ) // image lists ----------------------------------------------------------------------- -#define IMG_CONDFORMAT_DLG_SC (RID_IMAGELIST_START + 0) -#define IMG_CONDFORMAT_DLG_SCH (RID_IMAGELIST_START + 1) -#define IMG_CONDFORMAT_DLG_LC (RID_IMAGELIST_START + 2) -#define IMG_CONDFORMAT_DLG_LCH (RID_IMAGELIST_START + 3) -#define RID_SVXIMGLIST_RPTEXPL (RID_IMAGELIST_START + 4) -#define RID_SVXIMGLIST_RPTEXPL_HC (RID_IMAGELIST_START + 5) +#define IMG_CONDFORMAT_DLG_SC (RID_IMAGELIST_START + 0) +#define IMG_CONDFORMAT_DLG_SCH (RID_IMAGELIST_START + 1) +#define IMG_CONDFORMAT_DLG_LC (RID_IMAGELIST_START + 2) +#define IMG_CONDFORMAT_DLG_LCH (RID_IMAGELIST_START + 3) +#define RID_SVXIMGLIST_RPTEXPL (RID_IMAGELIST_START + 4) +#define RID_SVXIMGLIST_RPTEXPL_HC (RID_IMAGELIST_START + 5) #define IMGLST_GROUPSORT_DLG_SC (RID_IMAGELIST_START + 6) #define IMGLST_GROUPSORT_DLG_SCH (RID_IMAGELIST_START + 7) -#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 8) -#define IMG_ADDFIELD_DLG_SCH (RID_IMAGELIST_START + 9) -#define IMG_ADDFIELD_DLG_LC (RID_IMAGELIST_START + 10) -#define IMG_ADDFIELD_DLG_LCH (RID_IMAGELIST_START + 11) +#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 8) +#define IMG_ADDFIELD_DLG_SCH (RID_IMAGELIST_START + 9) +#define IMG_ADDFIELD_DLG_LC (RID_IMAGELIST_START + 10) +#define IMG_ADDFIELD_DLG_LCH (RID_IMAGELIST_START + 11) #define ADDFIELD_FL_HELP_SEPARATOR (RID_IMAGELIST_START + 12) #define ADDFIELD_HELP_FIELD (RID_IMAGELIST_START + 13) // untyped --------------------------------------------------------------------- -#define RID_STR_BOOL (RID_UNTYPED_START + 0 ) -#define RID_STR_FORCENEWPAGE_CONST (RID_UNTYPED_START + 1 ) -#define RID_STR_KEEPTOGETHER_CONST (RID_UNTYPED_START + 2) -#define RID_STR_GROUPKEEPTOGETHER_CONST (RID_UNTYPED_START + 3) -#define RID_STR_REPORTPRINTOPTION_CONST (RID_UNTYPED_START + 4) -#define RID_STR_SECTIONPAGEBREAK_CONST (RID_UNTYPED_START + 5) +#define RID_STR_BOOL (RID_UNTYPED_START + 0 ) +#define RID_STR_FORCENEWPAGE_CONST (RID_UNTYPED_START + 1 ) +#define RID_STR_KEEPTOGETHER_CONST (RID_UNTYPED_START + 2) +#define RID_STR_GROUPKEEPTOGETHER_CONST (RID_UNTYPED_START + 3) +#define RID_STR_REPORTPRINTOPTION_CONST (RID_UNTYPED_START + 4) +#define RID_STR_SECTIONPAGEBREAK_CONST (RID_UNTYPED_START + 5) #define RID_STR_TYPE_CONST (RID_UNTYPED_START + 6) #define RID_STR_VERTICAL_ALIGN_CONST (RID_UNTYPED_START + 7) #define RID_STR_PARAADJUST_CONST (RID_UNTYPED_START + 8) diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 4b884424444b..99178af175c3 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptui enum Action { Inserted = 1, - Removed = 2 + Removed = 2 }; /** Helper class to allow std::mem_fun for SAL_CALL @@ -84,9 +84,9 @@ namespace rptui :m_xGroup(_xGroup) { } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getHeader() { return m_xGroup->getHeader(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getFooter() { return m_xGroup->getFooter(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > getGroup() { return m_xGroup; } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getHeader() { return m_xGroup->getHeader(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getFooter() { return m_xGroup->getFooter(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > getGroup() { return m_xGroup; } inline ::sal_Bool getHeaderOn() { return m_xGroup->getHeaderOn(); } inline ::sal_Bool getFooterOn() { return m_xGroup->getFooterOn(); } @@ -108,9 +108,9 @@ namespace rptui } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageHeader() { return m_xReport->getPageHeader(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail() { return m_xReport->getDetail(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageHeader() { return m_xReport->getPageHeader(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail() { return m_xReport->getDetail(); } inline ::sal_Bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); } inline ::sal_Bool getReportFooterOn() { return m_xReport->getReportFooterOn(); } @@ -140,18 +140,18 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OCommentUndoAction : public SdrUndoAction { protected: - String m_strComment; // undo, redo comment - ::dbaui::IController* m_pController; + String m_strComment; // undo, redo comment + ::dbaui::IController* m_pController; public: TYPEINFO(); - OCommentUndoAction( SdrModel& rMod + OCommentUndoAction( SdrModel& rMod ,USHORT nCommentID); virtual ~OCommentUndoAction(); - virtual UniString GetComment() const { return m_strComment; } - virtual void Undo(); - virtual void Redo(); + virtual UniString GetComment() const { return m_strComment; } + virtual void Undo(); + virtual void Redo(); }; //================================================================== // OUndoContainerAction @@ -164,12 +164,12 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xElement; // object not owned by the action ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - m_xOwnElement; // object owned by the action + m_xOwnElement; // object owned by the action ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xContainer; ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - Action m_eAction; + Action m_eAction; public: OUndoContainerAction(SdrModel& rMod @@ -192,7 +192,7 @@ namespace rptui //================================================================== class REPORTDESIGN_DLLPUBLIC OUndoReportSectionAction : public OUndoContainerAction { - OReportHelper m_aReportHelper; + OReportHelper m_aReportHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OReportHelper> m_pMemberFunction; public: @@ -214,7 +214,7 @@ namespace rptui //================================================================== class REPORTDESIGN_DLLPUBLIC OUndoGroupSectionAction : public OUndoContainerAction { - OGroupHelper m_aGroupHelper; + OGroupHelper m_aGroupHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> m_pMemberFunction; public: @@ -237,9 +237,9 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC ORptUndoPropertyAction: public OCommentUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xObj; - ::rtl::OUString m_aPropertyName; - ::com::sun::star::uno::Any m_aNewValue; - ::com::sun::star::uno::Any m_aOldValue; + ::rtl::OUString m_aPropertyName; + ::com::sun::star::uno::Any m_aNewValue; + ::com::sun::star::uno::Any m_aOldValue; /** sets either the old value or the new value again at the property set. * @@ -255,7 +255,7 @@ namespace rptui virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual String GetComment() const; }; //================================================================== @@ -263,7 +263,7 @@ namespace rptui //================================================================== class REPORTDESIGN_DLLPUBLIC OUndoPropertyReportSectionAction : public ORptUndoPropertyAction { - OReportHelper m_aReportHelper; + OReportHelper m_aReportHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OReportHelper> m_pMemberFunction; protected: @@ -282,7 +282,7 @@ namespace rptui //================================================================== class REPORTDESIGN_DLLPUBLIC OUndoPropertyGroupSectionAction : public ORptUndoPropertyAction { - OGroupHelper m_aGroupHelper; + OGroupHelper m_aGroupHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> m_pMemberFunction; protected: diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index e48cd253a4ce..a2b16090748b 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +41,14 @@ namespace rptui //======================================================================== class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment - : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XModifyListener + : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener + , ::com::sun::star::container::XContainerListener + , ::com::sun::star::util::XModifyListener > , public SfxListener { const ::std::auto_ptr<OXUndoEnvironmentImpl> m_pImpl; - + OXUndoEnvironment(const OXUndoEnvironment&); OXUndoEnvironment& operator=(const OXUndoEnvironment&); @@ -111,7 +111,7 @@ namespace rptui void RemoveSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection ); /** removes the section from the page out of the undo env * - * \param _pPage + * \param _pPage */ void RemoveSection(OReportPage* _pPage); @@ -142,7 +142,7 @@ namespace rptui void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()); void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()); - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const; }; diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index 9b360a3fc9cb..2580a44d5b41 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/inc/dllapi.h b/reportdesign/inc/dllapi.h index 1f79662e2248..a64a26e8433d 100644 --- a/reportdesign/inc/dllapi.h +++ b/reportdesign/inc/dllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,16 +28,16 @@ #ifndef INCLUDED_REPORTDESIGNDLLAPI_H #define INCLUDED_REPORTDESIGNDLLAPI_H - + #include "sal/types.h" - + #if defined(REPORTDESIGN_DLLIMPLEMENTATION) #define REPORTDESIGN_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define REPORTDESIGN_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define REPORTDESIGN_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_REPORTDESIGNDLLAPI_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc index f73782a1d8d4..5e048c34becb 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.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,102 +28,102 @@ #define RTPUI_REPORTDESIGN_HELPID_HRC #ifndef _SOLAR_HRC -#include <svl/solar.hrc> // HID_RPT_DBACCESS_START +#include <svl/solar.hrc> // HID_RPT_DBACCESS_START #endif -#define UID_RPT_RPT_APP_VIEW (HID_RPT_START + 0) -#define UID_RPT_SCROLLWINDOW (HID_RPT_START + 1) -#define UID_RPT_REPORTWINDOW (HID_RPT_START + 2) -#define HID_RPT_HORZ_RULER (HID_RPT_START + 3) -#define UID_RPT_SECTIONSWINDOW (HID_RPT_START + 4) -#define UID_RPT_VIEWSWINDOW (HID_RPT_START + 5) -#define HID_RPT_ENDMARKER (HID_RPT_START + 6) -#define HID_RPT_SPLITTER (HID_RPT_START + 7) -#define HID_REPORTSECTION (HID_RPT_START + 8) -#define HID_RPT_HORZ_SCROLLBAR (HID_RPT_START + 9) -#define HID_RPT_VERT_SCROLLBAR (HID_RPT_START + 10) -#define HID_RPT_STARTMARKER (HID_RPT_START + 11) -#define HID_RPT_FIELDEXPRESSION (HID_RPT_START + 12) -#define HID_RPT_SORTORDER (HID_RPT_START + 13) -#define HID_RPT_GROUPSBRW (HID_RPT_START + 14) -#define HID_RPT_GROUPSSORTING_DLG (HID_RPT_START + 15) -#define HID_RPT_PAGENUMBERS_DLG (HID_RPT_START + 16) -#define HID_RPT_DATETIME_DLG (HID_RPT_START + 17) -#define HID_RPT_CONDFORMAT_DLG (HID_RPT_START + 18) -#define HID_RPT_CONDFORMAT_TB (HID_RPT_START + 19) -#define HID_RPT_CRTL_FORMAT_PREVIEW (HID_RPT_START + 20) -#define HID_RPT_COND_DLG (HID_RPT_START + 21) +#define UID_RPT_RPT_APP_VIEW (HID_RPT_START + 0) +#define UID_RPT_SCROLLWINDOW (HID_RPT_START + 1) +#define UID_RPT_REPORTWINDOW (HID_RPT_START + 2) +#define HID_RPT_HORZ_RULER (HID_RPT_START + 3) +#define UID_RPT_SECTIONSWINDOW (HID_RPT_START + 4) +#define UID_RPT_VIEWSWINDOW (HID_RPT_START + 5) +#define HID_RPT_ENDMARKER (HID_RPT_START + 6) +#define HID_RPT_SPLITTER (HID_RPT_START + 7) +#define HID_REPORTSECTION (HID_RPT_START + 8) +#define HID_RPT_HORZ_SCROLLBAR (HID_RPT_START + 9) +#define HID_RPT_VERT_SCROLLBAR (HID_RPT_START + 10) +#define HID_RPT_STARTMARKER (HID_RPT_START + 11) +#define HID_RPT_FIELDEXPRESSION (HID_RPT_START + 12) +#define HID_RPT_SORTORDER (HID_RPT_START + 13) +#define HID_RPT_GROUPSBRW (HID_RPT_START + 14) +#define HID_RPT_GROUPSSORTING_DLG (HID_RPT_START + 15) +#define HID_RPT_PAGENUMBERS_DLG (HID_RPT_START + 16) +#define HID_RPT_DATETIME_DLG (HID_RPT_START + 17) +#define HID_RPT_CONDFORMAT_DLG (HID_RPT_START + 18) +#define HID_RPT_CONDFORMAT_TB (HID_RPT_START + 19) +#define HID_RPT_CRTL_FORMAT_PREVIEW (HID_RPT_START + 20) +#define HID_RPT_COND_DLG (HID_RPT_START + 21) #define HID_RPT_POPUP_COLOR_CTRL (HID_RPT_START + 22) -#define HID_RPT_POPUP_COLOR (HID_RPT_START + 23) -#define HID_RPT_FIELD_SEL (HID_RPT_START + 24) -#define HID_RPT_FIELD_SEL_WIN (HID_RPT_START + 25) -#define HID_RPT_PROPDLG_TAB_GENERAL (HID_RPT_START + 26) -#define HID_RPT_PROPDLG_TAB_DATA (HID_RPT_START + 27) +#define HID_RPT_POPUP_COLOR (HID_RPT_START + 23) +#define HID_RPT_FIELD_SEL (HID_RPT_START + 24) +#define HID_RPT_FIELD_SEL_WIN (HID_RPT_START + 25) +#define HID_RPT_PROPDLG_TAB_GENERAL (HID_RPT_START + 26) +#define HID_RPT_PROPDLG_TAB_DATA (HID_RPT_START + 27) -#define HID_RPT_PROP_FORCENEWPAGE (HID_RPT_START + 28) -#define HID_RPT_PROP_NEWROWORCOL (HID_RPT_START + 29) -#define HID_RPT_PROP_KEEPTOGETHER (HID_RPT_START + 30) -#define HID_RPT_PROP_CANGROW (HID_RPT_START + 31) -#define HID_RPT_PROP_CANSHRINK (HID_RPT_START + 32) -#define HID_RPT_PROP_REPEATSECTION (HID_RPT_START + 33) +#define HID_RPT_PROP_FORCENEWPAGE (HID_RPT_START + 28) +#define HID_RPT_PROP_NEWROWORCOL (HID_RPT_START + 29) +#define HID_RPT_PROP_KEEPTOGETHER (HID_RPT_START + 30) +#define HID_RPT_PROP_CANGROW (HID_RPT_START + 31) +#define HID_RPT_PROP_CANSHRINK (HID_RPT_START + 32) +#define HID_RPT_PROP_REPEATSECTION (HID_RPT_START + 33) #define HID_RPT_PROP_FORMULALIST (HID_RPT_START + 34) -#define HID_RPT_PROP_SCOPE (HID_RPT_START + 35) -#define HID_RPT_PROP_TYPE (HID_RPT_START + 36) -#define HID_RPT_PROP_MASTERFIELDS (HID_RPT_START + 37) -#define HID_RPT_PROP_DETAILFIELDS (HID_RPT_START + 38) -#define HID_RPT_PROP_AREA (HID_RPT_START + 39) -#define UID_RPT_RPT_PROP_DLG_AREA (HID_RPT_START + 40) -#define HID_RPT_PROP_MIMETYPE (HID_RPT_START + 41) +#define HID_RPT_PROP_SCOPE (HID_RPT_START + 35) +#define HID_RPT_PROP_TYPE (HID_RPT_START + 36) +#define HID_RPT_PROP_MASTERFIELDS (HID_RPT_START + 37) +#define HID_RPT_PROP_DETAILFIELDS (HID_RPT_START + 38) +#define HID_RPT_PROP_AREA (HID_RPT_START + 39) +#define UID_RPT_RPT_PROP_DLG_AREA (HID_RPT_START + 40) +#define HID_RPT_PROP_MIMETYPE (HID_RPT_START + 41) // free // free -#define HID_RPT_PROP_PRINTREPEATEDVALUES (HID_RPT_START + 44) -#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION (HID_RPT_START + 45) +#define HID_RPT_PROP_PRINTREPEATEDVALUES (HID_RPT_START + 44) +#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION (HID_RPT_START + 45) #define HID_RPT_PROP_VERTICALALIGN (HID_RPT_START + 46) -#define HID_RPT_PROP_STARTNEWCOLUMN (HID_RPT_START + 47) -#define HID_RPT_PROP_STARTNEWPAGE (HID_RPT_START + 48) -#define HID_RPT_PROP_RESETPAGENUMBER (HID_RPT_START + 49) +#define HID_RPT_PROP_STARTNEWCOLUMN (HID_RPT_START + 47) +#define HID_RPT_PROP_STARTNEWPAGE (HID_RPT_START + 48) +#define HID_RPT_PROP_RESETPAGENUMBER (HID_RPT_START + 49) #define HID_RPT_PROP_PARAADJUST (HID_RPT_START + 50) -#define HID_RPT_PROP_MINHEIGHTNEWPAGE (HID_RPT_START + 51) -#define HID_RPT_PROP_PRINTWHENGROUPCHANGE (HID_RPT_START + 52) -#define HID_RPT_PROP_CHARTTYPE (HID_RPT_START + 53) +#define HID_RPT_PROP_MINHEIGHTNEWPAGE (HID_RPT_START + 51) +#define HID_RPT_PROP_PRINTWHENGROUPCHANGE (HID_RPT_START + 52) +#define HID_RPT_PROP_CHARTTYPE (HID_RPT_START + 53) // free // free -#define HID_RPT_PROP_VISIBLE (HID_RPT_START + 55) -#define HID_RPT_PROP_GROUPKEEPTOGETHER (HID_RPT_START + 56) -#define HID_RPT_PROP_PAGEHEADEROPTION (HID_RPT_START + 57) -#define HID_RPT_PROP_PAGEFOOTEROPTION (HID_RPT_START + 58) -#define UID_RPT_PROP_DLG_LINE_STYLE (HID_RPT_START + 59) +#define HID_RPT_PROP_VISIBLE (HID_RPT_START + 55) +#define HID_RPT_PROP_GROUPKEEPTOGETHER (HID_RPT_START + 56) +#define HID_RPT_PROP_PAGEHEADEROPTION (HID_RPT_START + 57) +#define HID_RPT_PROP_PAGEFOOTEROPTION (HID_RPT_START + 58) +#define UID_RPT_PROP_DLG_LINE_STYLE (HID_RPT_START + 59) #define HID_RPT_PROP_PREVIEW_COUNT (HID_RPT_START + 60) -#define HID_RPT_PROP_DATAFIELD (HID_RPT_START + 61) -#define HID_RPT_PROP_BACKCOLOR (HID_RPT_START + 62) -#define HID_RPT_PROP_RPT_POSITIONX (HID_RPT_START + 63) -#define HID_RPT_PROP_RPT_POSITIONY (HID_RPT_START + 64) +#define HID_RPT_PROP_DATAFIELD (HID_RPT_START + 61) +#define HID_RPT_PROP_BACKCOLOR (HID_RPT_START + 62) +#define HID_RPT_PROP_RPT_POSITIONX (HID_RPT_START + 63) +#define HID_RPT_PROP_RPT_POSITIONY (HID_RPT_START + 64) #define HID_RPT_PROP_RPT_WIDTH (HID_RPT_START + 65) #define HID_RPT_PROP_RPT_HEIGHT (HID_RPT_START + 66) -#define HID_RPT_START_TITLE (HID_RPT_START + 67) -#define HID_RPT_START_IMAGE (HID_RPT_START + 68) -#define HID_RPT_PROP_DEEPTRAVERSING (HID_RPT_START + 69) -#define HID_RPT_PROP_PREEVALUATED (HID_RPT_START + 70) -#define HID_RPT_NAVIGATOR_DLG (HID_RPT_START + 71) -#define HID_REPORT_NAVIGATOR_TREE (HID_RPT_START + 72) -#define HID_RPT_PROP_FORMULA (HID_RPT_START + 73) -#define HID_RPT_PROP_INITIALFORMULA (HID_RPT_START + 74) +#define HID_RPT_START_TITLE (HID_RPT_START + 67) +#define HID_RPT_START_IMAGE (HID_RPT_START + 68) +#define HID_RPT_PROP_DEEPTRAVERSING (HID_RPT_START + 69) +#define HID_RPT_PROP_PREEVALUATED (HID_RPT_START + 70) +#define HID_RPT_NAVIGATOR_DLG (HID_RPT_START + 71) +#define HID_REPORT_NAVIGATOR_TREE (HID_RPT_START + 72) +#define HID_RPT_PROP_FORMULA (HID_RPT_START + 73) +#define HID_RPT_PROP_INITIALFORMULA (HID_RPT_START + 74) #define HID_RPT_PROP_RPT_FONT (HID_RPT_START + 75) #define UID_RPT_RPT_PROP_DLG_FONT_TYPE (HID_RPT_START + 76) -#define HID_RPT_PROP_PRESERVEIRI (HID_RPT_START + 77) -#define HID_RPT_PROP_BACKTRANSPARENT (HID_RPT_START + 78) +#define HID_RPT_PROP_PRESERVEIRI (HID_RPT_START + 77) +#define HID_RPT_PROP_BACKTRANSPARENT (HID_RPT_START + 78) #define HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT (HID_RPT_START + 79) -#define UID_RPT_PROP_CHARTTYPE_DLG (HID_RPT_START + 80) -#define UID_RPT_PROP_DLG_LINKFIELDS (HID_RPT_START + 81) -#define UID_RPT_PROP_FORMULA (HID_RPT_START + 82) - -#define HID_RPT_GROUPSORT_MOVE_UP (HID_RPT_START + 82) -#define HID_RPT_GROUPSORT_MOVE_DOWN (HID_RPT_START + 83) -#define HID_RPT_GROUPSORT_DELETE (HID_RPT_START + 84) +#define UID_RPT_PROP_CHARTTYPE_DLG (HID_RPT_START + 80) +#define UID_RPT_PROP_DLG_LINKFIELDS (HID_RPT_START + 81) +#define UID_RPT_PROP_FORMULA (HID_RPT_START + 82) -#if UID_RPT_PROP_FORMULA > HID_RPT_END -#error Help-Id Ueberlauf in #file, #line -#endif +#define HID_RPT_GROUPSORT_MOVE_UP (HID_RPT_START + 82) +#define HID_RPT_GROUPSORT_MOVE_DOWN (HID_RPT_START + 83) +#define HID_RPT_GROUPSORT_DELETE (HID_RPT_START + 84) + +#if UID_RPT_PROP_FORMULA > HID_RPT_END +#error Help-Id Ueberlauf in #file, #line +#endif // don't forget to update the file util/hidother.src #endif //RTPUI_REPORTDESIGN_HELPID_HRC diff --git a/reportdesign/inc/pch/precompiled_reportdesign.cxx b/reportdesign/inc/pch/precompiled_reportdesign.cxx index e01779afdfba..c52af4709ee2 100644 --- a/reportdesign/inc/pch/precompiled_reportdesign.cxx +++ b/reportdesign/inc/pch/precompiled_reportdesign.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/inc/pch/precompiled_reportdesign.hxx b/reportdesign/inc/pch/precompiled_reportdesign.hxx index c0dfd77c3e5f..396aa8c3a177 100644 --- a/reportdesign/inc/pch/precompiled_reportdesign.hxx +++ b/reportdesign/inc/pch/precompiled_reportdesign.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 8d26195f2010..f43ba873b596 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/inc/rptui_slotid.hrc b/reportdesign/inc/rptui_slotid.hrc index 18ab6d5b0181..4096cb6a272a 100644 --- a/reportdesign/inc/rptui_slotid.hrc +++ b/reportdesign/inc/rptui_slotid.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,159 +30,159 @@ #include <svx/svxids.hrc> -#define SID_PAGEHEADERFOOTER ( SID_RPTUI_START + 0 ) -#define SID_REPORTHEADERFOOTER ( SID_RPTUI_START + 1 ) -#define SID_SORTINGANDGROUPING ( SID_RPTUI_START + 2 ) -#define SID_INSERT_FLD_PGNUMBER ( SID_RPTUI_START + 3 ) -#define SID_CONDITIONALFORMATTING ( SID_RPTUI_START + 4 ) -#define SID_PAGEDIALOG ( SID_RPTUI_START + 5 ) -#define SID_SETCONTROLDEFAULTS ( SID_RPTUI_START + 6 ) -#define SID_INSERTBREAK ( SID_RPTUI_START + 7 ) -#define SID_PAGEHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 8 ) -#define SID_PAGEFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 9 ) -#define SID_REPORTHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 10 ) -#define SID_REPORTFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 11 ) -#define SID_SELECT_REPORT ( SID_RPTUI_START + 12 ) -#define SID_GROUPHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 13 ) -#define SID_GROUPHEADER ( SID_RPTUI_START + 14 ) -#define SID_GROUPFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 15 ) -#define SID_GROUPFOOTER ( SID_RPTUI_START + 16 ) -#define SID_GROUP_REMOVE ( SID_RPTUI_START + 17 ) -#define SID_GROUP_APPEND ( SID_RPTUI_START + 18 ) -#define SID_EXECUTE_REPORT ( SID_RPTUI_START + 19 ) -#define SID_DATETIME ( SID_RPTUI_START + 20 ) -#define SID_ESCAPE ( SID_RPTUI_START + 21 ) -#define SID_ADD_CONTROL_PAIR ( SID_RPTUI_START + 22 ) -#define SID_SPLIT_POSITION ( SID_RPTUI_START + 23 ) -#define SID_PROPERTYBROWSER_LAST_PAGE ( SID_RPTUI_START + 24 ) +#define SID_PAGEHEADERFOOTER ( SID_RPTUI_START + 0 ) +#define SID_REPORTHEADERFOOTER ( SID_RPTUI_START + 1 ) +#define SID_SORTINGANDGROUPING ( SID_RPTUI_START + 2 ) +#define SID_INSERT_FLD_PGNUMBER ( SID_RPTUI_START + 3 ) +#define SID_CONDITIONALFORMATTING ( SID_RPTUI_START + 4 ) +#define SID_PAGEDIALOG ( SID_RPTUI_START + 5 ) +#define SID_SETCONTROLDEFAULTS ( SID_RPTUI_START + 6 ) +#define SID_INSERTBREAK ( SID_RPTUI_START + 7 ) +#define SID_PAGEHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 8 ) +#define SID_PAGEFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 9 ) +#define SID_REPORTHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 10 ) +#define SID_REPORTFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 11 ) +#define SID_SELECT_REPORT ( SID_RPTUI_START + 12 ) +#define SID_GROUPHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 13 ) +#define SID_GROUPHEADER ( SID_RPTUI_START + 14 ) +#define SID_GROUPFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 15 ) +#define SID_GROUPFOOTER ( SID_RPTUI_START + 16 ) +#define SID_GROUP_REMOVE ( SID_RPTUI_START + 17 ) +#define SID_GROUP_APPEND ( SID_RPTUI_START + 18 ) +#define SID_EXECUTE_REPORT ( SID_RPTUI_START + 19 ) +#define SID_DATETIME ( SID_RPTUI_START + 20 ) +#define SID_ESCAPE ( SID_RPTUI_START + 21 ) +#define SID_ADD_CONTROL_PAIR ( SID_RPTUI_START + 22 ) +#define SID_SPLIT_POSITION ( SID_RPTUI_START + 23 ) +#define SID_PROPERTYBROWSER_LAST_PAGE ( SID_RPTUI_START + 24 ) // free -#define SID_DRAWTBX_CS_BASIC1 ( SID_RPTUI_START + 26 ) -#define SID_DRAWTBX_CS_BASIC2 ( SID_RPTUI_START + 27 ) -#define SID_DRAWTBX_CS_BASIC3 ( SID_RPTUI_START + 28 ) -#define SID_DRAWTBX_CS_BASIC4 ( SID_RPTUI_START + 29 ) -#define SID_DRAWTBX_CS_BASIC5 ( SID_RPTUI_START + 30 ) -#define SID_DRAWTBX_CS_BASIC6 ( SID_RPTUI_START + 31 ) -#define SID_DRAWTBX_CS_BASIC7 ( SID_RPTUI_START + 32 ) -#define SID_DRAWTBX_CS_BASIC8 ( SID_RPTUI_START + 33 ) -#define SID_DRAWTBX_CS_BASIC9 ( SID_RPTUI_START + 34 ) -#define SID_DRAWTBX_CS_BASIC10 ( SID_RPTUI_START + 35 ) -#define SID_DRAWTBX_CS_BASIC11 ( SID_RPTUI_START + 36 ) -#define SID_DRAWTBX_CS_BASIC12 ( SID_RPTUI_START + 37 ) -#define SID_DRAWTBX_CS_BASIC13 ( SID_RPTUI_START + 38 ) -#define SID_DRAWTBX_CS_BASIC14 ( SID_RPTUI_START + 39 ) -#define SID_DRAWTBX_CS_BASIC15 ( SID_RPTUI_START + 40 ) -#define SID_DRAWTBX_CS_BASIC16 ( SID_RPTUI_START + 41 ) -#define SID_DRAWTBX_CS_BASIC17 ( SID_RPTUI_START + 42 ) -#define SID_DRAWTBX_CS_BASIC18 ( SID_RPTUI_START + 43 ) -#define SID_DRAWTBX_CS_BASIC19 ( SID_RPTUI_START + 44 ) -#define SID_DRAWTBX_CS_BASIC20 ( SID_RPTUI_START + 45 ) -#define SID_DRAWTBX_CS_BASIC21 ( SID_RPTUI_START + 46 ) -#define SID_DRAWTBX_CS_BASIC22 ( SID_RPTUI_START + 47 ) -#define SID_DRAWTBX_CS_SYMBOL1 ( SID_RPTUI_START + 48 ) -#define SID_DRAWTBX_CS_SYMBOL2 ( SID_RPTUI_START + 49 ) -#define SID_DRAWTBX_CS_SYMBOL3 ( SID_RPTUI_START + 50 ) -#define SID_DRAWTBX_CS_SYMBOL4 ( SID_RPTUI_START + 51 ) -#define SID_DRAWTBX_CS_SYMBOL5 ( SID_RPTUI_START + 52 ) -#define SID_DRAWTBX_CS_SYMBOL6 ( SID_RPTUI_START + 53 ) -#define SID_DRAWTBX_CS_SYMBOL7 ( SID_RPTUI_START + 54 ) -#define SID_DRAWTBX_CS_SYMBOL8 ( SID_RPTUI_START + 55 ) -#define SID_DRAWTBX_CS_SYMBOL9 ( SID_RPTUI_START + 56 ) -#define SID_DRAWTBX_CS_SYMBOL10 ( SID_RPTUI_START + 57 ) -#define SID_DRAWTBX_CS_SYMBOL11 ( SID_RPTUI_START + 58 ) -#define SID_DRAWTBX_CS_SYMBOL12 ( SID_RPTUI_START + 59 ) -#define SID_DRAWTBX_CS_SYMBOL13 ( SID_RPTUI_START + 60 ) -#define SID_DRAWTBX_CS_SYMBOL14 ( SID_RPTUI_START + 61 ) -#define SID_DRAWTBX_CS_SYMBOL15 ( SID_RPTUI_START + 62 ) -#define SID_DRAWTBX_CS_SYMBOL16 ( SID_RPTUI_START + 63 ) -#define SID_DRAWTBX_CS_SYMBOL17 ( SID_RPTUI_START + 64 ) -#define SID_DRAWTBX_CS_SYMBOL18 ( SID_RPTUI_START + 65 ) -#define SID_DRAWTBX_CS_ARROW1 ( SID_RPTUI_START + 66 ) -#define SID_DRAWTBX_CS_ARROW2 ( SID_RPTUI_START + 67 ) -#define SID_DRAWTBX_CS_ARROW3 ( SID_RPTUI_START + 68 ) -#define SID_DRAWTBX_CS_ARROW4 ( SID_RPTUI_START + 69 ) -#define SID_DRAWTBX_CS_ARROW5 ( SID_RPTUI_START + 70 ) -#define SID_DRAWTBX_CS_ARROW6 ( SID_RPTUI_START + 71 ) -#define SID_DRAWTBX_CS_ARROW7 ( SID_RPTUI_START + 72 ) -#define SID_DRAWTBX_CS_ARROW8 ( SID_RPTUI_START + 73 ) -#define SID_DRAWTBX_CS_ARROW9 ( SID_RPTUI_START + 74 ) -#define SID_DRAWTBX_CS_ARROW10 ( SID_RPTUI_START + 75 ) -#define SID_DRAWTBX_CS_ARROW11 ( SID_RPTUI_START + 76 ) -#define SID_DRAWTBX_CS_ARROW12 ( SID_RPTUI_START + 77 ) -#define SID_DRAWTBX_CS_ARROW13 ( SID_RPTUI_START + 78 ) -#define SID_DRAWTBX_CS_ARROW14 ( SID_RPTUI_START + 79 ) -#define SID_DRAWTBX_CS_ARROW15 ( SID_RPTUI_START + 80 ) -#define SID_DRAWTBX_CS_ARROW16 ( SID_RPTUI_START + 81 ) -#define SID_DRAWTBX_CS_ARROW17 ( SID_RPTUI_START + 82 ) -#define SID_DRAWTBX_CS_ARROW18 ( SID_RPTUI_START + 83 ) -#define SID_DRAWTBX_CS_ARROW19 ( SID_RPTUI_START + 84 ) -#define SID_DRAWTBX_CS_ARROW20 ( SID_RPTUI_START + 85 ) -#define SID_DRAWTBX_CS_ARROW21 ( SID_RPTUI_START + 86 ) -#define SID_DRAWTBX_CS_ARROW22 ( SID_RPTUI_START + 87 ) -#define SID_DRAWTBX_CS_ARROW23 ( SID_RPTUI_START + 88 ) -#define SID_DRAWTBX_CS_ARROW24 ( SID_RPTUI_START + 89 ) -#define SID_DRAWTBX_CS_ARROW25 ( SID_RPTUI_START + 90 ) -#define SID_DRAWTBX_CS_ARROW26 ( SID_RPTUI_START + 91 ) -#define SID_DRAWTBX_CS_STAR1 ( SID_RPTUI_START + 92 ) -#define SID_DRAWTBX_CS_STAR2 ( SID_RPTUI_START + 93 ) -#define SID_DRAWTBX_CS_STAR3 ( SID_RPTUI_START + 94 ) -#define SID_DRAWTBX_CS_STAR4 ( SID_RPTUI_START + 95 ) -#define SID_DRAWTBX_CS_STAR5 ( SID_RPTUI_START + 96 ) -#define SID_DRAWTBX_CS_STAR6 ( SID_RPTUI_START + 97 ) -#define SID_DRAWTBX_CS_STAR7 ( SID_RPTUI_START + 98 ) -#define SID_DRAWTBX_CS_STAR8 ( SID_RPTUI_START + 99 ) -#define SID_DRAWTBX_CS_STAR9 ( SID_RPTUI_START + 100 ) -#define SID_DRAWTBX_CS_STAR10 ( SID_RPTUI_START + 101 ) -#define SID_DRAWTBX_CS_STAR11 ( SID_RPTUI_START + 102 ) -#define SID_DRAWTBX_CS_STAR12 ( SID_RPTUI_START + 103 ) -#define SID_DRAWTBX_CS_FLOWCHART1 ( SID_RPTUI_START + 104 ) -#define SID_DRAWTBX_CS_FLOWCHART2 ( SID_RPTUI_START + 105 ) -#define SID_DRAWTBX_CS_FLOWCHART3 ( SID_RPTUI_START + 106 ) -#define SID_DRAWTBX_CS_FLOWCHART4 ( SID_RPTUI_START + 107 ) -#define SID_DRAWTBX_CS_FLOWCHART5 ( SID_RPTUI_START + 108 ) -#define SID_DRAWTBX_CS_FLOWCHART6 ( SID_RPTUI_START + 109 ) -#define SID_DRAWTBX_CS_FLOWCHART7 ( SID_RPTUI_START + 110 ) -#define SID_DRAWTBX_CS_FLOWCHART8 ( SID_RPTUI_START + 111 ) -#define SID_DRAWTBX_CS_FLOWCHART9 ( SID_RPTUI_START + 112 ) -#define SID_DRAWTBX_CS_FLOWCHART10 ( SID_RPTUI_START + 113 ) -#define SID_DRAWTBX_CS_FLOWCHART11 ( SID_RPTUI_START + 114 ) -#define SID_DRAWTBX_CS_FLOWCHART12 ( SID_RPTUI_START + 115 ) -#define SID_DRAWTBX_CS_FLOWCHART13 ( SID_RPTUI_START + 116 ) -#define SID_DRAWTBX_CS_FLOWCHART14 ( SID_RPTUI_START + 117 ) -#define SID_DRAWTBX_CS_FLOWCHART15 ( SID_RPTUI_START + 118 ) -#define SID_DRAWTBX_CS_FLOWCHART16 ( SID_RPTUI_START + 119 ) -#define SID_DRAWTBX_CS_FLOWCHART17 ( SID_RPTUI_START + 120 ) -#define SID_DRAWTBX_CS_FLOWCHART18 ( SID_RPTUI_START + 121 ) -#define SID_DRAWTBX_CS_FLOWCHART19 ( SID_RPTUI_START + 122 ) -#define SID_DRAWTBX_CS_FLOWCHART20 ( SID_RPTUI_START + 123 ) -#define SID_DRAWTBX_CS_FLOWCHART21 ( SID_RPTUI_START + 124 ) -#define SID_DRAWTBX_CS_FLOWCHART22 ( SID_RPTUI_START + 125 ) -#define SID_DRAWTBX_CS_FLOWCHART23 ( SID_RPTUI_START + 126 ) -#define SID_DRAWTBX_CS_FLOWCHART24 ( SID_RPTUI_START + 127 ) -#define SID_DRAWTBX_CS_FLOWCHART25 ( SID_RPTUI_START + 128 ) -#define SID_DRAWTBX_CS_FLOWCHART26 ( SID_RPTUI_START + 129 ) -#define SID_DRAWTBX_CS_FLOWCHART27 ( SID_RPTUI_START + 130 ) -#define SID_DRAWTBX_CS_FLOWCHART28 ( SID_RPTUI_START + 131 ) -#define SID_DRAWTBX_CS_CALLOUT1 ( SID_RPTUI_START + 132 ) -#define SID_DRAWTBX_CS_CALLOUT2 ( SID_RPTUI_START + 133 ) -#define SID_DRAWTBX_CS_CALLOUT3 ( SID_RPTUI_START + 134 ) -#define SID_DRAWTBX_CS_CALLOUT4 ( SID_RPTUI_START + 135 ) -#define SID_DRAWTBX_CS_CALLOUT5 ( SID_RPTUI_START + 136 ) -#define SID_DRAWTBX_CS_CALLOUT6 ( SID_RPTUI_START + 137 ) -#define SID_DRAWTBX_CS_CALLOUT7 ( SID_RPTUI_START + 138 ) +#define SID_DRAWTBX_CS_BASIC1 ( SID_RPTUI_START + 26 ) +#define SID_DRAWTBX_CS_BASIC2 ( SID_RPTUI_START + 27 ) +#define SID_DRAWTBX_CS_BASIC3 ( SID_RPTUI_START + 28 ) +#define SID_DRAWTBX_CS_BASIC4 ( SID_RPTUI_START + 29 ) +#define SID_DRAWTBX_CS_BASIC5 ( SID_RPTUI_START + 30 ) +#define SID_DRAWTBX_CS_BASIC6 ( SID_RPTUI_START + 31 ) +#define SID_DRAWTBX_CS_BASIC7 ( SID_RPTUI_START + 32 ) +#define SID_DRAWTBX_CS_BASIC8 ( SID_RPTUI_START + 33 ) +#define SID_DRAWTBX_CS_BASIC9 ( SID_RPTUI_START + 34 ) +#define SID_DRAWTBX_CS_BASIC10 ( SID_RPTUI_START + 35 ) +#define SID_DRAWTBX_CS_BASIC11 ( SID_RPTUI_START + 36 ) +#define SID_DRAWTBX_CS_BASIC12 ( SID_RPTUI_START + 37 ) +#define SID_DRAWTBX_CS_BASIC13 ( SID_RPTUI_START + 38 ) +#define SID_DRAWTBX_CS_BASIC14 ( SID_RPTUI_START + 39 ) +#define SID_DRAWTBX_CS_BASIC15 ( SID_RPTUI_START + 40 ) +#define SID_DRAWTBX_CS_BASIC16 ( SID_RPTUI_START + 41 ) +#define SID_DRAWTBX_CS_BASIC17 ( SID_RPTUI_START + 42 ) +#define SID_DRAWTBX_CS_BASIC18 ( SID_RPTUI_START + 43 ) +#define SID_DRAWTBX_CS_BASIC19 ( SID_RPTUI_START + 44 ) +#define SID_DRAWTBX_CS_BASIC20 ( SID_RPTUI_START + 45 ) +#define SID_DRAWTBX_CS_BASIC21 ( SID_RPTUI_START + 46 ) +#define SID_DRAWTBX_CS_BASIC22 ( SID_RPTUI_START + 47 ) +#define SID_DRAWTBX_CS_SYMBOL1 ( SID_RPTUI_START + 48 ) +#define SID_DRAWTBX_CS_SYMBOL2 ( SID_RPTUI_START + 49 ) +#define SID_DRAWTBX_CS_SYMBOL3 ( SID_RPTUI_START + 50 ) +#define SID_DRAWTBX_CS_SYMBOL4 ( SID_RPTUI_START + 51 ) +#define SID_DRAWTBX_CS_SYMBOL5 ( SID_RPTUI_START + 52 ) +#define SID_DRAWTBX_CS_SYMBOL6 ( SID_RPTUI_START + 53 ) +#define SID_DRAWTBX_CS_SYMBOL7 ( SID_RPTUI_START + 54 ) +#define SID_DRAWTBX_CS_SYMBOL8 ( SID_RPTUI_START + 55 ) +#define SID_DRAWTBX_CS_SYMBOL9 ( SID_RPTUI_START + 56 ) +#define SID_DRAWTBX_CS_SYMBOL10 ( SID_RPTUI_START + 57 ) +#define SID_DRAWTBX_CS_SYMBOL11 ( SID_RPTUI_START + 58 ) +#define SID_DRAWTBX_CS_SYMBOL12 ( SID_RPTUI_START + 59 ) +#define SID_DRAWTBX_CS_SYMBOL13 ( SID_RPTUI_START + 60 ) +#define SID_DRAWTBX_CS_SYMBOL14 ( SID_RPTUI_START + 61 ) +#define SID_DRAWTBX_CS_SYMBOL15 ( SID_RPTUI_START + 62 ) +#define SID_DRAWTBX_CS_SYMBOL16 ( SID_RPTUI_START + 63 ) +#define SID_DRAWTBX_CS_SYMBOL17 ( SID_RPTUI_START + 64 ) +#define SID_DRAWTBX_CS_SYMBOL18 ( SID_RPTUI_START + 65 ) +#define SID_DRAWTBX_CS_ARROW1 ( SID_RPTUI_START + 66 ) +#define SID_DRAWTBX_CS_ARROW2 ( SID_RPTUI_START + 67 ) +#define SID_DRAWTBX_CS_ARROW3 ( SID_RPTUI_START + 68 ) +#define SID_DRAWTBX_CS_ARROW4 ( SID_RPTUI_START + 69 ) +#define SID_DRAWTBX_CS_ARROW5 ( SID_RPTUI_START + 70 ) +#define SID_DRAWTBX_CS_ARROW6 ( SID_RPTUI_START + 71 ) +#define SID_DRAWTBX_CS_ARROW7 ( SID_RPTUI_START + 72 ) +#define SID_DRAWTBX_CS_ARROW8 ( SID_RPTUI_START + 73 ) +#define SID_DRAWTBX_CS_ARROW9 ( SID_RPTUI_START + 74 ) +#define SID_DRAWTBX_CS_ARROW10 ( SID_RPTUI_START + 75 ) +#define SID_DRAWTBX_CS_ARROW11 ( SID_RPTUI_START + 76 ) +#define SID_DRAWTBX_CS_ARROW12 ( SID_RPTUI_START + 77 ) +#define SID_DRAWTBX_CS_ARROW13 ( SID_RPTUI_START + 78 ) +#define SID_DRAWTBX_CS_ARROW14 ( SID_RPTUI_START + 79 ) +#define SID_DRAWTBX_CS_ARROW15 ( SID_RPTUI_START + 80 ) +#define SID_DRAWTBX_CS_ARROW16 ( SID_RPTUI_START + 81 ) +#define SID_DRAWTBX_CS_ARROW17 ( SID_RPTUI_START + 82 ) +#define SID_DRAWTBX_CS_ARROW18 ( SID_RPTUI_START + 83 ) +#define SID_DRAWTBX_CS_ARROW19 ( SID_RPTUI_START + 84 ) +#define SID_DRAWTBX_CS_ARROW20 ( SID_RPTUI_START + 85 ) +#define SID_DRAWTBX_CS_ARROW21 ( SID_RPTUI_START + 86 ) +#define SID_DRAWTBX_CS_ARROW22 ( SID_RPTUI_START + 87 ) +#define SID_DRAWTBX_CS_ARROW23 ( SID_RPTUI_START + 88 ) +#define SID_DRAWTBX_CS_ARROW24 ( SID_RPTUI_START + 89 ) +#define SID_DRAWTBX_CS_ARROW25 ( SID_RPTUI_START + 90 ) +#define SID_DRAWTBX_CS_ARROW26 ( SID_RPTUI_START + 91 ) +#define SID_DRAWTBX_CS_STAR1 ( SID_RPTUI_START + 92 ) +#define SID_DRAWTBX_CS_STAR2 ( SID_RPTUI_START + 93 ) +#define SID_DRAWTBX_CS_STAR3 ( SID_RPTUI_START + 94 ) +#define SID_DRAWTBX_CS_STAR4 ( SID_RPTUI_START + 95 ) +#define SID_DRAWTBX_CS_STAR5 ( SID_RPTUI_START + 96 ) +#define SID_DRAWTBX_CS_STAR6 ( SID_RPTUI_START + 97 ) +#define SID_DRAWTBX_CS_STAR7 ( SID_RPTUI_START + 98 ) +#define SID_DRAWTBX_CS_STAR8 ( SID_RPTUI_START + 99 ) +#define SID_DRAWTBX_CS_STAR9 ( SID_RPTUI_START + 100 ) +#define SID_DRAWTBX_CS_STAR10 ( SID_RPTUI_START + 101 ) +#define SID_DRAWTBX_CS_STAR11 ( SID_RPTUI_START + 102 ) +#define SID_DRAWTBX_CS_STAR12 ( SID_RPTUI_START + 103 ) +#define SID_DRAWTBX_CS_FLOWCHART1 ( SID_RPTUI_START + 104 ) +#define SID_DRAWTBX_CS_FLOWCHART2 ( SID_RPTUI_START + 105 ) +#define SID_DRAWTBX_CS_FLOWCHART3 ( SID_RPTUI_START + 106 ) +#define SID_DRAWTBX_CS_FLOWCHART4 ( SID_RPTUI_START + 107 ) +#define SID_DRAWTBX_CS_FLOWCHART5 ( SID_RPTUI_START + 108 ) +#define SID_DRAWTBX_CS_FLOWCHART6 ( SID_RPTUI_START + 109 ) +#define SID_DRAWTBX_CS_FLOWCHART7 ( SID_RPTUI_START + 110 ) +#define SID_DRAWTBX_CS_FLOWCHART8 ( SID_RPTUI_START + 111 ) +#define SID_DRAWTBX_CS_FLOWCHART9 ( SID_RPTUI_START + 112 ) +#define SID_DRAWTBX_CS_FLOWCHART10 ( SID_RPTUI_START + 113 ) +#define SID_DRAWTBX_CS_FLOWCHART11 ( SID_RPTUI_START + 114 ) +#define SID_DRAWTBX_CS_FLOWCHART12 ( SID_RPTUI_START + 115 ) +#define SID_DRAWTBX_CS_FLOWCHART13 ( SID_RPTUI_START + 116 ) +#define SID_DRAWTBX_CS_FLOWCHART14 ( SID_RPTUI_START + 117 ) +#define SID_DRAWTBX_CS_FLOWCHART15 ( SID_RPTUI_START + 118 ) +#define SID_DRAWTBX_CS_FLOWCHART16 ( SID_RPTUI_START + 119 ) +#define SID_DRAWTBX_CS_FLOWCHART17 ( SID_RPTUI_START + 120 ) +#define SID_DRAWTBX_CS_FLOWCHART18 ( SID_RPTUI_START + 121 ) +#define SID_DRAWTBX_CS_FLOWCHART19 ( SID_RPTUI_START + 122 ) +#define SID_DRAWTBX_CS_FLOWCHART20 ( SID_RPTUI_START + 123 ) +#define SID_DRAWTBX_CS_FLOWCHART21 ( SID_RPTUI_START + 124 ) +#define SID_DRAWTBX_CS_FLOWCHART22 ( SID_RPTUI_START + 125 ) +#define SID_DRAWTBX_CS_FLOWCHART23 ( SID_RPTUI_START + 126 ) +#define SID_DRAWTBX_CS_FLOWCHART24 ( SID_RPTUI_START + 127 ) +#define SID_DRAWTBX_CS_FLOWCHART25 ( SID_RPTUI_START + 128 ) +#define SID_DRAWTBX_CS_FLOWCHART26 ( SID_RPTUI_START + 129 ) +#define SID_DRAWTBX_CS_FLOWCHART27 ( SID_RPTUI_START + 130 ) +#define SID_DRAWTBX_CS_FLOWCHART28 ( SID_RPTUI_START + 131 ) +#define SID_DRAWTBX_CS_CALLOUT1 ( SID_RPTUI_START + 132 ) +#define SID_DRAWTBX_CS_CALLOUT2 ( SID_RPTUI_START + 133 ) +#define SID_DRAWTBX_CS_CALLOUT3 ( SID_RPTUI_START + 134 ) +#define SID_DRAWTBX_CS_CALLOUT4 ( SID_RPTUI_START + 135 ) +#define SID_DRAWTBX_CS_CALLOUT5 ( SID_RPTUI_START + 136 ) +#define SID_DRAWTBX_CS_CALLOUT6 ( SID_RPTUI_START + 137 ) +#define SID_DRAWTBX_CS_CALLOUT7 ( SID_RPTUI_START + 138 ) -#define SID_RPT_TEXTDOCUMENT ( SID_RPTUI_START + 139 ) -#define SID_RPT_SPREADSHEET ( SID_RPTUI_START + 140 ) -#define SID_RPT_SHOWREPORTEXPLORER ( SID_RPTUI_START + 141 ) -#define SID_RPT_NEW_FUNCTION ( SID_RPTUI_START + 142 ) +#define SID_RPT_TEXTDOCUMENT ( SID_RPTUI_START + 139 ) +#define SID_RPT_SPREADSHEET ( SID_RPTUI_START + 140 ) +#define SID_RPT_SHOWREPORTEXPLORER ( SID_RPTUI_START + 141 ) +#define SID_RPT_NEW_FUNCTION ( SID_RPTUI_START + 142 ) -#define SID_OBJECT_SMALLESTWIDTH ( SID_RPTUI_START + 143 ) -#define SID_OBJECT_SMALLESTHEIGHT ( SID_RPTUI_START + 144 ) -#define SID_OBJECT_GREATESTWIDTH ( SID_RPTUI_START + 145 ) -#define SID_OBJECT_GREATESTHEIGHT ( SID_RPTUI_START + 146 ) -#define SID_OBJECT_RESIZING ( SID_RPTUI_START + 147 ) -#define SID_ARRANGEMENU ( SID_RPTUI_START + 148 ) -#define SID_SELECTALL_IN_SECTION ( SID_RPTUI_START + 149 ) +#define SID_OBJECT_SMALLESTWIDTH ( SID_RPTUI_START + 143 ) +#define SID_OBJECT_SMALLESTHEIGHT ( SID_RPTUI_START + 144 ) +#define SID_OBJECT_GREATESTWIDTH ( SID_RPTUI_START + 145 ) +#define SID_OBJECT_GREATESTHEIGHT ( SID_RPTUI_START + 146 ) +#define SID_OBJECT_RESIZING ( SID_RPTUI_START + 147 ) +#define SID_ARRANGEMENU ( SID_RPTUI_START + 148 ) +#define SID_SELECTALL_IN_SECTION ( SID_RPTUI_START + 149 ) #define SID_ICON_GROUP ( SID_RPTUI_START + 150 ) #define SID_ICON_DETAIL ( SID_RPTUI_START + 151 ) diff --git a/reportdesign/qa/complex/ReportDesignerTest.java b/reportdesign/qa/complex/ReportDesignerTest.java index 3bbb9a42fe26..2a652fa460d9 100755 --- a/reportdesign/qa/complex/ReportDesignerTest.java +++ b/reportdesign/qa/complex/ReportDesignerTest.java @@ -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 @@ -62,15 +62,15 @@ import convwatch.DB; // import java.text.SimpleDateFormat; // import java.text.ParsePosition; // import java.sql.Time; -// +// // import java.io.BufferedReader; // import java.io.File; // import java.io.FileReader; // import java.io.IOException; // import java.io.FilenameFilter; -// +// // import java.util.Vector; -// +// // import helper.AppProvider; // import java.text.DecimalFormat; // import util.DynamicClassLoader; @@ -86,7 +86,7 @@ class PropertySetHelper { m_xPropertySet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, _aObj); } - + /** get a property and don't convert it @param _sName the string name of the property @@ -153,10 +153,10 @@ class PropertyHelper } public class ReportDesignerTest extends ComplexTestCase { - + String mTestDocumentPath; - public String[] getTestMethodNames() + public String[] getTestMethodNames() { return new String[] {"firsttest"}; } @@ -177,7 +177,7 @@ public class ReportDesignerTest extends ComplexTestCase { sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 7); } } - + log.println(sOfficePath); File sOffice = new File(sOfficePath); if (! sOffice.exists()) @@ -186,20 +186,20 @@ public class ReportDesignerTest extends ComplexTestCase { System.exit(0); } } - - + + private static XDesktop m_xDesktop = null; public static XDesktop getXDesktop() { - if (m_xDesktop == null) + if (m_xDesktop == null) { - try + try { XInterface xInterface = (XInterface) m_xXMultiServiceFactory.createInstance( "com.sun.star.frame.Desktop" ); m_xDesktop = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, xInterface); } - catch (com.sun.star.uno.Exception e) + catch (com.sun.star.uno.Exception e) { log.println("ERROR: uno.Exception caught"); log.println("Message: " + e.getMessage()); @@ -207,7 +207,7 @@ public class ReportDesignerTest extends ComplexTestCase { } return m_xDesktop; } - + private void showElements(XNameAccess _xNameAccess) { if (_xNameAccess != null) @@ -223,8 +223,8 @@ public class ReportDesignerTest extends ComplexTestCase { System.out.println("Warning: Given object is null."); } } - - + + private OfficeProvider m_aProvider = null; private static XMultiServiceFactory m_xXMultiServiceFactory = null; private void startOffice() @@ -248,7 +248,7 @@ public class ReportDesignerTest extends ComplexTestCase { m_aProvider = null; } } - + private String m_sMailAddress = null; private String m_sUPDMinor; private String m_sCWS_WORK_STAMP; @@ -256,19 +256,19 @@ public class ReportDesignerTest extends ComplexTestCase { private static final int WRITER = 1; private static final int CALC = 2; - public void firsttest() + public void firsttest() { convwatch.GlobalLogWriter.set(log); try { - + // -------------------- preconditions, try to find an office -------------------- - + String sAppExecutionCommand = (String) param.get("AppExecutionCommand"); String sUser = System.getProperty("user.name"); log.println("user.name='" + sUser + "'"); - + String sVCSID = System.getProperty("VCSID"); log.println("VCSID='" + sVCSID + "'"); m_sMailAddress = sVCSID + "@openoffice.org"; @@ -284,22 +284,22 @@ public class ReportDesignerTest extends ComplexTestCase { sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser); log.println("sAppExecutionCommand='" + sAppExecutionCommand + "'"); - + // an other way to replace strings // sAppExecutionCommand = utils.replaceAll13(sAppExecutionCommand, "${USERNAME}", sUser); - + checkIfOfficeExists(sAppExecutionCommand); param.put("AppExecutionCommand", new String(sAppExecutionCommand)); - + // --------------------------- Start the given Office --------------------------- - + startOffice(); - + // ------------------------------ Start a test run ------------------------------ - + String sCurrentDirectory = System.getProperty("user.dir"); log.println("Current Dir: " + sCurrentDirectory); - + String sWriterDocument = sCurrentDirectory + "/" + "RPTWriterTests.odb"; startTestForFile(sWriterDocument, WRITER); @@ -311,57 +311,57 @@ public class ReportDesignerTest extends ComplexTestCase { stopOffice(); throw new AssureException(e.getMessage()); } - + // ------------------------------ Office shutdown ------------------------------ stopOffice(); } - + // ----------------------------------------------------------------------------- private void startTestForFile(String _sDocument, int _nType) { File aFile = new File(_sDocument); assure("Test File doesn't '" + _sDocument + "'exist.", aFile.exists()); - + String sFileURL = URLHelper.getFileURLFromSystemPath(_sDocument); log.println("File URL: " + sFileURL); - + XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), null); log.println("Load done"); -// context = createUnoService("com.sun.star.sdb.DatabaseContext") +// context = createUnoService("com.sun.star.sdb.DatabaseContext") // oDataBase = context.getByName("hh") // oDBDoc = oDataBase.DatabaseDocument -// -// dim args(1) as new com.sun.star.beans.PropertyValue -// args(0).Name = "ActiveConnection" -// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection") -// reportContainer = oDBDoc.getReportDocuments() +// +// dim args(1) as new com.sun.star.beans.PropertyValue +// args(0).Name = "ActiveConnection" +// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection") +// reportContainer = oDBDoc.getReportDocuments() // report = reportContainer.loadComponentFromURL("Report40","",0,args) - + try { XInterface x = (XInterface)m_xXMultiServiceFactory.createInstance("com.sun.star.sdb.DatabaseContext"); assure("can't create instance of com.sun.star.sdb.DatabaseContext", x != null); log.println("createInstance com.sun.star.sdb.DatabaseContext done"); - + XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, x); showElements(xNameAccess); Object aObj = xNameAccess.getByName(sFileURL); // log.println("1"); - + // PropertySetHelper aHelper = new PropertySetHelper(aObj); XDocumentDataSource xDataSource = (XDocumentDataSource)UnoRuntime.queryInterface(XDocumentDataSource.class, aObj); // Object aDatabaseDocmuent = aHelper.getPropertyValueAsObject("DatabaseDocument"); XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument(); - + // XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, aDatabaseDocument); assure("can't access DatabaseDocument", xOfficeDBDoc != null); // log.println("2"); - + XModel xDBSource = (XModel)UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc); Object aController = xDBSource.getCurrentController(); assure("Controller of xOfficeDatabaseDocument is empty!", aController != null); // log.println("3"); - + XDatabaseDocumentUI aDBDocUI = (XDatabaseDocumentUI)UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController); boolean isConnect = aDBDocUI.connect(); // if (isConnect) @@ -373,28 +373,28 @@ public class ReportDesignerTest extends ComplexTestCase { // System.out.println("false"); // } // log.println("4"); - + // aHelper = new PropertySetHelper(aController); - + // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection"); - Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); + Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); assure("ActiveConnection is empty", aActiveConnectionObj != null); // log.println("5"); - + XReportDocumentsSupplier xSupplier = (XReportDocumentsSupplier)UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc); xNameAccess = xSupplier.getReportDocuments(); assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null); // log.println("5"); - + showElements(xNameAccess); - + ArrayList aPropertyList = new ArrayList(); - + PropertyValue aActiveConnection = new PropertyValue(); aActiveConnection.Name = "ActiveConnection"; aActiveConnection.Value = aActiveConnectionObj; aPropertyList.add(aActiveConnection); - + loadAndStoreReports(xNameAccess, aPropertyList, _nType); createDBEntry(_nType); } @@ -402,12 +402,12 @@ public class ReportDesignerTest extends ComplexTestCase { { log.println("ERROR: Exception caught"); } - + // String mTestDocumentPath = (String) param.get("TestDocumentPath"); // System.out.println("mTestDocumentPath: '" + mTestDocumentPath + "'"); // // workaround for issue using deprecated "DOCPTH" prop // System.setProperty("DOCPTH", mTestDocumentPath); - + // Close the document closeComponent(xDocComponent); } @@ -416,7 +416,7 @@ public class ReportDesignerTest extends ComplexTestCase { { return getFileFormat(_nType); } - + // ----------------------------------------------------------------------------- private void createDBEntry(int _nType) { @@ -443,7 +443,7 @@ public class ReportDesignerTest extends ComplexTestCase { // DB.test(); // System.exit(1); } - + private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList _aPropertyList, int _nType) { if (_xNameAccess != null) @@ -492,7 +492,7 @@ public class ReportDesignerTest extends ComplexTestCase { } return sFileType; } - + private String getOutputPath(int _nType) { String sOutputPath = (String)param.get( convwatch.PropertyName.DOC_COMPARATOR_OUTPUT_PATH ); @@ -513,7 +513,7 @@ public class ReportDesignerTest extends ComplexTestCase { return sOutputPath; } - + /* store given _xComponent under the given Name in DOC_COMPARATOR_INPUTPATH */ @@ -530,7 +530,7 @@ public class ReportDesignerTest extends ComplexTestCase { sOutputPath += _sName; sOutputPath += getFormatExtension(_nType); - + String sOutputURL = URLHelper.getFileURLFromSystemPath(sOutputPath); ArrayList aPropertyList = new ArrayList(); // set some properties for storeAsURL @@ -562,7 +562,7 @@ public class ReportDesignerTest extends ComplexTestCase { } } } - + private XComponent loadComponent(String _sName, Object _xComponent, ArrayList _aPropertyList) { XComponent xDocComponent = null; @@ -604,5 +604,5 @@ public class ReportDesignerTest extends ComplexTestCase { log.println("Message: " + e.getMessage()); } } - + } diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 4b5f26f9cd96..3085c2742083 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,7 +130,7 @@ uno::Sequence< ::rtl::OUString > lcl_getLineOptionals() , PROPERTY_CHARWORDMODECOMPLEX , PROPERTY_CHARROTATIONCOMPLEX , PROPERTY_CHARSCALEWIDTHCOMPLEX - , PROPERTY_CHARLOCALECOMPLEX + , PROPERTY_CHARLOCALECOMPLEX }; @@ -139,7 +139,7 @@ uno::Sequence< ::rtl::OUString > lcl_getLineOptionals() DBG_NAME(rpt_OFixedLine) // ----------------------------------------------------------------------------- OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContext) -:FixedLineBase(m_aMutex) +:FixedLineBase(m_aMutex) ,FixedLinePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getLineOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nOrientation(1) @@ -156,7 +156,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape ,sal_Int32 _nOrientation) -:FixedLineBase(m_aMutex) +:FixedLineBase(m_aMutex) ,FixedLinePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getLineOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nOrientation(_nOrientation) @@ -212,10 +212,10 @@ uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw (u return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException) +void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException) { FixedLinePropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -233,7 +233,7 @@ uno::Sequence< ::rtl::OUString > OFixedLine::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FIXEDLINE; - + return aServices; } //------------------------------------------------------------------------------ @@ -539,28 +539,28 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); -} -void SAL_CALL OFixedLine::setHyperLinkURL(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +} +void SAL_CALL OFixedLine::setHyperLinkURL(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); } -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +::rtl::OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); -} -void SAL_CALL OFixedLine::setHyperLinkTarget(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +} +void SAL_CALL OFixedLine::setHyperLinkTarget(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); } -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +::rtl::OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); -} -void SAL_CALL OFixedLine::setHyperLinkName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +} +void SAL_CALL OFixedLine::setHyperLinkName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); } diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 4414508dcd04..fbc6dce7e1fd 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ uno::Sequence< ::rtl::OUString > lcl_getFixedTextOptionals() DBG_NAME( rpt_OFixedText ) // ----------------------------------------------------------------------------- OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext) -:FixedTextBase(m_aMutex) +:FixedTextBase(m_aMutex) ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { @@ -64,7 +64,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) -:FixedTextBase(m_aMutex) +:FixedTextBase(m_aMutex) ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { @@ -99,7 +99,7 @@ uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (u //IMPLEMENT_FORWARD_XINTERFACE2(OFixedText,FixedTextBase,FixedTextPropertySet) // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) +void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) { FixedTextPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -122,7 +122,7 @@ uno::Sequence< ::rtl::OUString > OFixedText::getSupportedServiceNames_Static( ) uno::Sequence< ::rtl::OUString > aServices(1);//2); aServices.getArray()[0] = SERVICE_FIXEDTEXT; //aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); - + return aServices; } //------------------------------------------------------------------------------ diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 73315be74314..56973d8194ba 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ uno::Reference< uno::XInterface > OFormatCondition::create(uno::Reference< uno:: DBG_NAME( rpt_OFormatCondition ) // ----------------------------------------------------------------------------- OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext) -:FormatConditionBase(m_aMutex) +:FormatConditionBase(m_aMutex) ,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) ,m_bEnabled(sal_True) { @@ -65,10 +65,10 @@ OFormatCondition::~OFormatCondition() // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(OFormatCondition,FormatConditionBase,FormatConditionPropertySet) // ----------------------------------------------------------------------------- -void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException) +void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException) { FormatConditionPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -86,7 +86,7 @@ uno::Sequence< ::rtl::OUString > OFormatCondition::getSupportedServiceNames_Stat { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FORMATCONDITION; - + return aServices; } //-------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 100ded84e8ab..b8096cad5853 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ uno::Sequence< ::rtl::OUString > lcl_getFormattedFieldOptionals() DBG_NAME( rpt_OFormattedField ) // ----------------------------------------------------------------------------- OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext) -:FormattedFieldBase(m_aMutex) +:FormattedFieldBase(m_aMutex) ,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) @@ -71,7 +71,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) -:FormattedFieldBase(m_aMutex) +:FormattedFieldBase(m_aMutex) ,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) @@ -106,7 +106,7 @@ uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) thr } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) +void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) { FormattedFieldPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -130,7 +130,7 @@ uno::Sequence< ::rtl::OUString > OFormattedField::getSupportedServiceNames_Stati uno::Sequence< ::rtl::OUString > aServices(2); aServices.getArray()[0] = SERVICE_FORMATTEDFIELD; aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel")); - + return aServices; } //-------------------------------------------------------------------------- @@ -231,7 +231,7 @@ uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone( ) thr { uno::Reference< report::XReportComponent> xSource = this; uno::Reference< report::XFormattedField> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FORMATTEDFIELD),uno::UNO_QUERY_THROW); - + if ( xSet.is() ) { ::std::vector< uno::Reference< report::XFormatCondition> >::iterator aIter = m_aProps.m_aFormatConditions.begin(); diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 05e52ae6f93c..1752ef615986 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ uno::Reference< uno::XInterface > OFunction::create(uno::Reference< uno::XCompon DBG_NAME( rpt_OFunction ) // ----------------------------------------------------------------------------- OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext) -:FunctionBase(m_aMutex) +:FunctionBase(m_aMutex) ,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) ,m_xContext(_xContext) ,m_bPreEvaluated(sal_False) @@ -66,10 +66,10 @@ OFunction::~OFunction() // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(OFunction,FunctionBase,FunctionPropertySet) // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::dispose() throw(uno::RuntimeException) +void SAL_CALL OFunction::dispose() throw(uno::RuntimeException) { FunctionPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -87,7 +87,7 @@ uno::Sequence< ::rtl::OUString > OFunction::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FUNCTION; - + return aServices; } //-------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 80a06c85ef61..bce09bf54b03 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,20 +49,20 @@ OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xPar DBG_CTOR( rpt_OFunctions,NULL); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OFunctions::~OFunctions() { DBG_DTOR( rpt_OFunctions,NULL); } //-------------------------------------------------------------------------- -void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException) +void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException) { cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OFunctions::disposing() { ::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&com::sun::star::report::XFunction::dispose)); @@ -83,7 +83,7 @@ uno::Reference< report::XFunction > SAL_CALL OFunctions::createFunction( ) thro void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aFunctions.size())); if ( !bAdd ) checkIndex(Index); @@ -111,7 +111,7 @@ void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexO { uno::Reference< report::XFunction > xFunction; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); TFunctions::iterator aPos = m_aFunctions.begin(); ::std::advance(aPos,Index); @@ -128,7 +128,7 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele { uno::Any aOldElement; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); uno::Reference< report::XFunction > xFunction(Element,uno::UNO_QUERY); if ( !xFunction.is() ) diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index d7c208c98634..f57248420880 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent osl_decrementInterlockedCount( &m_refCount ); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OGroup::~OGroup() { DBG_DTOR( rpt_OGroup,NULL); @@ -109,14 +109,14 @@ sal_Bool SAL_CALL OGroup::supportsService( const ::rtl::OUString& _rServiceName return ::comphelper::existsValue(_rServiceName,getSupportedServiceNames_Static()); } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::dispose() throw(uno::RuntimeException) +void SAL_CALL OGroup::dispose() throw(uno::RuntimeException) { GroupPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OGroup::disposing() { m_xHeader.clear(); @@ -180,7 +180,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getHeader() throw (container ::osl::MutexGuard aGuard(m_aMutex); xRet = m_xHeader; } - + if ( !xRet.is() ) throw container::NoSuchElementException(); return xRet; @@ -193,7 +193,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container ::osl::MutexGuard aGuard(m_aMutex); xRet = m_xFooter; } - + if ( !xRet.is() ) throw container::NoSuchElementException(); return xRet; @@ -294,7 +294,7 @@ void SAL_CALL OGroup::setParent( const uno::Reference< uno::XInterface >& /*Pare // ----------------------------------------------------------------------------- uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo( ) throw(uno::RuntimeException) { - // return uno::Reference< beans::XPropertySetInfo >(); + // return uno::Reference< beans::XPropertySetInfo >(); return GroupPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- @@ -328,7 +328,7 @@ void SAL_CALL OGroup::removeVetoableChangeListener( const ::rtl::OUString& Prope GroupPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void OGroup::setSection( const ::rtl::OUString& _sProperty +void OGroup::setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,uno::Reference< report::XSection>& _member) diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index b65d8faf75fe..073894f352bc 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,con DBG_CTOR( rpt_OGroups,NULL); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OGroups::~OGroups() { DBG_DTOR( rpt_OGroups,NULL); @@ -59,21 +59,21 @@ void OGroups::copyGroups(const uno::Reference< report::XGroups >& _xSource) { sal_Int32 nCount = _xSource->getCount(); for (sal_Int32 i = 0; i != nCount; ++i) - { + { OGroup* pGroup = new OGroup(this,m_xContext); m_aGroups.push_back(pGroup); uno::Reference<report::XGroup> xGroup(_xSource->getByIndex(i),uno::UNO_QUERY); pGroup->copyGroup(xGroup); - } + } } // ----------------------------------------------------------------------------- -void SAL_CALL OGroups::dispose() throw(uno::RuntimeException) +void SAL_CALL OGroups::dispose() throw(uno::RuntimeException) { cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OGroups::disposing() { ::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&com::sun::star::report::XGroup::dispose)); @@ -98,7 +98,7 @@ uno::Reference< report::XGroup > SAL_CALL OGroups::createGroup( ) throw (uno::R void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aGroups.size())); if ( !bAdd ) checkIndex(Index); @@ -125,7 +125,7 @@ void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutO { uno::Reference< report::XGroup > xGroup; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); TGroups::iterator aPos = m_aGroups.begin(); ::std::advance(aPos,Index); @@ -141,7 +141,7 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Elemen { uno::Any aOldElement; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); uno::Reference< report::XGroup > xGroup(Element,uno::UNO_QUERY); if ( !xGroup.is() ) diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 60498b766b12..d7132b80bbb0 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ uno::Sequence< ::rtl::OUString > lcl_getImageOptionals() , PROPERTY_CHARWORDMODECOMPLEX , PROPERTY_CHARROTATIONCOMPLEX , PROPERTY_CHARSCALEWIDTHCOMPLEX - , PROPERTY_CHARLOCALECOMPLEX + , PROPERTY_CHARLOCALECOMPLEX }; return uno::Sequence< ::rtl::OUString >(pProps,SAL_N_ELEMENTS(pProps)); @@ -123,7 +123,7 @@ uno::Sequence< ::rtl::OUString > lcl_getImageOptionals() DBG_NAME( rpt_OImageControl ) // ----------------------------------------------------------------------------- OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext) -:ImageControlBase(m_aMutex) +:ImageControlBase(m_aMutex) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nScaleMode(awt::ImageScaleMode::None) @@ -136,7 +136,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) -:ImageControlBase(m_aMutex) +:ImageControlBase(m_aMutex) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nScaleMode(awt::ImageScaleMode::None) @@ -173,7 +173,7 @@ uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType ) throw } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException) +void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException) { ImageControlPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -194,7 +194,7 @@ uno::Sequence< ::rtl::OUString > OImageControl::getSupportedServiceNames_Static( { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_IMAGECONTROL; - + return aServices; } //------------------------------------------------------------------------------ @@ -220,61 +220,61 @@ REPORTCOMPONENT_IMPL2(OImageControl,m_aProps.aComponent) REPORTCOMPONENT_NOMASTERDETAIL(OImageControl) //REPORTCONTROLFORMAT_IMPL(OImageControl,m_aProps.aFormatProperties) NO_REPORTCONTROLFORMAT_IMPL(OImageControl) -::rtl::OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.sHyperLinkURL; -} -void SAL_CALL OImageControl::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - set(PROPERTY_HYPERLINKURL,the_value,m_aProps.aFormatProperties.sHyperLinkURL); -} -::rtl::OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.sHyperLinkTarget; -} -void SAL_CALL OImageControl::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - set(PROPERTY_HYPERLINKTARGET,the_value,m_aProps.aFormatProperties.sHyperLinkTarget); -} -::rtl::OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.sHyperLinkName; -} -void SAL_CALL OImageControl::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName); +::rtl::OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.sHyperLinkURL; +} +void SAL_CALL OImageControl::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + set(PROPERTY_HYPERLINKURL,the_value,m_aProps.aFormatProperties.sHyperLinkURL); +} +::rtl::OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.sHyperLinkTarget; +} +void SAL_CALL OImageControl::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + set(PROPERTY_HYPERLINKTARGET,the_value,m_aProps.aFormatProperties.sHyperLinkTarget); +} +::rtl::OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.sHyperLinkName; +} +void SAL_CALL OImageControl::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName); } // ----------------------------------------------------------------------------- -::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.m_bBackgroundTransparent ? COL_TRANSPARENT : m_aProps.aFormatProperties.nBackgroundColor; -} - +::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.m_bBackgroundTransparent ? COL_TRANSPARENT : m_aProps.aFormatProperties.nBackgroundColor; +} + void SAL_CALL OImageControl::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +{ sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT); setControlBackgroundTransparent(bTransparent); if ( !bTransparent ) set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,m_aProps.aFormatProperties.nBackgroundColor); -} - -::sal_Bool SAL_CALL OImageControl::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.m_bBackgroundTransparent; -} - -void SAL_CALL OImageControl::setControlBackgroundTransparent( ::sal_Bool _controlbackgroundtransparent ) throw (beans::UnknownPropertyException, uno::RuntimeException) -{ +} + +::sal_Bool SAL_CALL OImageControl::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.m_bBackgroundTransparent; +} + +void SAL_CALL OImageControl::setControlBackgroundTransparent( ::sal_Bool _controlbackgroundtransparent ) throw (beans::UnknownPropertyException, uno::RuntimeException) +{ set(PROPERTY_CONTROLBACKGROUNDTRANSPARENT,_controlbackgroundtransparent,m_aProps.aFormatProperties.m_bBackgroundTransparent); if ( _controlbackgroundtransparent ) set(PROPERTY_CONTROLBACKGROUND,static_cast<sal_Int32>(COL_TRANSPARENT),m_aProps.aFormatProperties.nBackgroundColor); -} +} // ----------------------------------------------------------------------------- uno::Reference< beans::XPropertySetInfo > SAL_CALL OImageControl::getPropertySetInfo( ) throw(uno::RuntimeException) diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 78361152a82d..d43c9032327b 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index c247742d9870..31f5d8127614 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index fd9360e30b3c..0a1e08b3d8d9 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,74 +125,74 @@ #define MAP_LEN(x) x, sizeof(x) - 1 #define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x)) -// page styles -#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" -#define SC_UNO_PAGE_LEFTBORDER "LeftBorder" -#define SC_UNO_PAGE_RIGHTBORDER "RightBorder" -#define SC_UNO_PAGE_BOTTBORDER "BottomBorder" -#define SC_UNO_PAGE_TOPBORDER "TopBorder" -#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" -#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" -#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" -#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" -#define SC_UNO_PAGE_BORDERDIST "BorderDistance" -#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" -#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" -#define SC_UNO_PAGE_SCALEVAL "PageScale" -#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" +// page styles +#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" +#define SC_UNO_PAGE_LEFTBORDER "LeftBorder" +#define SC_UNO_PAGE_RIGHTBORDER "RightBorder" +#define SC_UNO_PAGE_BOTTBORDER "BottomBorder" +#define SC_UNO_PAGE_TOPBORDER "TopBorder" +#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" +#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" +#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" +#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" +#define SC_UNO_PAGE_BORDERDIST "BorderDistance" +#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" +#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" +#define SC_UNO_PAGE_SCALEVAL "PageScale" +#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" #define SC_UNO_PAGE_SCALETOX "ScaleToPagesX" #define SC_UNO_PAGE_SCALETOY "ScaleToPagesY" -#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" -#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" -#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" -#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" -#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" -#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" -#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" -#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" -#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" -#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" -#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" -#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" -#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" -#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" -#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" -#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" -#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" -#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" -#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" -#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" -#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" -#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" -#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" -#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" -#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" -#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" -#define SC_UNO_PAGE_HDRON "HeaderIsOn" -#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" -#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" -#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" -#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" -#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" -#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" -#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" -#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" -#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" -#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" -#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" -#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" -#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" -#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" -#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" -#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" -#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" -#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" -#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" -#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" -#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" -#define SC_UNO_PAGE_FTRON "FooterIsOn" -#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" -#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" +#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" +#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" +#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" +#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" +#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" +#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" +#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" +#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" +#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" +#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" +#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" +#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" +#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" +#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" +#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" +#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" +#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" +#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" +#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" +#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" +#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" +#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" +#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" +#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" +#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" +#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" +#define SC_UNO_PAGE_HDRON "HeaderIsOn" +#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" +#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" +#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" +#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" +#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" +#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" +#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" +#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" +#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" +#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" +#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" +#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" +#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" +#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" +#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" +#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" +#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" +#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" +#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" +#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" +#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" +#define SC_UNO_PAGE_FTRON "FooterIsOn" +#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" +#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" // ============================================================================= namespace reportdesign @@ -243,10 +243,10 @@ void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _r } } // ----------------------------------------------------------------------------- -typedef ::comphelper::OPropertyStateContainer OStyle_PBASE; +typedef ::comphelper::OPropertyStateContainer OStyle_PBASE; class OStyle; -typedef ::comphelper::OPropertyArrayUsageHelper < OStyle - > OStyle_PABASE; +typedef ::comphelper::OPropertyArrayUsageHelper < OStyle + > OStyle_PABASE; typedef ::cppu::WeakImplHelper2< style::XStyle, beans::XMultiPropertyStates> TStyleBASE; class OStyle : public ::comphelper::OMutexAndBroadcastHelper @@ -317,109 +317,109 @@ OStyle::OStyle() sal_Int32 i = 0; registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< ::rtl::OUString *>(NULL) ), &sName ); - registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - - registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,nBound,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); - registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + + registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); + //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,nBound,::getBooleanCppuType() ,&bTrue); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); + registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); // - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,nBound,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,nBound,::getBooleanCppuType() ,&bTrue); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); // - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); // - registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height, ::getCppuType((const sal_Int32*)0) ); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ++i,nBound, ::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,nBound, ::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ++i,nBound, ::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ++i,nBound, ::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_LEFTMARGIN, ++i,beans::PropertyAttribute::BOUND, ::getCppuType((const sal_Int32*)0) ,&nMargin); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); + registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height, ::getCppuType((const sal_Int32*)0) ); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ++i,nBound, ::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,nBound, ::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ++i,nBound, ::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ++i,nBound, ::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(PROPERTY_LEFTMARGIN, ++i,beans::PropertyAttribute::BOUND, ::getCppuType((const sal_Int32*)0) ,&nMargin); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); + registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); const ::rtl::OUString sPaperTray(RTL_CONSTASCII_USTRINGPARAM("[From printer settings]")); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - registerProperty(PROPERTY_PAPERSIZE, ++i,beans::PropertyAttribute::BOUND,&m_aSize,::getCppuType((const awt::Size*)0) ); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); + registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); + registerProperty(PROPERTY_PAPERSIZE, ++i,beans::PropertyAttribute::BOUND,&m_aSize,::getCppuType((const awt::Size*)0) ); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),++i,nBound,::getBooleanCppuType() ,&bFalse); //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),++i,nBound,::getBooleanCppuType() ,&bFalse); uno::Reference< container::XNameContainer> xAttribs = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< xml::AttributeData* >(NULL))); - registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"), ++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs); - registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) ); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNONAME_WRITING), ++i,nBound,:.getCppuType((sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"), ++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs); + registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) ); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNONAME_WRITING), ++i,nBound,:.getCppuType((sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty); uno::Sequence<sal_Int8> aSe; - registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); + registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); } @@ -487,7 +487,7 @@ void SAL_CALL OStyle::setAllPropertiesToDefault( ) throw (uno::RuntimeException void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { const ::rtl::OUString* pIter = aPropertyNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); + const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); for(;pIter != pEnd;++pIter) setPropertyToDefault(*pIter); } @@ -496,7 +496,7 @@ uno::Sequence< uno::Any > SAL_CALL OStyle::getPropertyDefaults( const uno::Seque { uno::Sequence< uno::Any > aRet(aPropertyNames.getLength()); const ::rtl::OUString* pIter = aPropertyNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); + const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) aRet[i] = getPropertyDefault(*pIter); return aRet; @@ -572,22 +572,22 @@ namespace // ----------------------------------------------------------------------------- struct OReportDefinitionImpl { - uno::WeakReference< uno::XInterface > m_xParent; - ::cppu::OInterfaceContainerHelper m_aStorageChangeListeners; - ::cppu::OInterfaceContainerHelper m_aCloseListener; - ::cppu::OInterfaceContainerHelper m_aModifyListeners; - ::cppu::OInterfaceContainerHelper m_aDocEventListeners; + uno::WeakReference< uno::XInterface > m_xParent; + ::cppu::OInterfaceContainerHelper m_aStorageChangeListeners; + ::cppu::OInterfaceContainerHelper m_aCloseListener; + ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::cppu::OInterfaceContainerHelper m_aDocEventListeners; ::std::vector< uno::Reference< frame::XController> > m_aControllers; - uno::Sequence< beans::PropertyValue > m_aArgs; - - uno::Reference< report::XGroups > m_xGroups; - uno::Reference< report::XSection> m_xReportHeader; - uno::Reference< report::XSection> m_xReportFooter; - uno::Reference< report::XSection> m_xPageHeader; - uno::Reference< report::XSection> m_xPageFooter; - uno::Reference< report::XSection> m_xDetail; - uno::Reference< embed::XStorage > m_xStorage; - uno::Reference< frame::XController > m_xCurrentController; + uno::Sequence< beans::PropertyValue > m_aArgs; + + uno::Reference< report::XGroups > m_xGroups; + uno::Reference< report::XSection> m_xReportHeader; + uno::Reference< report::XSection> m_xReportFooter; + uno::Reference< report::XSection> m_xPageHeader; + uno::Reference< report::XSection> m_xPageFooter; + uno::Reference< report::XSection> m_xDetail; + uno::Reference< embed::XStorage > m_xStorage; + uno::Reference< frame::XController > m_xCurrentController; uno::Reference< container::XIndexAccess > m_xViewData; uno::Reference< container::XNameAccess > m_xStyles; uno::Reference< container::XNameAccess> m_xXMLNamespaceMap; @@ -608,21 +608,21 @@ struct OReportDefinitionImpl ::boost::shared_ptr< ::comphelper::EmbeddedObjectContainer> m_pObjectContainer; ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; - ::rtl::OUString m_sCaption; - ::rtl::OUString m_sCommand; - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sMimeType; - ::rtl::OUString m_sIdentifier; - ::rtl::OUString m_sDataSourceName; - awt::Size m_aVisualAreaSize; - ::sal_Int64 m_nAspect; - ::sal_Int16 m_nGroupKeepTogether; - ::sal_Int16 m_nPageHeaderOption; - ::sal_Int16 m_nPageFooterOption; - ::sal_Int32 m_nCommandType; - sal_Bool m_bControllersLocked; - sal_Bool m_bModified; - sal_Bool m_bEscapeProcessing; + ::rtl::OUString m_sCaption; + ::rtl::OUString m_sCommand; + ::rtl::OUString m_sFilter; + ::rtl::OUString m_sMimeType; + ::rtl::OUString m_sIdentifier; + ::rtl::OUString m_sDataSourceName; + awt::Size m_aVisualAreaSize; + ::sal_Int64 m_nAspect; + ::sal_Int16 m_nGroupKeepTogether; + ::sal_Int16 m_nPageHeaderOption; + ::sal_Int16 m_nPageFooterOption; + ::sal_Int32 m_nCommandType; + sal_Bool m_bControllersLocked; + sal_Bool m_bModified; + sal_Bool m_bEscapeProcessing; sal_Bool m_bSetModifiedEnabled; OReportDefinitionImpl(::osl::Mutex& _aMutex) :m_aStorageChangeListeners(_aMutex) @@ -1217,7 +1217,7 @@ uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) t return xSet.get(); } // ----------------------------------------------------------------------------- -void OReportDefinition::setSection( const ::rtl::OUString& _sProperty +void OReportDefinition::setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,uno::Reference< report::XSection>& _member) @@ -1409,8 +1409,8 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::getCurrentSelectio void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< embed::XStorage >& _xStorageToLoadFrom, const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor ) { -// ::osl::MutexGuard aGuard(m_aMutex); -// ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); +// ::osl::MutexGuard aGuard(m_aMutex); +// ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); // m_pImpl->m_xStorage = _xStorageToLoadFrom; diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index feb94419f337..e5af3f2d8379 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx index 8ee97e2369c9..d0c17ef9b69f 100644 --- a/reportdesign/source/core/api/ReportVisitor.cxx +++ b/reportdesign/source/core/api/ReportVisitor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ void OReportVisitor::start(const uno::Reference< report::XReportDefinition>& _xR m_pTraverseReport->traversePageHeader(_xReportDefinition->getPageHeader()); if ( _xReportDefinition->getReportHeaderOn() ) m_pTraverseReport->traverseReportHeader(_xReportDefinition->getReportHeader()); - + uno::Reference< report::XGroups > xGroups = _xReportDefinition->getGroups(); m_pTraverseReport->traverseGroups(xGroups); const sal_Int32 nCount = xGroups->getCount(); diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 54e5cd8847ca..1935670dd27c 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,8 +139,8 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& _xParent //.getSdrModel()->createNewPage(m_xSection); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OSection::~OSection() { DBG_DTOR( rpt_OSection,NULL); @@ -164,16 +164,16 @@ uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType ) throw (uno } // ----------------------------------------------------------------------------- -void SAL_CALL OSection::dispose() throw(uno::RuntimeException) +void SAL_CALL OSection::dispose() throw(uno::RuntimeException) { OSL_ENSURE(!rBHelper.bDisposed,"Already disposed!"); SectionPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); - + cppu::WeakComponentImplHelperBase::dispose(); + } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OSection::disposing() { lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -191,7 +191,7 @@ void SAL_CALL OSection::disposing() uno::Reference< drawing::XShape> xShape(m_xDrawPage->getByIndex(0),uno::UNO_QUERY); m_xDrawPage->remove(xShape); ::comphelper::disposeComponent(xShape); - } + } catch(const uno::Exception&) {} } @@ -243,7 +243,7 @@ void OSection::init() { ::comphelper::query_aggregation(m_xProxy,m_xDrawPage); } - + // set ourself as delegator { if ( m_xProxy.is() ) @@ -379,7 +379,7 @@ void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang:: ,1 ,m_xContext); checkNotPageHeaderFooter(); - + set(PROPERTY_NEWROWORCOL,_newroworcol,m_nNewRowOrCol); } // ----------------------------------------------------------------------------- @@ -396,7 +396,7 @@ void SAL_CALL OSection::setKeepTogether( ::sal_Bool _keeptogether ) throw (lang: ::osl::MutexGuard aGuard(m_aMutex); checkNotPageHeaderFooter(); } - + set(PROPERTY_KEEPTOGETHER,_keeptogether,m_bKeepTogether); } // ----------------------------------------------------------------------------- @@ -516,7 +516,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OSection::getAvailableReportComponentN const ::std::vector< ::rtl::OUString >& aRet = lcl_getControlModelMap(); const ::rtl::OUString* pRet = aRet.empty() ? 0 : &aRet[0]; - return uno::Sequence< ::rtl::OUString >(pRet, aRet.size()); + return uno::Sequence< ::rtl::OUString >(pRet, aRet.size()); } // ----------------------------------------------------------------------------- // XChild diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 4ed2b8aabb9d..c6327bae2841 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ namespace reportdesign using namespace comphelper; uno::Sequence< ::rtl::OUString > lcl_getShapeOptionals() { - ::rtl::OUString pProps[] = { - PROPERTY_DATAFIELD + ::rtl::OUString pProps[] = { + PROPERTY_DATAFIELD ,PROPERTY_CONTROLBACKGROUND ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT }; @@ -64,7 +64,7 @@ uno::Sequence< ::rtl::OUString > lcl_getShapeOptionals() DBG_NAME( rpt_OShape ) // ----------------------------------------------------------------------------- OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext) -:ShapeBase(m_aMutex) +:ShapeBase(m_aMutex) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nZOrder(0) @@ -78,7 +78,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape ,const ::rtl::OUString& _sServiceName) -:ShapeBase(m_aMutex) +:ShapeBase(m_aMutex) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nZOrder(0) @@ -122,10 +122,10 @@ uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType ) throw (uno:: } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::dispose() throw(uno::RuntimeException) +void SAL_CALL OShape::dispose() throw(uno::RuntimeException) { ShapePropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -143,7 +143,7 @@ uno::Sequence< ::rtl::OUString > OShape::getSupportedServiceNames_Static( ) thr { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_SHAPE; - + return aServices; } //------------------------------------------------------------------------------ @@ -160,7 +160,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OShape::getSupportedServiceNames( ) t //------------------------------------------------------------------------------ sal_Bool SAL_CALL OShape::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) { - + return m_sServiceName == ServiceName || ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } // ----------------------------------------------------------------------------- @@ -192,7 +192,7 @@ void SAL_CALL OShape::setControlBackgroundTransparent( ::sal_Bool /*_controlback // ----------------------------------------------------------------------------- uno::Reference< beans::XPropertySetInfo > SAL_CALL OShape::getPropertySetInfo( ) throw(uno::RuntimeException) { - + //return ShapePropertySet::getPropertySetInfo(); return cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } @@ -480,7 +480,7 @@ void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transfo { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEENGINE) >>= m_CustomShapeEngine; - + return m_CustomShapeEngine; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 99028d9c7e4f..43296d7b2f44 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 32fa29152634..9c500fa9c620 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,11 +72,11 @@ cppu::ImplementationEntry entries[] = { &cppu::createSingleComponentFactory, 0, 0 }, { &OFixedLine::create, &OFixedLine::getImplementationName_Static, &OFixedLine::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } -extern "C" +extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * implName, void * serviceManager, void * registryKey) diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index 5ae4790701d2..bc551a8ff136 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,32 +39,32 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedLine > FixedLinePropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedLine > FixedLinePropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFixedLine - ,com::sun::star::lang::XServiceInfo > FixedLineBase; + ,com::sun::star::lang::XServiceInfo > FixedLineBase; /** \class OFixedLine Defines the implementation of a \interface com:::sun::star::report::XFixedLine * \ingroup reportdesign_api * */ - class OFixedLine : public comphelper::OBaseMutex, + class OFixedLine : public comphelper::OBaseMutex, public FixedLineBase, public FixedLinePropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::com::sun::star::drawing::LineStyle m_LineStyle; - ::com::sun::star::drawing::LineDash m_LineDash; - sal_Int32 m_nOrientation; - ::sal_Int32 m_LineColor; - ::sal_Int16 m_LineTransparence; - ::sal_Int32 m_LineWidth; + OReportControlModel m_aProps; + ::com::sun::star::drawing::LineStyle m_LineStyle; + ::com::sun::star::drawing::LineDash m_LineDash; + sal_Int32 m_nOrientation; + ::sal_Int32 m_LineColor; + ::sal_Int16 m_LineTransparence; + ::sal_Int32 m_LineWidth; private: OFixedLine(const OFixedLine&); OFixedLine& operator=(const OFixedLine&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -116,7 +116,7 @@ namespace reportdesign // XReportControlModel REPORTCONTROLMODEL_HEADER() - + // XFixedLine virtual ::sal_Int32 SAL_CALL getOrientation() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setOrientation( ::sal_Int32 _orientation ) throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException); @@ -139,12 +139,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index f1208c6bf635..0c5aae05c752 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,26 +40,26 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedText > FixedTextPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedText > FixedTextPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFixedText - ,com::sun::star::lang::XServiceInfo > FixedTextBase; + ,com::sun::star::lang::XServiceInfo > FixedTextBase; /** \class OFixedText Defines the implementation of a \interface com:::sun::star::report::XFixedText * \ingroup reportdesign_api * */ - class OFixedText : public comphelper::OBaseMutex, + class OFixedText : public comphelper::OBaseMutex, public FixedTextBase, public FixedTextPropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::rtl::OUString m_sLabel; + OReportControlModel m_aProps; + ::rtl::OUString m_sLabel; private: OFixedText(const OFixedText&); OFixedText& operator=(const OFixedText&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -125,12 +125,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index e4698d686655..8a74766f49b4 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,26 +38,26 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormatCondition > FormatConditionPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormatCondition > FormatConditionPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFormatCondition - ,com::sun::star::lang::XServiceInfo > FormatConditionBase; + ,com::sun::star::lang::XServiceInfo > FormatConditionBase; /** \class OFormatCondition Defines the implementation of a \interface com:::sun::star::report::XFormatCondition * \ingroup reportdesign_api * */ - class OFormatCondition : public comphelper::OBaseMutex, + class OFormatCondition : public comphelper::OBaseMutex, public FormatConditionBase, public FormatConditionPropertySet { - OFormatProperties m_aFormatProperties; - ::rtl::OUString m_sFormula; - sal_Bool m_bEnabled; + OFormatProperties m_aFormatProperties; + ::rtl::OUString m_sFormula; + sal_Bool m_bEnabled; private: OFormatCondition(const OFormatCondition&); OFormatCondition& operator=(const OFormatCondition&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -104,12 +104,12 @@ namespace reportdesign REPORTCONTROLFORMAT_HEADER() // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 3c5304417f5f..d47ad7bc90ff 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,31 +38,31 @@ #include "ReportHelperDefines.hxx" namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormattedField > FormattedFieldPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormattedField > FormattedFieldPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFormattedField - ,com::sun::star::lang::XServiceInfo > FormattedFieldBase; + ,com::sun::star::lang::XServiceInfo > FormattedFieldBase; /** \class OFormattedField Defines the implementation of a \interface com:::sun::star::report::XFormattedField * \ingroup reportdesign_api * */ - class OFormattedField : public comphelper::OBaseMutex, + class OFormattedField : public comphelper::OBaseMutex, public FormattedFieldBase, public FormattedFieldPropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > + OReportControlModel m_aProps; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xFormatsSupplier; ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction> m_xFunction; ::sal_Int32 m_nFormatKey; - + private: OFormattedField(const OFormattedField&); OFormattedField& operator=(const OFormattedField&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -135,7 +135,7 @@ namespace reportdesign // XReportControlModel REPORTCONTROLMODEL_HEADER() - + // XReportControlFormat REPORTCONTROLFORMAT_HEADER() @@ -150,12 +150,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index 21accff689d3..719f911c2bc1 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +37,15 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFunction > FunctionPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFunction > FunctionPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFunction - ,com::sun::star::lang::XServiceInfo > FunctionBase; + ,com::sun::star::lang::XServiceInfo > FunctionBase; /** \class OFunction Defines the implementation of a \interface com:::sun::star::report::XFunction * \ingroup reportdesign_api * */ - class OFunction : public cppu::BaseMutex, + class OFunction : public cppu::BaseMutex, public FunctionBase, public FunctionPropertySet { @@ -53,14 +53,14 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctions > m_xParent; ::rtl::OUString m_sName; - ::rtl::OUString m_sFormula; + ::rtl::OUString m_sFormula; ::sal_Bool m_bPreEvaluated; ::sal_Bool m_bDeepTraversing; private: OFunction(const OFunction&); OFunction& operator=(const OFunction&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -110,12 +110,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx index 416ef70460b4..7760392651b8 100644 --- a/reportdesign/source/core/inc/Functions.hxx +++ b/reportdesign/source/core/inc/Functions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,24 +46,24 @@ namespace reportdesign class OFunctions : public comphelper::OBaseMutex, public FunctionsBase { - typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > > TFunctions; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > > TFunctions; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctionsSupplier > m_xParent; - TFunctions m_aFunctions; + TFunctions m_aFunctions; private: OFunctions& operator=(const OFunctions&); OFunctions(const OFunctions&); void checkIndex(sal_Int32 _nIndex); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OFunctions(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: explicit OFunctions( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xParent @@ -89,15 +89,15 @@ namespace reportdesign // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index cf43755094c1..b6678c68bf27 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,17 +53,17 @@ namespace reportdesign ,public GroupPropertySet { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroups > m_xParent; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xHeader; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xFooter; + ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroups > m_xParent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xHeader; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xFooter; ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; - ::rptshared::GroupProperties m_aProps; + ::rptshared::GroupProperties m_aProps; private: OGroup& operator=(const OGroup&); OGroup(const OGroup&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -78,19 +78,19 @@ namespace reportdesign } l.notify(); } - void setSection( const ::rtl::OUString& _sProperty + void setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OGroup(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: OGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups >& _xParent @@ -105,7 +105,7 @@ namespace reportdesign virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - + // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -114,7 +114,7 @@ namespace reportdesign virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( 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); 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); - + // XGroup virtual ::sal_Bool SAL_CALL getSortAscending() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setSortAscending( ::sal_Bool _sortascending ) throw (::com::sun::star::uno::RuntimeException); @@ -137,7 +137,7 @@ namespace reportdesign virtual void SAL_CALL setStartNewColumn( ::sal_Bool _startnewcolumn ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getResetPageNumber() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setResetPageNumber( ::sal_Bool _resetpagenumber ) throw (::com::sun::star::uno::RuntimeException); - + //XFunctionsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > SAL_CALL getFunctions() throw (::com::sun::star::uno::RuntimeException); @@ -147,12 +147,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx index c2ef3bc1b508..c5819cec5279 100644 --- a/reportdesign/source/core/inc/Groups.hxx +++ b/reportdesign/source/core/inc/Groups.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,24 +45,24 @@ namespace reportdesign class OGroups : public comphelper::OBaseMutex, public GroupsBase { - typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > > TGroups; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xParent; - TGroups m_aGroups; + typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > > TGroups; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xParent; + TGroups m_aGroups; private: OGroups& operator=(const OGroups&); OGroups(const OGroups&); void checkIndex(sal_Int32 _nIndex); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OGroups(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: OGroups( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent @@ -92,15 +92,15 @@ namespace reportdesign // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index 79ca29ff822c..49daa5ffdc8b 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,28 +38,28 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XImageControl > ImageControlPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XImageControl > ImageControlPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XImageControl - ,com::sun::star::lang::XServiceInfo > ImageControlBase; + ,com::sun::star::lang::XServiceInfo > ImageControlBase; /** \class OImageControl Defines the implementation of a \interface com:::sun::star::report::XImageControl * \ingroup reportdesign_api * */ - class OImageControl : public comphelper::OBaseMutex, + class OImageControl : public comphelper::OBaseMutex, public ImageControlBase, public ImageControlPropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::rtl::OUString m_aImageURL; + OReportControlModel m_aProps; + ::rtl::OUString m_aImageURL; sal_Int16 m_nScaleMode; - ::sal_Bool m_bPreserveIRI; + ::sal_Bool m_bPreserveIRI; private: OImageControl(const OImageControl&); OImageControl& operator=(const OImageControl&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -129,12 +129,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx index df07fadd0fb9..a2ec036be3dc 100644 --- a/reportdesign/source/core/inc/ReportComponent.hxx +++ b/reportdesign/source/core/inc/ReportComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ namespace reportdesign { - class OReportComponentProperties + class OReportComponentProperties { public: - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XChild > m_xParent; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XChild > m_xParent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxy; @@ -56,16 +56,16 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xTypeProvider; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xUnoTunnel; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; - ::rtl::OUString m_sName; - ::sal_Int32 m_nHeight; - ::sal_Int32 m_nWidth; - ::sal_Int32 m_nPosX; - ::sal_Int32 m_nPosY; - ::sal_Int32 m_nBorderColor; - ::sal_Int16 m_nBorder; - ::sal_Bool m_bPrintRepeatedValues; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; + ::rtl::OUString m_sName; + ::sal_Int32 m_nHeight; + ::sal_Int32 m_nWidth; + ::sal_Int32 m_nPosX; + ::sal_Int32 m_nPosY; + ::sal_Int32 m_nBorderColor; + ::sal_Int16 m_nBorder; + ::sal_Bool m_bPrintRepeatedValues; OReportComponentProperties(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext ) diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index 44f3b6c1eaa3..1b3f42b67171 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,19 +52,19 @@ namespace reportdesign struct OFormatProperties { - ::sal_Int16 nAlign; - ::com::sun::star::awt::FontDescriptor aFontDescriptor; - ::com::sun::star::awt::FontDescriptor aAsianFontDescriptor; - ::com::sun::star::awt::FontDescriptor aComplexFontDescriptor; + ::sal_Int16 nAlign; + ::com::sun::star::awt::FontDescriptor aFontDescriptor; + ::com::sun::star::awt::FontDescriptor aAsianFontDescriptor; + ::com::sun::star::awt::FontDescriptor aComplexFontDescriptor; ::com::sun::star::lang::Locale aCharLocale; ::com::sun::star::lang::Locale aCharLocaleAsian; ::com::sun::star::lang::Locale aCharLocaleComplex; - ::sal_Int16 nFontEmphasisMark; - ::sal_Int16 nFontRelief; - ::sal_Int32 nTextColor; - ::sal_Int32 nTextLineColor; - ::sal_Int32 nCharUnderlineColor; - ::sal_Int32 nBackgroundColor; + ::sal_Int16 nFontEmphasisMark; + ::sal_Int16 nFontRelief; + ::sal_Int32 nTextColor; + ::sal_Int32 nTextLineColor; + ::sal_Int32 nCharUnderlineColor; + ::sal_Int32 nBackgroundColor; ::rtl::OUString sCharCombinePrefix; ::rtl::OUString sCharCombineSuffix; ::rtl::OUString sHyperLinkURL; @@ -73,17 +73,17 @@ namespace reportdesign ::rtl::OUString sVisitedCharStyleName; ::rtl::OUString sUnvisitedCharStyleName; com::sun::star::style::VerticalAlignment aVerticalAlignment; - ::sal_Int16 nCharEscapement; - ::sal_Int16 nCharCaseMap; - ::sal_Int16 nCharKerning; - ::sal_Int8 nCharEscapementHeight; - ::sal_Bool m_bBackgroundTransparent; - ::sal_Bool bCharFlash; - ::sal_Bool bCharAutoKerning; - ::sal_Bool bCharCombineIsOn; - ::sal_Bool bCharHidden; - ::sal_Bool bCharShadowed; - ::sal_Bool bCharContoured; + ::sal_Int16 nCharEscapement; + ::sal_Int16 nCharCaseMap; + ::sal_Int16 nCharKerning; + ::sal_Int8 nCharEscapementHeight; + ::sal_Bool m_bBackgroundTransparent; + ::sal_Bool bCharFlash; + ::sal_Bool bCharAutoKerning; + ::sal_Bool bCharCombineIsOn; + ::sal_Bool bCharHidden; + ::sal_Bool bCharShadowed; + ::sal_Bool bCharContoured; OFormatProperties(); }; class OReportControlModel @@ -92,16 +92,16 @@ namespace reportdesign OReportControlModel(OReportControlModel&); void operator =(OReportControlModel&); public: - ::cppu::OInterfaceContainerHelper aContainerListeners; - OReportComponentProperties aComponent; - OFormatProperties aFormatProperties; + ::cppu::OInterfaceContainerHelper aContainerListeners; + OReportComponentProperties aComponent; + OFormatProperties aFormatProperties; ::com::sun::star::container::XContainer* m_pOwner; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> > + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> > m_aFormatConditions; osl::Mutex& m_rMutex; - ::rtl::OUString aDataField; - ::rtl::OUString aConditionalPrintExpression; - sal_Bool bPrintWhenGroupChange; + ::rtl::OUString aDataField; + ::rtl::OUString aConditionalPrintExpression; + sal_Bool bPrintWhenGroupChange; OReportControlModel(osl::Mutex& _rMutex ,::com::sun::star::container::XContainer* _pOwner diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx index e8fcc2547b8d..9fc3197c762e 100644 --- a/reportdesign/source/core/inc/ReportDrawPage.hxx +++ b/reportdesign/source/core/inc/ReportDrawPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index b56743807056..43bb35df8451 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,16 +50,16 @@ namespace reportdesign public ReportEngineBase, public ReportEnginePropertySet { - typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> m_StatusIndicator; + typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport; + ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> m_StatusIndicator; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; - ::sal_Int32 m_nMaxRows; + ::sal_Int32 m_nMaxRows; private: OReportEngineJFree(const OReportEngineJFree&); OReportEngineJFree& operator=(const OReportEngineJFree&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -79,11 +79,11 @@ namespace reportdesign ::rtl::OUString getNewOutputName(); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OReportEngineJFree(); public: - typedef ::comphelper::ImplementationReference< OReportEngineJFree ,::com::sun::star::report::XReportEngine,::com::sun::star::uno::XWeak > TReportEngine; + typedef ::comphelper::ImplementationReference< OReportEngineJFree ,::com::sun::star::report::XReportEngine,::com::sun::star::uno::XWeak > TReportEngine; OReportEngineJFree(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context); @@ -126,12 +126,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx b/reportdesign/source/core/inc/ReportHelperImpl.hxx index 1b5f7d2e78a0..5d27f230e312 100644 --- a/reportdesign/source/core/inc/ReportHelperImpl.hxx +++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx index 7a9f26d03371..ee4af6f0de02 100644 --- a/reportdesign/source/core/inc/ReportUndoFactory.hxx +++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptui { class OReportUndoFactory : public SdrUndoFactory { - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::std::auto_ptr<SdrUndoFactory> m_pUndoFactory; OReportUndoFactory(const OReportUndoFactory&); @@ -68,7 +68,7 @@ namespace rptui virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1); // page - virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); + virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1); diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx index 0174908452f2..b053be589fde 100644 --- a/reportdesign/source/core/inc/RptObjectListener.hxx +++ b/reportdesign/source/core/inc/RptObjectListener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +46,14 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListene class OObjectListener: public TPropertyChangeListenerHelper { private: - OObjectBase* m_pObject; + OObjectBase* m_pObject; OObjectListener(const OObjectListener&); void operator =(const OObjectListener&); protected: virtual ~OObjectListener(); public: OObjectListener(OObjectBase* _pObject); - + // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index c424b908a4e4..5dbd00c3e9e0 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,41 +44,41 @@ namespace reportdesign { - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::report::XSection + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::report::XSection , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XUnoTunnel> SectionBase; + , ::com::sun::star::lang::XUnoTunnel> SectionBase; typedef ::cppu::PropertySetMixin<com::sun::star::report::XSection> SectionPropertySet; class OSection : public comphelper::OMutexAndBroadcastHelper, public SectionBase, public SectionPropertySet { - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xDrawPage; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xDrawPage; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxy; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroup > m_xGroup; + ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroup > m_xGroup; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; - ::rtl::OUString m_sName; - ::rtl::OUString m_sConditionalPrintExpression; - ::sal_uInt32 m_nHeight; - ::sal_Int32 m_nBackgroundColor; - ::sal_Int16 m_nForceNewPage; - ::sal_Int16 m_nNewRowOrCol; - ::sal_Bool m_bKeepTogether; - ::sal_Bool m_bCanGrow; - ::sal_Bool m_bCanShrink; - ::sal_Bool m_bRepeatSection; - ::sal_Bool m_bVisible; - ::sal_Bool m_bBacktransparent; + ::rtl::OUString m_sName; + ::rtl::OUString m_sConditionalPrintExpression; + ::sal_uInt32 m_nHeight; + ::sal_Int32 m_nBackgroundColor; + ::sal_Int16 m_nForceNewPage; + ::sal_Int16 m_nNewRowOrCol; + ::sal_Bool m_bKeepTogether; + ::sal_Bool m_bCanGrow; + ::sal_Bool m_bCanShrink; + ::sal_Bool m_bRepeatSection; + ::sal_Bool m_bVisible; + ::sal_Bool m_bBacktransparent; bool m_bInRemoveNotify; bool m_bInInsertNotify; - + private: OSection(const OSection&); OSection& operator=(const OSection&); - - template <typename T> void set( const ::rtl::OUString& _sProperty + + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -101,17 +101,17 @@ namespace reportdesign void init(); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OSection(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: - typedef ::comphelper::ImplementationReference< OSection ,::com::sun::star::report::XSection,::com::sun::star::uno::XWeak > TSection; + typedef ::comphelper::ImplementationReference< OSection ,::com::sun::star::report::XSection,::com::sun::star::uno::XWeak > TSection; OSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context,bool _bPageSection=false); @@ -119,7 +119,7 @@ namespace reportdesign ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context,bool _bPageSection=false); DECLARE_XINTERFACE( ) - + // ::com::sun::star::lang::XServiceInfo virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -185,12 +185,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index dcef6ae36897..3bb22a9d74f8 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +40,15 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XShape > ShapePropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XShape > ShapePropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XShape - ,com::sun::star::lang::XServiceInfo > ShapeBase; + ,com::sun::star::lang::XServiceInfo > ShapeBase; /** \class OShape Defines the implementation of a \interface com:::sun::star::report::XShape * \ingroup reportdesign_api * */ - class OShape : public comphelper::OBaseMutex, + class OShape : public comphelper::OBaseMutex, public ShapeBase, public ShapePropertySet { @@ -69,7 +69,7 @@ namespace reportdesign OShape(const OShape&); OShape& operator=(const OShape&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -146,12 +146,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index 343acfbdf859..81d7a00cf757 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -168,7 +168,7 @@ namespace reportdesign if ( xChild.is() ) xChild->setParent(Parent); } - template<typename T> static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getParent( T* _pShape ) + template<typename T> static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getParent( T* _pShape ) { ::osl::MutexGuard aGuard(_pShape->m_aMutex); ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xChild; diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx index ae7602ca0b82..03f061116545 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc index e565ddc9b9c5..64577312852e 100644 --- a/reportdesign/source/core/inc/core_resource.hrc +++ b/reportdesign/source/core/inc/core_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 @@ -33,26 +33,26 @@ #endif //------------------------------------------------------------------------------ -#define RID_CORE_STRINGS_START RID_RPT_START +#define RID_CORE_STRINGS_START RID_RPT_START //------------------------------------------------------------------------------ //- String-IDs -#define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 ) -#define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_PAGE_FOOTER ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_REPORT_HEADER ( RID_CORE_STRINGS_START + 3 ) -#define RID_STR_REPORT_FOOTER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_PROPERTY_CHANGE_NOT_ALLOWED ( RID_CORE_STRINGS_START + 5 ) -#define RID_STR_ERROR_WRONG_ARGUMENT ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ARGUMENT_IS_NULL ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_SHAPE ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_FIXEDTEXT ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_FORMATTEDFIELD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_GROUP_HEADER ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_GROUP_FOOTER ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_FIXEDLINE ( RID_CORE_STRINGS_START + 15 ) +#define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 ) +#define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 ) +#define RID_STR_PAGE_FOOTER ( RID_CORE_STRINGS_START + 2 ) +#define RID_STR_REPORT_HEADER ( RID_CORE_STRINGS_START + 3 ) +#define RID_STR_REPORT_FOOTER ( RID_CORE_STRINGS_START + 4 ) +#define RID_STR_PROPERTY_CHANGE_NOT_ALLOWED ( RID_CORE_STRINGS_START + 5 ) +#define RID_STR_ERROR_WRONG_ARGUMENT ( RID_CORE_STRINGS_START + 6 ) +#define RID_STR_ARGUMENT_IS_NULL ( RID_CORE_STRINGS_START + 7 ) +#define RID_STR_SHAPE ( RID_CORE_STRINGS_START + 8 ) +#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 9 ) +#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) +#define RID_STR_FIXEDTEXT ( RID_CORE_STRINGS_START + 11 ) +#define RID_STR_FORMATTEDFIELD ( RID_CORE_STRINGS_START + 12 ) +#define RID_STR_GROUP_HEADER ( RID_CORE_STRINGS_START + 13 ) +#define RID_STR_GROUP_FOOTER ( RID_CORE_STRINGS_START + 14 ) +#define RID_STR_FIXEDLINE ( RID_CORE_STRINGS_START + 15 ) #endif // REPORTDESIGN_CORE_RESOURCE_HRC_ diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx index 80b9a3228ccb..714771a621ef 100644 --- a/reportdesign/source/core/inc/core_resource.hxx +++ b/reportdesign/source/core/inc/core_resource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace reportdesign //================================================================== class ResourceManager { - static SimpleResMgr* m_pImpl; + static SimpleResMgr* m_pImpl; private: // no instantiation allowed diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 0804c1814487..7f3b1d8d07fb 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index 69246f36e654..8d7fcd2dc23b 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index cd101b0a3be0..7acea859ba49 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -146,7 +146,7 @@ namespace rptui bool bIsField = ( getType() == Field ); ::rtl::OUStringBuffer aFieldContent; if ( bIsField ) - aFieldContent.appendAscii( "[" ); + aFieldContent.appendAscii( "[" ); aFieldContent.append( getUndecoratedContent() ); if ( bIsField ) aFieldContent.appendAscii( "]" ); @@ -154,9 +154,9 @@ namespace rptui return aFieldContent.makeStringAndClear(); } //-------------------------------------------------------------------- - const ::rtl::OUString& ReportFormula::getUndecoratedContent() const - { - return m_sUndecoratedContent; + const ::rtl::OUString& ReportFormula::getUndecoratedContent() const + { + return m_sUndecoratedContent; } const ::rtl::OUString& ReportFormula::getCompleteFormula() const { return m_sCompleteFormula; } bool ReportFormula::isValid() const { return getType() != Invalid; } diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 90db1ef61e91..c7e6641e5f56 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,8 +62,8 @@ namespace reportdesign if (!m_pImpl) { // now that we have an impl class make sure it's deleted on unloading the library - static ResourceManager::EnsureDelete s_aDeleteTheImplClass; - + static ResourceManager::EnsureDelete s_aDeleteTheImplClass; + ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); rtl::OString sResLibName = rtl::OString( "rpt" ); diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src index d6191e2f381e..f7d3d3a764aa 100644 --- a/reportdesign/source/core/resource/strings.src +++ b/reportdesign/source/core/resource/strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index d132304be477..c823aed327dc 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ #include <svl/solar.hrc> #define EXPAND_PROTOCOL "vnd.sun.star.expand:" -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ +#define ENTER_MOD_METHOD() \ + ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() //......................................................................... @@ -53,7 +53,7 @@ namespace rptui */ class OModuleImpl { - ResMgr* m_pRessources; + ResMgr* m_pRessources; public: /// ctor @@ -61,7 +61,7 @@ public: ~OModuleImpl(); /// get the manager for the ressources of the module - ResMgr* getResManager(); + ResMgr* getResManager(); }; DBG_NAME( rpt_OModuleImpl ) @@ -83,7 +83,7 @@ OModuleImpl::~OModuleImpl() } //------------------------------------------------------------------------- -ResMgr* OModuleImpl::getResManager() +ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -99,11 +99,11 @@ ResMgr* OModuleImpl::getResManager() //========================================================================= //= OModule //========================================================================= -::osl::Mutex OModule::s_aMutex; -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = NULL; +::osl::Mutex OModule::s_aMutex; +sal_Int32 OModule::s_nClients = 0; +OModuleImpl* OModule::s_pImpl = NULL; //------------------------------------------------------------------------- -ResMgr* OModule::getResManager() +ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); @@ -136,7 +136,7 @@ void OModule::ensureImpl() } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 307b6f26c390..7cef3bf1fcb4 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ namespace rptui using namespace ::com::sun::star::beans; using namespace reportdesign; -DBG_NAME( rpt_OPropertyMediator ) -OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource +DBG_NAME( rpt_OPropertyMediator ) +OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,const Reference< XPropertySet>& _xDest ,const TPropertyNamePair& _aNameMap ,sal_Bool _bReverse) @@ -53,7 +53,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,m_xDest(_xDest) ,m_bInChange(sal_False) { - DBG_CTOR( rpt_OPropertyMediator,NULL); + DBG_CTOR( rpt_OPropertyMediator,NULL); osl_incrementInterlockedCount(&m_refCount); OSL_ENSURE(m_xDest.is(),"Dest is NULL!"); OSL_ENSURE(m_xSource.is(),"Source is NULL!"); @@ -100,7 +100,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource // ----------------------------------------------------------------------------- OPropertyMediator::~OPropertyMediator() { - DBG_DTOR( rpt_OPropertyMediator,NULL); + DBG_DTOR( rpt_OPropertyMediator,NULL); } // ----------------------------------------------------------------------------- void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException) @@ -141,7 +141,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt } if ( sPropName.getLength() && xPropInfo->hasPropertyByName(sPropName) ) xProp->setPropertyValue(sPropName,aFind->second.second->operator()(sPropName,evt.NewValue)); - else if ( evt.PropertyName == PROPERTY_CHARFONTNAME + else if ( evt.PropertyName == PROPERTY_CHARFONTNAME || evt.PropertyName == PROPERTY_CHARFONTSTYLENAME || evt.PropertyName == PROPERTY_CHARSTRIKEOUT || evt.PropertyName == PROPERTY_CHARWORDMODE @@ -201,7 +201,7 @@ void OPropertyMediator::startListening() } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 2aa9cca9d187..31c977b05bed 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; uno::Reference < embed::XEmbeddedObject > xObj; ::rtl::OUString sName; - xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( + xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( ::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("80243D39-6741-46C5-926E-069164FF87BB"))), sName ); OSL_ENSURE(xObj.is(),"Embedded Object could not be created!"); diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index a16963c95573..0f2fbcebef48 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,12 +54,12 @@ DBG_NAME( rpt_OReportUndoFactory ) // ----------------------------------------------------------------------------- OReportUndoFactory::OReportUndoFactory() : m_pUndoFactory(new SdrUndoFactory) { - DBG_CTOR( rpt_OReportUndoFactory,NULL); + DBG_CTOR( rpt_OReportUndoFactory,NULL); } // ----------------------------------------------------------------------------- OReportUndoFactory::~OReportUndoFactory() { - DBG_DTOR( rpt_OReportUndoFactory,NULL); + DBG_DTOR( rpt_OReportUndoFactory,NULL); } /////////////////////////////////////////////////////////////////////// // shapes @@ -146,7 +146,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, Sdr } // page -SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) +SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) { return m_pUndoFactory->CreateUndoDeletePage( rPage ); } @@ -177,7 +177,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChan } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 7b98042f9aeb..689ecd9149a8 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include "UndoEnv.hxx" #include "ReportUndoFactory.hxx" #include "ReportDefinition.hxx" -#define ITEMID_COLOR 1 +#define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 #define ITEMID_FONT 3 #define ITEMID_FONTHEIGHT 4 @@ -120,7 +120,7 @@ Window* OReportModel::GetCurDocViewWin() } //---------------------------------------------------------------------------- -OXUndoEnvironment& OReportModel::GetUndoEnv() +OXUndoEnvironment& OReportModel::GetUndoEnv() { return *m_pUndoEnv; } @@ -230,7 +230,7 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const ::rtl::OUStrin return xRet; } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 9e7a83a5b557..3f622a48f636 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,11 +107,11 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo } if ( xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) return OBJ_DLG_IMAGECONTROL; - if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) + if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) return OBJ_DLG_FORMATTEDFIELD; if ( xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ) ) return OBJ_OLE2; - if ( xServiceInfo->supportsService( SERVICE_SHAPE )) + if ( xServiceInfo->supportsService( SERVICE_SHAPE )) return OBJ_CUSTOMSHAPE; if ( xServiceInfo->supportsService( SERVICE_REPORTDEFINITION ) ) return OBJ_DLG_SUBREPORT; @@ -128,11 +128,11 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon { case OBJ_DLG_FIXEDTEXT: { - OUnoObject* pUnoObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) + OUnoObject* pUnoObj = new OUnoObject( _xComponent + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) ,OBJ_DLG_FIXEDTEXT); pNewObj = pUnoObj; - + uno::Reference<beans::XPropertySet> xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY); if ( xControlModel.is() ) xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(sal_True)); @@ -140,18 +140,18 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon break; case OBJ_DLG_IMAGECONTROL: pNewObj = new OUnoObject(_xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_HFIXEDLINE: case OBJ_DLG_VFIXEDLINE: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) ,nType); break; case OBJ_CUSTOMSHAPE: @@ -323,7 +323,7 @@ DBG_NAME( rpt_OObjectBase ) OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComponent) :m_bIsListening(sal_False) { - DBG_CTOR( rpt_OObjectBase,NULL); + DBG_CTOR( rpt_OObjectBase,NULL); m_xReportComponent = _xComponent; } //---------------------------------------------------------------------------- @@ -336,7 +336,7 @@ OObjectBase::OObjectBase(const ::rtl::OUString& _sComponentName) //---------------------------------------------------------------------------- OObjectBase::~OObjectBase() { - DBG_DTOR( rpt_OObjectBase,NULL); + DBG_DTOR( rpt_OObjectBase,NULL); m_xMediator.reset(); if ( isListening() ) EndListening(); @@ -370,7 +370,7 @@ void OObjectBase::StartListening() if ( !isListening() && m_xReportComponent.is() ) { m_bIsListening = sal_True; - + if ( !m_xPropertyChangeListener.is() ) { m_xPropertyChangeListener = new OObjectListener( this ); @@ -551,8 +551,8 @@ void OCustomShape::NbcMove( const Size& rSize ) m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.A()); m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.B()); } - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetSnapRect()); m_bIsListening = sal_True; @@ -728,7 +728,7 @@ sal_Int32 OUnoObject::GetStep() const void OUnoObject::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OUnoObject,NULL); - + if ( m_bIsListening ) { // stop listening @@ -775,7 +775,7 @@ void OUnoObject::NbcMove( const Size& rSize ) // } // } } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -794,8 +794,8 @@ void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Frac // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -807,8 +807,8 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect) SdrUnoObj::NbcSetLogicRect(rRect); // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(rRect); // start listening @@ -823,7 +823,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if ( bResult ) { impl_setReportComponent_nothrow(); - // set labels + // set labels if ( m_xReportComponent.is() ) { try @@ -840,7 +840,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) impl_initializeModel_nothrow(); } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); } @@ -848,7 +848,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } //---------------------------------------------------------------------------- ::rtl::OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) -{ +{ sal_uInt16 nResId = 0; ::rtl::OUString aDefaultName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HERE WE HAVE TO INSERT OUR NAME!")); if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) ) @@ -869,7 +869,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } if (nResId) - aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) ); + aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) ); return aDefaultName; } @@ -928,7 +928,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw OObjectBase::StartListening(); } } - } + } } } // ----------------------------------------------------------------------------- @@ -1035,7 +1035,7 @@ sal_Int32 OOle2Obj::GetStep() const void OOle2Obj::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OOle2Obj,NULL); - + if ( m_bIsListening ) { // stop listening @@ -1048,8 +1048,8 @@ void OOle2Obj::NbcMove( const Size& rSize ) m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.A()); m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.B()); } - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -1068,8 +1068,8 @@ void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -1081,8 +1081,8 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect) SdrOle2Obj::NbcSetLogicRect(rRect); // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(rRect); // start listening @@ -1103,7 +1103,7 @@ bool OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if ( !m_xReportComponent.is() ) m_xReportComponent.set(getUnoShape(),uno::UNO_QUERY); } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); } @@ -1150,7 +1150,7 @@ SdrObject* OOle2Obj::Clone() const OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); svt::EmbeddedObjectRef::TryRunningState( pObj->GetObjRef() ); pObj->impl_createDataProvider_nothrow(pRptModel->getReportDefinition().get()); - + uno::Reference< chart2::data::XDatabaseDataProvider > xSource( lcl_getDataProvider(GetObjRef()) ); uno::Reference< chart2::data::XDatabaseDataProvider > xDest( lcl_getDataProvider(pObj->GetObjRef()) ); if ( xSource.is() && xDest.is() ) @@ -1190,7 +1190,7 @@ void OOle2Obj::initializeOle() uno::Reference < embed::XEmbeddedObject > xObj = GetObjRef(); OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj)); - + uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is() ) { @@ -1238,11 +1238,11 @@ uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XRepor { uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies(); uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"))),uno::UNO_QUERY); - + uno::Reference< style::XStyle> xReturn; uno::Sequence< ::rtl::OUString> aSeq = xPageStyles->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd && !xReturn.is() ;++pIter) { uno::Reference< style::XStyle> xStyle(xPageStyles->getByName(*pIter),uno::UNO_QUERY); diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 01ba228ffb96..16ba83604b90 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,14 +41,14 @@ DBG_NAME(rpt_OObjectListener) OObjectListener::OObjectListener(OObjectBase* _pObject) :m_pObject(_pObject) { - DBG_CTOR(rpt_OObjectListener,NULL); + DBG_CTOR(rpt_OObjectListener,NULL); } //---------------------------------------------------------------------------- OObjectListener::~OObjectListener() { - DBG_DTOR(rpt_OObjectListener,NULL); + DBG_DTOR(rpt_OObjectListener,NULL); } // XEventListener diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index fe9ae18cdb52..b466a60bd839 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,17 +134,17 @@ SdrObject* OReportPage::RemoveObject(ULONG nObjNum) //---------------------------------------------------------------------------- //namespace //{ -// ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >& _xServiceInfo) -// { -// if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT )) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); +// ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >& _xServiceInfo) +// { +// if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT )) +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); // if ( _xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")); -// if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")); -// -// return ::rtl::OUString(); -// } +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")); +// if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")); +// +// return ::rtl::OUString(); +// } //} //---------------------------------------------------------------------------- void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject) @@ -197,14 +197,14 @@ void OReportPage::resetSpecialMode() const sal_Bool bChanged = rModel.IsChanged(); ::std::vector<SdrObject*>::iterator aIter = m_aTemporaryObjectList.begin(); ::std::vector<SdrObject*>::iterator aEnd = m_aTemporaryObjectList.end(); - + for (; aIter != aEnd; ++aIter) { removeTempObject(*aIter); } m_aTemporaryObjectList.clear(); rModel.SetChanged(bChanged); - + m_bSpecialInsertMode = false; } // ----------------------------------------------------------------------------- @@ -218,7 +218,7 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRe m_aTemporaryObjectList.push_back(pObj); return; } - + if ( pUnoObj ) { pUnoObj->CreateMediator(); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 737e43af74be..5e043b49bde5 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,17 +97,17 @@ namespace rptui TYPEINIT1( OCommentUndoAction, SdrUndoAction ); DBG_NAME(rpt_OCommentUndoAction) //---------------------------------------------------------------------------- -OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,USHORT nCommentID) +OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,USHORT nCommentID) :SdrUndoAction(_rMod) -{ - DBG_CTOR(rpt_OCommentUndoAction,NULL); +{ + DBG_CTOR(rpt_OCommentUndoAction,NULL); m_pController = static_cast< OReportModel& >( _rMod ).getController(); if ( nCommentID ) - m_strComment = String(ModuleRes(nCommentID)); + m_strComment = String(ModuleRes(nCommentID)); } OCommentUndoAction::~OCommentUndoAction() { - DBG_DTOR(rpt_OCommentUndoAction,NULL); + DBG_DTOR(rpt_OCommentUndoAction,NULL); } //---------------------------------------------------------------------------- void OCommentUndoAction::Undo() @@ -170,7 +170,7 @@ OUndoContainerAction::~OUndoContainerAction() } //------------------------------------------------------------------------------ void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ if ( m_xContainer.is() ) { // insert the element @@ -277,7 +277,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -323,7 +323,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -406,7 +406,7 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld) String ORptUndoPropertyAction::GetComment() const { String aStr(ModuleRes(RID_STR_UNDO_PROPERTY)); - + aStr.SearchAndReplace( '#', m_aPropertyName ); return aStr; } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 780113958495..70f132d63cdf 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ public: ::osl::Mutex m_aMutex; ::std::vector< uno::Reference< container::XChild> > m_aSections; oslInterlockedCount m_nLocks; - sal_Bool m_bReadOnly; + sal_Bool m_bReadOnly; sal_Bool m_bIsUndo; OXUndoEnvironmentImpl(OReportModel& _rModel); @@ -118,16 +118,16 @@ OXUndoEnvironment::~OXUndoEnvironment() DBG_DTOR( rpt_OXUndoEnvironment,NULL); } // ----------------------------------------------------------------------------- -void OXUndoEnvironment::Lock() -{ +void OXUndoEnvironment::Lock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); } -void OXUndoEnvironment::UnLock() -{ +void OXUndoEnvironment::UnLock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); } sal_Bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; } // ----------------------------------------------------------------------------- @@ -174,7 +174,7 @@ void OXUndoEnvironment::Clear(const Accessor& /*_r*/) { OReportPage* pPage = PTR_CAST( OReportPage, m_pImpl->m_rModel.GetMasterPage(i) ); RemoveSection(pPage); - } + } m_pImpl->m_aSections.clear(); @@ -200,7 +200,7 @@ void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) ModeChanged(); } // ----------------------------------------------------------------------------- -// XEventListener +// XEventListener //------------------------------------------------------------------------------ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException ) { @@ -236,7 +236,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv if ( !pController ) return; - // no Undo for transient and readonly props. + // no Undo for transient and readonly props. // let's see if we know something about the set #if OSL_DEBUG_LEVEL > 0 int nlen = m_pImpl->m_aPropertySetCache.size(); @@ -257,7 +257,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv AllProperties& rPropInfos = aSetPos->second; AllPropertiesIterator aPropertyPos = rPropInfos.find( _rEvent.PropertyName ); if (aPropertyPos == rPropInfos.end()) - { // nothing 'til now ... have to change this .... + { // nothing 'til now ... have to change this .... // the attributes INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName( _rEvent.PropertyName ).Attributes; bool bTransReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0); @@ -316,7 +316,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv if ( _xContainer.is() ) { aFind = ::std::find(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(),_xContainer); - + if ( aFind == m_pImpl->m_aSections.end() ) { Reference<container::XChild> xParent(_xContainer->getParent(),uno::UNO_QUERY); @@ -342,7 +342,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro Reference< report::XSection > xContainer(evt.Source,uno::UNO_QUERY); ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = getSection(xContainer.get()); - + if ( aFind != m_pImpl->m_aSections.end() ) { OUndoEnvLock aLock(*this); @@ -357,7 +357,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro { DBG_UNHANDLED_EXCEPTION(); } - + } } else @@ -414,7 +414,7 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw { Reference< report::XSection > xContainer(evt.Source,uno::UNO_QUERY); ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = getSection(xContainer.get()); - + Reference< report::XReportComponent > xReportComponent( xIface, UNO_QUERY ); if ( aFind != m_pImpl->m_aSections.end() && xReportComponent.is() ) { @@ -445,7 +445,7 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw } } } - + if ( xIface.is() ) RemoveElement(xIface); diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 3620f29bf554..af475726bfa0 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,20 +68,20 @@ namespace rptui //==================================================================== //= FormatNormalizer //==================================================================== - DBG_NAME(rpt_FormatNormalizer) + DBG_NAME(rpt_FormatNormalizer) //-------------------------------------------------------------------- FormatNormalizer::FormatNormalizer( const OReportModel& _rModel ) :m_rModel( _rModel ) ,m_xReportDefinition( ) ,m_bFieldListDirty( true ) { - DBG_CTOR(rpt_FormatNormalizer,NULL); + DBG_CTOR(rpt_FormatNormalizer,NULL); } //-------------------------------------------------------------------- FormatNormalizer::~FormatNormalizer() { - DBG_DTOR(rpt_FormatNormalizer,NULL); + DBG_DTOR(rpt_FormatNormalizer,NULL); } //-------------------------------------------------------------------- diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx index a3974f8e9103..f1b6979cc17b 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.hxx +++ b/reportdesign/source/core/sdr/formatnormalizer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index fae4e234bdb3..b029a0ddc83a 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport")); ::comphelper::disposeComponent(xProp); } // if ( xProp.is() ) - } + } catch(Exception&) { } diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index 442017d9a940..b7ad819b3a94 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,9 +84,9 @@ public: ORptTypeDetection(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + ::rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ) diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index e5fec78cda69..b4002229d1f7 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( ::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin(); ::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end(); for (; i != aEnd ; ++i) - { + { sal_Int16 nContextID = aPropMapper->GetEntryContextId(i->mnIndex); switch (nContextID) { diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx index ece3c364b7d6..abdd342b0c80 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef RPT_XMLAUTOSTYLE_HXX +#ifndef RPT_XMLAUTOSTYLE_HXX #define RPT_XMLAUTOSTYLE_HXX #include <xmloff/maptype.hxx> diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index f47f360c4687..9548d62fba8a 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ OXMLCell::OXMLCell( ORptFilter& rImport if ( !m_pCell ) m_pCell = this; - OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); + OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); @@ -116,7 +116,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY); static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); @@ -140,7 +140,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); - + OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); setComponent(xControl.get()); if ( xControl.is() ) @@ -151,7 +151,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( { rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Reference< XImageControl > xControl(xFactor->createInstance(SERVICE_IMAGECONTROL),uno::UNO_QUERY); - + OSL_ENSURE(xControl.is(),"Could not create ImageControl!"); setComponent(xControl.get()); if ( xControl.is() ) @@ -215,7 +215,7 @@ void OXMLCell::EndElement() uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); xControl->setDataField(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + m_sText); - + OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); setComponent(xControl.get()); m_xComponent = xControl.get(); @@ -258,8 +258,8 @@ ORptFilter& OXMLCell::GetOwnImport() return static_cast<ORptFilter&>(GetImport()); } // ----------------------------------------------------------------------------- -void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _xComponent) -{ +void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _xComponent) +{ m_pCell->m_xComponent = _xComponent; m_xComponent = _xComponent; } @@ -274,7 +274,7 @@ void OXMLCell::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); m_sText += s_sStringConcat; } - + m_sText += s_Quote + rChars + s_Quote; } } diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx index e5cdcbda48f5..8360a691f599 100644 --- a/reportdesign/source/filter/xml/xmlCell.hxx +++ b/reportdesign/source/filter/xml/xmlCell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +37,7 @@ namespace rptxml class OXMLTable; class OXMLCell : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; OXMLTable* m_pContainer; OXMLCell* m_pCell; ::rtl::OUString m_sStyleName; diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index a6599cce79ff..3f90b9bc0d28 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ SvXMLImportContext* OXMLRowColumn::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -142,9 +142,9 @@ void OXMLRowColumn::fillStyle(const ::rtl::OUString& _sStyleName) { PropertySetInfo* pInfo = new PropertySetInfo(); static PropertyMapEntry pMap[] = - { - {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), PROPERTY_ID_WIDTH, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), PROPERTY_ID_HEIGHT, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), PROPERTY_ID_WIDTH, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), PROPERTY_ID_HEIGHT, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; pInfo->add(pMap); @@ -157,7 +157,7 @@ void OXMLRowColumn::fillStyle(const ::rtl::OUString& _sStyleName) xProp->getPropertyValue(PROPERTY_WIDTH) >>= nWidth; m_pContainer->addWidth(nWidth); } - else + else { pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_TABLE_ROW,_sStyleName)); if ( pAutoStyle ) diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx index 21a53a3221c9..47c57dbb78ee 100644 --- a/reportdesign/source/filter/xml/xmlColumn.hxx +++ b/reportdesign/source/filter/xml/xmlColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index dd1387db40da..cbe97b2a7102 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,13 +57,13 @@ namespace rptxml OXMLComponent::OXMLComponent( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList - ,const Reference< XReportComponent > & _xComponent + ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XReportComponent > & _xComponent ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) ,m_xComponent(_xComponent) { - DBG_CTOR( rpt_OXMLComponent,NULL); + DBG_CTOR( rpt_OXMLComponent,NULL); OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); OSL_ENSURE(m_xComponent.is(),"Component is NULL!"); @@ -72,7 +72,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); - + for(sal_Int16 i = 0; i < nLength; ++i) { try @@ -84,7 +84,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_NAME: + case XML_TOK_NAME: m_xComponent->setName(sValue); break; case XML_TOK_TEXT_STYLE_NAME: @@ -100,13 +100,13 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport { OSL_ENSURE(0,"Exception catched while putting props into report component!"); } - } + } } // ----------------------------------------------------------------------------- OXMLComponent::~OXMLComponent() { - DBG_DTOR( rpt_OXMLComponent,NULL); + DBG_DTOR( rpt_OXMLComponent,NULL); } // ----------------------------------------------------------------------------- //---------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx index 1daca10d9a2a..217de3669d55 100644 --- a/reportdesign/source/filter/xml/xmlComponent.hxx +++ b/reportdesign/source/filter/xml/xmlComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptxml class OXMLComponent : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; ::rtl::OUString m_sName; ::rtl::OUString m_sTextStyleName; - + OXMLComponent(const OXMLComponent&); void operator =(const OXMLComponent&); public: diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 16135095268a..30d27143f193 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,13 +70,13 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_FUNCTION_FORMULA: + case XML_TOK_FUNCTION_FORMULA: m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,uno::makeAny(ORptFilter::convertFormula(sValue))); break; default: break; } - + } } catch(const Exception&) diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx index c7af29faf9c6..fd457de45218 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptxml class ORptFilter; class OXMLCondPrtExpr : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; OXMLCondPrtExpr(const OXMLCondPrtExpr&); void operator =(const OXMLCondPrtExpr&); public: diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 6e717557aca8..f2d039d319df 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,9 +38,9 @@ #include <unotools/datetime.hxx> #include <com/sun/star/util/DateTime.hpp> -#define TYPE_DATE 1 -#define TYPE_TIME 2 -#define TYPE_DATETIME 3 +#define TYPE_DATE 1 +#define TYPE_TIME 2 +#define TYPE_DATETIME 3 namespace rptxml { @@ -67,7 +67,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); OSL_ENSURE(m_xControl.is(),"Control is NULL!"); - + const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); @@ -91,15 +91,15 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport static MapString2Type s_aTypeNameMap; if (!s_aTypeNameMap.size()) { - s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); - s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_TIME)] = ::getCppuType( static_cast< com::sun::star::util::Time* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); + s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); + s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_TIME)] = ::getCppuType( static_cast< com::sun::star::util::Time* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); } const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue); @@ -115,7 +115,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport break; } } - + } // ----------------------------------------------------------------------------- @@ -131,7 +131,7 @@ SvXMLImportContext* OXMLControlProperty::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -184,7 +184,7 @@ void OXMLControlProperty::addValue(const ::rtl::OUString& _sValue) if ( !m_bIsList ) m_aSetting.Value = aValue; - else + else { sal_Int32 nPos = m_aSequence.getLength(); m_aSequence.realloc(nPos+1); @@ -203,7 +203,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe Any aReturn; switch (_rExpectedType.getTypeClass()) { - case TypeClass_BOOLEAN: // sal_Bool + case TypeClass_BOOLEAN: // sal_Bool { bool bValue; #if OSL_DEBUG_LEVEL > 0 @@ -212,14 +212,14 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLControlProperty::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a boolean!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a boolean!")); aReturn <<= bValue; } break; - case TypeClass_SHORT: // sal_Int16 - case TypeClass_LONG: // sal_Int32 - { // it's a real int32/16 property + case TypeClass_SHORT: // sal_Int16 + case TypeClass_LONG: // sal_Int32 + { // it's a real int32/16 property sal_Int32 nValue(0); #if OSL_DEBUG_LEVEL > 0 sal_Bool bSuccess = @@ -227,8 +227,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLControlProperty::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into an integer!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into an integer!")); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; else @@ -249,8 +249,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLControlProperty::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a double!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a double!")); aReturn <<= (double)nValue; } break; @@ -260,11 +260,11 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_STRUCT: { // recognized structs: - static ::com::sun::star::uno::Type s_aDateType = ::getCppuType(static_cast< ::com::sun::star::util::Date* >(NULL)); - static ::com::sun::star::uno::Type s_aTimeType = ::getCppuType(static_cast< ::com::sun::star::util::Time* >(NULL)); - static ::com::sun::star::uno::Type s_aDateTimeType = ::getCppuType(static_cast< ::com::sun::star::util::DateTime* >(NULL)); + static ::com::sun::star::uno::Type s_aDateType = ::getCppuType(static_cast< ::com::sun::star::util::Date* >(NULL)); + static ::com::sun::star::uno::Type s_aTimeType = ::getCppuType(static_cast< ::com::sun::star::util::Time* >(NULL)); + static ::com::sun::star::uno::Type s_aDateTimeType = ::getCppuType(static_cast< ::com::sun::star::util::DateTime* >(NULL)); sal_Int32 nType = 0; - if ( _rExpectedType.equals(s_aDateType) ) + if ( _rExpectedType.equals(s_aDateType) ) nType = TYPE_DATE; else if ( _rExpectedType.equals(s_aTimeType) ) nType = TYPE_TIME; @@ -280,8 +280,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OPropertyImport::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a double!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a double!")); // then convert it into the target type switch (nType) diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx index 6335f993e00e..646a7e1ee93a 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.hxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptxml ::com::sun::star::beans::PropertyValue m_aSetting; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSequence; OXMLControlProperty* m_pContainer; - ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently + ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently sal_Bool m_bIsList; ORptFilter& GetOwnImport(); @@ -71,7 +71,7 @@ namespace rptxml /** adds value to property - @param _sValue + @param _sValue The value to add. */ void addValue(const ::rtl::OUString& _sValue); diff --git a/reportdesign/source/filter/xml/xmlEnums.hxx b/reportdesign/source/filter/xml/xmlEnums.hxx index 6986a36c4f9e..af293e902c45 100644 --- a/reportdesign/source/filter/xml/xmlEnums.hxx +++ b/reportdesign/source/filter/xml/xmlEnums.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,16 +45,16 @@ namespace rptxml enum XMLReportToken { XML_TOK_REPORT_HEADER, - XML_TOK_PAGE_HEADER , + XML_TOK_PAGE_HEADER , XML_TOK_GROUP, - XML_TOK_DETAIL , - XML_TOK_PAGE_FOOTER , + XML_TOK_DETAIL , + XML_TOK_PAGE_FOOTER , XML_TOK_REPORT_FOOTER, - XML_TOK_HEADER_ON_NEW_PAGE , - XML_TOK_FOOTER_ON_NEW_PAGE , - XML_TOK_COMMAND_TYPE , - XML_TOK_COMMAND , - XML_TOK_FILTER , + XML_TOK_HEADER_ON_NEW_PAGE , + XML_TOK_FOOTER_ON_NEW_PAGE , + XML_TOK_COMMAND_TYPE , + XML_TOK_COMMAND , + XML_TOK_FILTER , XML_TOK_CAPTION , XML_TOK_ESCAPE_PROCESSING , XML_TOK_REPORT_FUNCTION , @@ -66,26 +66,26 @@ namespace rptxml }; enum XMLGroup { - XML_TOK_START_NEW_COLUMN , - XML_TOK_RESET_PAGE_NUMBER , - XML_TOK_PRINT_HEADER_ON_EACH_PAGE , - XML_TOK_GROUP_EXPRESSION , - XML_TOK_GROUP_HEADER , + XML_TOK_START_NEW_COLUMN , + XML_TOK_RESET_PAGE_NUMBER , + XML_TOK_PRINT_HEADER_ON_EACH_PAGE , + XML_TOK_GROUP_EXPRESSION , + XML_TOK_GROUP_HEADER , XML_TOK_GROUP_GROUP , XML_TOK_GROUP_DETAIL , - XML_TOK_GROUP_FOOTER , - XML_TOK_SORT_ASCENDING , - XML_TOK_GROUP_FUNCTION , + XML_TOK_GROUP_FOOTER , + XML_TOK_SORT_ASCENDING , + XML_TOK_GROUP_FUNCTION , XML_TOK_GROUP_KEEP_TOGETHER }; enum XMLSection { XML_TOK_SECTION_NAME, XML_TOK_TABLE, - XML_TOK_VISIBLE , - XML_TOK_FORCE_NEW_PAGE , - XML_TOK_FORCE_NEW_COLUMN , - XML_TOK_KEEP_TOGETHER , + XML_TOK_VISIBLE , + XML_TOK_FORCE_NEW_PAGE , + XML_TOK_FORCE_NEW_COLUMN , + XML_TOK_KEEP_TOGETHER , XML_TOK_REPEAT_SECTION, XML_TOK_PAGE_PRINT_OPTION, XML_TOK_SECT_STYLE_NAME @@ -119,13 +119,13 @@ namespace rptxml ,XML_TOK_COV_CELL ,XML_TOK_NUMBER_COLUMNS_SPANNED ,XML_TOK_NUMBER_ROWS_SPANNED - ,XML_TOK_TEXT_STYLE_NAME + ,XML_TOK_TEXT_STYLE_NAME ,XML_TOK_TRANSFORM ,XML_TOK_CONDITIONAL_PRINT_EXPRESSION }; enum XMLReportElement { - XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE + XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE ,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION ,XML_TOK_PRINT_REPEATED_VALUES ,XML_TOK_COMPONENT @@ -133,19 +133,19 @@ namespace rptxml }; enum XMLControlProperty { - XML_TOK_PROPERTY_NAME - ,XML_TOK_VALUE_TYPE - ,XML_TOK_LIST_PROPERTY - ,XML_TOK_VALUE - ,XML_TOK_CURRENCY - ,XML_TOK_DATE_VALUE - ,XML_TOK_TIME_VALUE - ,XML_TOK_STRING_VALUE + XML_TOK_PROPERTY_NAME + ,XML_TOK_VALUE_TYPE + ,XML_TOK_LIST_PROPERTY + ,XML_TOK_VALUE + ,XML_TOK_CURRENCY + ,XML_TOK_DATE_VALUE + ,XML_TOK_TIME_VALUE + ,XML_TOK_STRING_VALUE ,XML_TOK_BOOLEAN_VALUE ,XML_TOK_PROPERTIES ,XML_TOK_SIZE ,XML_TOK_IMAGE_DATA - ,XML_TOK_IMAGE_POSITION + ,XML_TOK_IMAGE_POSITION ,XML_TOK_IMAGE_ALIGN ,XML_TOK_SCALE ,XML_TOK_LABEL @@ -173,7 +173,7 @@ namespace rptxml ,XML_TOK_ENABLED ,XML_TOK_FORMULA }; - + // ----------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index a8fdacf51e9e..a99de7c06b11 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #include "precompiled_reportdesign.hxx" - + #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" #include <xmloff/ProgressBarHelper.hxx> @@ -151,7 +151,7 @@ namespace rptxml aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } - + //--------------------------------------------------------------------- Reference< XInterface > ODBFullExportHelper::create(Reference< XComponentContext > const & xContext) { @@ -169,7 +169,7 @@ namespace rptxml aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } - + //--------------------------------------------------------------------- class OSpecialHanldeXMLExportPropertyMapper : public SvXMLExportPropertyMapper @@ -240,8 +240,8 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1 _GetNamespaceMap().Add( GetXMLToken(XML_NP_FORM), GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_DRAW), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_TEXT), GetXMLToken(XML_N_TEXT), XML_NAMESPACE_TEXT ); - - + + if( (getExportFlags() & (EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS) ) != 0 ) _GetNamespaceMap().Add( GetXMLToken(XML_NP_FO), GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO ); @@ -275,14 +275,14 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1 m_sTableStyle = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_STYLE_NAME) ); m_sColumnStyle = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_COLUMN) ); m_sCellStyle = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_REPORT, GetXMLToken(XML_STYLE_NAME) ); - + m_xPropHdlFactory = new OXMLRptPropHdlFactory(); UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper1 = new XMLPropertySetMapper(OXMLHelper::GetTableStyleProps(),xFac); UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper2 = new XMLTextPropertySetMapper(TEXT_PROP_MAP_TABLE_DEFAULTS ); xTableStylesPropertySetMapper1->AddMapperEntry(xTableStylesPropertySetMapper2); - + m_xTableStylesExportPropertySetMapper = new SvXMLExportPropertyMapper(xTableStylesPropertySetMapper1); //m_xTableStylesExportPropertySetMapper->ChainExportMapper(xTableStylesPropertySetMapper2); @@ -336,7 +336,7 @@ uno::Sequence< ::rtl::OUString > ORptExport::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); - + return aServices; } //-------------------------------------------------------------------------- @@ -388,7 +388,7 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR const ::rtl::OUString* pDetailFieldsIter = aDetailFields.getConstArray(); const ::rtl::OUString* pIter = aMasterFields.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aMasterFields.getLength(); + const ::rtl::OUString* pEnd = pIter + aMasterFields.getLength(); for(;pIter != pEnd;++pIter,++pDetailFieldsIter) { AddAttribute( XML_NAMESPACE_REPORT, XML_MASTER , *pIter ); @@ -398,7 +398,7 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR } } } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefinition) { if ( _xReportDefinition.is() ) @@ -406,7 +406,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini exportFunctions(_xReportDefinition->getFunctions().get()); exportGroupsExpressionAsFunction(_xReportDefinition->getGroups()); //exportMasterDetailFields(_xReportDefinition.get()); - + if ( _xReportDefinition->getReportHeaderOn() ) { SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_HEADER, sal_True, sal_True); @@ -419,7 +419,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_EnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION,sValue.makeStringAndClear()); - + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_HEADER, sal_True, sal_True); exportSection(_xReportDefinition->getPageHeader(),true); } // if ( _xReportDefinition->getPageHeaderOn() ) @@ -441,7 +441,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, sal_True, sal_True); exportSection(_xReportDefinition->getReportFooter()); } // if ( _xReportDefinition->getReportFooterOn() ) - } + } } // ----------------------------------------------------------------------------- void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComponent) @@ -451,7 +451,7 @@ void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComp return; AddAttribute(XML_NAMESPACE_DRAW, XML_NAME,_xReportComponent->getName()); - + SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT, sal_False, sal_False); } // ----------------------------------------------------------------------------- @@ -473,7 +473,7 @@ void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _x exportStyleName(xCond.get(),GetAttrList(),m_sCellStyle); SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION, sal_True, sal_True); } // for (sal_Int32 i = 0; i < nCount ; ++i) - } + } catch(uno::Exception&) { OSL_ENSURE(0,"Can not access format condition!"); @@ -491,7 +491,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT, sal_True, sal_True); if ( _xReportElement->getCount() ) - { + { exportFormatConditions(_xReportElement); } @@ -558,7 +558,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) aRowPos.reserve(2*(nCount + 1)); aRowPos.push_back(0); aRowPos.push_back(_xProp->getHeight()); - + sal_Int32 i; for (i = 0 ; i< nCount ; ++i) { @@ -615,7 +615,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) sal_Int32 xi = 0; sal_Int32 yi = 0; bool isOverlap = false; - + for (i = 0 ; i< nCount ; ++i) { Reference<XReportComponent> xReportElement(_xProp->getByIndex(i),uno::UNO_QUERY); @@ -675,7 +675,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) sal_Int32 nColSpan = x2 - x1; sal_Int32 nRowSpan = y2 - y1; - aInsert->second[y1].second[x1] = + aInsert->second[y1].second[x1] = TCell( aElementSize.Width , // -1 why? aElementSize.Height, // -1 why? @@ -720,7 +720,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr uno::Reference< report::XFormatCondition > xCond(xFormattedField->getByIndex(j),uno::UNO_QUERY); exportAutoStyle(xCond.get(),xFormattedField); } // for (sal_Int32 j = 0; j < nCount ; ++j) - } + } catch(uno::Exception&) { OSL_ENSURE(0,"Can not access format condition!"); @@ -735,7 +735,7 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader OSL_ENSURE(_xSection.is(),"Section is NULL -> GPF"); ::rtl::OUStringBuffer sValue; AddAttribute(XML_NAMESPACE_TABLE, XML_NAME,_xSection->getName()); - + if ( !_xSection->getVisible() ) AddAttribute(XML_NAMESPACE_REPORT, XML_VISIBLE,XML_FALSE); @@ -752,12 +752,12 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader if ( _xSection->getKeepTogether() ) AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER, XML_TRUE ); } - + exportStyleName(_xSection.get(),GetAttrList(),m_sTableStyle); /// TODO export as table layout SvXMLElementExport aComponents(*this,XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True); - + ::rtl::OUString sExpr = _xSection->getConditionalPrintExpression(); if ( sExpr.getLength() ) { @@ -797,7 +797,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) return; TGrid::iterator aRowIter = aFind->second.begin(); TGrid::iterator aRowEnd = aFind->second.end(); - + sal_Int32 nEmptyCellColSpan = 0; TGridStyleMap::iterator aRowFind = m_aRowStyleNames.find(_xSection.get()); TStringVec::iterator aHeightIter = aRowFind->second.begin(); @@ -813,7 +813,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { ::std::vector< TCell >::iterator aColIter = aRowIter->second.begin(); ::std::vector< TCell >::iterator aColEnd = aRowIter->second.end(); - nEmptyCellColSpan = 0; + nEmptyCellColSpan = 0; for (; aColIter != aColEnd; ++aColIter) { sal_Bool bCoveredCell = sal_False; @@ -831,10 +831,10 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) nColSpan = 1; if ( !--(aRowSpanFind->second) ) aRowSpan.erase(aRowSpanFind); - + if ( aColIter->nColSpan > 1 ) nColSpan += aColIter->nColSpan - 1; - + bCoveredCell = sal_True; aColIter = aColIter + (aColIter->nColSpan - 1); } @@ -862,7 +862,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) } if ( aColIter->xElement.is() ) exportStyleName(aColIter->xElement.get(),GetAttrList(),m_sTableStyle); - + // start <table:table-cell> Reference<XFormattedField> xFormattedField(aColIter->xElement,uno::UNO_QUERY); if ( xFormattedField.is() ) @@ -901,7 +901,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) Reference<XReportDefinition> xReportDefinition(xElement,uno::UNO_QUERY); Reference< XImageControl > xImage(xElement,uno::UNO_QUERY); Reference<XSection> xSection(xElement,uno::UNO_QUERY); - + XMLTokenEnum eToken = XML_SECTION; sal_Bool bExportData = sal_False; if ( xElement->supportsService(SERVICE_FIXEDTEXT) ) @@ -978,8 +978,8 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) exportShapes(_xSection); } aColIter = aColIter + (aColIter->nColSpan - 1); - } - else + } + else ++nEmptyCellColSpan; if ( bCoveredCell ) { @@ -987,7 +987,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, sal_True, sal_True); } - + } } // for (sal_Int32 i = 0 ; i< nCount ; ++i) if ( nEmptyCellColSpan ) @@ -1065,7 +1065,7 @@ bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const :: bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1; if ( !bRet ) AddAttribute(XML_NAMESPACE_REPORT, eName,sFieldData); - + return bRet; } // ----------------------------------------------------------------------------- @@ -1138,7 +1138,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef const SvXMLEnumMapEntry* aXML_KeepTogetherEnumMap = OXMLHelper::GetKeepTogetherOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_KeepTogetherEnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER,sValue.makeStringAndClear()); - + SvXMLElementExport aGroup(*this,XML_NAMESPACE_REPORT, XML_GROUP, sal_True, sal_True); exportFunctions(xGroup->getFunctions().get()); if ( xGroup->getHeaderOn() ) @@ -1306,8 +1306,8 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted } } } - - + + if ( !aPropertyStates.empty() ) m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_CELL, aPropertyStates ))); } @@ -1326,7 +1326,7 @@ void ORptExport::SetBodyAttributes() } // ----------------------------------------------------------------------------- void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xReport) -{ +{ if ( _xReport.is() ) { ::rtl::OUStringBuffer sValue; @@ -1379,7 +1379,7 @@ void ORptExport::collectComponentStyles() uno::Reference< report::XSection> xParent(xProp->getParent(),uno::UNO_QUERY); if ( xParent.is() ) exportAutoStyle(xProp.get()); - + if ( xProp->getReportHeaderOn() ) exportSectionAutoStyle(xProp->getReportHeader()); if ( xProp->getPageHeaderOn() ) @@ -1415,14 +1415,14 @@ void ORptExport::_ExportAutoStyles() ,GetMM100UnitConverter() ,GetNamespaceMap() ); - + GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL ,GetDocHandler() ,GetMM100UnitConverter() ,GetNamespaceMap() ); - - + + /*GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_REPORT_ID ,GetDocHandler() ,GetMM100UnitConverter() @@ -1478,7 +1478,7 @@ void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >& xDoc // ----------------------------------------------------------------------------- void ORptExport::_ExportFontDecls() { - GetFontAutoStylePool(); // make sure the pool is created + GetFontAutoStylePool(); // make sure the pool is created collectComponentStyles(); SvXMLExport::_ExportFontDecls(); } @@ -1520,17 +1520,17 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor } else { - + if ( sToken.indexOf('"') == 0 && sToken.lastIndexOf('"') == sToken.getLength()-1 ) sToken = sToken.copy(1,sToken.getLength()-2); - + sal_Bool bPrevCharIsSpace = sal_False; GetTextParagraphExport()->exportText(sToken,bPrevCharIsSpace); } } } while ( nIndex >= 0 ); - } + } } Reference< XFixedText > xFT(_xReportElement,UNO_QUERY); if ( xFT.is() ) @@ -1569,7 +1569,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa { pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False)); exportMasterDetailFields(xShape.get()); - exportReportElement(xShape.get()); + exportReportElement(xShape.get()); } AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_PARAGRAPH ); @@ -1653,7 +1653,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("([")); sFunction += sExpression; sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]")); - + if ( sPrefix.getLength() ) sFunction += sPrefix; sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 3d71e8deac69..8e4f2f22a71b 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,80 +120,80 @@ public: typedef ::std::map< Reference<XPropertySet> ,TGrid > TSectionsGrid; typedef ::std::map< Reference<XGroup> ,Reference<XFunction> > TGroupFunctionMap; private: - ::std::auto_ptr< TStringPair > m_aAutoIncrement; - ::std::auto_ptr< TDelimiter > m_aDelimiter; - ::std::vector< Any > m_aDataSourceSettings; + ::std::auto_ptr< TStringPair > m_aAutoIncrement; + ::std::auto_ptr< TDelimiter > m_aDelimiter; + ::std::vector< Any > m_aDataSourceSettings; TSectionsGrid m_aSectionsGrid; - - TPropertyStyleMap m_aAutoStyleNames; + + TPropertyStyleMap m_aAutoStyleNames; TGridStyleMap m_aColumnStyleNames; TGridStyleMap m_aRowStyleNames; - TGroupFunctionMap m_aGroupFunctionMap; - - ::rtl::OUString m_sCharSet; + TGroupFunctionMap m_aGroupFunctionMap; + + ::rtl::OUString m_sCharSet; ::rtl::OUString m_sTableStyle; ::rtl::OUString m_sCellStyle; ::rtl::OUString m_sColumnStyle; - Any m_aPreviewMode; - UniReference < SvXMLExportPropertyMapper> m_xExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xSectionPropMapper; - UniReference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xCellStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xColumnStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xRowStylesExportPropertySetMapper; + Any m_aPreviewMode; + UniReference < SvXMLExportPropertyMapper> m_xExportHelper; + UniReference < SvXMLExportPropertyMapper> m_xSectionPropMapper; + UniReference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper> m_xCellStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper> m_xColumnStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper> m_xRowStylesExportPropertySetMapper; UniReference < SvXMLExportPropertyMapper > m_xParaPropMapper; - UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; + UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; - mutable UniReference < XMLPropertySetMapper > m_xControlStylePropertyMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xControlStylePropertyMapper; + mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - Reference<XReportDefinition> m_xReportDefinition; - sal_Bool m_bAllreadyFilled; + Reference<XReportDefinition> m_xReportDefinition; + sal_Bool m_bAllreadyFilled; - void exportReport(const Reference<XReportDefinition>& _xReportDefinition); /// <element name="office:report"> + void exportReport(const Reference<XReportDefinition>& _xReportDefinition); /// <element name="office:report"> void exportReportAttributes(const Reference<XReportDefinition>& _xReport); - void exportFunctions(const Reference<XIndexAccess>& _xFunctions); /// <ref name="rpt-function"/> + void exportFunctions(const Reference<XIndexAccess>& _xFunctions); /// <ref name="rpt-function"/> void exportFunction(const Reference< XFunction>& _xFunction); - void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet); - void exportComponent(const Reference<XReportComponent>& _xReportComponent); - sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); - void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); - void exportSection(const Reference<XSection>& _xProp,bool bHeader = false); + void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet); + void exportComponent(const Reference<XReportComponent>& _xReportComponent); + sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); + void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); + void exportSection(const Reference<XSection>& _xProp,bool bHeader = false); void exportContainer(const Reference< XSection>& _xSection); void exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph = true); void exportTableColumns(const Reference< XSection>& _xSection); - void exportSectionAutoStyle(const Reference<XSection>& _xProp); - void exportReportElement(const Reference<XReportControlModel>& _xReportElement); - void exportFormatConditions(const Reference<XReportControlModel>& _xReportElement); - void exportAutoStyle(XPropertySet* _xProp,const Reference<XFormattedField>& _xParentFormattedField = Reference<XFormattedField>()); - void exportAutoStyle(const Reference<XSection>& _xProp); + void exportSectionAutoStyle(const Reference<XSection>& _xProp); + void exportReportElement(const Reference<XReportControlModel>& _xReportElement); + void exportFormatConditions(const Reference<XReportControlModel>& _xReportElement); + void exportAutoStyle(XPropertySet* _xProp,const Reference<XFormattedField>& _xParentFormattedField = Reference<XFormattedField>()); + void exportAutoStyle(const Reference<XSection>& _xProp); void exportReportComponentAutoStyles(const Reference<XSection>& _xProp); - void collectComponentStyles(); + void collectComponentStyles(); void collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames); void exportParagraph(const Reference< XReportControlModel >& _xReportElement); bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::rtl::OUString& _sFormula); void exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups); ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula); - ::rtl::OUString implConvertNumber(sal_Int32 _nValue); + ::rtl::OUString implConvertNumber(sal_Int32 _nValue); private: ORptExport(); - virtual void SetBodyAttributes(); + virtual void SetBodyAttributes(); protected: - virtual void _ExportStyles( BOOL bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportContent(); - virtual void _ExportMasterStyles(); - virtual void _ExportFontDecls(); - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); - virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); + virtual void _ExportStyles( BOOL bUsed ); + virtual void _ExportAutoStyles(); + virtual void _ExportContent(); + virtual void _ExportMasterStyles(); + virtual void _ExportFontDecls(); + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); + virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); virtual XMLShapeExport* CreateShapeExport(); - virtual ~ORptExport(){}; -public: - + virtual ~ORptExport(){}; +public: + ORptExport(const Reference< XMultiServiceFactory >& _rxMSF, sal_uInt16 nExportFlag = (EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS)); // XServiceInfo virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); @@ -248,7 +248,7 @@ class ORptStylesExportHelper public: static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 9abb4056108b..7d1f3e231beb 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -330,7 +330,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > if ( !m_xDatabaseDataProvider.is() || !m_xDatabaseDataProvider->getActiveConnection().is() ) throw uno::Exception(); - uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( + uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory")),m_xContext), uno::UNO_QUERY); m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get()); diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index 3a3d1ad0c851..1e4627098091 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index c30c3344b9e0..284a678227e9 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -150,7 +150,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( return pContext; static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); - const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); + const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); Reference<XMultiServiceFactory> xFactor = m_rImport.getServiceFactory(); m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); @@ -213,10 +213,10 @@ void OXMLFixedContent::EndElement() m_xComponent = xControl.get(); xControl->setLabel(m_sLabel); } - + m_pContainer->addCell(m_xComponent); m_rCell.setComponent(m_xComponent); - + OXMLReportElementBase::EndElement(); } } @@ -232,7 +232,7 @@ void OXMLFixedContent::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); m_sPageText += s_sStringConcat; } - + m_sPageText += s_Quote + rChars + s_Quote; } } diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index 42e9eaeefb4f..53bf91377d8f 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.hxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 6d70a78ec147..1180547ab6c8 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,10 +79,10 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_ENABLED: + case XML_TOK_ENABLED: m_xComponent->setEnabled(sValue == s_sTRUE); break; - case XML_TOK_FORMULA: + case XML_TOK_FORMULA: m_xComponent->setFormula(ORptFilter::convertFormula(sValue)); break; case XML_TOK_FORMAT_STYLE_NAME: diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx index 446b0a9760d6..bf0d1cda8183 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptxml { ORptFilter& m_rImport; ::rtl::OUString m_sStyleName; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent; OXMLFormatCondition(const OXMLFormatCondition&); void operator =(const OXMLFormatCondition&); public: diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 65fdbe1ee81f..aec8621eff7d 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ DBG_NAME( rpt_OXMLFormattedField ) OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName ,const uno::Reference< xml::sax::XAttributeList > & _xAttrList - ,const uno::Reference< XFormattedField > & _xComponent + ,const uno::Reference< XFormattedField > & _xComponent ,OXMLTable* _pContainer ,bool _bPageCount) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) @@ -71,7 +71,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_DATA_FORMULA: + case XML_TOK_DATA_FORMULA: _xComponent->setDataField(ORptFilter::convertFormula(sValue)); break; case XML_TOK_SELECT_PAGE: diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx index 5a3a28a48b9c..6437cf007c9c 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.hxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index fd0ede7b2244..00eb1759da8e 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ DBG_NAME( rpt_OXMLFunction ) OXMLFunction::OXMLFunction( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList - ,const Reference< XFunctionsSupplier >& _xFunctions + ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XFunctionsSupplier >& _xFunctions ,bool _bAddToReport ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) @@ -60,7 +60,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport OSL_ENSURE(m_xFunctions.is(),"Functions is NULL!"); m_xFunction = m_xFunctions->createFunction(); - + OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap(); @@ -82,7 +82,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport case XML_TOK_FUNCTION_NAME: m_xFunction->setName(sValue); break; - case XML_TOK_FUNCTION_FORMULA: + case XML_TOK_FUNCTION_FORMULA: m_xFunction->setFormula(ORptFilter::convertFormula(sValue)); break; case XML_TOK_PRE_EVALUATED: diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx index 2e6b33215b85..9e81d0791640 100644 --- a/reportdesign/source/filter/xml/xmlFunction.hxx +++ b/reportdesign/source/filter/xml/xmlFunction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptxml class OXMLFunction : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > m_xFunction; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > m_xFunction; bool m_bAddToReport; - + ORptFilter& GetOwnImport(); OXMLFunction(const OXMLFunction&); @@ -54,7 +54,7 @@ namespace rptxml , sal_uInt16 nPrfx ,const ::rtl::OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xFunctions + ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xFunctions ,bool _bAddToReport = false ); virtual ~OXMLFunction(); diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index c5fad4d165cd..f56239dbd8eb 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ DBG_NAME( rpt_OXMLGroup ) OXMLGroup::OXMLGroup( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XAttributeList > & _xAttrList ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) { @@ -70,7 +70,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport m_xGroups = _rImport.getReportDefinition()->getGroups(); OSL_ENSURE(m_xGroups.is(),"Groups is NULL!"); m_xGroup = m_xGroups->createGroup(); - + OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap(); @@ -103,7 +103,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport sal_Int32 nLen = sValue.getLength(); if ( nLen ) { - + const static ::rtl::OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\"")); sal_Int32 nPos = sValue.indexOf(s_sChanged); if ( nPos == -1 ) @@ -119,7 +119,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport sValue = sValue.replaceAt(nIndex,2,s_sSingleQuote); nIndex = sValue.indexOf(s_sQuote,nIndex+2); } - nLen = sValue.getLength() - 1; + nLen = sValue.getLength() - 1; } sValue = sValue.copy(nPos,nLen-nPos-1); const ORptFilter::TGroupFunctionMap& aFunctions = _rImport.getFunctions(); @@ -149,7 +149,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport { nGroupOn = report::GroupOn::MONTH; } - else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT((MONTH")),0) + else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT((MONTH")),0) && sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) ) { nGroupOn = report::GroupOn::QUARTAL; @@ -167,7 +167,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport nGroupOn = report::GroupOn::INTERVAL; _rImport.removeFunction(sExpression); sExpression = sExpression.copy(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT_count_")).getLength()); - + nIndex = 0; ::rtl::OUString sInterval = sCompleteFormula.getToken(1,'/',nIndex); nIndex = 0; @@ -176,7 +176,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport } m_xGroup->setGroupOn(nGroupOn); - + _rImport.removeFunction(sValue); sValue = sExpression; } @@ -212,7 +212,7 @@ SvXMLImportContext* OXMLGroup::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetGroupElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetGroupElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx index 06dfedf87785..5aa34fe4f7ba 100644 --- a/reportdesign/source/filter/xml/xmlGroup.hxx +++ b/reportdesign/source/filter/xml/xmlGroup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +38,9 @@ namespace rptxml class OXMLGroup : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > m_xGroups; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; - + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > m_xGroups; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; + ORptFilter& GetOwnImport(); OXMLGroup(const OXMLGroup&); diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 9e4569704d9c..584d702d0dba 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,12 +73,12 @@ namespace rptxml DBG_NAME(rpt_OPropertyHandlerFactory) OPropertyHandlerFactory::OPropertyHandlerFactory() { - DBG_CTOR(rpt_OPropertyHandlerFactory,NULL); + DBG_CTOR(rpt_OPropertyHandlerFactory,NULL); } // ----------------------------------------------------------------------------- OPropertyHandlerFactory::~OPropertyHandlerFactory() { - DBG_DTOR(rpt_OPropertyHandlerFactory,NULL); + DBG_DTOR(rpt_OPropertyHandlerFactory,NULL); } // ----------------------------------------------------------------------------- const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const @@ -93,9 +93,9 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 { static SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] = { - { XML_TOP, style::VerticalAlignment_TOP }, - { XML_MIDDLE, style::VerticalAlignment_MIDDLE }, - { XML_BOTTOM, style::VerticalAlignment_BOTTOM }, + { XML_TOP, style::VerticalAlignment_TOP }, + { XML_MIDDLE, style::VerticalAlignment_MIDDLE }, + { XML_BOTTOM, style::VerticalAlignment_BOTTOM }, { XML_TOKEN_INVALID, 0 } }; @@ -115,15 +115,15 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 return pHandler; } // ----------------------------------------------------------------------------- -#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_T( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_T( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } #define MAP_CONST_ASCII_T( name, prefix, token, type, context ) { name, sizeof(name)-1,XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_S( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } -#define GMAP( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_C( name, prefix, token, type, context ) { name, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_S( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define GMAP( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_C( name, prefix, token, type, context ) { name, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0, SvtSaveOptions::ODFVER_010} // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat) @@ -134,15 +134,15 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _ { MAP_CONST_C( PROPERTY_FORMATKEY, STYLE, DATA_STYLE_NAME, XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ), - MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, - FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), - MAP_CONST_C( PROPERTY_VERTICALALIGN, STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), + MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_C( PROPERTY_VERTICALALIGN, STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), MAP_CONST_C( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, - FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), - MAP_CONST_P( PROPERTY_CONTROLBACKGROUND, - FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + MAP_CONST_P( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), MAP_CONST_P( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, - FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), MAP_CONST_C_ASCII( "BorderLeft", FO, BORDER_LEFT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderRight", FO, BORDER_RIGHT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderTop", FO, BORDER_TOP, XML_TYPE_BORDER, 0 ), @@ -157,12 +157,12 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _ { MAP_CONST_C( PROPERTY_FORMATKEY, STYLE, DATA_STYLE_NAME, XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ), - MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, - FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), MAP_CONST_C( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, - FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), MAP_CONST_C( PROPERTY_VERTICALALIGN, - STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), + STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), MAP_CONST_C_ASCII( "BorderLeft", FO, BORDER_LEFT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderRight", FO, BORDER_RIGHT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderTop", FO, BORDER_TOP, XML_TYPE_BORDER, 0 ), @@ -202,7 +202,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps() //MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0), //MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_SC_ISVISIBLE ), MAP_CONST_S( "Width", STYLE, COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ), - // MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), + // MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), MAP_END() }; return aXMLColumnStylesProperties; @@ -212,10 +212,10 @@ const SvXMLEnumMapEntry* OXMLHelper::GetReportPrintOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { XML_ALL_PAGES, report::ReportPrintOption::ALL_PAGES }, // default - { XML_NOT_WITH_REPORT_HEADER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER }, - { XML_NOT_WITH_REPORT_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_FOOTER }, - { XML_NOT_WITH_REPORT_HEADER_NOR_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER }, + // { XML_ALL_PAGES, report::ReportPrintOption::ALL_PAGES }, // default + { XML_NOT_WITH_REPORT_HEADER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER }, + { XML_NOT_WITH_REPORT_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_FOOTER }, + { XML_NOT_WITH_REPORT_HEADER_NOR_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; @@ -225,10 +225,10 @@ const SvXMLEnumMapEntry* OXMLHelper::GetForceNewPageOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { XML_NONE, report::ForceNewPage::NONE }, // default - { XML_BEFORE_SECTION, report::ForceNewPage::BEFORE_SECTION }, - { XML_AFTER_SECTION, report::ForceNewPage::AFTER_SECTION }, - { XML_BEFORE_AFTER_SECTION, report::ForceNewPage::BEFORE_AFTER_SECTION }, + // { XML_NONE, report::ForceNewPage::NONE }, // default + { XML_BEFORE_SECTION, report::ForceNewPage::BEFORE_SECTION }, + { XML_AFTER_SECTION, report::ForceNewPage::AFTER_SECTION }, + { XML_BEFORE_AFTER_SECTION, report::ForceNewPage::BEFORE_AFTER_SECTION }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; @@ -238,9 +238,9 @@ const SvXMLEnumMapEntry* OXMLHelper::GetKeepTogetherOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { XML_NO, report::KeepTogether::NO }, // default - { XML_WHOLE_GROUP, report::KeepTogether::WHOLE_GROUP }, - { XML_WITH_FIRST_DETAIL, report::KeepTogether::WITH_FIRST_DETAIL }, + // { XML_NO, report::KeepTogether::NO }, // default + { XML_WHOLE_GROUP, report::KeepTogether::WHOLE_GROUP }, + { XML_WITH_FIRST_DETAIL, report::KeepTogether::WITH_FIRST_DETAIL }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; @@ -258,22 +258,22 @@ const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions() return s_aXML_EnumMap; } // ----------------------------------------------------------------------------- -#define PROPERTY_ID_FONTNAME 1 -#define PROPERTY_ID_FONTHEIGHT 2 -#define PROPERTY_ID_FONTWIDTH 3 -#define PROPERTY_ID_FONTSTYLENAME 4 -#define PROPERTY_ID_FONTFAMILY 5 -#define PROPERTY_ID_FONTCHARSET 6 -#define PROPERTY_ID_FONTPITCH 7 -#define PROPERTY_ID_FONTCHARWIDTH 8 -#define PROPERTY_ID_FONTWEIGHT 9 -#define PROPERTY_ID_FONTSLANT 10 -#define PROPERTY_ID_FONTUNDERLINE 11 -#define PROPERTY_ID_FONTSTRIKEOUT 12 +#define PROPERTY_ID_FONTNAME 1 +#define PROPERTY_ID_FONTHEIGHT 2 +#define PROPERTY_ID_FONTWIDTH 3 +#define PROPERTY_ID_FONTSTYLENAME 4 +#define PROPERTY_ID_FONTFAMILY 5 +#define PROPERTY_ID_FONTCHARSET 6 +#define PROPERTY_ID_FONTPITCH 7 +#define PROPERTY_ID_FONTCHARWIDTH 8 +#define PROPERTY_ID_FONTWEIGHT 9 +#define PROPERTY_ID_FONTSLANT 10 +#define PROPERTY_ID_FONTUNDERLINE 11 +#define PROPERTY_ID_FONTSTRIKEOUT 12 #define PROPERTY_ID_FONTORIENTATION 13 -#define PROPERTY_ID_FONTKERNING 14 +#define PROPERTY_ID_FONTKERNING 14 #define PROPERTY_ID_FONTWORDLINEMODE 15 -#define PROPERTY_ID_FONTTYPE 16 +#define PROPERTY_ID_FONTTYPE 16 void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const uno::Reference<beans::XPropertySet>& _xProp) { if ( !_xProp.is() || !_sStyleName.getLength() || !_pAutoStyles ) @@ -283,30 +283,30 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty { ::com::sun::star::awt::FontDescriptor aFont; static comphelper::PropertyMapEntry pMap[] = - { - {PROPERTY_FONTNAME, static_cast<sal_uInt16>(PROPERTY_FONTNAME.length), PROPERTY_ID_FONTNAME, &::getCppuType(&aFont.Name) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARFONTHEIGHT, static_cast<sal_uInt16>(PROPERTY_CHARFONTHEIGHT.length), PROPERTY_ID_FONTHEIGHT, &::getCppuType(&aFont.Height) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTWIDTH.length), PROPERTY_ID_FONTWIDTH, &::getCppuType(&aFont.Width) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTSTYLENAME, static_cast<sal_uInt16>(PROPERTY_FONTSTYLENAME.length), PROPERTY_ID_FONTSTYLENAME, &::getCppuType(&aFont.StyleName) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTFAMILY, static_cast<sal_uInt16>(PROPERTY_FONTFAMILY.length), PROPERTY_ID_FONTFAMILY, &::getCppuType(&aFont.Family) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTCHARSET, static_cast<sal_uInt16>(PROPERTY_FONTCHARSET.length), PROPERTY_ID_FONTCHARSET, &::getCppuType(&aFont.CharSet) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTPITCH, static_cast<sal_uInt16>(PROPERTY_FONTPITCH.length), PROPERTY_ID_FONTPITCH, &::getCppuType(&aFont.Pitch) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTCHARWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTCHARWIDTH.length), PROPERTY_ID_FONTCHARWIDTH, &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0}, - {PROPERTY_FONTWEIGHT, static_cast<sal_uInt16>(PROPERTY_FONTWEIGHT.length), PROPERTY_ID_FONTWEIGHT, &::getCppuType(&aFont.Weight) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARPOSTURE, static_cast<sal_uInt16>(PROPERTY_CHARPOSTURE.length), PROPERTY_ID_FONTSLANT, &::getCppuType(&aFont.Slant) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTUNDERLINE, static_cast<sal_uInt16>(PROPERTY_FONTUNDERLINE.length), PROPERTY_ID_FONTUNDERLINE, &::getCppuType(&aFont.Underline) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARSTRIKEOUT, static_cast<sal_uInt16>(PROPERTY_CHARSTRIKEOUT.length), PROPERTY_ID_FONTSTRIKEOUT, &::getCppuType(&aFont.Strikeout) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTORIENTATION, static_cast<sal_uInt16>(PROPERTY_FONTORIENTATION.length), PROPERTY_ID_FONTORIENTATION, &::getCppuType(&aFont.Orientation) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTKERNING, static_cast<sal_uInt16>(PROPERTY_FONTKERNING.length), PROPERTY_ID_FONTKERNING, &::getCppuType(&aFont.Kerning) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARWORDMODE, static_cast<sal_uInt16>(PROPERTY_CHARWORDMODE.length), PROPERTY_ID_FONTWORDLINEMODE, &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTTYPE, static_cast<sal_uInt16>(PROPERTY_FONTTYPE.length), PROPERTY_ID_FONTTYPE, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0}, - //{PROPERTY_BACKGROUNDCOLOR, static_cast<sal_uInt16>(PROPERTY_BACKGROUNDCOLOR.length), PROPERTY_ID_BACKGROUNDCOLOR, &::getCppuType(&nBackgroundColor) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_PARAADJUST, static_cast<sal_uInt16>(PROPERTY_PARAADJUST.length), PROPERTY_ID_ALIGN, &::getCppuType(&nAlign) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CONTROLBORDER, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDER.length), PROPERTY_ID_BORDER, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CONTROLBORDERCOLOR, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDERCOLOR.length), PROPERTY_ID_BORDERCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CHARCOLOR, static_cast<sal_uInt16>(PROPERTY_TEXTCOLOR.length), PROPERTY_ID_TEXTCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_FORMATKEY, static_cast<sal_uInt16>(PROPERTY_FORMATKEY.length), PROPERTY_ID_FORMATKEY, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CHARUNDERLINECOLOR, static_cast<sal_uInt16>(PROPERTY_CHARUNDERLINECOLOR.length), PROPERTY_ID_TEXTLINECOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + { + {PROPERTY_FONTNAME, static_cast<sal_uInt16>(PROPERTY_FONTNAME.length), PROPERTY_ID_FONTNAME, &::getCppuType(&aFont.Name) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARFONTHEIGHT, static_cast<sal_uInt16>(PROPERTY_CHARFONTHEIGHT.length), PROPERTY_ID_FONTHEIGHT, &::getCppuType(&aFont.Height) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTWIDTH.length), PROPERTY_ID_FONTWIDTH, &::getCppuType(&aFont.Width) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTSTYLENAME, static_cast<sal_uInt16>(PROPERTY_FONTSTYLENAME.length), PROPERTY_ID_FONTSTYLENAME, &::getCppuType(&aFont.StyleName) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTFAMILY, static_cast<sal_uInt16>(PROPERTY_FONTFAMILY.length), PROPERTY_ID_FONTFAMILY, &::getCppuType(&aFont.Family) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTCHARSET, static_cast<sal_uInt16>(PROPERTY_FONTCHARSET.length), PROPERTY_ID_FONTCHARSET, &::getCppuType(&aFont.CharSet) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTPITCH, static_cast<sal_uInt16>(PROPERTY_FONTPITCH.length), PROPERTY_ID_FONTPITCH, &::getCppuType(&aFont.Pitch) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTCHARWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTCHARWIDTH.length), PROPERTY_ID_FONTCHARWIDTH, &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0}, + {PROPERTY_FONTWEIGHT, static_cast<sal_uInt16>(PROPERTY_FONTWEIGHT.length), PROPERTY_ID_FONTWEIGHT, &::getCppuType(&aFont.Weight) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARPOSTURE, static_cast<sal_uInt16>(PROPERTY_CHARPOSTURE.length), PROPERTY_ID_FONTSLANT, &::getCppuType(&aFont.Slant) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTUNDERLINE, static_cast<sal_uInt16>(PROPERTY_FONTUNDERLINE.length), PROPERTY_ID_FONTUNDERLINE, &::getCppuType(&aFont.Underline) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARSTRIKEOUT, static_cast<sal_uInt16>(PROPERTY_CHARSTRIKEOUT.length), PROPERTY_ID_FONTSTRIKEOUT, &::getCppuType(&aFont.Strikeout) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTORIENTATION, static_cast<sal_uInt16>(PROPERTY_FONTORIENTATION.length), PROPERTY_ID_FONTORIENTATION, &::getCppuType(&aFont.Orientation) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTKERNING, static_cast<sal_uInt16>(PROPERTY_FONTKERNING.length), PROPERTY_ID_FONTKERNING, &::getCppuType(&aFont.Kerning) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARWORDMODE, static_cast<sal_uInt16>(PROPERTY_CHARWORDMODE.length), PROPERTY_ID_FONTWORDLINEMODE, &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTTYPE, static_cast<sal_uInt16>(PROPERTY_FONTTYPE.length), PROPERTY_ID_FONTTYPE, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0}, + //{PROPERTY_BACKGROUNDCOLOR, static_cast<sal_uInt16>(PROPERTY_BACKGROUNDCOLOR.length), PROPERTY_ID_BACKGROUNDCOLOR, &::getCppuType(&nBackgroundColor) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_PARAADJUST, static_cast<sal_uInt16>(PROPERTY_PARAADJUST.length), PROPERTY_ID_ALIGN, &::getCppuType(&nAlign) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CONTROLBORDER, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDER.length), PROPERTY_ID_BORDER, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CONTROLBORDERCOLOR, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDERCOLOR.length), PROPERTY_ID_BORDERCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CHARCOLOR, static_cast<sal_uInt16>(PROPERTY_TEXTCOLOR.length), PROPERTY_ID_TEXTCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_FORMATKEY, static_cast<sal_uInt16>(PROPERTY_FORMATKEY.length), PROPERTY_ID_FORMATKEY, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CHARUNDERLINECOLOR, static_cast<sal_uInt16>(PROPERTY_CHARUNDERLINECOLOR.length), PROPERTY_ID_TEXTLINECOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, { NULL, 0, 0, NULL, 0, 0 } }; try @@ -317,22 +317,22 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); pAutoStyle->FillPropertySet(xProp); - xProp->getPropertyValue(PROPERTY_FONTNAME) >>= aFont.Name; - xProp->getPropertyValue(PROPERTY_CHARFONTHEIGHT) >>= aFont.Height; - xProp->getPropertyValue(PROPERTY_FONTWIDTH) >>= aFont.Width; - xProp->getPropertyValue(PROPERTY_FONTSTYLENAME) >>= aFont.StyleName; - xProp->getPropertyValue(PROPERTY_FONTFAMILY) >>= aFont.Family; - xProp->getPropertyValue(PROPERTY_FONTCHARSET) >>= aFont.CharSet; - xProp->getPropertyValue(PROPERTY_FONTPITCH) >>= aFont.Pitch; - xProp->getPropertyValue(PROPERTY_FONTCHARWIDTH) >>= aFont.CharacterWidth; - xProp->getPropertyValue(PROPERTY_FONTWEIGHT) >>= aFont.Weight; - xProp->getPropertyValue(PROPERTY_CHARPOSTURE) >>= aFont.Slant; - xProp->getPropertyValue(PROPERTY_FONTUNDERLINE) >>= aFont.Underline; - xProp->getPropertyValue(PROPERTY_CHARSTRIKEOUT) >>= aFont.Strikeout; - xProp->getPropertyValue(PROPERTY_FONTORIENTATION) >>= aFont.Orientation; - xProp->getPropertyValue(PROPERTY_FONTKERNING) >>= aFont.Kerning; - xProp->getPropertyValue(PROPERTY_CHARWORDMODE) >>= aFont.WordLineMode; - xProp->getPropertyValue(PROPERTY_FONTTYPE) >>= aFont.Type; + xProp->getPropertyValue(PROPERTY_FONTNAME) >>= aFont.Name; + xProp->getPropertyValue(PROPERTY_CHARFONTHEIGHT) >>= aFont.Height; + xProp->getPropertyValue(PROPERTY_FONTWIDTH) >>= aFont.Width; + xProp->getPropertyValue(PROPERTY_FONTSTYLENAME) >>= aFont.StyleName; + xProp->getPropertyValue(PROPERTY_FONTFAMILY) >>= aFont.Family; + xProp->getPropertyValue(PROPERTY_FONTCHARSET) >>= aFont.CharSet; + xProp->getPropertyValue(PROPERTY_FONTPITCH) >>= aFont.Pitch; + xProp->getPropertyValue(PROPERTY_FONTCHARWIDTH) >>= aFont.CharacterWidth; + xProp->getPropertyValue(PROPERTY_FONTWEIGHT) >>= aFont.Weight; + xProp->getPropertyValue(PROPERTY_CHARPOSTURE) >>= aFont.Slant; + xProp->getPropertyValue(PROPERTY_FONTUNDERLINE) >>= aFont.Underline; + xProp->getPropertyValue(PROPERTY_CHARSTRIKEOUT) >>= aFont.Strikeout; + xProp->getPropertyValue(PROPERTY_FONTORIENTATION) >>= aFont.Orientation; + xProp->getPropertyValue(PROPERTY_FONTKERNING) >>= aFont.Kerning; + xProp->getPropertyValue(PROPERTY_CHARWORDMODE) >>= aFont.WordLineMode; + xProp->getPropertyValue(PROPERTY_FONTTYPE) >>= aFont.Type; uno::Reference<report::XReportControlFormat> xReportControlModel(_xProp,uno::UNO_QUERY); if ( xReportControlModel.is() && aFont.Name.getLength() ) { @@ -353,11 +353,11 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet() { static comphelper::PropertyMapEntry pMap[] = - { - {PROPERTY_BORDERLEFT, static_cast<sal_uInt16>(PROPERTY_BORDERLEFT.length), 0, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERRIGHT, static_cast<sal_uInt16>(PROPERTY_BORDERRIGHT.length), 1, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERTOP, static_cast<sal_uInt16>(PROPERTY_BORDERTOP.length), 2, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(PROPERTY_BORDERBOTTOM.length), 3, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_BORDERLEFT, static_cast<sal_uInt16>(PROPERTY_BORDERLEFT.length), 0, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERRIGHT, static_cast<sal_uInt16>(PROPERTY_BORDERRIGHT.length), 1, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERTOP, static_cast<sal_uInt16>(PROPERTY_BORDERTOP.length), 2, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(PROPERTY_BORDERBOTTOM.length), 3, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; return comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); @@ -367,24 +367,24 @@ SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_REPORT_HEADER, XML_TOK_REPORT_HEADER }, - { XML_NAMESPACE_REPORT, XML_PAGE_HEADER , XML_TOK_PAGE_HEADER }, - { XML_NAMESPACE_REPORT, XML_GROUP, XML_TOK_GROUP }, - { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_DETAIL }, - { XML_NAMESPACE_REPORT, XML_PAGE_FOOTER , XML_TOK_PAGE_FOOTER }, - { XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, XML_TOK_REPORT_FOOTER }, - { XML_NAMESPACE_REPORT, XML_HEADER_ON_NEW_PAGE, XML_TOK_HEADER_ON_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_FOOTER_ON_NEW_PAGE, XML_TOK_FOOTER_ON_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_COMMAND_TYPE, XML_TOK_COMMAND_TYPE }, - { XML_NAMESPACE_REPORT, XML_COMMAND, XML_TOK_COMMAND }, - { XML_NAMESPACE_REPORT, XML_FILTER, XML_TOK_FILTER }, - { XML_NAMESPACE_REPORT, XML_CAPTION, XML_TOK_CAPTION }, - { XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, - { XML_NAMESPACE_REPORT, XML_FUNCTION, XML_TOK_REPORT_FUNCTION }, - { XML_NAMESPACE_OFFICE, XML_MIMETYPE, XML_TOK_REPORT_MIMETYPE }, - { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_REPORT_NAME }, - { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, XML_TOK_MASTER_DETAIL_FIELDS }, - { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_SUB_FRAME }, + { XML_NAMESPACE_REPORT, XML_REPORT_HEADER, XML_TOK_REPORT_HEADER }, + { XML_NAMESPACE_REPORT, XML_PAGE_HEADER , XML_TOK_PAGE_HEADER }, + { XML_NAMESPACE_REPORT, XML_GROUP, XML_TOK_GROUP }, + { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_DETAIL }, + { XML_NAMESPACE_REPORT, XML_PAGE_FOOTER , XML_TOK_PAGE_FOOTER }, + { XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, XML_TOK_REPORT_FOOTER }, + { XML_NAMESPACE_REPORT, XML_HEADER_ON_NEW_PAGE, XML_TOK_HEADER_ON_NEW_PAGE }, + { XML_NAMESPACE_REPORT, XML_FOOTER_ON_NEW_PAGE, XML_TOK_FOOTER_ON_NEW_PAGE }, + { XML_NAMESPACE_REPORT, XML_COMMAND_TYPE, XML_TOK_COMMAND_TYPE }, + { XML_NAMESPACE_REPORT, XML_COMMAND, XML_TOK_COMMAND }, + { XML_NAMESPACE_REPORT, XML_FILTER, XML_TOK_FILTER }, + { XML_NAMESPACE_REPORT, XML_CAPTION, XML_TOK_CAPTION }, + { XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, + { XML_NAMESPACE_REPORT, XML_FUNCTION, XML_TOK_REPORT_FUNCTION }, + { XML_NAMESPACE_OFFICE, XML_MIMETYPE, XML_TOK_REPORT_MIMETYPE }, + { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_REPORT_NAME }, + { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, XML_TOK_MASTER_DETAIL_FIELDS }, + { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_SUB_FRAME }, XML_TOKEN_MAP_END }; return new SvXMLTokenMap( aElemTokenMap ); @@ -394,9 +394,9 @@ SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, XML_TOK_MASTER_DETAIL_FIELD}, - { XML_NAMESPACE_REPORT, XML_MASTER, XML_TOK_MASTER}, - { XML_NAMESPACE_REPORT, XML_DETAIL, XML_TOK_SUB_DETAIL}, + { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, XML_TOK_MASTER_DETAIL_FIELD}, + { XML_NAMESPACE_REPORT, XML_MASTER, XML_TOK_MASTER}, + { XML_NAMESPACE_REPORT, XML_DETAIL, XML_TOK_SUB_DETAIL}, XML_TOKEN_MAP_END }; return new SvXMLTokenMap( aElemTokenMap ); diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index 0fd7612e3248..4995161a5e91 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,11 +37,11 @@ #include <memory> -#define CTF_RPT_NUMBERFORMAT (XML_DB_CTF_START + 1) +#define CTF_RPT_NUMBERFORMAT (XML_DB_CTF_START + 1) -#define XML_STYLE_FAMILY_REPORT_ID 700 -#define XML_STYLE_FAMILY_REPORT_NAME "report-element" -#define XML_STYLE_FAMILY_REPORT_PREFIX "rptelem" +#define XML_STYLE_FAMILY_REPORT_ID 700 +#define XML_STYLE_FAMILY_REPORT_NAME "report-element" +#define XML_STYLE_FAMILY_REPORT_PREFIX "rptelem" class SvXMLImport; @@ -55,8 +55,8 @@ namespace rptxml OPropertyHandlerFactory(const OPropertyHandlerFactory&); void operator =(const OPropertyHandlerFactory&); protected: - mutable ::std::auto_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; - mutable ::std::auto_ptr<XMLPropertyHandler> m_pTextAlignHandler; + mutable ::std::auto_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; + mutable ::std::auto_ptr<XMLPropertyHandler> m_pTextAlignHandler; public: OPropertyHandlerFactory(); virtual ~OPropertyHandlerFactory(); @@ -69,15 +69,15 @@ namespace rptxml public: static UniReference < XMLPropertySetMapper > GetCellStylePropertyMap(bool _bOldFormat = false); - static const SvXMLEnumMapEntry* GetReportPrintOptions(); - static const SvXMLEnumMapEntry* GetForceNewPageOptions(); - static const SvXMLEnumMapEntry* GetKeepTogetherOptions(); - static const SvXMLEnumMapEntry* GetCommandTypeOptions(); + static const SvXMLEnumMapEntry* GetReportPrintOptions(); + static const SvXMLEnumMapEntry* GetForceNewPageOptions(); + static const SvXMLEnumMapEntry* GetKeepTogetherOptions(); + static const SvXMLEnumMapEntry* GetCommandTypeOptions(); static const SvXMLEnumMapEntry* GetImageScaleOptions(); - + static const XMLPropertyMapEntry* GetTableStyleProps(); static const XMLPropertyMapEntry* GetColumnStyleProps(); - + static const XMLPropertyMapEntry* GetRowStyleProps(); static void copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& _xProp); @@ -85,7 +85,7 @@ namespace rptxml static SvXMLTokenMap* GetReportElemTokenMap(); static SvXMLTokenMap* GetSubDocumentElemTokenMap(); - + }; // ----------------------------------------------------------------------------- } // rptxml diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index ab7567214fdf..a665e74abdef 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx index 597c4ffea31a..77eee02d4345 100644 --- a/reportdesign/source/filter/xml/xmlImage.hxx +++ b/reportdesign/source/filter/xml/xmlImage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index a61c4b21928b..decca01c4aa5 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -168,7 +168,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName switch( m_pReportElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) { - case XML_TOK_COMMAND_TYPE: + case XML_TOK_COMMAND_TYPE: { sal_uInt16 nRet = static_cast<sal_uInt16>(sdb::CommandType::COMMAND); const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetCommandTypeOptions(); @@ -176,13 +176,13 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName m_xDatabaseDataProvider->setCommandType(nRet); } break; - case XML_TOK_COMMAND: + case XML_TOK_COMMAND: m_xDatabaseDataProvider->setCommand(sValue); break; - case XML_TOK_FILTER: + case XML_TOK_FILTER: m_xDatabaseDataProvider->setFilter(sValue); break; - case XML_TOK_ESCAPE_PROCESSING: + case XML_TOK_ESCAPE_PROCESSING: m_xDatabaseDataProvider->setEscapeProcessing(sValue == s_sTRUE); break; default: @@ -219,10 +219,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName switch( pMasterElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) { - case XML_TOK_MASTER: + case XML_TOK_MASTER: sMasterField = sValue; break; - case XML_TOK_SUB_DETAIL: + case XML_TOK_SUB_DETAIL: sDetailField = sValue; break; } @@ -281,9 +281,9 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName xNewAttribs = pList; pList->AppendAttributeList(_xAttrList); pList->AddAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("local-table.$A$1:.$Z$65536"))); - + } - + if ( bExport ) m_xDelegatee->startElement(_sName,xNewAttribs); } @@ -304,7 +304,7 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName) m_xDatabaseDataProvider->setDetailFields(uno::Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); bExport = false; } - else if ( _sName.equalsAscii("rpt:detail") + else if ( _sName.equalsAscii("rpt:detail") || _sName.equalsAscii("rpt:formatted-text") || _sName.equalsAscii("rpt:master-detail-field") || _sName.equalsAscii("rpt:report-component") @@ -361,8 +361,8 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > } // if ( !m_xDatabaseDataProvider.is() ) m_aArguments = m_xDatabaseDataProvider->detectArguments(NULL); - - uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( + + uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory")),m_xContext), uno::UNO_QUERY); m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get()); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index 4ea40033edda..d2e531629f79 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,8 +97,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider; - - ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; + + ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; }; // ----------------------------------------------------------------------------- } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 745203f25c51..f36a6df7a2e7 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ SvXMLImportContext* OXMLMasterFields::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetSubDocumentElemTokenMap(); + const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetSubDocumentElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx index c684c020be24..b3d784e91f84 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.hxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx index 358aeba8e0f4..645c0bad893d 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx index 703428832507..1c36503a746d 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 6990c9144b20..a27712d15c8f 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ DBG_NAME( rpt_OXMLReport ) OXMLReport::OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, - const Reference< XAttributeList > & _xAttrList + const Reference< XAttributeList > & _xAttrList ,const uno::Reference< report::XReportDefinition >& _xComponent ,OXMLTable* _pContainer) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) @@ -78,7 +78,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_COMMAND_TYPE: + case XML_TOK_COMMAND_TYPE: { sal_uInt16 nRet = static_cast<sal_uInt16>(sdb::CommandType::COMMAND); const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetCommandTypeOptions(); @@ -86,16 +86,16 @@ OXMLReport::OXMLReport( ORptFilter& rImport, m_xComponent->setCommandType(nRet); } break; - case XML_TOK_COMMAND: + case XML_TOK_COMMAND: m_xComponent->setCommand(sValue); break; - case XML_TOK_FILTER: + case XML_TOK_FILTER: m_xComponent->setFilter(sValue); break; - case XML_TOK_CAPTION: + case XML_TOK_CAPTION: m_xComponent->setCaption(sValue); break; - case XML_TOK_ESCAPE_PROCESSING: + case XML_TOK_ESCAPE_PROCESSING: m_xComponent->setEscapeProcessing(sValue == s_sTRUE); break; case XML_TOK_REPORT_MIMETYPE: @@ -149,7 +149,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext( SvXMLImportContext *pContext = _CreateChildContext(nPrefix,rLocalName,xAttrList); if ( pContext ) return pContext; - const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap(); + const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index 858090f39f2c..a1300897fa12 100644 --- a/reportdesign/source/filter/xml/xmlReport.hxx +++ b/reportdesign/source/filter/xml/xmlReport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace rptxml OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xComponent ,OXMLTable* _pContainer); virtual ~OXMLReport(); diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 2ef2ad192423..a3a8b3cee183 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE: + case XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE: m_xComponent->setPrintWhenGroupChange(s_sTRUE == sValue); break; case XML_TOK_PRINT_REPEATED_VALUES: @@ -104,7 +104,7 @@ SvXMLImportContext* OXMLReportElement::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetReportElementElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetReportElementElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx index 333322430832..00bdbe2d734b 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.hxx +++ b/reportdesign/source/filter/xml/xmlReportElement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptxml class ORptFilter; class OXMLReportElement : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > m_xComponent; ORptFilter& GetOwnImport(); OXMLReportElement(const OXMLReportElement&); void operator =(const OXMLReportElement&); diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index 01de1e714bf9..031eca201534 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ SvXMLImportContext* OXMLReportElementBase::_CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap(); + const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index c1d212748a86..546bdd0af2e0 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ namespace rptxml protected: ORptFilter& m_rImport; OXMLTable* m_pContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, @@ -67,7 +67,7 @@ namespace rptxml virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - + virtual void EndElement(); }; // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index fbff64b2a617..d5cba84aefd6 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ OXMLRow::OXMLRow( ORptFilter& rImport DBG_CTOR( rpt_OXMLRow,NULL); OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); - + const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); @@ -85,7 +85,7 @@ OXMLRow::OXMLRow( ORptFilter& rImport break; } } - + } // ----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ SvXMLImportContext* OXMLRow::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -140,9 +140,9 @@ void OXMLRow::EndElement() { PropertySetInfo* pInfo = new PropertySetInfo(); static PropertyMapEntry pMap[] = - { - {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; pInfo->add(pMap); @@ -155,7 +155,7 @@ void OXMLRow::EndElement() xProp->getPropertyValue(PROPERTY_WIDTH) >>= nWidth; m_pContainer->addWidth(nWidth); } - else + else { pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_TABLE_ROW,m_sStyleName)); if ( pAutoStyle ) diff --git a/reportdesign/source/filter/xml/xmlRow.hxx b/reportdesign/source/filter/xml/xmlRow.hxx index e31a36003b26..bbbe189ecd86 100644 --- a/reportdesign/source/filter/xml/xmlRow.hxx +++ b/reportdesign/source/filter/xml/xmlRow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 098858190d28..3dc4567bf9ea 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - + case XML_TOK_PAGE_PRINT_OPTION: if ( _bPageHeader ) m_xSection->getReportDefinition()->setPageHeaderOption(lcl_getReportPrintOption(sValue)); @@ -113,7 +113,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport, } // ----------------------------------------------------------------------------- OXMLSection::~OXMLSection() -{ +{ DBG_DTOR( rpt_OXMLSection,NULL); } // ----------------------------------------------------------------------------- @@ -125,7 +125,7 @@ SvXMLImportContext* OXMLSection::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap(); uno::Reference<lang::XMultiServiceFactory> xFactor = rImport.getServiceFactory(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx index 866401974a0c..6172e74b0be4 100644 --- a/reportdesign/source/filter/xml/xmlSection.hxx +++ b/reportdesign/source/filter/xml/xmlSection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptxml class OXMLSection : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - sal_Bool m_bPageHeader; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; + sal_Bool m_bPageHeader; ORptFilter& GetOwnImport(); - + OXMLSection(const OXMLSection&); void operator =(const OXMLSection&); public: diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index afb2ceff5431..8e38218ecd94 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -229,7 +229,7 @@ UniReference < SvXMLImportPropertyMapper > { m_xCellImpPropMapper = new XMLTextImportPropertyMapper/*OSpecialHanldeXMLImportPropertyMapper*/( rImport.GetCellStylesPropertySetMapper(), m_rImport , const_cast<XMLFontStylesContext*>(m_rImport.GetFontDecls())); - + m_xCellImpPropMapper->ChainImportMapper(XMLTextImportHelper::CreateParaExtPropMapper(m_rImport, const_cast<XMLFontStylesContext*>(m_rImport.GetFontDecls()))); } xMapper = m_xCellImpPropMapper; @@ -238,9 +238,9 @@ UniReference < SvXMLImportPropertyMapper > case XML_STYLE_FAMILY_TABLE_COLUMN: { if( !m_xColumnImpPropMapper.is() ) - m_xColumnImpPropMapper = + m_xColumnImpPropMapper = new SvXMLImportPropertyMapper( rImport.GetColumnStylesPropertySetMapper(), m_rImport ); - + xMapper = m_xColumnImpPropMapper; } break; @@ -266,7 +266,7 @@ UniReference < SvXMLImportPropertyMapper > break; } } - + return xMapper; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 07ba5be94c56..8fec6ff9a6c8 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,16 +47,16 @@ namespace rptxml class OControlStyleContext : public XMLPropStyleContext { - ::rtl::OUString m_sDataStyleName; - ::rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; - SvXMLStylesContext* pStyles; - // std::vector<ScXMLMapContent> aMaps; - com::sun::star::uno::Any aConditionalFormat; - sal_Int32 m_nNumberFormat; + ::rtl::OUString m_sDataStyleName; + ::rtl::OUString sPageStyle; + const rtl::OUString sNumberFormat; + SvXMLStylesContext* pStyles; + // std::vector<ScXMLMapContent> aMaps; + com::sun::star::uno::Any aConditionalFormat; + sal_Int32 m_nNumberFormat; ORptFilter& m_rImport; - sal_Bool bConditionalFormatCreated : 1; - sal_Bool bParentSet : 1; + sal_Bool bConditionalFormatCreated : 1; + sal_Bool bParentSet : 1; ORptFilter& GetOwnImport() const; diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index 623eceaa849f..9bfc17808082 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ DBG_NAME( rpt_OXMLSubDocument ) OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport, sal_uInt16 nPrfx ,const ::rtl::OUString& rLName - ,const Reference< XReportComponent > & _xComponent + ,const Reference< XReportComponent > & _xComponent ,OXMLTable* _pContainer ,OXMLCell* _pCellParent) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) @@ -78,7 +78,7 @@ SvXMLImportContext* OXMLSubDocument::_CreateChildContext( SvXMLImportContext *pContext = OXMLReportElementBase::_CreateChildContext(_nPrefix,_rLocalName,xAttrList); if ( pContext ) return pContext; - const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetReportElemTokenMap(); + const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetReportElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { @@ -122,7 +122,7 @@ void OXMLSubDocument::EndElement() { // #i94115# this is no longer need. // m_pContainer->addCell(m_xComponent.get()); - + if ( !m_aMasterFields.empty() ) m_xComponent->setMasterFields(Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); if ( !m_aDetailFields.empty() ) @@ -130,8 +130,8 @@ void OXMLSubDocument::EndElement() m_xComponent->setName(m_xFake->getName()); m_xComponent->setPrintRepeatedValues(m_xFake->getPrintRepeatedValues()); - uno::Reference< report::XReportControlModel > xFakeModel(m_xFake,uno::UNO_QUERY); - uno::Reference< report::XReportControlModel > xComponentModel(m_xComponent,uno::UNO_QUERY); + uno::Reference< report::XReportControlModel > xFakeModel(m_xFake,uno::UNO_QUERY); + uno::Reference< report::XReportControlModel > xComponentModel(m_xComponent,uno::UNO_QUERY); if ( xComponentModel.is() && xFakeModel.is() ) { const sal_Int32 nCount = xFakeModel->getCount(); @@ -144,12 +144,12 @@ void OXMLSubDocument::EndElement() ::comphelper::copyProperties(xCond.get(),xNewCond.get()); xComponentModel->insertByIndex(xComponentModel->getCount(),uno::makeAny(xNewCond)); } // for (sal_Int32 i = 0; i < nCount ; ++i) - } + } catch(uno::Exception&) { OSL_ENSURE(0,"Can not access format condition!"); } - + } } } diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index e26996e81ee0..50bb1b91c8d5 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +38,8 @@ namespace rptxml class OXMLCell; class OXMLSubDocument : public OXMLReportElementBase, public IMasterDetailFieds { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake; ::std::vector< ::rtl::OUString> m_aMasterFields; ::std::vector< ::rtl::OUString> m_aDetailFields; OXMLCell* m_pCellParent; diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index f70a65d98bcc..e9ba7ac425f1 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,7 +127,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport } // ----------------------------------------------------------------------------- OXMLTable::~OXMLTable() -{ +{ DBG_DTOR( rpt_OXMLTable,NULL); } // ----------------------------------------------------------------------------- @@ -139,7 +139,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); Reference<XMultiServiceFactory> xFactor = rImport.getServiceFactory(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) @@ -265,7 +265,7 @@ void OXMLTable::EndElement() try { (*aCellIter)->setSize(awt::Size(nWidth,nHeight)); - (*aCellIter)->setPosition(awt::Point(nPosX,nPosY)); + (*aCellIter)->setPosition(awt::Point(nPosX,nPosY)); } catch(beans::PropertyVetoException) { @@ -310,8 +310,8 @@ void OXMLTable::addCell(const Reference<XReportComponent>& _xElement) } // ----------------------------------------------------------------------------- void OXMLTable::incrementRowIndex() -{ - ++m_nRowIndex; +{ + ++m_nRowIndex; m_nColumnIndex = 0; m_aGrid.push_back(::std::vector<TCell>(m_aWidth.size())); } diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx index 4b6bbd2f429b..29105d9b3cd2 100644 --- a/reportdesign/source/filter/xml/xmlTable.hxx +++ b/reportdesign/source/filter/xml/xmlTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +51,14 @@ namespace rptxml ::std::vector< ::std::vector<TCell> > m_aGrid; ::std::vector<sal_Int32> m_aHeight; ::std::vector<sal_Int32> m_aWidth; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - ::rtl::OUString m_sStyleName; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; + ::rtl::OUString m_sStyleName; sal_Int32 m_nColSpan; sal_Int32 m_nRowSpan; sal_Int32 m_nRowIndex; sal_Int32 m_nColumnIndex; ORptFilter& GetOwnImport(); - + OXMLTable(const OXMLTable&); void operator =(const OXMLTable&); public: @@ -85,7 +85,7 @@ namespace rptxml void incrementRowIndex(); inline void incrementColumnIndex() { ++m_nColumnIndex; } - + inline sal_Int32 getRowIndex() const { return m_nRowIndex; } inline sal_Int32 getColumnIndex() const { return m_nColumnIndex; } diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 1e1f2ba71305..8574b949845e 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,12 +116,12 @@ RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl( XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList ) ,m_rImport(rImport) { - DBG_CTOR(rpt_RptMLMasterStylesContext_Impl,NULL); + DBG_CTOR(rpt_RptMLMasterStylesContext_Impl,NULL); } RptMLMasterStylesContext_Impl::~RptMLMasterStylesContext_Impl() { - DBG_DTOR(rpt_RptMLMasterStylesContext_Impl,NULL); + DBG_DTOR(rpt_RptMLMasterStylesContext_Impl,NULL); } void RptMLMasterStylesContext_Impl::EndElement() @@ -182,10 +182,10 @@ sal_Int32 ReadThroughComponent( { xParser->parseStream( aParserInput ); } - catch( SAXParseException& + catch( SAXParseException& #if OSL_DEBUG_LEVEL > 1 -r +r #endif ) { @@ -240,7 +240,7 @@ sal_Int32 ReadThroughComponent( { uno::Reference< io::XStream > xDocStream; sal_Bool bEncrypted = sal_False; - + try { // open stream (and set parser input) @@ -249,7 +249,7 @@ sal_Int32 ReadThroughComponent( { // stream name not found! Then try the compatibility name. // if no stream can be opened, return immediatly with OK signal - + // do we even have an alternative name? if ( NULL == pCompatibilityStreamName ) return 0; @@ -330,7 +330,7 @@ Sequence< ::rtl::OUString > ORptImportHelper::getSupportedServiceNames_Static( //--------------------------------------------------------------------- Reference< XInterface > ORptContentImportHelper::create(const Reference< XComponentContext > & xContext) { - return static_cast< XServiceInfo* >(new ORptFilter(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | + return static_cast< XServiceInfo* >(new ORptFilter(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | IMPORT_FONTDECLS )); } //--------------------------------------------------------------------- @@ -389,10 +389,10 @@ Sequence< ::rtl::OUString > ORptMetaImportHelper::getSupportedServiceNames_Stati // - ORptFilter - // ------------- DBG_NAME(rpt_ORptFilter) -ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags ) +ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags ) :SvXMLImport(_rxMSF,nImportFlags) { - DBG_CTOR(rpt_ORptFilter,NULL); + DBG_CTOR(rpt_ORptFilter,NULL); GetMM100UnitConverter().setCoreMeasureUnit(MAP_100TH_MM); GetMM100UnitConverter().setXMLMeasureUnit(MAP_CM); GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__rpt) ), @@ -414,7 +414,7 @@ ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal ORptFilter::~ORptFilter() throw() { - DBG_DTOR(rpt_ORptFilter,NULL); + DBG_DTOR(rpt_ORptFilter,NULL); } //------------------------------------------------------------------------------ uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContext > const & xContext) @@ -438,7 +438,7 @@ uno::Sequence< ::rtl::OUString > ORptFilter::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_IMPORTFILTER; - + return aServices; } @@ -453,7 +453,7 @@ sal_Bool SAL_CALL ORptFilter::supportsService(const ::rtl::OUString& ServiceName return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor ) +sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { Window* pFocusWindow = Application::GetFocusWindow(); @@ -475,11 +475,11 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { ::rtl::OUString sFileName; - uno::Reference< embed::XStorage > xStorage; + uno::Reference< embed::XStorage > xStorage; uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier; - + const PropertyValue* pIter = rDescriptor.getConstArray(); - const PropertyValue* pEnd = pIter + rDescriptor.getLength(); + const PropertyValue* pEnd = pIter + rDescriptor.getLength(); for(;pIter != pEnd;++pIter) { if( pIter->Name.equalsAscii( "FileName" ) ) @@ -491,7 +491,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) Sequence< PropertyValue > aComponent; pIter->Value >>= aComponent; const PropertyValue* pComponentIter = aComponent.getConstArray(); - const PropertyValue* pComponentEnd = pComponentIter + aComponent.getLength(); + const PropertyValue* pComponentEnd = pComponentIter + aComponent.getLength(); for(;pComponentIter != pComponentEnd;++pComponentIter) { if( pComponentIter->Name.equalsAscii( "ActiveConnection" ) ) @@ -503,20 +503,20 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) } } } - + if ( sFileName.getLength() != 0 ) { uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY); SfxMediumRef pMedium = new SfxMedium( sFileName, ( STREAM_READ | STREAM_NOCREATE ), FALSE, 0 ); - + if( pMedium ) { try { xStorage = pMedium->GetStorage(); - // nError = pMedium->GetError(); + // nError = pMedium->GetError(); } catch(const Exception&) { @@ -535,13 +535,13 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY ); uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames(); const ::rtl::OUString* pDebugIter = aSeq.getConstArray(); - const ::rtl::OUString* pDebugEnd = pDebugIter + aSeq.getLength(); + const ::rtl::OUString* pDebugEnd = pDebugIter + aSeq.getLength(); for(;pDebugIter != pDebugEnd;++pDebugIter) { (void)*pDebugIter; } #endif - + Reference< document::XGraphicObjectResolver > xGraphicObjectResolver; uno::Reference<document::XEmbeddedObjectResolver> xEmbeddedObjectResolver; uno::Reference< lang::XMultiServiceFactory > xServiceFactory( getServiceFactory(), uno::UNO_QUERY); @@ -560,8 +560,8 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) static const ::rtl::OUString s_sOld(RTL_CONSTASCII_USTRINGPARAM("OldFormat")); static comphelper::PropertyMapEntry pMap[] = - { - { MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 }, + { + { MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 }, { MAP_LEN( "StreamName"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN("PrivateData"), 0, &::getCppuType( (uno::Reference<XInterface> *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "BaseURI"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, @@ -590,7 +590,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ,xProp ); - + try { xProp->setPropertyValue(s_sOld,uno::makeAny(!(xStorage->hasByName(s_sMeta) || xStorage->isStreamElement( s_sMeta )))); @@ -642,11 +642,11 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ,xProp ); } - + bRet = nRet == 0; - if ( bRet ) + if ( bRet ) { m_xReportDefinition->setModified(sal_False); } @@ -740,22 +740,22 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const { - if ( !m_pDocElemTokenMap.get() ) + if ( !m_pDocElemTokenMap.get() ) { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - //{ XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - //{ XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - //{ XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_REPORT, XML_TOK_DOC_REPORT }, - { XML_NAMESPACE_OOO, XML_REPORT, XML_TOK_DOC_REPORT }, - { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, - { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, - { XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, XML_TOK_DOC_META }, - //{ XML_NAMESPACE_OOO, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, + { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + //{ XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, + //{ XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + //{ XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OFFICE, XML_REPORT, XML_TOK_DOC_REPORT }, + { XML_NAMESPACE_OOO, XML_REPORT, XML_TOK_DOC_REPORT }, + { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, + { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, + { XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, XML_TOK_DOC_META }, + //{ XML_NAMESPACE_OOO, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, XML_TOKEN_MAP_END }; m_pDocElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -765,7 +765,7 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetReportElemTokenMap() const { - if ( !m_pReportElemTokenMap.get() ) + if ( !m_pReportElemTokenMap.get() ) m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap()); return *m_pReportElemTokenMap; } @@ -783,11 +783,11 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME }, - { XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA}, - { XML_NAMESPACE_REPORT, XML_PRE_EVALUATED, XML_TOK_PRE_EVALUATED }, - { XML_NAMESPACE_REPORT, XML_INITIAL_FORMULA,XML_TOK_INITIAL_FORMULA }, - { XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING,XML_TOK_DEEP_TRAVERSING }, + { XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME }, + { XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA}, + { XML_NAMESPACE_REPORT, XML_PRE_EVALUATED, XML_TOK_PRE_EVALUATED }, + { XML_NAMESPACE_REPORT, XML_INITIAL_FORMULA,XML_TOK_INITIAL_FORMULA }, + { XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING,XML_TOK_DEEP_TRAVERSING }, XML_TOKEN_MAP_END }; m_pFunctionElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -801,15 +801,15 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED }, - { XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA }, - { XML_NAMESPACE_REPORT, XML_STYLE_NAME , XML_TOK_FORMAT_STYLE_NAME }, + { XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED }, + { XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA }, + { XML_NAMESPACE_REPORT, XML_STYLE_NAME , XML_TOK_FORMAT_STYLE_NAME }, XML_TOKEN_MAP_END }; m_pFormatElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); } return *m_pFormatElemTokenMap; -} +} // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const { @@ -817,19 +817,19 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN }, - { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, - { XML_NAMESPACE_REPORT, XML_PRINT_HEADER_ON_EACH_PAGE , XML_TOK_PRINT_HEADER_ON_EACH_PAGE }, - { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, - { XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION , XML_TOK_GROUP_EXPRESSION }, - { XML_NAMESPACE_REPORT, XML_GROUP_HEADER , XML_TOK_GROUP_HEADER }, - { XML_NAMESPACE_REPORT, XML_GROUP , XML_TOK_GROUP_GROUP }, - { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_GROUP_DETAIL }, - { XML_NAMESPACE_REPORT, XML_GROUP_FOOTER , XML_TOK_GROUP_FOOTER }, - { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING , XML_TOK_SORT_ASCENDING }, - { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_GROUP_KEEP_TOGETHER }, - { XML_NAMESPACE_REPORT, XML_FUNCTION , XML_TOK_GROUP_FUNCTION }, - //{ XML_NAMESPACE_REPORT, XML_ , XML_TOK_ }, + { XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN }, + { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, + { XML_NAMESPACE_REPORT, XML_PRINT_HEADER_ON_EACH_PAGE , XML_TOK_PRINT_HEADER_ON_EACH_PAGE }, + { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, + { XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION , XML_TOK_GROUP_EXPRESSION }, + { XML_NAMESPACE_REPORT, XML_GROUP_HEADER , XML_TOK_GROUP_HEADER }, + { XML_NAMESPACE_REPORT, XML_GROUP , XML_TOK_GROUP_GROUP }, + { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_GROUP_DETAIL }, + { XML_NAMESPACE_REPORT, XML_GROUP_FOOTER , XML_TOK_GROUP_FOOTER }, + { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING , XML_TOK_SORT_ASCENDING }, + { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_GROUP_KEEP_TOGETHER }, + { XML_NAMESPACE_REPORT, XML_FUNCTION , XML_TOK_GROUP_FUNCTION }, + //{ XML_NAMESPACE_REPORT, XML_ , XML_TOK_ }, XML_TOKEN_MAP_END }; m_pGroupElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -843,11 +843,11 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES }, - { XML_NAMESPACE_REPORT, XML_PRINT_ONLY_WHEN_GROUP_CHANGE,XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION }, - { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT }, - { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION }, + { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES }, + { XML_NAMESPACE_REPORT, XML_PRINT_ONLY_WHEN_GROUP_CHANGE,XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE }, + { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION }, + { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT }, + { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION }, XML_TOKEN_MAP_END }; m_pElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -861,15 +861,15 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL }, - { XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES }, - { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE }, - { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA }, - { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE }, - { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT }, - { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA }, - { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI }, - { XML_NAMESPACE_REPORT, XML_SELECT_PAGE ,XML_TOK_SELECT_PAGE }, + { XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL }, + { XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES }, + { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE }, + { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA }, + { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE }, + { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT }, + { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA }, + { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI }, + { XML_NAMESPACE_REPORT, XML_SELECT_PAGE ,XML_TOK_SELECT_PAGE }, XML_TOKEN_MAP_END }; m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -883,15 +883,15 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME }, - { XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE }, - { XML_NAMESPACE_FORM, XML_LIST_PROPERTY ,XML_TOK_LIST_PROPERTY }, - { XML_NAMESPACE_OOO, XML_VALUE ,XML_TOK_VALUE }, - { XML_NAMESPACE_OOO, XML_CURRENCY ,XML_TOK_CURRENCY }, - { XML_NAMESPACE_OOO, XML_DATE_VALUE ,XML_TOK_DATE_VALUE }, - { XML_NAMESPACE_OOO, XML_TIME_VALUE ,XML_TOK_TIME_VALUE }, - { XML_NAMESPACE_OOO, XML_STRING_VALUE ,XML_TOK_STRING_VALUE }, - { XML_NAMESPACE_OOO, XML_BOOLEAN_VALUE ,XML_TOK_BOOLEAN_VALUE }, + { XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME }, + { XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE }, + { XML_NAMESPACE_FORM, XML_LIST_PROPERTY ,XML_TOK_LIST_PROPERTY }, + { XML_NAMESPACE_OOO, XML_VALUE ,XML_TOK_VALUE }, + { XML_NAMESPACE_OOO, XML_CURRENCY ,XML_TOK_CURRENCY }, + { XML_NAMESPACE_OOO, XML_DATE_VALUE ,XML_TOK_DATE_VALUE }, + { XML_NAMESPACE_OOO, XML_TIME_VALUE ,XML_TOK_TIME_VALUE }, + { XML_NAMESPACE_OOO, XML_STRING_VALUE ,XML_TOK_STRING_VALUE }, + { XML_NAMESPACE_OOO, XML_BOOLEAN_VALUE ,XML_TOK_BOOLEAN_VALUE }, XML_TOKEN_MAP_END }; m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -905,9 +905,9 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME }, - { XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME }, - { XML_NAMESPACE_REPORT, XML_TRANSFORM , XML_TOK_TRANSFORM }, + { XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME }, + { XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME }, + { XML_NAMESPACE_REPORT, XML_TRANSFORM , XML_TOK_TRANSFORM }, XML_TOKEN_MAP_END }; m_pComponentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -921,17 +921,17 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME }, - { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN , XML_TOK_COLUMN }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW , XML_TOK_ROW }, - { XML_NAMESPACE_TABLE, XML_TABLE_CELL , XML_TOK_CELL }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS , XML_TOK_TABLE_COLUMNS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS , XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL }, - { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED }, - { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, + { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN , XML_TOK_COLUMN }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW , XML_TOK_ROW }, + { XML_NAMESPACE_TABLE, XML_TABLE_CELL , XML_TOK_CELL }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS , XML_TOK_TABLE_COLUMNS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROWS , XML_TOK_TABLE_ROWS }, + { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL }, + { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED }, + { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED }, + { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, XML_TOKEN_MAP_END }; m_pColumnTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -945,15 +945,15 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE }, - { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME }, - { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE }, - { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN }, - { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_KEEP_TOGETHER }, - { XML_NAMESPACE_REPORT, XML_REPEAT_SECTION , XML_TOK_REPEAT_SECTION }, - { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_SECT_STYLE_NAME }, - { XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION , XML_TOK_PAGE_PRINT_OPTION }, + { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE }, + { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME }, + { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE }, + { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE }, + { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN }, + { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_KEEP_TOGETHER }, + { XML_NAMESPACE_REPORT, XML_REPEAT_SECTION , XML_TOK_REPEAT_SECTION }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_SECT_STYLE_NAME }, + { XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION , XML_TOK_PAGE_PRINT_OPTION }, XML_TOKEN_MAP_END }; @@ -968,18 +968,18 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_TEXT, XML_P , XML_TOK_P }, - { XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT }, - { XML_NAMESPACE_REPORT, XML_FORMATTED_TEXT , XML_TOK_FORMATTED_TEXT }, - { XML_NAMESPACE_REPORT, XML_IMAGE , XML_TOK_IMAGE }, - { XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT , XML_TOK_SUB_DOCUMENT }, - { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE , XML_TOK_CUSTOM_SHAPE }, - { XML_NAMESPACE_DRAW, XML_FRAME , XML_TOK_FRAME }, - { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER , XML_TOK_PAGE_NUMBER }, - { XML_NAMESPACE_TEXT, XML_PAGE_COUNT , XML_TOK_PAGE_COUNT }, - { XML_NAMESPACE_TEXT, XML_TAB , XML_TOK_TEXT_TAB_STOP }, - { XML_NAMESPACE_TEXT, XML_LINE_BREAK , XML_TOK_TEXT_LINE_BREAK }, - { XML_NAMESPACE_TEXT, XML_S , XML_TOK_TEXT_S }, + { XML_NAMESPACE_TEXT, XML_P , XML_TOK_P }, + { XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT }, + { XML_NAMESPACE_REPORT, XML_FORMATTED_TEXT , XML_TOK_FORMATTED_TEXT }, + { XML_NAMESPACE_REPORT, XML_IMAGE , XML_TOK_IMAGE }, + { XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT , XML_TOK_SUB_DOCUMENT }, + { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE , XML_TOK_CUSTOM_SHAPE }, + { XML_NAMESPACE_DRAW, XML_FRAME , XML_TOK_FRAME }, + { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER , XML_TOK_PAGE_NUMBER }, + { XML_NAMESPACE_TEXT, XML_PAGE_COUNT , XML_TOK_PAGE_COUNT }, + { XML_NAMESPACE_TEXT, XML_TAB , XML_TOK_TEXT_TAB_STOP }, + { XML_NAMESPACE_TEXT, XML_LINE_BREAK , XML_TOK_TEXT_LINE_BREAK }, + { XML_NAMESPACE_TEXT, XML_S , XML_TOK_TEXT_S }, XML_TOKEN_MAP_END }; m_pCellElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -1004,7 +1004,7 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const ::rtl::OUString& rLoca return pContext; } // ----------------------------------------------------------------------------- -SvXMLImport& ORptFilter::getGlobalContext() +SvXMLImport& ORptFilter::getGlobalContext() { return *this; } diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 9e4970d97d3d..e179a0baf5ff 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,34 +80,34 @@ public: DECLARE_STL_USTRINGACCESS_MAP(Sequence<PropertyValue>,TPropertyNameMap); DECLARE_STL_USTRINGACCESS_MAP( Reference<XFunction> ,TGroupFunctionMap); private: - + TGroupFunctionMap m_aFunctions; - com::sun::star::uno::Any m_aViewSettings; - Reference< XComponent > m_xSrcDoc; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupsElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pSectionElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pControlElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pFunctionElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pSubDocumentElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pFormatElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pCellElemTokenMap; - - UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; - UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - - Reference<XReportDefinition> m_xReportDefinition; + com::sun::star::uno::Any m_aViewSettings; + Reference< XComponent > m_xSrcDoc; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupsElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pSectionElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pControlElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pFunctionElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pSubDocumentElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pFormatElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pCellElemTokenMap; + + UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; + UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + + Reference<XReportDefinition> m_xReportDefinition; ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; - sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); + sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); SvXMLImportContext* CreateStylesContext(const ::rtl::OUString& rLocalName, const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ); @@ -123,9 +123,9 @@ protected: virtual XMLShapeImportHelper* CreateShapeImport(); - virtual ~ORptFilter() throw(); + virtual ~ORptFilter() throw(); public: - + ORptFilter( const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags = IMPORT_ALL ); // XFilter @@ -145,7 +145,7 @@ public: inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } /** return the SdrModel of the real model * - * \return + * \return */ ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_pReportModel; } void FinishStyles(); @@ -154,7 +154,7 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + const SvXMLTokenMap& GetDocElemTokenMap() const; const SvXMLTokenMap& GetReportElemTokenMap() const; const SvXMLTokenMap& GetGroupElemTokenMap() const; @@ -176,16 +176,16 @@ public: static ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula); /** inserts a new function * - * \param _xFunction + * \param _xFunction */ void insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction); void removeFunction(const ::rtl::OUString& _sFunctionName); inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } + + virtual SvXMLImport& getGlobalContext(); - virtual SvXMLImport& getGlobalContext(); - - virtual void enterEventContext(); - virtual void leaveEventContext(); + virtual void enterEventContext(); + virtual void leaveEventContext(); sal_Bool isOldFormat() const; }; diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index 3e4a09d3993a..cf5d753008d3 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ cppu::ImplementationEntry entries[] = { &cppu::createSingleComponentFactory, 0, 0 }, { &ORptMetaImportHelper::create, &ORptMetaImportHelper::getImplementationName_Static, &ORptMetaImportHelper::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } diff --git a/reportdesign/source/inc/GroupProperties.hxx b/reportdesign/source/inc/GroupProperties.hxx index 8baff4b3a91c..e07244dba64a 100644 --- a/reportdesign/source/inc/GroupProperties.hxx +++ b/reportdesign/source/inc/GroupProperties.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,14 +34,14 @@ namespace rptshared */ struct GroupProperties { - ::sal_Int32 m_nGroupInterval; - ::rtl::OUString m_sExpression; - ::sal_Int16 m_nGroupOn; - ::sal_Int16 m_nKeepTogether; - ::sal_Bool m_eSortAscending; - ::sal_Bool m_bStartNewColumn; - ::sal_Bool m_bResetPageNumber; - + ::sal_Int32 m_nGroupInterval; + ::rtl::OUString m_sExpression; + ::sal_Int16 m_nGroupOn; + ::sal_Int16 m_nKeepTogether; + ::sal_Bool m_eSortAscending; + ::sal_Bool m_bStartNewColumn; + ::sal_Bool m_bResetPageNumber; + GroupProperties() :m_nGroupInterval(1) ,m_nGroupOn(0) diff --git a/reportdesign/source/inc/constasciistring.hxx b/reportdesign/source/inc/constasciistring.hxx index 157923d36b5c..e76472a68803 100644 --- a/reportdesign/source/inc/constasciistring.hxx +++ b/reportdesign/source/inc/constasciistring.hxx @@ -14,17 +14,17 @@ // string constants struct ConstAsciiString { - const sal_Char* ascii; - sal_Int32 length; + const sal_Char* ascii; + sal_Int32 length; - inline operator const ::rtl::OUString& () const; - inline operator const sal_Char* () const { return ascii; } + inline operator const ::rtl::OUString& () const; + inline operator const sal_Char* () const { return ascii; } inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength); inline ~ConstAsciiString(); private: - mutable ::rtl::OUString* ustring; + mutable ::rtl::OUString* ustring; }; //------------------------------------------------------------ diff --git a/reportdesign/source/inc/corestrings.hrc b/reportdesign/source/inc/corestrings.hrc index 42f9dd829ad4..256ac5561eed 100644 --- a/reportdesign/source/inc/corestrings.hrc +++ b/reportdesign/source/inc/corestrings.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/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc index a84d299901da..46ed96fdb961 100644 --- a/reportdesign/source/inc/stringconstants.hrc +++ b/reportdesign/source/inc/stringconstants.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 @@ -56,101 +56,101 @@ DECLARE_CONSTASCII_USTRING(SERVICE_OLEOBJECT); //= property names //============================================================ -DECLARE_CONSTASCII_USTRING(PROPERTY_VISIBLE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_NAME ); -DECLARE_CONSTASCII_USTRING(PROPERTY_HEIGHT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_VISIBLE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_NAME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_HEIGHT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT ); DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUND); DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUNDTRANSPARENT); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CANGROW ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CANSHRINK ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPEATSECTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUP ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CANGROW ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CANSHRINK ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPEATSECTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUP ); DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTDEFINITION); -DECLARE_CONSTASCII_USTRING(PROPERTY_HEADER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EXPRESSION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_SORTASCENDING ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPS ); +DECLARE_CONSTASCII_USTRING(PROPERTY_HEADER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EXPRESSION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_SORTASCENDING ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPS ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DETAIL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CAPTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ORIENTATION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERSIZE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_HEADERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_WIDTH ); -DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONX ); -DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONY ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DATAFIELD ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PARAADJUST ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DETAIL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CAPTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ORIENTATION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERSIZE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_HEADERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_WIDTH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONX ); +DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONY ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DATAFIELD ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PARAADJUST ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR ); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORASIAN ); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORCOMPLEX); -DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARRELIEF ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEURL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LABEL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEY ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARRELIEF ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEURL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LABEL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEY ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TOPMARGIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TOPMARGIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWPAGE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MINHEIGHTNEWPAGE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_SHAPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_STATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TIME_STATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DATE_STATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TRISTATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWPAGE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MINHEIGHTNEWPAGE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_SHAPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_STATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TIME_STATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DATE_STATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TRISTATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE ); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARSET); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTFAMILY); @@ -171,21 +171,21 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWIDTH); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTTYPE); -DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLED ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLED ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH ); DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISASIAN); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMEASIAN); @@ -217,46 +217,46 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATIONCOMPLEX); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHCOMPLEX); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARLOCALECOMPLEX ); -DECLARE_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_SECTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING ); +DECLARE_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_SECTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MULTILINE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULA ); -DECLARE_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PREEVALUATED ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MIMETYPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TEXT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FONTRELIEF ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ZORDER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_OPAQUE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TRANSFORMATION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEENGINE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEDATA ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEGEOMETRY ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MULTILINE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULA ); +DECLARE_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PREEVALUATED ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MIMETYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TEXT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FONTRELIEF ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ZORDER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_OPAQUE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TRANSFORMATION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEENGINE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEDATA ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEGEOMETRY ); -DECLARE_CONSTASCII_USTRING(PROPERTY_NUMBERINGTYPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGESTYLELAYOUT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ISLANDSCAPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ALIGN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_NUMBERINGTYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGESTYLELAYOUT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ISLANDSCAPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ALIGN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE ); DECLARE_CONSTASCII_USTRING(PROPERTY_PRESERVEIRI ); DECLARE_CONSTASCII_USTRING(PROPERTY_SCALEMODE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LINESTYLE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LINEDASH ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LINECOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LINESTYLE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LINEDASH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LINECOLOR ); DECLARE_CONSTASCII_USTRING(PROPERTY_LINETRANSPARENCE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LINEWIDTH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LINEWIDTH ); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFLASH ); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARAUTOKERNING ); diff --git a/reportdesign/source/inc/uistrings.hrc b/reportdesign/source/inc/uistrings.hrc index 84807be6904e..5164236d743b 100644 --- a/reportdesign/source/inc/uistrings.hrc +++ b/reportdesign/source/inc/uistrings.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 @@ -37,28 +37,28 @@ namespace rptui #include "stringconstants.hrc" #undef STRINGCONSTANTS_INCLUDED_INDIRECT -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTNAME ); -DECLARE_CONSTASCII_USTRING(CFG_REPORTDESIGNER ); -DECLARE_CONSTASCII_USTRING(DBREPORTHEADER ); -DECLARE_CONSTASCII_USTRING(DBREPORTFOOTER ); -DECLARE_CONSTASCII_USTRING(DBPAGEHEADER ); -DECLARE_CONSTASCII_USTRING(DBPAGEFOOTER ); -DECLARE_CONSTASCII_USTRING(DBGROUPHEADER ); -DECLARE_CONSTASCII_USTRING(DBGROUPFOOTER ); -DECLARE_CONSTASCII_USTRING(DBCOLUMNHEADER ); -DECLARE_CONSTASCII_USTRING(DBCOLUMNFOOTER ); -DECLARE_CONSTASCII_USTRING(DBDETAIL ); -DECLARE_CONSTASCII_USTRING(REPORTCONTROLFORMAT ); -DECLARE_CONSTASCII_USTRING(CURRENT_WINDOW ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EMPTY_IS_NULL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_POSITION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTNAME ); +DECLARE_CONSTASCII_USTRING(CFG_REPORTDESIGNER ); +DECLARE_CONSTASCII_USTRING(DBREPORTHEADER ); +DECLARE_CONSTASCII_USTRING(DBREPORTFOOTER ); +DECLARE_CONSTASCII_USTRING(DBPAGEHEADER ); +DECLARE_CONSTASCII_USTRING(DBPAGEFOOTER ); +DECLARE_CONSTASCII_USTRING(DBGROUPHEADER ); +DECLARE_CONSTASCII_USTRING(DBGROUPFOOTER ); +DECLARE_CONSTASCII_USTRING(DBCOLUMNHEADER ); +DECLARE_CONSTASCII_USTRING(DBCOLUMNFOOTER ); +DECLARE_CONSTASCII_USTRING(DBDETAIL ); +DECLARE_CONSTASCII_USTRING(REPORTCONTROLFORMAT ); +DECLARE_CONSTASCII_USTRING(CURRENT_WINDOW ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EMPTY_IS_NULL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_POSITION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME ); DECLARE_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULALIST ); -DECLARE_CONSTASCII_USTRING(PROPERTY_SCOPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULALIST ); +DECLARE_CONSTASCII_USTRING(PROPERTY_SCOPE ); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARTTYPE ); DECLARE_CONSTASCII_USTRING(PROPERTY_PREVIEW_COUNT ); DECLARE_CONSTASCII_USTRING(PROPERTY_TITLE ); diff --git a/reportdesign/source/inc/xmlstrings.hrc b/reportdesign/source/inc/xmlstrings.hrc index 3f4a6f216174..248fa9c22f65 100644 --- a/reportdesign/source/inc/xmlstrings.hrc +++ b/reportdesign/source/inc/xmlstrings.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/reportdesign/source/shared/corestrings.cxx b/reportdesign/source/shared/corestrings.cxx index de78ede60197..fac2fb13c223 100644 --- a/reportdesign/source/shared/corestrings.cxx +++ b/reportdesign/source/shared/corestrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/shared/stringconstants.cxx b/reportdesign/source/shared/stringconstants.cxx index f9e28fd87bd1..0c15d46d950d 100644 --- a/reportdesign/source/shared/stringconstants.cxx +++ b/reportdesign/source/shared/stringconstants.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,12 +32,12 @@ //============================================================ //= service names //============================================================ -IMPLEMENT_CONSTASCII_USTRING(SERVICE_FIXEDTEXT , "com.sun.star.report.FixedText"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATTEDFIELD , "com.sun.star.report.FormattedField"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMAGECONTROL , "com.sun.star.report.ImageControl"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATCONDITION , "com.sun.star.report.FormatCondition"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_REPORTENGINE , "com.sun.star.report.ReportEngine"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_FUNCTION , "com.sun.star.report.Function"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_FIXEDTEXT , "com.sun.star.report.FixedText"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATTEDFIELD , "com.sun.star.report.FormattedField"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMAGECONTROL , "com.sun.star.report.ImageControl"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATCONDITION , "com.sun.star.report.FormatCondition"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_REPORTENGINE , "com.sun.star.report.ReportEngine"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_FUNCTION , "com.sun.star.report.Function"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_REPORTDEFINITION , "com.sun.star.report.ReportDefinition"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SHAPE , "com.sun.star.report.Shape"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_FIXEDLINE , "com.sun.star.report.FixedLine"); @@ -48,190 +48,190 @@ IMPLEMENT_CONSTASCII_USTRING(SERVICE_OLEOBJECT , "com.sun.star.report.O //============================================================ //= property names //============================================================ -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VISIBLE , "Visible"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NAME , "Name"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEIGHT , "Height"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKCOLOR , "BackColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT , "BackTransparent"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUND , "ControlBackground"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUNDTRANSPARENT , "ControlBackgroundTransparent"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE , "ForceNewPage"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL , "NewRowOrCol"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER , "KeepTogether"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANGROW , "CanGrow"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANSHRINK , "CanShrink"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPEATSECTION , "RepeatSection"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUP , "Group"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTDEFINITION , "ReportDefinition"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VISIBLE , "Visible"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NAME , "Name"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEIGHT , "Height"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKCOLOR , "BackColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT , "BackTransparent"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUND , "ControlBackground"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUNDTRANSPARENT , "ControlBackgroundTransparent"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE , "ForceNewPage"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL , "NewRowOrCol"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER , "KeepTogether"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANGROW , "CanGrow"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANSHRINK , "CanShrink"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPEATSECTION , "RepeatSection"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUP , "Group"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTDEFINITION , "ReportDefinition"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADER , "Header"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTER , "Footer"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL , "GroupInterval"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EXPRESSION , "Expression"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPON , "GroupOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SORTASCENDING , "SortAscending"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPS , "Groups"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADER , "Header"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTER , "Footer"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL , "GroupInterval"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EXPRESSION , "Expression"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPON , "GroupOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SORTASCENDING , "SortAscending"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPS , "Groups"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS , "MasterFields"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS , "DetailFields"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADER , "ReportHeader"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER , "ReportFooter"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADER , "PageHeader"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER , "PageFooter"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAIL , "Detail"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CAPTION , "Caption"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL , "BackGraphicURL"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMAND , "Command"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION , "BackGraphicLocation"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORIENTATION , "Orientation"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT , "PaperFormat"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERSIZE , "Size"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER , "GroupKeepTogether"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION , "PageHeaderOption"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION , "PageFooterOption"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE , "CommandType"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON , "ReportHeaderOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON , "ReportFooterOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON , "PageHeaderOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON , "PageFooterOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADERON , "HeaderOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTERON , "FooterOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS , "MasterFields"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS , "DetailFields"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADER , "ReportHeader"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER , "ReportFooter"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADER , "PageHeader"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER , "PageFooter"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAIL , "Detail"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CAPTION , "Caption"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL , "BackGraphicURL"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMAND , "Command"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION , "BackGraphicLocation"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORIENTATION , "Orientation"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT , "PaperFormat"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERSIZE , "Size"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER , "GroupKeepTogether"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION , "PageHeaderOption"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION , "PageFooterOption"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE , "CommandType"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON , "ReportHeaderOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON , "ReportFooterOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON , "PageHeaderOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON , "PageFooterOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADERON , "HeaderOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTERON , "FooterOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_WIDTH , "Width"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONX , "PositionX"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONY , "PositionY"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_WIDTH , "Width"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONX , "PositionX"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONY , "PositionY"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATAFIELD , "DataField"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PARAADJUST , "ParaAdjust"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ALIGN , "Align"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR , "FontDescriptor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORASIAN , "FontDescriptorAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATAFIELD , "DataField"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PARAADJUST , "ParaAdjust"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ALIGN , "Align"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR , "FontDescriptor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORASIAN , "FontDescriptorAsian"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORCOMPLEX , "FontDescriptorComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK , "ControlTextEmphasis"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARRELIEF , "CharRelief"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOLOR , "CharColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN , "VerticalAlign"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION , "ImagePosition"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEURL , "ImageURL"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR , "CharUnderlineColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LABEL , "Label"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK , "ControlTextEmphasis"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARRELIEF , "CharRelief"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOLOR , "CharColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN , "VerticalAlign"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION , "ImagePosition"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEURL , "ImageURL"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR , "CharUnderlineColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LABEL , "Label"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT , "EffectiveDefault"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX , "EffectiveMax"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN , "EffectiveMin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEY , "FormatKey"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN , "MaxTextLen"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCE , "ListSource"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER , "FormatsSupplier"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER , "ControlBorder"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR , "ControlBorderColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDER , "Border"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR , "BorderColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL , "DefaultControl"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT , "EffectiveDefault"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX , "EffectiveMax"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN , "EffectiveMin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEY , "FormatKey"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN , "MaxTextLen"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCE , "ListSource"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER , "FormatsSupplier"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER , "ControlBorder"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR , "ControlBorderColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDER , "Border"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR , "BorderColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL , "DefaultControl"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN , "LeftMargin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN , "RightMargin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TOPMARGIN , "TopMargin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN , "BottomMargin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN , "LeftMargin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN , "RightMargin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TOPMARGIN , "TopMargin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN , "BottomMargin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES , "PrintRepeatedValues"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION , "ConditionalPrintExpression"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SHAPE , "Shape"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN , "StartNewColumn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER , "ResetPageNumber"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE , "PrintWhenGroupChange"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATE , "State"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TIME_STATE , "TimeState"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATE_STATE , "DateState"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE , "TriState"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE , "ListSourceType"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH, "FontCharWidth"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARSET, "CharFontCharSet"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTFAMILY, "CharFontFamily"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTHEIGHT, "CharHeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT, "FontHeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTKERNING, "FontKerning"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONT, "FontDescriptor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTNAME, "FontName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION, "CharRotation"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTPITCH, "CharFontPitch"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSLANT, "FontSlant"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSTRIKEOUT, "CharStrikeout"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT, "FontStrikeout"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME, "CharFontStyleName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE, "CharUnderline"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT, "CharWeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWIDTH, "FontWidth"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE, "FontWordLineMode"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTTYPE, "FontType"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES , "PrintRepeatedValues"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION , "ConditionalPrintExpression"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SHAPE , "Shape"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN , "StartNewColumn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER , "ResetPageNumber"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE , "PrintWhenGroupChange"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATE , "State"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TIME_STATE , "TimeState"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATE_STATE , "DateState"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE , "TriState"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE , "ListSourceType"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH, "FontCharWidth"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARSET, "CharFontCharSet"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTFAMILY, "CharFontFamily"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTHEIGHT, "CharHeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT, "FontHeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTKERNING, "FontKerning"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONT, "FontDescriptor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTNAME, "FontName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION, "CharRotation"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTPITCH, "CharFontPitch"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSLANT, "FontSlant"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSTRIKEOUT, "CharStrikeout"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT, "FontStrikeout"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME, "CharFontStyleName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE, "CharUnderline"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT, "CharWeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWIDTH, "FontWidth"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE, "FontWordLineMode"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTTYPE, "FontType"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLED , "Enabled"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLED , "Enabled"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS, "CharEmphasis"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME, "CharFontName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS, "CharEmphasis"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME, "CharFontName"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME,"CharFontStyleName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY, "CharFontFamily"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET, "CharFontCharSet"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH, "CharFontPitch"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT, "CharHeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE, "CharUnderline"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT, "CharWeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE, "CharPosture"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE, "CharWordMode"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATION, "CharRotation"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH, "CharScaleWidth"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY, "CharFontFamily"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET, "CharFontCharSet"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH, "CharFontPitch"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT, "CharHeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE, "CharUnderline"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT, "CharWeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE, "CharPosture"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE, "CharWordMode"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATION, "CharRotation"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH, "CharScaleWidth"); // Asian -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISASIAN, "CharEmphasisAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMEASIAN, "CharFontNameAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISASIAN, "CharEmphasisAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMEASIAN, "CharFontNameAsian"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAMEASIAN, "CharFontStyleNameAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYASIAN, "CharFontFamilyAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETASIAN, "CharFontCharSetAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHASIAN, "CharFontPitchAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTASIAN, "CharHeightAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINEASIAN, "CharUnderlineAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTASIAN, "CharWeightAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTUREASIAN, "CharPostureAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODEASIAN, "CharWordModeAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONASIAN, "CharRotationAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHASIAN, "CharScaleWidthAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYASIAN, "CharFontFamilyAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETASIAN, "CharFontCharSetAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHASIAN, "CharFontPitchAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTASIAN, "CharHeightAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINEASIAN, "CharUnderlineAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTASIAN, "CharWeightAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTUREASIAN, "CharPostureAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODEASIAN, "CharWordModeAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONASIAN, "CharRotationAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHASIAN, "CharScaleWidthAsian"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARLOCALEASIAN, "CharLocaleAsian"); // Complex -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISCOMPLEX, "CharEmphasisComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMECOMPLEX, "CharFontNameComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISCOMPLEX, "CharEmphasisComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMECOMPLEX, "CharFontNameComplex"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAMECOMPLEX, "CharFontStyleNameComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYCOMPLEX, "CharFontFamilyComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETCOMPLEX, "CharFontCharSetComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHCOMPLEX, "CharFontPitchComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTCOMPLEX, "CharHeightComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOMPLEX, "CharUnderlineComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTCOMPLEX, "CharWeightComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURECOMPLEX, "CharPostureComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODECOMPLEX, "CharWordModeComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONCOMPLEX, "CharRotationComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHCOMPLEX, "CharScaleWidthComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYCOMPLEX, "CharFontFamilyComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETCOMPLEX, "CharFontCharSetComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHCOMPLEX, "CharFontPitchComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTCOMPLEX, "CharHeightComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOMPLEX, "CharUnderlineComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTCOMPLEX, "CharWeightComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURECOMPLEX, "CharPostureComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODECOMPLEX, "CharWordModeComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONCOMPLEX, "CharRotationComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHCOMPLEX, "CharScaleWidthComplex"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARLOCALECOMPLEX, "CharLocaleComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR, "StatusIndicator"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SECTION, "Section"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER, "Filter"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MULTILINE, "MultiLine"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING, "EscapeProcessing"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION, "ActiveConnection"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME, "DataSourceName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMULA, "Formula"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA, "InitialFormula"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PREEVALUATED, "PreEvaluated"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING, "DeepTraversing"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MIMETYPE, "MimeType"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR, "StatusIndicator"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SECTION, "Section"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER, "Filter"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MULTILINE, "MultiLine"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING, "EscapeProcessing"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION, "ActiveConnection"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME, "DataSourceName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMULA, "Formula"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA, "InitialFormula"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PREEVALUATED, "PreEvaluated"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING, "DeepTraversing"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MIMETYPE, "MimeType"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR, "BackgroundColor"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXT, "Text"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR, "TextColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR , "TextLineColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTRELIEF , "FontRelief"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR , "TextLineColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTRELIEF , "FontRelief"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK, "FontEmphasisMark"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ZORDER, "ZOrder"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_OPAQUE, "Opaque"); @@ -264,7 +264,7 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOMBINESUFFIX, "CharCombineSuffix") IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHIDDEN, "CharHidden"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSHADOWED, "CharShadowed"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCONTOURED, "CharContoured"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARAUTOKERNING, "CharAutoKerning"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARAUTOKERNING, "CharAutoKerning"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARKERNING, "CharKerning"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HYPERLINKURL , "HyperLinkURL"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HYPERLINKTARGET , "HyperLinkTarget"); diff --git a/reportdesign/source/shared/uistrings.cxx b/reportdesign/source/shared/uistrings.cxx index a9dc08d1a491..2b92d222ba52 100644 --- a/reportdesign/source/shared/uistrings.cxx +++ b/reportdesign/source/shared/uistrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,28 +32,28 @@ namespace rptui { #include "stringconstants.cxx" - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTNAME , "ReportName"); - IMPLEMENT_CONSTASCII_USTRING(CFG_REPORTDESIGNER , "SunReportBuilder"); - IMPLEMENT_CONSTASCII_USTRING(DBREPORTHEADER , "ReportHeader"); - IMPLEMENT_CONSTASCII_USTRING(DBREPORTFOOTER , "ReportFooter"); - IMPLEMENT_CONSTASCII_USTRING(DBPAGEHEADER , "PageHeader"); - IMPLEMENT_CONSTASCII_USTRING(DBPAGEFOOTER , "PageFooter"); - IMPLEMENT_CONSTASCII_USTRING(DBGROUPHEADER , "GroupHeader"); - IMPLEMENT_CONSTASCII_USTRING(DBGROUPFOOTER , "GroupFooter"); - IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNHEADER , "ColumnHeader"); - IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNFOOTER , "ColumnFooter"); - IMPLEMENT_CONSTASCII_USTRING(DBDETAIL , "Detail"); - IMPLEMENT_CONSTASCII_USTRING(REPORTCONTROLFORMAT , "ReportControlFormat"); - IMPLEMENT_CONSTASCII_USTRING(CURRENT_WINDOW , "CurrentWindow"); - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCOLOR , "FontColor"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTNAME , "ReportName"); + IMPLEMENT_CONSTASCII_USTRING(CFG_REPORTDESIGNER , "SunReportBuilder"); + IMPLEMENT_CONSTASCII_USTRING(DBREPORTHEADER , "ReportHeader"); + IMPLEMENT_CONSTASCII_USTRING(DBREPORTFOOTER , "ReportFooter"); + IMPLEMENT_CONSTASCII_USTRING(DBPAGEHEADER , "PageHeader"); + IMPLEMENT_CONSTASCII_USTRING(DBPAGEFOOTER , "PageFooter"); + IMPLEMENT_CONSTASCII_USTRING(DBGROUPHEADER , "GroupHeader"); + IMPLEMENT_CONSTASCII_USTRING(DBGROUPFOOTER , "GroupFooter"); + IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNHEADER , "ColumnHeader"); + IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNFOOTER , "ColumnFooter"); + IMPLEMENT_CONSTASCII_USTRING(DBDETAIL , "Detail"); + IMPLEMENT_CONSTASCII_USTRING(REPORTCONTROLFORMAT , "ReportControlFormat"); + IMPLEMENT_CONSTASCII_USTRING(CURRENT_WINDOW , "CurrentWindow"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCOLOR , "FontColor"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EMPTY_IS_NULL , "ConvertEmptyToNull"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL , "UseFilterValueProposal"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITION , "Position"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE , "FormatKeyDate"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME , "FormatKeyTime"); - IMPLEMENT_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL , "OverlappedControl"); + IMPLEMENT_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL , "OverlappedControl"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMULALIST , "FormulaList"); - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SCOPE , "Scope"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SCOPE , "Scope"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARTTYPE , "ChartType"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PREVIEW_COUNT , "RowLimit"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TITLE , "Title"); @@ -67,6 +67,6 @@ namespace rptui IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILLSTYLE , "FillStyle"); IMPLEMENT_CONSTASCII_USTRING(DBTEXTBOXBOUNDCONTENT , "TextBoxBoundContent"); -} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/shared/xmlstrings.cxx b/reportdesign/source/shared/xmlstrings.cxx index 6933a01a4d2c..d6e4afdd8936 100644 --- a/reportdesign/source/shared/xmlstrings.cxx +++ b/reportdesign/source/shared/xmlstrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,16 +32,16 @@ namespace rptxml { #include "stringconstants.cxx" -IMPLEMENT_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER , "com.sun.star.comp.Report.XMLOasisSettingsImporter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER , "com.sun.star.comp.Report.XMLOasisStylesImporter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER , "com.sun.star.comp.Report.XMLOasisContentImporter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER , "com.sun.star.comp.document.ImportFilter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_METAIMPORTER , "com.sun.star.comp.Report.XMLOasisMetaImporter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER , "com.sun.star.comp.Report.XMLOasisSettingsImporter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER , "com.sun.star.comp.Report.XMLOasisStylesImporter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER , "com.sun.star.comp.Report.XMLOasisContentImporter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER , "com.sun.star.comp.document.ImportFilter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_METAIMPORTER , "com.sun.star.comp.Report.XMLOasisMetaImporter"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERLEFT , "BorderLeft"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERRIGHT , "BorderRight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERTOP , "BorderTop"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERBOTTOM , "BorderBottom"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERLEFT , "BorderLeft"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERRIGHT , "BorderRight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERTOP , "BorderTop"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERBOTTOM , "BorderBottom"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 43ad175d827d..555243316ab1 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,14 +70,14 @@ using namespace lang; using namespace container; using namespace ::svx; -class OAddFieldWindowListBox : public SvTreeListBox +class OAddFieldWindowListBox : public SvTreeListBox { OAddFieldWindow* m_pTabWin; OAddFieldWindowListBox(const OAddFieldWindowListBox&); void operator =(const OAddFieldWindowListBox&); protected: -// virtual void Command( const CommandEvent& rEvt ); +// virtual void Command( const CommandEvent& rEvt ); public: OAddFieldWindowListBox( OAddFieldWindow* _pParent ); @@ -172,8 +172,8 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent ,m_xRowSet(_xRowSet) ,m_aActions(this,ModuleRes(RID_TB_SORTING)) ,m_pListBox(new OAddFieldWindowListBox( this )) - ,m_aFixedLine(this, ModuleRes(ADDFIELD_FL_HELP_SEPARATOR) ) - ,m_aHelpText(this, ModuleRes(ADDFIELD_HELP_FIELD) ) + ,m_aFixedLine(this, ModuleRes(ADDFIELD_FL_HELP_SEPARATOR) ) + ,m_aHelpText(this, ModuleRes(ADDFIELD_HELP_FIELD) ) ,m_aInsertButton(this, WB_TABSTOP|WB_CENTER) ,m_nCommandType(0) ,m_bEscapeProcessing(sal_False) @@ -192,7 +192,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent setToolBox(&m_aActions); m_aActions.CheckItem(SID_FM_SORTUP); m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, FALSE); - + m_pListBox->SetDoubleClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) ); m_pListBox->SetSelectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) ); m_pListBox->SetDeselectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) ); @@ -232,7 +232,7 @@ OAddFieldWindow::~OAddFieldWindow() { if ( m_pListBox.get() ) { - SvLBoxTreeList* pModel = m_pListBox->GetModel(); + SvLBoxTreeList* pModel = m_pListBox->GetModel(); ULONG nCount = pModel->GetEntryCount(); for(ULONG i = 0; i< nCount;++i) { @@ -332,7 +332,7 @@ void OAddFieldWindow::Update() { m_aActions.EnableItem(m_aActions.GetItemId(j),FALSE); } - + String aTitle(ModuleRes(RID_STR_FIELDSELECTION)); SetText(aTitle); if ( m_xRowSet.is() ) @@ -347,8 +347,8 @@ void OAddFieldWindow::Update() OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_ESCAPEPROCESSING ) >>= bEscapeProcessing ); OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_FILTER ) >>= sFilter ); - m_aCommandName = sCommand; - m_nCommandType = nCommandType; + m_aCommandName = sCommand; + m_nCommandType = nCommandType; m_bEscapeProcessing = bEscapeProcessing; m_sFilter = sFilter; @@ -558,11 +558,11 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) else if ( m_aActions.IsItemChecked(SID_FM_SORTDOWN) ) eSortMode = SortDescending; } // if ( SID_FM_REMOVE_FILTER_SORT != nCurItem ) - + m_pListBox->GetModel()->SetSortMode(eSortMode); if ( SID_FM_REMOVE_FILTER_SORT == nCurItem ) Update(); - + m_pListBox->GetModel()->Resort(); } } diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 898779094953..a505e111bf39 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ namespace rptui //======================================================================== // class ConditionalFormattingDialog //======================================================================== - DBG_NAME(rpt_ConditionalFormattingDialog) + DBG_NAME(rpt_ConditionalFormattingDialog) ConditionalFormattingDialog::ConditionalFormattingDialog( Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController ) :ModalDialog( _pParent, ModuleRes(RID_CONDFORMAT) ) @@ -110,10 +110,10 @@ namespace rptui ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_aCondScroll( this, ModuleRes( SB_ALL_CONDITIONS ) ) ,m_rController( _rController ) - ,m_xFormatConditions( _rxFormatConditions ) + ,m_xFormatConditions( _rxFormatConditions ) ,m_bDeletingCondition( false ) { - DBG_CTOR(rpt_ConditionalFormattingDialog,NULL); + DBG_CTOR(rpt_ConditionalFormattingDialog,NULL); OSL_ENSURE( m_xFormatConditions.is(), "ConditionalFormattingDialog::ConditionalFormattingDialog: ReportControlModel is NULL -> Prepare for GPF!" ); m_xCopy.set( m_xFormatConditions->createClone(), UNO_QUERY_THROW ); @@ -129,7 +129,7 @@ namespace rptui ConditionalFormattingDialog::~ConditionalFormattingDialog() { m_aConditions.clear(); - DBG_DTOR(rpt_ConditionalFormattingDialog,NULL); + DBG_DTOR(rpt_ConditionalFormattingDialog,NULL); } // ----------------------------------------------------------------------------- @@ -188,7 +188,7 @@ namespace rptui m_aConditions.insert( m_aConditions.begin() + _nNewCondIndex, pCon ); pCon->SetPosSizePixel( 0, 0, impl_getConditionWidth(), 0, WINDOW_POSSIZE_WIDTH ); - } + } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -246,7 +246,7 @@ namespace rptui if ( nNewFocusIndex >= impl_getConditionCount() ) nNewFocusIndex = impl_getConditionCount() - 1; } - } + } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -391,7 +391,7 @@ namespace rptui pCon->updateToolbar( xCond.get() ); m_aConditions.push_back( pCon ); } - } + } catch(Exception&) { OSL_ENSURE(0,"Can not access format condition!"); @@ -418,11 +418,11 @@ namespace rptui aArgs[2].Name = PROPERTY_FONTCOLOR; aArgs[2].Value <<= (sal_uInt32)_aColor.GetColor(); - + // we use this way to create undo actions m_rController.executeUnChecked(_nCommandId,aArgs); m_aConditions[ _nCondIndex ]->updateToolbar(xReportControlFormat); - } + } catch( Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -500,7 +500,7 @@ namespace rptui m_xFormatConditions->removeByIndex(k); ::comphelper::copyProperties( m_xCopy.get(), m_xFormatConditions.get() ); - } + } catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc index 89e0e1b88246..3c3b2ad8de78 100644 --- a/reportdesign/source/ui/dlg/CondFormat.hrc +++ b/reportdesign/source/ui/dlg/CondFormat.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,7 +28,7 @@ #define RPTUI_CONDFORMAT_HRC #define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_WIDTH 60 +#define FIXEDTEXT_WIDTH 60 #define FIXEDTEXT_HEIGHT 8 #define EDIT_WIDTH 75 #define RELATED_CONTROLS 4 diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index 14fe6649aff1..58af87f8cc21 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ Control WIN_CONDITION { Pos = MAP_APPFONT ( CONDITION_WIDTH - UNRELATED_CONTROLS - IMAGE_BUTTON_WIDTH, ROW_1_POS ) ; Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ; - TabStop = TRUE ; + TabStop = TRUE ; Symbol = IMAGEBUTTON_ARROW_UP ; }; @@ -118,7 +118,7 @@ Control WIN_CONDITION { Pos = MAP_APPFONT ( CONDITION_WIDTH - UNRELATED_CONTROLS - IMAGE_BUTTON_WIDTH, ROW_1_POS + IMAGE_BUTTON_HEIGHT + RELATED_CONTROLS ) ; Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ; - TabStop = TRUE ; + TabStop = TRUE ; Symbol = IMAGEBUTTON_ARROW_DOWN ; }; @@ -243,7 +243,7 @@ ModalDialog RID_CONDFORMAT HelpButton PB_HELP { - TabStop = TRUE ; + TabStop = TRUE ; Pos = MAP_APPFONT ( CONDITION_WIDTH - BUTTON_WIDTH - UNRELATED_CONTROLS, CONDITION_HEIGHT + 2*RELATED_CONTROLS + 1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; @@ -434,7 +434,7 @@ FixedLine ADDFIELD_FL_HELP_SEPARATOR Size = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Text [ en-US ] = "Help"; }; - + FixedText ADDFIELD_HELP_FIELD { SVLook = TRUE ; diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index a61b2fdb08cb..e56351ccb4e2 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index d382722ba818..d1b77c83f71c 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,8 +94,8 @@ namespace rptui ::svx::ToolboxButtonColorUpdater* m_pBtnUpdaterFontColor; // updates the color below the toolbar icon ::svx::ToolboxButtonColorUpdater* m_pBtnUpdaterBackgroundColor; - - + + size_t m_nCondIndex; long m_nLastKnownWindowWidth; bool m_bInDestruction; diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index b70e49140d2e..f6d24cc70590 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,17 +65,17 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent ,const uno::Reference< report::XSection >& _xHoldAlive ,OReportController* _pController) : ModalDialog( _pParent, ModuleRes(RID_DATETIME_DLG) ) - ,m_aDate(this, ModuleRes(CB_DATE ) ) - ,m_aFTDateFormat(this, ModuleRes(FT_DATE_FORMAT ) ) - ,m_aDateListBox(this, ModuleRes(LB_DATE_TYPE ) ) - ,m_aFL0(this, ModuleRes(FL_SEPARATOR0 ) ) - ,m_aTime(this, ModuleRes(CB_TIME ) ) - ,m_aFTTimeFormat(this, ModuleRes(FT_TIME_FORMAT ) ) - ,m_aTimeListBox(this, ModuleRes(LB_TIME_TYPE ) ) + ,m_aDate(this, ModuleRes(CB_DATE ) ) + ,m_aFTDateFormat(this, ModuleRes(FT_DATE_FORMAT ) ) + ,m_aDateListBox(this, ModuleRes(LB_DATE_TYPE ) ) + ,m_aFL0(this, ModuleRes(FL_SEPARATOR0 ) ) + ,m_aTime(this, ModuleRes(CB_TIME ) ) + ,m_aFTTimeFormat(this, ModuleRes(FT_TIME_FORMAT ) ) + ,m_aTimeListBox(this, ModuleRes(LB_TIME_TYPE ) ) ,m_aFL1(this, ModuleRes(FL_SEPARATOR1) ) - ,m_aPB_OK(this, ModuleRes(PB_OK)) - ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) - ,m_aPB_Help(this, ModuleRes(PB_HELP)) + ,m_aPB_OK(this, ModuleRes(PB_OK)) + ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_aDateControlling() ,m_aTimeControlling() ,m_pController(_pController) @@ -118,7 +118,7 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent ListBox* pListBox = &m_aDateListBox; if ( bTime ) pListBox = &m_aTimeListBox; - + const uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getReportNumberFormatter(); const uno::Reference< util::XNumberFormats> xFormats = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats(); const uno::Sequence<sal_Int32> aFormatKeys = xFormats->queryKeys(_nNumberFormatId,m_nLocale,sal_True); @@ -133,7 +133,7 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent //------------------------------------------------------------------------ ODateTimeDialog::~ODateTimeDialog() { - DBG_DTOR( rpt_ODateTimeDialog,NULL); + DBG_DTOR( rpt_ODateTimeDialog,NULL); } // ----------------------------------------------------------------------------- short ODateTimeDialog::Execute() @@ -241,12 +241,12 @@ sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const sal_Int32 nFormatKey; if ( _bDate ) { - // nFormat = m_aDateF1.IsChecked() ? i18n::NumberFormatIndex::DATE_SYSTEM_LONG : (m_aDateF2.IsChecked() ? i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY : i18n::NumberFormatIndex::DATE_SYSTEM_SHORT); + // nFormat = m_aDateF1.IsChecked() ? i18n::NumberFormatIndex::DATE_SYSTEM_LONG : (m_aDateF2.IsChecked() ? i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY : i18n::NumberFormatIndex::DATE_SYSTEM_SHORT); nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_aDateListBox.GetEntryData( m_aDateListBox.GetSelectEntryPos() ))); } else { - // nFormat = m_aTimeF1.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM); + // nFormat = m_aTimeF1.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM); nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_aTimeListBox.GetEntryData( m_aTimeListBox.GetSelectEntryPos() ))); } return nFormatKey; diff --git a/reportdesign/source/ui/dlg/DateTime.hrc b/reportdesign/source/ui/dlg/DateTime.hrc index 02a421f10c18..44d6eb6fe0ed 100644 --- a/reportdesign/source/ui/dlg/DateTime.hrc +++ b/reportdesign/source/ui/dlg/DateTime.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,29 +27,29 @@ #ifndef RPTUI_DATETIME_HRC #define RPTUI_DATETIME_HRC -#define CB_DATE (1) +#define CB_DATE (1) #define FT_DATE_FORMAT (2) -#define LB_DATE_TYPE (3) -#define FL_SEPARATOR0 (4) -#define CB_TIME (5) +#define LB_DATE_TYPE (3) +#define FL_SEPARATOR0 (4) +#define CB_TIME (5) #define FT_TIME_FORMAT (6) -#define LB_TIME_TYPE (7) -#define FL_SEPARATOR1 (8) -#define PB_OK (9) -#define PB_CANCEL (10) -#define PB_HELP (11) +#define LB_TIME_TYPE (7) +#define FL_SEPARATOR1 (8) +#define PB_OK (9) +#define PB_CANCEL (10) +#define PB_HELP (11) -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 #define LISTBOX_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 -#define BROWSER_HEIGHT 75 -#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) -#define PAGE_HEIGHT (2*RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT + BUTTON_HEIGHT) -#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 +#define BROWSER_HEIGHT 75 +#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) +#define PAGE_HEIGHT (2*RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT + BUTTON_HEIGHT) +#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_DATETIME_HRC diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src index 0e30747fb78c..2c391d666572 100644 --- a/reportdesign/source/ui/dlg/DateTime.src +++ b/reportdesign/source/ui/dlg/DateTime.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ ModalDialog RID_DATETIME_DLG HelpId = HID_RPT_DATETIME_DLG; Moveable = TRUE ; Closeable = TRUE ; - + CheckBox CB_DATE { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ; @@ -52,7 +52,7 @@ ModalDialog RID_DATETIME_DLG Check = TRUE; Text [ en-US ] = "Include Date"; }; - + FixedText FT_DATE_FORMAT { Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT ); @@ -74,7 +74,7 @@ ModalDialog RID_DATETIME_DLG { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 2*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; - // Text [ en-US ] = "Time"; + // Text [ en-US ] = "Time"; }; CheckBox CB_TIME { @@ -83,7 +83,7 @@ ModalDialog RID_DATETIME_DLG Check = TRUE; Text [ en-US ] = "Include Time"; }; - + FixedText FT_TIME_FORMAT { Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT); @@ -120,7 +120,7 @@ ModalDialog RID_DATETIME_DLG }; HelpButton PB_HELP { - TabStop = TRUE ; + TabStop = TRUE ; Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 2*BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index c199f8c3f7c3..d18105d9422f 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,9 +52,9 @@ namespace rptui using namespace formula; using namespace ::com::sun::star; -// -------------------------------------------------------------------------- -// Initialisierung / gemeinsame Funktionen fuer Dialog -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Initialisierung / gemeinsame Funktionen fuer Dialog +// -------------------------------------------------------------------------- FormulaDialog::FormulaDialog(Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory @@ -108,9 +108,9 @@ FormulaDialog::~FormulaDialog() } } -// -------------------------------------------------------------------------- -// Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Funktionen fuer rechte Seite +// -------------------------------------------------------------------------- bool FormulaDialog::calculateValue( const String& rStrExp, String& rStrResult ) { rStrResult = rStrExp; @@ -120,7 +120,7 @@ void FormulaDialog::doClose(BOOL _bOk) { EndDialog(_bOk ? RET_OK : RET_CANCEL); } -void FormulaDialog::insertEntryToLRUList(const IFunctionDescription* /*_pDesc*/) +void FormulaDialog::insertEntryToLRUList(const IFunctionDescription* /*_pDesc*/) { } void FormulaDialog::showReference(const String& /*_sFormula*/) diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index efa70b6b7e61..0cb97b5bd365 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx index f46304d897ba..5b08638227bb 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.hxx +++ b/reportdesign/source/ui/dlg/GroupExchange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +45,9 @@ namespace rptui static sal_uInt32 getReportGroupId(); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( 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 void ObjectReleased(); }; } #endif // RPTUI_GROUP_EXCHANGE_HXX diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index f2334687e4f3..8996e0f62f0c 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -62,9 +62,9 @@ #include <cppuhelper/bootstrap.hxx> -#define HANDLE_ID 0 -#define FIELD_EXPRESSION 1 -#define GROUPS_START_LEN 5 +#define HANDLE_ID 0 +#define FIELD_EXPRESSION 1 +#define GROUPS_START_LEN 5 #define NO_GROUP -1 namespace rptui @@ -100,12 +100,12 @@ class OFieldExpressionControl : public TContainerListenerBase ::osl::Mutex m_aMutex; ::std::vector<sal_Int32> m_aGroupPositions; ::std::vector<ColumnInfo> m_aColumnInfo; - ::svt::ComboBoxControl* m_pComboCell; - sal_Int32 m_nDataPos; - sal_Int32 m_nCurrentPos; - ULONG m_nPasteEvent; - ULONG m_nDeleteEvent; - OGroupsSortingDialog* m_pParent; + ::svt::ComboBoxControl* m_pComboCell; + sal_Int32 m_nDataPos; + sal_Int32 m_nCurrentPos; + ULONG m_nPasteEvent; + ULONG m_nDeleteEvent; + OGroupsSortingDialog* m_pParent; bool m_bIgnoreEvent; @@ -125,17 +125,17 @@ public: virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException); - void fillColumns(const uno::Reference< container::XNameAccess>& _xColumns); - void lateInit(); - sal_Bool IsDeleteAllowed( ); - void DeleteRows(); - void cut(); - void copy(); - void paste(); + void fillColumns(const uno::Reference< container::XNameAccess>& _xColumns); + void lateInit(); + sal_Bool IsDeleteAllowed( ); + void DeleteRows(); + void cut(); + void copy(); + void paste(); inline sal_Int32 getGroupPosition(sal_Int32 _nRow) const { return _nRow != BROWSER_ENDOFSELECTION ? m_aGroupPositions[_nRow] : sal_Int32(NO_GROUP); } - inline ::svt::ComboBoxControl* getExpressionControl() const { return m_pComboCell; } + inline ::svt::ComboBoxControl* getExpressionControl() const { return m_pComboCell; } /** returns the sequence with the selected groups @@ -164,7 +164,7 @@ protected: virtual void Command( const CommandEvent& rEvt ); // D&D - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); @@ -295,7 +295,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE sal_Int8 nAction = DND_ACTION_NONE; if ( IsDropFormatSupported( OGroupExchange::getReportGroupId() ) ) { - sal_Int32 nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); + sal_Int32 nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); SetNoSelection(); TransferableDataHelper aDropped( rEvt.maDropEvent.Transferable ); @@ -394,8 +394,8 @@ void OFieldExpressionControl::lateInit() ////////////////////////////////////////////////////////////////////// // set browse mode - BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | - BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL); + BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | + BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL); if( m_pParent->isReadOnly() ) nMode |= BROWSER_HIDECURSOR; SetMode(nMode); @@ -634,7 +634,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const } return EditBrowseBox::CLEAN; } -// XEventListener +// XEventListener //------------------------------------------------------------------------------ void SAL_CALL OFieldExpressionControl::disposing(const lang::EventObject& /*e*/) throw( uno::RuntimeException ) { @@ -727,7 +727,7 @@ void OFieldExpressionControl::KeyInput( const KeyEvent& rEvt ) { if (IsDeleteAllowed()) { - if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows + if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows !rEvt.GetKeyCode().IsShift() && !rEvt.GetKeyCode().IsMod1()) { @@ -1027,7 +1027,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent for (size_t i = 0; i < (SAL_N_ELEMENTS(pControlsLst))-1; ++i) static_cast<ListBox*>(pControlsLst[i])->SetSelectHdl(LINK(this,OGroupsSortingDialog,LBChangeHdl)); - Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder + Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder , &m_aMove,&m_aFL2}; sal_Int32 nMaxTextWidth = 0; MnemonicGenerator aMnemonicGenerator; @@ -1049,7 +1049,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height()); SetMinOutputSizePixel(aOutSize); SetOutputSizePixel(aOutSize); -// Resize(); +// Resize(); m_pReportListener = new OPropertyChangeMultiplexer(this,m_pController->getReportDefinition().get()); m_pReportListener->addProperty(PROPERTY_COMMAND); @@ -1071,8 +1071,8 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent //BTN m_aPB_Up.SetZOrder(&m_aMove, WINDOW_ZORDER_BEHIND); //BTN m_aPB_Down.SetZOrder(&m_aPB_Up, WINDOW_ZORDER_BEHIND); // set Hi contrast bitmaps - //BTN m_aPB_Up.SetModeImage( ModuleRes(IMG_UP_H),BMP_COLOR_HIGHCONTRAST); - //BTN m_aPB_Down.SetModeImage( ModuleRes(IMG_DOWN_H),BMP_COLOR_HIGHCONTRAST); + //BTN m_aPB_Up.SetModeImage( ModuleRes(IMG_UP_H),BMP_COLOR_HIGHCONTRAST); + //BTN m_aPB_Down.SetModeImage( ModuleRes(IMG_DOWN_H),BMP_COLOR_HIGHCONTRAST); m_aToolBox.SetStyle(m_aToolBox.GetStyle()|WB_LINESPACING); m_aToolBox.SetSelectHdl(LINK(this, OGroupsSortingDialog, OnFormatAction)); m_aToolBox.SetImageListProvider(this); @@ -1424,7 +1424,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) pControls[i]->SaveValue(); - ListBox* pControlsLst2[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst,&m_aOrderLst}; + ListBox* pControlsLst2[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst,&m_aOrderLst}; sal_Bool bReadOnly = !m_pController->isEditable(); for (size_t i = 0; i < SAL_N_ELEMENTS(pControlsLst2); ++i) pControlsLst2[i]->SetReadOnly(bReadOnly); @@ -1438,8 +1438,8 @@ void OGroupsSortingDialog::Resize() Size aSpace = LogicToPixel( Size( UNRELATED_CONTROLS, UNRELATED_CONTROLS ), MAP_APPFONT ); m_pFieldExpression->SetSizePixel(Size(aTotalOutputSize.Width() - 2*aSpace.Width(),m_pFieldExpression->GetSizePixel().Height())); - Control* pControlsLst[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aGroupIntervalEd,&m_aKeepTogetherLst,&m_aOrderLst}; - Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder}; + Control* pControlsLst[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aGroupIntervalEd,&m_aKeepTogetherLst,&m_aOrderLst}; + Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder}; sal_Int32 nMaxTextWidth = 0; for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) { @@ -1461,14 +1461,14 @@ void OGroupsSortingDialog::Resize() m_aFL2.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL2.GetSizePixel().Height())); m_aFL3.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL3.GetSizePixel().Height())); -//BTN sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aPB_Up.GetSizePixel().Width(); -//BTN m_aPB_Delete.SetPosPixel(Point(nPos,m_aPB_Delete.GetPosPixel().Y())); +//BTN sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aPB_Up.GetSizePixel().Width(); +//BTN m_aPB_Delete.SetPosPixel(Point(nPos,m_aPB_Delete.GetPosPixel().Y())); //BTN -//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( UNRELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); -//BTN m_aPB_Down.SetPosPixel(Point(nPos,m_aPB_Down.GetPosPixel().Y())); +//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( UNRELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); +//BTN m_aPB_Down.SetPosPixel(Point(nPos,m_aPB_Down.GetPosPixel().Y())); //BTN -//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( RELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); -//BTN m_aPB_Up.SetPosPixel(Point(nPos,m_aPB_Up.GetPosPixel().Y())); +//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( RELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); +//BTN m_aPB_Up.SetPosPixel(Point(nPos,m_aPB_Up.GetPosPixel().Y())); sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aToolBox.GetSizePixel().Width(); m_aToolBox.SetPosPixel(Point(nPos,m_aToolBox.GetPosPixel().Y())); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc b/reportdesign/source/ui/dlg/GroupsSorting.hrc index 8dfbfd3224a4..d717562cf14f 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.hrc +++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,32 +27,32 @@ #ifndef RPTUI_GROUPSSORTING_HRC #define RPTUI_GROUPSSORTING_HRC -#define FT_HEADER (1) -#define LST_HEADERLST (2) -#define FT_FOOTER (3) -#define LST_FOOTERLST (4) -#define FT_GROUPON (5) -#define LST_GROUPONLST (6) -#define FT_GROUPINTERVAL (7) +#define FT_HEADER (1) +#define LST_HEADERLST (2) +#define FT_FOOTER (3) +#define LST_FOOTERLST (4) +#define FT_GROUPON (5) +#define LST_GROUPONLST (6) +#define FT_GROUPINTERVAL (7) #define ED_GROUPINTERVALLST (8) -#define FT_KEEPTOGETHER (9) -#define LST_KEEPTOGETHERLST (10) -#define PB_OK (11) -#define PB_CANCEL (12) -#define PB_HELP (13) -#define WND_CONTROL (14) -#define HELP_FIELD (15) -#define FT_ORDER (16) -#define LST_ORDER (17) -#define FL_SEPARATOR1 (18) -#define FT_MOVELABEL (19) -#define PB_UP (20) -#define PB_DOWN (21) -#define FL_SEPARATOR2 (22) -#define FL_SEPARATOR3 (23) -//BTN #define IMG_UP_H (24) -//BTN #define IMG_DOWN_H (25) -//BTN #define PB_DELETE (26) +#define FT_KEEPTOGETHER (9) +#define LST_KEEPTOGETHERLST (10) +#define PB_OK (11) +#define PB_CANCEL (12) +#define PB_HELP (13) +#define WND_CONTROL (14) +#define HELP_FIELD (15) +#define FT_ORDER (16) +#define LST_ORDER (17) +#define FL_SEPARATOR1 (18) +#define FT_MOVELABEL (19) +#define PB_UP (20) +#define PB_DOWN (21) +#define FL_SEPARATOR2 (22) +#define FL_SEPARATOR3 (23) +//BTN #define IMG_UP_H (24) +//BTN #define IMG_DOWN_H (25) +//BTN #define PB_DELETE (26) #define TB_TOOLBOX (27) // #define IMG_GROUPSORT_MOVE_DOWN (28) @@ -63,17 +63,17 @@ // #define IMG_GROUPSORT_DELETE_H (33) -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define FIXEDTEXT_WIDTH 60 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 -#define BROWSER_HEIGHT 75 -#define PAGE_WIDTH 120 -#define PAGE_HEIGHT ( 13*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 11*FIXEDTEXT_HEIGHT ) -#define LISTBOX_WIDTH PAGE_WIDTH - 4*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define FIXEDTEXT_WIDTH 60 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 +#define BROWSER_HEIGHT 75 +#define PAGE_WIDTH 120 +#define PAGE_HEIGHT ( 13*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 11*FIXEDTEXT_HEIGHT ) +#define LISTBOX_WIDTH PAGE_WIDTH - 4*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_GROUPSSORTING_HRC diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index 2c73fff07de4..af78f65dee8d 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ FloatingWindow RID_GROUPS_SORTING Moveable = TRUE ; Closeable = TRUE ; Sizeable = TRUE; - + FixedLine FL_SEPARATOR2 { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Groups"; }; - + Control WND_CONTROL { Pos = MAP_APPFONT( UNRELATED_CONTROLS, 2*UNRELATED_CONTROLS ); @@ -61,62 +61,62 @@ FloatingWindow RID_GROUPS_SORTING Border = TRUE; TabStop = TRUE; }; - + FixedText FT_MOVELABEL { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 3*UNRELATED_CONTROLS + BROWSER_HEIGHT ) ; Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; -// Text [ en-US ] = "Move group" ; +// Text [ en-US ] = "Move group" ; Text [ en-US ] = "Group actions" ; }; - + // /* // | PAGE_WIDTH | // | /-----\ {-------\ /---------\ | // | unreleated FT_MOVELABEL |PB_UP| unreleated |PB_DOWN| unreleated |PD_DELETE| unreleated | -// | \_____/ \_______/ \_________/ | -// +// | \_____/ \_______/ \_________/ | +// // Don't set any position here, it will be done in OGroupsSortingDialog::Resize() -// +// // Find possible IMAGEBUTTON_* in rscicpx.cxx // Symbol is vclrsc.hxx // */ -// ImageButton PB_UP -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 3*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT -1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; +// ImageButton PB_UP +// { +// Pos = MAP_APPFONT ( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 3*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT -1 ) ; +// Size = MAP_APPFONT ( 14 , 14 ) ; +// TabStop = TRUE; // // Symbol = IMAGEBUTTON_ARROW_UP ; // arrow up // Symbol = IMAGEBUTTON_SPIN_UP ; // triangle up // // Symbol = IMAGEBUTTON_FLOAT; -// }; -// -// ImageButton PB_DOWN -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS - 2*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; +// }; +// +// ImageButton PB_DOWN +// { +// Pos = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS - 2*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; +// Size = MAP_APPFONT ( 14 , 14 ) ; +// TabStop = TRUE; // // Symbol = IMAGEBUTTON_ARROW_DOWN ; // arrow down // // Symbol = IMAGEBUTTON_FIRST ; // Symbol = IMAGEBUTTON_SPIN_DOWN; -// -// }; -// -// ImageButton PB_DELETE -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - UNRELATED_CONTROLS - 14, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; +// +// }; +// +// ImageButton PB_DELETE +// { +// Pos = MAP_APPFONT ( PAGE_WIDTH - UNRELATED_CONTROLS - 14, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; +// Size = MAP_APPFONT ( 14 , 14 ) ; +// TabStop = TRUE; // Symbol = IMAGEBUTTON_CLOSE ; -// }; +// }; ToolBox TB_TOOLBOX { Pos = MAP_APPFONT ( PAGE_WIDTH - 4*14 - UNRELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; ButtonType = BUTTON_SYMBOL; -// Align = BOXALIGN_TOP; -// HelpId = HID_RPT_CONDFORMAT_TB; +// Align = BOXALIGN_TOP; +// HelpId = HID_RPT_CONDFORMAT_TB; Customize = FALSE; ItemList = { @@ -124,7 +124,7 @@ FloatingWindow RID_GROUPS_SORTING { Identifier = SID_RPT_GROUPSORT_MOVE_UP ; // Command = ".uno:ReportGroupMoveUp" ; // default_images/res/commandimages/sc_reportgroupmoveup.png - HelpID = HID_RPT_GROUPSORT_MOVE_UP ; + HelpID = HID_RPT_GROUPSORT_MOVE_UP ; Text [ en-US ] = "Move up" ; Checkable = TRUE; // Disable = TRUE; @@ -132,7 +132,7 @@ FloatingWindow RID_GROUPS_SORTING ToolBoxItem { Identifier = SID_RPT_GROUPSORT_MOVE_DOWN ; - // Command = ".uno:ReportGroupMoveDown" ; + // Command = ".uno:ReportGroupMoveDown" ; HelpID = HID_RPT_GROUPSORT_MOVE_DOWN ; Text [ en-US ] = "Move down" ; Checkable = TRUE; @@ -156,7 +156,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Properties"; }; - + FixedText FT_ORDER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + FIXEDTEXT_HEIGHT ) ; @@ -178,7 +178,7 @@ FloatingWindow RID_GROUPS_SORTING < "Ascending" ; 0 ; > ; < "Descending" ; 1 ; > ; }; - + }; FixedText FT_HEADER { @@ -186,7 +186,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group Header" ; - + }; ListBox LST_HEADERLST { @@ -209,7 +209,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group Footer" ; - + }; ListBox LST_FOOTERLST { @@ -232,7 +232,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group On" ; - + }; ListBox LST_GROUPONLST { @@ -263,7 +263,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT( LISTBOX_WIDTH, EDIT_HEIGHT ); TabStop = TRUE; }; - + FixedText FT_KEEPTOGETHER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 9*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 6*FIXEDTEXT_HEIGHT) ; @@ -287,29 +287,29 @@ FloatingWindow RID_GROUPS_SORTING < "With First Detail" ; 2 ; > ; }; }; - + FixedLine FL_SEPARATOR1 { Pos = MAP_APPFONT ( RELATED_CONTROLS , 10*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 7*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Help"; }; - + FixedText HELP_FIELD { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 12*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 7*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT( PAGE_WIDTH - 2*UNRELATED_CONTROLS, 4*FIXEDTEXT_HEIGHT); WordBreak = TRUE; }; - -//BTN Image IMG_UP_H -//BTN { -//BTN ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; }; -//BTN }; -//BTN Image IMG_DOWN_H -//BTN { -//BTN ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; }; -//BTN }; + +//BTN Image IMG_UP_H +//BTN { +//BTN ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; }; +//BTN }; +//BTN Image IMG_DOWN_H +//BTN { +//BTN ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; }; +//BTN }; }; @@ -395,7 +395,7 @@ Menu RID_GROUPSROWPOPUPMENU { ItemList = { -/* +/* MenuItem { ITEM_EDIT_CUT @@ -469,7 +469,7 @@ ImageList IMGLST_GROUPSORT_DLG_SCH // }; // DEF_MASKCOLOR; // }; -// +// // Image IMG_GROUPSORT_MOVEUP_H // { // ImageBitmap = Bitmap diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index cca1a5a2fbdb..0c1760b8e48a 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,8 +62,8 @@ #include <memory> #include <algorithm> -#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) -#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) +#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) +#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) #define DROP_ACTION_TIMER_INITIAL_TICKS 10 #define DROP_ACTION_TIMER_SCROLL_TICKS 3 #define DROP_ACTION_TIMER_TICK_BASE 10 @@ -121,7 +121,7 @@ class NavigatorTree : public ::cppu::BaseMutex , public SvTreeListBox , public reportdesign::ITraverseReport , public comphelper::OSelectionChangeListener - , public ::comphelper::OPropertyChangeListener + , public ::comphelper::OPropertyChangeListener { class UserData; friend class UserData; @@ -159,8 +159,8 @@ class NavigatorTree : public ::cppu::BaseMutex DROP_ACTION m_aDropActionType; OReportController& m_rController; SvLBoxEntry* m_pMasterReport; - SvLBoxEntry* m_pDragedEntry; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; + SvLBoxEntry* m_pDragedEntry; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; ::rtl::Reference< comphelper::OSelectionChangeMultiplexer> m_pSelectionListener; unsigned short m_nTimerCounter; @@ -171,12 +171,12 @@ class NavigatorTree : public ::cppu::BaseMutex NavigatorTree(const NavigatorTree&); void operator =(const NavigatorTree&); protected: - virtual void Command( const CommandEvent& rEvt ); + virtual void Command( const CommandEvent& rEvt ); // 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 ); // OSelectionChangeListener virtual void _disposing(const lang::EventObject& _rSource) throw( uno::RuntimeException); @@ -205,7 +205,7 @@ public: virtual void traverseReportFooter(const uno::Reference< report::XSection>& _xSection); virtual void traversePageHeader(const uno::Reference< report::XSection>& _xSection); virtual void traversePageFooter(const uno::Reference< report::XSection>& _xSection); - + virtual void traverseGroups(const uno::Reference< report::XGroups>& _xGroups); virtual void traverseGroup(const uno::Reference< report::XGroup>& _xGroup); virtual void traverseGroupFunctions(const uno::Reference< report::XFunctions>& _xFunctions); @@ -232,7 +232,7 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) ,m_pDragedEntry(NULL) ,m_nTimerCounter( DROP_ACTION_TIMER_INITIAL_TICKS ) { - DBG_CTOR(rpt_NavigatorTree,NULL); + DBG_CTOR(rpt_NavigatorTree,NULL); m_pReportListener = new OPropertyChangeMultiplexer(this,m_rController.getReportDefinition().get()); m_pReportListener->addProperty(PROPERTY_PAGEHEADERON); m_pReportListener->addProperty(PROPERTY_PAGEFOOTERON); @@ -277,7 +277,7 @@ NavigatorTree::~NavigatorTree() } m_pReportListener->dispose(); m_pSelectionListener->dispose(); - DBG_DTOR(rpt_NavigatorTree,NULL); + DBG_DTOR(rpt_NavigatorTree,NULL); } //------------------------------------------------------------------------------ void NavigatorTree::Command( const CommandEvent& rEvt ) @@ -317,14 +317,14 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) sal_Bool bDeleteAllowed = m_rController.isEditable() && (xGroup.is() || uno::Reference< report::XFunction>(pData->getContent(),uno::UNO_QUERY).is()); PopupMenu aContextMenu( ModuleRes( RID_MENU_NAVIGATOR ) ); - + USHORT nCount = aContextMenu.GetItemCount(); for (USHORT i = 0; i < nCount; ++i) { if ( MENUITEM_SEPARATOR != aContextMenu.GetItemType(i)) { USHORT nId = aContextMenu.GetItemId(i); - + aContextMenu.CheckItem(nId,m_rController.isCommandChecked(nId)); sal_Bool bEnabled = m_rController.isCommandEnabled(nId); if ( nId == SID_RPT_NEW_FUNCTION ) @@ -372,7 +372,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) { if (m_aDropActionTimer.IsActive()) m_aDropActionTimer.Stop(); - } + } else { bool bNeedTrigger = false; @@ -381,14 +381,14 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) { m_aDropActionType = DA_SCROLLUP; bNeedTrigger = true; - } + } else if ((aDropPos.Y() < GetSizePixel().Height()) && (aDropPos.Y() >= GetSizePixel().Height() - GetEntryHeight())) { m_aDropActionType = DA_SCROLLDOWN; bNeedTrigger = true; - } + } else - { + { SvLBoxEntry* pDropppedOn = GetEntry(aDropPos); if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn)) { @@ -409,7 +409,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) m_aDropActionTimer.SetTimeout(DROP_ACTION_TIMER_TICK_BASE); m_aDropActionTimer.Start(); } - } + } else if (!bNeedTrigger) m_aDropActionTimer.Stop(); } @@ -480,8 +480,8 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) aSelection <<= static_cast<UserData*>(pEntry->GetUserData())->getContent(); m_rController.select(aSelection); m_pSelectionListener->unlock(); - } - + } + return 0L; } // ----------------------------------------------------------------------------- @@ -699,7 +699,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } } // ----------------------------------------------------------------------------- -void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) +void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) { SvLBoxEntry* pEntry = find(_rEvent.Source); uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY_THROW); @@ -780,13 +780,13 @@ void NavigatorTree::removeEntry(SvLBoxEntry* _pEntry,bool _bRemove) } DBG_NAME(rpt_NavigatorTree_UserData) // ----------------------------------------------------------------------------- -NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent) +NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent) : OPropertyChangeListener(m_aMutex) , OContainerListener(m_aMutex) , m_xContent(_xContent) , m_pTree(_pTree) { - DBG_CTOR(rpt_NavigatorTree_UserData,NULL); + DBG_CTOR(rpt_NavigatorTree_UserData,NULL); uno::Reference<beans::XPropertySet> xProp(m_xContent,uno::UNO_QUERY); if ( xProp.is() ) { @@ -817,7 +817,7 @@ NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno // ----------------------------------------------------------------------------- NavigatorTree::UserData::~UserData() { - DBG_DTOR(rpt_NavigatorTree_UserData,NULL); + DBG_DTOR(rpt_NavigatorTree_UserData,NULL); if ( m_pContainerListener.is() ) m_pContainerListener->dispose(); if ( m_pListener.is() ) @@ -844,7 +844,7 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& pMemFunSection = ::std::mem_fun(&OGroupHelper::getFooter); nPos = m_pTree->GetChildCount(pEntry) - 1; } - + OGroupHelper aGroupHelper(xGroup); if ( pIsOn(&aGroupHelper) ) { @@ -902,11 +902,11 @@ public: virtual ~ONavigatorImpl(); uno::Reference< report::XReportDefinition> m_xReport; - ::rptui::OReportController& m_rController; + ::rptui::OReportController& m_rController; ::std::auto_ptr<NavigatorTree> m_pNavigatorTree; }; -ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent) +ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent) :m_xReport(_rController.getReportDefinition()) ,m_rController(_rController) ,m_pNavigatorTree(new NavigatorTree(_pParent,_rController)) @@ -936,7 +936,7 @@ ONavigator::ONavigator( Window* _pParent DBG_CTOR( rpt_ONavigator,NULL); m_pImpl.reset(new ONavigatorImpl(_rController,this)); - + //Size aSpace = LogicToPixel( Size( 7, 120), MAP_APPFONT ); //Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height()); //SetMinOutputSizePixel(aOutSize); @@ -946,14 +946,14 @@ ONavigator::ONavigator( Window* _pParent m_pImpl->m_pNavigatorTree->GrabFocus(); SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y)); Show(); - + } // ----------------------------------------------------------------------------- //------------------------------------------------------------------------ ONavigator::~ONavigator() { - DBG_DTOR( rpt_ONavigator,NULL); + DBG_DTOR( rpt_ONavigator,NULL); } //------------------------------------------------------------------------------ void ONavigator::Resize() diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index 496bae3b0ab7..5cac973dc0ef 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,9 +35,9 @@ #endif #include <svl/solar.hrc> -#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) -#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) -#define RID_SVXIMG_FORMS (RID_FORMS_START +13) +#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) +#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) +#define RID_SVXIMG_FORMS (RID_FORMS_START +13) FloatingWindow RID_NAVIGATOR { @@ -49,7 +49,7 @@ FloatingWindow RID_NAVIGATOR Moveable = TRUE ; Closeable = TRUE ; Sizeable = TRUE; - + Control 1 { Pos = MAP_APPFONT( 0, 0 ); @@ -181,7 +181,7 @@ Menu RID_MENU_NAVIGATOR { ITEM_EDIT_PASTE }; -*/ +*/ }; }; diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 10e9f64b852c..8ea8aef3e8b0 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,14 +67,14 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent ,m_aAlignment(this, ModuleRes(FL_ALIGNMENT) ) ,m_aAlignmentLst(this, ModuleRes(LST_ALIGNMENT) ) ,m_aShowNumberOnFirstPage(this, ModuleRes(CB_SHOWNUMBERONFIRSTPAGE) ) - ,m_aFl1(this, ModuleRes(FL_SEPARATOR1)) - ,m_aPB_OK(this, ModuleRes(PB_OK)) - ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) - ,m_aPB_Help(this, ModuleRes(PB_HELP)) + ,m_aFl1(this, ModuleRes(FL_SEPARATOR1)) + ,m_aPB_OK(this, ModuleRes(PB_OK)) + ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_pController(_pController) ,m_xHoldAlive(_xHoldAlive) { - DBG_CTOR( rpt_OPageNumberDialog,NULL); + DBG_CTOR( rpt_OPageNumberDialog,NULL); m_aShowNumberOnFirstPage.Hide(); @@ -84,7 +84,7 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent //------------------------------------------------------------------------ OPageNumberDialog::~OPageNumberDialog() { - DBG_DTOR( rpt_OPageNumberDialog,NULL); + DBG_DTOR( rpt_OPageNumberDialog,NULL); } // ----------------------------------------------------------------------------- short OPageNumberDialog::Execute() diff --git a/reportdesign/source/ui/dlg/PageNumber.hrc b/reportdesign/source/ui/dlg/PageNumber.hrc index a6087c50b00f..65318a500a26 100644 --- a/reportdesign/source/ui/dlg/PageNumber.hrc +++ b/reportdesign/source/ui/dlg/PageNumber.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,33 +27,33 @@ #ifndef RPTUI_PAGENUMBER_HRC #define RPTUI_PAGENUMBER_HRC -#define FL_FORMAT (1) -#define RB_PAGE_N (2) -#define RB_PAGE_N_OF_M (3) -#define FL_POSITION (4) -#define RB_PAGE_TOPPAGE (5) -#define RB_PAGE_BOTTOMPAGE (6) -#define FL_ALIGNMENT (7) -#define LST_ALIGNMENT (8) -#define CB_SHOWNUMBERONFIRSTPAGE (9) -#define PB_OK (10) -#define PB_CANCEL (11) -#define PB_HELP (12) -#define FL_SEPARATOR1 (13) -#define FL_MISC (14) +#define FL_FORMAT (1) +#define RB_PAGE_N (2) +#define RB_PAGE_N_OF_M (3) +#define FL_POSITION (4) +#define RB_PAGE_TOPPAGE (5) +#define RB_PAGE_BOTTOMPAGE (6) +#define FL_ALIGNMENT (7) +#define LST_ALIGNMENT (8) +#define CB_SHOWNUMBERONFIRSTPAGE (9) +#define PB_OK (10) +#define PB_CANCEL (11) +#define PB_HELP (12) +#define FL_SEPARATOR1 (13) +#define FL_MISC (14) -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define FIXEDTEXT_WIDTH 60 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 -#define BROWSER_HEIGHT 75 -#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) -#define PAGE_HEIGHT ( 8*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT + BUTTON_HEIGHT +1 ) -#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define FIXEDTEXT_WIDTH 60 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 +#define BROWSER_HEIGHT 75 +#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) +#define PAGE_HEIGHT ( 8*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT + BUTTON_HEIGHT +1 ) +#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_PAGENUMBER_HRC diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src index 31c5bdb4026c..751bb7c547e0 100644 --- a/reportdesign/source/ui/dlg/PageNumber.src +++ b/reportdesign/source/ui/dlg/PageNumber.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,14 +44,14 @@ ModalDialog RID_PAGENUMBERS HelpId = HID_RPT_PAGENUMBERS_DLG; Moveable = TRUE ; Closeable = TRUE ; - + FixedLine FL_FORMAT { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Format"; }; - + RadioButton RB_PAGE_N { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ; @@ -66,14 +66,14 @@ ModalDialog RID_PAGENUMBERS Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Page N of M"; }; - + FixedLine FL_POSITION { Pos = MAP_APPFONT ( RELATED_CONTROLS , 3*RELATED_CONTROLS + UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Position"; }; - + RadioButton RB_PAGE_TOPPAGE { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ; @@ -85,17 +85,17 @@ ModalDialog RID_PAGENUMBERS RadioButton RB_PAGE_BOTTOMPAGE { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 5*RELATED_CONTROLS + UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; + Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Bottom of Page (Footer)"; }; - + FixedLine FL_MISC { Pos = MAP_APPFONT ( RELATED_CONTROLS , 5*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "General"; }; - + FixedText FL_ALIGNMENT { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT) ; @@ -146,7 +146,7 @@ ModalDialog RID_PAGENUMBERS }; HelpButton PB_HELP { - TabStop = TRUE ; + TabStop = TRUE ; Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 2*BUTTON_WIDTH , 7*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 383078a377f5..bdea855c9e77 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,15 +30,15 @@ #include <svx/dialogs.hrc> #include <svx/tabarea.hxx> -#include <svx/flagsdef.hxx> -#include <svx/svxdlg.hxx> -#include <editeng/svxenum.hxx> +#include <svx/flagsdef.hxx> +#include <svx/svxdlg.hxx> +#include <editeng/svxenum.hxx> #include "dlgpage.hxx" #include "ModuleHelper.hxx" #include "RptResId.hrc" -#include <svl/intitem.hxx> //add CHINA001 +#include <svl/intitem.hxx> //add CHINA001 #include <svl/cjkoptions.hxx> -#include <svl/aeitem.hxx> +#include <svl/aeitem.hxx> namespace rptui { @@ -50,9 +50,9 @@ namespace rptui ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,USHORT _nPageId) : SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ), - rOutAttrs ( *pAttr ) -{ - SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); + rOutAttrs ( *pAttr ) +{ + SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); switch( _nPageId ) { @@ -63,16 +63,16 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ), //AddTabPage( RID_SVXPAGE_PAGE,String(ModuleRes(1))); // AddTabPage( RID_SVXPAGE_BACKGROUND,String(ModuleRes(1))); AddTabPage(RID_SVXPAGE_PAGE, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 ); - AddTabPage(RID_SVXPAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); + AddTabPage(RID_SVXPAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); break; case RID_PAGEDIALOG_CHAR: AddTabPage(RID_PAGE_CHAR, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); - AddTabPage(RID_PAGE_EFFECTS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); - AddTabPage(RID_PAGE_POSITION, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); - AddTabPage(RID_PAGE_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 ); + AddTabPage(RID_PAGE_EFFECTS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); + AddTabPage(RID_PAGE_POSITION, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); + AddTabPage(RID_PAGE_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 ); AddTabPage(RID_PAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); AddTabPage(RID_PAGE_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); - + break; case RID_PAGEDIALOG_LINE: AddTabPage( RID_SVXPAGE_LINE,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), 0 ); diff --git a/reportdesign/source/ui/dlg/dlgpage.src b/reportdesign/source/ui/dlg/dlgpage.src index b8dfcd377994..78873f1b1238 100644 --- a/reportdesign/source/ui/dlg/dlgpage.src +++ b/reportdesign/source/ui/dlg/dlgpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ TabDialog RID_PAGEDIALOG_PAGE TabStop = TRUE ; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Page" ; @@ -135,7 +135,7 @@ TabDialog RID_PAGEDIALOG_BACKGROUND Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Background" ; @@ -224,7 +224,7 @@ TabDialog RID_PAGEDIALOG_CHAR Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Character" ; @@ -296,7 +296,7 @@ TabDialog RID_PAGEDIALOG_LINE Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Line" ; diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index cbfc8608d1bb..074f15a4ceae 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +57,8 @@ namespace rptui class OAddFieldWindow; class OAddFieldWindowListBox; //======================================================================== -class OAddFieldWindow :public FloatingWindow - , public ::cppu::BaseMutex +class OAddFieldWindow :public FloatingWindow + , public ::cppu::BaseMutex , public ::comphelper::OPropertyChangeListener , public ::comphelper::OContainerListener , public dbaui::OToolBoxHelper @@ -69,17 +69,17 @@ class OAddFieldWindow :public FloatingWindow ToolBox m_aActions; - ::std::auto_ptr<OAddFieldWindowListBox> m_pListBox; + ::std::auto_ptr<OAddFieldWindowListBox> m_pListBox; FixedLine m_aFixedLine; FixedText m_aHelpText; PushButton m_aInsertButton; Link m_aCreateLink; - ::rtl::OUString m_aCommandName; + ::rtl::OUString m_aCommandName; ::rtl::OUString m_sFilter; - sal_Int32 m_nCommandType; + sal_Int32 m_nCommandType; sal_Bool m_bEscapeProcessing; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; DECL_LINK( OnDoubleClickHdl, void* ); @@ -97,8 +97,8 @@ public: virtual void GetFocus(); virtual long PreNotify( NotifyEvent& _rNEvt ); - inline const ::rtl::OUString& GetCommand() const { return m_aCommandName; } - inline sal_Int32 GetCommandType() const { return m_nCommandType; } + inline const ::rtl::OUString& GetCommand() const { return m_aCommandName; } + inline sal_Int32 GetCommandType() const { return m_nCommandType; } inline sal_Bool GetEscapeProcessing() const { return m_bEscapeProcessing; } inline void SetCreateHdl(const Link& _aCreateLink) { m_aCreateLink = _aCreateLink; } diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx index db58419fca42..e794de95ffe7 100644 --- a/reportdesign/source/ui/inc/ColorChanger.hxx +++ b/reportdesign/source/ui/inc/ColorChanger.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptui class ColorChanger { protected: - OutputDevice* m_pDev; + OutputDevice* m_pDev; public: ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor) diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index b3ded2a5aaf8..13677f7e53fd 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptui void operator =(const OColorListener&); protected: OModuleClient m_aModuleClient; - Link m_aCollapsedLink; - svtools::ColorConfig m_aColorConfig; - svtools::ExtendedColorConfig m_aExtendedColorConfig; - ::rtl::OUString m_sColorEntry; - sal_Int32 m_nColor; - sal_Int32 m_nTextBoundaries; - sal_Bool m_bCollapsed; - sal_Bool m_bMarked; + Link m_aCollapsedLink; + svtools::ColorConfig m_aColorConfig; + svtools::ExtendedColorConfig m_aExtendedColorConfig; + ::rtl::OUString m_sColorEntry; + sal_Int32 m_nColor; + sal_Int32 m_nTextBoundaries; + sal_Bool m_bCollapsed; + sal_Bool m_bMarked; virtual void ImplInitSettings() = 0; protected: @@ -63,22 +63,22 @@ namespace rptui virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint); /** set the marker as marked or not marked - @param _bMark set the new state of the marker + @param _bMark set the new state of the marker */ - void setMarked(sal_Bool _bMark); + void setMarked(sal_Bool _bMark); /** returns if the section is marked */ - inline sal_Bool isMarked() const { return m_bMarked; } + inline sal_Bool isMarked() const { return m_bMarked; } - inline void setCollapsedHdl(const Link& _aLink ){ m_aCollapsedLink = _aLink; } - inline sal_Bool isCollapsed() const { return m_bCollapsed; } + inline void setCollapsedHdl(const Link& _aLink ){ m_aCollapsedLink = _aLink; } + inline sal_Bool isCollapsed() const { return m_bCollapsed; } /** collapse or expand * * \param _bCollapsed */ - virtual void setCollapsed(sal_Bool _bCollapsed); + virtual void setCollapsed(sal_Bool _bCollapsed); }; } #endif // RPTUI_COLORLISTENER_HXX diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx index 215797729b1c..eddde4c724fa 100644 --- a/reportdesign/source/ui/inc/ColumnInfo.hxx +++ b/reportdesign/source/ui/inc/ColumnInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,13 +40,13 @@ namespace rptui ::rtl::OUString sColumnName; ::rtl::OUString sLabel; bool bColumn; - ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel) + ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel) : sColumnName(i_sColumnName) , sLabel(i_sLabel) , bColumn(true) { } - ColumnInfo(const ::rtl::OUString& i_sColumnName) + ColumnInfo(const ::rtl::OUString& i_sColumnName) : sColumnName(i_sColumnName) , bColumn(false) { diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 20156d51b01d..1d775e19f7a8 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index 458debb305b3..80f0a5f4aa49 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ namespace rptui DataProviderHandler(DataProviderHandler &); // not defined void operator =(DataProviderHandler &); // not defined - + bool impl_dialogLinkedFields_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; bool impl_dialogChartType_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; void impl_updateChartTitle_throw(const ::com::sun::star::uno::Any& _aValue); diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index c73f366ea619..8c670ba5dc55 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,41 +47,41 @@ class OReportController; |* Groups and Sorting dialog |* \************************************************************************/ -class ODateTimeDialog : public ModalDialog +class ODateTimeDialog : public ModalDialog { - // FixedLine m_aFLDate; - CheckBox m_aDate; + // FixedLine m_aFLDate; + CheckBox m_aDate; FixedText m_aFTDateFormat; ListBox m_aDateListBox; - FixedLine m_aFL0; - CheckBox m_aTime; + FixedLine m_aFL0; + CheckBox m_aTime; FixedText m_aFTTimeFormat; ListBox m_aTimeListBox; - FixedLine m_aFL1; - OKButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_Help; + FixedLine m_aFL1; + OKButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_Help; svt::ControlDependencyManager m_aDateControlling; svt::ControlDependencyManager m_aTimeControlling; - ::rptui::OReportController* m_pController; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> + ::rptui::OReportController* m_pController; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xHoldAlive; - ::com::sun::star::lang::Locale m_nLocale; + ::com::sun::star::lang::Locale m_nLocale; /** returns the frmat string * * \param _nNumberFormatKey the number format key - * \param _xFormats - * \param _bTime - * \return + * \param _xFormats + * \param _bTime + * \return */ ::rtl::OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats>& _xFormats,bool _bTime); /** returns the number format key - @param _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex + @param _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex */ sal_Int32 getFormatKey(sal_Bool _bDate) const; @@ -96,7 +96,7 @@ public: ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~ODateTimeDialog(); - virtual short Execute(); + virtual short Execute(); }; // ============================================================================= } // namespace rptui diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index 43c62a761458..2149777e4cb2 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index ffe4b5f37cb1..c355a6c46d90 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +37,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <tools/link.hxx> -#include <tools/gen.hxx> +#include <tools/gen.hxx> #include <vcl/timer.hxx> #include <svl/hint.hxx> #include <svl/brdcst.hxx> @@ -73,30 +73,30 @@ namespace rptui private: SplitWindow m_aSplitWin; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; - OReportController& m_rReportController; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; + OReportController& m_rReportController; OScrollWindowHelper m_aScrollWindow; - Window* m_pTaskPane; - PropBrw* m_pPropWin; - OAddFieldWindow* m_pAddField; - OSectionView* m_pCurrentView; + Window* m_pTaskPane; + PropBrw* m_pPropWin; + OAddFieldWindow* m_pAddField; + OSectionView* m_pCurrentView; ONavigator* m_pReportExplorer; - Timer m_aMarkTimer; - Point m_aScrollOffset; - DlgEdMode m_eMode; - USHORT m_nCurrentPosition; - USHORT m_eActObj; - BOOL m_bFirstDraw; + Timer m_aMarkTimer; + Point m_aScrollOffset; + DlgEdMode m_eMode; + USHORT m_nCurrentPosition; + USHORT m_eActObj; + BOOL m_bFirstDraw; Size m_aGridSizeCoarse; Size m_aGridSizeFine; - BOOL m_bGridVisible; - BOOL m_bGridSnap; - BOOL m_bDeleted; - + BOOL m_bGridVisible; + BOOL m_bGridSnap; + BOOL m_bDeleted; + DECL_LINK( MarkTimeout, Timer * ); DECL_LINK( SplitHdl, void* ); - + void ImplInitSettings(); ODesignView(ODesignView&); @@ -108,7 +108,7 @@ namespace rptui virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - ODesignView(Window* pParent, + ODesignView(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&, OReportController& _rController); virtual ~ODesignView(); @@ -123,13 +123,13 @@ namespace rptui virtual void initialize(); - inline OReportController& getController() const { return m_rReportController; } + inline OReportController& getController() const { return m_rReportController; } - void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - USHORT GetInsertObj() const; + void SetMode( DlgEdMode m_eMode ); + void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + USHORT GetInsertObj() const; rtl::OUString GetInsertObjString() const; - DlgEdMode GetMode() const { return m_eMode; } + DlgEdMode GetMode() const { return m_eMode; } /** cuts the current selection in this section */ @@ -139,7 +139,7 @@ namespace rptui */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return <TRUE/> if paste is allowed */ @@ -163,59 +163,59 @@ namespace rptui void SelectAll(const sal_uInt16 _nObjectType); /// checks if a selection exists - BOOL HasSelection() const; + BOOL HasSelection() const; void UpdatePropertyBrowserDelayed(OSectionView& _rView); - USHORT getSectionCount() const; + USHORT getSectionCount() const; /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(USHORT _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry ,USHORT _nPosition = USHRT_MAX); inline Size getGridSizeCoarse() const { return m_aGridSizeCoarse; } inline Size getGridSizeFine() const { return m_aGridSizeFine; } - inline BOOL isGridSnap() const { return m_bGridSnap; } + inline BOOL isGridSnap() const { return m_bGridSnap; } void setGridSnap(BOOL bOn); void setDragStripes(BOOL bOn); /** turns the grid on or off * * \param _bGridVisible */ - void toggleGrid(sal_Bool _bGridVisible); + void toggleGrid(sal_Bool _bGridVisible); - void togglePropertyBrowser(sal_Bool _bToogleOn); + void togglePropertyBrowser(sal_Bool _bToogleOn); - BOOL isAddFieldVisible() const; - void toggleAddField(); + BOOL isAddFieldVisible() const; + void toggleAddField(); - BOOL isReportExplorerVisible() const; - void toggleReportExplorer(); + BOOL isReportExplorerVisible() const; + void toggleReportExplorer(); /** shows or hides the ruler. */ - void showRuler(sal_Bool _bShow); + void showRuler(sal_Bool _bShow); /** unmark all objects on the views without the given one. * * @param _pSectionView The view where the objects should not be unmarked. */ - void unmarkAllObjects(OSectionView* _pSectionView); + void unmarkAllObjects(OSectionView* _pSectionView); /** triggers the property browser with the section - @param _xReportComponent the report component + @param _xReportComponent the report component */ - void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); + void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); ::com::sun::star::uno::Any getCurrentlyShownProperty() const; /** returns the current section or the detail section if no section was selected previously @@ -247,17 +247,17 @@ namespace rptui void setCurrentPage(const ::rtl::OUString& _sLastActivePage); /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); - + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + /** set the section as marked or not marked - @param _pSectionView the section where to set the marked flag - @param _bMark the marked flag + @param _pSectionView the section where to set the marked flag + @param _bMark the marked flag */ - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); /** returns if the view handles the event by itself * @@ -287,7 +287,7 @@ namespace rptui sal_uInt16 getZoomFactor(SvxZoomType _eType) const; }; //================================================================== -} //rptui +} //rptui //================================================================== #endif // RPTUI_DESIGNVIEW_HXX diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx index 7c435e94d35e..7c3d3205adea 100644 --- a/reportdesign/source/ui/inc/EndMarker.hxx +++ b/reportdesign/source/ui/inc/EndMarker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace rptui // windows virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); }; } #endif // RPTUI_ENDMARKER_HXX diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx index 7a9916e5a499..858aa54a78de 100644 --- a/reportdesign/source/ui/inc/FixedTextColor.hxx +++ b/reportdesign/source/ui/inc/FixedTextColor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx index 4c2038e8e6a3..fac75dd65c8c 100644 --- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx +++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index da5471fbce52..c4cc37087242 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class FormulaDialog : public formula::FormulaModalDialog, { ::boost::shared_ptr< formula::IFunctionManager > m_aFunctionManager; formula::FormEditData* m_pFormulaData; - OAddFieldWindow* m_pAddField; + OAddFieldWindow* m_pAddField; ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > m_xRowSet; ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFormulaParser> m_xParser; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; @@ -74,7 +74,7 @@ public: virtual void fill(); virtual bool calculateValue(const String& _sExpression,String& _rResult); virtual void doClose(BOOL _bOk); - virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); + virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); virtual void showReference(const String& _sFormula); virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked); virtual void setDispatcherLock( BOOL bLock ); @@ -102,7 +102,7 @@ public: virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); protected: - void HighlightFunctionParas(const String& aFormula); + void HighlightFunctionParas(const String& aFormula); }; // ============================================================================= diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 743cd1a755b6..207977fc46e1 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index e6d5d51a4485..4c1b18ee5ebf 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,9 +140,9 @@ namespace rptui /** clear the own properties like function and scope and send a notification * - * \param _aGuard - * \param _sOldFunctionName - * \param _sOldScope + * \param _aGuard + * \param _sOldFunctionName + * \param _sOldScope * \param _nOldDataFieldType */ void resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const ::rtl::OUString& _sOldFunctionName,const ::rtl::OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType); @@ -206,10 +206,10 @@ namespace rptui /** checks if the given function is a default function we know. * - * \param _xFunction - * \param _rDataField - * \param _rsDefaultFunctionName - * \return + * \param _xFunction + * \param _rDataField + * \param _rsDefaultFunctionName + * \return */ sal_Bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction ,::rtl::OUString& _rDataField @@ -222,7 +222,7 @@ namespace rptui /** creates a default functionof the _sFunction for the data field _sDataField * The new function will only be created if it didn't exist. - * + * * \param _aGuard Will be cleared, when a new function was created. * \param _sFunction The name of the function. * \param _sDataField The name of the data field. diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 84178a76feaa..d7e819e7348e 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,49 +64,49 @@ class OReportController; |* \************************************************************************/ -class OGroupsSortingDialog : public FloatingWindow - , public ::cppu::BaseMutex - , public ::comphelper::OPropertyChangeListener +class OGroupsSortingDialog : public FloatingWindow + , public ::cppu::BaseMutex + , public ::comphelper::OPropertyChangeListener ,public dbaui::OToolBoxHelper ,public vcl::IImageListProvider { friend class OFieldExpressionControl; - FixedLine m_aFL2; - FixedText m_aMove; -//BTN ImageButton m_aPB_Up; -//BTN ImageButton m_aPB_Down; -//BTN ImageButton m_aPB_Delete; + FixedLine m_aFL2; + FixedText m_aMove; +//BTN ImageButton m_aPB_Up; +//BTN ImageButton m_aPB_Down; +//BTN ImageButton m_aPB_Delete; ToolBox m_aToolBox; - FixedLine m_aFL3; - FixedText m_aOrder; - ListBox m_aOrderLst; - FixedText m_aHeader; - ListBox m_aHeaderLst; - FixedText m_aFooter; - ListBox m_aFooterLst; - FixedText m_aGroupOn; - ListBox m_aGroupOnLst; - FixedText m_aGroupInterval; - NumericField m_aGroupIntervalEd; - FixedText m_aKeepTogether; - ListBox m_aKeepTogetherLst; - FixedLine m_aFL; - FixedText m_aHelpWindow; - - OFieldExpressionControl* m_pFieldExpression; - ::rptui::OReportController* m_pController; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pCurrentGroupListener; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups> m_xGroups; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - sal_Bool m_bReadOnly; + FixedLine m_aFL3; + FixedText m_aOrder; + ListBox m_aOrderLst; + FixedText m_aHeader; + ListBox m_aHeaderLst; + FixedText m_aFooter; + ListBox m_aFooterLst; + FixedText m_aGroupOn; + ListBox m_aGroupOnLst; + FixedText m_aGroupInterval; + NumericField m_aGroupIntervalEd; + FixedText m_aKeepTogether; + ListBox m_aKeepTogetherLst; + FixedLine m_aFL; + FixedText m_aHelpWindow; + + OFieldExpressionControl* m_pFieldExpression; + ::rptui::OReportController* m_pController; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pCurrentGroupListener; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups> m_xGroups; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; + sal_Bool m_bReadOnly; private: DECL_LINK( OnControlFocusLost, Control* ); DECL_LINK( OnControlFocusGot, Control* ); DECL_LINK( LBChangeHdl, ListBox* ); -//BTN DECL_LINK( ClickHdl, ImageButton* ); +//BTN DECL_LINK( ClickHdl, ImageButton* ); DECL_LINK( OnFormatAction, ToolBox* ); /** returns the groups @@ -114,19 +114,19 @@ private: */ ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups>& getGroups() { return m_xGroups; } - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> getGroup(sal_Int32 _nPos) - { + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> getGroup(sal_Int32 _nPos) + { OSL_ENSURE(_nPos >= 0 && _nPos < m_xGroups->getCount(),"Invalid count!"); return ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>(m_xGroups->getByIndex(_nPos),::com::sun::star::uno::UNO_QUERY); } /** updates the listboxes with the new group properties - @param _nRow the new group pos + @param _nRow the new group pos */ void DisplayData( sal_Int32 _nRow ); /** saves the values from the listboxes into the group at position _nRow - @param _nRow the group pos to store in + @param _nRow the group pos to store in */ void SaveData( sal_Int32 _nRow ); @@ -140,20 +140,20 @@ private: sal_Int32 getColumnDataType(const ::rtl::OUString& _sColumnName); /** shows the text given by the id in the multiline edit - @param _nResId the string id + @param _nResId the string id */ void showHelpText(USHORT _nResId); /** display the group props - @param _xGroup the group to display + @param _xGroup the group to display */ void displayGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup); /** enables or diables the up and down button - @param _nRow the row which will be active + @param _nRow the row which will be active */ void checkButtons(sal_Int32 _nRow); - /** clears the m_xColumns member and reset the fields + /** clears the m_xColumns member and reset the fields * */ void fillColumns(); @@ -161,9 +161,9 @@ private: void operator =(OGroupsSortingDialog&); protected: // window - virtual void Resize(); + virtual void Resize(); // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); + virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); public: OGroupsSortingDialog( Window* pParent ,sal_Bool _bReadOnly @@ -171,7 +171,7 @@ public: virtual ~OGroupsSortingDialog(); /** sets the newe columns at the groups dialog. - @param _xColumns the new columns + @param _xColumns the new columns */ void setColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xColumns); @@ -180,15 +180,15 @@ public: void UpdateData( ); /** will be called when the controls need to be resized. - @param _rDiff + @param _rDiff Contains the difference of the old and new toolbox size. */ virtual void resizeControls(const Size& _rDiff); /** will be called when the image list is needed. - @param _eSymbolsSize + @param _eSymbolsSize <svtools/imgdef.hxx> - @param _bHiContast + @param _bHiContast <TRUE/> when in high contrast mode. */ virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const; diff --git a/reportdesign/source/ui/inc/IReportControllerObserver.hxx b/reportdesign/source/ui/inc/IReportControllerObserver.hxx index 09d76f9769b4..26b1d7d9c977 100644 --- a/reportdesign/source/ui/inc/IReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/IReportControllerObserver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +40,9 @@ namespace rptui protected: // IReportControllerObserver(){} virtual ~IReportControllerObserver() {} - + public: - + virtual void notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) = 0; virtual void notifyElementInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) = 0; virtual void handle( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) = 0; diff --git a/reportdesign/source/ui/inc/InsertFunctions.hxx b/reportdesign/source/ui/inc/InsertFunctions.hxx index 802a6b993850..ff55d62151c8 100644 --- a/reportdesign/source/ui/inc/InsertFunctions.hxx +++ b/reportdesign/source/ui/inc/InsertFunctions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,6 +41,6 @@ namespace rptui // --------- } // namespace rptui // --------- -#endif // RPT_INSERTFUNCTIONS_HXX_INCLUDED +#endif // RPT_INSERTFUNCTIONS_HXX_INCLUDED /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx index a879e7053d2a..126693d2deaa 100644 --- a/reportdesign/source/ui/inc/MarkedSection.hxx +++ b/reportdesign/source/ui/inc/MarkedSection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptui PREVIOUS = -1, POST = 1 }; - + class IMarkedSection { public: @@ -55,7 +55,7 @@ namespace rptui */ virtual void markSection(const sal_uInt16 _nPos) = 0; }; - + } // rptui #endif /* RPTUI_MARKEDSECTION_HXX */ diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx index 05cb003b85f0..8ddcb0c65524 100644 --- a/reportdesign/source/ui/inc/Navigator.hxx +++ b/reportdesign/source/ui/inc/Navigator.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +37,7 @@ namespace rptui class ONavigatorImpl; class ONavigator : public FloatingWindow { - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::std::auto_ptr<ONavigatorImpl> m_pImpl; ONavigator(const ONavigator&); void operator =(const ONavigator&); @@ -47,7 +47,7 @@ namespace rptui virtual ~ONavigator(); // window - virtual void Resize(); + virtual void Resize(); virtual void GetFocus(); }; // ============================================================================= diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index e42530dd22a8..65d4f4f3c23d 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,28 +44,28 @@ class OReportController; |* Groups and Sorting dialog |* \************************************************************************/ -class OPageNumberDialog : public ModalDialog +class OPageNumberDialog : public ModalDialog { - FixedLine m_aFormat; - RadioButton m_aPageN; - RadioButton m_aPageNofM; + FixedLine m_aFormat; + RadioButton m_aPageN; + RadioButton m_aPageNofM; - FixedLine m_aPosition; - RadioButton m_aTopPage; - RadioButton m_aBottomPage; - FixedLine m_aMisc; - FixedText m_aAlignment; - ListBox m_aAlignmentLst; + FixedLine m_aPosition; + RadioButton m_aTopPage; + RadioButton m_aBottomPage; + FixedLine m_aMisc; + FixedText m_aAlignment; + ListBox m_aAlignmentLst; - CheckBox m_aShowNumberOnFirstPage; - FixedLine m_aFl1; - OKButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_Help; + CheckBox m_aShowNumberOnFirstPage; + FixedLine m_aFl1; + OKButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_Help; - ::rptui::OReportController* m_pController; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> + ::rptui::OReportController* m_pController; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> m_xHoldAlive; OPageNumberDialog(const OPageNumberDialog&); @@ -75,7 +75,7 @@ public: ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~OPageNumberDialog(); - virtual short Execute(); + virtual short Execute(); }; // ============================================================================= } // namespace rptui diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index c2b1929e1612..415903019773 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ namespace rptui ReportComponentHandler(ReportComponentHandler &); // not defined void operator =(ReportComponentHandler &); // not defined - + // overload WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index c55e32cb2dd5..1d5eb6488af7 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,55 +79,55 @@ namespace rptui class OAddFieldWindow; class OSectionWindow; - typedef ::dbaui::OSingleDocumentController OReportController_BASE; - typedef ::cppu::ImplHelper5 < ::com::sun::star::container::XContainerListener + typedef ::dbaui::OSingleDocumentController OReportController_BASE; + typedef ::cppu::ImplHelper5 < ::com::sun::star::container::XContainerListener , ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::view::XSelectionSupplier - , ::com::sun::star::util::XModeSelector - , ::com::sun::star::embed::XVisualObject - > OReportController_Listener; + , ::com::sun::star::util::XModeSelector + , ::com::sun::star::embed::XVisualObject + > OReportController_Listener; - class OReportController : public OReportController_BASE + class OReportController : public OReportController_BASE ,public OReportController_Listener ,public SfxListener ,public ::comphelper::OPropertyStateContainer ,public ::comphelper::OPropertyArrayUsageHelper < OReportController_BASE > { private: - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::cppu::OInterfaceContainerHelper m_aSelectionListeners; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aCollapsedSections; - TransferableDataHelper m_aSystemClipboard; // content of the clipboard + TransferableDataHelper m_aSystemClipboard; // content of the clipboard TransferableClipboardListener* - m_pClipbordNotifier; /// notifier for changes in the clipboard - OGroupsSortingDialog* m_pGroupsFloater; + m_pClipbordNotifier; /// notifier for changes in the clipboard + OGroupsSortingDialog* m_pGroupsFloater; OXReportControllerObserver* m_pReportControllerObserver; ODesignView* getDesignView() const { return static_cast< ODesignView* >( getView() ); } - + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> m_xReportDefinition; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportEngine> m_xReportEngine; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XComponentLoader> m_xFrameLoader; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > m_xRowSetMediator; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the report's NumberFormatsSupplier - mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xHoldAlive; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the report's NumberFormatsSupplier + mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xHoldAlive; mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - ::com::sun::star::awt::Size m_aVisualAreaSize; + ::com::sun::star::awt::Size m_aVisualAreaSize; - ::boost::shared_ptr<rptui::OReportModel> + ::boost::shared_ptr<rptui::OReportModel> m_aReportModel; - ::rtl::OUString m_sName; /// name for the report definition + ::rtl::OUString m_sName; /// name for the report definition ::rtl::OUString m_sLastActivePage; /// last active property browser page - ::rtl::OUString m_sMode; /// the current mode of the controller - sal_Int32 m_nSplitPos; /// the position of the splitter + ::rtl::OUString m_sMode; /// the current mode of the controller + sal_Int32 m_nSplitPos; /// the position of the splitter sal_Int32 m_nPageNum; /// the page number from the restoreView call sal_Int32 m_nSelectionCount; - ::sal_Int64 m_nAspect; + ::sal_Int64 m_nAspect; sal_Int16 m_nZoomValue; SvxZoomType m_eZoomType; sal_Bool m_bShowRuler; @@ -142,7 +142,7 @@ namespace rptui /** creates a formatted field in the given section with the given formula as data field * - * \param _aArgs + * \param _aArgs * \param _xSection the section where to create the formatted field * \param _sFunction the function which will be set at the data field. */ @@ -161,7 +161,7 @@ namespace rptui /** append a new group or remove it with undo. * - * \param _bAppend + * \param _bAppend * \param _aArgs The args which contains a element named PROPERTY_GROUP of type report::XGroup. */ void modifyGroup(const bool _bAppend, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); @@ -176,7 +176,7 @@ namespace rptui /** add or remove me as listener at the report definition * - * \param _bAdd + * \param _bAdd */ void listen(const bool _bAdd); @@ -197,17 +197,17 @@ namespace rptui sal_Int32 getGroupPosition(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup); /** calls propertyChanged when the header or footer is really turned on. - @param _rEvent the group - @param _bShow when <TRUE/> the header and footer will be shown otherwise not + @param _rEvent the group + @param _bShow when <TRUE/> the header and footer will be shown otherwise not */ void notifyGroupSections(const ::com::sun::star::container::ContainerEvent& _rEvent ,bool _bShow); /** change the sections for a group - @param _sPropName the header or footer - @param _xGroup the group - @param _nGroupPos the position of the group inside the groups collection or the previous index when it was removed - @param _bShow when <TRUE/> the header and footer will be shown otherwise not + @param _sPropName the header or footer + @param _xGroup the group + @param _nGroupPos the position of the group inside the groups collection or the previous index when it was removed + @param _bShow when <TRUE/> the header and footer will be shown otherwise not */ void groupChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup ,const ::rtl::OUString& _sPropName @@ -224,14 +224,14 @@ namespace rptui void shrinkSectionBottom(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection); void shrinkSectionTop(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection); public: - + void shrinkSection(USHORT _nUndoStrId, ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection, sal_Int32 _nShrinkId); - /** opens the file open dialog to allow the user to select a image which will be + /** opens the file open dialog to allow the user to select a image which will be * bound to a newly created image button. */ void insertGraphic(); - + /** resets the floater */ void updateFloater(); @@ -244,7 +244,7 @@ namespace rptui /** inserts a label - field pair into the current selected section * - * \param aArgs + * \param aArgs */ void addPairControls(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs); @@ -256,7 +256,7 @@ namespace rptui /** creates a formatted filed with TODAY() function and if set also an NOW() function * - * \param _aArgs + * \param _aArgs */ void createDateTime(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); @@ -308,7 +308,7 @@ namespace rptui void createDefaultControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aArgs); /** fills the state for the feture request. - @param _sProperty the property which should be filled in the value + @param _sProperty the property which should be filled in the value @param _rState the state to fill */ void impl_fillState_nothrow(const ::rtl::OUString& _sProperty,dbaui::FeatureState& _rState) const; @@ -328,9 +328,9 @@ namespace rptui DECL_LINK( OnOpenHelpAgent, void* ); short saveModified(); // 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 dbaui::FeatureState GetState(sal_uInt16 nId) const; + virtual dbaui::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); @@ -338,7 +338,7 @@ namespace rptui virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); - + virtual ~OReportController(); public: OReportController(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & the_context); @@ -355,26 +355,26 @@ namespace rptui 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(); /** returns <TRUE/> when the command is enbaled - @param _nCommand the command id - @param _xControlFormat the report control format + @param _nCommand the command id + @param _xControlFormat the report control format */ - sal_Bool isFormatCommandEnabled(sal_uInt16 _nCommand + sal_Bool isFormatCommandEnabled(sal_uInt16 _nCommand ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat) const; - - virtual sal_Bool Construct(Window* pParent); + + 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); @@ -430,10 +430,10 @@ namespace rptui /** returns the current position of the splitter * - * \return + * \return */ - inline sal_Int32 getSplitPos() const { return m_nSplitPos;} - inline void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} + inline sal_Int32 getSplitPos() const { return m_nSplitPos;} + inline void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} /** creates a new report from the report definition. * @@ -450,11 +450,11 @@ namespace rptui /** returns the number formatter */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getReportNumberFormatter() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getReportNumberFormatter() const; /** return the SdrModel of the real model * - * \return + * \return */ ::boost::shared_ptr<rptui::OReportModel> getSdrModel(); diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index 8c3d827110ba..378a599136e5 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ namespace rptui //======================================================================== class /* REPORTDESIGN_DLLPUBLIC */ OXReportControllerObserver - : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XModifyListener + : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener + , ::com::sun::star::container::XContainerListener + , ::com::sun::star::util::XModifyListener > /*,public SfxListener*/ { @@ -120,11 +120,11 @@ namespace rptui // void ModeChanged(); // will be called from 'Notify' DECL_LINK(SettingsChanged, VclWindowEvent* ); private: - + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const; - + }; - + } // namespace rptui #endif /* INCLUDED_REPORTCONTROLLEROBSERVER_HXX */ diff --git a/reportdesign/source/ui/inc/ReportDefines.hxx b/reportdesign/source/ui/inc/ReportDefines.hxx index 0e45ca91c418..6fc274f1e276 100644 --- a/reportdesign/source/ui/inc/ReportDefines.hxx +++ b/reportdesign/source/ui/inc/ReportDefines.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +32,9 @@ namespace rptui { enum DlgEdMode { RPTUI_INSERT, RPTUI_SELECT, RPTUI_TEST, RPTUI_READONLY }; -#define REPORT_STARTMARKER_WIDTH 120 -#define REPORT_ENDMARKER_WIDTH 10 -#define REPORT_EXTRA_SPACE 10 +#define REPORT_STARTMARKER_WIDTH 120 +#define REPORT_ENDMARKER_WIDTH 10 +#define REPORT_EXTRA_SPACE 10 } #endif //RPTUI_REPORT_DEFINES_HXX diff --git a/reportdesign/source/ui/inc/ReportRuler.hxx b/reportdesign/source/ui/inc/ReportRuler.hxx index 97962a336ee5..fd78308a5408 100644 --- a/reportdesign/source/ui/inc/ReportRuler.hxx +++ b/reportdesign/source/ui/inc/ReportRuler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptui class OReportWindow; class OReportRuler : public Window { - OReportSection* m_pSection; - OReportWindow* m_pParent; - sal_Bool m_bShow; + OReportSection* m_pSection; + OReportWindow* m_pParent; + sal_Bool m_bShow; OReportRuler(OReportRuler&); void operator =(OReportRuler&); public: @@ -49,8 +49,8 @@ namespace rptui // windows overloads virtual void Resize(); - inline OReportSection* getSection() const { return m_pSection; } - inline OReportWindow* getView() const { return m_pParent; } + inline OReportSection* getSection() const { return m_pSection; } + inline OReportWindow* getView() const { return m_pParent; } /** makes the grid visible * diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index e8f64642afc6..f7a09c7e1925 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptui { - class OReportModel; - class OReportPage; - class OSectionView; - class OSectionWindow; - - class OReportSection : public Window - , public ::cppu::BaseMutex - , public ::comphelper::OPropertyChangeListener + class OReportModel; + class OReportPage; + class OSectionView; + class OSectionWindow; + + class OReportSection : public Window + , public ::cppu::BaseMutex + , public ::comphelper::OPropertyChangeListener , public DropTargetHelper { - OReportPage* m_pPage; - OSectionView* m_pView; - OSectionWindow* m_pParent; - ::std::auto_ptr<DlgEdFunc> m_pFunc; + OReportPage* m_pPage; + OSectionView* m_pView; + OSectionWindow* m_pParent; + ::std::auto_ptr<DlgEdFunc> m_pFunc; ::boost::shared_ptr<OReportModel> m_pModel; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pMulti; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pMulti; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - - DlgEdMode m_eMode; - BOOL m_bDialogModelChanged; - sal_Bool m_bInDrag; + + DlgEdMode m_eMode; + BOOL m_bDialogModelChanged; + sal_Bool m_bInDrag; /** fills the section with all control from the report section */ @@ -73,24 +73,24 @@ namespace rptui void operator =(OReportSection&); protected: // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); - + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); + // window overrides virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Resize(); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void Resize(); // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); + virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); public: OReportSection(OSectionWindow* _pParent,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); virtual ~OReportSection(); // window overrides - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); /** copies the current selection in this section @param _rAllreadyCopiedObjects This is an out/in put param which contains all already copied objects. @@ -120,21 +120,21 @@ namespace rptui */ void SetGridVisible(BOOL _bVisible); - inline OSectionWindow* getSectionWindow() const { return m_pParent; } - inline OSectionView& getSectionView() const { return *m_pView; } - inline OReportPage* getPage() const { return m_pPage; } + inline OSectionWindow* getSectionWindow() const { return m_pParent; } + inline OSectionView& getSectionView() const { return *m_pView; } + inline OReportPage* getPage() const { return m_pPage; } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; } - void SetDialogModelChanged( BOOL bChanged = TRUE ) { m_bDialogModelChanged = bChanged; } - BOOL IsDialogModelChanged() const { return m_bDialogModelChanged; } - DlgEdMode GetMode() const { return m_eMode; } - void SetMode( DlgEdMode m_eMode ); + void SetDialogModelChanged( BOOL bChanged = TRUE ) { m_bDialogModelChanged = bChanged; } + BOOL IsDialogModelChanged() const { return m_bDialogModelChanged; } + DlgEdMode GetMode() const { return m_eMode; } + void SetMode( DlgEdMode m_eMode ); /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** returns the current control report model or <NULL/> */ @@ -153,8 +153,8 @@ namespace rptui /** creates a new default custom shape * - * \param _sType - * \param _pObj + * \param _sType + * \param _pObj */ void createDefault(const ::rtl::OUString& _sType,SdrObject* _pObj); void stopScrollTimer(); @@ -168,7 +168,7 @@ namespace rptui bool isUiActive() const; }; //================================================================== -} //rptui +} //rptui //================================================================== #endif // REPORT_REPORTSECTION_HXX diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 11af785dc6a7..573f92023dcc 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,20 +55,20 @@ namespace rptui class DlgEdFunc; class DlgEdFactory; - class OReportWindow : public Window, public IMarkedSection + class OReportWindow : public Window, public IMarkedSection { - Ruler m_aHRuler; - ODesignView* m_pView; - OScrollWindowHelper* m_pParent; - OViewsWindow m_aViewsWindow; - ::std::auto_ptr<DlgEdFactory> + Ruler m_aHRuler; + ODesignView* m_pView; + OScrollWindowHelper* m_pParent; + OViewsWindow m_aViewsWindow; + ::std::auto_ptr<DlgEdFactory> m_pObjFac; - + void ImplInitSettings(); - + sal_Int32 GetTotalHeight() const; sal_Int32 impl_getRealPixelWidth() const; - + OReportWindow(OReportWindow&); void operator =(OReportWindow&); protected: @@ -83,11 +83,11 @@ namespace rptui // WINDOW overloads virtual void Resize(); - inline ODesignView* getReportView() const { return m_pView; } - inline OScrollWindowHelper* getScrollWindow() const { return m_pParent; } + inline ODesignView* getReportView() const { return m_pView; } + inline OScrollWindowHelper* getScrollWindow() const { return m_pParent; } - void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + void SetMode( DlgEdMode m_eMode ); + void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); rtl::OUString GetInsertObjString() const; void setGridSnap(BOOL bOn); void setDragStripes(BOOL bOn); @@ -96,7 +96,7 @@ namespace rptui */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return <TRUE/> if paste is allowed */ @@ -119,76 +119,76 @@ namespace rptui */ BOOL HasSelection() const; - Point getThumbPos() const; + Point getThumbPos() const; /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(USHORT _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry ,USHORT _nPosition = USHRT_MAX); - USHORT getSectionCount() const; + USHORT getSectionCount() const; /** turns the grid on or off * * \param _bVisible */ - void toggleGrid(sal_Bool _bVisible); + void toggleGrid(sal_Bool _bVisible); /** shows the ruler */ - void showRuler(sal_Bool _bShow); + void showRuler(sal_Bool _bShow); inline sal_Int32 getRulerHeight() const { return m_aHRuler.GetSizePixel().Height(); } /** returns the total width of the first section */ - sal_Int32 GetTotalWidth() const; + sal_Int32 GetTotalWidth() const; /** calculate the max width of the markers * - * @param _bWithEnd if <TRUE/> the end marker will be used for calculation as well otherwise not. + * @param _bWithEnd if <TRUE/> the end marker will be used for calculation as well otherwise not. * \return the max width */ - sal_Int32 getMaxMarkerWidth(sal_Bool _bWithEnd) const; + sal_Int32 getMaxMarkerWidth(sal_Bool _bWithEnd) const; - void ScrollChildren(const Point& _aThumbPos); + void ScrollChildren(const Point& _aThumbPos); - void notifySizeChanged(); + void notifySizeChanged(); /** unmark all objects on the views without the given one. * * @param _pSectionView The view where the objects should not be unmarked. */ - void unmarkAllObjects(OSectionView* _pSectionView); + void unmarkAllObjects(OSectionView* _pSectionView); /** triggers the property browser with the report component or section - @param _xReportComponent + @param _xReportComponent */ - void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xReportComponent); + void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xReportComponent); /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** the the section as marked or not marked - @param _pSectionView the section where to set the marked flag - @param _bMark the marked flag + @param _pSectionView the section where to set the marked flag + @param _bMark the marked flag */ - void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); + void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); // IMarkedSection ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const; @@ -207,12 +207,12 @@ namespace rptui * \param _aCollpasedSections The position of the sections which should be collapsed. */ void collapseSections(const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections); - + /** align all marked objects in all sections * - * \param eHor - * \param eVert - * \param bBoundRects + * \param eHor + * \param eVert + * \param bBoundRects */ void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false); @@ -233,7 +233,7 @@ namespace rptui sal_uInt16 getZoomFactor(SvxZoomType _eType) const; }; //================================================================== -} //rptui +} //rptui //================================================================== #endif // RPTUI_REPORT_WINDOW_HXX diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index ecb117488bd4..8a74946d591e 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/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 @@ -43,7 +43,7 @@ class SdrView; namespace rptui -{ +{ class ODesignView; class OReportWindow; class OSectionView; @@ -54,18 +54,18 @@ namespace rptui the h-ruler and the sections, and end marker. Not the start marker. */ typedef Window OScrollWindowHelper_BASE; - class OScrollWindowHelper : public ::cppu::BaseMutex + class OScrollWindowHelper : public ::cppu::BaseMutex , public OScrollWindowHelper_BASE/*TabPage*/ - , public ::comphelper::OPropertyChangeListener + , public ::comphelper::OPropertyChangeListener , public IMarkedSection { - private: - ScrollBar m_aHScroll; - ScrollBar m_aVScroll; - ScrollBarBox m_aCornerWin; // window in the bottom right corner - Size m_aTotalPixelSize; - ODesignView* m_pParent; - OReportWindow m_aReportWindow; + private: + ScrollBar m_aHScroll; + ScrollBar m_aVScroll; + ScrollBarBox m_aCornerWin; // window in the bottom right corner + Size m_aTotalPixelSize; + ODesignView* m_pParent; + OReportWindow m_aReportWindow; ::rtl::Reference<comphelper::OPropertyChangeMultiplexer > m_pReportDefintionMultiPlexer; // listener for property changes @@ -79,28 +79,28 @@ namespace rptui protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); // window - virtual void Resize(); + virtual void Resize(); virtual long Notify( NotifyEvent& rNEvt ); // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); + virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); public: OScrollWindowHelper( ODesignView* _pReportDesignView); virtual ~OScrollWindowHelper(); /** late ctor */ - void initialize(); + void initialize(); - inline Point getThumbPos() const { return Point(m_aHScroll.GetThumbPos(),m_aVScroll.GetThumbPos())/*m_aScrollOffset*/; } - inline const OReportWindow& getReportWindow() const { return m_aReportWindow; } - void setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight); - inline Size getTotalSize() const { return m_aTotalPixelSize; } - inline ScrollBar* GetHScroll() { return &m_aHScroll; } - inline ScrollBar* GetVScroll() { return &m_aVScroll; } + inline Point getThumbPos() const { return Point(m_aHScroll.GetThumbPos(),m_aVScroll.GetThumbPos())/*m_aScrollOffset*/; } + inline const OReportWindow& getReportWindow() const { return m_aReportWindow; } + void setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight); + inline Size getTotalSize() const { return m_aTotalPixelSize; } + inline ScrollBar* GetHScroll() { return &m_aHScroll; } + inline ScrollBar* GetVScroll() { return &m_aVScroll; } // forwards - void SetMode( DlgEdMode _eMode ); - void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + void SetMode( DlgEdMode _eMode ); + void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); rtl::OUString GetInsertObjString() const; void setGridSnap(BOOL bOn); void setDragStripes(BOOL bOn); @@ -108,7 +108,7 @@ namespace rptui */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return <TRUE/> if paste is allowed */ @@ -135,55 +135,55 @@ namespace rptui * * \param _nPosition Zero based. */ - void removeSection(USHORT _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry ,USHORT _nPosition = USHRT_MAX); - USHORT getSectionCount() const; + USHORT getSectionCount() const; /** turns the grid on or off * * \param _bVisible */ - void toggleGrid(sal_Bool _bVisible); + void toggleGrid(sal_Bool _bVisible); /** unmark all objects on the views without the given one. * * @param _pSectionView The view where the objects should not be unmarked. */ - void unmarkAllObjects(OSectionView* _pSectionView); + void unmarkAllObjects(OSectionView* _pSectionView); /** shows or hides the ruler. */ - void showRuler(sal_Bool _bShow); - + void showRuler(sal_Bool _bShow); + /** calculate the max width of the markers * - * @param _bWithEnd if <TRUE/> the end marker will be used for calculation as well otherwise not. + * @param _bWithEnd if <TRUE/> the end marker will be used for calculation as well otherwise not. * \return the max width */ - sal_Int32 getMaxMarkerWidth(sal_Bool _bWithEnd) const; + sal_Int32 getMaxMarkerWidth(sal_Bool _bWithEnd) const; /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** the the section as marked or not marked - @param _pSectionView the section where to set the marked flag - @param _bMark the marked flag + @param _pSectionView the section where to set the marked flag + @param _bMark the marked flag */ - void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); - + void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); + // IMarkedSection ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const; ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; @@ -204,9 +204,9 @@ namespace rptui /** align all marked objects in all sections * - * \param eHor - * \param eVert - * \param bBoundRects + * \param eHor + * \param eVert + * \param bBoundRects */ void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false); diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx index 63424dfc38a2..6014aceb90fa 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class OReportSection; class OSectionView : public SdrView { private: - OReportWindow* m_pReportWindow; - OReportSection* m_pSectionWindow; + OReportWindow* m_pReportWindow; + OReportSection* m_pSectionWindow; void ObjectRemovedInAliveMode( const SdrObject* pObject ); OSectionView(const OSectionView&); @@ -58,8 +58,8 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void MarkListHasChanged(); virtual void MakeVisible( const Rectangle& rRect, Window& rWin ); - - inline OReportSection* getReportSection() const { return m_pSectionWindow; } + + inline OReportSection* getReportSection() const { return m_pSectionWindow; } // switch the marked objects to the given layer. void SetMarkedToLayer( SdrLayerID nLayerNo ); diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index 637b245097fd..7acbc96da8d6 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +55,8 @@ namespace rptui class ODesignView; class OViewsWindow; class OSectionWindow : public Window - , public ::cppu::BaseMutex - , public ::comphelper::OPropertyChangeListener + , public ::cppu::BaseMutex + , public ::comphelper::OPropertyChangeListener { OViewsWindow* m_pParent; OStartMarker m_aStartMarker; @@ -72,20 +72,20 @@ namespace rptui /** set the title of the group header or footer * - * \param _xGroup - * \param _nResId - * \param _pGetSection - * \param _pIsSectionOn + * \param _xGroup + * \param _nResId + * \param _pGetSection + * \param _pIsSectionOn * @return TRUE when title was set otherwise FALSE */ bool setGroupSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup,USHORT _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OGroupHelper> _pIsSectionOn); /** set the title of the (report/page) header or footer * - * \param _xGroup - * \param _nResId - * \param _pGetSection - * \param _pIsSectionOn + * \param _xGroup + * \param _nResId + * \param _pGetSection + * \param _pIsSectionOn * @return TRUE when title was set otherwise FALSE */ bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,USHORT _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OReportHelper> _pIsSectionOn); @@ -100,9 +100,9 @@ namespace rptui virtual void DataChanged( const DataChangedEvent& rDCEvt ); // windows overload virtual void Resize(); - + protected: - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); + virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); public: OSectionWindow( OViewsWindow* _pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection @@ -114,17 +114,17 @@ namespace rptui inline OEndMarker& getEndMarker() { return m_aEndMarker; } inline OViewsWindow* getViewsWindow() { return m_pParent; } - void setCollapsed(sal_Bool _bCollapsed); + void setCollapsed(sal_Bool _bCollapsed); /** triggers the property browser with the section - @param _pStartMarker + @param _pStartMarker */ - void showProperties(); + void showProperties(); /** set the marker as marked or not marked - @param _bMark set the new state of the marker + @param _bMark set the new state of the marker */ - void setMarked(sal_Bool _bMark); + void setMarked(sal_Bool _bMark); OViewsWindow* getViewsWindow() const { return m_pParent; } diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index 50d4311d9ed4..d902d004f6c4 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,18 +39,18 @@ namespace rptui class OSectionWindow; class OStartMarker : public OColorListener { - - Ruler m_aVRuler; + + Ruler m_aVRuler; FixedText m_aText; FixedImage m_aImage; - OSectionWindow* m_pParent; - static Image* s_pDefCollapsed; - static Image* s_pDefExpanded; - static Image* s_pDefCollapsedHC; - static Image* s_pDefExpandedHC; - static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed + OSectionWindow* m_pParent; + static Image* s_pDefCollapsed; + static Image* s_pDefExpanded; + static Image* s_pDefCollapsedHC; + static Image* s_pDefExpandedHC; + static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed - sal_Bool m_bShowRuler; + sal_Bool m_bShowRuler; void changeImage(); void initDefaultNodeImages(); @@ -66,19 +66,19 @@ namespace rptui virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint); // window overloads virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Resize(); + virtual void RequestHelp( const HelpEvent& rHEvt ); using Window::Notify; - void setTitle(const String& _sTitle); - sal_Int32 getMinHeight() const; + void setTitle(const String& _sTitle); + sal_Int32 getMinHeight() const; /** shows or hides the ruler. */ - void showRuler(sal_Bool _bShow); + void showRuler(sal_Bool _bShow); - virtual void setCollapsed(sal_Bool _bCollapsed); + virtual void setCollapsed(sal_Bool _bCollapsed); /** zoom the ruler and view windows */ diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 6e600c4307da..11e30e9d1add 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/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 @@ -54,16 +54,16 @@ namespace comphelper namespace rptui { /** returns the position of the object inside the index container - @param _xReportDefinition the report definition to get the groups - @param _xGroup the group to search + @param _xReportDefinition the report definition to get the groups + @param _xGroup the group to search @return returns the position of the group in the list, otherwise -1 */ - template<typename T> sal_Int32 getPositionInIndexAccess( + template<typename T> sal_Int32 getPositionInIndexAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _xCollection ,const ::com::sun::star::uno::Reference< T >& _xSearch) { sal_Int32 nCount = _xCollection->getCount(); - sal_Int32 i = (nCount == 0) ? -1 : 0; + sal_Int32 i = (nCount == 0) ? -1 : 0; for (;i<nCount ; ++i) { ::com::sun::star::uno::Reference< T > xObject(_xCollection->getByIndex(i),::com::sun::star::uno::UNO_QUERY); @@ -74,15 +74,15 @@ namespace rptui } /** set the name of the header and footer of the group by the expression appended by the localized name of the section - @param _xGroup the group where the header/footer name is set by the expression of the group + @param _xGroup the group where the header/footer name is set by the expression of the group */ void adjustSectionName(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup,sal_Int32 _nPos); /** add a listener for the properties size, left margin, right margin to the page style * - * \param _xReportDefinition - * \param _pListener - * \return + * \param _xReportDefinition + * \param _pListener + * \return */ ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition ,::comphelper::OPropertyChangeListener* _pListener); @@ -97,7 +97,7 @@ namespace rptui /** opens the area dialog for shapes */ - bool openAreaDialog( + bool openAreaDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XShape >& _xShape ,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _xWindow ); @@ -124,11 +124,11 @@ namespace rptui ); /** 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) @@ -141,8 +141,8 @@ namespace rptui /** checks whether the given rectangle overlapps another OUnoObject object in that view. * - * \param _rRect - * \param _rPage + * \param _rRect + * \param _rPage * \param _bAllObjects if <TRUE/> all objects are taken into account, otherwise only not marked ones * \return the object which is overlapped, otherwise <NULL/> */ @@ -152,9 +152,9 @@ namespace rptui /** checks whether the given OUnoObject object rectangle overlapps another object in that view. * - * \param _pObj - * \param _rPage - * \param _rView + * \param _pObj + * \param _rPage + * \param _rView * \param _bAllObjects if <TRUE/> all objects are taken into account, otherwise only not marked ones * \return the object which is overlapped, otherwise <NULL/>. If the given object is not of type OUnoObject <NULL/> will be returned. */ diff --git a/reportdesign/source/ui/inc/Undo.hxx b/reportdesign/source/ui/inc/Undo.hxx index 199ecd92c1f8..4e3a35e161aa 100644 --- a/reportdesign/source/ui/inc/Undo.hxx +++ b/reportdesign/source/ui/inc/Undo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 namespace rptui { class OObjectBase; - - + + /** \class OSectionUndo * Undo class for section add and remove. */ @@ -51,12 +51,12 @@ namespace rptui OSectionUndo(const OSectionUndo&); void operator =(const OSectionUndo&); protected: - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> > + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> > m_aControls; - ::std::vector< ::std::pair< ::rtl::OUString ,::com::sun::star::uno::Any> > + ::std::vector< ::std::pair< ::rtl::OUString ,::com::sun::star::uno::Any> > m_aValues; - Action m_eAction; - sal_uInt16 m_nSlot; + Action m_eAction; + sal_uInt16 m_nSlot; bool m_bInserted; virtual void implReInsert( ) = 0; @@ -65,21 +65,21 @@ namespace rptui void collectControls(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); public: TYPEINFO(); - OSectionUndo( OReportModel& rMod + OSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,Action _eAction ,USHORT nCommentID); virtual ~OSectionUndo(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; /** Undo action for the group header, footer, page header, footer */ class OReportSectionUndo : public OSectionUndo { - OReportHelper m_aReportHelper; + OReportHelper m_aReportHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OReportHelper> m_pMemberFunction; @@ -89,8 +89,8 @@ namespace rptui void operator =(const OReportSectionUndo&); public: TYPEINFO(); - //OReportSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - OReportSectionUndo( OReportModel& rMod + //OReportSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + OReportSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OReportHelper> _pMemberFunction @@ -104,7 +104,7 @@ namespace rptui */ class OGroupSectionUndo : public OSectionUndo { - OGroupHelper m_aGroupHelper; + OGroupHelper m_aGroupHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> m_pMemberFunction; @@ -116,8 +116,8 @@ namespace rptui void operator =(const OGroupSectionUndo&); public: TYPEINFO(); - //OGroupSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - OGroupSectionUndo( OReportModel& rMod + //OGroupSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + OGroupSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> _pMemberFunction @@ -125,7 +125,7 @@ namespace rptui ,Action _eAction ,USHORT nCommentID); - virtual String GetComment() const; + virtual String GetComment() const; }; /** /class OGroupUndo @@ -133,10 +133,10 @@ namespace rptui */ class OGroupUndo : public OCommentUndoAction { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> m_xGroup; ///<! the group for the undo redo action - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; ///<! the parent report definition - Action m_eAction; ///<! the current action - sal_Int32 m_nLastPosition; ///<! the last position of the group + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> m_xGroup; ///<! the group for the undo redo action + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; ///<! the parent report definition + Action m_eAction; ///<! the current action + sal_Int32 m_nLastPosition; ///<! the last position of the group void implReInsert( ); void implReRemove( ); @@ -144,11 +144,11 @@ namespace rptui TYPEINFO(); OGroupUndo(OReportModel& rMod ,USHORT nCommentID - ,Action _eAction + ,Action _eAction ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; } #endif // RPTUI_UNDO_HXX diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index dfa2f6ec7cdf..c87566859f76 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rptui class OEndMarker; class OReportSection; class OSectionView; - + // ----------------------------------------------------------------------------- struct RectangleLess : public ::std::binary_function< Rectangle, Rectangle, bool> @@ -64,7 +64,7 @@ namespace rptui CompareMode m_eCompareMode; Point m_aRefPoint; RectangleLess(CompareMode _eCompareMode,const Point& _rRefPoint ) : m_eCompareMode(_eCompareMode),m_aRefPoint(_rRefPoint){} - bool operator() (const Rectangle& lhs, const Rectangle& rhs) const + bool operator() (const Rectangle& lhs, const Rectangle& rhs) const { switch(m_eCompareMode) { @@ -114,13 +114,13 @@ namespace rptui } }; - class OViewsWindow : public Window - , public utl::ConfigurationListener + class OViewsWindow : public Window + , public utl::ConfigurationListener , public IMarkedSection { typedef ::std::multimap<Rectangle,::std::pair<SdrObject*,OSectionView*>,RectangleLess> TRectangleMap; public: - typedef ::std::vector< ::boost::shared_ptr<OSectionWindow> > TSectionsMap; + typedef ::std::vector< ::boost::shared_ptr<OSectionWindow> > TSectionsMap; struct TReportPairHelper : public ::std::unary_function< TSectionsMap::value_type, OReportSection > { @@ -131,18 +131,18 @@ namespace rptui }; struct TStartMarkerHelper : public ::std::unary_function< TSectionsMap::value_type, OStartMarker > { - OStartMarker& operator() (const TSectionsMap::value_type& lhs) const + OStartMarker& operator() (const TSectionsMap::value_type& lhs) const { return lhs->getStartMarker(); } }; private: - TSectionsMap m_aSections; - svtools::ColorConfig m_aColorConfig; - OReportWindow* m_pParent; + TSectionsMap m_aSections; + svtools::ColorConfig m_aColorConfig; + OReportWindow* m_pParent; ::rtl::OUString m_sShapeType; - sal_Bool m_bInSplitHandler; - sal_Bool m_bInUnmark; + sal_Bool m_bInSplitHandler; + sal_Bool m_bInUnmark; void ImplInitSettings(); /** returns the iterator at pos _nPos or the end() @@ -163,7 +163,7 @@ namespace rptui virtual void Paint( const Rectangle& rRect ); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); public: - OViewsWindow( + OViewsWindow( OReportWindow* _pReportWindow); virtual ~OViewsWindow(); @@ -176,26 +176,26 @@ namespace rptui */ void initialize(); - inline OReportWindow* getView() const { return m_pParent; } + inline OReportWindow* getView() const { return m_pParent; } /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(USHORT _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry ,USHORT _nPosition = USHRT_MAX); - USHORT getSectionCount() const; + USHORT getSectionCount() const; /** return the section at the given position * - * \param _nPos + * \param _nPos * \return the section at this pos or an empty section */ ::boost::shared_ptr<OSectionWindow> getSectionWindow(const USHORT _nPos) const; @@ -204,23 +204,23 @@ namespace rptui * * \param _bVisible */ - void toggleGrid(sal_Bool _bVisible); + void toggleGrid(sal_Bool _bVisible); void setGridSnap(BOOL bOn); void setDragStripes(BOOL bOn); /** returns the total accumulated height of all sections until _pSection is reached */ - sal_Int32 getTotalHeight() const; + sal_Int32 getTotalHeight() const; - inline bool empty() const { return m_aSections.empty(); } - void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + inline bool empty() const { return m_aSections.empty(); } + void SetMode( DlgEdMode m_eMode ); + void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); rtl::OUString GetInsertObjString() const; /** copies the current selection in this section */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return <TRUE/> if paste is allowed */ @@ -247,27 +247,27 @@ namespace rptui * * @param _pSectionView The view where the objects should not be unmarked. */ - void unmarkAllObjects(OSectionView* _pSectionView); + void unmarkAllObjects(OSectionView* _pSectionView); /** returns the report section window for the given xsection - @param _xSection the section + @param _xSection the section */ - // ::boost::shared_ptr<OSectionWindow> getReportSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); + // ::boost::shared_ptr<OSectionWindow> getReportSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** the the section as marked or not marked - @param _pSectionView the section where to set the marked flag - @param _bMark the marked flag + @param _pSectionView the section where to set the marked flag + @param _bMark the marked flag */ - void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); + void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); // IMarkedSection ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const; diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx index dc5533fbea8d..1f80d5cabc3e 100644 --- a/reportdesign/source/ui/inc/dlgedclip.hxx +++ b/reportdesign/source/ui/inc/dlgedclip.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +37,7 @@ namespace rptui //============================================================================ // OReportExchange //============================================================================ -/** \class OReportExchange +/** \class OReportExchange * \brief defines a clipboard fromat for copying selection elements. * \ingroup reportdesign_source_ui_report * @@ -51,15 +51,15 @@ public: /** Constructs a new exchange object with section elements * * \param _rCopyElements the elements to copy. Each section is one entry. The value must be a sequence of elements. - * \return + * \return */ OReportExchange( const TSectionElements& _rCopyElements); /** checks whether or not a descriptor can be extracted from the data flavor vector given * - * \param _rFlavors + * \param _rFlavors available flavors - * \return + * \return */ static sal_Bool canExtract(const DataFlavorExVector& _rFlavors); @@ -74,14 +74,14 @@ public: * * \return the registered format id */ - static sal_uInt32 getDescriptorFormatId(); + static sal_uInt32 getDescriptorFormatId(); protected: // TransferableHelper overridables - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); private: - TSectionElements m_aCopyElements; + TSectionElements m_aCopyElements; }; } #endif // _REPORT_RPTUICLIP_HXX diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx index 415d27e9ba7b..d4690e3f031b 100644 --- a/reportdesign/source/ui/inc/dlgedfac.hxx +++ b/reportdesign/source/ui/inc/dlgedfac.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index 4300beaf4d16..327c4a78c4c4 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +52,7 @@ class DlgEdFunc /* : public LinkHdl */ protected: OReportSection* m_pParent; OSectionView& m_rView; - Timer aScrollTimer; + Timer aScrollTimer; Point m_aMDPos; com::sun::star::uno::Reference<com::sun::star::uno::XInterface> m_xOverlappingObj; SdrObject * m_pOverlappingObj; @@ -63,16 +63,16 @@ protected: bool m_bShowPropertyBrowser; DECL_LINK( ScrollTimeout, Timer * ); - void ForceScroll( const Point& rPos ); + void ForceScroll( const Point& rPos ); /** checks that no other object is overlapped. * - * \param rMEvt + * \param rMEvt */ void checkMovementAllowed(const MouseEvent& rMEvt); /** sets the correct mouse pointer when moving a object * - * \param rMEvt + * \param rMEvt * \return <TRUE/> when the pointer was already set. */ bool setMovementPointer(const MouseEvent& rMEvt); @@ -99,14 +99,14 @@ public: virtual BOOL MouseMove( const MouseEvent& rMEvt ); /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - virtual sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + virtual sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** returns <TRUE/> if the mouse event is over an existing object * - * \param rMEvt + * \param rMEvt * \return <TRUE/> if overlapping, otherwise <FALSE/> */ bool isOverlapping(const MouseEvent& rMEvt); @@ -122,7 +122,7 @@ protected: void colorizeOverlappedObject(SdrObject* _pOverlappedObj); void unColorizeOverlappedObj(); - + }; //============================================================================ diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index fb1a01e42301..680452cbbbde 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace rptui class ORptPageDialog : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; ORptPageDialog(const ORptPageDialog&); void operator =(const ORptPageDialog&); diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 727cd5bb1c62..84d9d8c797b6 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,17 +53,17 @@ namespace rptui OPropertyInfoService(const OPropertyInfoService&); void operator =(const OPropertyInfoService&); protected: - static sal_uInt16 s_nCount; - static OPropertyInfoImpl* s_pPropertyInfos; + static sal_uInt16 s_nCount; + static OPropertyInfoImpl* s_pPropertyInfos; // TODO: a real structure which allows quick access by name as well as by id public: OPropertyInfoService(){} virtual ~OPropertyInfoService(){} // IPropertyInfoService - sal_Int32 getPropertyId(const String& _rName) const; - String getPropertyTranslation(sal_Int32 _nId) const; - sal_Int32 getPropertyHelpId(sal_Int32 _nId) const; + sal_Int32 getPropertyId(const String& _rName) const; + String getPropertyTranslation(sal_Int32 _nId) const; + sal_Int32 getPropertyHelpId(sal_Int32 _nId) const; sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler); @@ -110,12 +110,12 @@ namespace rptui //= The ID is used for the view order in the property browser. //======================================================================== - #define PROPERTY_ID_FORCENEWPAGE 1 - #define PROPERTY_ID_NEWROWORCOL 2 - #define PROPERTY_ID_KEEPTOGETHER 3 - #define PROPERTY_ID_CANGROW 4 - #define PROPERTY_ID_CANSHRINK 5 - #define PROPERTY_ID_REPEATSECTION 6 + #define PROPERTY_ID_FORCENEWPAGE 1 + #define PROPERTY_ID_NEWROWORCOL 2 + #define PROPERTY_ID_KEEPTOGETHER 3 + #define PROPERTY_ID_CANGROW 4 + #define PROPERTY_ID_CANSHRINK 5 + #define PROPERTY_ID_REPEATSECTION 6 #define PROPERTY_ID_PRESERVEIRI 7 #define PROPERTY_ID_VISIBLE 8 #define PROPERTY_ID_GROUPKEEPTOGETHER 9 @@ -125,10 +125,10 @@ namespace rptui #define PROPERTY_ID_POSITIONY 13 #define PROPERTY_ID_WIDTH 14 #define PROPERTY_ID_HEIGHT 15 - #define PROPERTY_ID_FORMULA 16 + #define PROPERTY_ID_FORMULA 16 #define PROPERTY_ID_PRINTREPEATEDVALUES 17 - #define PROPERTY_ID_CONDITIONALPRINTEXPRESSION 18 - #define PROPERTY_ID_INITIALFORMULA 19 + #define PROPERTY_ID_CONDITIONALPRINTEXPRESSION 18 + #define PROPERTY_ID_INITIALFORMULA 19 #define PROPERTY_ID_STARTNEWCOLUMN 20 #define PROPERTY_ID_TYPE 21 #define PROPERTY_ID_DATAFIELD 22 @@ -155,7 +155,7 @@ namespace rptui #define PROPERTY_ID_FONT 40 #define PROPERTY_ID_PARAADJUST 41 #define PROPERTY_ID_VERTICALALIGN 42 - + //............................................................................ } // namespace rptui diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index ad31dfb4b24c..c7efc6d02817 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +54,8 @@ class OObjectBase; class PropBrw : public DockingWindow , public SfxListener, public SfxBroadcaster { private: - OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + OModuleClient m_aModuleClient; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xInspectorContext; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; @@ -69,17 +69,17 @@ private: m_xLastSection; /// is the previously displayed section ::rtl::OUString m_sLastActivePage; ODesignView* m_pDesignView; - OSectionView* m_pView; - sal_Bool m_bInitialStateChange; + OSectionView* m_pView; + sal_Bool m_bInitialStateChange; PropBrw(PropBrw&); void operator =(PropBrw&); protected: - + virtual void Resize(); virtual sal_Bool Close(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > CreateCompPropSet(const SdrMarkList& rMarkList); void implSetNewObject( @@ -96,16 +96,16 @@ protected: DECL_LINK( OnAsyncGetFocus, void* ); public: - PropBrw(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB + PropBrw(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB ,Window* pParent ,ODesignView* _pDesignView); virtual ~PropBrw(); virtual void LoseFocus(); - void Update( OSectionView* m_pView ); - void Update( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); - inline OSectionView* GetCurView() const { return m_pView; } + void Update( OSectionView* m_pView ); + void Update( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); + inline OSectionView* GetCurView() const { return m_pView; } ::rtl::OUString getCurrentPage() const; void setCurrentPage(const ::rtl::OUString& _sLastActivePage); diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx index cd25a477d02e..615dde813ca1 100644 --- a/reportdesign/source/ui/inc/statusbarcontroller.hxx +++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ namespace rptui { typedef ::comphelper::ImplementationReference<SfxStatusBarControl,::com::sun::star::frame::XStatusbarController> TStatusbarHelper; - 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 { TStatusbarHelper m_pController; - sal_uInt16 m_nSlotId; - sal_uInt16 m_nId; + sal_uInt16 m_nSlotId; + sal_uInt16 m_nId; public: OStatusbarController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); @@ -62,7 +62,7 @@ namespace rptui 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); // need by registration - + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -70,7 +70,7 @@ namespace rptui // XUpdatable virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -78,12 +78,12 @@ namespace rptui virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, + virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + ::sal_Int32 nCommand, + ::sal_Bool bMouseEvent, const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, + virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, + const ::com::sun::star::awt::Rectangle& rOutputRectangle, ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 0b12e6551176..d55cb94dea48 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/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,7 +39,7 @@ class SfxToolBoxControl; namespace rptui { - typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, + typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XSubToolbarController> TToolboxController_BASE; typedef ::comphelper::ImplementationReference<SfxToolBoxControl,::com::sun::star::frame::XToolbarController> TToolbarHelper; @@ -47,10 +47,10 @@ namespace rptui ,public TToolboxController_BASE { DECLARE_STL_USTRINGACCESS_MAP(sal_Bool,TCommandState); - TCommandState m_aStates; + TCommandState m_aStates; TToolbarHelper m_pToolbarController; - sal_uInt16 m_nToolBoxId; - sal_uInt16 m_nSlotId; + sal_uInt16 m_nToolBoxId; + sal_uInt16 m_nSlotId; OToolboxController(const OToolboxController&); void operator =(const OToolboxController&); public: diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index f2a87ea06bde..d1756b123202 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -169,7 +169,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface m_xMasterDetails = new OPropertyMediator( m_xDataProvider.get(), m_xReportComponent.get(), aPropertyMediation,sal_True ); } - + //const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); //if ( xNameCont->hasByName(sRowSet) ) //{ @@ -205,7 +205,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & // uno::Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW ); // const uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems()); // const uno::Reference< chart2::XCoordinateSystem >* pIter = aCooSysSeq.getConstArray(); - // const uno::Reference< chart2::XCoordinateSystem >* pEnd = pIter + aCooSysSeq.getLength(); + // const uno::Reference< chart2::XCoordinateSystem >* pEnd = pIter + aCooSysSeq.getLength(); // for(;pIter != pEnd;++pIter) // { // const uno::Reference< chart2::XChartTypeContainer > xCTCnt( *pIter, uno::UNO_QUERY_THROW ); @@ -267,7 +267,7 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) ::rtl::OUString sStr; _aValue>>= sStr; xFormatted->setString(sStr); - uno::Sequence< uno::Reference< chart2::XFormattedString> > aArgs(1); + uno::Sequence< uno::Reference< chart2::XFormattedString> > aArgs(1); aArgs[0] = xFormatted; xTitle->setText(aArgs); } @@ -398,7 +398,7 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope ,PROPERTY_PREVIEW_COUNT //,PROPERTY_TITLE }; - + for (size_t nPos = 0; nPos < SAL_N_ELEMENTS(s_pProperties) ;++nPos ) { aValue.Name = s_pProperties[nPos]; @@ -452,7 +452,7 @@ inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteracti default: eResult = m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, out_Data, _rxInspectorUI); } - + return eResult; } @@ -493,7 +493,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin const sal_Int32 nId = m_pInfoService->getPropertyId(ActuatingPropertyName); switch(nId) { - + case PROPERTY_ID_MASTERFIELDS: break; case PROPERTY_ID_DETAILFIELDS: @@ -559,7 +559,7 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua _rClearBeforeDialog.clear(); return ( xDialog->execute() != 0 ); -} +} //........................................................................ } // namespace rptui //........................................................................ diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 368aa7cac239..b82f11071692 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace rptui //==================================================================== //= DefaultComponentInspectorModel //==================================================================== - DBG_NAME(DefaultComponentInspectorModel) + DBG_NAME(DefaultComponentInspectorModel) //-------------------------------------------------------------------- DefaultComponentInspectorModel::DefaultComponentInspectorModel( const Reference< XComponentContext >& _rxContext) :m_xContext( _rxContext ) @@ -72,13 +72,13 @@ namespace rptui ,m_nMaxHelpTextLines( 8 ) ,m_pInfoService(new OPropertyInfoService()) { - DBG_CTOR(DefaultComponentInspectorModel,NULL); + DBG_CTOR(DefaultComponentInspectorModel,NULL); } //------------------------------------------------------------------------ DefaultComponentInspectorModel::~DefaultComponentInspectorModel() { - DBG_DTOR(DefaultComponentInspectorModel,NULL); + DBG_DTOR(DefaultComponentInspectorModel,NULL); } //------------------------------------------------------------------------ @@ -124,7 +124,7 @@ namespace rptui { ::osl::MutexGuard aGuard( m_aMutex ); - + // service names for all our handlers const struct { @@ -135,9 +135,9 @@ namespace rptui { "com.sun.star.form.inspection.EditPropertyHandler"}, { "com.sun.star.report.inspection.DataProviderHandler"}, { "com.sun.star.report.inspection.GeometryHandler"} - + // generic virtual edit properties - + }; const size_t nFactories = SAL_N_ELEMENTS( aFactories ); @@ -156,7 +156,7 @@ namespace rptui ::osl::MutexGuard aGuard(m_aMutex); return m_bHasHelpSection; } - + //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMinHelpTextLines() throw (RuntimeException) { @@ -175,7 +175,7 @@ namespace rptui ::osl::MutexGuard aGuard(m_aMutex); m_bIsReadOnly = _isreadonly; } - + //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMaxHelpTextLines() throw (RuntimeException) { diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index a90a80a26f65..691bef2134e9 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,9 +85,9 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> -#define ITEMID_COLOR_TABLE SID_COLOR_TABLE -#define ITEMID_DASH_LIST SID_DASH_LIST -#define ITEMID_LINEEND_LIST SID_LINEEND_LIST +#define ITEMID_COLOR_TABLE SID_COLOR_TABLE +#define ITEMID_DASH_LIST SID_DASH_LIST +#define ITEMID_LINEEND_LIST SID_LINEEND_LIST #include <svx/xdef.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> @@ -104,9 +104,9 @@ #include <svx/xlineit0.hxx> #include <svx/svxids.hrc> -#define ITEMID_COLOR_TABLE SID_COLOR_TABLE -#define ITEMID_DASH_LIST SID_DASH_LIST -#define ITEMID_LINEEND_LIST SID_LINEEND_LIST +#define ITEMID_COLOR_TABLE SID_COLOR_TABLE +#define ITEMID_DASH_LIST SID_DASH_LIST +#define ITEMID_LINEEND_LIST SID_LINEEND_LIST #include <svx/drawitem.hxx> #define ITEMID_BRUSH SID_ATTR_BRUSH #include <editeng/brshitem.hxx> @@ -176,7 +176,7 @@ void lcl_collectFunctionNames(const uno::Reference< report::XSection>& _xSection nPos = getPositionInIndexAccess(xGroups.get(),xGroup); else if ( _xSection == xReportDefinition->getDetail() ) nPos = xGroups->getCount()-1; - + for (sal_Int32 i = 0 ; i <= nPos ; ++i) { xGroup.set(xGroups->getByIndex(i),uno::UNO_QUERY_THROW); @@ -249,7 +249,7 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const // ----------------------------------------------------------------------------- GeometryHandler::~GeometryHandler() { - DBG_DTOR(rpt_GeometryHandler,NULL); + DBG_DTOR(rpt_GeometryHandler,NULL); } //------------------------------------------------------------------------ ::rtl::OUString SAL_CALL GeometryHandler::getImplementationName( ) throw(uno::RuntimeException) @@ -300,7 +300,7 @@ void SAL_CALL GeometryHandler::disposing() ::comphelper::disposeComponent(m_xTypeConverter); if ( m_xReportComponent.is() && m_xReportComponent->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATAFIELD) ) m_xReportComponent->removePropertyChangeListener(PROPERTY_DATAFIELD,static_cast< beans::XPropertyChangeListener* >( this )); - + m_xReportComponent.clear(); m_xRowSet.clear(); m_aPropertyListeners.clear(); @@ -398,7 +398,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & Prop aPropertyValue = uno::Any(); break; } - + } break; case PROPERTY_ID_TYPE: @@ -434,8 +434,8 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & Prop aPropertyValue <<= m_sScope; break; } - - } + + } break; case PROPERTY_ID_BACKCOLOR: case PROPERTY_ID_CONTROLBACKGROUND: @@ -494,7 +494,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property else if ( m_aFunctionNames.find(sDataField) != m_aFunctionNames.end() ) m_nDataFieldType = USER_DEF_FUNCTION; } - + resetOwnProperties(aGuard,sOldFunctionName,sOldScope,nOldDataFieldType); } break; @@ -592,10 +592,10 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property } } } - + break; case PROPERTY_ID_SCOPE: - if ( !(Value >>= m_sScope) ) + if ( !(Value >>= m_sScope) ) m_sScope = ::rtl::OUString(); else { @@ -618,7 +618,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property ::rtl::OUString sDefaultFunctionName; ::rtl::OUString sDataField; OSL_VERIFY( impl_isDefaultFunction_nothrow(m_xFunction,sDataField,sDefaultFunctionName) ); - m_sDefaultFunction = sDefaultFunctionName; + m_sDefaultFunction = sDefaultFunctionName; createDefaultFunction(aGuard,m_sDefaultFunction,sDataField); } } @@ -645,7 +645,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property aAwtSize.Height = nNewValue; else if ( nId == PROPERTY_ID_WIDTH ) aAwtSize.Width = nNewValue; - + checkPosAndSize(aAwtPoint,aAwtSize); } } @@ -690,7 +690,7 @@ void GeometryHandler::implCreateListLikeControl( { ::std::vector< ::rtl::OUString > aList; tools::StringListResource aRes(ModuleRes(_nResId),aList); - + implCreateListLikeControl(_rxControlFactory,out_Descriptor,aList,_bReadOnlyControl,_bTrueIfListBoxFalseIfComboBox); } // ----------------------------------------------------------------------------- @@ -755,7 +755,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const case PROPERTY_ID_TYPE: implCreateListLikeControl(_xControlFactory,aOut,RID_STR_TYPE_CONST,sal_False,sal_True); break; - case PROPERTY_ID_VISIBLE: + case PROPERTY_ID_VISIBLE: case PROPERTY_ID_CANGROW: case PROPERTY_ID_CANSHRINK: case PROPERTY_ID_REPEATSECTION: @@ -845,7 +845,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const aOut = m_xFormComponentHandler->describePropertyLine(PropertyName, _xControlFactory); } } - + if ( nId != -1 ) { aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ? @@ -855,7 +855,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) ); aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId); } - + if ( ( nId == PROPERTY_ID_POSITIONX ) || ( nId == PROPERTY_ID_POSITIONY ) || ( nId == PROPERTY_ID_WIDTH ) @@ -974,7 +974,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString aPropertyValue <<= static_cast<sal_Int32>(COL_TRANSPARENT); break; } - // run through + // run through case PROPERTY_ID_KEEPTOGETHER: if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) @@ -982,7 +982,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString aPropertyValue = getConstantValue(sal_False,RID_STR_KEEPTOGETHER_CONST,_rControlValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName); break; } - // run through + // run through case PROPERTY_ID_VISIBLE: case PROPERTY_ID_CANGROW: @@ -999,17 +999,17 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString case PROPERTY_ID_CONTROLBACKGROUNDTRANSPARENT: { if ( aPropertyValue.hasValue() ) - { + { const beans::Property aProp = getProperty(PropertyName); if ( aPropertyValue.getValueType().equals( aProp.Type ) ) // nothing to do, type is already as desired return aPropertyValue; - + if ( _rControlValue.getValueType().getTypeClass() == uno::TypeClass_STRING ) { ::rtl::OUString sControlValue; _rControlValue >>= sControlValue; - + const uno::Reference< inspection::XStringRepresentation > xConversionHelper = inspection::StringRepresentation::create( m_xContext,m_xTypeConverter ); aPropertyValue = xConversionHelper->convertToPropertyValue( sControlValue, aProp.Type ); } @@ -1025,7 +1025,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString } } } - + break; } case PROPERTY_ID_CONDITIONALPRINTEXPRESSION: @@ -1336,10 +1336,10 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie // { // beans::Property aValue; // aValue.Name = PROPERTY_AREA; -// aNewProps.push_back(aValue); +// aNewProps.push_back(aValue); // } // re-enable when the remaining issues of #i88727# are fixed - + return uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } @@ -1384,7 +1384,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr if ( !_rxInspectorUI.is() ) throw lang::NullPointerException(); if ( PropertyName.equalsAscii(PROPERTY_FILTER) ) - { + { ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; @@ -1395,9 +1395,9 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr eResult = inspection::InteractiveSelectionResult_ObtainedValue; } return eResult; - } + } else if ( PropertyName.equalsAscii(PROPERTY_FONT) ) - { + { ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; @@ -1413,21 +1413,21 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr } return eResult; } - else if ( PropertyName.equalsAscii(PROPERTY_FORMULA) - || PropertyName.equalsAscii(PROPERTY_INITIALFORMULA) - || PropertyName.equalsAscii(PROPERTY_DATAFIELD) + else if ( PropertyName.equalsAscii(PROPERTY_FORMULA) + || PropertyName.equalsAscii(PROPERTY_INITIALFORMULA) + || PropertyName.equalsAscii(PROPERTY_DATAFIELD) || PropertyName.equalsAscii(PROPERTY_CONDITIONALPRINTEXPRESSION)) - { + { ::osl::ClearableMutexGuard aGuard( m_aMutex ); - + ::rtl::OUString sFormula; m_xReportComponent->getPropertyValue(PropertyName) >>= sFormula; const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY); uno::Reference< uno::XComponentContext > xContext = m_xContext; uno::Reference< beans::XPropertySet > xRowSet( m_xRowSet,uno::UNO_QUERY); aGuard.clear(); - + inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; if ( rptui::openDialogFormula_nothrow( sFormula, xContext,xInspectorWindow,xRowSet ) ) { @@ -1437,7 +1437,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr return eResult; } else if ( PropertyName.equalsAscii(PROPERTY_AREA) ) - { + { ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; @@ -1482,14 +1482,14 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString & _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,sal_False); _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,sal_False); OSL_ENSURE(m_sDefaultFunction.getLength() == 0,"Why is the m_sDefaultFunction set?"); - OSL_ENSURE(m_sScope.getLength() == 0,"Why is the m_sScope set?"); + OSL_ENSURE(m_sScope.getLength() == 0,"Why is the m_sScope set?"); break; case FUNCTION: _rxInspectorUI->rebuildPropertyUI(PROPERTY_DATAFIELD); _rxInspectorUI->rebuildPropertyUI(PROPERTY_FORMULALIST); _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,sal_True); - _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,m_sDefaultFunction.getLength() != 0); - _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,m_sScope.getLength() != 0); + _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,m_sDefaultFunction.getLength() != 0); + _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,m_sScope.getLength() != 0); break; case USER_DEF_FUNCTION: _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,sal_False); @@ -1541,7 +1541,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString & default: m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, _rxInspectorUI, _bFirstTimeInit); break; - } + } } ::sal_Bool SAL_CALL GeometryHandler::suspend(::sal_Bool Suspend) throw (uno::RuntimeException) @@ -1625,7 +1625,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos, const uno::Reference< report::XSection> xSection(xSourceReportComponent->getParent(),uno::UNO_QUERY); if ( !xSection.is() || uno::Reference< report::XShape>(xSourceReportComponent,uno::UNO_QUERY).is() ) // shapes can overlap. return; - + ::Point aPos(VCLPoint(_aNewPos)); if ( aPos.X() < 0 || aPos.Y() < 0 ) // TODO: have to check size with pos aka || (aPos.X() + aAwtSize.Width) > m_xSection->getReportDefinition()-> throw beans::PropertyVetoException(String(ModuleRes(RID_STR_ILLEGAL_POSITION)),xSourceReportComponent); @@ -1750,7 +1750,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r const uno::Reference< report::XSection> xSection(xSourceReportComponent->getParent(),uno::UNO_QUERY_THROW); const uno::Reference< report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); if ( !m_sScope.getLength() ) - { + { const uno::Reference< report::XGroup> xGroup(xSection->getGroup(),uno::UNO_QUERY); if ( xGroup.is() ) { @@ -1770,7 +1770,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r String sGroupName = String(ModuleRes(RID_STR_SCOPE_GROUP)); _rsNamePostFix = xGroup2->getExpression(); sGroupName.SearchAndReplaceAscii("%1",_rsNamePostFix); - m_sScope = sGroupName; + m_sScope = sGroupName; xReturn = xGroup2.get(); } } @@ -1789,7 +1789,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r { uno::Reference< report::XGroups> xGroups = xReportDefinition->getGroups(); const sal_Int32 nCount = xGroups->getCount(); - + for (sal_Int32 i = 0 ; i < nCount; ++i) { const uno::Reference< report::XGroup> xGroup(xGroups->getByIndex(i),uno::UNO_QUERY_THROW); @@ -1802,7 +1802,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r break; } } - + } OSL_ENSURE(xReturn.is(),"Why don't we have a functionssupplier here!"); @@ -1820,7 +1820,7 @@ sal_Bool GeometryHandler::isDefaultFunction( const ::rtl::OUString& _sQuotedFunc const uno::Reference< report::XReportComponent> xSourceReportComponent(m_xReportComponent,uno::UNO_QUERY_THROW); const uno::Reference< report::XSection> xSection(xSourceReportComponent->getParent(),uno::UNO_QUERY_THROW); const uno::Reference< report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); - + ::std::pair<TFunctions::const_iterator,TFunctions::const_iterator> aFind = m_aFunctionNames.equal_range(_sQuotedFunction); while ( aFind.first != aFind.second ) { @@ -1891,7 +1891,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< break; } } - + bDefaultFunction = aIter != aDeEnd; } catch(uno::Exception&) @@ -2039,7 +2039,7 @@ void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,co aFormulaEvent.PropertyName = PROPERTY_FORMULALIST; aFormulaEvent.OldValue <<= _sOldFunctionName; aFormulaEvent.NewValue <<= sNewFunction; - + m_aPropertyListeners.notify( aFormulaEvent, &beans::XPropertyChangeListener::propertyChange ); } if ( _sOldScope != sNewScope ) @@ -2050,7 +2050,7 @@ void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,co aScopeEvent.NewValue <<= sNewScope; m_aPropertyListeners.notify( aScopeEvent, &beans::XPropertyChangeListener::propertyChange ); } - + _aGuard.reset(); } //------------------------------------------------------------------------ @@ -2168,7 +2168,7 @@ void GeometryHandler::impl_setCounterFunction_throw() ::rtl::OUString sScope; if ( !(sFunctionName.getLength() && m_aFunctionNames.find(sQuotedFunctionName) != m_aFunctionNames.end() && impl_isCounterFunction_throw(sQuotedFunctionName,sScope)) ) impl_createFunction(sFunctionName,::rtl::OUString(),m_aCounterFunction); - + OBlocker aBlocker(m_bIn); m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(impl_convertToFormula( uno::makeAny(sQuotedFunctionName)))); } @@ -2185,7 +2185,7 @@ sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const ::rtl::OUString& _ lcl_convertFormulaTo(aDataField,aDataField); aDataField >>= sDataField; } - + if ( sDataField.getLength() ) { if ( impl_isDataField(sDataField) ) @@ -2237,7 +2237,7 @@ void SAL_CALL GeometryHandler::propertyChange(const beans::PropertyChangeEvent& default: ; } - + resetOwnProperties(aGuard,sOldFunctionName,sOldScope,nOldDataFieldType); } } diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index d42be56e7656..7e34b66672d9 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -190,7 +190,7 @@ uno::Sequence< beans::Property > SAL_CALL ReportComponentHandler::getSupportedPr { ::std::vector< beans::Property > aNewProps; m_pInfoService->getExcludeProperties( aNewProps, m_xFormComponentHandler ); - + return aNewProps.empty() ? uno::Sequence< beans::Property > () : uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src index 5d496ee26d83..99b6d8d3a41c 100644 --- a/reportdesign/source/ui/inspection/inspection.src +++ b/reportdesign/source/ui/inspection/inspection.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -266,37 +266,37 @@ String RID_STR_ILLEGAL_POSITION Text [ en-US ] = "This position can not be set. It is invalid."; }; String RID_STR_SCOPE_GROUP -{ +{ Text [ en-US ] = "Group: %1"; }; String RID_STR_FORMULALIST -{ +{ Text [ en-US ] = "Function"; }; String RID_STR_SCOPE -{ +{ Text [ en-US ] = "Scope"; }; String RID_STR_TYPE -{ +{ Text [ en-US ] = "Data Field Type"; }; Resource RID_STR_TYPE_CONST { String 1 - { + { Text [ en-US ] = "Field or Formula"; }; String 2 - { + { Text [ en-US ] = "Function"; }; String 3 - { + { Text [ en-US ] = "Counter"; }; String 4 - { + { Text [ en-US ] = "User defined Function"; }; }; diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index b677e3598f07..bc866d9c13ee 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,19 +51,19 @@ namespace rptui //======================================================================== struct OPropertyInfoImpl { - String sName; - String sTranslation; + String sName; + String sTranslation; sal_uInt32 nHelpId; sal_Int32 nId; sal_uInt16 nPos; sal_uInt32 nUIFlags; OPropertyInfoImpl( - const ::rtl::OUString& rName, - sal_Int32 _nId, - const String& aTranslation, - sal_uInt16 nPosId, - sal_uInt32 nHelpId, + const ::rtl::OUString& rName, + sal_Int32 _nId, + const String& aTranslation, + sal_uInt16 nPosId, + sal_uInt32 nHelpId, sal_uInt32 _nUIFlags); }; @@ -111,8 +111,8 @@ namespace rptui #define DEF_INFO_5( ident, uinameres, helpid, flag1, flag2, flag3, flag4, flag5 ) \ DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 | PROP_FLAG_##flag5 ) - sal_uInt16 OPropertyInfoService::s_nCount = 0; - OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = NULL; + sal_uInt16 OPropertyInfoService::s_nCount = 0; + OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = NULL; //------------------------------------------------------------------------ const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo() { @@ -155,7 +155,7 @@ namespace rptui ,DEF_INFO_2( TYPE, TYPE, TYPE, COMPOSEABLE,DATA_PROPERTY ) ,DEF_INFO_2( DATAFIELD, DATAFIELD, DATAFIELD, COMPOSEABLE,DATA_PROPERTY ) ,DEF_INFO_2( FORMULALIST, FORMULALIST, FORMULALIST, COMPOSEABLE,DATA_PROPERTY ) - ,DEF_INFO_2( SCOPE, SCOPE, SCOPE, COMPOSEABLE,DATA_PROPERTY ) + ,DEF_INFO_2( SCOPE, SCOPE, SCOPE, COMPOSEABLE,DATA_PROPERTY ) ,DEF_INFO_1( PRESERVEIRI, PRESERVEIRI, PRESERVEIRI, COMPOSEABLE ) ,DEF_INFO_1( BACKCOLOR, BACKCOLOR, BACKCOLOR, COMPOSEABLE ) ,DEF_INFO_1( CONTROLBACKGROUND, BACKCOLOR, BACKCOLOR, COMPOSEABLE ) @@ -173,7 +173,7 @@ namespace rptui }; s_pPropertyInfos = aPropertyInfos; - + s_nCount = SAL_N_ELEMENTS(aPropertyInfos); ::std::sort( aPropertyInfos, aPropertyInfos + SAL_N_ELEMENTS(aPropertyInfos), PropertyInfoLessByName() ); return s_pPropertyInfos; diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 4c37cfa888f1..4b773392041f 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,20 +30,20 @@ #include <svl/smplhint.hxx> #include "uistrings.hrc" -#define BORDERCOLORCHANGE 191 +#define BORDERCOLORCHANGE 191 //===================================================================== namespace rptui { //===================================================================== DBG_NAME( rpt_OColorListener ) -OColorListener::OColorListener(Window* _pParent ,const ::rtl::OUString& _sColorEntry) +OColorListener::OColorListener(Window* _pParent ,const ::rtl::OUString& _sColorEntry) : Window(_pParent) ,m_sColorEntry(_sColorEntry) ,m_nColor(COL_LIGHTBLUE) ,m_bCollapsed(sal_False) ,m_bMarked(sal_False) { - DBG_CTOR( rpt_OColorListener,NULL); + DBG_CTOR( rpt_OColorListener,NULL); StartListening(m_aExtendedColorConfig); m_nColor = m_aExtendedColorConfig.GetColorValue(CFG_REPORTDESIGNER,m_sColorEntry).getColor(); m_nTextBoundaries = m_aColorConfig.GetColorValue(::svtools::DOCBOUNDARIES).nColor; @@ -73,21 +73,21 @@ void OColorListener::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) - { + { ImplInitSettings(); Invalidate(); } } // ----------------------------------------------------------------------------- void OColorListener::setCollapsed(sal_Bool _bCollapsed) -{ - m_bCollapsed = _bCollapsed; - if ( m_aCollapsedLink.IsSet() ) +{ + m_bCollapsed = _bCollapsed; + if ( m_aCollapsedLink.IsSet() ) m_aCollapsedLink.Call(this); } // ----------------------------------------------------------------------------- void OColorListener::setMarked(sal_Bool _bMark) -{ +{ m_bMarked = _bMark; Invalidate(); } diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 1de40751f9c1..d653ef971437 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -217,36 +217,36 @@ void FunctionDescription::initArgumentInfo() const { } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getSignature() const +::rtl::OUString FunctionDescription::getSignature() const { return m_xFunctionDescription->getSignature(); } // ----------------------------------------------------------------------------- -long FunctionDescription::getHelpId() const +long FunctionDescription::getHelpId() const { return 0; } // ----------------------------------------------------------------------------- -sal_uInt32 FunctionDescription::getParameterCount() const +sal_uInt32 FunctionDescription::getParameterCount() const { return m_aParameter.getLength(); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const +::rtl::OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Name; return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const +::rtl::OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Description; return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const +bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].IsOptional; diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 6e1ed17c4e2e..ba963d93131b 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ #include <editeng/charscaleitem.hxx> #include <svx/algitem.hxx> #include <svx/svdpagv.hxx> -#include <svx/xtable.hxx> // XColorTable +#include <svx/xtable.hxx> // XColorTable #include <editeng/brshitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/emphitem.hxx> @@ -717,15 +717,15 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep }; SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); - // not needed for font height pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why - pPool->FreezeIdRanges(); // the same + // not needed for font height pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why + pPool->FreezeIdRanges(); // the same bool bSuccess = false; try { ::std::auto_ptr<SfxItemSet> pDescriptor( new SfxItemSet( *pPool, pRanges ) ); lcl_CharPropertiesToItems( _rxReportControlFormat, *pDescriptor ); - { // want the dialog to be destroyed before our set + { // want the dialog to be destroyed before our set ORptPageDialog aDlg(pParent, pDescriptor.get(),RID_PAGEDIALOG_CHAR); uno::Reference< report::XShape > xShape( _rxReportControlFormat, uno::UNO_QUERY ); if ( xShape.is() ) @@ -763,7 +763,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R //static USHORT pRanges[] = //{ - // XATTR_START,XATTR_END, + // XATTR_START,XATTR_END, // 0 //}; @@ -775,7 +775,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R lcl_fillShapeToItems(_xShape,*pDescriptor); - { // want the dialog to be destroyed before our set + { // want the dialog to be destroyed before our set SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get() )); // #i74099# by default, the dialog deletes the current color table if a different one is loaded diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/Undo.cxx index 3a434d179985..b66511816dcb 100644 --- a/reportdesign/source/ui/misc/Undo.cxx +++ b/reportdesign/source/ui/misc/Undo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,7 +130,7 @@ OSectionUndo::OSectionUndo(OReportModel& _rMod ,m_nSlot(_nSlot) ,m_bInserted(false) { - DBG_CTOR(rpt_OSectionUndo,NULL); + DBG_CTOR(rpt_OSectionUndo,NULL); } // ----------------------------------------------------------------------------- OSectionUndo::~OSectionUndo() @@ -160,19 +160,19 @@ OSectionUndo::~OSectionUndo() } } } - DBG_DTOR(rpt_OSectionUndo,NULL); + DBG_DTOR(rpt_OSectionUndo,NULL); } // ----------------------------------------------------------------------------- void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xSection) { m_aControls.clear(); try - { + { // copy all properties for restoring uno::Reference< beans::XPropertySetInfo> xInfo = _xSection->getPropertySetInfo(); uno::Sequence< beans::Property> aSeq = xInfo->getProperties(); const beans::Property* pIter = aSeq.getConstArray(); - const beans::Property* pEnd = pIter + aSeq.getLength(); + const beans::Property* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( 0 == (pIter->Attributes & beans::PropertyAttribute::READONLY) ) @@ -262,7 +262,7 @@ void OReportSectionUndo::implReRemove( ) if( m_eAction == Removed ) collectControls(m_pMemberFunction(&m_aReportHelper)); const uno::Sequence< beans::PropertyValue > aArgs; - m_pController->executeChecked(m_nSlot,aArgs); + m_pController->executeChecked(m_nSlot,aArgs); m_bInserted = false; } //---------------------------------------------------------------------------- @@ -294,7 +294,7 @@ String OGroupSectionUndo::GetComment() const try { uno::Reference< report::XSection > xSection = const_cast<OGroupSectionUndo*>(this)->m_pMemberFunction(&const_cast<OGroupSectionUndo*>(this)->m_aGroupHelper); - + if ( xSection.is() ) m_sName = xSection->getName(); } @@ -331,7 +331,7 @@ void OGroupSectionUndo::implReRemove( ) aArgs[0].Value <<= sal_False; aArgs[1].Name = PROPERTY_GROUP; aArgs[1].Value <<= m_aGroupHelper.getGroup(); - + m_pController->executeChecked(m_nSlot,aArgs); m_bInserted = false; } @@ -340,7 +340,7 @@ TYPEINIT1( OGroupUndo, OCommentUndoAction ); //---------------------------------------------------------------------------- OGroupUndo::OGroupUndo(OReportModel& _rMod ,USHORT nCommentID - ,Action _eAction + ,Action _eAction ,const uno::Reference< report::XGroup>& _xGroup ,const uno::Reference< report::XReportDefinition >& _xReportDefinition) : OCommentUndoAction(_rMod,nCommentID) @@ -387,7 +387,7 @@ void OGroupUndo::Undo() implReInsert(); break; } - + } //---------------------------------------------------------------------------- void OGroupUndo::Redo() diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index ee0fc6512c32..444ae268e304 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ cppu::ImplementationEntry entries[] = { &cppu::createSingleComponentFactory, 0, 0 }, { &DataProviderHandler::create, &DataProviderHandler::getImplementationName_Static, &DataProviderHandler::getSupportedServiceNames_static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index a169c8279026..a8230177caad 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,10 +84,10 @@ Reference< XInterface > OStatusbarController::create(Reference< XComponentContex } IMPLEMENT_FORWARD_XINTERFACE2(OStatusbarController, ::svt::StatusbarController,OStatusbarController_BASE) -OStatusbarController::OStatusbarController(const Reference< XMultiServiceFactory >& _rxORB) +OStatusbarController::OStatusbarController(const Reference< XMultiServiceFactory >& _rxORB) : m_nSlotId(0) ,m_nId(1) -{ +{ m_xServiceManager = _rxORB; } // ----------------------------------------------------------------------------- @@ -111,11 +111,11 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen } } if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) - { + { m_pController = TStatusbarHelper::createFromQuery(new SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar)); } // if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) else if ( m_aCommandURL.equalsAscii(".uno:Zoom") ) - { + { m_pController = TStatusbarHelper::createFromQuery(new SvxZoomStatusBarControl(m_nSlotId = SID_ATTR_ZOOM,m_nId,*pStatusBar)); } diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index a009e4393de0..3bc4d1810a40 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include <svtools/menuoptions.hxx> #include <osl/mutex.hxx> #include <svx/svxids.hrc> -#define ITEMID_COLOR 1 +#define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 #define ITEMID_FONT 3 #define ITEMID_FONTHEIGHT 4 @@ -228,7 +228,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event { // All other status events will be processed here sal_Bool bSetCheckmark = sal_False; - sal_Bool bCheckmark = sal_False; + sal_Bool bCheckmark = sal_False; //m_pToolbarController->GetToolBox().Enable(Event.IsEnabled); ToolBox& rTb = m_pToolbarController->GetToolBox(); for ( USHORT i = 0; i < rTb.GetItemCount(); i++ ) diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 3e97c4e0f002..4af7f7025345 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ using namespace lang; using namespace beans; using namespace container; -#define LINE_SIZE 50 +#define LINE_SIZE 50 #define START_SIZE_TASKPANE 30 #define COLSET_ID 1 #define REPORT_ID 2 @@ -96,7 +96,7 @@ class OwnSplitWindow : public SplitWindow public: OwnSplitWindow(Window* pParent) : SplitWindow(pParent,WB_DIALOGCONTROL){SetBackground( );} - virtual void Split() + virtual void Split() { SplitWindow::Split(); setItemSizes(); @@ -104,7 +104,7 @@ public: void setItemSizes() { const long nOutWidth = GetOutputSizePixel().Width(); - long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); + long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); nTaskPaneMinSplitSize = static_cast<long>(nTaskPaneMinSplitSize*100/nOutWidth); if ( !nTaskPaneMinSplitSize ) nTaskPaneMinSplitSize = START_SIZE_TASKPANE; @@ -114,7 +114,7 @@ public: long nReportSize = GetItemSize( REPORT_ID ); long nTaskPaneSize = GetItemSize( TASKPANE_ID ); - BOOL bMod = FALSE; + BOOL bMod = FALSE; if( nReportSize < nReportMinSplitSize ) { nReportSize = nReportMinSplitSize; @@ -157,7 +157,7 @@ ODesignView::ODesignView( Window* pParent, ,m_nCurrentPosition(USHRT_MAX) ,m_eActObj( OBJ_NONE ) ,m_bFirstDraw(FALSE) - ,m_aGridSizeCoarse( 1000, 1000 ) // #i93595# 100TH_MM changed to grid using coarse 1 cm grid + ,m_aGridSizeCoarse( 1000, 1000 ) // #i93595# 100TH_MM changed to grid using coarse 1 cm grid ,m_aGridSizeFine( 250, 250 ) // and a 0,25 cm subdivision for better visualisation ,m_bGridVisible(TRUE) ,m_bGridSnap(TRUE) @@ -281,8 +281,8 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground) sal_Int32 nSplitPos = getController().getSplitPos(); if ( 0 != aPlaygroundSize.Width() ) { - if ( ( -1 == nSplitPos ) - || ( nSplitPos >= aPlaygroundSize.Width() ) + if ( ( -1 == nSplitPos ) + || ( nSplitPos >= aPlaygroundSize.Width() ) ) { long nMinWidth = static_cast<long>(0.1*aPlaygroundSize.Width()); diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 92b6b716860f..686bb65daab5 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,16 +35,16 @@ #include <vcl/lineinfo.hxx> -#define CORNER_SPACE 5 +#define CORNER_SPACE 5 //===================================================================== namespace rptui { //===================================================================== DBG_NAME( rpt_OEndMarker ) -OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry) +OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) { - DBG_CTOR( rpt_OEndMarker,NULL); + DBG_CTOR( rpt_OEndMarker,NULL); SetUniqueId(HID_RPT_ENDMARKER); ImplInitSettings(); SetPaintTransparent(TRUE); diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 67c6829b75ec..659fc4a32fdd 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ namespace rptui // { // const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings(); // BOOL bHighContrast = aStyleSettings.GetHighContrastMode(); - // + // // Color aGetFaceColor = aStyleSettings.GetFaceColor(); // Color aGetCheckedColor = aStyleSettings.GetCheckedColor(); // Color aGetLightColor = aStyleSettings.GetLightColor(); @@ -118,11 +118,11 @@ namespace rptui // Color aGetHighlightLinkColor = aStyleSettings.GetHighlightLinkColor(); // Color aGetMonoColor = aStyleSettings.GetMonoColor(); // Color aGetActiveTabColor = aStyleSettings.GetActiveTabColor(); - // Color aGetInactiveTabColor = aStyleSettings.GetInactiveTabColor(); - // + // Color aGetInactiveTabColor = aStyleSettings.GetInactiveTabColor(); + // // Color aWindowColor = aStyleSettings.GetWindowColor(); // Color aLabelColor = aStyleSettings.GetLabelTextColor(); - // + // // // if (m_nTextColor == -1) // // { // // svtools::ExtendedColorConfig aConfig; @@ -130,14 +130,14 @@ namespace rptui // // } // return aLabelColor.GetColor(); // } - + //-------------------------------------------------------------------- FixedTextColor::~FixedTextColor() { DBG_DTOR(rpt_FixedTextColor,NULL); } // ----------------------------------------------------------------------------- - + void FixedTextColor::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent ) { // (void)_rEvent; @@ -160,7 +160,7 @@ namespace rptui DBG_UNHANDLED_EXCEPTION(); } } - + // ----------------------------------------------------------------------------- void FixedTextColor::setPropertyTextColor(const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nTextColor) { @@ -172,7 +172,7 @@ namespace rptui { handle(_rxElement); } - + // ----------------------------------------------------------------------------- void FixedTextColor::handle( const uno::Reference< uno::XInterface >& _rxElement ) { @@ -188,9 +188,9 @@ namespace rptui sal_Bool bIsDark = sal_False; const sal_Int32 nBackColor( xFixedText->getControlBackground() ); if ((sal_uInt32)nBackColor == COL_TRANSPARENT) - { + { uno::Reference <report::XSection> xSection(xFixedText->getParent(), uno::UNO_QUERY_THROW); - + sal_Bool bSectionBackColorIsTransparent = xSection->getBackTransparent(); if (bSectionBackColorIsTransparent) { @@ -210,8 +210,8 @@ namespace rptui { Color aLabelBackColor(nBackColor); bIsDark = aLabelBackColor.IsDark(); - } - + } + uno::Reference<awt::XVclWindowPeer> xVclWindowPeer = getVclWindowPeer(xFixedText); if (bIsDark) { @@ -224,25 +224,25 @@ namespace rptui util::Color aLabelColor = xFixedText->getCharColor(); setPropertyTextColor(xVclWindowPeer, aLabelColor); } - + } catch( const uno::Exception& ) { DBG_UNHANDLED_EXCEPTION(); } } - + // ----------------------------------------------------------------------------- // XPropertyChangeListener uno::Reference<awt::XControl> FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText) throw(uno::RuntimeException) { - + uno::Reference<awt::XControl> xControl; OReportController *pController = (OReportController *)&m_rReportController; - + ::boost::shared_ptr<OReportModel> pModel = pController->getSdrModel(); - + uno::Reference<report::XSection> xSection(_xFixedText->getSection()); if ( xSection.is() ) { @@ -266,7 +266,7 @@ namespace rptui } return xControl; } - + // ----------------------------------------------------------------------------- uno::Reference<awt::XVclWindowPeer> FixedTextColor::getVclWindowPeer(const uno::Reference< report::XFixedText >& _xComponent) throw(uno::RuntimeException) { @@ -280,7 +280,7 @@ namespace rptui - + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 4cb76497d7f8..2e604a95da34 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace rptui } return m_nTextColor; } - + //-------------------------------------------------------------------- FormattedFieldBeautifier::~FormattedFieldBeautifier() { @@ -127,7 +127,7 @@ namespace rptui DBG_UNHANDLED_EXCEPTION(); } } - + // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, const ::rtl::OUString& _rText ) { @@ -146,7 +146,7 @@ namespace rptui aFontDescriptorStructure.Slant = ::com::sun::star::awt::FontSlant_ITALIC; _xVclWindowPeer->setProperty(PROPERTY_FONTDESCRIPTOR, uno::makeAny(aFontDescriptorStructure)); } - + // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent ) { @@ -156,7 +156,7 @@ namespace rptui setPlaceholderText( _rEvent.Source ); } - + // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::handle( const uno::Reference< uno::XInterface >& _rxElement ) { @@ -168,17 +168,17 @@ namespace rptui { handle( _rxElement ); } - + // ----------------------------------------------------------------------------- uno::Reference<awt::XVclWindowPeer> FormattedFieldBeautifier::getVclWindowPeer(const uno::Reference< report::XReportComponent >& _xComponent) throw(uno::RuntimeException) - { + { uno::Reference<awt::XVclWindowPeer> xVclWindowPeer; ::boost::shared_ptr<OReportModel> pModel = const_cast< OReportController& >( m_rReportController ).getSdrModel(); - + uno::Reference<report::XSection> xSection(_xComponent->getSection()); if ( xSection.is() ) - { + { OReportPage *pPage = pModel->getPage(xSection); ULONG nIndex = pPage->getIndexOf(_xComponent); if (nIndex < pPage->GetObjCount() ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 2f7fc8997d16..473e3b366ee7 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,21 +27,21 @@ ************************************************************************/ #include "precompiled_reportdesign.hxx" -#define RPTUI_ID_LRSPACE 1 -#define RPTUI_ID_ULSPACE 2 -#define RPTUI_ID_PAGE 3 -#define RPTUI_ID_SIZE 4 -#define RPTUI_ID_PAGE_MODE 5 -#define RPTUI_ID_START 6 -#define RPTUI_ID_END 7 -#define RPTUI_ID_BRUSH 8 -#define RPTUI_ID_METRIC 9 +#define RPTUI_ID_LRSPACE 1 +#define RPTUI_ID_ULSPACE 2 +#define RPTUI_ID_PAGE 3 +#define RPTUI_ID_SIZE 4 +#define RPTUI_ID_PAGE_MODE 5 +#define RPTUI_ID_START 6 +#define RPTUI_ID_END 7 +#define RPTUI_ID_BRUSH 8 +#define RPTUI_ID_METRIC 9 #define ITEMID_LRSPACE RPTUI_ID_LRSPACE #define ITEMID_ULSPACE RPTUI_ID_ULSPACE #define ITEMID_SIZE RPTUI_ID_SIZE -#define ITEMID_PAGE RPTUI_ID_PAGE -#define ITEMID_BRUSH RPTUI_ID_BRUSH +#define ITEMID_PAGE RPTUI_ID_PAGE +#define ITEMID_BRUSH RPTUI_ID_BRUSH #include "ReportController.hxx" @@ -373,7 +373,7 @@ void OReportController::disposing() pSectionWindow = getDesignView()->getMarkedSection(); if ( pSectionWindow ) pSectionWindow->getReportSection().deactivateOle(); - getUndoMgr()->Clear(); // clear all undo redo things + getUndoMgr()->Clear(); // clear all undo redo things if ( m_aReportModel ) listen(false); m_pReportControllerObserver->Clear(); @@ -1641,7 +1641,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > // don't change anything here so return return; case RET_NO: - setModified(sal_False); // and we are not modified yet + setModified(sal_False); // and we are not modified yet break; default: break; @@ -1703,8 +1703,8 @@ void OReportController::impl_initialize( ) if ( m_xReportDefinition.is() ) { //m_sName = m_xReportDefinition->getName(); - getView()->initialize(); // show the windows and fill with our informations - getUndoMgr()->Clear(); // clear all undo redo things + getView()->initialize(); // show the windows and fill with our informations + getUndoMgr()->Clear(); // clear all undo redo things getSdrModel(); if ( !m_aReportModel ) throw Exception(); @@ -1776,7 +1776,7 @@ void OReportController::impl_initialize( ) executeUnChecked(SID_SELECT_REPORT,aArgs); } // if ( m_bShowProperties && m_nPageNum == -1 ) - setModified(sal_False); // and we are not modified yet + setModified(sal_False); // and we are not modified yet // open the global help agent // we need a Frame but at this time there is no frame, therefore we send a UserEvent @@ -1861,265 +1861,265 @@ void OReportController::describeSupportedFeatures() { OSingleDocumentController::describeSupportedFeatures(); - implDescribeSupportedFeature( ".uno:TextDocument", SID_RPT_TEXTDOCUMENT, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:Spreadsheet", SID_RPT_SPREADSHEET, CommandGroup::APPLICATION ); - - implDescribeSupportedFeature( ".uno:Redo", SID_REDO, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:Undo", SID_UNDO, CommandGroup::EDIT ); - //implDescribeSupportedFeature( ".uno:PasteSpecial", SID_PASTE, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:SelectAll", SID_SELECTALL, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:SelectAllInSection", SID_SELECTALL_IN_SECTION, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:Delete", SID_DELETE, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:SelectReport", SID_SELECT_REPORT, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:ExecuteReport", SID_EXECUTE_REPORT, CommandGroup::EDIT ); - - implDescribeSupportedFeature( ".uno:GridVisible", SID_GRID_VISIBLE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:GridUse", SID_GRID_USE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:HelplinesMove", SID_HELPLINES_MOVE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ShowRuler", SID_RULER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:AddField", SID_FM_ADD_FIELD, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ReportNavigator", SID_RPT_SHOWREPORTEXPLORER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ControlProperties", SID_SHOW_PROPERTYBROWSER, CommandGroup::VIEW ); - //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:DbSortingAndGrouping", SID_SORTINGANDGROUPING, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:PageHeaderFooter", SID_PAGEHEADERFOOTER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ReportHeaderFooter", SID_REPORTHEADERFOOTER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ZoomSlider", SID_ATTR_ZOOMSLIDER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:Zoom", SID_ATTR_ZOOM, CommandGroup::VIEW ); - //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW ); - - implDescribeSupportedFeature( ".uno:ConditionalFormatting", SID_CONDITIONALFORMATTING, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:PageDialog", SID_PAGEDIALOG, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ResetAttributes", SID_SETCONTROLDEFAULTS, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:Bold", SID_ATTR_CHAR_WEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Italic", SID_ATTR_CHAR_POSTURE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Underline", SID_ATTR_CHAR_UNDERLINE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:BackColor", SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:BackgroundColor", SID_BACKGROUND_COLOR, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Color", SID_ATTR_CHAR_COLOR); - implDescribeSupportedFeature( ".uno:FontColor", SID_ATTR_CHAR_COLOR2, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:FontDialog", SID_CHAR_DLG, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:LeftPara", SID_ATTR_PARA_ADJUST_LEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:CenterPara", SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:RightPara", SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:JustifyPara", SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:FontHeight", SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:CharFontName", SID_ATTR_CHAR_FONT, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:ArrangeMenu", SID_ARRANGEMENU, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:BringToFront", SID_FRAME_TO_TOP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectBackOne", SID_FRAME_DOWN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectForwardOne", SID_FRAME_UP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SendToBack", SID_FRAME_TO_BOTTOM, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SetObjectToForeground", SID_OBJECT_HEAVEN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SetObjectToBackground", SID_OBJECT_HELL, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:ObjectAlign", SID_OBJECT_ALIGN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectAlignLeft", SID_OBJECT_ALIGN_LEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignCenter", SID_OBJECT_ALIGN_CENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectAlignRight", SID_OBJECT_ALIGN_RIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignUp", SID_OBJECT_ALIGN_UP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignMiddle", SID_OBJECT_ALIGN_MIDDLE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignDown", SID_OBJECT_ALIGN_DOWN, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:SectionAlign", SID_SECTION_ALIGN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignLeft", SID_SECTION_ALIGN_LEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignCenter", SID_SECTION_ALIGN_CENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignRight", SID_SECTION_ALIGN_RIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignTop", SID_SECTION_ALIGN_UP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignMiddle", SID_SECTION_ALIGN_MIDDLE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignBottom", SID_SECTION_ALIGN_DOWN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:TextDocument", SID_RPT_TEXTDOCUMENT, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( ".uno:Spreadsheet", SID_RPT_SPREADSHEET, CommandGroup::APPLICATION ); + + implDescribeSupportedFeature( ".uno:Redo", SID_REDO, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:Undo", SID_UNDO, CommandGroup::EDIT ); + //implDescribeSupportedFeature( ".uno:PasteSpecial", SID_PASTE, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:SelectAll", SID_SELECTALL, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:SelectAllInSection", SID_SELECTALL_IN_SECTION, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:Delete", SID_DELETE, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:SelectReport", SID_SELECT_REPORT, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:ExecuteReport", SID_EXECUTE_REPORT, CommandGroup::EDIT ); + + implDescribeSupportedFeature( ".uno:GridVisible", SID_GRID_VISIBLE, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:GridUse", SID_GRID_USE, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:HelplinesMove", SID_HELPLINES_MOVE, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ShowRuler", SID_RULER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:AddField", SID_FM_ADD_FIELD, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ReportNavigator", SID_RPT_SHOWREPORTEXPLORER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ControlProperties", SID_SHOW_PROPERTYBROWSER, CommandGroup::VIEW ); + //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:DbSortingAndGrouping", SID_SORTINGANDGROUPING, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:PageHeaderFooter", SID_PAGEHEADERFOOTER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ReportHeaderFooter", SID_REPORTHEADERFOOTER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ZoomSlider", SID_ATTR_ZOOMSLIDER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:Zoom", SID_ATTR_ZOOM, CommandGroup::VIEW ); + //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW ); + + implDescribeSupportedFeature( ".uno:ConditionalFormatting", SID_CONDITIONALFORMATTING, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:PageDialog", SID_PAGEDIALOG, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ResetAttributes", SID_SETCONTROLDEFAULTS, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:Bold", SID_ATTR_CHAR_WEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:Italic", SID_ATTR_CHAR_POSTURE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:Underline", SID_ATTR_CHAR_UNDERLINE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:BackColor", SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:BackgroundColor", SID_BACKGROUND_COLOR, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:Color", SID_ATTR_CHAR_COLOR); + implDescribeSupportedFeature( ".uno:FontColor", SID_ATTR_CHAR_COLOR2, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:FontDialog", SID_CHAR_DLG, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:LeftPara", SID_ATTR_PARA_ADJUST_LEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:CenterPara", SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:RightPara", SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:JustifyPara", SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:FontHeight", SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:CharFontName", SID_ATTR_CHAR_FONT, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:ArrangeMenu", SID_ARRANGEMENU, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:BringToFront", SID_FRAME_TO_TOP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ObjectBackOne", SID_FRAME_DOWN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ObjectForwardOne", SID_FRAME_UP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SendToBack", SID_FRAME_TO_BOTTOM, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SetObjectToForeground", SID_OBJECT_HEAVEN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SetObjectToBackground", SID_OBJECT_HELL, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:ObjectAlign", SID_OBJECT_ALIGN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ObjectAlignLeft", SID_OBJECT_ALIGN_LEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:AlignCenter", SID_OBJECT_ALIGN_CENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ObjectAlignRight", SID_OBJECT_ALIGN_RIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:AlignUp", SID_OBJECT_ALIGN_UP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:AlignMiddle", SID_OBJECT_ALIGN_MIDDLE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:AlignDown", SID_OBJECT_ALIGN_DOWN, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:SectionAlign", SID_SECTION_ALIGN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignLeft", SID_SECTION_ALIGN_LEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignCenter", SID_SECTION_ALIGN_CENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignRight", SID_SECTION_ALIGN_RIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignTop", SID_SECTION_ALIGN_UP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignMiddle", SID_SECTION_ALIGN_MIDDLE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignBottom", SID_SECTION_ALIGN_DOWN, CommandGroup::FORMAT ); implDescribeSupportedFeature( ".uno:SectionShrink", SID_SECTION_SHRINK, CommandGroup::FORMAT ); implDescribeSupportedFeature( ".uno:SectionShrinkTop", SID_SECTION_SHRINK_TOP, CommandGroup::FORMAT ); implDescribeSupportedFeature( ".uno:SectionShrinkBottom", SID_SECTION_SHRINK_BOTTOM, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectResize", SID_OBJECT_RESIZING, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SmallestWidth", SID_OBJECT_SMALLESTWIDTH, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SmallestHeight", SID_OBJECT_SMALLESTHEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:GreatestWidth", SID_OBJECT_GREATESTWIDTH, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:GreatestHeight", SID_OBJECT_GREATESTHEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Distribution", SID_DISTRIBUTION, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:HelpMenu", SID_HELPMENU, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:ExportTo", SID_EXPORTDOC, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:ExportToPDF", SID_EXPORTDOCASPDF, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:PrintPreview", SID_PRINTPREVIEW, CommandGroup::APPLICATION ); - - implDescribeSupportedFeature( ".uno:NewDoc", SID_NEWDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:Save", SID_SAVEDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:SaveAs", SID_SAVEASDOC, CommandGroup::DOCUMENT ); - - implDescribeSupportedFeature( ".uno:InsertPageNumberField", SID_INSERT_FLD_PGNUMBER, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:InsertDateTimeField", SID_DATETIME, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:InsertObjectChart", SID_INSERT_DIAGRAM, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:InsertGraphic", SID_INSERT_GRAPHIC, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ObjectResize", SID_OBJECT_RESIZING, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SmallestWidth", SID_OBJECT_SMALLESTWIDTH, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SmallestHeight", SID_OBJECT_SMALLESTHEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:GreatestWidth", SID_OBJECT_GREATESTWIDTH, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:GreatestHeight", SID_OBJECT_GREATESTHEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:Distribution", SID_DISTRIBUTION, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:HelpMenu", SID_HELPMENU, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( ".uno:ExportTo", SID_EXPORTDOC, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( ".uno:ExportToPDF", SID_EXPORTDOCASPDF, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( ".uno:PrintPreview", SID_PRINTPREVIEW, CommandGroup::APPLICATION ); + + implDescribeSupportedFeature( ".uno:NewDoc", SID_NEWDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( ".uno:Save", SID_SAVEDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( ".uno:SaveAs", SID_SAVEASDOC, CommandGroup::DOCUMENT ); + + implDescribeSupportedFeature( ".uno:InsertPageNumberField", SID_INSERT_FLD_PGNUMBER, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:InsertDateTimeField", SID_DATETIME, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:InsertObjectChart", SID_INSERT_DIAGRAM, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:InsertGraphic", SID_INSERT_GRAPHIC, CommandGroup::INSERT ); // controls - implDescribeSupportedFeature( ".uno:SelectObject", SID_OBJECT_SELECT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:Label", SID_FM_FIXEDTEXT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:Edit", SID_FM_EDIT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ImageControl", SID_FM_IMAGECONTROL, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:HFixedLine", SID_INSERT_HFIXEDLINE, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:VFixedLine", SID_INSERT_VFIXEDLINE, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SelectObject", SID_OBJECT_SELECT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:Label", SID_FM_FIXEDTEXT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:Edit", SID_FM_EDIT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ImageControl", SID_FM_IMAGECONTROL, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:HFixedLine", SID_INSERT_HFIXEDLINE, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:VFixedLine", SID_INSERT_VFIXEDLINE, CommandGroup::INSERT ); // shapes - implDescribeSupportedFeature( ".uno:BasicShapes", SID_DRAWTBX_CS_BASIC, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.rectangle", SID_DRAWTBX_CS_BASIC1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.round-rectangle",SID_DRAWTBX_CS_BASIC2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.quadrat", SID_DRAWTBX_CS_BASIC3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.round-quadrat", SID_DRAWTBX_CS_BASIC4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.circle", SID_DRAWTBX_CS_BASIC5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.ellipse", SID_DRAWTBX_CS_BASIC6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.circle-pie", SID_DRAWTBX_CS_BASIC7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.isosceles-triangle",SID_DRAWTBX_CS_BASIC8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.right-triangle",SID_DRAWTBX_CS_BASIC9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.trapezoid", SID_DRAWTBX_CS_BASIC10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.diamond", SID_DRAWTBX_CS_BASIC11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.parallelogram", SID_DRAWTBX_CS_BASIC12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.pentagon", SID_DRAWTBX_CS_BASIC13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.hexagon", SID_DRAWTBX_CS_BASIC14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.octagon", SID_DRAWTBX_CS_BASIC15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.cross", SID_DRAWTBX_CS_BASIC16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.ring", SID_DRAWTBX_CS_BASIC17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.block-arc", SID_DRAWTBX_CS_BASIC18, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.can", SID_DRAWTBX_CS_BASIC19, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.cube", SID_DRAWTBX_CS_BASIC20, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.paper", SID_DRAWTBX_CS_BASIC21, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.frame", SID_DRAWTBX_CS_BASIC22, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:SymbolShapes", SID_DRAWTBX_CS_SYMBOL, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:SymbolShapes.smiley" , SID_DRAWTBX_CS_SYMBOL1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.sun" , SID_DRAWTBX_CS_SYMBOL2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.moon" , SID_DRAWTBX_CS_SYMBOL3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.lightning" , SID_DRAWTBX_CS_SYMBOL4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.heart" , SID_DRAWTBX_CS_SYMBOL5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.flower" , SID_DRAWTBX_CS_SYMBOL6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.cloud" , SID_DRAWTBX_CS_SYMBOL7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.forbidden" , SID_DRAWTBX_CS_SYMBOL8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.puzzle" , SID_DRAWTBX_CS_SYMBOL9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.bracket-pair" ,SID_DRAWTBX_CS_SYMBOL10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.left-bracket" ,SID_DRAWTBX_CS_SYMBOL11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.right-bracket",SID_DRAWTBX_CS_SYMBOL12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.brace-pair" , SID_DRAWTBX_CS_SYMBOL13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.left-brace" , SID_DRAWTBX_CS_SYMBOL14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.right-brace" , SID_DRAWTBX_CS_SYMBOL15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.quad-bevel" , SID_DRAWTBX_CS_SYMBOL16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.octagon-bevel",SID_DRAWTBX_CS_SYMBOL17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.diamond-bevel",SID_DRAWTBX_CS_SYMBOL18, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow" , SID_DRAWTBX_CS_ARROW1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow" , SID_DRAWTBX_CS_ARROW2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow" , SID_DRAWTBX_CS_ARROW3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow" , SID_DRAWTBX_CS_ARROW4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow" , SID_DRAWTBX_CS_ARROW5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow" , SID_DRAWTBX_CS_ARROW6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow" , SID_DRAWTBX_CS_ARROW7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-down-arrow" , SID_DRAWTBX_CS_ARROW8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow" , SID_DRAWTBX_CS_ARROW9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.corner-right-arrow" , SID_DRAWTBX_CS_ARROW10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.split-arrow" , SID_DRAWTBX_CS_ARROW11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.striped-right-arrow" , SID_DRAWTBX_CS_ARROW12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.notched-right-arrow" , SID_DRAWTBX_CS_ARROW13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.pentagon-right" , SID_DRAWTBX_CS_ARROW14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.chevron" , SID_DRAWTBX_CS_ARROW15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow-callout" , SID_DRAWTBX_CS_ARROW16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow-callout" , SID_DRAWTBX_CS_ARROW17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow-callout" , SID_DRAWTBX_CS_ARROW18, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow-callout" , SID_DRAWTBX_CS_ARROW19, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow-callout",SID_DRAWTBX_CS_ARROW20, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow-callout" ,SID_DRAWTBX_CS_ARROW21, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow-callout",SID_DRAWTBX_CS_ARROW22, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow-callout" , SID_DRAWTBX_CS_ARROW23, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.circular-arrow" , SID_DRAWTBX_CS_ARROW24, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.split-round-arrow" , SID_DRAWTBX_CS_ARROW25, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.s-sharped-arrow" , SID_DRAWTBX_CS_ARROW26, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:StarShapes.bang" , SID_DRAWTBX_CS_STAR1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star4" , SID_DRAWTBX_CS_STAR2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star5" , SID_DRAWTBX_CS_STAR3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star6" , SID_DRAWTBX_CS_STAR4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star8" , SID_DRAWTBX_CS_STAR5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star12" , SID_DRAWTBX_CS_STAR6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star24" , SID_DRAWTBX_CS_STAR7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.concave-star6" , SID_DRAWTBX_CS_STAR8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.vertical-scroll" , SID_DRAWTBX_CS_STAR9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.horizontal-scroll" , SID_DRAWTBX_CS_STAR10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.signet" , SID_DRAWTBX_CS_STAR11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.doorplate" , SID_DRAWTBX_CS_STAR12, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-process" , SID_DRAWTBX_CS_FLOWCHART1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-alternate-process" , SID_DRAWTBX_CS_FLOWCHART2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-decision" , SID_DRAWTBX_CS_FLOWCHART3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-data" , SID_DRAWTBX_CS_FLOWCHART4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-predefined-process" , SID_DRAWTBX_CS_FLOWCHART5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-internal-storage" , SID_DRAWTBX_CS_FLOWCHART6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-document" , SID_DRAWTBX_CS_FLOWCHART7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-multidocument" , SID_DRAWTBX_CS_FLOWCHART8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-terminator" , SID_DRAWTBX_CS_FLOWCHART9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-preparation" , SID_DRAWTBX_CS_FLOWCHART10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-input" , SID_DRAWTBX_CS_FLOWCHART11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-operation" , SID_DRAWTBX_CS_FLOWCHART12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-connector" , SID_DRAWTBX_CS_FLOWCHART13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-off-page-connector" , SID_DRAWTBX_CS_FLOWCHART14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-card" , SID_DRAWTBX_CS_FLOWCHART15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-punched-tape" , SID_DRAWTBX_CS_FLOWCHART16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-summing-junction" , SID_DRAWTBX_CS_FLOWCHART17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-or" , SID_DRAWTBX_CS_FLOWCHART18, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-collate" , SID_DRAWTBX_CS_FLOWCHART19, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sort" , SID_DRAWTBX_CS_FLOWCHART20, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-extract" , SID_DRAWTBX_CS_FLOWCHART21, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-merge" , SID_DRAWTBX_CS_FLOWCHART22, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-stored-data" , SID_DRAWTBX_CS_FLOWCHART23, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-delay" , SID_DRAWTBX_CS_FLOWCHART24, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sequential-access" , SID_DRAWTBX_CS_FLOWCHART25, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-magnetic-disk" , SID_DRAWTBX_CS_FLOWCHART26, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-direct-access-storage",SID_DRAWTBX_CS_FLOWCHART27, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-display" , SID_DRAWTBX_CS_FLOWCHART28, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:CalloutShapes.rectangular-callout" , SID_DRAWTBX_CS_CALLOUT1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.round-rectangular-callout" , SID_DRAWTBX_CS_CALLOUT2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.round-callout" , SID_DRAWTBX_CS_CALLOUT3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.cloud-callout" , SID_DRAWTBX_CS_CALLOUT4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-1" , SID_DRAWTBX_CS_CALLOUT5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-2" , SID_DRAWTBX_CS_CALLOUT6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-3" , SID_DRAWTBX_CS_CALLOUT7, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:ArrowShapes", SID_DRAWTBX_CS_ARROW, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:FlowChartShapes", SID_DRAWTBX_CS_FLOWCHART, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes", SID_DRAWTBX_CS_CALLOUT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes", SID_DRAWTBX_CS_STAR, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes", SID_DRAWTBX_CS_BASIC, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.rectangle", SID_DRAWTBX_CS_BASIC1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.round-rectangle",SID_DRAWTBX_CS_BASIC2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.quadrat", SID_DRAWTBX_CS_BASIC3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.round-quadrat", SID_DRAWTBX_CS_BASIC4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.circle", SID_DRAWTBX_CS_BASIC5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.ellipse", SID_DRAWTBX_CS_BASIC6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.circle-pie", SID_DRAWTBX_CS_BASIC7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.isosceles-triangle",SID_DRAWTBX_CS_BASIC8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.right-triangle",SID_DRAWTBX_CS_BASIC9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.trapezoid", SID_DRAWTBX_CS_BASIC10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.diamond", SID_DRAWTBX_CS_BASIC11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.parallelogram", SID_DRAWTBX_CS_BASIC12, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.pentagon", SID_DRAWTBX_CS_BASIC13, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.hexagon", SID_DRAWTBX_CS_BASIC14, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.octagon", SID_DRAWTBX_CS_BASIC15, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.cross", SID_DRAWTBX_CS_BASIC16, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.ring", SID_DRAWTBX_CS_BASIC17, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.block-arc", SID_DRAWTBX_CS_BASIC18, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.can", SID_DRAWTBX_CS_BASIC19, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.cube", SID_DRAWTBX_CS_BASIC20, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.paper", SID_DRAWTBX_CS_BASIC21, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.frame", SID_DRAWTBX_CS_BASIC22, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:SymbolShapes", SID_DRAWTBX_CS_SYMBOL, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:SymbolShapes.smiley" , SID_DRAWTBX_CS_SYMBOL1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.sun" , SID_DRAWTBX_CS_SYMBOL2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.moon" , SID_DRAWTBX_CS_SYMBOL3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.lightning" , SID_DRAWTBX_CS_SYMBOL4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.heart" , SID_DRAWTBX_CS_SYMBOL5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.flower" , SID_DRAWTBX_CS_SYMBOL6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.cloud" , SID_DRAWTBX_CS_SYMBOL7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.forbidden" , SID_DRAWTBX_CS_SYMBOL8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.puzzle" , SID_DRAWTBX_CS_SYMBOL9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.bracket-pair" ,SID_DRAWTBX_CS_SYMBOL10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.left-bracket" ,SID_DRAWTBX_CS_SYMBOL11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.right-bracket",SID_DRAWTBX_CS_SYMBOL12, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.brace-pair" , SID_DRAWTBX_CS_SYMBOL13, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.left-brace" , SID_DRAWTBX_CS_SYMBOL14, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.right-brace" , SID_DRAWTBX_CS_SYMBOL15, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.quad-bevel" , SID_DRAWTBX_CS_SYMBOL16, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.octagon-bevel",SID_DRAWTBX_CS_SYMBOL17, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.diamond-bevel",SID_DRAWTBX_CS_SYMBOL18, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow" , SID_DRAWTBX_CS_ARROW1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow" , SID_DRAWTBX_CS_ARROW2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow" , SID_DRAWTBX_CS_ARROW3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow" , SID_DRAWTBX_CS_ARROW4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow" , SID_DRAWTBX_CS_ARROW5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow" , SID_DRAWTBX_CS_ARROW6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow" , SID_DRAWTBX_CS_ARROW7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-down-arrow" , SID_DRAWTBX_CS_ARROW8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow" , SID_DRAWTBX_CS_ARROW9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.corner-right-arrow" , SID_DRAWTBX_CS_ARROW10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.split-arrow" , SID_DRAWTBX_CS_ARROW11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.striped-right-arrow" , SID_DRAWTBX_CS_ARROW12, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.notched-right-arrow" , SID_DRAWTBX_CS_ARROW13, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.pentagon-right" , SID_DRAWTBX_CS_ARROW14, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.chevron" , SID_DRAWTBX_CS_ARROW15, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow-callout" , SID_DRAWTBX_CS_ARROW16, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow-callout" , SID_DRAWTBX_CS_ARROW17, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow-callout" , SID_DRAWTBX_CS_ARROW18, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow-callout" , SID_DRAWTBX_CS_ARROW19, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow-callout",SID_DRAWTBX_CS_ARROW20, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow-callout" ,SID_DRAWTBX_CS_ARROW21, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow-callout",SID_DRAWTBX_CS_ARROW22, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow-callout" , SID_DRAWTBX_CS_ARROW23, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.circular-arrow" , SID_DRAWTBX_CS_ARROW24, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.split-round-arrow" , SID_DRAWTBX_CS_ARROW25, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.s-sharped-arrow" , SID_DRAWTBX_CS_ARROW26, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:StarShapes.bang" , SID_DRAWTBX_CS_STAR1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star4" , SID_DRAWTBX_CS_STAR2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star5" , SID_DRAWTBX_CS_STAR3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star6" , SID_DRAWTBX_CS_STAR4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star8" , SID_DRAWTBX_CS_STAR5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star12" , SID_DRAWTBX_CS_STAR6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star24" , SID_DRAWTBX_CS_STAR7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.concave-star6" , SID_DRAWTBX_CS_STAR8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.vertical-scroll" , SID_DRAWTBX_CS_STAR9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.horizontal-scroll" , SID_DRAWTBX_CS_STAR10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.signet" , SID_DRAWTBX_CS_STAR11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.doorplate" , SID_DRAWTBX_CS_STAR12, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-process" , SID_DRAWTBX_CS_FLOWCHART1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-alternate-process" , SID_DRAWTBX_CS_FLOWCHART2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-decision" , SID_DRAWTBX_CS_FLOWCHART3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-data" , SID_DRAWTBX_CS_FLOWCHART4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-predefined-process" , SID_DRAWTBX_CS_FLOWCHART5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-internal-storage" , SID_DRAWTBX_CS_FLOWCHART6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-document" , SID_DRAWTBX_CS_FLOWCHART7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-multidocument" , SID_DRAWTBX_CS_FLOWCHART8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-terminator" , SID_DRAWTBX_CS_FLOWCHART9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-preparation" , SID_DRAWTBX_CS_FLOWCHART10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-input" , SID_DRAWTBX_CS_FLOWCHART11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-operation" , SID_DRAWTBX_CS_FLOWCHART12, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-connector" , SID_DRAWTBX_CS_FLOWCHART13, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-off-page-connector" , SID_DRAWTBX_CS_FLOWCHART14, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-card" , SID_DRAWTBX_CS_FLOWCHART15, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-punched-tape" , SID_DRAWTBX_CS_FLOWCHART16, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-summing-junction" , SID_DRAWTBX_CS_FLOWCHART17, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-or" , SID_DRAWTBX_CS_FLOWCHART18, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-collate" , SID_DRAWTBX_CS_FLOWCHART19, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sort" , SID_DRAWTBX_CS_FLOWCHART20, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-extract" , SID_DRAWTBX_CS_FLOWCHART21, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-merge" , SID_DRAWTBX_CS_FLOWCHART22, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-stored-data" , SID_DRAWTBX_CS_FLOWCHART23, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-delay" , SID_DRAWTBX_CS_FLOWCHART24, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sequential-access" , SID_DRAWTBX_CS_FLOWCHART25, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-magnetic-disk" , SID_DRAWTBX_CS_FLOWCHART26, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-direct-access-storage",SID_DRAWTBX_CS_FLOWCHART27, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-display" , SID_DRAWTBX_CS_FLOWCHART28, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:CalloutShapes.rectangular-callout" , SID_DRAWTBX_CS_CALLOUT1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.round-rectangular-callout" , SID_DRAWTBX_CS_CALLOUT2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.round-callout" , SID_DRAWTBX_CS_CALLOUT3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.cloud-callout" , SID_DRAWTBX_CS_CALLOUT4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-1" , SID_DRAWTBX_CS_CALLOUT5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-2" , SID_DRAWTBX_CS_CALLOUT6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-3" , SID_DRAWTBX_CS_CALLOUT7, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:ArrowShapes", SID_DRAWTBX_CS_ARROW, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:FlowChartShapes", SID_DRAWTBX_CS_FLOWCHART, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes", SID_DRAWTBX_CS_CALLOUT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes", SID_DRAWTBX_CS_STAR, CommandGroup::INSERT ); // keys - implDescribeSupportedFeature( ".uno:Escape", SID_ESCAPE, CommandGroup::CONTROLS); + implDescribeSupportedFeature( ".uno:Escape", SID_ESCAPE, CommandGroup::CONTROLS); // internal one - implDescribeSupportedFeature( ".uno:RPT_RPTHEADER_UNDO", SID_REPORTHEADER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:RPT_RPTFOOTER_UNDO", SID_REPORTFOOTER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:RPT_PGHEADER_UNDO", SID_PAGEHEADER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:RPT_PGFOOTER_UNDO", SID_PAGEFOOTER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:DBBackgroundColor", SID_ATTR_CHAR_COLOR_BACKGROUND); - implDescribeSupportedFeature( ".uno:SID_GROUPHEADER", SID_GROUPHEADER); - implDescribeSupportedFeature( ".uno:SID_GROUPHEADER_WITHOUT_UNDO", SID_GROUPHEADER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER", SID_GROUPFOOTER); - implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER_WITHOUT_UNDO", SID_GROUPFOOTER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:SID_GROUP_REMOVE", SID_GROUP_REMOVE); - implDescribeSupportedFeature( ".uno:SID_GROUP_APPEND", SID_GROUP_APPEND); - implDescribeSupportedFeature( ".uno:SID_ADD_CONTROL_PAIR", SID_ADD_CONTROL_PAIR); - implDescribeSupportedFeature( ".uno:SplitPosition", SID_SPLIT_POSITION); - implDescribeSupportedFeature( ".uno:LastPropertyBrowserPage", SID_PROPERTYBROWSER_LAST_PAGE); - implDescribeSupportedFeature( ".uno:Select", SID_SELECT); - implDescribeSupportedFeature( ".uno:InsertFunction", SID_RPT_NEW_FUNCTION); - implDescribeSupportedFeature( ".uno:NextMark", SID_NEXT_MARK); - implDescribeSupportedFeature( ".uno:PrevMark", SID_PREV_MARK); + implDescribeSupportedFeature( ".uno:RPT_RPTHEADER_UNDO", SID_REPORTHEADER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:RPT_RPTFOOTER_UNDO", SID_REPORTFOOTER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:RPT_PGHEADER_UNDO", SID_PAGEHEADER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:RPT_PGFOOTER_UNDO", SID_PAGEFOOTER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:DBBackgroundColor", SID_ATTR_CHAR_COLOR_BACKGROUND); + implDescribeSupportedFeature( ".uno:SID_GROUPHEADER", SID_GROUPHEADER); + implDescribeSupportedFeature( ".uno:SID_GROUPHEADER_WITHOUT_UNDO", SID_GROUPHEADER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER", SID_GROUPFOOTER); + implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER_WITHOUT_UNDO", SID_GROUPFOOTER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:SID_GROUP_REMOVE", SID_GROUP_REMOVE); + implDescribeSupportedFeature( ".uno:SID_GROUP_APPEND", SID_GROUP_APPEND); + implDescribeSupportedFeature( ".uno:SID_ADD_CONTROL_PAIR", SID_ADD_CONTROL_PAIR); + implDescribeSupportedFeature( ".uno:SplitPosition", SID_SPLIT_POSITION); + implDescribeSupportedFeature( ".uno:LastPropertyBrowserPage", SID_PROPERTYBROWSER_LAST_PAGE); + implDescribeSupportedFeature( ".uno:Select", SID_SELECT); + implDescribeSupportedFeature( ".uno:InsertFunction", SID_RPT_NEW_FUNCTION); + implDescribeSupportedFeature( ".uno:NextMark", SID_NEXT_MARK); + implDescribeSupportedFeature( ".uno:PrevMark", SID_PREV_MARK); implDescribeSupportedFeature( ".uno:TerminateInplaceActivation", SID_TERMINATE_INPLACEACTIVATION); implDescribeSupportedFeature( ".uno:SelectAllLabels", SID_SELECT_ALL_LABELS); implDescribeSupportedFeature( ".uno:SelectAllEdits", SID_SELECT_ALL_EDITS); - implDescribeSupportedFeature( ".uno:CollapseSection", SID_COLLAPSE_SECTION); - implDescribeSupportedFeature( ".uno:ExpandSection", SID_EXPAND_SECTION); + implDescribeSupportedFeature( ".uno:CollapseSection", SID_COLLAPSE_SECTION); + implDescribeSupportedFeature( ".uno:ExpandSection", SID_EXPAND_SECTION); } // ----------------------------------------------------------------------------- SfxUndoManager* OReportController::getUndoMgr() @@ -2429,16 +2429,16 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ // UNO->ItemSet static SfxItemInfo aItemInfos[] = { - { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, - { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, - { SID_ATTR_PAGE, SFX_ITEM_POOLABLE }, - { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE }, - { SID_ENUM_PAGE_MODE, SFX_ITEM_POOLABLE }, - { SID_PAPER_START, SFX_ITEM_POOLABLE }, - { SID_PAPER_END, SFX_ITEM_POOLABLE }, - { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, - { SID_FLAG_TYPE, SFX_ITEM_POOLABLE }, - { SID_ATTR_METRIC, SFX_ITEM_POOLABLE } + { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, + { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, + { SID_ATTR_PAGE, SFX_ITEM_POOLABLE }, + { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE }, + { SID_ENUM_PAGE_MODE, SFX_ITEM_POOLABLE }, + { SID_PAPER_START, SFX_ITEM_POOLABLE }, + { SID_PAPER_END, SFX_ITEM_POOLABLE }, + { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, + { SID_FLAG_TYPE, SFX_ITEM_POOLABLE }, + { SID_ATTR_METRIC, SFX_ITEM_POOLABLE } }; MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); @@ -2463,8 +2463,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ 0 }; SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ReportPageProperties"), RPTUI_ID_LRSPACE,RPTUI_ID_METRIC, aItemInfos, pDefaults) ); - pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why - pPool->FreezeIdRanges(); // the same + pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why + pPool->FreezeIdRanges(); // the same try { @@ -2495,7 +2495,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ } } - { // want the dialog to be destroyed before our set + { // want the dialog to be destroyed before our set ORptPageDialog aDlg(getView(), pDescriptor.get(),_xSection.is() ? RID_PAGEDIALOG_BACKGROUND : RID_PAGEDIALOG_PAGE); if (RET_OK == aDlg.Execute()) { @@ -2526,8 +2526,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_LRSPACE,sal_True,&pItem)) { - xProp->setPropertyValue(PROPERTY_LEFTMARGIN,uno::makeAny(static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft())); - xProp->setPropertyValue(PROPERTY_RIGHTMARGIN,uno::makeAny(static_cast<const SvxLRSpaceItem*>(pItem)->GetRight())); + xProp->setPropertyValue(PROPERTY_LEFTMARGIN,uno::makeAny((sal_Int32)static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft())); + xProp->setPropertyValue(PROPERTY_RIGHTMARGIN,uno::makeAny((sal_Int32)static_cast<const SvxLRSpaceItem*>(pItem)->GetRight())); } if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_ULSPACE,sal_True,&pItem)) { @@ -3594,7 +3594,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) OUnoObject* pObj = dynamic_cast<OUnoObject*>(pControl[0]); uno::Reference< report::XFixedText> xShapeProp(pObj->getUnoShape(),uno::UNO_QUERY_THROW); xShapeProp->setName(xShapeProp->getName() + sDefaultName ); - + for(i = 0; i < SAL_N_ELEMENTS(pControl);++i) // insert controls { correctOverlapping(pControl[i],pSectionWindow[1-i]->getReportSection()); @@ -3642,7 +3642,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // this should never happen. // else // { - // DBG_ERROR("unhandled case."); + // DBG_ERROR("unhandled case."); // } } } @@ -3717,7 +3717,7 @@ void OReportController::listen(const bool _bAdd) uno::Reference< XPropertyChangeListener > xUndo = &rUndoEnv; uno::Sequence< beans::Property> aSeq = m_xReportDefinition->getPropertySetInfo()->getProperties(); const beans::Property* pIter = aSeq.getConstArray(); - const beans::Property* pEnd = pIter + aSeq.getLength(); + const beans::Property* pEnd = pIter + aSeq.getLength(); const ::rtl::OUString* pPropsBegin = &aProps[0]; const ::rtl::OUString* pPropsEnd = pPropsBegin + (SAL_N_ELEMENTS(aProps)) - 3; for(;pIter != pEnd;++pIter) @@ -4275,8 +4275,8 @@ void OReportController::openZoomDialog() 0 }; SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); - pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why - pPool->FreezeIdRanges(); // the same + pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why + pPool->FreezeIdRanges(); // the same try { ::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges)); @@ -4291,7 +4291,7 @@ void OReportController::openZoomDialog() if ( !bCancel ) { - const SvxZoomItem& rZoomItem = (const SvxZoomItem&)pDlg->GetOutputItemSet()->Get( SID_ATTR_ZOOM ); + const SvxZoomItem& rZoomItem = (const SvxZoomItem&)pDlg->GetOutputItemSet()->Get( SID_ATTR_ZOOM ); m_eZoomType = rZoomItem.GetType(); m_nZoomValue = rZoomItem.GetValue(); if ( m_eZoomType != SVX_ZOOM_PERCENT ) diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 45c389f94bef..007e0e01966e 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public: ,m_bReadOnly(sal_False) { } - + OXReportControllerObserverImpl::~OXReportControllerObserverImpl() { } @@ -119,7 +119,7 @@ public: nEvent == VCLEVENT_WINDOW_RESIZE || nEvent == VCLEVENT_WINDOW_SHOW || nEvent == VCLEVENT_WINDOW_MOUSEMOVE || - nEvent == VCLEVENT_WINDOW_FRAMETITLECHANGED || + nEvent == VCLEVENT_WINDOW_FRAMETITLECHANGED || nEvent == VCLEVENT_WINDOW_HIDE || nEvent == VCLEVENT_EDIT_MODIFY || nEvent == VCLEVENT_SCROLLBAR_ENDSCROLL || @@ -136,18 +136,18 @@ public: return 0L; } */ - + if (nEvent == VCLEVENT_APPLICATION_DATACHANGED ) { DataChangedEvent* pData = reinterpret_cast<DataChangedEvent*>(_pEvt->GetData()); - if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) || - ( pData->GetType() == DATACHANGED_DISPLAY )) && - ( pData->GetFlags() & SETTINGS_STYLE ))) + if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) || + ( pData->GetType() == DATACHANGED_DISPLAY )) && + ( pData->GetFlags() & SETTINGS_STYLE ))) { OEnvLock aLock(*this); - + // sal_uInt32 nCount = m_pImpl->m_aSections.size(); - + // send all Section Objects a 'tingle' // maybe they need a change in format, color, etc ::std::vector< uno::Reference< container::XChild > >::const_iterator aIter = m_pImpl->m_aSections.begin(); @@ -159,7 +159,7 @@ public: { uno::Reference<report::XSection> xSection(xChild, uno::UNO_QUERY); if (xSection.is()) - { + { const sal_Int32 nCount = xSection->getCount(); for (sal_Int32 i = 0; i < nCount; ++i) { @@ -177,7 +177,7 @@ public: } } } - + return 0L; } @@ -196,14 +196,14 @@ public: RemoveElement(xSourceSet); } } - + void OXReportControllerObserver::Clear() { OEnvLock aLock(*this); // sal_uInt32 nDebugValue = m_pImpl->m_aSections.size(); m_pImpl->m_aSections.clear(); } - + // XPropertyChangeListener void SAL_CALL OXReportControllerObserver::propertyChange(const beans::PropertyChangeEvent& _rEvent) throw(uno::RuntimeException) { @@ -214,20 +214,20 @@ public: return; m_aFormattedFieldBeautifier.notifyPropertyChange(_rEvent); - m_aFixedTextColor.notifyPropertyChange(_rEvent); + m_aFixedTextColor.notifyPropertyChange(_rEvent); } - + // ----------------------------------------------------------------------------- -void OXReportControllerObserver::Lock() -{ +void OXReportControllerObserver::Lock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); } -void OXReportControllerObserver::UnLock() -{ +void OXReportControllerObserver::UnLock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); } sal_Bool OXReportControllerObserver::IsLocked() const { return m_pImpl->m_nLocks != 0; } @@ -379,7 +379,7 @@ void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterfac m_aFormattedFieldBeautifier.notifyElementInserted(_rxElement); m_aFixedTextColor.notifyElementInserted(_rxElement); // } - + // if it's a container, start listening at all elements uno::Reference< container::XIndexAccess > xContainer( _rxElement, uno::UNO_QUERY ); if ( xContainer.is() ) @@ -405,7 +405,7 @@ void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInter if ( _xContainer.is() ) { aFind = ::std::find(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(),_xContainer); - + if ( aFind == m_pImpl->m_aSections.end() ) { uno::Reference<container::XChild> xParent(_xContainer->getParent(),uno::UNO_QUERY); diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx index 2867f9fee662..a345d00550c0 100644 --- a/reportdesign/source/ui/report/ReportRuler.cxx +++ b/reportdesign/source/ui/report/ReportRuler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,14 +32,14 @@ namespace rptui { using namespace ::com::sun::star; -DBG_NAME( rpt_OReportRuler ) +DBG_NAME( rpt_OReportRuler ) OReportRuler::OReportRuler(Window* _pParent,OReportWindow* _pReportWindow,const uno::Reference< report::XSection >& _xSection) :Window(_pParent) ,m_pParent(_pReportWindow) { DBG_CTOR( rpt_OReportRuler,NULL); SetMapMode( MapMode( MAP_100TH_MM ) ); - + Show(); } //------------------------------------------------------------------------------ diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 875adf1118e3..9c7888e12c27 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ sal_Int32 lcl_getOverlappedControlColor(/*const uno::Reference <lang::XMultiServ } //------------------------------------------------------------------------------ DBG_NAME( rpt_OReportSection ) -OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< report::XSection >& _xSection) +OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< report::XSection >& _xSection) : Window(_pParent,WB_DIALOGCONTROL) , ::comphelper::OPropertyChangeListener(m_aMutex) , DropTargetHelper(this) @@ -104,7 +104,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re EnableChildTransparentMode(); SetHelpId(HID_REPORTSECTION); SetMapMode( MapMode( MAP_100TH_MM ) ); - + try { fill(); @@ -125,11 +125,11 @@ OReportSection::~OReportSection() //m_pModel->GetUndoEnv().RemoveSection(m_xSection.get()); if ( m_pMulti.is() ) m_pMulti->dispose(); - + if ( m_pReportListener.is() ) m_pReportListener->dispose(); m_pFunc = ::std::auto_ptr<DlgEdFunc>(); - + { ::std::auto_ptr<OSectionView> aTemp( m_pView); if ( m_pView ) @@ -227,7 +227,7 @@ void OReportSection::fill() const Fraction aY(aGridSizeFine.B()); m_pView->SetSnapGridWidth(aX, aY); - m_pView->SetGridSnap( pDesignView->isGridSnap() ); + m_pView->SetGridSnap( pDesignView->isGridSnap() ); m_pView->SetGridFront( FALSE ); m_pView->SetDragStripes( TRUE ); m_pView->SetPageVisible(); @@ -244,7 +244,7 @@ void OReportSection::fill() // LLA: TODO // m_pPage->SetUppBorder(-10000); - m_pView->SetDesignMode( TRUE ); + m_pView->SetDesignMode( TRUE ); m_pView->StartListening( *m_pModel ); /*Resize();*/ @@ -290,7 +290,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC SvxShape* pShape = SvxShape::getImplementation( *pCopiesIter ); SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL; if ( pObject ) - { + { SdrObject* pNeuObj = pObject->Clone(); pNeuObj->SetPage( m_pPage ); @@ -354,16 +354,16 @@ void OReportSection::SetMode( DlgEdMode eNewMode ) m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( ) ); m_pModel->SetReadOnly(eNewMode == RPTUI_READONLY); m_eMode = eNewMode; - } + } } // ----------------------------------------------------------------------------- void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects) -{ +{ Copy(_rAllreadyCopiedObjects,false); } //---------------------------------------------------------------------------- void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects,bool _bEraseAnddNoClone) -{ +{ OSL_ENSURE(m_xSection.is(),"Why is the section here NULL!"); if( !m_pView->AreObjectsMarked() || !m_xSection.is() ) return; @@ -379,7 +379,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb aCopies.reserve(nMark); SdrUndoFactory& rUndo = m_pView->GetModel()->GetSdrUndoFactory(); - + for( ULONG i = nMark; i > 0; ) { --i; @@ -452,13 +452,13 @@ void OReportSection::SelectAll(const sal_uInt16 _nObjectType) { m_pView->UnmarkAll(); SdrObjListIter aIter(*m_pPage,IM_DEEPNOGROUPS); - SdrObject* pObjIter = NULL; + SdrObject* pObjIter = NULL; while( (pObjIter = aIter.Next()) != NULL ) { if ( pObjIter->GetObjIdentifier() == _nObjectType ) m_pView->MarkObj( pObjIter, m_pView->GetSdrPageView() ); } - } + } } } void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rController,const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame,BOOL _bHiContrast) @@ -506,9 +506,9 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) BOOL bHiContrast = rSettings.GetHighContrastMode(); OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController(); uno::Reference<frame::XFrame> xFrame = rController.getFrame(); - PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) ); + PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) ); uno::Reference< report::XReportDefinition> xReportDefinition = getSection()->getReportDefinition(); - + lcl_insertMenuItemImages(aContextMenu,rController,xReportDefinition,xFrame,bHiContrast); Point aPos = _rCEvt.GetMousePosPixel(); @@ -595,7 +595,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } if ( aPos.Y < 0 ) aPos.Y = 0; - if ( bChanged ) + if ( bChanged ) { xReportComponent->setPosition(aPos); correctOverlapping(pObject,*this,false); @@ -616,7 +616,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) Resize(); } - } + } } //------------------------------------------------------------------------------ sal_Bool OReportSection::handleKeyEvent(const KeyEvent& _rEvent) @@ -662,7 +662,7 @@ void OReportSection::createDefault(const ::rtl::OUString& _sType,SdrObject* _pOb if( pSourceObj ) { const SfxItemSet& rSource = pSourceObj->GetMergedItemSet(); - SfxItemSet aDest( _pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj + SfxItemSet aDest( _pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, @@ -779,7 +779,7 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt ) if ( ::svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors) || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) ) return _rEvt.mnAction; - + const sal_Int8 nDropOption = ( OReportExchange::canExtract(rFlavors) ) ? DND_ACTION_COPYMOVE : DND_ACTION_NONE; return nDropOption; @@ -827,13 +827,13 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) if ( !bMultipleFormat ) { ::svx::ODataAccessDescriptor aDescriptor = ::svx::OColumnTransferable::extractColumnDescriptor(aDropped); - + aValues.realloc(1); aValues[0].Value <<= aDescriptor.createPropertyValueSequence(); } // if ( !bMultipleFormat ) - else + else aValues = ::svx::OMultiColumnTransferable::extractDescriptor(aDropped); - + beans::PropertyValue* pIter = aValues.getArray(); beans::PropertyValue* pEnd = pIter + aValues.getLength(); for(;pIter != pEnd; ++pIter) @@ -846,7 +846,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) aCurrent.realloc(nLength + 3); aCurrent[nLength].Name = PROPERTY_POSITION; aCurrent[nLength++].Value <<= AWTPoint(aDropPos); - // give also the DND Action (Shift|Ctrl) Key to really say what we want + // give also the DND Action (Shift|Ctrl) Key to really say what we want aCurrent[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")); aCurrent[nLength++].Value <<= _rEvt.mnAction; diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index cd9363e05d57..ddbeea74a9a9 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ #include <toolkit/helper/vclunohelper.hxx> -#define SECTION_OFFSET 3 +#define SECTION_OFFSET 3 namespace rptui { using namespace ::com::sun::star; @@ -64,7 +64,7 @@ using namespace ::comphelper; //================================================================== DBG_NAME( rpt_OReportWindow ) //------------------------------------------------------------------------------ -OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) +OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) : Window(_pParent,WB_DIALOGCONTROL) ,m_aHRuler(this) ,m_pView(_pView) @@ -78,7 +78,7 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) m_aViewsWindow.Show(); - m_aHRuler.Show(); + m_aHRuler.Show(); m_aHRuler.Activate(); m_aHRuler.SetPagePos(0); m_aHRuler.SetBorders(); @@ -103,7 +103,7 @@ void OReportWindow::initialize() //---------------------------------------------------------------------------- void OReportWindow::SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType ) { - m_aViewsWindow.SetInsertObj( eObj,_sShapeType); + m_aViewsWindow.SetInsertObj( eObj,_sShapeType); } //---------------------------------------------------------------------------- @@ -114,7 +114,7 @@ rtl::OUString OReportWindow::GetInsertObjString() const //------------------------------------------------------------------------------ void OReportWindow::SetMode( DlgEdMode eNewMode ) { - m_aViewsWindow.SetMode(eNewMode); + m_aViewsWindow.SetMode(eNewMode); } //---------------------------------------------------------------------------- void OReportWindow::removeSection(USHORT _nPosition) @@ -129,9 +129,9 @@ void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSecti { if ( !_xSection.is() ) return; - - m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition); - + + m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition); + m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight()); } //------------------------------------------------------------------------------ @@ -143,7 +143,7 @@ void OReportWindow::toggleGrid(sal_Bool _bVisible) void OReportWindow::showRuler(sal_Bool _bShow) { m_aHRuler.Show(_bShow); - + m_aViewsWindow.showRuler(_bShow); } //------------------------------------------------------------------------------ @@ -157,7 +157,7 @@ sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const } //------------------------------------------------------------------------------ sal_Int32 OReportWindow::GetTotalWidth() const -{ +{ sal_Int32 nWidth = 0; if ( !m_aViewsWindow.empty() ) { @@ -170,7 +170,7 @@ sal_Int32 OReportWindow::GetTotalWidth() const const Size aPageSize = LogicToPixel(Size(aPaperWidth,0)); nWidth = aPageSize.Width() + long(aStartWidth); } - return nWidth; + return nWidth; } //------------------------------------------------------------------------------ void OReportWindow::Resize() @@ -200,12 +200,12 @@ void OReportWindow::Resize() m_aHRuler.SetNullOffset(nLeftMargin); m_aHRuler.SetMargin1(0); m_aHRuler.SetMargin2(aPageSize.Width() - nLeftMargin - nRightMargin); - + aStartPoint.Y() += aPageSize.Height(); nSectionsHeight -= aStartPoint.Y(); aStartPoint.X() = aOffset.X(); - + m_aViewsWindow.SetPosSizePixel(aStartPoint,Size(aTotalOutputSize.Width(),nSectionsHeight)); } } @@ -227,7 +227,7 @@ void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } @@ -269,19 +269,19 @@ BOOL OReportWindow::HasSelection() const //---------------------------------------------------------------------------- void OReportWindow::Delete() { - + m_aViewsWindow.Delete(); } //---------------------------------------------------------------------------- void OReportWindow::Copy() -{ - +{ + m_aViewsWindow.Copy(); } //---------------------------------------------------------------------------- void OReportWindow::Paste() { - + m_aViewsWindow.Paste(); } //---------------------------------------------------------------------------- @@ -292,13 +292,13 @@ BOOL OReportWindow::IsPasteAllowed() const //----------------------------------------------------------------------------- void OReportWindow::SelectAll(const sal_uInt16 _nObjectType) { - + m_aViewsWindow.SelectAll(_nObjectType); } //----------------------------------------------------------------------------- void OReportWindow::unmarkAllObjects(OSectionView* _pSectionView) { - + m_aViewsWindow.unmarkAllObjects(_pSectionView); } //----------------------------------------------------------------------------- @@ -321,13 +321,13 @@ void OReportWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark) //------------------------------------------------------------------------ void OReportWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark) { - + m_aViewsWindow.setMarked(_xSection,_bMark); } //------------------------------------------------------------------------ void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark) { - + m_aViewsWindow.setMarked(_xShape,_bMark); } //----------------------------------------------------------------------------- @@ -341,33 +341,33 @@ void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepo return m_aViewsWindow.getSectionWindow(_xSection); } // ------------------------------------------------------------------------- -void OReportWindow::markSection(const sal_uInt16 _nPos) +void OReportWindow::markSection(const sal_uInt16 _nPos) { - + m_aViewsWindow.markSection(_nPos); } // ----------------------------------------------------------------------------- void OReportWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const { - + m_aViewsWindow.fillCollapsedSections(_rCollapsedPositions); } // ----------------------------------------------------------------------------- void OReportWindow::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections) { - + m_aViewsWindow.collapseSections(_aCollpasedSections); } // ----------------------------------------------------------------------------- void OReportWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects) { - + m_aViewsWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects); } // ----------------------------------------------------------------------------- void OReportWindow::setGridSnap(BOOL bOn) { - + m_aViewsWindow.setGridSnap(bOn); } // ----------------------------------------------------------------------------- @@ -388,13 +388,13 @@ void OReportWindow::zoom(const Fraction& _aZoom) //setZoomFactor(_aZoom,*this); // if this will be include the H - ruler has the wrong size m_aViewsWindow.zoom(_aZoom); - + notifySizeChanged(); const Point aNewThumbPos( m_pParent->getThumbPos() ); ScrollChildren( aNewThumbPos ); Resize(); - + Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); } // ----------------------------------------------------------------------------- @@ -437,10 +437,10 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const break; } - return nZoom; + return nZoom; } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 82988a764f99..2f4429f72202 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ namespace rptui { -#define LINE_SIZE 50 -#define SECTION_OFFSET 3 +#define LINE_SIZE 50 +#define SECTION_OFFSET 3 #define SCR_LINE_SIZE 10 using namespace ::com::sun::star; @@ -53,7 +53,7 @@ void lcl_setScrollBar(sal_Int32 _nNewValue,const Point& _aPos,const Size& _aSize // ----------------------------------------------------------------------------- DBG_NAME( rpt_OScrollWindowHelper ); -OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) +OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) : OScrollWindowHelper_BASE( _pDesignView,WB_DIALOGCONTROL) ,OPropertyChangeListener(m_aMutex) ,m_aHScroll( this, WB_HSCROLL|WB_REPEAT|WB_DRAG ) @@ -65,7 +65,7 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) { DBG_CTOR( rpt_OScrollWindowHelper,NULL); SetMapMode( MapMode( MAP_100TH_MM ) ); - + impl_initScrollBar( m_aHScroll ); impl_initScrollBar( m_aVScroll ); @@ -96,7 +96,7 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const //_rScrollBar.SetMapMode( MapMode( MAP_100TH_MM ) ); _rScrollBar.SetScrollHdl( LINK( this, OScrollWindowHelper, ScrollHdl ) ); - _rScrollBar.SetLineSize( SCR_LINE_SIZE ); + _rScrollBar.SetLineSize( SCR_LINE_SIZE ); } // ----------------------------------------------------------------------------- @@ -104,7 +104,7 @@ void OScrollWindowHelper::initialize() { uno::Reference<report::XReportDefinition> xReportDefinition = m_pParent->getController().getReportDefinition(); m_pReportDefintionMultiPlexer = addStyleListener(xReportDefinition,this); - + m_aReportWindow.initialize(); } //------------------------------------------------------------------------------ @@ -118,7 +118,7 @@ void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight) long nWidth = long(_nWidth - (double)aStartWidth); m_aHScroll.SetRangeMax( nWidth ); m_aVScroll.SetRangeMax( m_aTotalPixelSize.Height() ); - + Resize(); } //------------------------------------------------------------------------------ @@ -134,14 +134,14 @@ Size OScrollWindowHelper::ResizeScrollBars() const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize(); bool bVVisible = false; // by default no vertical-ScrollBar bool bHVisible = false; // by default no horizontal-ScrollBar - bool bChanged; // determines if a visiblility was changed + bool bChanged; // determines if a visiblility was changed do { bChanged = false; // does we need a vertical ScrollBar if ( aOutPixSz.Width() < m_aTotalPixelSize.Width() && !bHVisible ) - { + { bHVisible = true; aOutPixSz.Height() -= nScrSize; bChanged = true; @@ -149,7 +149,7 @@ Size OScrollWindowHelper::ResizeScrollBars() // does we need a horizontal ScrollBar if ( aOutPixSz.Height() < m_aTotalPixelSize.Height() && !bVVisible ) - { + { bVVisible = true; aOutPixSz.Width() -= nScrSize; bChanged = true; @@ -175,7 +175,7 @@ Size OScrollWindowHelper::ResizeScrollBars() const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, SECTION_OFFSET ), MAP_APPFONT ); // resize scrollbars and set their ranges - { + { Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100); const sal_Int32 nNewWidth = aOutPixSz.Width() - aOffset.X() - (long)aStartWidth; lcl_setScrollBar(nNewWidth,Point( (long)aStartWidth + aOffset.X(), aOutPixSz.Height() ),Size( nNewWidth, nScrSize ),m_aHScroll); @@ -250,7 +250,7 @@ void OScrollWindowHelper::Delete() } //---------------------------------------------------------------------------- void OScrollWindowHelper::Copy() -{ +{ m_aReportWindow.Copy(); } //---------------------------------------------------------------------------- @@ -314,7 +314,7 @@ void OScrollWindowHelper::setMarked(const uno::Sequence< uno::Reference< report: return m_aReportWindow.getSectionWindow(_xSection); } // ------------------------------------------------------------------------- -void OScrollWindowHelper::markSection(const sal_uInt16 _nPos) +void OScrollWindowHelper::markSection(const sal_uInt16 _nPos) { m_aReportWindow.markSection(_nPos); } @@ -332,19 +332,19 @@ void OScrollWindowHelper::collapseSections(const uno::Sequence< ::com::sun::star long OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) { const CommandEvent* pCommandEvent = rNEvt.GetCommandEvent(); - if ( pCommandEvent && + if ( pCommandEvent && ( ((pCommandEvent->GetCommand() == COMMAND_WHEEL) || (pCommandEvent->GetCommand() == COMMAND_STARTAUTOSCROLL) || (pCommandEvent->GetCommand() == COMMAND_AUTOSCROLL))) ) - { + { ScrollBar* pHScrBar = NULL; ScrollBar* pVScrBar = NULL; if ( m_aHScroll.IsVisible() ) pHScrBar = &m_aHScroll; - + if ( m_aVScroll.IsVisible() ) pVScrBar = &m_aVScroll; - + if ( HandleScrollCommand( *pCommandEvent, pHScrBar, pVScrBar ) ) return 1L; } @@ -371,7 +371,7 @@ void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index b0c9a080ea3a..f47df1521b36 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O OSectionView::~OSectionView() { - DBG_DTOR( rpt_OSectionView,NULL); + DBG_DTOR( rpt_OSectionView,NULL); } //---------------------------------------------------------------------------- @@ -73,7 +73,7 @@ void OSectionView::MarkListHasChanged() { DBG_CHKTHIS( rpt_OSectionView,NULL); SdrView::MarkListHasChanged(); - + if ( m_pReportWindow && m_pSectionWindow && !m_pSectionWindow->getPage()->getSpecialMode() ) { //m_pReportWindow->unmarkAllObjects(this); // WHY @@ -183,8 +183,8 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo ) { if (AreObjectsMarked()) { - // #i11702# use SdrUndoObjectLayerChange for undo - // STR_UNDO_SELATTR is "Attributes" - should use a different text later + // #i11702# use SdrUndoObjectLayerChange for undo + // STR_UNDO_SELATTR is "Attributes" - should use a different text later BegUndo( ); const SdrMarkList& rMark = GetMarkedObjectList(); @@ -210,7 +210,7 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo ) EndUndo(); - // #84073# check mark list now instead of later in a timer + // #84073# check mark list now instead of later in a timer CheckMarked(); MarkListHasChanged(); } diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 0a829c73f01e..7a72e6e075ac 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace rptui { -#define SECTION_OFFSET 3 +#define SECTION_OFFSET 3 using namespace ::com::sun::star; using namespace ::comphelper; @@ -78,8 +78,8 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep m_aSplitter.SetEndSplitHdl(LINK(this, OSectionWindow,EndSplitHdl)); m_aSplitter.SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); m_aSplitter.SetSplitPosPixel(m_aSplitter.LogicToPixel(Size(0,_xSection->getHeight())).Height()); - - + + m_aStartMarker.setCollapsedHdl(LINK(this,OSectionWindow,Collapsed)); m_aStartMarker.zoom(rMapMode.GetScaleX()); @@ -108,7 +108,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep aEvent.Source = xGroup; aEvent.PropertyName = PROPERTY_EXPRESSION; } - + _propertyChanged(aEvent); SetPaintTransparent(TRUE); } @@ -125,7 +125,7 @@ OSectionWindow::~OSectionWindow() } catch (uno::Exception&) { - } + } } // ----------------------------------------------------------------------------- void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) @@ -152,7 +152,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) else if ( _rEvent.PropertyName.equals(PROPERTY_NAME) && !xSection->getGroup().is() ) { uno::Reference< report::XReportDefinition > xReport = xSection->getReportDefinition(); - if ( setReportSectionTitle(xReport,RID_STR_REPORT_HEADER,::std::mem_fun(&OReportHelper::getReportHeader),::std::mem_fun(&OReportHelper::getReportHeaderOn)) + if ( setReportSectionTitle(xReport,RID_STR_REPORT_HEADER,::std::mem_fun(&OReportHelper::getReportHeader),::std::mem_fun(&OReportHelper::getReportHeaderOn)) || setReportSectionTitle(xReport,RID_STR_REPORT_FOOTER,::std::mem_fun(&OReportHelper::getReportFooter),::std::mem_fun(&OReportHelper::getReportFooterOn)) || setReportSectionTitle(xReport,RID_STR_PAGE_HEADER,::std::mem_fun(&OReportHelper::getPageHeader),::std::mem_fun(&OReportHelper::getPageHeaderOn)) || setReportSectionTitle(xReport,RID_STR_PAGE_FOOTER,::std::mem_fun(&OReportHelper::getPageFooter),::std::mem_fun(&OReportHelper::getPageFooterOn)) ) @@ -223,15 +223,15 @@ void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } //------------------------------------------------------------------------------ void OSectionWindow::Resize() { - Window::Resize(); - + Window::Resize(); + Size aOutputSize = GetOutputSizePixel(); Fraction aEndWidth(long(REPORT_ENDMARKER_WIDTH)); aEndWidth *= GetMapMode().GetScaleX(); @@ -246,9 +246,9 @@ void OSectionWindow::Resize() m_aStartMarker.SetPosSizePixel(aPos,aOutputSize); } else - { + { const bool bShowEndMarker = m_pParent->getView()->GetTotalWidth() <= (aThumbPos.X() + aOutputSize.Width() ); - + Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); aStartWidth *= GetMapMode().GetScaleX(); @@ -331,13 +331,13 @@ void OSectionWindow::zoom(const Fraction& _aZoom) IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*, ) { const String sEmpty(ModuleRes(RID_STR_UNDO_CHANGE_SIZE)); - getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->EnterListAction(sEmpty,String()); + getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->EnterListAction(sEmpty,String()); return 0L; } //------------------------------------------------------------------------------ IMPL_LINK( OSectionWindow, EndSplitHdl, Splitter*, ) { - getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->LeaveListAction(); + getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->LeaveListAction(); /*getViewsWindow()->Resize();*/ return 0L; } @@ -351,12 +351,12 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter ) sal_Int32 nSplitPos = _pSplitter->GetSplitPosPixel(); const Point aPos = _pSplitter->GetPosPixel(); - + const uno::Reference< report::XSection> xSection = m_aReportSection.getSection(); nSplitPos = m_aSplitter.PixelToLogic(Size(0,nSplitPos)).Height(); // nSplitPos = xSection->getHeight() + m_aSplitter.PixelToLogic(Size(0,nSplitPos - aPos.Y() )).Height(); - + const sal_Int32 nCount = xSection->getCount(); for (sal_Int32 i = 0; i < nCount; ++i) { @@ -404,10 +404,10 @@ void OSectionWindow::scrollChildren(long _nX) //OWindowPositionCorrector aCorrector(&m_aReportSection,-aDelta.Width(),0); lcl_scroll(m_aReportSection,aDiff); } - + //lcl_setOrigin(m_aEndMarker,_nDeltaX, 0); lcl_scroll(m_aEndMarker,m_aEndMarker.PixelToLogic(Point(_nX,0))); - + lcl_setOrigin(m_aSplitter,_nX, 0); lcl_scroll(m_aSplitter,aDiff); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index da2e56a178e8..0cd74a8988bd 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,18 +42,18 @@ #include <unotools/syslocale.hxx> #include <svl/smplhint.hxx> -#define CORNER_SPACE 5 +#define CORNER_SPACE 5 //===================================================================== namespace rptui { //===================================================================== -Image* OStartMarker::s_pDefCollapsed = NULL; -Image* OStartMarker::s_pDefExpanded = NULL; -Image* OStartMarker::s_pDefCollapsedHC = NULL; -Image* OStartMarker::s_pDefExpandedHC = NULL; -oslInterlockedCount OStartMarker::s_nImageRefCount = 0; +Image* OStartMarker::s_pDefCollapsed = NULL; +Image* OStartMarker::s_pDefExpanded = NULL; +Image* OStartMarker::s_pDefCollapsedHC = NULL; +Image* OStartMarker::s_pDefExpandedHC = NULL; +oslInterlockedCount OStartMarker::s_nImageRefCount = 0; DBG_NAME( rpt_OStartMarker ) // ----------------------------------------------------------------------------- @@ -89,7 +89,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sCol // ----------------------------------------------------------------------------- OStartMarker::~OStartMarker() { - DBG_DTOR( rpt_OStartMarker,NULL); + DBG_DTOR( rpt_OStartMarker,NULL); if ( osl_decrementInterlockedCount(&s_nImageRefCount) == 0 ) { DELETEZ(s_pDefCollapsed); @@ -168,7 +168,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) { if ( !rMEvt.IsLeft() ) return; - + Point aPos( rMEvt.GetPosPixel()); const Size aOutputSize = GetOutputSizePixel(); @@ -178,7 +178,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) if ( rMEvt.GetClicks() == 2 || aRect.IsInside( aPos ) ) { m_bCollapsed = !m_bCollapsed; - + changeImage(); m_aVRuler.Show(!m_bCollapsed && m_bShowRuler); @@ -209,7 +209,7 @@ void OStartMarker::initDefaultNodeImages() s_pDefExpandedHC = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED_HC ) ); } - Image* pImage = NULL; + Image* pImage = NULL; if ( GetSettings().GetStyleSettings().GetHighContrastMode() ) { pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC; @@ -236,7 +236,7 @@ void OStartMarker::ImplInitSettings() void OStartMarker::Resize() { const Size aOutputSize( GetOutputSizePixel() ); - const long nOutputWidth = aOutputSize.Width(); + const long nOutputWidth = aOutputSize.Width(); const long nOutputHeight = aOutputSize.Height(); const long nVRulerWidth = m_aVRuler.GetSizePixel().Width(); @@ -305,7 +305,7 @@ void OStartMarker::RequestHelp( const HelpEvent& rHEvt ) } // ----------------------------------------------------------------------------- void OStartMarker::setCollapsed(sal_Bool _bCollapsed) -{ +{ OColorListener::setCollapsed(_bCollapsed); showRuler(_bCollapsed); changeImage(); diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 8571adceb816..df456b102770 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ using namespace ::comphelper; bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,SdrObject* _pObj,SdrView* _pView,sal_Int32 _nControlModification, bool _bBoundRects) { bool bMoveAllowed = _nXMov != 0 || _nYMov != 0; - if ( bMoveAllowed ) + if ( bMoveAllowed ) { Rectangle aNewRect = _aObjRect; SdrObject* pOverlappedObj = NULL; @@ -87,7 +87,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd break; } if ( dynamic_cast<OUnoObject*>(_pObj) ) - { + { pOverlappedObj = isOver(aNewRect,*_pObj->GetPage(),*_pView,true,_pObj); if ( pOverlappedObj && _pObj != pOverlappedObj ) { @@ -97,7 +97,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd switch(_nControlModification) { case ControlModification::LEFT: - nXTemp += aOverlappingRect.Right() - aNewRect.Left(); + nXTemp += aOverlappingRect.Right() - aNewRect.Left(); bMoveAllowed = _nXMov != nXTemp; break; case ControlModification::RIGHT: @@ -164,7 +164,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd default: break; } - + _nXMov = nXTemp; _nYMov = nYTemp; } @@ -179,7 +179,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd // ----------------------------------------------------------------------------- DBG_NAME( rpt_OViewsWindow ); -OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) +OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) : Window( _pReportWindow,WB_DIALOGCONTROL) ,m_pParent(_pReportWindow) ,m_bInUnmark(sal_False) @@ -202,7 +202,7 @@ OViewsWindow::~OViewsWindow() // ----------------------------------------------------------------------------- void OViewsWindow::initialize() { - + } // ----------------------------------------------------------------------------- void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet) @@ -211,7 +211,7 @@ void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Poin Size aSectionSize = _rSectionWindow.LogicToPixel( Size( 0,xSection->getHeight() ) ); aSectionSize.Width() = getView()->GetTotalWidth(); - + const sal_Int32 nMinHeight = _rSectionWindow.getStartMarker().getMinHeight(); if ( _rSectionWindow.getStartMarker().isCollapsed() || nMinHeight > aSectionSize.Height() ) { @@ -241,7 +241,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow) aStartPoint = pSectionWindow->GetPosPixel(); bSet = true; } // if ( pSectionWindow.get() == &_rSectionWindow ) - + if ( bSet ) { impl_resizeSectionWindow(*pSectionWindow.get(),aStartPoint,bSet); @@ -255,18 +255,18 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow) aOut.Width() = aStartWidth; aOut = PixelToLogic(aOut); m_pParent->notifySizeChanged(); - + Rectangle aRect(PixelToLogic(Point(0,0)),aOut); Invalidate(aRect,INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); } //------------------------------------------------------------------------------ void OViewsWindow::Resize() { - Window::Resize(); + Window::Resize(); if ( !m_aSections.empty() ) { const Point aOffset(m_pParent->getThumbPos()); - Point aStartPoint(0,-aOffset.Y()); + Point aStartPoint(0,-aOffset.Y()); TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); for (USHORT nPos=0;aIter != aEnd ; ++aIter,++nPos) @@ -280,21 +280,21 @@ void OViewsWindow::Resize() void OViewsWindow::Paint( const Rectangle& rRect ) { Window::Paint( rRect ); - + Size aOut = GetOutputSizePixel(); Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); aStartWidth *= GetMapMode().GetScaleX(); aOut.Width() -= (long)aStartWidth; aOut = PixelToLogic(aOut); - + Rectangle aRect(PixelToLogic(Point(aStartWidth,0)),aOut); Wallpaper aWall( m_aColorConfig.GetColorValue(::svtools::APPBACKGROUND).nColor ); DrawWallpaper(aRect,aWall); } //------------------------------------------------------------------------------ void OViewsWindow::ImplInitSettings() -{ +{ // SetBackground( Wallpaper( COL_LIGHTBLUE )); SetBackground( ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); @@ -330,7 +330,7 @@ void OViewsWindow::removeSection(USHORT _nPosition) TSectionsMap::iterator aNew = getIteratorAtPos(_nPosition == 0 ? _nPosition+1: _nPosition - 1); m_pParent->getReportView()->UpdatePropertyBrowserDelayed((*aNew)->getReportSection().getSectionView()); - + m_aSections.erase(aPos); Resize(); } // if ( _nPosition < m_aSections.size() ) @@ -389,7 +389,7 @@ BOOL OViewsWindow::HasSelection() const TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd && !(*aIter)->getReportSection().getSectionView().AreObjectsMarked(); ++aIter) ; - return aIter != aEnd; + return aIter != aEnd; } //---------------------------------------------------------------------------- void OViewsWindow::Delete() @@ -416,7 +416,7 @@ void OViewsWindow::Copy() } //---------------------------------------------------------------------------- void OViewsWindow::Paste() -{ +{ TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(this)); OReportExchange::TSectionElements aCopies = OReportExchange::extractCopies(aTransferData); if ( aCopies.getLength() > 1 ) @@ -445,7 +445,7 @@ void OViewsWindow::Paste() break; } } - + return pSectionWindow; } @@ -455,7 +455,7 @@ void OViewsWindow::Paste() ::boost::shared_ptr<OSectionWindow> pRet; TSectionsMap::const_iterator aIter = m_aSections.begin(); TSectionsMap::const_iterator aEnd = m_aSections.end(); - sal_uInt32 nCurrentPosition = 0; + sal_uInt32 nCurrentPosition = 0; for (; aIter != aEnd ; ++aIter) { if ( (*aIter)->getStartMarker().isMarked() ) @@ -464,7 +464,7 @@ void OViewsWindow::Paste() { pRet = (*aIter); break; - } + } else if ( nsa == PREVIOUS ) { if (nCurrentPosition > 0) @@ -503,11 +503,11 @@ void OViewsWindow::Paste() } // ( (*aIter).second->isMarked() ) ++nCurrentPosition; } // for (; aIter != aEnd ; ++aIter) - + return pRet; } // ------------------------------------------------------------------------- -void OViewsWindow::markSection(const sal_uInt16 _nPos) +void OViewsWindow::markSection(const sal_uInt16 _nPos) { if ( _nPos < m_aSections.size() ) m_pParent->setMarked(m_aSections[_nPos]->getReportSection().getSection(),sal_True); @@ -547,10 +547,10 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView) } //----------------------------------------------------------------------------- /* -::boost::shared_ptr<OSectionWindow> OViewsWindow::getReportSection(const uno::Reference< report::XSection >& _xSection) +::boost::shared_ptr<OSectionWindow> OViewsWindow::getReportSection(const uno::Reference< report::XSection >& _xSection) { OSL_ENSURE(_xSection.is(),"Section is NULL!"); - ::boost::shared_ptr<OSectionWindow> pRet; + ::boost::shared_ptr<OSectionWindow> pRet; TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); for (; aIter != aEnd ; ++aIter) @@ -609,7 +609,7 @@ void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt ) for (aIter = m_aSections.begin();aIter != aEnd ; ++aIter) { (*aIter)->getReportSection().getPage()->resetSpecialMode(); - } + } } } //------------------------------------------------------------------------------ @@ -676,7 +676,7 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor bFirst = false; m_pParent->setMarked(xSection,_bMark); } - ::boost::shared_ptr<OSectionWindow> pSectionWindow = getSectionWindow(xSection); + ::boost::shared_ptr<OSectionWindow> pSectionWindow = getSectionWindow(xSection); if ( pSectionWindow ) { SvxShape* pShape = SvxShape::getImplementation( *pIter ); @@ -700,7 +700,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles, bool _bBo { rView.SortMarkedObjects(); const sal_uInt32 nCount = rView.GetMarkedObjectCount(); - for (sal_uInt32 i=0; i < nCount; ++i) + for (sal_uInt32 i=0; i < nCount; ++i) { const SdrMark* pM = rView.GetSdrMarkByIndex(i); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -745,7 +745,7 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles, const SdrObject* pObj = aRectIter->second.first; pObj->TakeObjInfo(aInfo); BOOL bHasFixed = !aInfo.bMoveAllowed || pObj->IsMoveProtect(); - if ( bHasFixed ) + if ( bHasFixed ) _rBound.Union(aObjRect); else { @@ -765,12 +765,12 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles, } catch(uno::Exception){} } - } - else + } + else { - if (_bBoundRects) + if (_bBoundRects) _rBound.Union(aRectIter->second.second->GetMarkedObjBoundRect()); - else + else _rBound.Union(aRectIter->second.second->GetMarkedObjRect()); } } @@ -784,7 +784,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli Point aRefPoint; RectangleLess::CompareMode eCompareMode = RectangleLess::POS_LEFT; - switch (_nControlModification) + switch (_nControlModification) { case ControlModification::TOP : eCompareMode = RectangleLess::POS_UPPER; break; case ControlModification::BOTTOM: eCompareMode = RectangleLess::POS_DOWN; break; @@ -793,7 +793,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli case ControlModification::CENTER_HORIZONTAL : case ControlModification::CENTER_VERTICAL : { - eCompareMode = (ControlModification::CENTER_VERTICAL == _nControlModification) ? RectangleLess::POS_CENTER_VERTICAL : RectangleLess::POS_CENTER_HORIZONTAL; + eCompareMode = (ControlModification::CENTER_VERTICAL == _nControlModification) ? RectangleLess::POS_CENTER_VERTICAL : RectangleLess::POS_CENTER_HORIZONTAL; uno::Reference<report::XSection> xSection = (*m_aSections.begin())->getReportSection().getSection(); uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); aRefPoint = Rectangle(getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN),0, @@ -806,7 +806,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli RectangleLess aCompare(eCompareMode,aRefPoint); TRectangleMap aSortRectangles(aCompare); collectRectangles(aSortRectangles,_bBoundRects); - + Rectangle aBound; Rectangle aResize; collectBoundResizeRect(aSortRectangles,_nControlModification,_bAlignAtSection,_bBoundRects,aBound,aResize); @@ -825,36 +825,36 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli Point aCenter(aBound.Center()); SdrObjTransformInfoRec aInfo; pObj->TakeObjInfo(aInfo); - if (aInfo.bMoveAllowed && !pObj->IsMoveProtect()) + if (aInfo.bMoveAllowed && !pObj->IsMoveProtect()) { long nXMov = 0; long nYMov = 0; long* pValue = &nXMov; switch(_nControlModification) { - case ControlModification::TOP : + case ControlModification::TOP : aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Top); aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Bottom); pValue = &nYMov; break; - case ControlModification::BOTTOM: + case ControlModification::BOTTOM: // defaults are already set pValue = &nYMov; break; - case ControlModification::CENTER_VERTICAL: - nYMov = aCenter.Y() - aObjRect.Center().Y(); + case ControlModification::CENTER_VERTICAL: + nYMov = aCenter.Y() - aObjRect.Center().Y(); pValue = &nYMov; bMove = false; break; - case ControlModification::RIGHT : + case ControlModification::RIGHT : aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Right); aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Left); break; - case ControlModification::CENTER_HORIZONTAL: + case ControlModification::CENTER_HORIZONTAL: nXMov = aCenter.X() - aObjRect.Center().X(); bMove = false; break; - case ControlModification::LEFT : + case ControlModification::LEFT : aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Left); aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Right); break; @@ -883,7 +883,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli if ( aInterSectRectIter == aRectIter ) *pValue = aGetFun(&aBound) - aGetFun(&aObjRect); } - + if ( lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification,_bBoundRects) ) { const Size aSize(nXMov,nYMov); @@ -924,7 +924,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli } } break; - default: + default: break; } } @@ -978,7 +978,7 @@ USHORT OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) const ::boost::shared_ptr<OSectionWindow> OViewsWindow::getSectionWindow(const USHORT _nPos) const { ::boost::shared_ptr<OSectionWindow> aReturn; - + if ( _nPos < m_aSections.size() ) aReturn = m_aSections[_nPos]; @@ -1013,12 +1013,12 @@ namespace OSectionView& rView( _rhs->getReportSection().getSectionView() ); switch ( m_eAction ) { - case eEndDragObj: + case eEndDragObj: rView.EndDragObj( m_bCopy ); break; case eEndAction: - if ( rView.IsAction() ) - rView.EndAction ( ); + if ( rView.IsAction() ) + rView.EndAction ( ); break; case eMoveAction: rView.MovAction ( m_aPoint ); @@ -1030,11 +1030,11 @@ namespace rView.ForceMarkedToAnotherPage(); break; case eBreakAction: - if ( rView.IsAction() ) - rView.BrkAction ( ); + if ( rView.IsAction() ) + rView.BrkAction ( ); break; // default: - + } } }; @@ -1057,11 +1057,11 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _ OReportSection& rReportSection = (*aIter)->getReportSection(); rReportSection.getPage()->setSpecialMode(); OSectionView& rView = rReportSection.getSectionView(); - + if ( &rView != &_rSection ) { // SdrRectObj *pNewObj = new SdrRectObj(OBJ_RECT, _aRect); -// SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Temp Label"))); +// SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Temp Label"))); SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))); if (pNewObj) { @@ -1093,7 +1093,7 @@ bool OViewsWindow::isObjectInMyTempList(SdrObject *_pObj) // ----------------------------------------------------------------------------- void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection) -{ +{ OSL_TRACE("BegDragObj Clickpoint X:%d Y:%d\n", _aPnt.X(), _aPnt.Y() ); m_aBegDragTempList.clear(); @@ -1104,7 +1104,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi TSectionsMap::iterator aEnd = m_aSections.end(); for (; aIter != aEnd; ++aIter) { - OReportSection& rReportSection = (*aIter)->getReportSection(); + OReportSection& rReportSection = (*aIter)->getReportSection(); OSectionView* pView = &rReportSection.getSectionView(); if (pView == _pSection) break; @@ -1126,13 +1126,13 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) { OReportSection& rReportSection = (*aIter)->getReportSection(); - + OSectionView& rView = rReportSection.getSectionView(); - + if ( rView.AreObjectsMarked() ) { const sal_uInt32 nCount = rView.GetMarkedObjectCount(); - for (sal_uInt32 i=0; i < nCount; ++i) + for (sal_uInt32 i=0; i < nCount; ++i) { const SdrMark* pM = rView.GetSdrMarkByIndex(i); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -1145,10 +1145,10 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi aLeftTop.Y() = ::std::min( aRect.Top(), aLeftTop.Y() ); OSL_TRACE("BegDragObj createInvisible X:%d Y:%d on View #%d\n", aRect.Left(), aRect.Top(), nViewCount ); - + BegDragObj_createInvisibleObjectAtPosition(aRect, rView); - - // calculate the clickpoint + + // calculate the clickpoint // const sal_Int32 nDeltaX = abs(aRect.Left() - aAbsolutePnt.X()); // const sal_Int32 nDeltaY = abs(aRect.Top() - aAbsolutePnt.Y()); // if (m_aDragDelta.X() > nDeltaX) @@ -1156,7 +1156,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi // if (m_aDragDelta.Y() > nDeltaY) // m_aDragDelta.Y() = nDeltaY; } - } + } } ++nViewCount; Rectangle aClipRect = rView.GetWorkArea(); @@ -1169,7 +1169,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi // don't subtract the height of the lines between the views // aNewObjPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height(); } - + const sal_Int32 nDeltaX = abs(aLeftTop.X() - aAbsolutePnt.X()); const sal_Int32 nDeltaY = abs(aLeftTop.Y() - aAbsolutePnt.Y()); m_aDragDelta.X() = nDeltaX; @@ -1247,7 +1247,7 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection) if ( &rReportSection.getSectionView() == _pSection ) { bAdd = false; - aNewPos = _aPnt; // 2,2 + aNewPos = _aPnt; // 2,2 } else if ( bAdd ) { @@ -1376,7 +1376,7 @@ void OViewsWindow::EndDragObj(BOOL _bControlKeyPressed, const OSectionView* _pSe aNewPos.X() = nLeftMargin; if ( aNewPos.Y() < 0 ) aNewPos.Y() = 0; - + Point aPrevious; for (; pIter != pEnd; ++pIter) { @@ -1496,7 +1496,7 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo aPosForWorkArea.Y() += nSectionHeight; // aNewPos.Y() += PixelToLogic(aIter->second.second->GetSizePixel()).Height(); } - + for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) { @@ -1628,7 +1628,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) SdrMark* pMark = rMarkList.GetMark(i); bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL; } - + if ( bCheck && isOver(aMarkRect,*rReportSection.getPage(),rView) ) break; } @@ -1673,7 +1673,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) if ( bCheck ) aNewRect.Union(pMark->GetMarkedSdrObj()->GetLastBoundRect()); } - + switch(pHdl->GetKind()) { case HDL_LEFT: @@ -1696,7 +1696,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) if ( !(bCheck && isOver(aNewRect,*rReportSection.getPage(),rView)) ) rView.MovAction(aEndPoint); rView.EndDragObj(); - + // restore snap if ( !bWasNoSnap ) ((SdrDragStat&)rDragStat).SetNoSnap( bWasNoSnap ); @@ -1748,7 +1748,7 @@ void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>& void OViewsWindow::zoom(const Fraction& _aZoom) { const MapMode& aMapMode = GetMapMode(); - + Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); if ( _aZoom < aMapMode.GetScaleX() ) aStartWidth *= aMapMode.GetScaleX(); @@ -1765,11 +1765,11 @@ void OViewsWindow::zoom(const Fraction& _aZoom) } // for (;aIter != aEnd ; ++aIter) Resize(); - + Size aOut = GetOutputSizePixel(); aOut.Width() = aStartWidth; aOut = PixelToLogic(aOut); - + Rectangle aRect(PixelToLogic(Point(0,0)),aOut); Invalidate(aRect,/*INVALIDATE_NOERASE | */INVALIDATE_NOCHILDREN /*| INVALIDATE_TRANSPARENT*/); } @@ -1783,7 +1783,7 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos) aMapMode.SetOrigin(m_pParent->GetMapMode().GetOrigin()); const Point aPosY(m_pParent->PixelToLogic(_aThumbPos,aMapMode)); - + aMapMode.SetOrigin( Point(aOld.X() , - aPosY.Y())); SetMapMode( aMapMode ); //OWindowPositionCorrector aCorrector(this,0,-( aOld.Y() + aPosY.Y())); diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index b18c645aa18e..0b36df5c4672 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ void OReportExchange::AddSupportedFormats() sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); - return (nFormatId == getDescriptorFormatId()) ? + return (nFormatId == getDescriptorFormatId()) ? SetAny( uno::Any(m_aCopyElements), _rFlavor ) : sal_False; } diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 1ca2e5cadbee..259191396d11 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,24 +64,24 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { case OBJ_DLG_FIXEDTEXT: pObjFactory->pNewObj = new OUnoObject( SERVICE_FIXEDTEXT - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) ,OBJ_DLG_FIXEDTEXT); break; case OBJ_DLG_IMAGECONTROL: pObjFactory->pNewObj = new OUnoObject( SERVICE_IMAGECONTROL - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pObjFactory->pNewObj = new OUnoObject( SERVICE_FORMATTEDFIELD - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_VFIXEDLINE: case OBJ_DLG_HFIXEDLINE: { OUnoObject* pObj = new OUnoObject( SERVICE_FIXEDLINE - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) ,pObjFactory->nIdentifier); pObjFactory->pNewObj = pObj; if ( pObjFactory->nIdentifier == OBJ_DLG_HFIXEDLINE ) diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 10fdbce9a06e..ad0aa4a1803b 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,13 +87,13 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) OReportWindow* pReportWindow = m_pParent->getSectionWindow()->getViewsWindow()->getView(); OScrollWindowHelper* pScrollWindow = pReportWindow->getScrollWindow(); - + Size aOut = pReportWindow->GetOutputSizePixel(); Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); aStartWidth *= m_pParent->GetMapMode().GetScaleX(); aOut.Width() -= (long)aStartWidth; - + Rectangle aOutRect( pScrollWindow->getThumbPos(), aOut ); aOutRect = m_pParent->PixelToLogic( aOutRect ); //Rectangle aWorkArea = m_pParent->getView()->GetWorkArea(); @@ -320,7 +320,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) else m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); //m_rView.UnmarkAll(); - + deactivateOle(true); bReturn = FALSE; } @@ -413,7 +413,7 @@ void DlgEdFunc::activateOle(SdrObject* _pObj) { const UINT16 nSdrObjKind = _pObj->GetObjIdentifier(); // - // OLE: activate + // OLE: activate // if (nSdrObjKind == OBJ_OLE2) { @@ -533,7 +533,7 @@ bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt) { unColorizeOverlappedObj(); } - + return bOverlapping; } // ----------------------------------------------------------------------------- @@ -614,11 +614,11 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) if (rDragStat.GetDragMethod() != NULL) { SdrObjListIter aIter(*m_pParent->getPage(),IM_DEEPNOGROUPS); - SdrObject* pObjIter = NULL; + SdrObject* pObjIter = NULL; // loop through all marked objects and check if there new rect overlapps an old one. while( (pObjIter = aIter.Next()) != NULL && !bIsSetPoint) { - if ( m_rView.IsObjMarked(pObjIter) + if ( m_rView.IsObjMarked(pObjIter) && dynamic_cast<OUnoObject*>(pObjIter) != NULL ) { Rectangle aNewRect = pObjIter->GetLastBoundRect(); @@ -633,8 +633,8 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) aNewRect.Move(nDx,nDy); else ::ResizeRect(aNewRect,rDragStat.GetRef1(),rDragStat.GetXFact(),rDragStat.GetYFact()); - - + + SdrObject* pObjOverlapped = isOver(aNewRect,*m_pParent->getPage(),m_rView,false,pObjIter, ISOVER_IGNORE_CUSTOMSHAPES); bIsSetPoint = pObjOverlapped ? true : false; if (pObjOverlapped && !m_bSelectionMode) @@ -731,7 +731,7 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj( m_aMDPos,&m_rView ); } - return TRUE; + return TRUE; } //---------------------------------------------------------------------------- @@ -740,7 +740,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) if ( DlgEdFunc::MouseButtonUp( rMEvt ) ) return TRUE; - const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); + const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); const USHORT nHitLog = USHORT ( m_pParent->PixelToLogic(Size(3,0)).Width() ); BOOL bReturn = TRUE; @@ -754,7 +754,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) m_rView.SetCreateMode( TRUE ); return TRUE; } - + m_rView.EndCreateObj(SDRCREATE_FORCEEND); if ( !m_rView.AreObjectsMarked() ) @@ -781,7 +781,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) } else checkMovementAllowed(rMEvt); - + if ( !m_rView.AreObjectsMarked() && Abs(m_aMDPos.X() - aPos.X()) < nHitLog && Abs(m_aMDPos.Y() - aPos.Y()) < nHitLog && @@ -803,7 +803,7 @@ BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseMove(rMEvt ) ) return TRUE; - Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); + Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); if ( m_rView.IsCreateObj() ) { @@ -856,7 +856,7 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) m_bSelectionMode = false; if ( DlgEdFunc::MouseButtonDown(rMEvt) ) return TRUE; - + SdrViewEvent aVEvt; const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); if( eHit == SDRHIT_UNMARKEDOBJECT ) @@ -913,7 +913,7 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) checkTwoCklicks(rMEvt); m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) ); - + if ( !m_bUiActive ) m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); m_bSelectionMode = false; @@ -962,8 +962,8 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) bool bControlKey = rMEvt.IsMod1(); m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, false, bControlKey); } - } - + } + if ( !bIsSetPoint ) { m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) ); @@ -978,141 +978,141 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) //void DlgEdFuncSelect::SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, BOOL bQuickDrag) //{ // -// SdrPageView* pPV = m_rView.GetSdrPageView(); -// if( _pTextObj && _pTextObj->GetPage() == pPV->GetPage() ) -// { -// m_rView.SetCurrentObj(OBJ_TEXT); -// m_rView.SetEditMode(SDREDITMODE_EDIT); +// SdrPageView* pPV = m_rView.GetSdrPageView(); +// if( _pTextObj && _pTextObj->GetPage() == pPV->GetPage() ) +// { +// m_rView.SetCurrentObj(OBJ_TEXT); +// m_rView.SetEditMode(SDREDITMODE_EDIT); // -// BOOL bEmptyOutliner = FALSE; +// BOOL bEmptyOutliner = FALSE; // -// if (!_pTextObj->GetOutlinerParaObject() && m_rView.GetTextEditOutliner()) -// { -// ::SdrOutliner* pOutl = m_rView.GetTextEditOutliner(); -// ULONG nParaAnz = pOutl->GetParagraphCount(); -// Paragraph* p1stPara = pOutl->GetParagraph( 0 ); +// if (!_pTextObj->GetOutlinerParaObject() && m_rView.GetTextEditOutliner()) +// { +// ::SdrOutliner* pOutl = m_rView.GetTextEditOutliner(); +// ULONG nParaAnz = pOutl->GetParagraphCount(); +// Paragraph* p1stPara = pOutl->GetParagraph( 0 ); // -// if (nParaAnz==1 && p1stPara) -// { -// // Bei nur einem Pararaph -// if (pOutl->GetText(p1stPara).Len() == 0) -// { -// bEmptyOutliner = TRUE; -// } -// } -// } +// if (nParaAnz==1 && p1stPara) +// { +// // Bei nur einem Pararaph +// if (pOutl->GetText(p1stPara).Len() == 0) +// { +// bEmptyOutliner = TRUE; +// } +// } +// } // -// if (_pTextObj != m_rView.GetTextEditObject() || bEmptyOutliner) -// { -// UINT32 nInv = _pTextObj->GetObjInventor(); -// UINT16 nSdrObjKind = _pTextObj->GetObjIdentifier(); +// if (_pTextObj != m_rView.GetTextEditObject() || bEmptyOutliner) +// { +// UINT32 nInv = _pTextObj->GetObjInventor(); +// UINT16 nSdrObjKind = _pTextObj->GetObjIdentifier(); // -// if (nInv == SdrInventor && _pTextObj->HasTextEdit() && -// (nSdrObjKind == OBJ_TEXT || -// nSdrObjKind == OBJ_TITLETEXT || -// nSdrObjKind == OBJ_OUTLINETEXT || -// (_pTextObj->ISA(SdrTextObj) && !_pTextObj->IsEmptyPresObj()))) -// { -// // Neuen Outliner machen (gehoert der SdrObjEditView) +// if (nInv == SdrInventor && _pTextObj->HasTextEdit() && +// (nSdrObjKind == OBJ_TEXT || +// nSdrObjKind == OBJ_TITLETEXT || +// nSdrObjKind == OBJ_OUTLINETEXT || +// (_pTextObj->ISA(SdrTextObj) && !_pTextObj->IsEmptyPresObj()))) +// { +// // Neuen Outliner machen (gehoert der SdrObjEditView) // SdrModel* pModel = _pTextObj->GetModel(); // SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, pModel ); -// pOutl->SetMinDepth(0); -// pOutl->SetStyleSheetPool((SfxStyleSheetPool*) pModel->GetStyleSheetPool()); -// //pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl)); -// ULONG nCntrl = pOutl->GetControlWord(); -// nCntrl |= EE_CNTRL_ALLOWBIGOBJS; -// nCntrl |= EE_CNTRL_URLSFXEXECUTE; -// nCntrl |= EE_CNTRL_MARKFIELDS; -// nCntrl |= EE_CNTRL_AUTOCORRECT; +// pOutl->SetMinDepth(0); +// pOutl->SetStyleSheetPool((SfxStyleSheetPool*) pModel->GetStyleSheetPool()); +// //pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl)); +// ULONG nCntrl = pOutl->GetControlWord(); +// nCntrl |= EE_CNTRL_ALLOWBIGOBJS; +// nCntrl |= EE_CNTRL_URLSFXEXECUTE; +// nCntrl |= EE_CNTRL_MARKFIELDS; +// nCntrl |= EE_CNTRL_AUTOCORRECT; // -// nCntrl &= ~EE_CNTRL_ULSPACESUMMATION; -// //if ( pModel->IsSummationOfParagraphs() ) -// // nCntrl |= EE_CNTRL_ULSPACESUMMATION; +// nCntrl &= ~EE_CNTRL_ULSPACESUMMATION; +// //if ( pModel->IsSummationOfParagraphs() ) +// // nCntrl |= EE_CNTRL_ULSPACESUMMATION; // -// //SetSpellOptions( nCntrl ); +// //SetSpellOptions( nCntrl ); // -// pOutl->SetControlWord(nCntrl); +// pOutl->SetControlWord(nCntrl); // // uno::Reference< linguistic2::XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() ); -// if ( xSpellChecker.is() ) -// pOutl->SetSpeller( xSpellChecker ); +// if ( xSpellChecker.is() ) +// pOutl->SetSpeller( xSpellChecker ); // // uno::Reference< linguistic2::XHyphenator > xHyphenator( LinguMgr::GetHyphenator() ); -// if( xHyphenator.is() ) -// pOutl->SetHyphenator( xHyphenator ); +// if( xHyphenator.is() ) +// pOutl->SetHyphenator( xHyphenator ); // -// pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguage() ); +// pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguage() ); // -// // in einem Gliederungstext darf nicht auf die 0-te -// // Ebene ausgerueckt werden -// if (_pTextObj->GetObjInventor() == SdrInventor && -// _pTextObj->GetObjIdentifier() == OBJ_OUTLINETEXT) -// { -// pOutl->SetMinDepth(1); -// } +// // in einem Gliederungstext darf nicht auf die 0-te +// // Ebene ausgerueckt werden +// if (_pTextObj->GetObjInventor() == SdrInventor && +// _pTextObj->GetObjIdentifier() == OBJ_OUTLINETEXT) +// { +// pOutl->SetMinDepth(1); +// } // -// if (bEmptyOutliner) -// { -// m_rView.SdrEndTextEdit(sal_True); -// } +// if (bEmptyOutliner) +// { +// m_rView.SdrEndTextEdit(sal_True); +// } // -// if( _pTextObj ) -// { -// OutlinerParaObject* pOPO = _pTextObj->GetOutlinerParaObject(); -// if( ( pOPO && pOPO->IsVertical() ) /*|| -// nSlotId == SID_ATTR_CHAR_VERTICAL || -// nSlotId == SID_TEXT_FITTOSIZE_VERTICAL */) -// pOutl->SetVertical( TRUE ); +// if( _pTextObj ) +// { +// OutlinerParaObject* pOPO = _pTextObj->GetOutlinerParaObject(); +// if( ( pOPO && pOPO->IsVertical() ) /*|| +// nSlotId == SID_ATTR_CHAR_VERTICAL || +// nSlotId == SID_TEXT_FITTOSIZE_VERTICAL */) +// pOutl->SetVertical( TRUE ); // // -// if (m_rView.SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor) -// { -// //bFirstObjCreated = TRUE; -// //DeleteDefaultText(); +// if (m_rView.SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor) +// { +// //bFirstObjCreated = TRUE; +// //DeleteDefaultText(); // -// OutlinerView* pOLV = m_rView.GetTextEditOutlinerView(); +// OutlinerView* pOLV = m_rView.GetTextEditOutlinerView(); // -// nSdrObjKind = _pTextObj->GetObjIdentifier(); +// nSdrObjKind = _pTextObj->GetObjIdentifier(); // -// SdrViewEvent aVEvt; -// SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); +// SdrViewEvent aVEvt; +// SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); // -// if (eHit == SDRHIT_TEXTEDIT) -// { -// // Text getroffen -// if (nSdrObjKind == OBJ_TEXT || -// nSdrObjKind == OBJ_TITLETEXT || -// nSdrObjKind == OBJ_OUTLINETEXT || -// //nSlotId == SID_TEXTEDIT || -// !bQuickDrag) -// { -// pOLV->MouseButtonDown(rMEvt); -// pOLV->MouseMove(rMEvt); -// pOLV->MouseButtonUp(rMEvt); -// } +// if (eHit == SDRHIT_TEXTEDIT) +// { +// // Text getroffen +// if (nSdrObjKind == OBJ_TEXT || +// nSdrObjKind == OBJ_TITLETEXT || +// nSdrObjKind == OBJ_OUTLINETEXT || +// //nSlotId == SID_TEXTEDIT || +// !bQuickDrag) +// { +// pOLV->MouseButtonDown(rMEvt); +// pOLV->MouseMove(rMEvt); +// pOLV->MouseButtonUp(rMEvt); +// } // -// if ( bQuickDrag && _pTextObj->GetOutlinerParaObject()) -// { -// pOLV->MouseButtonDown(rMEvt); -// } -// } -// else -// { -// // #98198# Move cursor to end of text -// ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND); -// pOLV->SetSelection(aNewSelection); -// } -// } -// else -// { -// //RestoreDefaultText(); -// } -// } -// } -// } -// } -// else -// _pTextObj = NULL; +// if ( bQuickDrag && _pTextObj->GetOutlinerParaObject()) +// { +// pOLV->MouseButtonDown(rMEvt); +// } +// } +// else +// { +// // #98198# Move cursor to end of text +// ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND); +// pOLV->SetSelection(aNewSelection); +// } +// } +// else +// { +// //RestoreDefaultText(); +// } +// } +// } +// } +// } +// else +// _pTextObj = NULL; //} diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index ac36078ff3cf..5bfb868973f0 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,12 +102,12 @@ DBG_NAME( rpt_PropBrw ) //---------------------------------------------------------------------------- -PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParent,ODesignView* _pDesignView) +PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParent,ODesignView* _pDesignView) :DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE)) ,m_xORB(_xORB) ,m_pDesignView(_pDesignView) ,m_pView( NULL ) - ,m_bInitialStateChange(sal_True) + ,m_bInitialStateChange(sal_True) { DBG_CTOR( rpt_PropBrw,NULL); @@ -159,7 +159,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen Reference< inspection::XObjectInspectorModel> xInspectorModel( bEnableHelpSection ? report::inspection::DefaultComponentInspectorModel::createWithHelpSection( m_xInspectorContext, 3, 8 ) : report::inspection::DefaultComponentInspectorModel::createDefault( m_xInspectorContext ) ); - + m_xBrowserController = inspection::ObjectInspector::createWithModel(m_xInspectorContext, xInspectorModel); if ( !m_xBrowserController.is() ) { @@ -199,7 +199,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen if (m_xBrowserComponentWindow.is()) { - + m_xBrowserComponentWindow->setPosSize(0, 0, aPropWinSize.Width(), aPropWinSize.Height(), awt::PosSize::WIDTH | awt::PosSize::HEIGHT | awt::PosSize::X | awt::PosSize::Y); Resize(); @@ -235,9 +235,9 @@ PropBrw::~PropBrw() DBG_DTOR( rpt_PropBrw,NULL); } // ----------------------------------------------------------------------------- -void PropBrw::setCurrentPage(const ::rtl::OUString& _sLastActivePage) -{ - m_sLastActivePage = _sLastActivePage; +void PropBrw::setCurrentPage(const ::rtl::OUString& _sLastActivePage) +{ + m_sLastActivePage = _sLastActivePage; } //---------------------------------------------------------------------------- @@ -311,7 +311,7 @@ uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const Sdr { sal_uInt32 nMarkCount = _rMarkList.GetMarkCount(); ::std::vector< uno::Reference< uno::XInterface> > aSets; - aSets.reserve(nMarkCount); + aSets.reserve(nMarkCount); for(sal_uInt32 i=0;i<nMarkCount;++i) { @@ -352,7 +352,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); } - //Resize(); + //Resize(); } SetText( GetHeadlineName(_aObjects) ); } @@ -583,7 +583,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent) EndListening( *(m_pView->GetModel()) ); m_pView = NULL; } // if ( m_pView ) - + uno::Reference< uno::XInterface> xTemp(CreateComponentPair(_xReportComponent,_xReportComponent)); implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) ); } @@ -604,7 +604,7 @@ IMPL_LINK( PropBrw, OnAsyncGetFocus, void*, ) void PropBrw::LoseFocus() { DockingWindow::LoseFocus(); - m_pDesignView->getController().InvalidateAll(); + m_pDesignView->getController().InvalidateAll(); } //---------------------------------------------------------------------------- } diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index 4a84f7bd034d..536579d7fb7b 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -353,13 +353,13 @@ Menu RID_MENU_REPORT }; MenuItem { - Identifier = SID_ARRANGEMENU ; - HelpID = SID_ARRANGEMENU ; - Command = ".uno:ArrangeMenu" ; - Text [ en-US ] = "~Arrange" ; + Identifier = SID_ARRANGEMENU ; + HelpID = SID_ARRANGEMENU ; + Command = ".uno:ArrangeMenu" ; + Text [ en-US ] = "~Arrange" ; SubMenu = Menu { - ItemList = + ItemList = { MenuItem { @@ -367,13 +367,13 @@ Menu RID_MENU_REPORT }; MenuItem { - Identifier = SID_FRAME_UP ; - HelpID = SID_FRAME_UP ; + Identifier = SID_FRAME_UP ; + HelpID = SID_FRAME_UP ; Text [ en-US ] = "Bring ~Forward" ; }; MenuItem { - Identifier = SID_FRAME_DOWN ; + Identifier = SID_FRAME_DOWN ; HelpID = SID_FRAME_DOWN ; Text [ en-US ] = "Send Back~ward" ; }; @@ -401,7 +401,7 @@ Menu RID_MENU_REPORT ITEM_FORMAT_OBJECT_ALIGN SubMenu = Menu { - ItemList = + ItemList = { MenuItem { @@ -441,14 +441,14 @@ Menu RID_MENU_REPORT MenuItem { - Identifier = SID_OBJECT_RESIZING ; - Command = ".uno:ObjectResize" ; - HelpID = SID_OBJECT_RESIZING ; + Identifier = SID_OBJECT_RESIZING ; + Command = ".uno:ObjectResize" ; + HelpID = SID_OBJECT_RESIZING ; Text [ en-US ] = "~Object Resizing" ; - Text [ x-comment ] = " "; + Text [ x-comment ] = " "; SubMenu = Menu { - ItemList = + ItemList = { MenuItem { @@ -496,14 +496,14 @@ Menu RID_MENU_REPORT }; MenuItem { - Identifier = SID_SECTION_SHRINK_MENU ; - Command = ".uno:SectionShrinkMenu" ; - HelpID = SID_SECTION_SHRINK_MENU ; + Identifier = SID_SECTION_SHRINK_MENU ; + Command = ".uno:SectionShrinkMenu" ; + HelpID = SID_SECTION_SHRINK_MENU ; Text [ en-US ] = "Section" ; - Text [ x-comment ] = " "; + Text [ x-comment ] = " "; SubMenu = Menu { - ItemList = + ItemList = { MenuItem { diff --git a/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml index 62f2e5e2d534..3d64100d1636 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml @@ -18,17 +18,17 @@ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/> </toolbar:toolbar>
\ No newline at end of file diff --git a/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml index e26df54f29ab..4d1e847a8f2f 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml @@ -18,12 +18,12 @@ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/> </toolbar:toolbar>
\ No newline at end of file diff --git a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml index d3e649930942..3e9c2140baac 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml @@ -18,19 +18,19 @@ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector"/> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector"/> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display"/> </toolbar:toolbar>
\ No newline at end of file diff --git a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml index ac460a3ba77c..9b7673730c5a 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml @@ -11,7 +11,7 @@ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:style="radio auto" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:style="radio" /> - <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio" /> + <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="radio auto" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false"/> diff --git a/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml index 4269c1d42e08..a3dd6264966d 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml @@ -18,7 +18,7 @@ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair"/> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace"/> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace"/> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/> </toolbar:toolbar>
\ No newline at end of file diff --git a/reportdesign/util/hidother.src b/reportdesign/util/hidother.src index f7e08f34442e..398f247c8f4f 100644 --- a/reportdesign/util/hidother.src +++ b/reportdesign/util/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,42 +32,42 @@ #include <svx/svxids.hrc> #endif -hidspecial UID_RPT_RPT_APP_VIEW { HelpId = UID_RPT_RPT_APP_VIEW ; }; -hidspecial UID_RPT_SCROLLWINDOW { HelpId = UID_RPT_SCROLLWINDOW ; }; -hidspecial UID_RPT_REPORTWINDOW { HelpId = UID_RPT_REPORTWINDOW ; }; -hidspecial HID_RPT_HORZ_RULER { HelpId = HID_RPT_HORZ_RULER ; }; -hidspecial UID_RPT_SECTIONSWINDOW { HelpId = UID_RPT_SECTIONSWINDOW ; }; -hidspecial UID_RPT_VIEWSWINDOW { HelpId = UID_RPT_VIEWSWINDOW ; }; -hidspecial HID_RPT_ENDMARKER { HelpId = HID_RPT_ENDMARKER ; }; -hidspecial HID_RPT_SPLITTER { HelpId = HID_RPT_SPLITTER ; }; -hidspecial HID_REPORTSECTION { HelpId = HID_REPORTSECTION ; }; -hidspecial HID_RPT_HORZ_SCROLLBAR { HelpId = HID_RPT_HORZ_SCROLLBAR ; }; -hidspecial HID_RPT_VERT_SCROLLBAR { HelpId = HID_RPT_VERT_SCROLLBAR ; }; -hidspecial HID_RPT_STARTMARKER { HelpId = HID_RPT_STARTMARKER ; }; +hidspecial UID_RPT_RPT_APP_VIEW { HelpId = UID_RPT_RPT_APP_VIEW ; }; +hidspecial UID_RPT_SCROLLWINDOW { HelpId = UID_RPT_SCROLLWINDOW ; }; +hidspecial UID_RPT_REPORTWINDOW { HelpId = UID_RPT_REPORTWINDOW ; }; +hidspecial HID_RPT_HORZ_RULER { HelpId = HID_RPT_HORZ_RULER ; }; +hidspecial UID_RPT_SECTIONSWINDOW { HelpId = UID_RPT_SECTIONSWINDOW ; }; +hidspecial UID_RPT_VIEWSWINDOW { HelpId = UID_RPT_VIEWSWINDOW ; }; +hidspecial HID_RPT_ENDMARKER { HelpId = HID_RPT_ENDMARKER ; }; +hidspecial HID_RPT_SPLITTER { HelpId = HID_RPT_SPLITTER ; }; +hidspecial HID_REPORTSECTION { HelpId = HID_REPORTSECTION ; }; +hidspecial HID_RPT_HORZ_SCROLLBAR { HelpId = HID_RPT_HORZ_SCROLLBAR ; }; +hidspecial HID_RPT_VERT_SCROLLBAR { HelpId = HID_RPT_VERT_SCROLLBAR ; }; +hidspecial HID_RPT_STARTMARKER { HelpId = HID_RPT_STARTMARKER ; }; -hidspecial SID_RPT_SHOWREPORTEXPLORER { HelpId = SID_RPT_SHOWREPORTEXPLORER ; }; -hidspecial SID_PAGEHEADERFOOTER { HelpId = SID_PAGEHEADERFOOTER ; }; -hidspecial SID_REPORTHEADERFOOTER { HelpId = SID_REPORTHEADERFOOTER ; }; -hidspecial SID_SORTINGANDGROUPING { HelpId = SID_SORTINGANDGROUPING ; }; -hidspecial SID_INSERT_FLD_PGNUMBER { HelpId = SID_INSERT_FLD_PGNUMBER ; }; -hidspecial SID_CONDITIONALFORMATTING { HelpId = SID_CONDITIONALFORMATTING ; }; -hidspecial SID_PAGEDIALOG { HelpId = SID_PAGEDIALOG ; }; -hidspecial SID_SETCONTROLDEFAULTS { HelpId = SID_SETCONTROLDEFAULTS ; }; -hidspecial SID_INSERTBREAK { HelpId = SID_INSERTBREAK ; }; -hidspecial HID_RPT_FIELDEXPRESSION { HelpId = HID_RPT_FIELDEXPRESSION ; }; -hidspecial HID_RPT_SORTORDER { HelpId = HID_RPT_SORTORDER ; }; -hidspecial HID_RPT_GROUPSBRW { HelpId = HID_RPT_GROUPSBRW ; }; -hidspecial HID_RPT_GROUPSSORTING_DLG { HelpId = HID_RPT_GROUPSSORTING_DLG ; }; -hidspecial HID_RPT_PAGENUMBERS_DLG { HelpId = HID_RPT_PAGENUMBERS_DLG ; }; -hidspecial HID_RPT_DATETIME_DLG { HelpId = HID_RPT_DATETIME_DLG ; }; -hidspecial HID_RPT_CONDFORMAT_DLG { HelpId = HID_RPT_CONDFORMAT_DLG ; }; -hidspecial HID_RPT_CRTL_FORMAT_PREVIEW { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW ; }; -hidspecial HID_RPT_COND_DLG { HelpId = HID_RPT_COND_DLG ; }; +hidspecial SID_RPT_SHOWREPORTEXPLORER { HelpId = SID_RPT_SHOWREPORTEXPLORER ; }; +hidspecial SID_PAGEHEADERFOOTER { HelpId = SID_PAGEHEADERFOOTER ; }; +hidspecial SID_REPORTHEADERFOOTER { HelpId = SID_REPORTHEADERFOOTER ; }; +hidspecial SID_SORTINGANDGROUPING { HelpId = SID_SORTINGANDGROUPING ; }; +hidspecial SID_INSERT_FLD_PGNUMBER { HelpId = SID_INSERT_FLD_PGNUMBER ; }; +hidspecial SID_CONDITIONALFORMATTING { HelpId = SID_CONDITIONALFORMATTING ; }; +hidspecial SID_PAGEDIALOG { HelpId = SID_PAGEDIALOG ; }; +hidspecial SID_SETCONTROLDEFAULTS { HelpId = SID_SETCONTROLDEFAULTS ; }; +hidspecial SID_INSERTBREAK { HelpId = SID_INSERTBREAK ; }; +hidspecial HID_RPT_FIELDEXPRESSION { HelpId = HID_RPT_FIELDEXPRESSION ; }; +hidspecial HID_RPT_SORTORDER { HelpId = HID_RPT_SORTORDER ; }; +hidspecial HID_RPT_GROUPSBRW { HelpId = HID_RPT_GROUPSBRW ; }; +hidspecial HID_RPT_GROUPSSORTING_DLG { HelpId = HID_RPT_GROUPSSORTING_DLG ; }; +hidspecial HID_RPT_PAGENUMBERS_DLG { HelpId = HID_RPT_PAGENUMBERS_DLG ; }; +hidspecial HID_RPT_DATETIME_DLG { HelpId = HID_RPT_DATETIME_DLG ; }; +hidspecial HID_RPT_CONDFORMAT_DLG { HelpId = HID_RPT_CONDFORMAT_DLG ; }; +hidspecial HID_RPT_CRTL_FORMAT_PREVIEW { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW ; }; +hidspecial HID_RPT_COND_DLG { HelpId = HID_RPT_COND_DLG ; }; hidspecial HID_RPT_POPUP_COLOR_CTRL { HelpId = HID_RPT_POPUP_COLOR_CTRL ; }; hidspecial HID_RPT_POPUP_COLOR { HelpId = HID_RPT_POPUP_COLOR ; }; -hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; -hidspecial HID_RPT_PROPDLG_TAB_GENERAL { HelpId = HID_RPT_PROPDLG_TAB_GENERAL ; }; -hidspecial HID_RPT_PROPDLG_TAB_DATA { HelpId = HID_RPT_PROPDLG_TAB_DATA ; }; +hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; +hidspecial HID_RPT_PROPDLG_TAB_GENERAL { HelpId = HID_RPT_PROPDLG_TAB_GENERAL ; }; +hidspecial HID_RPT_PROPDLG_TAB_DATA { HelpId = HID_RPT_PROPDLG_TAB_DATA ; }; hidspecial HID_RPT_PROP_FORCENEWPAGE { HelpId = HID_RPT_PROP_FORCENEWPAGE; }; hidspecial HID_RPT_PROP_NEWROWORCOL { HelpId = HID_RPT_PROP_NEWROWORCOL; }; @@ -120,14 +120,14 @@ hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT { HelpId = HID_RPT_PROP_ hidspecial SID_ARRANGEMENU { HelpId = SID_ARRANGEMENU; }; hidspecial SID_SELECTALL_IN_SECTION { HelpId = SID_SELECTALL_IN_SECTION; }; -hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; }; -hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; }; -hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; }; -hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; }; -hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; }; -hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; }; -hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; }; -hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; }; +hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; }; +hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; }; +hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; }; +hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; }; +hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; }; +hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; }; +hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; }; +hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; }; hidspecial SID_PREV_MARK { HelpId = SID_PREV_MARK; }; hidspecial SID_SECTION_SHRINK { HelpId = SID_SECTION_SHRINK; }; @@ -162,9 +162,9 @@ hidspecial HID_RPT_PROP_AREA { HelpId = HID_RPT_PROP_AREA; }; hidspecial UID_RPT_RPT_PROP_DLG_AREA { HelpId = UID_RPT_RPT_PROP_DLG_AREA; }; hidspecial UID_RPT_PROP_FORMULA { HelpId = UID_RPT_PROP_FORMULA; }; -hidspecial HID_RPT_GROUPSORT_MOVE_UP { HelpId = HID_RPT_GROUPSORT_MOVE_UP; }; -hidspecial HID_RPT_GROUPSORT_MOVE_DOWN { HelpId = HID_RPT_GROUPSORT_MOVE_DOWN; }; -hidspecial HID_RPT_GROUPSORT_DELETE { HelpId = HID_RPT_GROUPSORT_DELETE; }; +hidspecial HID_RPT_GROUPSORT_MOVE_UP { HelpId = HID_RPT_GROUPSORT_MOVE_UP; }; +hidspecial HID_RPT_GROUPSORT_MOVE_DOWN { HelpId = HID_RPT_GROUPSORT_MOVE_DOWN; }; +hidspecial HID_RPT_GROUPSORT_DELETE { HelpId = HID_RPT_GROUPSORT_DELETE; }; hidspecial HID_RPT_PROP_MIMETYPE { HelpId = HID_RPT_PROP_MIMETYPE; }; hidspecial HID_RPT_PROP_VERTICALALIGN { HelpId = HID_RPT_PROP_VERTICALALIGN; }; hidspecial HID_RPT_PROP_PARAADJUST { HelpId = HID_RPT_PROP_PARAADJUST; }; |