summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/shells')
-rw-r--r--sw/source/ui/shells/annotsh.cxx8
-rw-r--r--sw/source/ui/shells/basesh.cxx4
-rw-r--r--sw/source/ui/shells/beziersh.cxx2
-rw-r--r--sw/source/ui/shells/drawsh.cxx2
-rw-r--r--sw/source/ui/shells/drformsh.cxx5
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx10
-rw-r--r--sw/source/ui/shells/frmsh.cxx2
-rw-r--r--sw/source/ui/shells/grfsh.cxx2
-rw-r--r--sw/source/ui/shells/grfshex.cxx5
-rw-r--r--sw/source/ui/shells/langhelper.cxx14
-rw-r--r--sw/source/ui/shells/listsh.cxx2
-rw-r--r--sw/source/ui/shells/mediash.cxx2
-rw-r--r--sw/source/ui/shells/navsh.cxx2
-rw-r--r--sw/source/ui/shells/olesh.cxx2
-rw-r--r--sw/source/ui/shells/tabsh.cxx2
-rw-r--r--sw/source/ui/shells/textdrw.cxx3
-rw-r--r--sw/source/ui/shells/textfld.cxx8
-rw-r--r--sw/source/ui/shells/textsh.cxx39
-rw-r--r--sw/source/ui/shells/textsh1.cxx22
-rw-r--r--sw/source/ui/shells/textsh2.cxx4
20 files changed, 68 insertions, 72 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index c425a66e4d78..8dd405e82ab0 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -340,7 +340,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break;
case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break;
}
- pOLV->InsertText( rtl::OUString(cIns));
+ pOLV->InsertText( OUString(cIns));
rReq.Done();
break;
}
@@ -1128,7 +1128,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
{
Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
+ OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
, xContext), UNO_QUERY);
Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
if( xInit.is() )
@@ -1138,7 +1138,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
Sequence<Any> aSeq(1);
Any* pArray = aSeq.getArray();
PropertyValue aParam;
- aParam.Name = rtl::OUString("ParentWindow");
+ aParam.Name = OUString("ParentWindow");
aParam.Value <<= makeAny(xDialogParentWindow);
pArray[0] <<= makeAny(aParam);
xInit->initialize( aSeq );
@@ -1454,7 +1454,7 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
{
if( pUndoManager )
{
- rtl::OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
+ OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
sal_uInt16 nCount;
if( SID_GETUNDOSTRINGS == nWhich )
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index c36def954fff..2f200e0568b9 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -848,7 +848,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if( SfxRequest::HasMacroRecorder(pViewFrame) )
{
SfxRequest aReq( pViewFrame, nSlot);
- aReq.AppendItem( SfxStringItem( FN_PARAM_1, rtl::OUString(cDelim) ));
+ aReq.AppendItem( SfxStringItem( FN_PARAM_1, OUString(cDelim) ));
if(bToTable)
{
if(pTAFmt)
@@ -1921,7 +1921,7 @@ SwBaseShell::SwBaseShell(SwView& rVw) :
SwWrtShell& rWrtSh = rView.GetWrtShell();
SetPool(&rWrtSh.GetAttrPool());
- SetName(rtl::OUString("Base"));
+ SetName(OUString("Base"));
rWrtSh.SetGrfArrivedLnk( LINK( this, SwBaseShell, GraphicArrivedHdl));
}
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx
index d2a17b268524..a5948bd1fec4 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/ui/shells/beziersh.cxx
@@ -53,7 +53,7 @@ TYPEINIT1(SwBezierShell,SwBaseShell)
SwBezierShell::SwBezierShell(SwView &_rView):
SwBaseShell( _rView )
{
- SetName(rtl::OUString("Bezier"));
+ SetName(OUString("Bezier"));
SetHelpId(SW_BEZIERSHELL);
SwWrtShell *pSh = &GetShell();
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index a47eba8ab026..eb402f7a5e95 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -352,7 +352,7 @@ SwDrawShell::SwDrawShell(SwView &_rView) :
SwDrawBaseShell(_rView)
{
SetHelpId(SW_DRAWSHELL);
- SetName(rtl::OUString("Draw"));
+ SetName(OUString("Draw"));
}
/*************************************************************************
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx
index b92a3d74246e..f2c6a79195a1 100644
--- a/sw/source/ui/shells/drformsh.cxx
+++ b/sw/source/ui/shells/drformsh.cxx
@@ -56,7 +56,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM))
{
@@ -122,7 +121,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq)
{
uno::Any aTmp;
// Ja!
- ::rtl::OUString sLabel("Label");
+ OUString sLabel("Label");
if( xPropInfoSet->hasPropertyByName(sLabel) )
{
aTmp <<= OUString(rHLinkItem.GetName());
@@ -252,7 +251,7 @@ SwDrawFormShell::SwDrawFormShell(SwView &_rView) :
{
SetHelpId(SW_DRAWFORMSHELL);
GetShell().NoEdit(true);
- SetName(rtl::OUString("DrawForm"));
+ SetName(OUString("DrawForm"));
}
SwDrawFormShell::~SwDrawFormShell()
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index d0d6f12e5123..5601cc940b5f 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -129,7 +129,7 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) :
Init();
rSh.NoEdit(true);
- SetName(rtl::OUString("ObjectText"));
+ SetName(OUString("ObjectText"));
SetHelpId(SW_DRWTXTSHELL);
}
@@ -328,7 +328,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
{
Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
+ OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
, xContext), UNO_QUERY);
Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
if( xInit.is() )
@@ -338,7 +338,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
Sequence<Any> aSeq(1);
Any* pArray = aSeq.getArray();
PropertyValue aParam;
- aParam.Name = rtl::OUString("ParentWindow");
+ aParam.Name = OUString("ParentWindow");
aParam.Value <<= makeAny(xDialogParentWindow);
pArray[0] <<= makeAny(aParam);
xInit->initialize( aSeq );
@@ -419,7 +419,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break;
case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break;
}
- pOLV->InsertText( rtl::OUString(cIns));
+ pOLV->InsertText( OUString(cIns));
rReq.Done();
}
break;
@@ -576,7 +576,7 @@ void SwDrawTextShell::StateUndo(SfxItemSet &rSet)
::svl::IUndoManager* pUndoManager = GetUndoManager();
if( pUndoManager )
{
- rtl::OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
+ OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
sal_uInt16 nCount;
if( SID_GETUNDOSTRINGS == nWhich )
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index f8725d6caec8..ece47193fb01 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -869,7 +869,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
SwFrameShell::SwFrameShell(SwView &_rView) :
SwBaseShell( _rView )
{
- SetName(rtl::OUString("Frame"));
+ SetName(OUString("Frame"));
SetHelpId(SW_FRAMESHELL);
/* #96392# Use this to announce it is the frame shell who creates the
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index f29eb7486221..555cad4a2d51 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -737,7 +737,7 @@ SwGrfShell::SwGrfShell(SwView &_rView) :
SwBaseShell(_rView)
{
- SetName(rtl::OUString("Graphic"));
+ SetName(OUString("Graphic"));
SetHelpId(SW_GRFSHELL);
}
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx
index 428c91bee035..d00ec0e89a2c 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/ui/shells/grfshex.cxx
@@ -58,11 +58,10 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::sfx2;
-using ::rtl::OUString;
bool SwTextShell::InsertMediaDlg( SfxRequest& rReq )
{
- ::rtl::OUString aURL;
+ OUString aURL;
const SfxItemSet* pReqArgs = rReq.GetArgs();
Window* pWindow = &GetView().GetViewFrame()->GetWindow();
bool bAPI = false, bRet = false;
@@ -123,7 +122,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq )
else
aSize = Size( 2835, 2835 );
- ::rtl::OUString realURL;
+ OUString realURL;
if (bLink)
{
realURL = aURL;
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx
index 01c14facd349..b8d503caad29 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -82,14 +82,14 @@ namespace SwLangHelper
aKeyboardLang = aLangTable.GetString( nLang );
// get the language that is in use
- String aCurrentLang = rtl::OUString("*");
+ String aCurrentLang = OUString("*");
SfxItemSet aSet(pOLV->GetAttribs());
nLang = SwLangHelper::GetCurrentLanguage( aSet,nScriptType );
if (nLang != LANGUAGE_DONTKNOW)
aCurrentLang = aLangTable.GetString( nLang );
// build sequence for status value
- uno::Sequence< ::rtl::OUString > aSeq( 4 );
+ uno::Sequence< OUString > aSeq( 4 );
aSeq[0] = aCurrentLang;
aSeq[1] = aScriptTypesInUse;
aSeq[2] = aKeyboardLang;
@@ -138,11 +138,11 @@ namespace SwLangHelper
// setting the new language...
if (aNewLangTxt.Len() > 0)
{
- const rtl::OUString aSelectionLangPrefix("Current_");
- const rtl::OUString aParagraphLangPrefix("Paragraph_");
- const rtl::OUString aDocumentLangPrefix("Default_");
- const String aStrNone( rtl::OUString("LANGUAGE_NONE") );
- const String aStrResetLangs( rtl::OUString("RESET_LANGUAGES") );
+ const OUString aSelectionLangPrefix("Current_");
+ const OUString aParagraphLangPrefix("Paragraph_");
+ const OUString aDocumentLangPrefix("Default_");
+ const String aStrNone( OUString("LANGUAGE_NONE") );
+ const String aStrResetLangs( OUString("RESET_LANGUAGES") );
xub_StrLen nPos = 0;
bool bForSelection = true;
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index e1d970bd0271..30c2644d8a93 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -269,7 +269,7 @@ void SwListShell::GetState(SfxItemSet &rSet)
SwListShell::SwListShell(SwView &_rView) :
SwBaseShell(_rView)
{
- SetName(rtl::OUString("List"));
+ SetName(OUString("List"));
SetHelpId(SW_LISTSHELL);
}
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index 85cd1e535f53..5de6dfee7030 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -190,7 +190,7 @@ SwMediaShell::SwMediaShell(SwView &_rView) :
SwBaseShell(_rView)
{
- SetName(rtl::OUString("Media Playback"));
+ SetName(OUString("Media Playback"));
SetHelpId(SW_MEDIASHELL);
}
diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx
index 3cff898e025e..d6dcfc6dbdc0 100644
--- a/sw/source/ui/shells/navsh.cxx
+++ b/sw/source/ui/shells/navsh.cxx
@@ -66,7 +66,7 @@ SwNavigationShell::SwNavigationShell(SwView &_rView):
SwBaseShell( _rView )
{
- SetName(rtl::OUString("Navigation"));
+ SetName(OUString("Navigation"));
SetHelpId(SW_NAVIGATIONSHELL);
}
diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx
index 8b06595c6ec5..b155637d92f5 100644
--- a/sw/source/ui/shells/olesh.cxx
+++ b/sw/source/ui/shells/olesh.cxx
@@ -49,7 +49,7 @@ SwOleShell::SwOleShell(SwView &_rView) :
SwFrameShell(_rView)
{
- SetName(rtl::OUString("Object"));
+ SetName(OUString("Object"));
SetHelpId(SW_OLESHELL);
}
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 5d3360752c1d..43c57935c176 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -1345,7 +1345,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
SwTableShell::SwTableShell(SwView &_rView) :
SwBaseShell(_rView)
{
- SetName(rtl::OUString("Table"));
+ SetName(OUString("Table"));
SetHelpId(SW_TABSHELL);
}
diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx
index 231765b699b9..7438965838ec 100644
--- a/sw/source/ui/shells/textdrw.cxx
+++ b/sw/source/ui/shells/textdrw.cxx
@@ -40,7 +40,6 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using ::rtl::OUString;
void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, const String& rTxt)
{
@@ -109,7 +108,7 @@ void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, con
{
// #105638# OJ
aTmp <<= sal_True;
- xPropSet->setPropertyValue( rtl::OUString( "DispatchURLInternal" ), aTmp );
+ xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), aTmp );
}
}
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 81dc574f5be7..b0997d745bbe 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -402,7 +402,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
if (pRedline)
{
- rtl::OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
+ OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
sal_Bool bTravel = sal_False;
@@ -492,7 +492,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
case FN_JAVAEDIT:
{
- rtl::OUString aType, aText;
+ OUString aType, aText;
sal_Bool bIsUrl=sal_False;
sal_Bool bNew=sal_False;
bool bUpdate = false;
@@ -801,7 +801,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn )
pSh->SwapPam();
pRedline = pSh->GetCurrRedline();
- rtl::OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
+ OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
pDlg->SetNote(sComment);
pDlg->ShowLastAuthor( pRedline->GetAuthorString(),
@@ -848,7 +848,7 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn )
pDlg->EnableTravel(sal_True, bEnable);
pRedline = pSh->GetCurrRedline();
- rtl::OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
+ OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
pDlg->SetNote(sComment);
pDlg->ShowLastAuthor(pRedline->GetAuthorString(),
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index b106ceb1fdea..e41a40b04275 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -102,7 +102,6 @@
#include <comcore.hrc>
using namespace ::com::sun::star;
-using ::rtl::OUString;
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
@@ -148,7 +147,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
case FN_INSERT_SOFT_HYPHEN:
if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( sal_True, 0 ) &&
CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( sal_True, -1 ))
- rSh.Insert( rtl::OUString( CHAR_SOFTHYPHEN ) );
+ rSh.Insert( OUString( CHAR_SOFTHYPHEN ) );
break;
case FN_INSERT_HARDHYPHEN:
@@ -165,7 +164,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
ChgToEnEmDash | SetINetAttr | Autocorrect ))
rSh.AutoCorrect( *pACorr, cIns );
else
- rSh.Insert( rtl::OUString( cIns ) );
+ rSh.Insert( OUString( cIns ) );
}
break;
case SID_INSERT_RLM :
@@ -181,7 +180,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break;
case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break;
}
- rSh.Insert( rtl::OUString( cIns ) );
+ rSh.Insert( OUString( cIns ) );
}
break;
case FN_INSERT_BREAK:
@@ -226,7 +225,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if ( pURL->SetURL( aStrURL, INetURLObject::WAS_ENCODED ) )
{
- ::rtl::OUString aName;
+ OUString aName;
comphelper::EmbeddedObjectContainer aCnt;
svt::EmbeddedObjectRef xObj( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), aName ), embed::Aspects::MSOLE_CONTENT );
if ( xObj.is() )
@@ -237,8 +236,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString("PluginURL"),
- uno::makeAny( ::rtl::OUString( pURL->GetMainURL( INetURLObject::NO_DECODE ) ) ) );
+ xSet->setPropertyValue( OUString("PluginURL"),
+ uno::makeAny( OUString( pURL->GetMainURL( INetURLObject::NO_DECODE ) ) ) );
}
}
@@ -278,7 +277,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
{
comphelper::EmbeddedObjectContainer aCnt;
- ::rtl::OUString sName;
+ OUString sName;
xObj.Assign( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), sName ),
embed::Aspects::MSOLE_CONTENT );
svt::EmbeddedObjectRef::TryRunningState( xObj.GetObject() );
@@ -288,9 +287,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
try
{
if ( sClassLocation.Len() )
- xSet->setPropertyValue( ::rtl::OUString("PluginURL"),
+ xSet->setPropertyValue( OUString("PluginURL"),
uno::makeAny(
- ::rtl::OUString(
+ OUString(
URIHelper::SmartRel2Abs(
INetURLObject(), sClassLocation,
URIHelper::GetMaybeFileHdl()) ) ) );
@@ -298,7 +297,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if ( aCommandList.size() )
{
aCommandList.FillSequence( aSeq );
- xSet->setPropertyValue( ::rtl::OUString("PluginCommands"), uno::makeAny( aSeq ) );
+ xSet->setPropertyValue( OUString("PluginCommands"), uno::makeAny( aSeq ) );
}
}
catch (const uno::Exception&)
@@ -330,7 +329,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if(pURLItem) // URL is a _must_
{
comphelper::EmbeddedObjectContainer aCnt;
- ::rtl::OUString aName;
+ OUString aName;
xObj.Assign( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence(), aName ),
embed::Aspects::MSOLE_CONTENT );
svt::EmbeddedObjectRef::TryRunningState( xObj.GetObject() );
@@ -348,27 +347,27 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
aMargin = pMarginItem->GetSize();
if ( pURLItem )
- xSet->setPropertyValue( ::rtl::OUString("FrameURL"), uno::makeAny( ::rtl::OUString( pURLItem->GetValue() ) ) );
+ xSet->setPropertyValue( OUString("FrameURL"), uno::makeAny( OUString( pURLItem->GetValue() ) ) );
if ( pNameItem )
- xSet->setPropertyValue( ::rtl::OUString("FrameName"), uno::makeAny( ::rtl::OUString( pNameItem->GetValue() ) ) );
+ xSet->setPropertyValue( OUString("FrameName"), uno::makeAny( OUString( pNameItem->GetValue() ) ) );
if ( eScroll == ScrollingAuto )
- xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"),
+ xSet->setPropertyValue( OUString("FrameIsAutoScroll"),
uno::makeAny( sal_True ) );
else
- xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"),
+ xSet->setPropertyValue( OUString("FrameIsScrollingMode"),
uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
if ( pBorderItem )
- xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"),
+ xSet->setPropertyValue( OUString("FrameIsBorder"),
uno::makeAny( (sal_Bool) pBorderItem->GetValue() ) );
if ( pMarginItem )
{
- xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"),
+ xSet->setPropertyValue( OUString("FrameMarginWidth"),
uno::makeAny( sal_Int32( aMargin.Width() ) ) );
- xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"),
+ xSet->setPropertyValue( OUString("FrameMarginHeight"),
uno::makeAny( sal_Int32( aMargin.Height() ) ) );
}
}
@@ -912,7 +911,7 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest & rReq )
SwTextShell::SwTextShell(SwView &_rView) :
SwBaseShell(_rView), pPostItFldMgr( 0 )
{
- SetName(rtl::OUString("Text"));
+ SetName(OUString("Text"));
SetHelpId(SW_TEXTSHELL);
}
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index e5afbb385a13..f0c07c7476cf 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -318,11 +318,11 @@ void SwTextShell::Execute(SfxRequest &rReq)
// setting the new language...
if (aNewLangTxt.Len() > 0)
{
- const rtl::OUString aSelectionLangPrefix("Current_");
- const rtl::OUString aParagraphLangPrefix("Paragraph_");
- const rtl::OUString aDocumentLangPrefix("Default_");
- const String aStrNone( rtl::OUString("LANGUAGE_NONE") );
- const String aStrResetLangs( rtl::OUString("RESET_LANGUAGES") );
+ const OUString aSelectionLangPrefix("Current_");
+ const OUString aParagraphLangPrefix("Paragraph_");
+ const OUString aDocumentLangPrefix("Default_");
+ const String aStrNone( OUString("LANGUAGE_NONE") );
+ const String aStrResetLangs( OUString("RESET_LANGUAGES") );
SfxItemSet aCoreSet( GetPool(),
RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE,
@@ -564,7 +564,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
{
if ( pItem )
{
- ::rtl::OUString sName = ((SfxStringItem*)pItem)->GetValue();
+ OUString sName = ((SfxStringItem*)pItem)->GetValue();
rWrtSh.SetBookmark( KeyCode(), sName, aEmptyStr );
}
else
@@ -1321,13 +1321,13 @@ void SwTextShell::GetState( SfxItemSet &rSet )
aKeyboardLang = aLangTable.GetString( nLang );
// get the language that is in use
- String aCurrentLang = rtl::OUString("*");
+ String aCurrentLang = OUString("*");
nLang = SwLangHelper::GetCurrentLanguage( rSh );
if (nLang != LANGUAGE_DONTKNOW)
aCurrentLang = aLangTable.GetString( nLang );
// build sequence for status value
- uno::Sequence< ::rtl::OUString > aSeq( 4 );
+ uno::Sequence< OUString > aSeq( 4 );
aSeq[0] = aCurrentLang;
aSeq[1] = aScriptTypesInUse;
aSeq[2] = aKeyboardLang;
@@ -1573,7 +1573,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
break;
case SID_OPEN_SMARTTAGMENU:
{
- uno::Sequence< rtl::OUString > aSmartTagTypes;
+ uno::Sequence< OUString > aSmartTagTypes;
uno::Sequence< uno::Reference< container::XStringKeyMap > > aStringKeyMaps;
uno::Reference<text::XTextRange> xRange;
@@ -1591,8 +1591,8 @@ void SwTextShell::GetState( SfxItemSet &rSet )
uno::Reference <frame::XController> xController = GetView().GetController();
const lang::Locale aLocale( SW_BREAKITER()->GetLocale( GetAppLanguageTag() ) );
- const rtl::OUString aApplicationName( rSmartTagMgr.GetApplicationName() );
- const rtl::OUString aRangeText = xRange->getString();
+ const OUString aApplicationName( rSmartTagMgr.GetApplicationName() );
+ const OUString aRangeText = xRange->getString();
const SvxSmartTagItem aItem( nWhich,
aActionComponentsSequence,
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 46868899508a..8adea0bb43d3 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -87,7 +87,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
SwNewDBMgr* pNewDBMgr = GetShell().GetNewDBMgr();
sal_uInt16 nSlot = rReq.GetSlot();
- ::rtl::OUString sSourceArg, sCommandArg;
+ OUString sSourceArg, sCommandArg;
sal_Int32 nCommandTypeArg = 0;
const SfxPoolItem* pSourceItem = 0;
@@ -194,7 +194,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
pArgs->GetItemState(FN_DB_COLUMN_ANY, sal_False, &pColumnItem);
pArgs->GetItemState(FN_DB_DATA_COLUMN_NAME_ANY, sal_False, &pColumnNameItem);
- ::rtl::OUString sColumnName;
+ OUString sColumnName;
if(pColumnNameItem)
((SfxUsrAnyItem*)pColumnNameItem)->GetValue() >>= sColumnName;
String sDBName = sSourceArg;