summaryrefslogtreecommitdiff
path: root/chart2/source/controller/main/SelectionHelper.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/controller/main/SelectionHelper.cxx')
-rw-r--r--chart2/source/controller/main/SelectionHelper.cxx46
1 files changed, 23 insertions, 23 deletions
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 16c795875aa6..950c05df949b 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -43,11 +43,11 @@ using namespace ::com::sun::star;
namespace
{
-rtl::OUString lcl_getObjectName( SdrObject* pObj )
+OUString lcl_getObjectName( SdrObject* pObj )
{
if(pObj)
return pObj->GetName();
- return rtl::OUString();
+ return OUString();
}
void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper )
@@ -71,7 +71,7 @@ bool Selection::hasSelection()
return m_aSelectedOID.isValid();
}
-rtl::OUString Selection::getSelectedCID()
+OUString Selection::getSelectedCID()
{
return m_aSelectedOID.getObjectCID();
}
@@ -86,7 +86,7 @@ ObjectIdentifier Selection::getSelectedOID() const
return m_aSelectedOID;
}
-bool Selection::setSelection( const ::rtl::OUString& rCID )
+bool Selection::setSelection( const OUString& rCID )
{
if ( !rCID.equals( m_aSelectedOID.getObjectCID() ) )
{
@@ -256,7 +256,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
if ( !m_aSelectedOID.isAdditionalShape() )
{
- rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model
+ OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model
if ( !m_aSelectedOID.isAutoGeneratedObject() )
{
@@ -264,8 +264,8 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
}
//check whether the diagram was hit but not selected (e.g. because it has no filling):
- rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
- rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+ OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
+ OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject();
if( bBackGroundHit )
{
@@ -283,7 +283,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
//check whether the legend was hit but not selected (e.g. because it has no filling):
if( bBackGroundHit || m_aSelectedOID.getObjectCID().equals( aDiagramCID ) )
{
- rtl::OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model
+ OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model
SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID );
if( pLegend )
{
@@ -338,13 +338,13 @@ bool Selection::isAdditionalShapeSelected() const
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
- , rtl::OUString& rOutName
+ , OUString& rOutName
, bool bGivenObjectMayBeResult )
{
SolarMutexGuard aSolarGuard;
//find the deepest named group
SdrObject* pObj = pInOutObject;
- rtl::OUString aName;
+ OUString aName;
if( bGivenObjectMayBeResult )
aName = lcl_getObjectName( pObj );
@@ -374,7 +374,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
, ObjectIdentifier& rOutObject
, bool bGivenObjectMayBeResult )
{
- rtl::OUString aName;
+ OUString aName;
if ( findNamedParent( pInOutObject, aName, bGivenObjectMayBeResult ) )
{
rOutObject = ObjectIdentifier( aName );
@@ -384,7 +384,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
}
bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
- , const rtl::OUString& rNameOfSelectedObject
+ , const OUString& rNameOfSelectedObject
, const DrawViewWrapper& rDrawViewWrapper )
{
if(rNameOfSelectedObject.isEmpty())
@@ -398,14 +398,14 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
return true;
}
-::rtl::OUString SelectionHelper::getHitObjectCID(
+OUString SelectionHelper::getHitObjectCID(
const Point& rMPos,
DrawViewWrapper& rDrawViewWrapper,
bool bGetDiagramInsteadOf_Wall )
{
// //- solar mutex
SolarMutexGuard aSolarGuard;
- rtl::OUString aRet;
+ OUString aRet;
SdrObject* pNewObj = rDrawViewWrapper.getHitObject(rMPos);
aRet = lcl_getObjectName( pNewObj );//name of pNewObj
@@ -421,10 +421,10 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
//accept only named objects while searching for the object to select
if( !findNamedParent( pNewObj, aRet, true ) )
{
- aRet = ::rtl::OUString();
+ aRet = OUString();
}
- rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model
+ OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model
//get page when nothing was hit
if( aRet.isEmpty() && !pNewObj )
{
@@ -436,7 +436,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
{
if( aRet.equals( aPageCID ) )
{
- rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
+ OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
//todo: if more than one diagram is available in future do chack the list of all diagrams here
SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID );
if( pDiagram )
@@ -449,11 +449,11 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
}
else if( bGetDiagramInsteadOf_Wall )
{
- rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+ OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
if( aRet.equals( aWallCID ) )
{
- rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
+ OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
aRet = aDiagramCID;
}
}
@@ -463,7 +463,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
// \\- solar mutex
}
-bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID
+bool SelectionHelper::isRotateableObject( const OUString& rCID
, const uno::Reference< frame::XModel >& xChartModel )
{
if( !ObjectIdentifier::isRotateableObject( rCID ) )
@@ -497,7 +497,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj )
{
if(!pObj)
return 0;
- rtl::OUString aName( lcl_getObjectName( pObj ) );
+ OUString aName( lcl_getObjectName( pObj ) );
if( aName.match("MarkHandles") || aName.match("HandlesOnly") )
return pObj;
if( !aName.isEmpty() )//dont't get the markhandles of a different object
@@ -643,7 +643,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
if( !pSubList )//no group object !pObj->IsGroupObject()
return false;
- rtl::OUString aName( lcl_getObjectName( pObj ) );
+ OUString aName( lcl_getObjectName( pObj ) );
ObjectType eObjectType( ObjectIdentifier::getObjectType( aName ) );
if( OBJECTTYPE_DATA_POINT == eObjectType
|| OBJECTTYPE_DATA_LABEL == eObjectType
@@ -660,7 +660,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
SdrObject* pSubObj = aIterator.Next();
if( OBJECTTYPE_DATA_SERIES == eObjectType )
{
- rtl::OUString aSubName( lcl_getObjectName( pSubObj ) );
+ OUString aSubName( lcl_getObjectName( pSubObj ) );
ObjectType eSubObjectType( ObjectIdentifier::getObjectType( aSubName ) );
if( eSubObjectType!=OBJECTTYPE_DATA_POINT )
return false;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 09:32:50 +0000