summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sd/source/ui/func
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/fubullet.cxx2
-rw-r--r--sd/source/ui/func/fuconcs.cxx2
-rw-r--r--sd/source/ui/func/fuconstr.cxx2
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx16
-rw-r--r--sd/source/ui/func/fuinsfil.cxx15
-rw-r--r--sd/source/ui/func/fupoor.cxx4
-rw-r--r--sd/source/ui/func/fusldlg.cxx2
-rw-r--r--sd/source/ui/func/futempl.cxx1
-rw-r--r--sd/source/ui/func/futext.cxx1
-rw-r--r--sd/source/ui/func/futhes.cxx1
-rw-r--r--sd/source/ui/func/unmovss.cxx4
-rw-r--r--sd/source/ui/func/unprlout.cxx2
13 files changed, 25 insertions, 29 deletions
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 2a2321213076..7795cb8ac451 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -132,7 +132,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
aEmptyStr );
// insert given text
- rtl::OUString aStr( cMark );
+ OUString aStr( cMark );
pOV->InsertText( aStr, sal_True);
ESelection aSel = pOV->GetSelection();
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index ab7c3b369cdf..45586622e4d4 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -196,7 +196,7 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj )
if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
{
- std::vector< rtl::OUString > aObjList;
+ std::vector< OUString > aObjList;
if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) )
{
sal_uInt16 i;
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 2492a5335da3..f932e68e8e48 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -341,7 +341,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
* Objects was created on the slide master page
***********************************************/
String aName( pPage->GetLayoutName() );
- String aSep = rtl::OUString(SD_LT_SEPARATOR);
+ String aSep = OUString(SD_LT_SEPARATOR);
sal_uInt16 n = aName.Search(aSep);
n = n + aSep.Len();
aName.Erase(n);
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index 344515e9d355..87b0c571cf95 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -256,7 +256,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
// except in a few cases (?)
if( pObj )
{
- rtl::OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush" ) );
+ OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush" ) );
mpDoc->BegUndo( sLabel );
mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, sal_False, sal_True ) );
}
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e9bb90c84319..f21dd7e0c689 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -256,7 +256,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
SdrObject* pPickObj = mpView->GetEmptyPresentationObject( ePresObjKind );
// insert diagram or Calc table
- ::rtl::OUString aObjName;
+ OUString aObjName;
SvGlobalName aName;
if (nSlotId == SID_INSERT_DIAGRAM)
aName = SvGlobalName( SO3_SCH_CLASSID);
@@ -345,15 +345,15 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
{
if (nSlotId == SID_INSERT_DIAGRAM)
{
- pOleObj->SetProgName( rtl::OUString( "StarChart" ));
+ pOleObj->SetProgName( OUString( "StarChart" ));
}
else if (nSlotId == SID_ATTR_TABLE)
{
- pOleObj->SetProgName( rtl::OUString( "StarCalc" ) );
+ pOleObj->SetProgName( OUString( "StarCalc" ) );
}
else if (nSlotId == SID_INSERT_MATH)
{
- pOleObj->SetProgName( rtl::OUString( "StarMath" ) );
+ pOleObj->SetProgName( OUString( "StarMath" ) );
}
pOleObj->SetLogicRect(aRect);
@@ -387,9 +387,9 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
uno::Reference < embed::XEmbeddedObject > xObj;
uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage();
SvObjectServerList aServerLst;
- ::rtl::OUString aName;
+ OUString aName;
- ::rtl::OUString aIconMediaType;
+ OUString aIconMediaType;
uno::Reference< io::XInputStream > xIconMetaFile;
SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False );
@@ -467,7 +467,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
if ( xSet.is() )
{
xSet->setPropertyValue("PluginURL",
- uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
+ uno::makeAny( OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
}
}
}
@@ -665,7 +665,7 @@ FunctionReference FuInsertAVMedia::Create( ViewShell* pViewSh, ::sd::Window* pWi
void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
{
- ::rtl::OUString aURL;
+ OUString aURL;
const SfxItemSet* pReqArgs = rReq.GetArgs();
bool bAPI = false;
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 40d4eede8c42..821b156116e9 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -64,7 +64,6 @@
#include "Outliner.hxx"
#include "sdabstdlg.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ui::dialogs;
@@ -107,8 +106,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
SFXWB_INSERT );
Reference< XFilePicker > xFilePicker( aFileDialog.GetFilePicker(), UNO_QUERY );
Reference< XFilterManager > xFilterManager( xFilePicker, UNO_QUERY );
- rtl::OUString aOwnCont;
- rtl::OUString aOtherCont;
+ OUString aOwnCont;
+ OUString aOtherCont;
const SfxFilter* pFilter = NULL;
aFileDialog.SetTitle( String( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE ) ) );
@@ -134,7 +133,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
String aExt;
String aAllSpec( SdResId( STR_ALL_FILES ) );
- xFilterManager->appendFilter( aAllSpec, rtl::OUString("*.*") );
+ xFilterManager->appendFilter( aAllSpec, OUString("*.*") );
xFilterManager->setCurrentFilter( aAllSpec ); // set default-filter (<All>)
// Get main filter
@@ -160,7 +159,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() );
// get Powerpoint filter
- aExt = rtl::OUString(".ppt");
+ aExt = OUString(".ppt");
pFilter = aMatch.GetFilter4Extension( aExt );
if( pFilter )
xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() );
@@ -343,7 +342,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
{
/* list with page names (if NULL, then all pages)
First, insert pages */
- std::vector<rtl::OUString> aBookmarkList = pDlg->GetList( 1 ); // pages
+ std::vector<OUString> aBookmarkList = pDlg->GetList( 1 ); // pages
sal_Bool bLink = pDlg->IsLink();
sal_Bool bReplace = sal_False;
SdPage* pPage = NULL;
@@ -373,8 +372,8 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
}
sal_Bool bNameOK;
- std::vector<rtl::OUString> aExchangeList;
- std::vector<rtl::OUString> aObjectBookmarkList = pDlg->GetList( 2 ); // objects
+ std::vector<OUString> aExchangeList;
+ std::vector<OUString> aObjectBookmarkList = pDlg->GetList( 2 ); // objects
/* if pBookmarkList is NULL, we insert selected pages, and/or selected
objects or everything. */
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 566d2dcbd71d..9bf40b570052 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -823,7 +823,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt)
if(bPrintable)
{
// try to activate textedit mode for the selected object
- SfxStringItem aInputString(SID_ATTR_CHAR, rtl::OUString(rKEvt.GetCharCode()));
+ SfxStringItem aInputString(SID_ATTR_CHAR, OUString(rKEvt.GetCharCode()));
mpViewShell->GetViewFrame()->GetDispatcher()->Execute(
SID_ATTR_CHAR,
@@ -874,7 +874,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt)
{
mpView->UnMarkAll();
mpView->MarkObj(pCandidate, mpView->GetSdrPageView());
- SfxStringItem aInputString(SID_ATTR_CHAR, rtl::OUString(rKEvt.GetCharCode()));
+ SfxStringItem aInputString(SID_ATTR_CHAR, OUString(rKEvt.GetCharCode()));
mpViewShell->GetViewFrame()->GetDispatcher()->Execute(
SID_ATTR_CHAR,
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index fecabb9d3fa8..93db40368f92 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -116,7 +116,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
AbstractSdStartPresDlg* pDlg = pFact ? pFact->CreateSdStartPresentationDlg(mpWindow, aDlgSet, aPageNameList, pCustomShowList) : 0;
if( pDlg && (pDlg->Execute() == RET_OK) )
{
- rtl::OUString aPage;
+ OUString aPage;
long nValue32;
sal_Bool bValue;
bool bValuesChanged = sal_False;
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index c59e3e59aebf..7ce9b1bfa0db 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -66,7 +66,6 @@
#include "helpids.h"
#include "sdabstdlg.hxx"
-using rtl::OUString;
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
using namespace com::sun::star::beans;
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 17de3c9c5d04..5724d2e4a7d5 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -67,7 +67,6 @@
#include "pres.hxx"
#include "optsitem.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index cdb8a9d861f7..9a4012c1f1d4 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -41,7 +41,6 @@
#include "Window.hxx"
#include "sdresid.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx
index 7553e4c9e34e..ff42ebef9cd4 100644
--- a/sd/source/ui/func/unmovss.cxx
+++ b/sd/source/ui/func/unmovss.cxx
@@ -84,9 +84,9 @@ SdMoveStyleSheetsUndoAction::~SdMoveStyleSheetsUndoAction()
{
}
-rtl::OUString SdMoveStyleSheetsUndoAction::GetComment() const
+OUString SdMoveStyleSheetsUndoAction::GetComment() const
{
- return rtl::OUString();
+ return OUString();
}
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index 96d7268280ad..35cb13bb3a27 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -67,7 +67,7 @@ SdPresentationLayoutUndoAction::~SdPresentationLayoutUndoAction()
{
}
-rtl::OUString SdPresentationLayoutUndoAction::GetComment() const
+OUString SdPresentationLayoutUndoAction::GetComment() const
{
return aComment;
}