diff options
-rw-r--r-- | sfx2/inc/sfx2/thumbnailviewitem.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/templatefolderview.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/control/templatefolderviewitem.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/templatesearchview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/templateview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailviewacc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailviewitem.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx b/sfx2/inc/sfx2/thumbnailviewitem.hxx index 9b4289d8de60..e6719c9b225a 100644 --- a/sfx2/inc/sfx2/thumbnailviewitem.hxx +++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx @@ -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); diff --git a/sfx2/source/control/templatefolderview.cxx b/sfx2/source/control/templatefolderview.cxx index 1db2f7727d30..a23114dca700 100644 --- a/sfx2/source/control/templatefolderview.cxx +++ b/sfx2/source/control/templatefolderview.cxx @@ -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; diff --git a/sfx2/source/control/templatefolderviewitem.cxx b/sfx2/source/control/templatefolderviewitem.cxx index 36f19097a9ca..8e9e381f84f9 100644 --- a/sfx2/source/control/templatefolderviewitem.cxx +++ b/sfx2/source/control/templatefolderviewitem.cxx @@ -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(), diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index 5bf2f731cc38..ab3e1223db39 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -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)); diff --git a/sfx2/source/control/templateview.cxx b/sfx2/source/control/templateview.cxx index b8043412d112..a8190944a86c 100644 --- a/sfx2/source/control/templateview.cxx +++ b/sfx2/source/control/templateview.cxx @@ -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; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index d64edf127bfd..886ec9bb1769 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -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(); } diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 48a6ce98c967..5ba12d3c18ab 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -772,7 +772,7 @@ sal_Int16 SAL_CALL ThumbnailViewItemAcc::getAccessibleRole() if( mpParent ) { - aRet = mpParent->maText; + aRet = mpParent->maTitle; if( aRet.isEmpty() ) { diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index dbbbcb79ac3c..dad7702a6d92 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -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(), diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index decb401df636..9738060b8b18 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -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); } }; |