[Libreoffice-commits] core.git: 46 commits - cui/source dbaccess/source include/framework sc/inc sc/source sd/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Thu Sep 19 01:14:56 PDT 2013
cui/source/inc/macroass.hxx | 1
dbaccess/source/ui/inc/callbacks.hxx | 1
include/framework/bmkmenu.hxx | 1
sc/inc/addincol.hxx | 1
sc/inc/externalrefmgr.hxx | 11 -
sc/inc/paramisc.hxx | 10 -
sc/inc/servuno.hxx | 3
sc/source/core/data/global2.cxx | 8 -
sc/source/core/inc/adiasync.hxx | 6
sc/source/core/tool/adiasync.cxx | 7
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 4
sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx | 3
sc/source/filter/xml/XMLCodeNameProvider.cxx | 4
sc/source/filter/xml/XMLCodeNameProvider.hxx | 3
sc/source/ui/docshell/dbdocfun.cxx | 4
sc/source/ui/docshell/externalrefmgr.cxx | 6
sc/source/ui/drawfunc/drtxtob.cxx | 4
sc/source/ui/inc/dbdocfun.hxx | 6
sc/source/ui/inc/viewutil.hxx | 3
sc/source/ui/unoobj/servuno.cxx | 8 -
sc/source/ui/view/editsh.cxx | 4
sc/source/ui/view/viewutil.cxx | 2
sd/source/core/drawdoc3.cxx | 66 ++++----
sd/source/core/sdpage.cxx | 36 ++--
sd/source/core/sdpage2.cxx | 20 +-
sd/source/core/stlfamily.cxx | 6
sd/source/ui/dlg/dlgass.cxx | 8 -
sd/source/ui/func/fuinsfil.cxx | 20 +-
sd/source/ui/inc/MasterPageObserver.hxx | 5
sd/source/ui/inc/TemplateScanner.hxx | 12 -
sd/source/ui/inc/TextLogger.hxx | 56 -------
sd/source/ui/inc/fuinsfil.hxx | 6
sd/source/ui/inc/taskpane/ScrollPanel.hxx | 2
sd/source/ui/inc/taskpane/TitleBar.hxx | 7
sd/source/ui/inc/taskpane/TitledControl.hxx | 6
sd/source/ui/inc/tmplctrl.hxx | 2
sd/source/ui/inc/unoaprms.hxx | 12 -
sd/source/ui/remotecontrol/ImagePreparer.cxx | 4
sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 5
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 8 -
sd/source/ui/sidebar/DocumentHelper.cxx | 12 -
sd/source/ui/sidebar/DocumentHelper.hxx | 4
sd/source/ui/sidebar/LayoutMenu.cxx | 4
sd/source/ui/sidebar/MasterPageContainer.cxx | 23 +-
sd/source/ui/sidebar/MasterPageContainer.hxx | 10 -
sd/source/ui/sidebar/MasterPageContainerFiller.cxx | 8 -
sd/source/ui/sidebar/MasterPageDescriptor.cxx | 6
sd/source/ui/sidebar/MasterPageDescriptor.hxx | 6
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx | 4
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 4
sd/source/ui/slideshow/showwin.cxx | 8 -
sd/source/ui/slideshow/slideshow.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 32 +---
sd/source/ui/slideshow/slideshowimpl.hxx | 6
sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 3
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 16 +-
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 2
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx | 3
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx | 12 -
sd/source/ui/table/tablefunction.cxx | 4
sd/source/ui/toolpanel/ControlContainerDescriptor.hxx | 6
sd/source/ui/toolpanel/LayoutMenu.cxx | 4
sd/source/ui/toolpanel/ScrollPanel.cxx | 2
sd/source/ui/toolpanel/TitleBar.cxx | 10 -
sd/source/ui/toolpanel/TitledControl.cxx | 4
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2
sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx | 5
sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx | 8 -
sd/source/ui/toolpanel/controls/DocumentHelper.cxx | 12 -
sd/source/ui/toolpanel/controls/DocumentHelper.hxx | 4
sd/source/ui/toolpanel/controls/MasterPageContainer.cxx | 23 +-
sd/source/ui/toolpanel/controls/MasterPageContainer.hxx | 10 -
sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx | 8 -
sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx | 6
sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx | 6
sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx | 4
sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx | 4
sd/source/ui/unoidl/sddetect.cxx | 36 ++--
sd/source/ui/unoidl/unocpres.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 78 ++++------
sd/source/ui/unoidl/unoobj.cxx | 19 +-
sw/inc/EnhancedPDFExportHelper.hxx | 5
sw/inc/IDocumentContentOperations.hxx | 13 -
sw/inc/IDocumentFieldsAccess.hxx | 1
sw/inc/IDocumentLinksAdministration.hxx | 1
sw/inc/IDocumentMarkAccess.hxx | 1
sw/inc/IDocumentRedlineAccess.hxx | 5
sw/inc/IDocumentStylePoolAccess.hxx | 1
sw/inc/doc.hxx | 16 +-
sw/inc/ndarr.hxx | 7
sw/inc/swabstdlg.hxx | 51 +++---
sw/inc/swunohelper.hxx | 15 -
sw/inc/toxwrap.hxx | 12 -
sw/inc/unocrsrhelper.hxx | 7
sw/source/core/access/accportions.hxx | 1
sw/source/core/doc/doc.cxx | 16 +-
sw/source/core/doc/docedt.cxx | 14 -
sw/source/core/doc/docredln.cxx | 4
sw/source/core/graphic/ndgrf.cxx | 4
sw/source/core/ole/ndole.cxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 6
sw/source/core/tox/toxhlp.cxx | 18 +-
sw/source/core/unocore/swunohelper.cxx | 16 +-
sw/source/core/unocore/unocrsrhelper.cxx | 27 +--
sw/source/core/unocore/unoparagraph.cxx | 4
sw/source/ui/dialog/swdlgfact.cxx | 36 ++--
sw/source/ui/dialog/swdlgfact.hxx | 46 ++---
sw/source/ui/inc/glossary.hxx | 4
sw/source/ui/inc/instable.hxx | 4
sw/source/ui/inc/mailmergewizard.hxx | 4
sw/source/ui/misc/glosdoc.cxx | 11 -
sw/source/ui/misc/glossary.cxx | 4
sw/source/ui/shells/basesh.cxx | 8 -
sw/source/ui/shells/textsh1.cxx | 4
sw/source/ui/table/instable.cxx | 4
sw/source/ui/utlui/gloslst.cxx | 7
118 files changed, 532 insertions(+), 654 deletions(-)
New commits:
commit a2b86b5fb75925e7e8b24751f83e1ecc8584cf72
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 15:50:00 2013 +0200
convert the rest of the .cxx files in sd from String to OUString
Change-Id: I2f68a14baf707d7098b84c68b11a85cd28e49d95
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index ec2fee2..336cdb3 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -82,8 +82,8 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
// now check for duplicate masterpage and layout names
// ===================================================
- String aFullNameLayout( pBMMPage->GetLayoutName() );
- aFullNameLayout.Erase( aFullNameLayout.SearchAscii( SD_LT_SEPARATOR ));
+ OUString aFullNameLayout( pBMMPage->GetLayoutName() );
+ aFullNameLayout = aFullNameLayout.copy(0, aFullNameLayout.indexOf( SD_LT_SEPARATOR ));
OUString aLayout(aFullNameLayout);
@@ -97,8 +97,8 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
{
// Do the layouts already exist within the document?
SdPage* pTestPage = (SdPage*) rDoc.GetMasterPage(nMPage);
- String aFullTest(pTestPage->GetLayoutName());
- aFullTest.Erase( aFullTest.SearchAscii( SD_LT_SEPARATOR ));
+ OUString aFullTest(pTestPage->GetLayoutName());
+ aFullTest = aFullTest.copy(0, aFullTest.indexOf( SD_LT_SEPARATOR ));
OUString aTest(aFullTest);
@@ -815,8 +815,8 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
++pExchangeIter;
}
- String aLayout(pRefPage->GetLayoutName());
- aLayout.Erase(aLayout.SearchAscii( SD_LT_SEPARATOR ));
+ OUString aLayout(pRefPage->GetLayoutName());
+ aLayout = aLayout.copy(0, aLayout.indexOf( SD_LT_SEPARATOR ));
// update layout and referred master page
pRefPage->SetPresentationLayout(aLayout);
@@ -1311,7 +1311,7 @@ bool isMasterPageLayoutNameUnique(const SdDrawDocument& rDoc, const OUString& rC
// #i121863# factored out functinality
OUString createNewMasterPageLayoutName(const SdDrawDocument& rDoc)
{
- const String aBaseName(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ const OUString aBaseName(SdResId(STR_LAYOUT_DEFAULT_NAME));
OUString aRetval;
sal_uInt16 nCount(0);
@@ -1350,7 +1350,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if( bUndo )
{
- pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), String());
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString());
}
SdPage* pSelectedPage = GetSdPage(nSdPageNum, PK_STANDARD);
@@ -1360,9 +1360,9 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
SdPage* pMaster = NULL;
SdPage* pNotesMaster = NULL;
SdPage* pPage = NULL;
- String aOldPageLayoutName(pSelectedPage->GetLayoutName());
- String aOldLayoutName(aOldPageLayoutName);
- aOldLayoutName.Erase(aOldLayoutName.SearchAscii( SD_LT_SEPARATOR ));
+ OUString aOldPageLayoutName(pSelectedPage->GetLayoutName());
+ OUString aOldLayoutName(aOldPageLayoutName);
+ aOldLayoutName = aOldLayoutName.copy(0, aOldLayoutName.indexOf( SD_LT_SEPARATOR ));
if (pSourceDoc)
{
@@ -1421,8 +1421,8 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
return;
}
- const String aOriginalNewLayoutName( pMaster->GetName() );
- String aTargetNewLayoutName(aOriginalNewLayoutName);
+ const OUString aOriginalNewLayoutName( pMaster->GetName() );
+ OUString aTargetNewLayoutName(aOriginalNewLayoutName);
if (pSourceDoc != this)
{
@@ -1443,15 +1443,15 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
// layout name needs to be unique
aTargetNewLayoutName = pMaster->GetLayoutName();
- aTargetNewLayoutName.Erase(aTargetNewLayoutName.SearchAscii(SD_LT_SEPARATOR));
+ aTargetNewLayoutName = aTargetNewLayoutName.copy(0, aTargetNewLayoutName.indexOf(SD_LT_SEPARATOR));
if(!isMasterPageLayoutNameUnique(*this, aTargetNewLayoutName))
{
aTargetNewLayoutName = createNewMasterPageLayoutName(*this);
- String aTemp(aTargetNewLayoutName);
- aTemp.AppendAscii(RTL_CONSTASCII_STRINGPARAM(SD_LT_SEPARATOR));
- aTemp.Append(SD_RESSTR(STR_LAYOUT_OUTLINE));
+ OUString aTemp(aTargetNewLayoutName);
+ aTemp += SD_LT_SEPARATOR;
+ aTemp += SD_RESSTR(STR_LAYOUT_OUTLINE);
pMaster->SetName(aTargetNewLayoutName);
pMaster->SetLayoutName(aTemp);
@@ -1476,7 +1476,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
// Correct or create presentation templates --
// only worry about presentation templates
- String aName;
+ OUString aName;
SdStyleSheetPool* pSourceStyleSheetPool = (SdStyleSheetPool*) pSourceDoc->GetStyleSheetPool();
pSourceStyleSheetPool->SetSearchMask(SD_STYLE_FAMILY_MASTERPAGE);
static_cast<SdStyleSheetPool*>( mxStyleSheetPool.get())->SetSearchMask(SD_STYLE_FAMILY_MASTERPAGE);
@@ -1490,14 +1490,13 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
// #i121863# search in source styles with original style name from source of
// evtl. cloned master (not-cloned, renamed for uniqueness)
- if( aName.Search( aOriginalNewLayoutName ) == 0 )
+ if( aName.indexOf( aOriginalNewLayoutName ) == 0 )
{
// #i121863# build name of evtl. cloned master style to search for
if(aOriginalNewLayoutName != aTargetNewLayoutName)
{
- const sal_uInt16 nPos(aName.SearchAscii(SD_LT_SEPARATOR));
- aName.Erase(0, nPos);
- aName.Insert(aTargetNewLayoutName, 0);
+ const sal_Int32 nPos(aName.indexOf(SD_LT_SEPARATOR));
+ aName = aTargetNewLayoutName + aName.copy(nPos);
}
SfxStyleSheet* pMySheet = static_cast<SfxStyleSheet*>( mxStyleSheetPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE) );
@@ -1537,10 +1536,9 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
// #i121863# re-create original name of styte used at page where to replace with
// this new style
- String aTemp(pMySheet->GetName());
- const sal_uInt16 nPos(aTemp.SearchAscii(SD_LT_SEPARATOR));
- aTemp.Erase(0, nPos);
- aTemp.Insert(aOldLayoutName, 0);
+ OUString aTemp(pMySheet->GetName());
+ const sal_Int32 nPos(aTemp.indexOf(SD_LT_SEPARATOR));
+ aTemp = aOldLayoutName + aTemp.copy(nPos);
aReplData.aName = aTemp;
aReplList.push_back(aReplData);
}
@@ -1560,17 +1558,17 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if (pSOld && pSNew)
{
- const String& rParentOfOld = pSOld->GetParent();
- const String& rParentOfNew = pSNew->GetParent();
+ const OUString& rParentOfOld = pSOld->GetParent();
+ const OUString& rParentOfNew = pSNew->GetParent();
- if (rParentOfOld.Len() > 0 && rParentOfNew.Len() == 0)
+ if (!rParentOfOld.isEmpty() && rParentOfNew.isEmpty())
{
std::vector<StyleReplaceData>::iterator pRDIter;
for ( pRDIter = aReplList.begin(); pRDIter != aReplList.end(); ++pRDIter )
{
if ((pRDIter->aName == rParentOfOld) && (pRDIter->aName != pRDIter->aNewName))
{
- String aParentOfNew(pRDIter->aNewName);
+ OUString aParentOfNew(pRDIter->aNewName);
pSNew->SetParent(aParentOfNew);
break;
}
@@ -1595,9 +1593,9 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
// Create layout name based upon the name of the page layout of the
// master page
- String aPageLayoutName(pMaster->GetLayoutName());
- String aLayoutName = aPageLayoutName;
- aLayoutName.Erase( aLayoutName.SearchAscii( SD_LT_SEPARATOR ));
+ OUString aPageLayoutName(pMaster->GetLayoutName());
+ OUString aLayoutName = aPageLayoutName;
+ aLayoutName = aLayoutName.copy( 0, aLayoutName.indexOf( SD_LT_SEPARATOR ));
// #i121863# Do *not* remove from original document any longer, it is potentially used there
// and would lead to crashes. Rely on the automatic process of removing unused masterpages
@@ -1653,7 +1651,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++)
{
pPage = (SdPage*) GetPage(nPage);
- String aTest = pPage->GetLayoutName();
+ OUString aTest = pPage->GetLayoutName();
if (aTest == aOldPageLayoutName)
{
aPageList.push_back(pPage);
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 099e8aa..d310476 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -568,14 +568,14 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const
{
- String aName(GetLayoutName());
- String aSep( SD_LT_SEPARATOR );
- sal_uInt16 nPos = aName.Search(aSep);
+ OUString aName(GetLayoutName());
+ OUString aSep( SD_LT_SEPARATOR );
+ sal_Int32 nPos = aName.indexOf(aSep);
- if (nPos != STRING_NOTFOUND)
+ if (nPos != -1)
{
- nPos = nPos + aSep.Len();
- aName.Erase(nPos);
+ nPos = nPos + aSep.getLength();
+ aName = aName.copy(0, nPos);
}
aName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
@@ -587,13 +587,13 @@ SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const
SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const
{
- String aName(GetLayoutName());
- String aSep( SD_LT_SEPARATOR );
- sal_uInt16 nPos = aName.Search(aSep);
- if (nPos != STRING_NOTFOUND)
+ OUString aName(GetLayoutName());
+ OUString aSep( SD_LT_SEPARATOR );
+ sal_Int32 nPos = aName.indexOf(aSep);
+ if (nPos != -1)
{
- nPos = nPos + aSep.Len();
- aName.Erase(nPos);
+ nPos = nPos + aSep.getLength();
+ aName = aName.copy(0, nPos);
}
switch (eObjKind)
@@ -636,9 +636,9 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const
slides masterpage */
SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const
{
- String aStyleName( pPage->GetLayoutName() );
- const String aSep( SD_LT_SEPARATOR );
- aStyleName.Erase(aStyleName.Search(aSep) + aSep.Len());
+ OUString aStyleName( pPage->GetLayoutName() );
+ const OUString aSep( SD_LT_SEPARATOR );
+ aStyleName = aStyleName.copy(0, aStyleName.indexOf(aSep) + aSep.getLength());
sal_uInt16 nNameId;
switch( nHelpId )
@@ -662,11 +662,11 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const
OSL_FAIL( "SdPage::getPresentationStyle(), illegal argument!" );
return 0;
}
- aStyleName.Append( SD_RESSTR( nNameId ) );
+ aStyleName += SD_RESSTR( nNameId );
if( nNameId == STR_LAYOUT_OUTLINE )
{
- aStyleName.Append( sal_Unicode( ' ' ));
- aStyleName.Append( OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE )));
+ aStyleName += " ";
+ aStyleName += OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE ));
}
SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool();
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index c6d2f6e..da7791d 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -154,20 +154,18 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName,
{
if (!bListsFilled || !bReplaceStyleSheets)
{
- String aFullName;
- String aOldFullName;
+ OUString aFullName;
+ OUString aOldFullName;
SfxStyleSheetBase* pSheet = NULL;
SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool();
for (sal_Int16 i = -1; i < 9; i++)
{
- aFullName = maLayoutName;
aOldFullName = aOldLayoutName;
- aFullName += sal_Unicode( ' ' );
- aFullName += OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1);
- aOldFullName += sal_Unicode( ' ' );
- aOldFullName += OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1 );
-
+ aFullName = maLayoutName + " " +
+ OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1) +
+ " " +
+ OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1 );
pSheet = pStShPool->Find(aOldFullName, SD_STYLE_FAMILY_MASTERPAGE);
DBG_ASSERT(pSheet, "Old outline style sheet not found");
aOldOutlineStyles.push_back(pSheet);
@@ -268,8 +266,8 @@ void SdPage::EndListenOutlineText()
{
SdStyleSheetPool* pSPool = (SdStyleSheetPool*)pModel->GetStyleSheetPool();
DBG_ASSERT(pSPool, "StyleSheetPool missing");
- String aTrueLayoutName(maLayoutName);
- aTrueLayoutName.Erase( aTrueLayoutName.SearchAscii( SD_LT_SEPARATOR ));
+ OUString aTrueLayoutName(maLayoutName);
+ aTrueLayoutName = aTrueLayoutName.copy(0, aTrueLayoutName.indexOf( SD_LT_SEPARATOR ));
SfxStyleSheet *pSheet = NULL;
std::vector<SfxStyleSheetBase*> aOutlineStyles;
@@ -403,7 +401,7 @@ SdPage::SdPage(const SdPage& rSrcPage)
maSoundFile = rSrcPage.maSoundFile;
mbLoopSound = rSrcPage.mbLoopSound;
mbStopSound = rSrcPage.mbStopSound;
- maCreatedPageName = String();
+ maCreatedPageName = "";
maFileName = rSrcPage.maFileName;
maBookmarkName = rSrcPage.maBookmarkName;
mbScaleObjects = rSrcPage.mbScaleObjects;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index e9891e9..a17c324 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -208,9 +208,9 @@ OUString SAL_CALL SdStyleFamily::getName() throw (RuntimeException)
if( pPage == 0 )
throw DisposedException();
- String aLayoutName( pPage->GetLayoutName() );
- const String aSep( SD_LT_SEPARATOR );
- aLayoutName.Erase(aLayoutName.Search(aSep));
+ OUString aLayoutName( pPage->GetLayoutName() );
+ const OUString aSep( SD_LT_SEPARATOR );
+ aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(aSep));
return OUString( aLayoutName );
}
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 112c7da..34b41bc 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -201,7 +201,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
Transmitter::PRIORITY_LOW );
}
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl );
+sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, OUString aUrl );
// Code copied from sdremote/source/presenter/PresenterNotesView.cxx
OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
@@ -283,7 +283,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
aRet.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
}
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl )
+sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, OUString aUrl )
{
OUString aFilterName( "XHTML Draw File" );
uno::Reference< document::XExporter > xExporter;
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index a1ddbed..dfe4b7c 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -146,7 +146,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
continue;
// Use the name of the master page to avoid duplicate entries.
- String sName (pMasterPage->GetName());
+ OUString sName (pMasterPage->GetName());
if (aMasterPageNames.find(sName)!=aMasterPageNames.end())
continue;
aMasterPageNames.insert (sName);
@@ -159,9 +159,9 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor(
MasterPageContainer::MASTERPAGE,
nIndex,
- String(),
+ OUString(),
pMasterPage->GetName(),
- String(),
+ OUString(),
pMasterPage->IsPrecious(),
::boost::shared_ptr<PageObjectProvider>(new ExistingPageProvider(pMasterPage)),
::boost::shared_ptr<PreviewProvider>(new PagePreviewProvider())));
@@ -221,7 +221,7 @@ void CurrentMasterPagesSelector::UpdateSelection (void)
sal_uInt16 nItemCount (PreviewValueSet::GetItemCount());
for (nIndex=1; nIndex<=nItemCount && bLoop; nIndex++)
{
- String sName (PreviewValueSet::GetItemText (nIndex));
+ OUString sName (PreviewValueSet::GetItemText (nIndex));
if (aNames.find(sName) != aNames.end())
{
PreviewValueSet::SelectItem (nIndex);
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index d386841..5e3651e 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -262,8 +262,8 @@ void DocumentHelper::ProvideStyles (
SdPage* pPage)
{
// Get the layout name of the given page.
- String sLayoutName (pPage->GetLayoutName());
- sLayoutName.Erase (sLayoutName.SearchAscii (SD_LT_SEPARATOR));
+ OUString sLayoutName (pPage->GetLayoutName());
+ sLayoutName = sLayoutName.copy(0, sLayoutName.indexOf(SD_LT_SEPARATOR));
// Copy the style sheet from source to target document.
SdStyleSheetPool* pSourceStyleSheetPool =
@@ -306,8 +306,8 @@ void DocumentHelper::AssignMasterPageToPageList (
// Make the layout name by stripping ouf the layout postfix from the
// layout name of the given master page.
OUString sFullLayoutName(pMasterPage->GetLayoutName());
- String sBaseLayoutName (sFullLayoutName);
- sBaseLayoutName.Erase (sBaseLayoutName.SearchAscii (SD_LT_SEPARATOR));
+ OUString sBaseLayoutName (sFullLayoutName);
+ sBaseLayoutName = sBaseLayoutName.copy(0, sBaseLayoutName.indexOf(SD_LT_SEPARATOR));
if (rpPageList->empty())
return;
@@ -329,7 +329,7 @@ void DocumentHelper::AssignMasterPageToPageList (
::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
if( pUndoMgr )
- pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), String());
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString());
SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList);
if (pMasterPageInDocument == NULL)
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index bf392db..be13bda 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -583,7 +583,7 @@ SfxRequest LayoutMenu::CreateRequest (
SetOfByte aVisibleLayers (pPage->TRG_GetMasterPageVisibleLayers());
aRequest.AppendItem(
- SfxStringItem (ID_VAL_PAGENAME, String()));//pPage->GetName()));
+ SfxStringItem (ID_VAL_PAGENAME, OUString()));//pPage->GetName()));
aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout));
aRequest.AppendItem(
SfxBoolItem(ID_VAL_ISPAGEBACK, aVisibleLayers.IsSet(aBackground)));
@@ -654,7 +654,7 @@ void LayoutMenu::Fill (void)
if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
aBmp.Mirror (BMP_MIRROR_HORZ);
- InsertItem (i, aBmp, String (SdResId (pInfo->mnStrResId)));
+ InsertItem (i, aBmp, SdResId (pInfo->mnStrResId));
SetItemData (i, new AutoLayout(pInfo->maAutoLayout));
n++;
}
commit 0bfd0378f9615283ed0dd02eb719cd434e5de7ea
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 15:35:23 2013 +0200
remove dead method definition
Change-Id: I0cf5cbd4925fad54ee9bb3f6ba7d84b1689fae9c
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index e9acf10..906f880 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -172,9 +172,6 @@ private:
typedef ::std::pair<MasterPageContainerChangeEvent::EventType,Token> EventData;
DECL_LINK(AsynchronousNotifyCallback, EventData*);
- ::sd::DrawDocShell* LoadDocument (
- const String& sFileName,
- SfxObjectShellLock& rxDocumentShell);
Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize);
commit 15d88e256dcf4d0bf567b5f320cefe55179e4bd8
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 15:34:45 2013 +0200
convert more .cxx files in sd from String to OUString
Change-Id: I03d86a02021df0205cc3505ea9f99d1d18735abc
diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
index cec5047..a33c86d 100644
--- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
@@ -43,9 +43,9 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte
SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor(
MasterPageContainer::DEFAULT,
0,
- String(),
- String(),
- String(),
+ OUString(),
+ OUString(),
+ OUString(),
false,
::boost::shared_ptr<PageObjectProvider>(new DefaultPageObjectProvider()),
::boost::shared_ptr<PreviewProvider>(new PagePreviewProvider())));
@@ -160,7 +160,7 @@ MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate (void)
mnIndex,
mpLastAddedEntry->msPath,
mpLastAddedEntry->msTitle,
- String(),
+ OUString(),
false,
::boost::shared_ptr<PageObjectProvider>(
new TemplatePageObjectProvider(mpLastAddedEntry->msPath)),
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index 2d9b7cd5..29ed781 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -129,8 +129,8 @@ void RecentMasterPagesSelector::Fill (ItemList& rItemList)
MasterPageContainer::Token aToken (rInstance.GetTokenForIndex(nIndex));
if (aToken != MasterPageContainer::NIL_TOKEN)
{
- String sStyleName (mpContainer->GetStyleNameForToken(aToken));
- if (sStyleName.Len()==0
+ OUString sStyleName (mpContainer->GetStyleNameForToken(aToken));
+ if (sStyleName.isEmpty()
|| aCurrentNames.find(sStyleName) == aCurrentNames.end())
{
rItemList.push_back(aToken);
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 94a741e..aa696b3 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -203,7 +203,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void)
MasterPageContainer::TEMPLATE,
-1,
sURL,
- String(),
+ OUString(),
sName,
false,
::boost::shared_ptr<PageObjectProvider>(
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index a495bed..4fece11 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -506,7 +506,7 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly )
const Size aOutSize( GetOutputSize() );
const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, rMap ) );
const Size aOffset( LogicToLogic( Size( 1000, 1000 ), MAP_100TH_MM, rMap ) );
- String aText( SdResId( STR_PRES_PAUSE ) );
+ OUString aText( SdResId( STR_PRES_PAUSE ) );
bool bDrawn = false;
Font aFont( GetSettings().GetStyleSettings().GetMenuFont() );
@@ -555,9 +555,9 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly )
SvtSysLocale aSysLocale;
const LocaleDataWrapper& aLocaleData = aSysLocale.GetLocaleData();
- aText.AppendAscii( " ( " );
+ aText += " ( ";
aText += aLocaleData.getDuration( Time( 0, 0, mnPauseTimeout ) );
- aText.AppendAscii( " )" );
+ aText += " )";
aVDev.DrawText( Point( aOffset.Width(), 0 ), aText );
DrawOutDev( Point( aOutOrg.X(), aOffset.Height() ), aVDevSize, Point(), aVDevSize, aVDev );
bDrawn = true;
@@ -581,7 +581,7 @@ void ShowWindow::DrawEndScene()
const Point aOutOrg( PixelToLogic( Point() ) );
const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, GetMapMode() ) );
- const String aText( SdResId( STR_PRES_SOFTEND ) );
+ const OUString aText( SdResId( STR_PRES_SOFTEND ) );
aFont.SetSize( aTextSize );
aFont.SetColor( COL_WHITE );
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 9abf0aa..2d50fc3e 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -373,7 +373,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const
{
bIllegalArgument = false;
- const String aShowName( aShow );
+ const OUString aShowName( aShow );
SdCustomShowList* pCustomShowList = mpDoc->GetCustomShowList(sal_False);
if(pCustomShowList)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 5f47c70..afc85dc 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -914,7 +914,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
// ---
- String aPresSlide( maPresSettings.maPresPage );
+ OUString aPresSlide( maPresSettings.maPresPage );
SdPage* pStartPage = mpViewShell ? mpViewShell->GetActualPage() : 0;
bool bStartWithActualSlide = pStartPage &&
( (meAnimationMode != ANIMATIONMODE_SHOW) ||
@@ -945,7 +945,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
if( bStartWithActualSlide )
{
- if ( !aPresSlide.Len())
+ if ( aPresSlide.isEmpty())
{
// no preset slide yet, so pick current on one
aPresSlide = pStartPage->GetName();
@@ -1609,7 +1609,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
case presentation::ClickAction_MACRO:
{
- const String aMacro( pEvent->maStrBookmark );
+ const OUString aMacro( pEvent->maStrBookmark );
if ( SfxApplication::IsXScriptURL( aMacro ) )
{
@@ -1624,14 +1624,12 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
// aMacro has the following syntax:
// "Macroname.Modulname.Libname.Documentname" or
// "Macroname.Modulname.Libname.Applicationname"
- String aMacroName = aMacro.GetToken(0, sal_Unicode('.'));
- String aModulName = aMacro.GetToken(1, sal_Unicode('.'));
+ OUString aMacroName = aMacro.getToken(0, '.');
+ OUString aModulName = aMacro.getToken(1, '.');
// todo: is the limitation still given that only
// Modulname+Macroname can be used here?
- String aExecMacro(aModulName);
- aExecMacro.Append( sal_Unicode('.') );
- aExecMacro.Append( aMacroName );
+ OUString aExecMacro = aModulName + "." + aMacroName;
mpDocSh->GetBasic()->Call(aExecMacro);
}
}
@@ -2814,7 +2812,7 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq)
case SID_NAVIGATOR_OBJECT:
{
- const String aTarget( ((SfxStringItem&) pArgs->Get(SID_NAVIGATOR_OBJECT)).GetValue() );
+ const OUString aTarget( ((SfxStringItem&) pArgs->Get(SID_NAVIGATOR_OBJECT)).GetValue() );
// is the bookmark a Slide?
sal_Bool bIsMasterPage;
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
index c70fad5..58431bf 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
@@ -71,7 +71,7 @@ Bitmap BitmapFactory::CreateBitmap (
Bitmap aPreview (maRenderer.RenderPage (
&rPage,
aSize,
- String(),
+ OUString(),
true,
false).GetBitmapEx().GetBitmap());
if (bDoSuperSampling)
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 2190b26..bdb17b4 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -544,7 +544,7 @@ void Clipboard::CreateSlideTransferable (
const sal_Int32 nIndex (sURL.indexOf((sal_Unicode)'#'));
if (nIndex == -1)
break;
- String sBookmark (sURL.copy(nIndex+1));
+ OUString sBookmark (sURL.copy(nIndex+1));
// Make sure that the bookmark points to a page.
SdDrawDocument* pTransferableDocument = rSlideSorter.GetModel().GetDocument();
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index f0c5df2..cf64461 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -841,7 +841,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
sal_Int32 nActivePageCount;
sal_uInt16 nSelectedPages = mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount();
OUStringBuffer aPageStr;
- String aLayoutStr;
+ OUString aLayoutStr;
//Set number of slides
if (nSelectedPages > 0)
@@ -872,7 +872,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
{
pFirstPage = pPage;
aLayoutStr = pFirstPage->GetLayoutName();
- aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
+ aLayoutStr = aLayoutStr.copy(0, aLayoutStr.indexOf( SD_LT_SEPARATOR ) );
rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );
}
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) )
@@ -933,9 +933,9 @@ void SlotManager::RenameSlide (void)
pSelectedPage = aSelectedPages.GetNextElement()->GetPage();
if (pSelectedPage != NULL)
{
- String aTitle( SdResId( STR_TITLE_RENAMESLIDE ) );
- String aDescr( SdResId( STR_DESC_RENAMESLIDE ) );
- String aPageName = pSelectedPage->GetName();
+ OUString aTitle( SdResId( STR_TITLE_RENAMESLIDE ) );
+ OUString aDescr( SdResId( STR_DESC_RENAMESLIDE ) );
+ OUString aPageName = pSelectedPage->GetName();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
@@ -1043,7 +1043,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri
pPageToRename = pDocument->GetMasterSdPage( nPageId, ePageKind );
if (pPageToRename != NULL)
{
- const String aOldLayoutName( pPageToRename->GetLayoutName() );
+ const OUString aOldLayoutName( pPageToRename->GetLayoutName() );
pManager->AddUndoAction( new RenameLayoutTemplateUndoAction( pDocument, aOldLayoutName, rName ) );
pDocument->RenameLayoutTemplate( aOldLayoutName, rName );
}
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index ebbd839..eaea90f 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -250,18 +250,18 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount)
if (mpPageNumberFont)
mpWindow->SetFont(*mpPageNumberFont);
- String sPageNumberTemplate;
+ OUString sPageNumberTemplate;
if (nPageCount < 10)
- sPageNumberTemplate = OUString("9");
+ sPageNumberTemplate = "9";
else if (nPageCount < 100)
- sPageNumberTemplate = OUString("99");
+ sPageNumberTemplate = "99";
else if (nPageCount < 200)
// Just for the case that 1 is narrower than 9.
- sPageNumberTemplate = OUString("199");
+ sPageNumberTemplate = "199";
else if (nPageCount < 1000)
- sPageNumberTemplate = OUString("999");
+ sPageNumberTemplate = "999";
else
- sPageNumberTemplate = OUString("9999");
+ sPageNumberTemplate = "9999";
// More then 9999 pages are not handled.
const Size aSize (
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 77de56c..634bb79 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -220,11 +220,11 @@ void DrawViewShell::GetTableMenuState( SfxItemSet &rSet )
}
else
{
- String aActiveLayer = mpDrawView->GetActiveLayer();
+ OUString aActiveLayer = mpDrawView->GetActiveLayer();
SdrPageView* pPV = mpDrawView->GetSdrPageView();
if( bIsUIActive ||
- ( aActiveLayer.Len() != 0 && pPV && ( pPV->IsLayerLocked(aActiveLayer) ||
+ ( !aActiveLayer.isEmpty() && pPV && ( pPV->IsLayerLocked(aActiveLayer) ||
!pPV->IsLayerVisible(aActiveLayer) ) ) ||
SD_MOD()->GetWaterCan() )
{
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 557a31f..beb9c39 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -733,7 +733,7 @@ SfxRequest LayoutMenu::CreateRequest (
SetOfByte aVisibleLayers (pPage->TRG_GetMasterPageVisibleLayers());
aRequest.AppendItem(
- SfxStringItem (ID_VAL_PAGENAME, String()));//pPage->GetName()));
+ SfxStringItem (ID_VAL_PAGENAME, OUString()));//pPage->GetName()));
aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout));
aRequest.AppendItem(
SfxBoolItem(ID_VAL_ISPAGEBACK, aVisibleLayers.IsSet(aBackground)));
@@ -804,7 +804,7 @@ void LayoutMenu::Fill (void)
if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
aBmp.Mirror (BMP_MIRROR_HORZ);
- InsertItem (i, aBmp, String (SdResId (pInfo->mnStrResId)));
+ InsertItem (i, aBmp, SdResId (pInfo->mnStrResId));
SetItemData (i, new AutoLayout(pInfo->maAutoLayout));
n++;
}
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 1352e99..081a77b 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -748,7 +748,7 @@ ToolPanelViewShell_Impl::ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelVi
,m_pTaskPane( new ::sfx2::ModuleTaskPane( i_rPanelDeckParent, i_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame().GetFrameInterface(), *this ) )
,m_bInitialized( false )
{
- const String sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) );
+ const OUString sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) );
GetToolPanelDeck().SetAccessibleName( sPaneTitle );
GetToolPanelDeck().SetAccessibleDescription( sPaneTitle );
diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
index 4d901cf..8cf8076 100644
--- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
@@ -120,7 +120,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
continue;
// Use the name of the master page to avoid duplicate entries.
- String sName (pMasterPage->GetName());
+ OUString sName (pMasterPage->GetName());
if (aMasterPageNames.find(sName)!=aMasterPageNames.end())
continue;
aMasterPageNames.insert (sName);
@@ -133,9 +133,9 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor(
MasterPageContainer::MASTERPAGE,
nIndex,
- String(),
+ OUString(),
pMasterPage->GetName(),
- String(),
+ OUString(),
pMasterPage->IsPrecious(),
::boost::shared_ptr<PageObjectProvider>(new ExistingPageProvider(pMasterPage)),
::boost::shared_ptr<PreviewProvider>(new PagePreviewProvider())));
@@ -195,7 +195,7 @@ void CurrentMasterPagesSelector::UpdateSelection (void)
sal_uInt16 nItemCount (mpPageSet->GetItemCount());
for (nIndex=1; nIndex<=nItemCount && bLoop; nIndex++)
{
- String sName (mpPageSet->GetItemText (nIndex));
+ OUString sName (mpPageSet->GetItemText (nIndex));
if (aNames.find(sName) != aNames.end())
{
mpPageSet->SelectItem (nIndex);
diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
index 61b8be1..74848dd 100644
--- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
+++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
@@ -263,8 +263,8 @@ void DocumentHelper::ProvideStyles (
SdPage* pPage)
{
// Get the layout name of the given page.
- String sLayoutName (pPage->GetLayoutName());
- sLayoutName.Erase (sLayoutName.SearchAscii (SD_LT_SEPARATOR));
+ OUString sLayoutName (pPage->GetLayoutName());
+ sLayoutName = sLayoutName.copy(0, sLayoutName.indexOf(SD_LT_SEPARATOR));
// Copy the style sheet from source to target document.
SdStyleSheetPool* pSourceStyleSheetPool =
@@ -307,8 +307,8 @@ void DocumentHelper::AssignMasterPageToPageList (
// Make the layout name by stripping ouf the layout postfix from the
// layout name of the given master page.
OUString sFullLayoutName(pMasterPage->GetLayoutName());
- String sBaseLayoutName (sFullLayoutName);
- sBaseLayoutName.Erase (sBaseLayoutName.SearchAscii (SD_LT_SEPARATOR));
+ OUString sBaseLayoutName (sFullLayoutName);
+ sBaseLayoutName = sBaseLayoutName.copy(0, sBaseLayoutName.indexOf(SD_LT_SEPARATOR));
if (rpPageList->empty())
return;
@@ -330,7 +330,7 @@ void DocumentHelper::AssignMasterPageToPageList (
::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
if( pUndoMgr )
- pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), String());
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString());
SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList);
if (pMasterPageInDocument == NULL)
commit bd6f344f027a06c2894bfa87fbeee1016576d117
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 15:22:05 2013 +0200
remove dead method definition
Change-Id: If95c03246eeda942084a10ed39a02e6ebeffe2aa
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index 09be804..6ab2a14 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -174,9 +174,6 @@ private:
typedef ::std::pair<MasterPageContainerChangeEvent::EventType,Token> EventData;
DECL_LINK(AsynchronousNotifyCallback, EventData*);
- ::sd::DrawDocShell* LoadDocument (
- const String& sFileName,
- SfxObjectShellLock& rxDocumentShell);
Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize);
commit 001080ae7010767f515723abe725182d98fbac0f
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 15:17:39 2013 +0200
convert some .cxx files in sd from String to OUString
Change-Id: I3f3ba3521b72d78887e01970192f353cdc866626
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx
index 1aa244a..666666b 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx
@@ -45,9 +45,9 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte
SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor(
MasterPageContainer::DEFAULT,
0,
- String(),
- String(),
- String(),
+ OUString(),
+ OUString(),
+ OUString(),
false,
::boost::shared_ptr<PageObjectProvider>(new DefaultPageObjectProvider()),
::boost::shared_ptr<PreviewProvider>(new PagePreviewProvider())));
@@ -162,7 +162,7 @@ MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate (void)
mnIndex,
mpLastAddedEntry->msPath,
mpLastAddedEntry->msTitle,
- String(),
+ OUString(),
false,
::boost::shared_ptr<PageObjectProvider>(
new TemplatePageObjectProvider(mpLastAddedEntry->msPath)),
diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
index 1dd3d10..dc483a5 100644
--- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
@@ -100,8 +100,8 @@ void RecentMasterPagesSelector::Fill (ItemList& rItemList)
MasterPageContainer::Token aToken (rInstance.GetTokenForIndex(nIndex));
if (aToken != MasterPageContainer::NIL_TOKEN)
{
- String sStyleName (mpContainer->GetStyleNameForToken(aToken));
- if (sStyleName.Len()==0
+ OUString sStyleName (mpContainer->GetStyleNameForToken(aToken));
+ if (sStyleName.isEmpty()
|| aCurrentNames.find(sStyleName) == aCurrentNames.end())
{
rItemList.push_back(aToken);
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
index 0e6d958..7969bbd 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
@@ -206,7 +206,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void)
MasterPageContainer::TEMPLATE,
-1,
sURL,
- String(),
+ OUString(),
sName,
false,
::boost::shared_ptr<PageObjectProvider>(
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index e3a93da..e340e01 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -107,10 +107,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
Reference< XInputStream > xStream;
Reference< XContent > xContent;
Reference< XInteractionHandler > xInteraction;
- String aURL;
+ OUString aURL;
OUString sTemp;
OUString aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection)
- String aPreselectedFilterName; // a name describing the filter to use (from MediaDescriptor, usually from UI action)
+ OUString aPreselectedFilterName; // a name describing the filter to use (from MediaDescriptor, usually from UI action)
OUString aDocumentTitle; // interesting only if set in this method
@@ -141,7 +141,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp;
}
- else if( !aURL.Len() && lDescriptor[nProperty].Name == "FileName" )
+ else if( aURL.isEmpty() && lDescriptor[nProperty].Name == "FileName" )
{
lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp;
@@ -189,22 +189,22 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
bWasReadOnly = pItem && pItem->GetValue();
const SfxFilter* pFilter = 0;
- String aPrefix = OUString("private:factory/");
- if( aURL.Match( aPrefix ) == aPrefix.Len() )
+ OUString aPrefix = OUString("private:factory/");
+ if( aURL.startsWith( aPrefix ) )
{
if( SvtModuleOptions().IsImpress() )
{
- String aPattern( aPrefix );
- aPattern += OUString("simpress");
- if ( aURL.Match( aPattern ) >= aPattern.Len() )
+ OUString aPattern( aPrefix );
+ aPattern += "simpress";
+ if ( aURL.startsWith( aPattern ) )
pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
}
if( !pFilter && SvtModuleOptions().IsDraw() )
{
- String aPattern( aPrefix );
- aPattern += OUString("sdraw");
- if ( aURL.Match( aPattern ) >= aPattern.Len() )
+ OUString aPattern( aPrefix );
+ aPattern += "sdraw";
+ if ( aURL.startsWith( aPattern ) )
pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
}
}
@@ -213,7 +213,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
// ctor of SfxMedium uses owner transition of ItemSet
SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, NULL, pSet );
aMedium.UseInteractionHandler( sal_True );
- if ( aPreselectedFilterName.Len() )
+ if ( !aPreselectedFilterName.isEmpty() )
pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName );
else if (!aTypeName.isEmpty())
{
@@ -400,17 +400,17 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
}
else
{
- String aShortName( aDesc.GetImportFormatShortName( aDesc.GetFileFormat() ) );
+ OUString aShortName( aDesc.GetImportFormatShortName( aDesc.GetFileFormat() ) );
GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter();
- const String aName( rGrfFilter.GetImportFormatTypeName( rGrfFilter.GetImportFormatNumberForShortName( aShortName ) ) );
+ const OUString aName( rGrfFilter.GetImportFormatTypeName( rGrfFilter.GetImportFormatNumberForShortName( aShortName ) ) );
- if ( pFilter && aShortName.EqualsIgnoreCaseAscii( "PCD" ) ) // there is a multiple pcd selection possible
+ if ( pFilter && aShortName.equalsIgnoreAsciiCase( "PCD" ) ) // there is a multiple pcd selection possible
{
sal_Int32 nBase = 2; // default Base0
- String aFilterTypeName( pFilter->GetRealTypeName() );
- if ( aFilterTypeName.CompareToAscii( "pcd_Photo_CD_Base4" ) == COMPARE_EQUAL )
+ OUString aFilterTypeName( pFilter->GetRealTypeName() );
+ if ( aFilterTypeName == "pcd_Photo_CD_Base4" )
nBase = 1;
- else if ( aFilterTypeName.CompareToAscii( "pcd_Photo_CD_Base16" ) == COMPARE_EQUAL )
+ else if ( aFilterTypeName == "pcd_Photo_CD_Base16" )
nBase = 0;
FilterConfigItem aFilterConfigItem( "Office.Common/Filter/Graphic/Import/PCD" );
aFilterConfigItem.WriteInt32( "Resolution" , nBase );
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index f0f0117..ce3e77a 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -481,7 +481,7 @@ SdCustomShow * SdXCustomPresentationAccess::getSdCustomShow( const OUString& Nam
SdCustomShowList* pList = GetCustomShowList();
const sal_uInt32 nCount = pList ? pList->size() : 0;
- const String aName( Name );
+ const OUString aName( Name );
while( nIdx < nCount )
{
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 6a55af3..055fb00 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -484,8 +484,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate
sal_uInt16 nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2;
SdPage* pPreviousNotesPage = (SdPage*) mpDoc->GetPage( nStandardPageNum - 1 );
sal_uInt16 nNotesPageNum = nStandardPageNum + 1;
- String aStandardPageName;
- String aNotesPageName;
+ OUString aStandardPageName;
+ OUString aNotesPageName;
/**************************************************************
* standard page
@@ -966,78 +966,78 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( c
uno::Reference< uno::XInterface > xRet;
- const String aType( aServiceSpecifier );
- if( aType.EqualsAscii( "com.sun.star.presentation.", 0, 26 ) )
+ if( aServiceSpecifier.startsWith( "com.sun.star.presentation.") )
{
+ const OUString aType( aServiceSpecifier.copy(26) );
SvxShape* pShape = NULL;
sal_uInt16 nType = OBJ_TEXT;
// create a shape wrapper
- if( aType.EqualsAscii( "TitleTextShape", 26, 14 ) )
+ if( aType.startsWith( "TitleTextShape" ) )
{
nType = OBJ_TEXT;
}
- else if( aType.EqualsAscii( "OutlinerShape", 26, 13 ) )
+ else if( aType.startsWith( "OutlinerShape" ) )
{
nType = OBJ_TEXT;
}
- else if( aType.EqualsAscii( "SubtitleShape", 26, 13 ) )
+ else if( aType.startsWith( "SubtitleShape" ) )
{
nType = OBJ_TEXT;
}
- else if( aType.EqualsAscii( "GraphicObjectShape", 26, 18 ) )
+ else if( aType.startsWith( "GraphicObjectShape" ) )
{
nType = OBJ_GRAF;
}
- else if( aType.EqualsAscii( "PageShape", 26, 9 ) )
+ else if( aType.startsWith( "PageShape" ) )
{
nType = OBJ_PAGE;
}
- else if( aType.EqualsAscii( "OLE2Shape", 26, 9 ) )
+ else if( aType.startsWith( "OLE2Shape" ) )
{
nType = OBJ_OLE2;
}
- else if( aType.EqualsAscii( "ChartShape", 26, 10 ) )
+ else if( aType.startsWith( "ChartShape" ) )
{
nType = OBJ_OLE2;
}
- else if( aType.EqualsAscii( "CalcShape", 26, 9 ) )
+ else if( aType.startsWith( "CalcShape" ) )
{
nType = OBJ_OLE2;
}
- else if( aType.EqualsAscii( "TableShape", 26, 10 ) )
+ else if( aType.startsWith( "TableShape" ) )
{
nType = OBJ_TABLE;
}
- else if( aType.EqualsAscii( "OrgChartShape", 26, 13 ) )
+ else if( aType.startsWith( "OrgChartShape" ) )
{
nType = OBJ_OLE2;
}
- else if( aType.EqualsAscii( "NotesShape", 26, 13 ) )
+ else if( aType.startsWith( "NotesShape" ) )
{
nType = OBJ_TEXT;
}
- else if( aType.EqualsAscii( "HandoutShape", 26, 13 ) )
+ else if( aType.startsWith( "HandoutShape" ) )
{
nType = OBJ_PAGE;
}
- else if( aType.EqualsAscii( "FooterShape", 26, 12 ) )
+ else if( aType.startsWith( "FooterShape" ) )
{
nType = OBJ_TEXT;
}
- else if( aType.EqualsAscii( "HeaderShape", 26, 12 ) )
+ else if( aType.startsWith( "HeaderShape" ) )
{
nType = OBJ_TEXT;
}
- else if( aType.EqualsAscii( "SlideNumberShape", 26, 17 ) )
+ else if( aType.startsWith( "SlideNumberShape" ) )
{
nType = OBJ_TEXT;
}
- else if( aType.EqualsAscii( "DateTimeShape", 26, 17 ) )
+ else if( aType.startsWith( "DateTimeShape" ) )
{
nType = OBJ_TEXT;
}
- else if( aType.EqualsAscii( "MediaShape", 26, 10 ) )
+ else if( aType.startsWith( "MediaShape" ) )
{
nType = OBJ_MEDIA;
}
@@ -1538,17 +1538,17 @@ ImplRenderPaintProc::~ImplRenderPaintProc()
{
}
-sal_Int32 ImplPDFGetBookmarkPage( const String& rBookmark, SdDrawDocument& rDoc )
+sal_Int32 ImplPDFGetBookmarkPage( const OUString& rBookmark, SdDrawDocument& rDoc )
{
sal_Int32 nPage = -1;
OSL_TRACE("GotoBookmark %s",
OUStringToOString(rBookmark, RTL_TEXTENCODING_UTF8).getStr());
- String aBookmark( rBookmark );
+ OUString aBookmark( rBookmark );
- if( rBookmark.Len() && rBookmark.GetChar( 0 ) == sal_Unicode('#') )
- aBookmark = rBookmark.Copy( 1 );
+ if( !rBookmark.isEmpty() && rBookmark[ 0 ] == '#' )
+ aBookmark = rBookmark.copy( 1 );
// is the bookmark a page ?
sal_Bool bIsMasterPage;
@@ -1585,11 +1585,11 @@ void ImplPDFExportComments( uno::Reference< drawing::XDrawPage > xPage, vcl::PDF
Date aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year );
Time aTime( Time::EMPTY );
- String aStr( SvxDateTimeField::GetFormatted( aDate, aTime, SVXDATEFORMAT_B, *(SD_MOD()->GetNumberFormatter()), eLanguage ) );
+ OUString aStr( SvxDateTimeField::GetFormatted( aDate, aTime, SVXDATEFORMAT_B, *(SD_MOD()->GetNumberFormatter()), eLanguage ) );
vcl::PDFNote aNote;
- String sTitle( xAnnotation->getAuthor() );
- sTitle.AppendAscii( ", " );
+ OUString sTitle( xAnnotation->getAuthor() );
+ sTitle += ", ";
sTitle += aStr;
aNote.Title = sTitle;
aNote.Contents = xText->getString();
@@ -1803,7 +1803,7 @@ sal_Bool ImplRenderPaintProc::IsVisible( const SdrObject* pObj ) const
const SdrLayer* pSdrLayer = rLayerAdmin.GetLayer( nLayerId );
if ( pSdrLayer )
{
- String aLayerName = pSdrLayer->GetName();
+ OUString aLayerName = pSdrLayer->GetName();
bVisible = pSdrPageView->IsLayerVisible( aLayerName );
}
}
@@ -1818,7 +1818,7 @@ sal_Bool ImplRenderPaintProc::IsPrintable( const SdrObject* pObj ) const
const SdrLayer* pSdrLayer = rLayerAdmin.GetLayer( nLayerId );
if ( pSdrLayer )
{
- String aLayerName = pSdrLayer->GetName();
+ OUString aLayerName = pSdrLayer->GetName();
bPrintable = pSdrPageView->IsLayerPrintable( aLayerName );
}
}
@@ -2108,8 +2108,8 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
rBookmarks.clear();
//---> #i56629, #i40318
//get the page name, will be used as outline element in PDF bookmark pane
- String aPageName = mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1 , PK_STANDARD )->GetName();
- if( aPageName.Len() > 0 )
+ OUString aPageName = mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1 , PK_STANDARD )->GetName();
+ if( !aPageName.isEmpty() )
{
// insert the bookmark to this page into the NamedDestinations
if( pPDFExtOutDevData->GetIsExportNamedDestinations() )
@@ -2676,8 +2676,8 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
nInsertPos = nMPageCount;
// now generate a unique name for the new masterpage
- const String aStdPrefix( SdResId(STR_LAYOUT_DEFAULT_NAME) );
- String aPrefix( aStdPrefix );
+ const OUString aStdPrefix( SdResId(STR_LAYOUT_DEFAULT_NAME) );
+ OUString aPrefix( aStdPrefix );
sal_Bool bUnique = sal_True;
sal_Int32 i = 0;
@@ -2697,15 +2697,13 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
if( !bUnique )
{
i++;
- aPrefix = aStdPrefix;
- aPrefix += sal_Unicode( ' ' );
- aPrefix += OUString::number( i );
+ aPrefix = aStdPrefix + " " + OUString::number( i );
}
} while( !bUnique );
- String aLayoutName( aPrefix );
- aLayoutName.AppendAscii( SD_LT_SEPARATOR );
+ OUString aLayoutName( aPrefix );
+ aLayoutName += SD_LT_SEPARATOR;
aLayoutName += SD_RESSTR(STR_LAYOUT_OUTLINE);
// create styles
@@ -2974,7 +2972,7 @@ SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw()
sal_uInt16 nPage;
SdPage* pPage;
- const String aName( rName );
+ const OUString aName( rName );
const bool bDraw = mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 72a3b49..8ff7ff2 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1176,8 +1176,7 @@ SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw()
static void clearEventsInAnimationInfo( SdAnimationInfo* pInfo )
{
- const String aEmpty;
- pInfo->SetBookmark( aEmpty );
+ pInfo->SetBookmark( "" );
pInfo->mbSecondSoundOn = sal_False;
pInfo->mbSecondPlayFull = sal_False;
pInfo->meClickAction = presentation::ClickAction_NONE;
@@ -1425,11 +1424,11 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
}
else
{
- String aMacro = aStrMacro;
+ OUString aMacro = aStrMacro;
- String aLibName = aMacro.GetToken(0, sal_Unicode('.'));
- String aModulName = aMacro.GetToken(1, sal_Unicode('.'));
- String aMacroName = aMacro.GetToken(2, sal_Unicode('.'));
+ OUString aLibName = aMacro.getToken(0, '.');
+ OUString aModulName = aMacro.getToken(1, '.');
+ OUString aMacroName = aMacro.getToken(2, '.');
OUStringBuffer sBuffer;
sBuffer.append( aMacroName );
@@ -1537,14 +1536,14 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
- String aMacro = pInfo->GetBookmark();
+ OUString aMacro = pInfo->GetBookmark();
// aMacro has got following format:
// "Macroname.Modulname.Libname.Documentname" or
// "Macroname.Modulname.Libname.Applicationname"
- String aMacroName = aMacro.GetToken(0, sal_Unicode('.'));
- String aModulName = aMacro.GetToken(1, sal_Unicode('.'));
- String aLibName = aMacro.GetToken(2, sal_Unicode('.'));
+ OUString aMacroName = aMacro.getToken(0, '.');
+ OUString aModulName = aMacro.getToken(1, '.');
+ OUString aLibName = aMacro.getToken(2, '.');
OUStringBuffer sBuffer;
sBuffer.append( aLibName );
commit 15b3fbf9385835df4636ec7f10e1d2b94754eab0
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 13:49:40 2013 +0200
convert sd/.../dlgass.hxx from String to OUString
Change-Id: I1602e3c5bcab59d27c96a2698185b913f5ce69a7
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 0de4bf8..76833b4 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -887,7 +887,7 @@ void AssistentDlgImpl::TemplateScanDone (
{
TemplateEntry* pEntry = pDir->maEntries.front();
if (pEntry != NULL)
- if (pEntry->msPath.SearchAscii("presnt") != STRING_NOTFOUND)
+ if (pEntry->msPath.indexOf("presnt") != -1)
nFirstEntry = i;
}
@@ -912,7 +912,7 @@ void AssistentDlgImpl::TemplateScanDone (
{
TemplateEntry* pEntry = pDir->maEntries.front();
if (pEntry != NULL)
- if (pEntry->msPath.SearchAscii("layout") != STRING_NOTFOUND)
+ if (pEntry->msPath.indexOf("layout") != -1)
nFirstEntry = i;
}
@@ -1361,7 +1361,7 @@ void AssistentDlgImpl::SelectTemplateRegion( const OUString& rRegion )
{
TemplateDir * pDir = *I;
mpTemplateRegion = *I;
- if (pDir->msRegion.Equals( rRegion ) )
+ if (pDir->msRegion == rRegion)
{
std::vector<TemplateEntry*>::iterator J;
for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); ++J)
@@ -1387,7 +1387,7 @@ void AssistentDlgImpl::SelectLayoutRegion( const OUString& rRegion )
TemplateDir * pDir = *I;
mpLayoutRegion = *I;
- if (pDir->msRegion.Equals (rRegion))
+ if (pDir->msRegion == rRegion)
{
std::vector<TemplateEntry*>::iterator J;
for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); ++J)
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 3448b15..2bc3ace 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -50,11 +50,11 @@ namespace sd {
class TemplateEntry
{
public:
- TemplateEntry (const String& rsTitle, const String& rsPath)
+ TemplateEntry (const OUString& rsTitle, const OUString& rsPath)
: msTitle(rsTitle), msPath(rsPath) {}
- String msTitle;
- String msPath;
+ OUString msTitle;
+ OUString msPath;
};
@@ -80,12 +80,12 @@ private:
class TemplateDir
{
public:
- TemplateDir (const String& rsRegion, const String& rsUrl )
+ TemplateDir (const OUString& rsRegion, const OUString& rsUrl )
: msRegion(rsRegion), msUrl(rsUrl), maEntries(),
mbSortingEnabled(false), mpEntryCompare(NULL) {}
- String msRegion;
- String msUrl;
+ OUString msRegion;
+ OUString msUrl;
::std::vector<TemplateEntry*> maEntries;
void EnableSorting(bool bSortingEnabled = true);
commit ab0806e183fcdc8b2e4eca2d29b877a41f3ded8b
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 13:45:48 2013 +0200
convert sd/.../fuinsfil.hxx from String to OUString
Change-Id: I8d2847ba00730be8c2fd7814ee41021119e25cfa
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index d6d6631..d789de7 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -282,10 +282,10 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
{
sal_Bool bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() );
if( !bFound &&
- ( aFilterName.SearchAscii( "Text" ) != STRING_NOTFOUND ||
- aFilterName.SearchAscii( "Rich" ) != STRING_NOTFOUND ||
- aFilterName.SearchAscii( "RTF" ) != STRING_NOTFOUND ||
- aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND ) )
+ ( aFilterName.indexOf( "Text" ) != -1 ||
+ aFilterName.indexOf( "Rich" ) != -1 ||
+ aFilterName.indexOf( "RTF" ) != -1 ||
+ aFilterName.indexOf( "HTML" ) != -1 ) )
{
bFound = sal_True;
}
@@ -428,9 +428,9 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
// selected file format: text, RTF or HTML (default is text)
sal_uInt16 nFormat = EE_FORMAT_TEXT;
- if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND )
+ if( aFilterName.indexOf( "Rich") != -1 )
nFormat = EE_FORMAT_RTF;
- else if( aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND )
+ else if( aFilterName.indexOf( "HTML" ) != -1 )
nFormat = EE_FORMAT_HTML;
/* create our own outline since:
@@ -446,7 +446,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage();
aLayoutName = pPage->GetLayoutName();
- aLayoutName.Erase(aLayoutName.SearchAscii(SD_LT_SEPARATOR));
+ aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR));
pOutliner->SetPaperSize(pPage->GetSize());
@@ -553,9 +553,9 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
// selected file format: text, RTF or HTML (default is text)
sal_uInt16 nFormat = EE_FORMAT_TEXT;
- if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND )
+ if( aFilterName.indexOf( "Rich") != -1 )
nFormat = EE_FORMAT_RTF;
- else if( aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND )
+ else if( aFilterName.indexOf( "HTML" ) != -1 )
nFormat = EE_FORMAT_HTML;
::Outliner* pDocliner = static_cast<OutlineView*>(mpView)->GetOutliner();
@@ -583,7 +583,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
}
SdPage* pPage = mpDoc->GetSdPage(nPage, PK_STANDARD);
aLayoutName = pPage->GetLayoutName();
- aLayoutName.Erase(aLayoutName.SearchAscii(SD_LT_SEPARATOR));
+ aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR));
/* create our own outline since:
- it is possible that the document outliner is actually used in the
diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx
index 0fe091a..e9d6899 100644
--- a/sd/source/ui/inc/fuinsfil.hxx
+++ b/sd/source/ui/inc/fuinsfil.hxx
@@ -47,9 +47,9 @@ private:
SdDrawDocument* pDoc,
SfxRequest& rReq);
- String aLayoutName; ///< layout name of the currently inserted page
- String aFilterName; ///< chosen file filter
- String aFile; ///< chosen file name
+ OUString aLayoutName; ///< layout name of the currently inserted page
+ OUString aFilterName; ///< chosen file filter
+ OUString aFile; ///< chosen file name
void InsTextOrRTFinOlMode(SfxMedium* pMedium);
sal_Bool InsSDDinOlMode(SfxMedium* pMedium);
commit 4bbbbee8ba2395bb09fc83cbf4598085c3ef0d5f
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 13:40:08 2013 +0200
convert sd/.../ScrollPanel.hxx from String to OUString
Change-Id: I6dde03dd77dac7b8e7568597329d65c8ec317da6
diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
index f3cfd1d..1d799f5 100644
--- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx
+++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
@@ -67,7 +67,7 @@ public:
*/
TitledControl* AddControl (
::std::auto_ptr<TreeNode> pControl,
- const String& rTitle,
+ const OUString& rTitle,
const OString& sHelpId);
/** Add a control to the sub panel without a title bar.
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 8d9a6b0a..677f007 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -106,7 +106,7 @@ ScrollPanel::~ScrollPanel (void)
SAL_WNODEPRECATED_DECLARATIONS_PUSH
TitledControl* ScrollPanel::AddControl (
::std::auto_ptr<TreeNode> pControl,
- const String& rTitle,
+ const OUString& rTitle,
const OString& rHelpId)
{
// We are interested only in the title. The control itself is
commit 6f48261f0e533917a4f519c39af8b0148d7f0a58
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 13:34:33 2013 +0200
convert sd/.../TitleBar.hxx from String to OUString
Change-Id: I5e98c11d27a890cb70808a860c6edcf43f87a314
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index 669fdb8..f00ba4a 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -54,7 +54,7 @@ public:
*/
TitleBar (
::Window* pParent,
- const String& rsTitle,
+ const OUString& rsTitle,
TitleBarType eType,
bool bIsExpandable);
virtual ~TitleBar (void);
@@ -83,7 +83,7 @@ public:
virtual void DataChanged (const DataChangedEvent& rEvent);
- String GetTitle (void) const;
+ OUString GetTitle() const { return msTitle; }
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > CreateAccessibleObject (
@@ -92,7 +92,7 @@ public:
private:
TitleBarType meType;
- String msTitle;
+ OUString msTitle;
bool mbExpanded;
bool mbFocused;
// Size of the bounding box that encloses the title string.
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index 9fa8c80..ca33f7c 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -49,7 +49,7 @@ namespace sd { namespace toolpanel {
const int TitleBar::snIndentationWidth = 16;
-TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eType, bool bIsExpandable)
+TitleBar::TitleBar ( ::Window* pParent, const OUString& rsTitle, TitleBarType eType, bool bIsExpandable)
: ::Window (pParent, WB_TABSTOP)
, TreeNode(this)
, meType(eType)
@@ -541,14 +541,6 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent)
-String TitleBar::GetTitle (void) const
-{
- return msTitle;
-}
-
-
-
-
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > TitleBar::CreateAccessibleObject (
const ::com::sun::star::uno::Reference<
commit 387c414a57e0d96c56cd008b631b2708baace12a
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 13:27:43 2013 +0200
convert sd/../TitledControl.hxx from String to OUString
Change-Id: Ib83d2cfc931c39374358ae0148eae4e5b02a00ae
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index 6b03171..4cd6896 100644
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -65,7 +65,7 @@ public:
TitledControl (
TreeNode* pParent,
::std::auto_ptr<TreeNode> pControl,
- const String& rTitle,
+ const OUString& rTitle,
const ClickHandler& rClickHandler,
TitleBar::TitleBarType eType);
@@ -92,7 +92,7 @@ public:
TreeNode* GetControl (void);
const TreeNode* GetConstControl () const;
- const String& GetTitle (void) const;
+ const OUString& GetTitle (void) const;
/** Expand the control without informing its container. This
method ususally is called by the container as a result of a
@@ -127,7 +127,7 @@ public:
using Window::Show;
private:
- String msTitle;
+ OUString msTitle;
bool mbVisible;
void* mpUserData;
::std::auto_ptr<ClickHandler> mpClickHandler;
diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx
index f530371..7e6fafd 100644
--- a/sd/source/ui/toolpanel/TitledControl.cxx
+++ b/sd/source/ui/toolpanel/TitledControl.cxx
@@ -34,7 +34,7 @@ namespace sd { namespace toolpanel {
TitledControl::TitledControl (
TreeNode* pParent,
::std::auto_ptr<TreeNode> pControl,
- const String& rTitle,
+ const OUString& rTitle,
const ClickHandler& rClickHandler,
TitleBar::TitleBarType eType)
: ::Window (pParent->GetWindow(), WB_TABSTOP),
@@ -219,7 +219,7 @@ void TitledControl::KeyInput (const KeyEvent& rEvent)
-const String& TitledControl::GetTitle (void) const
+const OUString& TitledControl::GetTitle (void) const
{
return msTitle;
}
commit 3880c0a1a656a7e052618563c7dae02710ceb879
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 13:22:00 2013 +0200
convert sd/../tmplctrl.hxx from String to OUString
Change-Id: Ie06a8103c11a00c79004620ab993dbd6c73f13dc
diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx
index 7756e58..20a79a4 100644
--- a/sd/source/ui/inc/tmplctrl.hxx
+++ b/sd/source/ui/inc/tmplctrl.hxx
@@ -37,7 +37,7 @@ protected:
virtual void Command( const CommandEvent& rCEvt );
private:
- String msTemplate;
+ OUString msTemplate;
};
commit d6f8e16bdf93bcb45c60431adc09d5561d88bdac
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 13:20:03 2013 +0200
convert sd/../unoaprms.hxx from String to OUString
Change-Id: I579cc101902027813ebd09c9a0e6adffb5b9e5a1
diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx
index 5d349c8..2509901 100644
--- a/sd/source/ui/inc/unoaprms.hxx
+++ b/sd/source/ui/inc/unoaprms.hxx
@@ -62,14 +62,14 @@ class SdAnimationPrmsUndoAction : public SdUndoAction
Color aNewDimColor;
Color aOldBlueScreen;
Color aNewBlueScreen;
- String aOldSoundFile;
- String aNewSoundFile;
+ OUString aOldSoundFile;
+ OUString aNewSoundFile;
SdrPathObj* pOldPathObj;
SdrPathObj* pNewPathObj;
::com::sun::star::presentation::ClickAction eOldClickAction;
::com::sun::star::presentation::ClickAction eNewClickAction;
- String aOldBookmark;
- String aNewBookmark;
+ OUString aOldBookmark;
+ OUString aNewBookmark;
sal_Bool bOldInvisibleInPres;
sal_Bool bNewInvisibleInPres;
sal_uInt16 nOldVerb;
@@ -104,7 +104,7 @@ public:
{ bOldDimHide = bTheOldDimHide; bNewDimHide = bTheNewDimHide; }
void SetSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn)
{ bOldSoundOn = bTheOldSoundOn; bNewSoundOn = bTheNewSoundOn; }
- void SetSound(String aTheOldSound, String aTheNewSound)
+ void SetSound(String aTheOldSound, OUString aTheNewSound)
{ aOldSoundFile = aTheOldSound; aNewSoundFile = aTheNewSound; }
void SetBlueScreen(Color aTheOldBlueScreen, Color aTheNewBlueScreen)
{ aOldBlueScreen = aTheOldBlueScreen; aNewBlueScreen = aTheNewBlueScreen; }
@@ -114,7 +114,7 @@ public:
{ pOldPathObj = pTheOldPath; pNewPathObj = pTheNewPath; }
void SetClickAction(::com::sun::star::presentation::ClickAction eTheOldAction, ::com::sun::star::presentation::ClickAction eTheNewAction)
{ eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; }
- void SetBookmark(String aTheOldBookmark, String aTheNewBookmark)
+ void SetBookmark(String aTheOldBookmark, OUString aTheNewBookmark)
{ aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; }
void SetInvisibleInPres(sal_Bool bTheOldInvisibleInPres, sal_Bool bTheNewInvisibleInPres)
{ bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; }
commit a8ffc2a5ef3bc28ed4105e1cea5d4062a93f9275
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 13:16:52 2013 +0200
convert sd/.../MasterPageContainer.hxx from String to OUString
Change-Id: Ic28cce392c73732510087c5812c1e317e86a1013
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 46a60e6..e9acf10 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -372,12 +372,12 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForIndex (int nIndex)
MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
- const String& sURL)
+ const OUString& sURL)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
Token aResult (NIL_TOKEN);
- if (sURL.Len() > 0)
+ if (!sURL.isEmpty())
{
MasterPageContainerType::iterator iEntry (
::std::find_if (
@@ -393,12 +393,12 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
-MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const String& sStyleName)
+MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const OUString& sStyleName)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
Token aResult (NIL_TOKEN);
- if (sStyleName.Len() > 0)
+ if (!sStyleName.isEmpty())
{
MasterPageContainerType::iterator iEntry (
::std::find_if (
@@ -436,7 +436,7 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForPageObject (
-String MasterPageContainer::GetURLForToken (
+OUString MasterPageContainer::GetURLForToken (
MasterPageContainer::Token aToken)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -445,13 +445,13 @@ String MasterPageContainer::GetURLForToken (
if (pDescriptor.get() != NULL)
return pDescriptor->msURL;
else
- return String();
+ return OUString();
}
-String MasterPageContainer::GetPageNameForToken (
+OUString MasterPageContainer::GetPageNameForToken (
MasterPageContainer::Token aToken)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -460,13 +460,13 @@ String MasterPageContainer::GetPageNameForToken (
if (pDescriptor.get() != NULL)
return pDescriptor->msPageName;
else
- return String();
+ return OUString();
}
-String MasterPageContainer::GetStyleNameForToken (
+OUString MasterPageContainer::GetStyleNameForToken (
MasterPageContainer::Token aToken)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -475,7 +475,7 @@ String MasterPageContainer::GetStyleNameForToken (
if (pDescriptor.get() != NULL)
return pDescriptor->msStyleName;
else
- return String();
+ return OUString();
}
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index b67bf8a..762b52c 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -128,13 +128,13 @@ public:
*/
Token GetTokenForIndex (int nIndex);
- Token GetTokenForURL (const String& sURL);
- Token GetTokenForStyleName (const String& sStyleName);
+ Token GetTokenForURL (const OUString& sURL);
+ Token GetTokenForStyleName (const OUString& sStyleName);
Token GetTokenForPageObject (const SdPage* pPage);
- String GetURLForToken (Token aToken);
- String GetPageNameForToken (Token aToken);
- String GetStyleNameForToken (Token aToken);
+ OUString GetURLForToken (Token aToken);
+ OUString GetPageNameForToken (Token aToken);
+ OUString GetStyleNameForToken (Token aToken);
SdPage* GetPageObjectForToken (Token aToken, bool bLoad=true);
Origin GetOriginForToken (Token aToken);
sal_Int32 GetTemplateIndexForToken (Token aToken);
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 33633f7..94a741e 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -411,7 +411,7 @@ void RecentlyUsedMasterPages::AddMasterPage (
// has to have a valid URL. This excludes master pages that do not come
// from template files.
if (aToken != MasterPageContainer::NIL_TOKEN
- && mpContainer->GetURLForToken(aToken).Len()>0)
+ && !mpContainer->GetURLForToken(aToken).isEmpty())
{
MasterPageList::iterator aIterator (
commit ae0b46609cba590d9c17d088b57b5d60232a1d1e
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 13:12:16 2013 +0200
convert sd/.../MasterPageDescriptor.hxx from String to OUString
Change-Id: I1844052366527c146f08a2a999065891a671aa2a
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
index 3e5117f..973e864 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
@@ -31,9 +31,9 @@ namespace sd { namespace sidebar {
MasterPageDescriptor::MasterPageDescriptor (
MasterPageContainer::Origin eOrigin,
const sal_Int32 nTemplateIndex,
- const String& rsURL,
- const String& rsPageName,
- const String& rsStyleName,
+ const OUString& rsURL,
+ const OUString& rsPageName,
+ const OUString& rsStyleName,
const bool bIsPrecious,
const ::boost::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider)
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index c1ddc2e..6063cc6 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -40,9 +40,9 @@ public:
MasterPageDescriptor (
MasterPageContainer::Origin eOrigin,
const sal_Int32 nTemplateIndex,
- const String& rURL,
- const String& rPageName,
- const String& rStyleName,
+ const OUString& rURL,
+ const OUString& rPageName,
+ const OUString& rStyleName,
const bool bIsPrecious,
const ::boost::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider);
commit 589e157cdad3b38271096c86943747b3b4f7bf41
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 12:07:18 2013 +0200
convert sd/.../slideshowimpl.hxx from String to OUString
Change-Id: Ia3fbe38ccd4abc6d5fc87d83af1e6af3d1474a4e
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8db58e2..5f47c70 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1724,7 +1724,7 @@ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex )
// ---------------------------------------------------------
-void SlideshowImpl::jumpToBookmark( const String& sBookmark )
+void SlideshowImpl::jumpToBookmark( const OUString& sBookmark )
{
sal_Int32 nSlideNumber = getSlideNumberForBookmark( sBookmark );
if( nSlideNumber != -1 )
@@ -1977,14 +1977,14 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
case KEY_RETURN:
{
- if( maCharBuffer.Len() )
+ if( !maCharBuffer.isEmpty() )
{
if( mpSlideController.get() )
{
- if( mpSlideController->jumpToSlideNumber( maCharBuffer.ToInt32() - 1 ) )
+ if( mpSlideController->jumpToSlideNumber( maCharBuffer.toInt32() - 1 ) )
displayCurrentSlide();
}
- maCharBuffer.Erase();
+ maCharBuffer = "";
}
else
{
@@ -2004,7 +2004,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
case KEY_7:
case KEY_8:
case KEY_9:
- maCharBuffer.Append( rKEvt.GetCharCode() );
+ maCharBuffer += OUString( rKEvt.GetCharCode() );
break;
case KEY_PAGEUP:
@@ -2462,7 +2462,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const
// ---------------------------------------------------------
-void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, const String& rPresSlide )
+void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, const OUString& rPresSlide )
{
const long nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD );
@@ -2490,7 +2490,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
// normal presentation
- if( rPresSlide.Len() )
+ if( !rPresSlide.isEmpty() )
{
sal_Int32 nSlide;
sal_Bool bTakeNextAvailable = sal_False;
@@ -2526,7 +2526,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
}
else
{
- if( meAnimationMode != ANIMATIONMODE_SHOW && rPresSlide.Len() )
+ if( meAnimationMode != ANIMATIONMODE_SHOW && !rPresSlide.isEmpty() )
{
sal_Int32 nSlide;
for( nSlide = 0; nSlide < nSlideCount; nSlide++ )
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 2768e96..b0cbcf1 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -267,7 +267,7 @@ private:
double update();
- void createSlideList( bool bAll, bool bStartWithActualSlide, const String& rPresSlide );
+ void createSlideList( bool bAll, bool bStartWithActualSlide, const OUString& rPresSlide );
void displayCurrentSlide (const bool bSkipAllMainSequenceEffects = false);
@@ -278,7 +278,7 @@ private:
sal_Int32 getLastSlideNumber();
inline bool isInputFreezed() const { return mbInputFreeze; }
- void jumpToBookmark( const String& sBookmark );
+ void jumpToBookmark( const OUString& sBookmark );
void hideChildWindows();
void showChildWindows();
@@ -357,7 +357,7 @@ private:
Size maSlideSize;
Size maPresSize;
AnimationMode meAnimationMode;
- String maCharBuffer;
+ OUString maCharBuffer;
Pointer maOldPointer;
Pointer maPencil;
std::vector< ::sd::Window* > maDrawModeWindows;
commit 126906303e8ad010d7d1de9645e3360bd6ca9b9f
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 12:00:37 2013 +0200
convert sd/.../SlideSorterController.hxx from String to OUString
Change-Id: Ifa9cc2448d5376fb171158538fedce9cfb8d6e0a
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index efbef96..b7afa2d 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -971,7 +971,7 @@ void SlideSorterController::FinishEditModeChange (void)
-void SlideSorterController::PageNameHasChanged (int nPageIndex, const String& rsOldName)
+void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString& rsOldName)
{
// Request a repaint for the page object whose name has changed.
model::SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex));
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 1e1ce4d..27ff35e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -209,7 +209,7 @@ public:
The old name of the page. The new name can be taken from the
page object.
*/
- void PageNameHasChanged (int nPageIndex, const String& rsOldName);
+ void PageNameHasChanged (int nPageIndex, const OUString& rsOldName);
/** Provide the set of pages to be displayed in the slide sorter. The
GetDocumentSlides() method can be found only in the SlideSorterModel.
commit 7100252db2cf8b5cc3b6d64eebf11599890b5357
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 11:47:31 2013 +0200
convert sd/.../SlsSlotManager.hxx from String to OUString
Change-Id: I5d526ebb84606ee32feaedd9998bbf8155acd441
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 93875a3..f0c5df2 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -990,7 +990,7 @@ IMPL_LINK(SlotManager, RenameSlideHdl, AbstractSvxNameDialog*, pDialog)
&& mrSlideSorter.GetViewShell()->GetDocSh()->IsNewPageNameValid( aNewName ) ));
}
-bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String & rName )
+bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString & rName )
{
sal_Bool bOutDummy;
SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument();
@@ -1049,7 +1049,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String
}
}
- bool bSuccess = pPageToRename!=NULL && ( sal_False != rName.Equals( pPageToRename->GetName()));
+ bool bSuccess = pPageToRename!=NULL && ( rName == pPageToRename->GetName() );
if( bSuccess )
{
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index f5e68a5..2339cf9 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -92,7 +92,7 @@ private:
*/
void RenameSlide (void);
DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*);
- bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String& rName);
+ bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString& rName);
/** Handle SID_INSERTPAGE slot calls.
*/
commit 5cbfbad727f5411d869169be5f77b42e68d2cbc5
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 11:32:40 2013 +0200
convert sd/.../ControlContainerDescriptor.hxx from String to OUString
Change-Id: Ic165c4f40b2a84b69c3cf256b884fc6f5f12d982
diff --git a/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx b/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx
index dd99d1c..1950609 100644
--- a/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx
+++ b/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx
@@ -62,7 +62,7 @@ public:
ControlContainer& rContainer,
::Window* pParent,
::std::auto_ptr<ILayoutableWindow> pControl,
- const String& rTitle,
+ const OUString& rTitle,
TitleBar::TitleBarType eType);
virtual ~ControlContainerDescriptor (void);
@@ -85,7 +85,7 @@ public:
// const Rectangle& GetTitleBarBox (void) const;
Window* GetControl (void) const;
- const String& GetTitle (void) const;
+ const OUString& GetTitle (void) const;
void Expand (bool bExpanded = true);
void Collapse (void);
@@ -109,7 +109,7 @@ private:
ControlContainer& mrContainer;
::std::auto_ptr<TitleBar> mpTitleBar;
::std::auto_ptr<ILayoutableWindow> mpControl;
- String msTitle;
+ OUString msTitle;
bool mbExpanded;
bool mbVisible;
void* mpUserData;
commit f9f99f4a8c3e43919cabd9b2cafc6843d5d1f21b
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 11:31:07 2013 +0200
remove dead method definitions
Change-Id: I2751c913bab397d49000bb3462a2f9265d09b32e
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
index c6e2494..9a506f3 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
@@ -69,11 +69,6 @@ private:
void AddTemplate (const TemplateEntry& rEntry);
- /** This filter returns <TRUE/> when the master page specified by the
- given file name belongs to the set of Impress master pages.
- */
- bool FileFilter (const String& sFileName);
-
void AddItem (MasterPageContainer::Token aToken);
/** Add all items in the internal master page list into the given list.
diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
index af01f25..7774bcf 100644
--- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
@@ -66,11 +66,6 @@ private:
void AddTemplate (const TemplateEntry& rEntry);
- /** This filter returns <TRUE/> when the master page specified by the
- given file name belongs to the set of Impress master pages.
- */
- bool FileFilter (const String& sFileName);
-
void AddItem (MasterPageContainer::Token aToken);
/** Add all items in the internal master page list into the given list.
commit f2a167c9272c18799eb486f8e94b78183c159402
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 18 11:22:59 2013 +0200
convert sd/.../MasterPageContainer.hxx from String to OUString
Change-Id: I88f8bcd6f6f447f3184beedee04b4aab1fddd41e
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index cfad63c..09be804 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -374,12 +374,12 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForIndex (int nIndex)
MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
- const String& sURL)
+ const OUString& sURL)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
Token aResult (NIL_TOKEN);
- if (sURL.Len() > 0)
+ if (!sURL.isEmpty())
{
MasterPageContainerType::iterator iEntry (
::std::find_if (
@@ -395,12 +395,12 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
-MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const String& sStyleName)
+MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const OUString& sStyleName)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
Token aResult (NIL_TOKEN);
- if (sStyleName.Len() > 0)
+ if (!sStyleName.isEmpty())
{
MasterPageContainerType::iterator iEntry (
::std::find_if (
@@ -438,7 +438,7 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForPageObject (
-String MasterPageContainer::GetURLForToken (
+OUString MasterPageContainer::GetURLForToken (
MasterPageContainer::Token aToken)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -447,13 +447,13 @@ String MasterPageContainer::GetURLForToken (
if (pDescriptor.get() != NULL)
return pDescriptor->msURL;
else
- return String();
+ return OUString();
}
-String MasterPageContainer::GetPageNameForToken (
+OUString MasterPageContainer::GetPageNameForToken (
MasterPageContainer::Token aToken)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -462,13 +462,13 @@ String MasterPageContainer::GetPageNameForToken (
if (pDescriptor.get() != NULL)
return pDescriptor->msPageName;
else
- return String();
+ return OUString();
}
-String MasterPageContainer::GetStyleNameForToken (
+OUString MasterPageContainer::GetStyleNameForToken (
MasterPageContainer::Token aToken)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -477,7 +477,7 @@ String MasterPageContainer::GetStyleNameForToken (
if (pDescriptor.get() != NULL)
return pDescriptor->msStyleName;
else
- return String();
+ return OUString();
}
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
index 5602c38..b0bfd75 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
@@ -128,13 +128,13 @@ public:
*/
Token GetTokenForIndex (int nIndex);
- Token GetTokenForURL (const String& sURL);
- Token GetTokenForStyleName (const String& sStyleName);
+ Token GetTokenForURL (const OUString& sURL);
+ Token GetTokenForStyleName (const OUString& sStyleName);
Token GetTokenForPageObject (const SdPage* pPage);
- String GetURLForToken (Token aToken);
- String GetPageNameForToken (Token aToken);
- String GetStyleNameForToken (Token aToken);
+ OUString GetURLForToken (Token aToken);
+ OUString GetPageNameForToken (Token aToken);
+ OUString GetStyleNameForToken (Token aToken);
SdPage* GetPageObjectForToken (Token aToken, bool bLoad=true);
Origin GetOriginForToken (Token aToken);
sal_Int32 GetTemplateIndexForToken (Token aToken);
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
index da68fab..0e6d958 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
@@ -414,7 +414,7 @@ void RecentlyUsedMasterPages::AddMasterPage (
// has to have a valid URL. This excludes master pages that do not come
// from template files.
if (aToken != MasterPageContainer::NIL_TOKEN
- && mpContainer->GetURLForToken(aToken).Len()>0)
+ && !mpContainer->GetURLForToken(aToken).isEmpty())
{
MasterPageList::iterator aIterator (
commit 856707082f2cc8dbd0476397f1c330c331cceb8e
Author: Noel Grandin <noel at peralex.com>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list