diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-02-15 23:55:18 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-02-15 23:01:23 +0000 |
commit | 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 (patch) | |
tree | 3f669db44367a2a072b899a1a1b87eb25ee607af /cui/source/inc | |
parent | 3e1e49561bb734475d2b7d1db1beef0d3e9b53cd (diff) |
Drop :: prefix from std in c*/
Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155
Reviewed-on: https://gerrit.libreoffice.org/34324
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'cui/source/inc')
-rw-r--r-- | cui/source/inc/cfgutil.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/cuifmsearch.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/cuigaldlg.hxx | 8 | ||||
-rw-r--r-- | cui/source/inc/cuitabline.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/hangulhanjadlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/iconcdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/macropg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/pastedlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/treeopt.hxx | 6 |
9 files changed, 17 insertions, 17 deletions
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 21178f68fae7..ef73b0bb429a 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -68,8 +68,8 @@ public: static bool parseStyleCommand(SfxStyleInfo_Impl& aStyle); void getLabel4Style(SfxStyleInfo_Impl& aStyle); - ::std::vector< SfxStyleInfo_Impl > getStyleFamilies(); - ::std::vector< SfxStyleInfo_Impl > getStyles(const OUString& sFamily); + std::vector< SfxStyleInfo_Impl > getStyleFamilies(); + std::vector< SfxStyleInfo_Impl > getStyles(const OUString& sFamily); static OUString generateCommand(const OUString& sFamily, const OUString& sStyle); }; diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index b61fd63adb16..51e521f26881 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -84,7 +84,7 @@ class FmSearchDialog : public ModalDialog Link<FmSearchContext&,sal_uInt32> m_lnkContextSupplier; ///< for search in contexts /// memorize the currently selected field for every context - ::std::vector<OUString> m_arrContextFields; + std::vector<OUString> m_arrContextFields; FmSearchEngine* m_pSearchEngine; @@ -107,7 +107,7 @@ public: (of course needed : the string number i in strUsedFields of a context must correspond with the interface number i in the arrFields of the context) */ - FmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, + FmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier); virtual ~FmSearchDialog() override; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index dcef86db5030..a0cd12637028 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -48,8 +48,8 @@ class SearchProgress; class TakeProgress; class TPGalleryThemeProperties; -typedef ::std::vector< OUString > StringList; -typedef ::std::vector< sal_uLong > TokenList_impl; +typedef std::vector< OUString > StringList; +typedef std::vector< sal_uLong > TokenList_impl; struct FilterEntry { @@ -65,7 +65,7 @@ private: INetURLObject maStartURL; void ImplSearch( const INetURLObject& rStartURL, - const ::std::vector< OUString >& rFormats, + const std::vector< OUString >& rFormats, bool bRecursive ); virtual ~SearchThread() override; @@ -250,7 +250,7 @@ class TPGalleryThemeProperties : public SfxTabPage ExchangeData* pData; StringList aFoundList; - ::std::vector< FilterEntry* > + std::vector< FilterEntry* > aFilterEntryList; Timer aPreviewTimer; OUString aLastFilterName; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 39e7498e5fdb..5b39cc711182 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -137,7 +137,7 @@ private: VclPtr<MetricField> m_pSymbolHeightMF; VclPtr<CheckBox> m_pSymbolRatioCB; std::vector<OUString> m_aGrfNames; - ::std::vector< SvxBmpItemInfo* > + std::vector< SvxBmpItemInfo* > m_aGrfBrushItems; bool m_bLastWidthModified; Size m_aSymbolLastSize; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 91c55eb3a2b1..60bdb4cff011 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -193,7 +193,7 @@ namespace svx }; - typedef ::std::vector< css::uno::Reference< css::linguistic2::XConversionDictionary > > HHDictList; + typedef std::vector< css::uno::Reference< css::linguistic2::XConversionDictionary > > HHDictList; class HangulHanjaOptionsDialog : public ModalDialog { diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 2b7c014f2d1d..044e749d26ac 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -99,7 +99,7 @@ class IconChoiceDialog : public ModalDialog private: friend class IconChoicePage; - ::std::vector< IconChoicePageData* > maPageList; + std::vector< IconChoicePageData* > maPageList; VclPtr<SvtIconChoiceCtrl> m_pIconCtrl; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 8767b671360f..b2feb3c6dcdc 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -48,7 +48,7 @@ struct EventDisplayName { } }; -typedef ::std::vector< EventDisplayName > EventDisplayNames; +typedef std::vector< EventDisplayName > EventDisplayNames; class SvxMacroTabPage_; class SvTabListBox; @@ -78,7 +78,7 @@ protected: void EnableButtons(); static css::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); - static ::std::pair< OUString, OUString > GetPairFromAny( const css::uno::Any& aAny ); + static std::pair< OUString, OUString > GetPairFromAny( const css::uno::Any& aAny ); public: diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 2e0dec3a3c34..6ef2572d839b 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -42,7 +42,7 @@ class SvPasteObjectDialog : public ModalDialog VclPtr<FixedText> m_pFtObjectSource; VclPtr<ListBox> m_pLbInsertList; VclPtr<OKButton> m_pOKButton; - ::std::map< SotClipboardFormatId, OUString > aSupplementMap; + std::map< SotClipboardFormatId, OUString > aSupplementMap; SvGlobalName aObjClassName; OUString aObjName; diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 0510327bd880..1b05598c2475 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -70,7 +70,7 @@ struct OptionsLeaf m_nGroupIndex( nGroupIndex ) {} }; -typedef ::std::vector< OptionsLeaf* > VectorOfLeaves; +typedef std::vector< OptionsLeaf* > VectorOfLeaves; // struct OptionsNode ---------------------------------------------------- @@ -81,7 +81,7 @@ struct OptionsNode OUString m_sPageURL; bool m_bAllModules; VectorOfLeaves m_aLeaves; - ::std::vector< VectorOfLeaves > + std::vector< VectorOfLeaves > m_aGroupedLeaves; OptionsNode( const OUString& rId, @@ -102,7 +102,7 @@ struct OptionsNode } }; -typedef ::std::vector< OptionsNode* > VectorOfNodes; +typedef std::vector< OptionsNode* > VectorOfNodes; struct LastPageSaver { |