diff options
23 files changed, 22 insertions, 41 deletions
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 26326647096a..e7bfc03a3d5c 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -35,6 +35,8 @@ #define CUR_HYPH_POS_CHAR '-' +using namespace css; + HyphenEdit::HyphenEdit(Window* pParent) : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK|WB_TABSTOP) { diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index 2e06c45d6379..8d911b285ad5 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -42,8 +42,6 @@ #include <map> #include <algorithm> -using namespace ::com::sun::star; - class SvTreeListEntry; class ThesaurusAlternativesCtrl; diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 816a00464696..c1924d7c0b77 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -29,8 +29,6 @@ #include <com/sun/star/linguistic2/XHyphenator.hpp> #include <com/sun/star/linguistic2/XPossibleHyphens.hpp> -using namespace ::com::sun::star; - class SvxSpellWrapper; class HyphenEdit : public Edit @@ -54,8 +52,8 @@ class SvxHyphenWordDialog : public SfxModalDialog CloseButton* m_pCloseBtn; String aLabel; SvxSpellWrapper* pHyphWrapper; - uno::Reference< linguistic2::XHyphenator > xHyphenator; - uno::Reference< linguistic2::XPossibleHyphens > xPossHyph; + css::uno::Reference< css::linguistic2::XHyphenator > xHyphenator; + css::uno::Reference< css::linguistic2::XPossibleHyphens > xPossHyph; String aEditWord; // aEditWord and aWordEdit.GetText() differ only by the character for the current selected hyphenation position String aActWord; // actual word to be hyphenated LanguageType nActLanguage; // and its language @@ -67,7 +65,7 @@ class SvxHyphenWordDialog : public SfxModalDialog void EnableLRBtn_Impl(); - String EraseUnusableHyphens_Impl( uno::Reference< linguistic2::XPossibleHyphens > &rxPossHyph, sal_uInt16 nMaxHyphenationPos ); + String EraseUnusableHyphens_Impl( css::uno::Reference< css::linguistic2::XPossibleHyphens > &rxPossHyph, sal_uInt16 nMaxHyphenationPos ); void InitControls_Impl(); void ContinueHyph_Impl( sal_uInt16 nInsPos = 0 ); @@ -85,7 +83,7 @@ class SvxHyphenWordDialog : public SfxModalDialog public: SvxHyphenWordDialog( const String &rWord, LanguageType nLang, Window* pParent, - uno::Reference< linguistic2::XHyphenator > &xHyphen, + css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); virtual ~SvxHyphenWordDialog(); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 1b1a58688433..a3b36dcb0fcf 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -19,7 +19,6 @@ #ifndef _SVX_THESDLG_HXX #define _SVX_THESDLG_HXX - #include <com/sun/star/linguistic2/XThesaurus.hpp> #include <svx/checklbx.hxx> @@ -30,8 +29,6 @@ #include <memory> -using namespace ::com::sun::star; - class SvxThesaurusDialog; class LookUpComboBox : public ComboBox @@ -132,7 +129,7 @@ class SvxThesaurusDialog : public SvxStandardDialog OUString m_aErrStr; - uno::Reference< linguistic2::XThesaurus > xThesaurus; + css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus; OUString aLookUpText; LanguageType nLookUpLanguage; std::stack< OUString > aLookUpHistory; @@ -153,8 +150,8 @@ public: DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox * ); - uno::Sequence< uno::Reference< linguistic2::XMeaning > > - queryMeanings_Impl( OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); + css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > + queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); bool UpdateAlternativesBox_Impl(); void LookUp( const String &rText ); @@ -163,7 +160,7 @@ public: public: SvxThesaurusDialog( Window* pParent, - uno::Reference< linguistic2::XThesaurus > xThesaurus, + css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const String &rWord, LanguageType nLanguage ); ~SvxThesaurusDialog(); diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index cf4c3ea2a3bf..590621ccb3f2 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -39,8 +39,6 @@ #include <symbol.hxx> #include <types.hxx> -using namespace com::sun::star; - class SmSym; class SmFormat; class Font; diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx index e5babc70764e..ed8f87c312eb 100644 --- a/svtools/source/graphic/descriptor.hxx +++ b/svtools/source/graphic/descriptor.hxx @@ -53,8 +53,6 @@ #define MIMETYPE_SVG "image/svg+xml" #define MIMETYPE_VCLGRAPHIC "image/x-vclgraphic" -using namespace com::sun::star; - namespace comphelper { class PropertySetInfo; } namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx index adecace1c5ce..de1958fe885a 100644 --- a/svtools/source/graphic/graphic.hxx +++ b/svtools/source/graphic/graphic.hxx @@ -28,8 +28,6 @@ #include "descriptor.hxx" #include "transformer.hxx" -using namespace com::sun::star; - class Graphic; namespace unographic { diff --git a/svtools/source/graphic/transformer.hxx b/svtools/source/graphic/transformer.hxx index 9ae4cffdda47..6abef364deb2 100644 --- a/svtools/source/graphic/transformer.hxx +++ b/svtools/source/graphic/transformer.hxx @@ -24,8 +24,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/graphic/XGraphicTransformer.hpp> -using namespace com::sun::star; - namespace unographic { // ---------------------- diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx index 6095e5f8fed1..c27836f9396a 100644 --- a/svtools/source/inc/provider.hxx +++ b/svtools/source/inc/provider.hxx @@ -25,8 +25,6 @@ #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/awt/XBitmap.hpp> -using namespace com::sun::star; - namespace unographic { // ------------------- diff --git a/svtools/source/inc/renderer.hxx b/svtools/source/inc/renderer.hxx index 58d2774c8a82..f7841028281b 100644 --- a/svtools/source/inc/renderer.hxx +++ b/svtools/source/inc/renderer.hxx @@ -27,9 +27,6 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XGraphicRenderer.hpp> - -using namespace com::sun::star; - class OutputDevice; namespace unographic { diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx index 406367971782..da5e7d248e2e 100644 --- a/svtools/source/uno/miscservices.cxx +++ b/svtools/source/uno/miscservices.cxx @@ -34,6 +34,7 @@ #include "cppuhelper/implementationentry.hxx" +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::lang; diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 60cf506e107a..682866ad20db 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -33,8 +33,6 @@ #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> -using namespace ::com::sun::star; - namespace accessibility { class AccessibleShape; diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 5ac61815d96c..b5c30212ca38 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -44,8 +44,6 @@ class SwTableBox; class SwDoc; class SwPaM; -using namespace com::sun::star; - inline void SwFltClearFlag(sal_uLong& rFieldFlags, int no) { rFieldFlags &= ~(1L << no); } diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 507393924a86..c2483488e24c 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -68,6 +68,7 @@ #define MAX_FIELDLEN 64000 +using namespace css; using namespace nsSwDocInfoSubType; diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 4f4f24e78e41..f4cbd4311e51 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -159,7 +159,7 @@ public: SvStream& OutULong( sal_uLong nVal ); SvStream& OutLong( long nVal ); void OutUnicode(const sal_Char *pToken, const String &rContent, bool bUpr = false); - void OutDateTime(const sal_Char* pStr, const util::DateTime& rDT ); + void OutDateTime(const sal_Char* pStr, const css::util::DateTime& rDT ); void OutPageDescription( const SwPageDesc& rPgDsc, bool bWriteReset, bool bCheckForFirstPage ); sal_uInt16 GetColor( const Color& rColor ) const; diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index bb1d1a02c7e1..b42d0291194e 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -29,6 +29,7 @@ #include <vcl/cvtgrf.hxx> using namespace sw::util; +using namespace css; RtfSdrExport::RtfSdrExport( RtfExport &rExport ) : EscherEx( EscherExGlobalRef( new EscherExGlobal ), 0 ), diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index c245eac3cd89..8ce8bd95271d 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -50,6 +50,8 @@ #define ASSIGN_CONST_ASC(s) AssignAscii(s) +using namespace css; + namespace myImplHelpers { SwTwips CalcHdFtDist(const SwFrmFmt& rFmt, sal_uInt16 nSpacing) diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index f8493cfc9415..17fb01c50706 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -70,6 +70,7 @@ #include "docxattributeoutput.hxx" #include "rtfattributeoutput.hxx" +using namespace css; using namespace sw::util; using namespace nsHdFtFlags; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index de440b04ea30..7753d3c1af6b 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -113,6 +113,7 @@ #include "WW8FibData.hxx" #include "numrule.hxx"//For i120928 +using namespace css; using namespace sw::util; using namespace sw::types; diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index e4d108f41561..312ce82b5c0b 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -26,6 +26,8 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/security/DocumentDigitalSignatures.hpp> +using namespace css; + // ----------------------------------------------------------------------- IMPL_LINK_NOARG(SSLWarnDialog, OKHdl_Impl) diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index f5e5a122541d..0f2ce7ab0a77 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -19,17 +19,13 @@ #ifndef UUI_SSLWARN_HXX #define UUI_SSLWARN_HXX - #include <vcl/dialog.hxx> - #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -using namespace com::sun::star; - //===================================================================== //= Https_WarnDialog //===================================================================== diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 98e712a07a28..9967261af6ce 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -26,6 +26,8 @@ #include <com/sun/star/security/DocumentDigitalSignatures.hpp> +using namespace css; + // ----------------------------------------------------------------------- IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl) diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 90d50edc7389..51c371bbe801 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -19,17 +19,13 @@ #ifndef UUI_UNKNOWNAUTH_HXX #define UUI_UNKNOWNAUTH_HXX - #include <vcl/dialog.hxx> - #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -using namespace com::sun::star; - //===================================================================== //= Https_UADialog //===================================================================== |