summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svx/inc/svx/svdlayer.hxx15
-rw-r--r--svx/source/svdraw/svdlayer.cxx32
2 files changed, 29 insertions, 18 deletions
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index 19d053ec64ed..6664064f7a18 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -20,7 +20,6 @@
#ifndef _SVDLAYER_HXX
#define _SVDLAYER_HXX
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <svx/svdsob.hxx>
#include <svx/svdtypes.hxx> // fuer typedef SdrLayerID
@@ -79,7 +78,7 @@ protected:
std::vector<SdrLayer*> aLayer;
SdrLayerAdmin* pParent; // Der Admin der Seite kennt den Admin des Docs
SdrModel* pModel; // zum Broadcasten
- String aControlLayerName;
+ OUString maControlLayerName;
protected:
// Eine noch nicht verwendete LayerID raussuchen. Sind bereits alle
// verbraucht, so gibt's 'ne 0. Wer sicher gehen will, muss vorher
@@ -117,7 +116,7 @@ public:
// Alle Layer loeschen
void ClearLayer();
// Neuer Layer wird angelegt und eingefuegt
- SdrLayer* NewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
+ SdrLayer* NewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF);
void DeleteLayer(SdrLayer* pLayer)
{
std::vector<SdrLayer*>::iterator it = std::find(aLayer.begin(), aLayer.end(), pLayer);
@@ -137,14 +136,14 @@ public:
sal_uInt16 GetLayerPos(SdrLayer* pLayer) const;
- SdrLayer* GetLayer(const String& rName, bool bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); }
- const SdrLayer* GetLayer(const String& rName, bool bInherited) const;
- SdrLayerID GetLayerID(const String& rName, bool bInherited) const;
+ SdrLayer* GetLayer(const OUString& rName, bool bInherited);
+ const SdrLayer* GetLayer(const OUString& rName, bool bInherited) const;
+ SdrLayerID GetLayerID(const OUString& rName, bool bInherited) const;
SdrLayer* GetLayerPerID(sal_uInt16 nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
const SdrLayer* GetLayerPerID(sal_uInt16 nID) const;
- void SetControlLayerName(const String& rNewName) { aControlLayerName=rNewName; }
- const String& GetControlLayerName() const { return aControlLayerName; }
+ void SetControlLayerName(const OUString& rNewName);
+ const OUString& GetControlLayerName() const { return maControlLayerName; }
};
/*
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index a28f307ca917..4ce8f12a94e9 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -103,7 +103,9 @@ void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const
SdrLayer::SdrLayer() : pModel(NULL), nType(0), nID(0) {}
SdrLayer::SdrLayer(SdrLayerID nNewID, const OUString& rNewName) :
- maName(rNewName), pModel(NULL), nType(0), nID(nNewID) {}
+ maName(rNewName), pModel(NULL), nType(0), nID(nNewID)
+{
+}
void SdrLayer::SetID(SdrLayerID nNewID)
{
@@ -152,18 +154,18 @@ bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const
SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent):
aLayer(),
- pModel(NULL)
+ pParent(pNewParent),
+ pModel(NULL),
+ maControlLayerName("Controls")
{
- aControlLayerName = String(RTL_CONSTASCII_USTRINGPARAM("Controls"));
- pParent=pNewParent;
}
SdrLayerAdmin::SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin):
aLayer(),
pParent(NULL),
- pModel(NULL)
+ pModel(NULL),
+ maControlLayerName("Controls")
{
- aControlLayerName = String(RTL_CONSTASCII_USTRINGPARAM("Controls"));
*this = rSrcLayerAdmin;
}
@@ -235,7 +237,7 @@ SdrLayer* SdrLayerAdmin::RemoveLayer(sal_uInt16 nPos)
return pRetLayer;
}
-SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, sal_uInt16 nPos)
+SdrLayer* SdrLayerAdmin::NewLayer(const OUString& rName, sal_uInt16 nPos)
{
SdrLayerID nID=GetUniqueLayerID();
SdrLayer* pLay=new SdrLayer(nID,rName);
@@ -276,14 +278,19 @@ sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
return sal_uInt16(nRet);
}
-const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherited*/) const
+SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool bInherited)
+{
+ return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName, bInherited));
+}
+
+const SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool /*bInherited*/) const
{
sal_uInt16 i(0);
const SdrLayer* pLay = NULL;
while(i < GetLayerCount() && !pLay)
{
- if(rName.Equals(GetLayer(i)->GetName()))
+ if (rName == GetLayer(i)->GetName())
pLay = GetLayer(i);
else
i++;
@@ -297,7 +304,7 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherite
return pLay;
}
-SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, bool bInherited) const
+SdrLayerID SdrLayerAdmin::GetLayerID(const OUString& rName, bool bInherited) const
{
SdrLayerID nRet=SDRLAYER_NOTFOUND;
const SdrLayer* pLay=GetLayer(rName,bInherited);
@@ -349,4 +356,9 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
return i;
}
+void SdrLayerAdmin::SetControlLayerName(const OUString& rNewName)
+{
+ maControlLayerName = rNewName;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */