Kaydet (Commit) a93e06c0 authored tarafından Rafael Dominguez's avatar Rafael Dominguez

Rename ThumbnailViewItem maText attribute to maTitle.

Change-Id: Id253d06325ec05bb587c9759027ea07b65fe257f
üst df82184b
......@@ -69,7 +69,7 @@ public:
bool mbSelected;
bool mbHover;
BitmapEx maPreview1;
rtl::OUString maText;
rtl::OUString maTitle;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc;
ThumbnailViewItem (ThumbnailView &rView, Window *pParent);
......
......@@ -310,7 +310,7 @@ void TemplateFolderView::Populate ()
TemplateFolderViewItem* pItem = new TemplateFolderViewItem( *this, this );
pItem->mnId = i+1;
pItem->maText = aRegionName;
pItem->maTitle = aRegionName;
pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
sal_uInt16 nEntries = mpDocTemplates->GetCount(i);
......@@ -355,7 +355,7 @@ std::vector<rtl::OUString> TemplateFolderView::getFolderNames()
std::vector<rtl::OUString> ret(n);
for (size_t i = 0; i < n; ++i)
ret[i] = mItemList[i]->maText;
ret[i] = mItemList[i]->maTitle;
return ret;
}
......@@ -455,7 +455,7 @@ sal_uInt16 TemplateFolderView::createRegion(const rtl::OUString &rName)
TemplateFolderViewItem* pItem = new TemplateFolderViewItem( *this, this );
pItem->mnId = nRegionId+1;
pItem->maText = aRegionName;
pItem->maTitle = aRegionName;
pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
mItemList.push_back(pItem);
......@@ -567,7 +567,7 @@ bool TemplateFolderView::moveTemplates(std::set<const ThumbnailViewItem *> &rIte
TemplateItemProperties aTemplateItem;
aTemplateItem.nId = nTargetIdx + 1;
aTemplateItem.nRegionId = nTargetRegion;
aTemplateItem.aName = pViewItem->maText;
aTemplateItem.aName = pViewItem->maTitle;
aTemplateItem.aPath = pViewItem->getPath();
aTemplateItem.aType = pViewItem->getFileType();
aTemplateItem.aThumbnail = pViewItem->maPreview1;
......@@ -696,7 +696,7 @@ IMPL_LINK(TemplateFolderView, ChangeNameHdl, TemplateView*, pView)
{
if (mItemList[i]->mnId == nItemId)
{
mItemList[i]->maText = pView->getRegionName();
mItemList[i]->maTitle = pView->getRegionName();
mItemList[i]->calculateItemsPosition(mpItemAttrs->nMaxTextLenght);
Invalidate();
break;
......
......@@ -98,7 +98,7 @@ void TemplateFolderViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *
aSeq[nCount++] = Primitive2DReference(
new TextSimplePortionPrimitive2D(aTextMatrix,
maText,0,maText.getLength(),
maTitle,0,maTitle.getLength(),
std::vector< double >( ),
pAttrs->aFontAttr,
com::sun::star::lang::Locale(),
......
......@@ -42,7 +42,7 @@ void TemplateSearchView::AppendItem(sal_uInt16 nItemId, sal_uInt16 nRegionId, sa
pItem->mnIdx = nIdx;
pItem->mnRegionId = nRegionId;
pItem->maPreview1 = rImage;
pItem->maText = rStr;
pItem->maTitle = rStr;
pItem->setPath(rPath);
pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
......
......@@ -115,7 +115,7 @@ void TemplateView::InsertItems (const std::vector<TemplateItemProperties> &rTemp
const TemplateItemProperties *pCur = &rTemplates[i];
pItem->mnId = pCur->nId;
pItem->maText = pCur->aName;
pItem->maTitle = pCur->aName;
pItem->setPath(pCur->aPath);
pItem->setFileType(pCur->aType);
pItem->maPreview1 = pCur->aThumbnail;
......
......@@ -803,7 +803,7 @@ void ThumbnailView::InsertItem( sal_uInt16 nItemId, const BitmapEx& rImage,
ThumbnailViewItem* pItem = new ThumbnailViewItem( *this, this );
pItem->mnId = nItemId;
pItem->maPreview1 = rImage;
pItem->maText = rText;
pItem->maTitle = rText;
pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
ImplInsertItem( pItem, nPos );
}
......@@ -1047,7 +1047,7 @@ rtl::OUString ThumbnailView::GetItemText( sal_uInt16 nItemId ) const
size_t nPos = GetItemPos( nItemId );
if ( nPos != THUMBNAILVIEW_ITEM_NOTFOUND )
return mItemList[nPos]->maText;
return mItemList[nPos]->maTitle;
return rtl::OUString();
}
......
......@@ -772,7 +772,7 @@ sal_Int16 SAL_CALL ThumbnailViewItemAcc::getAccessibleRole()
if( mpParent )
{
aRet = mpParent->maText;
aRet = mpParent->maTitle;
if( aRet.isEmpty() )
{
......
......@@ -132,7 +132,7 @@ void ThumbnailViewItem::calculateItemsPosition (sal_uInt32 nMaxTextLenght)
// Calculate text position
aPos.Y() += aImageSize.Height();
aPos.Y() = aPos.Y() + aTextDev.getTextHeight() + (maDrawArea.Bottom() - aPos.Y() - aTextDev.getTextHeight())/2;
aPos.X() = maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maText,0,nMaxTextLenght))/2;
aPos.X() = maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maTitle,0,nMaxTextLenght))/2;
maTextPos = aPos;
// Calculate checkbox position
......@@ -199,7 +199,7 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc
aSeq[2] = Primitive2DReference(
new TextSimplePortionPrimitive2D(aTextMatrix,
maText,0,pAttrs->nMaxTextLenght,
maTitle,0,pAttrs->nMaxTextLenght,
std::vector< double >( ),
pAttrs->aFontAttr,
com::sun::star::lang::Locale(),
......
......@@ -60,7 +60,7 @@ public:
bool operator() (const ThumbnailViewItem *pItem1, const ThumbnailViewItem *pItem2)
{
return (pItem1->maText.compareTo(pItem2->maText) < 0);
return (pItem1->maTitle.compareTo(pItem2->maTitle) < 0);
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment