diff options
Diffstat (limited to 'sw/source/uibase')
68 files changed, 201 insertions, 215 deletions
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 1a1123dcb458..f39e02c1159b 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -68,8 +68,8 @@ #include <unomid.h> -using namespace css::uno; -using namespace css::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) { @@ -151,7 +151,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) css::lang::Locale aLocale; LanguageType nLang; - using namespace css::i18n::ScriptType; + using namespace ::com::sun::star::i18n::ScriptType; Any aLang = aLinguCfg.GetProperty(OUString("DefaultLocale")); aLang >>= aLocale; diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 5f2ccf464157..e88a8e88f8c8 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -129,9 +129,9 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::script; -using namespace css::container; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::script; +using namespace ::com::sun::star::container; SFX_IMPL_SUPERCLASS_INTERFACE(SwDocShell, SfxObjectShell) diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 2b5bc210bf57..484b86b9c0e7 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -127,9 +127,9 @@ #include <memory> -using namespace css::ui::dialogs; -using namespace css::lang; -using namespace css::uno; +using namespace ::com::sun::star::ui::dialogs; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::sfx2; @@ -216,7 +216,7 @@ void SwDocShell::DoFlushDocInfo() static void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XVBAEventProcessor >& xVbaEvents, const SfxHint& rHint ) { - using namespace css::script::vba::VBAEventId; + using namespace com::sun::star::script::vba::VBAEventId; if ( dynamic_cast<const SfxEventHint*>(&rHint) ) { uno::Sequence< uno::Any > aArgs; @@ -327,7 +327,7 @@ bool SwDocShell::PrepareClose( bool bUI ) m_pDoc->GetVbaEventProcessor(); if( xVbaEvents.is() ) { - using namespace css::script::vba::VBAEventId; + using namespace com::sun::star::script::vba::VBAEventId; uno::Sequence< uno::Any > aArgs; xVbaEvents->processVbaEvent( DOCUMENT_CLOSE, aArgs ); } @@ -808,10 +808,8 @@ void SwDocShell::Execute(SfxRequest& rReq) } else { - TransferDataContainer* pClipCntnr = - new TransferDataContainer; - css::uno::Reference< css::datatransfer::XTransferable > - xRef( pClipCntnr ); + TransferDataContainer* pClipCntnr = new TransferDataContainer; + css::uno::Reference< css::datatransfer::XTransferable > xRef( pClipCntnr ); pClipCntnr->CopyAnyData( SotClipboardFormatId::RTF, static_cast<sal_Char const *>( pStrm->GetData()), pStrm->GetEndOfData() ); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 677389288535..c716ca3f51d6 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -93,9 +93,9 @@ #include <tgrditem.hxx> #include <memory> -using namespace css::i18n; -using namespace css::lang; -using namespace css::uno; +using namespace ::com::sun::star::i18n; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; using namespace ::com::sun::star; // Load Document diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index 88312cb6e270..7427473aa21d 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -62,11 +62,11 @@ using namespace ::svx; using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::beans; -using namespace css::frame; -using namespace css::view; -using namespace css::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::view; +using namespace ::com::sun::star::lang; static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, SwViewShell* pSh ) { diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 3f91a1dbcd32..d2d99939dd50 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -140,7 +140,7 @@ using namespace com::sun::star; TYPEINIT1( SwModule, SfxModule ); using namespace ::com::sun::star; -using namespace css::uno; +using namespace ::com::sun::star::uno; SwModule::SwModule( SfxObjectFactory* pWebFact, SfxObjectFactory* pFact, diff --git a/sw/source/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx index d5e33f2294f1..b823f0e7de89 100644 --- a/sw/source/uibase/config/barcfg.cxx +++ b/sw/source/uibase/config/barcfg.cxx @@ -26,7 +26,7 @@ #include <unomid.h> using namespace utl; -using namespace css::uno; +using namespace com::sun::star::uno; #define SEL_TYPE_TABLE_TEXT 0 #define SEL_TYPE_LIST_TEXT 1 diff --git a/sw/source/uibase/config/dbconfig.cxx b/sw/source/uibase/config/dbconfig.cxx index 29f0eeb9a290..3aee9f4f8d80 100644 --- a/sw/source/uibase/config/dbconfig.cxx +++ b/sw/source/uibase/config/dbconfig.cxx @@ -26,7 +26,7 @@ #include <unomid.h> using namespace utl; -using namespace css::uno; +using namespace com::sun::star::uno; const Sequence<OUString>& SwDBConfig::GetPropertyNames() { diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx index 8e1b52a8d2e3..8aa42336a9d5 100644 --- a/sw/source/uibase/config/fontcfg.cxx +++ b/sw/source/uibase/config/fontcfg.cxx @@ -30,7 +30,7 @@ #include <unomid.h> using namespace utl; -using namespace css::uno; +using namespace com::sun::star::uno; static inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16 eWestern, sal_Int16 eCJK, sal_Int16 eCTL) { diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 8d51c185891f..d932fea3d70a 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -39,7 +39,7 @@ #include <unomid.h> using namespace utl; -using namespace css::uno; +using namespace com::sun::star::uno; #define GLOB_NAME_CALC 0 #define GLOB_NAME_IMPRESS 1 diff --git a/sw/source/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx index e59d0ae56a1d..f182ca26001f 100644 --- a/sw/source/uibase/config/prtopt.cxx +++ b/sw/source/uibase/config/prtopt.cxx @@ -26,7 +26,7 @@ #include <unomid.h> using namespace utl; -using namespace css::uno; +using namespace com::sun::star::uno; // Ctor Sequence<OUString> SwPrintOptions::GetPropertyNames() diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 46ade91ccc99..657ee2a3a897 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -36,7 +36,7 @@ using namespace utl; using namespace ::com::sun::star; -using namespace css::uno; +using namespace ::com::sun::star::uno; void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy) { diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index fc62336780c3..9cb14f9a0e82 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -52,14 +52,14 @@ using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::container; -using namespace css::lang; -using namespace css::sdb; -using namespace css::sdbc; -using namespace css::sdbcx; -using namespace css::task; -using namespace css::beans; +using namespace ::com::sun::star::uno; +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::task; +using namespace ::com::sun::star::beans; struct SwConnectionData { diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 25fd69742397..1b49433d0f4d 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -43,11 +43,11 @@ #include <dbui.hrc> using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::container; -using namespace css::sdb; -using namespace css::sdbc; -using namespace css::sdbcx; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::sdb; +using namespace ::com::sun::star::sdbc; +using namespace ::com::sun::star::sdbcx; namespace SwMailMergeHelper { diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 8efa47795e6d..027821c4acec 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -50,12 +50,12 @@ using namespace utl; using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::lang; -using namespace css::beans; -using namespace css::sdb; -using namespace css::sdbc; -using namespace css::sdbcx; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::sdb; +using namespace ::com::sun::star::sdbc; +using namespace ::com::sun::star::sdbcx; const char* cAddressDataAssignments = "AddressDataAssignments"; const char* cDBColumnAssignments = "DBColumnAssignments"; diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index c4cbb3c99e61..230202341a86 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -52,10 +52,10 @@ #include <cmdid.h> using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::text; -using namespace css::linguistic2; -using namespace css::beans; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::linguistic2; +using namespace ::com::sun::star::beans; SFX_IMPL_CHILDWINDOW_WITHID(SwSpellDialogChildWindow, FN_SPELL_GRAMMAR_DIALOG) diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index c69c6b3fd067..2f7d5c5d6686 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -145,8 +145,8 @@ extern bool g_bExecuteDrag; using namespace ::svx; using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::datatransfer; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::datatransfer; using namespace nsTransferBufferType; #define DDE_TXT_ENCODING osl_getThreadTextEncoding() diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index f75dafd17025..24bd2cad4ea0 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -139,13 +139,11 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent virtual void SAL_CALL addAccessibleEventListener ( - const css::uno::Reference< - css::accessibility::XAccessibleEventListener >& xListener) + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeAccessibleEventListener ( - const css::uno::Reference< - css::accessibility::XAccessibleEventListener >& xListener) + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) override; protected: diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 20873b4d0400..8cac9180b002 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -46,8 +46,8 @@ #include <helpid.h> #include <docvw.hrc> -using namespace css::lang; -using namespace css::uno; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::sfx2; diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index d1ed4a6a9bdb..e5f12bbbca66 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -41,7 +41,7 @@ #endif using namespace utl; -using namespace css::uno; +using namespace ::com::sun::star::uno; TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem ); diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx index dcd1a4ac0532..bfa2220b407e 100644 --- a/sw/source/uibase/envelp/labelcfg.cxx +++ b/sw/source/uibase/envelp/labelcfg.cxx @@ -30,8 +30,8 @@ #include <unomid.h> using namespace utl; -using namespace css::uno; -using namespace css::beans; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader) { diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index d893eb93f429..a38844014fdf 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -29,7 +29,7 @@ #include <unomid.h> using namespace utl; -using namespace css::uno; +using namespace ::com::sun::star::uno; SwLabItem::SwLabItem() : diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 230ea4eeabb4..fa6ecca7d6d8 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -80,13 +80,13 @@ #include <cnttab.hxx> #include <unotools/useroptions.hxx> -using namespace css::uno; -using namespace css::container; -using namespace css::lang; -using namespace css::beans; -using namespace css::text; -using namespace css::style; -using namespace css::sdbc; +using namespace com::sun::star::uno; +using namespace com::sun::star::container; +using namespace com::sun::star::lang; +using namespace com::sun::star::beans; +using namespace com::sun::star::text; +using namespace com::sun::star::style; +using namespace com::sun::star::sdbc; using namespace ::com::sun::star; using namespace nsSwDocInfoSubType; diff --git a/sw/source/uibase/fldui/xfldui.cxx b/sw/source/uibase/fldui/xfldui.cxx index 95d6ec51cbc5..c7164e5e771d 100644 --- a/sw/source/uibase/fldui/xfldui.cxx +++ b/sw/source/uibase/fldui/xfldui.cxx @@ -33,13 +33,13 @@ #include <view.hxx> #include <swmodule.hxx> -using namespace css::uno; -using namespace css::container; -using namespace css::lang; -using namespace css::sdb; -using namespace css::sdbc; -using namespace css::sdbcx; -using namespace css::beans; +using namespace ::com::sun::star::uno; +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::beans; // This file contains all routines of the fldui directory, which must compile // with exceptions. So we can reduce the code of the other files, which don't diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx index b76ecf5078b6..0e206e8c6cc4 100644 --- a/sw/source/uibase/inc/SwXFilterOptions.hxx +++ b/sw/source/uibase/inc/SwXFilterOptions.hxx @@ -41,10 +41,8 @@ class SwXFilterOptions : public ::cppu::WeakImplHelper< OUString sFilterName; OUString sFilterOptions; - css::uno::Reference< - css::io::XInputStream > xInputStream; - css::uno::Reference< - css::lang::XComponent > xModel; + css::uno::Reference< css::io::XInputStream > xInputStream; + css::uno::Reference< css::lang::XComponent > xModel; bool bExport; public: diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx index 8031e2203137..258c39693237 100644 --- a/sw/source/uibase/inc/hyp.hxx +++ b/sw/source/uibase/inc/hyp.hxx @@ -29,10 +29,9 @@ class SwView; class SwHyphWrapper : public SvxSpellWrapper { private: SwView* pView; - css::uno::Reference< - css::linguistic2::XHyphenator > xHyph; - sal_uInt16 nPageCount; // page count for progress view - sal_uInt16 nPageStart; // 1st checked page + css::uno::Reference< css::linguistic2::XHyphenator > xHyph; + sal_uInt16 nPageCount; // page count for progress view + sal_uInt16 nPageStart; // 1st checked page bool bInSelection : 1; // separating selected text bool bAutomatic : 1; // insert separators without further inquiry bool bInfoBox : 1; // display info-box when ending @@ -46,8 +45,7 @@ protected: public: SwHyphWrapper( SwView* pVw, - css::uno::Reference< - css::linguistic2::XHyphenator > &rxHyph, + css::uno::Reference< css::linguistic2::XHyphenator > &rxHyph, bool bStart, bool bOther, bool bSelect ); virtual ~SwHyphWrapper(); }; diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 9132a282ca26..b0ab3ba771e0 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -98,7 +98,7 @@ class SwMailMergeDlg : public SvxStandardDialog SwModuleOptions* pModOpt; DBManagerOptions nMergeType; - css::uno::Sequence< css::uno::Any > m_aSelection; + css::uno::Sequence< css::uno::Any > m_aSelection; css::uno::Reference< css::frame::XFrame2 > m_xFrame; Size m_aDialogSize; diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx index 4eb41f011511..7637bfb3712c 100644 --- a/sw/source/uibase/inc/mmconfigitem.hxx +++ b/sw/source/uibase/inc/mmconfigitem.hxx @@ -49,7 +49,6 @@ struct SwDocMergeInfo class SW_DLLPUBLIC SwMailMergeConfigItem { -// css::uno::Sequence< OUString> m_aSavedDocuments; SwMailMergeConfigItem_Impl* m_pImpl; //session information - not stored in configuration bool m_bAddressInserted; diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx index 3e1324bb1bea..1aab51e8b3f0 100644 --- a/sw/source/uibase/inc/olmenu.hxx +++ b/sw/source/uibase/inc/olmenu.hxx @@ -36,10 +36,8 @@ class SwWrtShell; class SW_DLLPUBLIC SwSpellPopup : public PopupMenu { SwWrtShell* m_pSh; - css::uno::Sequence< css::uno::Reference< - css::linguistic2::XDictionary > > m_aDics; - css::uno::Reference< - css::linguistic2::XSpellAlternatives > m_xSpellAlt; + css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > m_aDics; + css::uno::Reference< css::linguistic2::XSpellAlternatives > m_xSpellAlt; css::linguistic2::ProofreadingResult m_xGrammarResult; sal_Int32 m_nGrammarError; @@ -71,8 +69,7 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu public: SwSpellPopup( SwWrtShell *pWrtSh, - const css::uno::Reference< - css::linguistic2::XSpellAlternatives > &xAlt, + const css::uno::Reference< css::linguistic2::XSpellAlternatives > &xAlt, const OUString & rParaText ); SwSpellPopup( SwWrtShell *pWrtSh, diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx index 2889116c0200..b115f7e49744 100644 --- a/sw/source/uibase/inc/unodispatch.hxx +++ b/sw/source/uibase/inc/unodispatch.hxx @@ -90,7 +90,7 @@ public: struct StatusStruct_Impl { css::uno::Reference< css::frame::XStatusListener> xListener; - css::util::URL aURL; + css::util::URL aURL; }; typedef std::list< StatusStruct_Impl > StatusListenerList; class SwXDispatch : public cppu::WeakImplHelper diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx index e6d9b4b51e04..f94a55f31482 100644 --- a/sw/source/uibase/inc/unotxvw.hxx +++ b/sw/source/uibase/inc/unotxvw.hxx @@ -111,15 +111,13 @@ public: //XRubySelection virtual css::uno::Sequence< - css::uno::Sequence< - css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic ) + css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setRubyList( const css::uno::Sequence< - css::uno::Sequence< - css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic ) + css::uno::Sequence< css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index b2e220eabf26..233168288c27 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -121,8 +121,8 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: - SwScrollNaviPopup( sal_uInt16 nId, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window *pParent ); - virtual ~SwScrollNaviPopup(); + SwScrollNaviPopup( sal_uInt16 nId, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window *pParent ); + virtual ~SwScrollNaviPopup(); virtual void dispose() override; static OUString GetQuickHelpText(bool bNext); diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 889541a777ab..d4c2479c564b 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -50,10 +50,10 @@ #include <unomid.h> using namespace ::com::sun::star; -using namespace css::text; -using namespace css::uno; -using namespace css::linguistic2; -using namespace css::i18n; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::linguistic2; +using namespace ::com::sun::star::i18n; // Description: Turn off frame/object shell if applicable diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx index e3a485794b67..6b147080a178 100644 --- a/sw/source/uibase/misc/glosdoc.cxx +++ b/sw/source/uibase/misc/glosdoc.cxx @@ -44,7 +44,7 @@ #include <memory> using namespace ::com::sun::star; -using namespace css::uno; +using namespace ::com::sun::star::uno; namespace { diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 10a2e227455d..9b8276d6bd2c 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -60,9 +60,9 @@ #define ZOOM_ENTRIES 9 using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::beans; -using namespace css::frame; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::frame; SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxVoidItem ); SFX_IMPL_TOOLBOX_CONTROL( SwTbxFieldCtrl, SfxBoolItem ); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index d3ebe91d5e56..5f68f0c57b73 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -126,9 +126,9 @@ #include <memory> using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::beans; -using namespace css::i18n; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::i18n; #define SwAnnotationShell @@ -1401,7 +1401,7 @@ void SwAnnotationShell::ExecTransliteration(SfxRequest &rReq) if (!pOLV) return; - using namespace css::i18n; + using namespace ::com::sun::star::i18n; sal_uInt32 nMode = 0; diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 3aa8c419d035..f6fe41d6b321 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -149,9 +149,9 @@ namespace } using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::frame; -using namespace css::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::lang; SFX_IMPL_SUPERCLASS_INTERFACE(SwBaseShell, SfxShell) diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 21440386efdc..86df26664185 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -67,7 +67,7 @@ #include "misc.hrc" using namespace ::com::sun::star; -using namespace css::uno; +using namespace ::com::sun::star::uno; SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell) diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 98b77ecb8e55..ff2c67e550c7 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -77,9 +77,9 @@ #include <memory> using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::beans; -using namespace css::i18n; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::i18n; SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell) diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 1e065af9f124..0872981aa2be 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -85,7 +85,7 @@ using ::editeng::SvxBorderLine; using namespace ::com::sun::star; -using namespace css::uno; +using namespace ::com::sun::star::uno; // Prototypes static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine); diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx index 4910b7a5f13b..69a18da6a07b 100644 --- a/sw/source/uibase/shells/grfshex.cxx +++ b/sw/source/uibase/shells/grfshex.cxx @@ -57,8 +57,8 @@ // <- #111827# using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::ui::dialogs; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::ui::dialogs; using namespace ::sfx2; bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 807db4339bbd..8c65f71359fd 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -876,7 +876,7 @@ void SwTextShell::ExecDelete(SfxRequest &rReq) void SwTextShell::ExecTransliteration( SfxRequest & rReq ) { - using namespace css::i18n; + using namespace ::com::sun::star::i18n; sal_uInt32 nMode = 0; switch( rReq.GetSlot() ) diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index 19a578974e8b..fddb21522455 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -66,14 +66,14 @@ using namespace ::svx; using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::container; -using namespace css::lang; -using namespace css::sdb; -using namespace css::sdbc; -using namespace css::sdbcx; -using namespace css::beans; -using namespace css::frame; +using namespace ::com::sun::star::uno; +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::beans; +using namespace ::com::sun::star::frame; struct DBTextStruct_Impl { diff --git a/sw/source/uibase/smartmenu/stmenu.cxx b/sw/source/uibase/smartmenu/stmenu.cxx index 9d45454ab0d0..42751cfc507d 100644 --- a/sw/source/uibase/smartmenu/stmenu.cxx +++ b/sw/source/uibase/smartmenu/stmenu.cxx @@ -29,7 +29,7 @@ #include <breakit.hxx> using namespace ::com::sun::star; -using namespace css::uno; +using namespace ::com::sun::star::uno; SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView, Sequence< OUString >& rSmartTagTypes, diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index 7f54cf505442..c28c18675c45 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -59,7 +59,7 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> using namespace ::com::sun::star; -using namespace css::uno; +using namespace ::com::sun::star::uno; Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ) { diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 80a6c849ce61..eb66d8ac5fa5 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -91,12 +91,12 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> using namespace ::com::sun::star; -using namespace css::i18n; -using namespace css::lang; -using namespace css::uno; -using namespace css::ui::dialogs; +using namespace ::com::sun::star::i18n; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::ui::dialogs; using namespace ::sfx2; -using css::util::SearchOptions; +using ::com::sun::star::util::SearchOptions; #define SWSRCVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::NO_NEWWINDOW ) diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx index b1f792bff4c3..17fbac4e8e90 100644 --- a/sw/source/uibase/uiview/uivwimp.cxx +++ b/sw/source/uibase/uiview/uivwimp.cxx @@ -49,10 +49,10 @@ #include <view.hrc> using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::scanner; -using namespace css::lang; -using namespace css::datatransfer::clipboard; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::scanner; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::datatransfer::clipboard; SwView_Impl::SwView_Impl(SwView* pShell) : mxXTextView() diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 4cb1d172d216..7dd9064caad0 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -114,9 +114,9 @@ #include <svl/cjkoptions.hxx> using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::lang; -using namespace css::scanner; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::scanner; extern bool g_bNoInterrupt; // in swmodule.cxx diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index b506d5505c9f..7c528dc42a31 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -153,15 +153,15 @@ const char sStatusComma[] = " , "; using namespace sfx2; using namespace ::com::sun::star; -using namespace css::i18n; -using namespace css::util; -using namespace css::uno; -using namespace css::lang; -using namespace css::scanner; -using namespace css::beans; -using namespace css::container; -using namespace css::sdb; -using namespace css::ui::dialogs; +using namespace ::com::sun::star::i18n; +using namespace ::com::sun::star::util; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::scanner; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::sdb; +using namespace ::com::sun::star::ui::dialogs; static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, sal_uInt16 nWhichId ) { diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 7e83a86dd620..e2d37d25e3b2 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -90,10 +90,10 @@ using namespace sw::mark; using namespace ::com::sun::star; -using namespace css::beans; -using namespace css::uno; -using namespace css::linguistic2; -using namespace css::smarttags; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::linguistic2; +using namespace ::com::sun::star::smarttags; // Lingu-Dispatcher diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 58fc72667fd1..a722622493fd 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -56,8 +56,8 @@ sal_uInt16 SwView::m_nMoveType = NID_PGE; sal_Int32 SwView::m_nActMark = 0; -using namespace css::uno; -using namespace css::frame; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::frame; void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, bool bViewOnly ) { diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index f37acaeda850..92d907694970 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -69,9 +69,9 @@ #include "PostItMgr.hxx" using namespace com::sun::star; -using namespace css::i18n; -using namespace css::lang; -using namespace css::util; +using namespace ::com::sun::star::i18n; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::util; //Search Parameter diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 3aefd4f83588..a48e970561ed 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -50,10 +50,10 @@ using namespace comphelper; using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::beans; -using namespace css::lang; -using namespace css::i18n; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::i18n; enum SwDocumentSettingsPropertyHandles { diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index 003cc4bac491..d2bec2560321 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -35,9 +35,9 @@ #include <memory> using namespace ::com::sun::star; -using namespace css::ui::dialogs; -using namespace css::document; -using namespace css::lang; +using namespace ::com::sun::star::ui::dialogs; +using namespace ::com::sun::star::document; +using namespace ::com::sun::star::lang; #define FILTER_OPTIONS_NAME "FilterOptions" diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx index 98c5f8bb1038..b3c7ba28cd02 100644 --- a/sw/source/uibase/uno/dlelstnr.cxx +++ b/sw/source/uibase/uno/dlelstnr.cxx @@ -37,11 +37,11 @@ #include <view.hxx> using namespace ::com::sun::star; -using namespace css::lang; -using namespace css::frame; -using namespace css::uno; -using namespace css::linguistic2; -using namespace css::linguistic2::LinguServiceEventFlags; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::linguistic2; +using namespace ::com::sun::star::linguistic2::LinguServiceEventFlags; SwLinguServiceEventListener::SwLinguServiceEventListener() { diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx index a3671cf390ab..a5f6468771ea 100644 --- a/sw/source/uibase/uno/unofreg.cxx +++ b/sw/source/uibase/uno/unofreg.cxx @@ -32,7 +32,7 @@ #include <string.h> using namespace ::com::sun::star; -using namespace css::lang; +using namespace ::com::sun::star::lang; // #i73788# #include <cppuhelper/implementationentry.hxx> diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 5d83796a5208..371080ea7e63 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -74,11 +74,11 @@ #include <memory> using namespace ::com::sun::star; -using namespace css::frame; -using namespace css::uno; -using namespace css::lang; -using namespace css::beans; -using namespace css::text; +using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::text; using namespace SWUnoHelper; typedef ::utl::SharedUNOComponent< XInterface > SharedComponent; diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index a87741b45302..fa4fbb2e97fc 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -42,9 +42,9 @@ #include <rtl/ustrbuf.hxx> #include <tools/urlobj.hxx> using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::beans; -using namespace css::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::lang; using namespace ::comphelper; enum SwViewSettingsPropertyHandles diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 5244f007b166..83416d69e336 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -152,13 +152,13 @@ #include <memory> using namespace ::com::sun::star; -using namespace css::text; -using namespace css::i18n; -using namespace css::uno; -using namespace css::beans; -using namespace css::lang; -using namespace css::container; -using namespace css::document; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::i18n; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::document; using ::osl::FileBase; #define SW_CREATE_DASH_TABLE 0x01 diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index fce18a5a9620..dc012f1a0183 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -77,14 +77,14 @@ #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; -using namespace css::uno; -using namespace css::lang; -using namespace css::beans; -using namespace css::text; -using namespace css::view; -using namespace css::frame; - -using css::util::URL; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::view; +using namespace ::com::sun::star::frame; + +using ::com::sun::star::util::URL; using comphelper::HelperBaseNoState; SwXTextView::SwXTextView(SwView* pSwView) : diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx index b67e203fb607..fd11e8a5b8a0 100644 --- a/sw/source/uibase/utlui/condedit.cxx +++ b/sw/source/uibase/utlui/condedit.cxx @@ -24,7 +24,7 @@ #include <vcl/builderfactory.hxx> using namespace ::svx; -using namespace css::uno; +using namespace ::com::sun::star::uno; ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 822284f74f3e..338198eb9e5b 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -101,9 +101,9 @@ using namespace ::std; using namespace ::com::sun::star; -using namespace css::text; -using namespace css::uno; -using namespace css::container; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::container; #define NAVI_BOOKMARK_DELIM (sal_Unicode)1 diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 5882387ef719..1c43dd420de4 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -60,7 +60,7 @@ #include "swabstdlg.hxx" #include <memory> -using namespace css::uno; +using namespace ::com::sun::star::uno; // Context menu for GlobalTree #define CTX_INSERT_ANY_INDEX 10 diff --git a/sw/source/uibase/utlui/navicfg.cxx b/sw/source/uibase/utlui/navicfg.cxx index 0732fed68add..75fd8feef18f 100644 --- a/sw/source/uibase/utlui/navicfg.cxx +++ b/sw/source/uibase/utlui/navicfg.cxx @@ -27,7 +27,7 @@ #include <unomid.h> using namespace ::utl; -using namespace css::uno; +using namespace ::com::sun::star::uno; Sequence<OUString> SwNavigationConfig::GetPropertyNames() { diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index fd048d49073b..b4997d00096a 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -57,8 +57,8 @@ #include <unomid.h> #include <memory> -using namespace css::uno; -using namespace css::frame; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::frame; SFX_IMPL_CHILDWINDOW_CONTEXT( SwNavigationChild, SID_NAVIGATOR, SwView ) diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index ddeb44c6188b..90a8154c82fe 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -44,8 +44,8 @@ #include <sfx2/viewfrm.hxx> #include <memory> -using namespace css::uno; -using namespace css::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; // STATIC DATA diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index dee8d90482ee..16823c94e688 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -30,7 +30,7 @@ #include <numrule.hxx> using namespace ::com::sun::star; -using namespace css::uno; +using namespace ::com::sun::star::uno; SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( const sal_uInt16 nId, SwPageFootnoteInfo& rInfo) : SfxPoolItem( nId ), diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 342123150f12..e7a3806b95e2 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star { namespace util { struct SearchOptions; } } } } -using namespace css::util; +using namespace ::com::sun::star::util; static long nStartDragX = 0, nStartDragY = 0; static bool bStartDrag = false; |