summaryrefslogtreecommitdiff
path: root/sc/source/ui/drawfunc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/drawfunc')
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx10
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx26
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconcustomshape.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuins1.cxx6
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx44
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx4
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx2
11 files changed, 51 insertions, 51 deletions
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index b748f81898ac..3e8605c70827 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -197,7 +197,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
case SID_DRAW_HLINK_DELETE:
if ( pSingleSelectedObj )
- SetHlinkForObject( pSingleSelectedObj, rtl::OUString() );
+ SetHlinkForObject( pSingleSelectedObj, OUString() );
break;
case SID_OPEN_HYPERLINK:
@@ -296,8 +296,8 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
if ( !pInfo->GetMacro().isEmpty() )
{
SvxMacroTableDtor aTab;
- rtl::OUString sMacro = pInfo->GetMacro();
- aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, SvxMacro(sMacro, rtl::OUString()));
+ OUString sMacro = pInfo->GetMacro();
+ aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, SvxMacro(sMacro, OUString()));
aItem.SetMacroTable( aTab );
}
@@ -321,7 +321,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, false, &pItem ))
{
- rtl::OUString sMacro;
+ OUString sMacro;
const SvxMacro* pMacro = ((SvxMacroItem*)pItem)->GetMacroTable().Get( SFX_EVENT_MOUSECLICK_OBJECT );
if ( pMacro )
sMacro = pMacro->GetMacName();
@@ -444,7 +444,7 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 /* nTabPage *
delete( pDlg );
}
-void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk )
+void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk )
{
if ( pObj )
{
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 10edc8317745..b161aeafa9d4 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -63,7 +63,7 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) :
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_DRAWSH );
- SetName(rtl::OUString("Drawing"));
+ SetName(OUString("Drawing"));
}
ScDrawShell::~ScDrawShell()
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 5d4029de27c6..1bbc09f25f64 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -92,10 +92,10 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink
uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY );
uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo();
- rtl::OUString sPropButtonType( "ButtonType" );
- rtl::OUString sPropTargetURL( "TargetURL" );
- rtl::OUString sPropTargetFrame( "TargetFrame" );
- rtl::OUString sPropLabel( "Label" );
+ OUString sPropButtonType( "ButtonType" );
+ OUString sPropTargetURL( "TargetURL" );
+ OUString sPropTargetFrame( "TargetFrame" );
+ OUString sPropLabel( "Label" );
if(xInfo->hasPropertyByName( sPropButtonType ))
{
@@ -103,7 +103,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink
form::FormButtonType eTmp;
if ( (aAny >>= eTmp) && eTmp == form::FormButtonType_URL )
{
- rtl::OUString sTmp;
+ OUString sTmp;
// Label
if(xInfo->hasPropertyByName( sPropLabel ))
{
@@ -179,31 +179,31 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY );
uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo();
- rtl::OUString sPropTargetURL( "TargetURL" );
+ OUString sPropTargetURL( "TargetURL" );
// Darf man eine URL an dem Objekt setzen?
if (xInfo->hasPropertyByName( sPropTargetURL ))
{
// Ja!
- rtl::OUString sPropButtonType( "ButtonType");
- rtl::OUString sPropTargetFrame( "TargetFrame" );
- rtl::OUString sPropLabel( "Label" );
+ OUString sPropButtonType( "ButtonType");
+ OUString sPropTargetFrame( "TargetFrame" );
+ OUString sPropLabel( "Label" );
uno::Any aAny;
if ( xInfo->hasPropertyByName( sPropLabel ) )
{
- aAny <<= rtl::OUString(rName);
+ aAny <<= OUString(rName);
xPropSet->setPropertyValue( sPropLabel, aAny );
}
- ::rtl::OUString aTmp = INetURLObject::GetAbsURL( pViewData->GetDocShell()->GetMedium()->GetBaseURL(), rURL );
+ OUString aTmp = INetURLObject::GetAbsURL( pViewData->GetDocShell()->GetMedium()->GetBaseURL(), rURL );
aAny <<= aTmp;
xPropSet->setPropertyValue( sPropTargetURL, aAny );
if( rTarget.Len() && xInfo->hasPropertyByName( sPropTargetFrame ) )
{
- aAny <<= rtl::OUString(rTarget);
+ aAny <<= OUString(rTarget);
xPropSet->setPropertyValue( sPropTargetFrame, aAny );
}
@@ -486,7 +486,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
if(SC_LAYER_INTERN != pSelected->GetLayer())
{
- rtl::OUString aName = pSelected->GetName();
+ OUString aName = pSelected->GetName();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 08542bead9d4..6355ef5e8d9d 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -53,7 +53,7 @@ ScDrawFormShell::ScDrawFormShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_DRAWFORMSH);
- SetName(rtl::OUString("DrawForm"));
+ SetName(OUString("DrawForm"));
}
ScDrawFormShell::~ScDrawFormShell()
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 944f853862c8..ed3b2c1295e7 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -120,7 +120,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
}
SetHelpId( HID_SCSHELL_DRTXTOB );
- SetName(rtl::OUString("DrawText"));
+ SetName(OUString("DrawText"));
}
ScDrawTextObjectBar::~ScDrawTextObjectBar()
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index fa4988c452ee..ef7df53356fc 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -214,7 +214,7 @@ void FuConstCustomShape::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/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index a0cb995bbc8c..b30af3caf23e 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -151,7 +151,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
//------------------------------------------------------------------------
-static void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi,
+static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi,
ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView,
const Size& rPrefSize, bool const bLink )
{
@@ -176,7 +176,7 @@ static void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi,
if( pData->GetDocument()->IsNegativePage( pData->GetTabNo() ) )
aInsertPos.X() -= aSize.Width();
- ::rtl::OUString realURL;
+ OUString realURL;
if (bLink)
{
realURL = rMediaURL;
@@ -314,7 +314,7 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
SfxRequest& rReq ) :
FuPoor(pViewSh, pWin, pViewP, pDoc, rReq)
{
- ::rtl::OUString aURL;
+ OUString aURL;
const SfxItemSet* pReqArgs = rReq.GetArgs();
bool bAPI = false;
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index c9cd38ea34b0..5b47107a1f94 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -86,12 +86,12 @@ extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht
namespace {
void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScViewData* pViewData,
- const rtl::OUString& rRangeParam )
+ const OUString& rRangeParam )
{
ScDocShell* pDocShell = pViewData->GetDocShell();
ScDocument* pScDoc = pDocShell->GetDocument();
- rtl::OUString aRangeString( rRangeParam );
+ OUString aRangeString( rRangeParam );
if ( aRangeString.isEmpty() )
{
SCCOL nCol1 = 0;
@@ -176,16 +176,16 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
uno::Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- ::rtl::OUString("CellRangeRepresentation"), -1,
+ OUString("CellRangeRepresentation"), -1,
uno::makeAny( aRangeString ), beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString("HasCategories"), -1,
+ OUString("HasCategories"), -1,
uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString("FirstCellAsLabel"), -1,
+ OUString("FirstCellAsLabel"), -1,
uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- ::rtl::OUString("DataRowSource"), -1,
+ OUString("DataRowSource"), -1,
uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE );
xReceiver->setArguments( aArgs );
@@ -208,10 +208,10 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
uno::Reference < embed::XEmbeddedObject > xObj;
uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage();
sal_Bool bIsFromFile = false;
- ::rtl::OUString aName;
+ OUString aName;
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
- ::rtl::OUString aIconMediaType;
+ OUString aIconMediaType;
uno::Reference< io::XInputStream > xIconMetaFile;
@@ -280,7 +280,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
if ( aURL.SetURL( aPluginFileDialog.GetPath() ) )
{
// create a plugin object
- ::rtl::OUString aObjName;
+ OUString aObjName;
SvGlobalName aClassId( SO3_PLUGIN_CLASSID );
comphelper::EmbeddedObjectContainer aCnt( xStorage );
xObj = aCnt.CreateEmbeddedObject( aClassId.GetByteSequence(), aObjName );
@@ -290,8 +290,8 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString("PluginURL"),
- uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
+ xSet->setPropertyValue( OUString("PluginURL"),
+ uno::makeAny( OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
}
}
}
@@ -359,7 +359,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
// Chart initialisieren ?
if ( SvtModuleOptions().IsChart() && SotExchange::IsChart( SvGlobalName( xObj->getClassID() ) ) )
- lcl_ChartInit( xObj, pViewSh->GetViewData(), rtl::OUString() );
+ lcl_ChartInit( xObj, pViewSh->GetViewData(), OUString() );
ScViewData* pData = pViewSh->GetViewData();
@@ -451,13 +451,13 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
// BM/IHA --
// get range
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
ScRange aPositionRange; // cell range for chart positioning
if( pReqArgs )
{
const SfxPoolItem* pItem;
if( pReqArgs->HasItem( FN_PARAM_5, &pItem ) )
- aRangeString = ::rtl::OUString( ((const SfxStringItem*)pItem)->GetValue());
+ aRangeString = OUString( ((const SfxStringItem*)pItem)->GetValue());
aPositionRange = pViewSh->GetViewData()->GetCurPos();
}
@@ -499,7 +499,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
// adapted old code
pView->UnmarkAll();
- ::rtl::OUString aName;
+ OUString aName;
const sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
uno::Reference < embed::XEmbeddedObject > xObj =
@@ -582,7 +582,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
if ( nToTable == pScDoc->GetTableCount() )
{
// dann los...
- rtl::OUString aTabName;
+ OUString aTabName;
SCTAB nNewTab = pScDoc->GetTableCount();
pScDoc->CreateValidTabName( aTabName );
@@ -667,7 +667,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
{
uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- rtl::OUString("com.sun.star.comp.chart2.WizardDialog")
+ OUString("com.sun.star.comp.chart2.WizardDialog")
, xContext), uno::UNO_QUERY);
uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY );
if( xChartModel.is() && xInit.is() )
@@ -677,10 +677,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
uno::Sequence<uno::Any> aSeq(2);
uno::Any* pArray = aSeq.getArray();
beans::PropertyValue aParam1;
- aParam1.Name = rtl::OUString("ParentWindow");
+ aParam1.Name = OUString("ParentWindow");
aParam1.Value <<= uno::makeAny(xDialogParentWindow);
beans::PropertyValue aParam2;
- aParam2.Name = rtl::OUString("ChartModel");
+ aParam2.Name = OUString("ChartModel");
aParam2.Value <<= uno::makeAny(xChartModel);
pArray[0] <<= uno::makeAny(aParam1);
pArray[1] <<= uno::makeAny(aParam2);
@@ -694,7 +694,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
{
//get dialog size:
awt::Size aDialogAWTSize;
- if( xDialogProps->getPropertyValue( ::rtl::OUString("Size") )
+ if( xDialogProps->getPropertyValue( OUString("Size") )
>>= aDialogAWTSize )
{
Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height );
@@ -702,12 +702,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
{
//calculate and set new position
Point aDialogPos = pViewShell->GetChartDialogPos( aDialogSize, aRect );
- xDialogProps->setPropertyValue( ::rtl::OUString("Position"),
+ xDialogProps->setPropertyValue( OUString("Position"),
uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) );
}
}
//tell the dialog to unlock controller
- xDialogProps->setPropertyValue( ::rtl::OUString("UnlockControllersOnExecute"),
+ xDialogProps->setPropertyValue( OUString("UnlockControllersOnExecute"),
uno::makeAny( sal_True ) );
}
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index d07cefa60b47..ece660700fa3 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -211,7 +211,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
try
{
- aCaller = xProps->getPropertyValue( rtl::OUString("Name") );
+ aCaller = xProps->getPropertyValue( OUString("Name") );
}
catch( uno::Exception& ) {}
}
@@ -398,7 +398,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
ScDocument* pDocument = ( pViewData ? pViewData->GetDocument() : NULL );
SdrPageView* pPageView = ( pView ? pView->GetSdrPageView() : NULL );
SdrPage* pPage = ( pPageView ? pPageView->GetPage() : NULL );
- ::std::vector< ::rtl::OUString > aExcludedChartNames;
+ ::std::vector< OUString > aExcludedChartNames;
ScRangeListVector aProtectedChartRangesVector;
if ( rMEvt.IsLeft() )
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 5364d5cd1cfe..45666e6f6999 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -78,7 +78,7 @@ ScGraphicShell::ScGraphicShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_GRAPHIC);
- SetName(rtl::OUString("GraphicObject"));
+ SetName(OUString("GraphicObject"));
}
ScGraphicShell::~ScGraphicShell()
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index fdf06d9ea9bb..6cb1db567ce5 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -53,7 +53,7 @@ ScOleObjectShell::ScOleObjectShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_OLEOBEJCTSH);
- SetName(rtl::OUString("OleObject"));
+ SetName(OUString("OleObject"));
}
ScOleObjectShell::~ScOleObjectShell()
generated by cgit (git 2.34.1) at 2024-08-07 19:52:09 +0000