diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-09 08:35:35 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-09 08:36:01 +0200 |
commit | 4671c3e2944678fa1f3875b13839391d8df49578 (patch) | |
tree | 99684e9f0aeb23f93b405c1238f116a347462cc0 /sw/source/uibase/app | |
parent | f045b7cb457e8ca1c0a2b3d3ec08f5fe647542bd (diff) |
formatting improvements in sw/
after my recent "com::sun::star->css in sw" commit
Change-Id: I2545648fc6f14ea0ebcabbe012e91546cf392b16
Diffstat (limited to 'sw/source/uibase/app')
-rw-r--r-- | sw/source/uibase/app/appopt.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/app/docsh.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 16 | ||||
-rw-r--r-- | sw/source/uibase/app/docshini.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/app/swmodul1.cxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 2 |
6 files changed, 22 insertions, 24 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, |