summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/cfgutil.cxx22
-rw-r--r--cui/source/customize/macropg.cxx12
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx4
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx12
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx2
-rw-r--r--cui/source/dialogs/iconcdlg.cxx2
-rw-r--r--cui/source/dialogs/pastedlg.cxx4
-rw-r--r--cui/source/dialogs/screenshotannotationdlg.cxx4
-rw-r--r--cui/source/factory/dlgfact.cxx2
-rw-r--r--cui/source/factory/dlgfact.hxx2
-rw-r--r--cui/source/inc/cfgutil.hxx4
-rw-r--r--cui/source/inc/cuifmsearch.hxx4
-rw-r--r--cui/source/inc/cuigaldlg.hxx8
-rw-r--r--cui/source/inc/cuitabline.hxx2
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx2
-rw-r--r--cui/source/inc/iconcdlg.hxx2
-rw-r--r--cui/source/inc/macropg.hxx4
-rw-r--r--cui/source/inc/pastedlg.hxx2
-rw-r--r--cui/source/inc/treeopt.hxx6
-rw-r--r--cui/source/options/cfgchart.hxx2
-rw-r--r--cui/source/options/dbregistersettings.hxx2
-rw-r--r--cui/source/options/optasian.cxx4
-rw-r--r--cui/source/options/optchart.cxx2
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/options/sdbcdriverenum.cxx4
-rw-r--r--cui/source/options/sdbcdriverenum.hxx2
-rw-r--r--cui/source/tabpages/border.cxx6
-rw-r--r--cui/source/tabpages/page.cxx2
28 files changed, 63 insertions, 63 deletions
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 7455586dd6dd..0579880c3bba 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -158,16 +158,16 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
}
}
-::std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyleFamilies()
+std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyleFamilies()
{
// It's an optional interface!
css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(m_xDoc, css::uno::UNO_QUERY);
if (!xModel.is())
- return ::std::vector< SfxStyleInfo_Impl >();
+ return std::vector< SfxStyleInfo_Impl >();
css::uno::Reference< css::container::XNameAccess > xCont = xModel->getStyleFamilies();
css::uno::Sequence< OUString > lFamilyNames = xCont->getElementNames();
- ::std::vector< SfxStyleInfo_Impl > lFamilies;
+ std::vector< SfxStyleInfo_Impl > lFamilies;
sal_Int32 c = lFamilyNames.getLength();
sal_Int32 i = 0;
for(i=0; i<c; ++i)
@@ -190,7 +190,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { return ::std::vector< SfxStyleInfo_Impl >(); }
+ { return std::vector< SfxStyleInfo_Impl >(); }
lFamilies.push_back(aFamilyInfo);
}
@@ -198,7 +198,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
return lFamilies;
}
-::std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const OUString& sFamily)
+std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const OUString& sFamily)
{
css::uno::Sequence< OUString > lStyleNames;
css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(m_xDoc, css::uno::UNO_QUERY_THROW);
@@ -212,9 +212,9 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { return ::std::vector< SfxStyleInfo_Impl >(); }
+ { return std::vector< SfxStyleInfo_Impl >(); }
- ::std::vector< SfxStyleInfo_Impl > lStyles;
+ std::vector< SfxStyleInfo_Impl > lStyles;
sal_Int32 c = lStyleNames.getLength();
sal_Int32 i = 0;
for (i=0; i<c; ++i)
@@ -891,8 +891,8 @@ void SfxConfigGroupListBox::GroupSelected()
SfxStyleInfo_Impl* pFamily = static_cast<SfxStyleInfo_Impl*>(pInfo->pObject);
if (pFamily)
{
- const ::std::vector< SfxStyleInfo_Impl > lStyles = pStylesInfo->getStyles(pFamily->sFamily);
- ::std::vector< SfxStyleInfo_Impl >::const_iterator pIt;
+ const std::vector< SfxStyleInfo_Impl > lStyles = pStylesInfo->getStyles(pFamily->sFamily);
+ std::vector< SfxStyleInfo_Impl >::const_iterator pIt;
for ( pIt = lStyles.begin();
pIt != lStyles.end() ;
++pIt )
@@ -1053,8 +1053,8 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry )
{
if ( !GetChildCount( pEntry ) )
{
- const ::std::vector< SfxStyleInfo_Impl > lStyleFamilies = pStylesInfo->getStyleFamilies();
- ::std::vector< SfxStyleInfo_Impl >::const_iterator pIt;
+ const std::vector< SfxStyleInfo_Impl > lStyleFamilies = pStylesInfo->getStyleFamilies();
+ std::vector< SfxStyleInfo_Impl >::const_iterator pIt;
for ( pIt = lStyleFamilies.begin();
pIt != lStyleFamilies.end() ;
++pIt )
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 1fcf3146f369..659f289b96ed 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -506,11 +506,11 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
return;
Sequence< OUString > eventNames = nameReplace->getElementNames();
- ::std::set< OUString > aEventNamesCache;
- ::std::copy(
+ std::set< OUString > aEventNamesCache;
+ std::copy(
eventNames.getConstArray(),
eventNames.getConstArray() + eventNames.getLength(),
- ::std::insert_iterator< ::std::set< OUString > >( aEventNamesCache, aEventNamesCache.end() )
+ std::insert_iterator< std::set< OUString > >( aEventNamesCache, aEventNamesCache.end() )
);
for ( EventDisplayNames::const_iterator displayableEvent = aDisplayNames.begin();
@@ -769,7 +769,7 @@ void SvxMacroTabPage_::InitAndSetHandler( const Reference< container::XNameRepla
// returns the two props EventType & Script for a given event name
Any SvxMacroTabPage_::GetPropsByName( const OUString& eventName, EventsHash& eventsHash )
{
- const ::std::pair< OUString, OUString >& rAssignedEvent( eventsHash[ eventName ] );
+ const std::pair< OUString, OUString >& rAssignedEvent( eventsHash[ eventName ] );
Any aReturn;
::comphelper::NamedValueCollection aProps;
@@ -785,7 +785,7 @@ Any SvxMacroTabPage_::GetPropsByName( const OUString& eventName, EventsHash& eve
// converts the Any returned by GetByName into a pair which can be stored in
// the EventHash
-::std::pair< OUString, OUString > SvxMacroTabPage_::GetPairFromAny( const Any& aAny )
+std::pair< OUString, OUString > SvxMacroTabPage_::GetPairFromAny( const Any& aAny )
{
Sequence< beans::PropertyValue > props;
OUString type, url;
@@ -795,7 +795,7 @@ Any SvxMacroTabPage_::GetPropsByName( const OUString& eventName, EventsHash& eve
type = aProps.getOrDefault( "EventType", type );
url = aProps.getOrDefault( "Script", url );
}
- return ::std::make_pair( type, url );
+ return std::make_pair( type, url );
}
SvxMacroTabPage::SvxMacroTabPage(vcl::Window* pParent,
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 06739fa9ba83..8d404c4cfee2 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -73,7 +73,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
m_pbClose->SetHelpText(OUString());
}
-FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
+FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialText, const std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier)
:ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui")
,m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) )
@@ -126,7 +126,7 @@ FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialTex
}
#endif // (OSL_DEBUG_LEVEL > 1) || DBG_UTIL
- for ( ::std::vector< OUString >::const_iterator context = _rContexts.begin();
+ for ( std::vector< OUString >::const_iterator context = _rContexts.begin();
context != _rContexts.end();
++context
)
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 8a545b1f7b25..3e102961d0f3 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -83,7 +83,7 @@ void SearchThread::execute()
{
const sal_Int32 nFileNumber = mpBrowser->m_pCbbFileType->GetEntryPos( aFileType );
sal_Int32 nBeginFormat, nEndFormat;
- ::std::vector< OUString > aFormats;
+ std::vector< OUString > aFormats;
if( !nFileNumber || ( nFileNumber >= mpBrowser->m_pCbbFileType->GetEntryCount() ) )
{
@@ -104,7 +104,7 @@ void SearchThread::execute()
void SearchThread::ImplSearch( const INetURLObject& rStartURL,
- const ::std::vector< OUString >& rFormats,
+ const std::vector< OUString >& rFormats,
bool bRecursive )
{
{
@@ -152,12 +152,12 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
GraphicDescriptor aDesc( aFoundURL );
if( ( aDesc.Detect() &&
- ::std::find( rFormats.begin(),
+ std::find( rFormats.begin(),
rFormats.end(),
GraphicDescriptor::GetImportFormatShortName(
aDesc.GetFileFormat() ).toAsciiLowerCase() )
!= rFormats.end() ) ||
- ::std::find( rFormats.begin(),
+ std::find( rFormats.begin(),
rFormats.end(),
aFoundURL.GetExtension().toAsciiLowerCase() )
!= rFormats.end() )
@@ -353,8 +353,8 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void)
maTakeThread->join();
TPGalleryThemeProperties* pBrowser = static_cast<TPGalleryThemeProperties*>( GetParent() );
- ::std::vector<bool, std::allocator<bool> > aRemoveEntries( pBrowser->aFoundList.size(), false );
- ::std::vector< OUString > aRemainingVector;
+ std::vector<bool, std::allocator<bool> > aRemoveEntries( pBrowser->aFoundList.size(), false );
+ std::vector< OUString > aRemainingVector;
sal_uInt32 i, nCount;
GetParent()->EnterWait();
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 5276d57a5cad..fd22cd31374a 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -137,7 +137,7 @@ namespace svx
// position these rectangles properly
// x-axis:
- sal_Int32 nCombinedWidth = ::std::max( aSecondaryRect.GetWidth(), aPrimaryRect.GetWidth() );
+ sal_Int32 nCombinedWidth = std::max( aSecondaryRect.GetWidth(), aPrimaryRect.GetWidth() );
// the rectangle where both texts will reside is as high as possible, and as wide as the
// widest of both text rects
aPrimaryRect.Left() = aSecondaryRect.Left() = _rRect.Left();
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 661d3d5adf9e..169c34ec571c 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -33,7 +33,7 @@
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
-using ::std::vector;
+using std::vector;
/**********************************************************************
|
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index c0d5da6d506d..61ae7c66a9a7 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -89,7 +89,7 @@ IMPL_LINK_NOARG( SvPasteObjectDialog, DoubleClickHdl, ListBox&, void )
*************************************************************************/
void SvPasteObjectDialog::Insert( SotClipboardFormatId nFormat, const OUString& rFormatName )
{
- aSupplementMap.insert( ::std::make_pair( nFormat, rFormatName ) );
+ aSupplementMap.insert( std::make_pair( nFormat, rFormatName ) );
}
SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper)
@@ -116,7 +116,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe
{
SotClipboardFormatId nFormat = (*aIter++).mnSotId;
- ::std::map< SotClipboardFormatId, OUString >::iterator itName =
+ std::map< SotClipboardFormatId, OUString >::iterator itName =
aSupplementMap.find( nFormat );
// if there is an "Embed Source" or and "Embedded Object" on the
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 1c422fa136b1..5b02b861473a 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -122,8 +122,8 @@ private:
basegfx::B2IRange maB2IRange;
};
-typedef ::std::vector< ControlDataEntry > ControlDataCollection;
-typedef ::std::set< ControlDataEntry* > ControlDataSet;
+typedef std::vector< ControlDataEntry > ControlDataCollection;
+typedef std::set< ControlDataEntry* > ControlDataSet;
class ScreenshotAnnotationDlg_Impl // : public ModalDialog
{
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 8bf720fa4b04..354554dcc0dc 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1152,7 +1152,7 @@ VclPtr<AbstractSvxHpLinkDlg> AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (vcl
VclPtr<AbstractFmSearchDialog> AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::Window* pParent,
const OUString& strInitialText,
- const ::std::vector< OUString >& _rContexts,
+ const std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier)
{
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 79f3e7cd9f36..2160c8a0c81c 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -565,7 +565,7 @@ public:
virtual VclPtr<AbstractSvxHpLinkDlg> CreateSvxHpLinkDlg(vcl::Window* pParent, SfxBindings* pBindings) override;
virtual VclPtr<AbstractFmSearchDialog> CreateFmSearchDialog(vcl::Window* pParent,
const OUString& strInitialText,
- const ::std::vector< OUString >& _rContexts,
+ const std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) override;
virtual VclPtr<AbstractGraphicFilterDialog> CreateGraphicFilterEmboss(vcl::Window* pParent,
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
{
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 6b1bc4a5add6..1cf007dbce04 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -29,7 +29,7 @@
class SvxChartColorTable
{
private:
- ::std::vector< XColorEntry > m_aColorEntries;
+ std::vector< XColorEntry > m_aColorEntries;
int nNextElementNumber;
OUString sDefaultNamePrefix;
OUString sDefaultNamePostfix;
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index 131cef4c804a..8a05ce5520f7 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -57,7 +57,7 @@ namespace svx
};
- typedef ::std::map< OUString, DatabaseRegistration > DatabaseRegistrations;
+ typedef std::map< OUString, DatabaseRegistration > DatabaseRegistrations;
class DatabaseMapItem : public SfxPoolItem
{
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 5509f0c526f1..da87582e22b7 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -52,7 +52,7 @@ struct SvxForbiddenChars_Impl
std::unique_ptr<ForbiddenCharacters> pCharacters;
};
-typedef ::std::map< LanguageType, SvxForbiddenChars_Impl* > SvxForbiddenCharacterMap_Impl;
+typedef std::map< LanguageType, SvxForbiddenChars_Impl* > SvxForbiddenCharacterMap_Impl;
struct SvxAsianLayoutPage_Impl
{
@@ -103,7 +103,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
SvxForbiddenChars_Impl* pChar = new SvxForbiddenChars_Impl;
pChar->bRemoved = nullptr == pForbidden;
pChar->pCharacters.reset( pForbidden ? new ForbiddenCharacters(*pForbidden) : nullptr );
- aChangedLanguagesMap.insert( ::std::make_pair( eLang, pChar ) );
+ aChangedLanguagesMap.insert( std::make_pair( eLang, pChar ) );
}
else
{
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 060d3b0b6587..34c8f4ed58de 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -58,7 +58,7 @@ void SvxDefaultColorOptPage::InsertColorEntry(const XColorEntry& rEntry, sal_Int
if ( static_cast<size_t>(nPos) < aColorList.size() )
{
ImpColorList::iterator it = aColorList.begin();
- ::std::advance( it, nPos );
+ std::advance( it, nPos );
aColorList.insert( it, rColor );
}
else
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 50c5a9c347bd..845944bcd653 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -78,7 +78,7 @@ private:
VclPtr<CheckBox> m_pExperimentalCB;
VclPtr<CheckBox> m_pMacroCB;
- ::std::vector< JavaInfo* >
+ std::vector< JavaInfo* >
m_aAddedInfos;
rtl::Reference< ::svt::DialogClosedListener > xDialogListener;
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index 6bf32542e420..1d2831ffcb42 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -37,12 +37,12 @@ namespace offapp
class ODriverEnumerationImpl
{
protected:
- ::std::vector< OUString > m_aImplNames;
+ std::vector< OUString > m_aImplNames;
public:
ODriverEnumerationImpl();
- const ::std::vector< OUString >& getDriverImplNames() const { return m_aImplNames; }
+ const std::vector< OUString >& getDriverImplNames() const { return m_aImplNames; }
};
diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx
index 80f0b3212907..46cec9736694 100644
--- a/cui/source/options/sdbcdriverenum.hxx
+++ b/cui/source/options/sdbcdriverenum.hxx
@@ -45,7 +45,7 @@ namespace offapp
public:
ODriverEnumeration() throw();
~ODriverEnumeration() throw();
- typedef ::std::vector< OUString >::const_iterator const_iterator;
+ typedef std::vector< OUString >::const_iterator const_iterator;
const_iterator begin() const throw();
const_iterator end() const throw();
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index a1f6ac6e752e..c5a08f68428d 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -654,7 +654,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
// outer border:
- ::std::pair<svx::FrameBorderType,SvxBoxItemLine> eTypes1[] = {
+ std::pair<svx::FrameBorderType,SvxBoxItemLine> eTypes1[] = {
{ svx::FrameBorderType::Top,SvxBoxItemLine::TOP },
{ svx::FrameBorderType::Bottom,SvxBoxItemLine::BOTTOM },
{ svx::FrameBorderType::Left,SvxBoxItemLine::LEFT },
@@ -668,7 +668,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
aBoxItem.SetRemoveAdjacentCellBorder( mbRemoveAdjacentCellBorders );
// border hor/ver and TableFlag
- ::std::pair<svx::FrameBorderType,SvxBoxInfoItemLine> eTypes2[] = {
+ std::pair<svx::FrameBorderType,SvxBoxInfoItemLine> eTypes2[] = {
{ svx::FrameBorderType::Horizontal,SvxBoxInfoItemLine::HORI },
{ svx::FrameBorderType::Vertical,SvxBoxInfoItemLine::VERT }
};
@@ -1222,7 +1222,7 @@ void SvxBorderTabPage::UpdateRemoveAdjCellBorderCB( sal_uInt16 nPreset )
const SvxBoxItem* pOldBoxItem = static_cast<const SvxBoxItem*>(GetOldItem( rOldSet, SID_ATTR_BORDER_OUTER ));
if( !pOldBoxInfoItem || !pOldBoxItem )
return;
- ::std::pair<svx::FrameBorderType, SvxBoxInfoItemValidFlags> eTypes1[] = {
+ std::pair<svx::FrameBorderType, SvxBoxInfoItemValidFlags> eTypes1[] = {
{ svx::FrameBorderType::Top,SvxBoxInfoItemValidFlags::TOP },
{ svx::FrameBorderType::Bottom,SvxBoxInfoItemValidFlags::BOTTOM },
{ svx::FrameBorderType::Left,SvxBoxInfoItemValidFlags::LEFT },
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index fd4065f98a6b..1b99f638094f 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -349,7 +349,7 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
m_pBottomMarginEdit->SetLast(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM);
// Get the i18n framework numberings and add them to the listbox.
- SvxNumOptionsTabPageHelper::GetI18nNumbering( *m_pNumberFormatBox, ::std::numeric_limits<sal_uInt16>::max());
+ SvxNumOptionsTabPageHelper::GetI18nNumbering( *m_pNumberFormatBox, std::numeric_limits<sal_uInt16>::max());
}