mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XubString->OUString

Browse Source 
Change-Id: I8bf16712cee985c1eeeea9e42479f22de2a43597
This commit is contained in:
Caolán McNamara
2013-09-01 20:26:27 +01:00
parent 277b339371
commit 6c5c0302f3
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/svx/svdedtv.hxx
View File

@@ -189,11 +189,11 @@ public:
void AddUndoActions( std::vector< SdrUndoAction* >& ); void AddUndoActions( std::vector< SdrUndoAction* >& );
// Layerverwaltung. Mit Undo. // Layerverwaltung. Mit Undo.
SdrLayer* InsertNewLayer(const String& rName, sal_uInt16 nPos=0xFFFF); SdrLayer* InsertNewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF);
// Loeschen eines Layer inkl. aller darauf befindlichen Objekte // Loeschen eines Layer inkl. aller darauf befindlichen Objekte
void DeleteLayer(const String& rName); void DeleteLayer(const OUString& rName);
// Verschieben eines Layer (Layerreihenfolge aendern) // Verschieben eines Layer (Layerreihenfolge aendern)
void MoveLayer(const String& rName, sal_uInt16 nNewPos); void MoveLayer(const OUString& rName, sal_uInt16 nNewPos);
// Markierte Objekte die ausserhalb ihrer Page liegen // Markierte Objekte die ausserhalb ihrer Page liegen
// werden ggf. einer anderen Page zugewiesen // werden ggf. einer anderen Page zugewiesen

8
include/svx/svdpagv.hxx
View File

@@ -119,8 +119,8 @@ private:
void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const; void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const;
void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa); void SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa);
sal_Bool IsLayer(const String& rName, const SetOfByte& rBS) const; bool IsLayer(const OUString& rName, const SetOfByte& rBS) const;
// Nachsehen, ob AktGroup noch Inserted ist. // Nachsehen, ob AktGroup noch Inserted ist.
void CheckAktGroup(); void CheckAktGroup();
@@ -195,8 +195,8 @@ public:
Rectangle& MarkBound() { return aMarkBound; } Rectangle& MarkBound() { return aMarkBound; }
Rectangle& MarkSnap() { return aMarkSnap; } Rectangle& MarkSnap() { return aMarkSnap; }
void SetLayerVisible(const String& rName, sal_Bool bShow = sal_True) { SetLayer(rName, aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); } void SetLayerVisible(const OUString& rName, bool bShow = true) { SetLayer(rName, aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); }
sal_Bool IsLayerVisible(const String& rName) const { return IsLayer(rName, aLayerVisi); } bool IsLayerVisible(const OUString& rName) const { return IsLayer(rName, aLayerVisi); }
void SetLayerLocked(const String& rName, sal_Bool bLock = sal_True) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); } void SetLayerLocked(const String& rName, sal_Bool bLock = sal_True) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); }
sal_Bool IsLayerLocked(const String& rName) const { return IsLayer(rName,aLayerLock); } sal_Bool IsLayerLocked(const String& rName) const { return IsLayer(rName,aLayerLock); }

4
include/svx/svdpntv.hxx
View File

@@ -353,8 +353,8 @@ public:
virtual void AddWindowToPaintView(OutputDevice* pNewWin); virtual void AddWindowToPaintView(OutputDevice* pNewWin);
virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin); virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin);
void SetLayerVisible(const String& rName, sal_Bool bShow=sal_True); void SetLayerVisible(const OUString& rName, bool bShow=true);
bool IsLayerVisible(const String& rName) const; bool IsLayerVisible(const OUString& rName) const;
void SetLayerLocked(const String& rName, sal_Bool bLock=sal_True); void SetLayerLocked(const String& rName, sal_Bool bLock=sal_True);
bool IsLayerLocked(const String& rName) const; bool IsLayerLocked(const String& rName) const;

4
svx/source/svdraw/svdedtv.cxx
View File

@@ -102,7 +102,7 @@ SdrEditView::~SdrEditView()
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, sal_uInt16 nPos) SdrLayer* SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos)
{ {
SdrLayerAdmin& rLA=pMod->GetLayerAdmin(); SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
sal_uInt16 nMax=rLA.GetLayerCount(); sal_uInt16 nMax=rLA.GetLayerCount();
@@ -196,7 +196,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID)
} }
} }
void SdrEditView::DeleteLayer(const XubString& rName) void SdrEditView::DeleteLayer(const OUString& rName)
{ {
SdrLayerAdmin& rLA = pMod->GetLayerAdmin(); SdrLayerAdmin& rLA = pMod->GetLayerAdmin();
SdrLayer* pLayer = rLA.GetLayer(rName, sal_True); SdrLayer* pLayer = rLA.GetLayer(rName, sal_True);

12
svx/source/svdraw/svdpagv.cxx
View File

@@ -612,7 +612,7 @@ void SdrPageView::AdjHdl()
GetView().AdjustMarkHdl(); GetView().AdjustMarkHdl();
} }
void SdrPageView::SetLayer(const XubString& rName, SetOfByte& rBS, sal_Bool bJa) void SdrPageView::SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa)
{ {
if(!GetPage()) if(!GetPage())
return; return;
@@ -623,16 +623,16 @@ void SdrPageView::SetLayer(const XubString& rName, SetOfByte& rBS, sal_Bool bJa)
rBS.Set(nID, bJa); rBS.Set(nID, bJa);
} }
sal_Bool SdrPageView::IsLayer(const XubString& rName, const SetOfByte& rBS) const bool SdrPageView::IsLayer(const OUString& rName, const SetOfByte& rBS) const
{ {
if(!GetPage()) if(!GetPage())
return sal_False; return false;
sal_Bool bRet(sal_False); bool bRet(false);
if(rName.Len()) if (!rName.isEmpty())
{ {
SdrLayerID nId = GetPage()->GetLayerAdmin().GetLayerID(rName, sal_True); SdrLayerID nId = GetPage()->GetLayerAdmin().GetLayerID(rName, true);
if(SDRLAYER_NOTFOUND != nId) if(SDRLAYER_NOTFOUND != nId)
{ {

6
svx/source/svdraw/svdpntv.cxx
View File

@@ -509,17 +509,17 @@ void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
#endif #endif
} }
void SdrPaintView::SetLayerVisible(const XubString& rName, sal_Bool bShow) void SdrPaintView::SetLayerVisible(const OUString& rName, bool bShow)
{ {
if(mpPageView) if(mpPageView)
{ {
mpPageView->SetLayerVisible(rName,bShow); mpPageView->SetLayerVisible(rName, bShow);
} }
InvalidateAllWin(); InvalidateAllWin();
} }
bool SdrPaintView::IsLayerVisible(const XubString& rName) const bool SdrPaintView::IsLayerVisible(const OUString& rName) const
{ {
if(mpPageView) if(mpPageView)
{ {