diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-06 10:51:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-06 11:55:09 +0200 |
commit | 2633976ef3406d48907bd922f067ea04e39c94f1 (patch) | |
tree | c29440a174d106805b686299fcaa4a3bacf23592 /sw/source/ui/dbui | |
parent | 41d83eb8cd8e9544641182ff19a8c635760e75dc (diff) |
com::sun::star->css in sw/source/core
Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9
Diffstat (limited to 'sw/source/ui/dbui')
-rw-r--r-- | sw/source/ui/dbui/addresslistdialog.cxx | 18 | ||||
-rw-r--r-- | sw/source/ui/dbui/addresslistdialog.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbinsdlg.cxx | 16 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbtablepreviewdialog.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbtablepreviewdialog.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmdocselectpage.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputpage.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmpreparemergepage.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dbui/selectdbtabledialog.cxx | 12 |
16 files changed, 54 insertions, 54 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index cd44b5614d03..267fba8f086b 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -62,15 +62,15 @@ #include <unomid.h> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::sdb; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::task; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::ui::dialogs; +using namespace css::uno; +using namespace css::lang; +using namespace css::container; +using namespace css::sdb; +using namespace css::sdbc; +using namespace css::sdbcx; +using namespace css::task; +using namespace css::beans; +using namespace css::ui::dialogs; #define ITEMID_NAME 1 #define ITEMID_TABLE 2 diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 5e74b4ebd5d1..325fbf0f18ae 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -68,7 +68,7 @@ class SwAddressListDialog : public SfxModalDialog VclPtr<SwMailMergeAddressBlockPage> m_pAddressPage; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext> m_xDBContext; + css::uno::Reference< css::sdb::XDatabaseContext> m_xDBContext; SwDBData m_aDBData; @@ -89,12 +89,12 @@ public: virtual ~SwAddressListDialog(); virtual void dispose() override; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> + css::uno::Reference< css::sdbc::XDataSource> GetSource(); SharedConnection GetConnection(); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> + css::uno::Reference< css::sdbcx::XColumnsSupplier> GetColumnsSupplier(); const SwDBData& GetDBData() const {return m_aDBData;} diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 9f9fb7fbce30..0fc2e80943bf 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -42,7 +42,7 @@ #include <unomid.h> using namespace ::com::sun::star; -using namespace ::com::sun::star::ui::dialogs; +using namespace css::ui::dialogs; class SwAddressControl_Impl : public Control { diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 64bbe8e655ab..1913e5310a03 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -98,13 +98,13 @@ using namespace ::dbtools; using namespace ::com::sun::star; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::sdb; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::uno; +using namespace css::beans; +using namespace css::container; +using namespace css::lang; +using namespace css::sdb; +using namespace css::sdbc; +using namespace css::sdbcx; +using namespace css::uno; const char cDBFieldStart = '<'; const char cDBFieldEnd = '>'; @@ -1520,7 +1520,7 @@ static OUString lcl_CreateUniqueName(const Sequence<OUString>& aNames) } } -void SwInsertDBColAutoPilot::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} +void SwInsertDBColAutoPilot::Notify( const css::uno::Sequence< OUString >& ) {} void SwInsertDBColAutoPilot::ImplCommit() { diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index fd9e2eb34f5c..004fef5014cd 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -26,11 +26,11 @@ #include <unomid.h> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::util; +using namespace css::uno; +using namespace css::frame; +using namespace css::beans; +using namespace css::lang; +using namespace css::util; SwDBTablePreviewDialog::SwDBTablePreviewDialog(vcl::Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) : SfxModalDialog(pParent, "TablePreviewDialog", "modules/swriter/ui/tablepreviewdialog.ui") diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx index edaa78497d6c..166b0cacb1cc 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx @@ -34,10 +34,10 @@ class SwDBTablePreviewDialog : public SfxModalDialog VclPtr<FixedText> m_pDescriptionFI; VclPtr<vcl::Window> m_pBeamerWIN; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame; + css::uno::Reference< css::frame::XFrame2 > m_xFrame; public: SwDBTablePreviewDialog(vcl::Window* pParent, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rValues ); + css::uno::Sequence< css::beans::PropertyValue>& rValues ); virtual ~SwDBTablePreviewDialog(); virtual void dispose() override; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index fe8c59a3543b..c328dfa29905 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -39,10 +39,10 @@ using namespace svt; using namespace ::com::sun::star; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::sdb; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::sdbcx; +using namespace css::container; +using namespace css::sdb; +using namespace css::sdbc; +using namespace css::sdbcx; static void lcl_Move(Control* pCtrl, long nYOffset) { diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index b046df8130e8..b1df29cc0a46 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -96,7 +96,7 @@ class SwSelectAddressBlockDialog : public SfxModalDialog VclPtr<RadioButton> m_pDependentRB; VclPtr<Edit> m_pCountryED; - com::sun::star::uno::Sequence< OUString> m_aAddressBlocks; + css::uno::Sequence< OUString> m_aAddressBlocks; SwMailMergeConfigItem& m_rConfig; DECL_LINK_TYPED(NewCustomizeHdl_Impl, Button*, void); @@ -257,7 +257,7 @@ class SwAssignFieldsDialog : public SfxModalDialog SwMailMergeConfigItem& m_rConfigItem; - ::com::sun::star::uno::Sequence< OUString > CreateAssignments(); + css::uno::Sequence< OUString > CreateAssignments(); DECL_LINK_TYPED(OkHdl_Impl, Button*, void); DECL_LINK_TYPED(AssignmentModifyHdl_Impl, LinkParamNone*, void); diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 2617a0cf61ee..b0637f42ba3d 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -38,9 +38,9 @@ #include <com/sun/star/ui/dialogs/XFilePicker2.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> -using namespace ::com::sun::star::ui::dialogs; +using namespace css::ui::dialogs; using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; +using namespace css::uno; using namespace svt; SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pParent) diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 87cbd05e3038..5af6bb8b2054 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -31,7 +31,7 @@ using namespace svt; using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; +using namespace css::uno; static void lcl_FillGreetingsBox(ListBox& rBox, SwMailMergeConfigItem& rConfig, diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index b0438805205b..0328aad6f0e3 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -61,11 +61,11 @@ using namespace osl; using namespace svt; using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::view; +using namespace css::uno; +using namespace css::text; +using namespace css::frame; +using namespace css::lang; +using namespace css::view; #define DEFAULT_LEFT_DISTANCE (MM50*5) // 2,5 cm #define DEFAULT_TOP_DISTANCE (MM50*11) // 5,5 cm diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 83007a94623a..3c113d570730 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -63,7 +63,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xViewProperties; + css::uno::Reference< css::beans::XPropertySet > m_xViewProperties; DECL_LINK_TYPED(PreviewLoadedHdl_Impl, SwOneExampleFrame&, void); DECL_LINK_TYPED(ZoomHdl_Impl, ListBox&, void); diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 11b7e5321a79..e70fce6b76cd 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -75,7 +75,7 @@ using namespace svt; using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; +using namespace css::uno; #define MM_DOCTYPE_OOO 1 #define MM_DOCTYPE_PDF 2 diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index de3dfff36b4a..5657543e431d 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -200,7 +200,7 @@ public: void EnableDesctruction() {m_bDesctructionEnabled = true;} void ShowDialog(); - void DocumentSent( ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage>, + void DocumentSent( css::uno::Reference< css::mail::XMailMessage>, bool bResult, const OUString* pError ); void AllMailsSent(); diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 7b8d649fc7f5..361f5cea96fc 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -33,9 +33,9 @@ #include <unomid.h> -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::sdbc; +using namespace css::uno; +using namespace css::beans; +using namespace css::sdbc; SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent) : svt::OWizardPage(_pParent, "MMPreparePage", "modules/swriter/ui/mmpreparepage.ui") diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 706bf0549637..c4b00c3658ca 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -35,12 +35,12 @@ #include <helpid.h> using namespace ::com::sun::star; -using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::sdb; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::beans; +using namespace css::sdbcx; +using namespace css::sdbc; +using namespace css::sdb; +using namespace css::uno; +using namespace css::container; +using namespace css::beans; class SwAddressTable : public SvSimpleTable { |