chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 98 +- cui/source/inc/cuitabline.hxx | 5 cui/source/tabpages/tpline.cxx | 523 +++++++------- svx/inc/svx/gallery.hxx | 1 svx/source/gallery2/galexpl.cxx | 17 5 files changed, 335 insertions(+), 309 deletions(-)
New commits: commit c7b8b3482c50eb5de8d43acf036642dc684fe8d9 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Mon Mar 26 16:17:36 2012 -0400 fdo#46942: Fix a regression caused by List removal. 3236c2c3af9355157c62f68fcbd429498f7f747b accidentally removed the gallery item count which was used to differentiate the gallery symbols from normal ones. diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 1436c0a..ede160b 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -277,6 +277,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) rtl::OUString aEmptyStr; const rtl::OUString *pUIName = NULL; sal_uInt32 i = 0; + nNumMenuGalleryItems = aGrfNames.size(); for(std::vector<rtl::OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) { pUIName = &(*it); commit 622a0ee58130a6c0e712f70eb5d6daed810a64f0 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Mon Mar 26 15:18:52 2012 -0400 Move this into a real method also. diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 0bc07ff..6a0881c 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -197,6 +197,7 @@ private: sal_Bool FillXLSet_Impl(); #endif + void InitSymbols(MenuButton* pButton); void SymbolSelected(MenuButton* pButton); void FillListboxes(); public: diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 255db52..1436c0a 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -265,6 +265,157 @@ void SvxLineTabPage::Construct() FillListboxes(); } +void SvxLineTabPage::InitSymbols(MenuButton* pButton) +{ + //Popup initialisieren + if(!pButton->GetPopupMenu()->GetPopupMenu( MN_GALLERY )) + { + // Gallery-Eintraege besorgen + GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); + + PopupMenu* pPopup = new PopupMenu; + rtl::OUString aEmptyStr; + const rtl::OUString *pUIName = NULL; + sal_uInt32 i = 0; + for(std::vector<rtl::OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) + { + pUIName = &(*it); + + // convert URL encodings to UI characters (eg %20 for spaces) + rtl::OUString aPhysicalName; + if (utl::LocalFileHelper::ConvertURLToPhysicalName(*it, aPhysicalName)) + { + pUIName = &aPhysicalName; + } + + SvxBrushItem* pBrushItem = new SvxBrushItem(*it, aEmptyStr, GPOS_AREA, SID_ATTR_BRUSH); + pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl)); + + SvxBmpItemInfo* pInfo = new SvxBmpItemInfo(); + pInfo->pBrushItem = pBrushItem; + pInfo->nItemId = (sal_uInt16)(MN_GALLERY_ENTRY + i); + if ( i < aGrfBrushItems.size() ) { + aGrfBrushItems.insert( aGrfBrushItems.begin() + i, pInfo ); + } else { + aGrfBrushItems.push_back( pInfo ); + } + const Graphic* pGraphic = pBrushItem->GetGraphic(); + + if(pGraphic) + { + Bitmap aBitmap(pGraphic->GetBitmap()); + Size aSize(aBitmap.GetSizePixel()); + if(aSize.Width() > MAX_BMP_WIDTH || + aSize.Height() > MAX_BMP_HEIGHT) + { + sal_Bool bWidth = aSize.Width() > aSize.Height(); + double nScale = bWidth ? + (double)MAX_BMP_WIDTH / (double)aSize.Width(): + (double)MAX_BMP_HEIGHT / (double)aSize.Height(); + aBitmap.Scale(nScale, nScale); + + } + Image aImage(aBitmap); + pPopup->InsertItem(pInfo->nItemId, *pUIName, aImage ); + } + else + { + Image aImage; + pPopup->InsertItem(pInfo->nItemId, *pUIName, aImage ); + } + } + aSymbolMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup ); + + if(aGrfNames.empty()) + aSymbolMB.GetPopupMenu()->EnableItem(MN_GALLERY, sal_False); + } + + if(!pButton->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS ) && pSymbolList) + { + VirtualDevice aVDev; + aVDev.SetMapMode(MapMode(MAP_100TH_MM)); + SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS); + pModel->GetItemPool().FreezeIdRanges(); + // Page + SdrPage* pPage = new SdrPage( *pModel, sal_False ); + pPage->SetSize(Size(1000,1000)); + pModel->InsertPage( pPage, 0 ); + // 3D View + SdrView* pView = new SdrView( pModel, &aVDev ); + pView->hideMarkHandles(); + pView->ShowSdrPage(pPage); + + PopupMenu* pPopup = new PopupMenu; + rtl::OUString aEmptyStr; + + // Generate invisible square to give all symbols a + // bitmap size, which is indepedent from specific glyph + SdrObject *pInvisibleSquare=pSymbolList->GetObj(0); + pInvisibleSquare=pInvisibleSquare->Clone(); + pPage->NbcInsertObject(pInvisibleSquare); + pInvisibleSquare->SetMergedItem(XFillTransparenceItem(100)); + pInvisibleSquare->SetMergedItem(XLineTransparenceItem(100)); + + for(long i=0;; ++i) + { + SdrObject *pObj=pSymbolList->GetObj(i); + if(pObj==NULL) + break; + pObj=pObj->Clone(); + aGrfNames.push_back(aEmptyStr); + pPage->NbcInsertObject(pObj); + if(pSymbolAttr) + { + pObj->SetMergedItemSet(*pSymbolAttr); + } + else + { + pObj->SetMergedItemSet(rOutAttrs); + } + pView->MarkAll(); + Bitmap aBitmap(pView->GetAllMarkedBitmap()); + GDIMetaFile aMeta(pView->GetAllMarkedMetaFile()); + pView->UnmarkAll(); + pObj=pPage->RemoveObject(1); + SdrObject::Free(pObj); + + SvxBrushItem* pBrushItem = new SvxBrushItem(Graphic(aMeta), GPOS_AREA, SID_ATTR_BRUSH); + pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl)); + + SvxBmpItemInfo* pInfo = new SvxBmpItemInfo(); + pInfo->pBrushItem = pBrushItem; + pInfo->nItemId = (sal_uInt16)(MN_GALLERY_ENTRY + i + nNumMenuGalleryItems); + if ( (size_t)(nNumMenuGalleryItems + i) < aGrfBrushItems.size() ) { + aGrfBrushItems.insert( aGrfBrushItems.begin() + nNumMenuGalleryItems + i, pInfo ); + } else { + aGrfBrushItems.push_back( pInfo ); + } + + Size aSize(aBitmap.GetSizePixel()); + if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT) + { + sal_Bool bWidth = aSize.Width() > aSize.Height(); + double nScale = bWidth ? + (double)MAX_BMP_WIDTH / (double)aSize.Width(): + (double)MAX_BMP_HEIGHT / (double)aSize.Height(); + aBitmap.Scale(nScale, nScale); + } + Image aImage(aBitmap); + pPopup->InsertItem(pInfo->nItemId,aEmptyStr,aImage); + } + pInvisibleSquare=pPage->RemoveObject(0); + SdrObject::Free(pInvisibleSquare); + + aSymbolMB.GetPopupMenu()->SetPopupMenu( MN_SYMBOLS, pPopup ); + + if(aGrfNames.empty()) + aSymbolMB.GetPopupMenu()->EnableItem(MN_SYMBOLS, sal_False); + + delete pView; + delete pModel; + } +} + void SvxLineTabPage::SymbolSelected(MenuButton* pButton) { sal_uInt16 nItemId = pButton->GetCurItemId(); @@ -1553,153 +1704,7 @@ void SvxLineTabPage::FillUserData() //der folgende Link stammt urspruenglich aus SvxNumOptionsTabPage IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) { - //Popup initialisieren - if(!pButton->GetPopupMenu()->GetPopupMenu( MN_GALLERY )) - { - // Gallery-Eintraege besorgen - GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); - - PopupMenu* pPopup = new PopupMenu; - rtl::OUString aEmptyStr; - const rtl::OUString *pUIName = NULL; - sal_uInt32 i = 0; - for(std::vector<rtl::OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) - { - pUIName = &(*it); - - // convert URL encodings to UI characters (eg %20 for spaces) - rtl::OUString aPhysicalName; - if (utl::LocalFileHelper::ConvertURLToPhysicalName(*it, aPhysicalName)) - { - pUIName = &aPhysicalName; - } - - SvxBrushItem* pBrushItem = new SvxBrushItem(*it, aEmptyStr, GPOS_AREA, SID_ATTR_BRUSH); - pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl)); - - SvxBmpItemInfo* pInfo = new SvxBmpItemInfo(); - pInfo->pBrushItem = pBrushItem; - pInfo->nItemId = (sal_uInt16)(MN_GALLERY_ENTRY + i); - if ( i < aGrfBrushItems.size() ) { - aGrfBrushItems.insert( aGrfBrushItems.begin() + i, pInfo ); - } else { - aGrfBrushItems.push_back( pInfo ); - } - const Graphic* pGraphic = pBrushItem->GetGraphic(); - - if(pGraphic) - { - Bitmap aBitmap(pGraphic->GetBitmap()); - Size aSize(aBitmap.GetSizePixel()); - if(aSize.Width() > MAX_BMP_WIDTH || - aSize.Height() > MAX_BMP_HEIGHT) - { - sal_Bool bWidth = aSize.Width() > aSize.Height(); - double nScale = bWidth ? - (double)MAX_BMP_WIDTH / (double)aSize.Width(): - (double)MAX_BMP_HEIGHT / (double)aSize.Height(); - aBitmap.Scale(nScale, nScale); - - } - Image aImage(aBitmap); - pPopup->InsertItem(pInfo->nItemId, *pUIName, aImage ); - } - else - { - Image aImage; - pPopup->InsertItem(pInfo->nItemId, *pUIName, aImage ); - } - } - aSymbolMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup ); - - if(aGrfNames.empty()) - aSymbolMB.GetPopupMenu()->EnableItem(MN_GALLERY, sal_False); - } - - if(!pButton->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS ) && pSymbolList) - { - VirtualDevice aVDev; - aVDev.SetMapMode(MapMode(MAP_100TH_MM)); - SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS); - pModel->GetItemPool().FreezeIdRanges(); - // Page - SdrPage* pPage = new SdrPage( *pModel, sal_False ); - pPage->SetSize(Size(1000,1000)); - pModel->InsertPage( pPage, 0 ); - // 3D View - SdrView* pView = new SdrView( pModel, &aVDev ); - pView->hideMarkHandles(); - pView->ShowSdrPage(pPage); - - PopupMenu* pPopup = new PopupMenu; - rtl::OUString aEmptyStr; - - // Generate invisible square to give all symbols a - // bitmap size, which is indepedent from specific glyph - SdrObject *pInvisibleSquare=pSymbolList->GetObj(0); - pInvisibleSquare=pInvisibleSquare->Clone(); - pPage->NbcInsertObject(pInvisibleSquare); - pInvisibleSquare->SetMergedItem(XFillTransparenceItem(100)); - pInvisibleSquare->SetMergedItem(XLineTransparenceItem(100)); - - for(long i=0;; ++i) - { - SdrObject *pObj=pSymbolList->GetObj(i); - if(pObj==NULL) - break; - pObj=pObj->Clone(); - aGrfNames.push_back(aEmptyStr); - pPage->NbcInsertObject(pObj); - if(pSymbolAttr) - { - pObj->SetMergedItemSet(*pSymbolAttr); - } - else - { - pObj->SetMergedItemSet(rOutAttrs); - } - pView->MarkAll(); - Bitmap aBitmap(pView->GetAllMarkedBitmap()); - GDIMetaFile aMeta(pView->GetAllMarkedMetaFile()); - pView->UnmarkAll(); - pObj=pPage->RemoveObject(1); - SdrObject::Free(pObj); - - SvxBrushItem* pBrushItem = new SvxBrushItem(Graphic(aMeta), GPOS_AREA, SID_ATTR_BRUSH); - pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl)); - - SvxBmpItemInfo* pInfo = new SvxBmpItemInfo(); - pInfo->pBrushItem = pBrushItem; - pInfo->nItemId = (sal_uInt16)(MN_GALLERY_ENTRY + i + nNumMenuGalleryItems); - if ( (size_t)(nNumMenuGalleryItems + i) < aGrfBrushItems.size() ) { - aGrfBrushItems.insert( aGrfBrushItems.begin() + nNumMenuGalleryItems + i, pInfo ); - } else { - aGrfBrushItems.push_back( pInfo ); - } - - Size aSize(aBitmap.GetSizePixel()); - if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT) - { - sal_Bool bWidth = aSize.Width() > aSize.Height(); - double nScale = bWidth ? - (double)MAX_BMP_WIDTH / (double)aSize.Width(): - (double)MAX_BMP_HEIGHT / (double)aSize.Height(); - aBitmap.Scale(nScale, nScale); - } - Image aImage(aBitmap); - pPopup->InsertItem(pInfo->nItemId,aEmptyStr,aImage); - } - pInvisibleSquare=pPage->RemoveObject(0); - SdrObject::Free(pInvisibleSquare); - - aSymbolMB.GetPopupMenu()->SetPopupMenu( MN_SYMBOLS, pPopup ); - - if(aGrfNames.empty()) - aSymbolMB.GetPopupMenu()->EnableItem(MN_SYMBOLS, sal_False); - - delete pView; - delete pModel; - } + InitSymbols(pButton); return 0; } //#58425# Symbole auf einer Linie (z.B. StarChart) commit 0087946df5363b4ca4107e015532552e4aad8f08 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Mon Mar 26 14:50:55 2012 -0400 This string is assigned but not used. diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 62a382d..255db52 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -270,7 +270,6 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) sal_uInt16 nItemId = pButton->GetCurItemId(); const Graphic* pGraphic = 0; Graphic aGraphic; - rtl::OUString aGrfName; bool bResetSize = false; bool bEnable = true; long nPreviousSymbolType = nSymbolType; @@ -314,7 +313,6 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) if( !aGrfDlg.Execute() ) { // ausgewaehlten Filter merken - aGrfName = aGrfDlg.GetPath(); if( !aGrfDlg.GetGraphic(aGraphic) ) { nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM; commit 9e18d9f9c59a5d6783ded83d3cee0a42a99d6c82 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Mon Mar 26 14:49:45 2012 -0400 bool and string. diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index e2676b0..62a382d 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -270,9 +270,9 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) sal_uInt16 nItemId = pButton->GetCurItemId(); const Graphic* pGraphic = 0; Graphic aGraphic; - String aGrfName; - sal_Bool bResetSize = sal_False; - sal_Bool bEnable=sal_True; + rtl::OUString aGrfName; + bool bResetSize = false; + bool bEnable = true; long nPreviousSymbolType = nSymbolType; if(nItemId >= MN_GALLERY_ENTRY) @@ -284,7 +284,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) else { nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM; - bResetSize = sal_True; + bResetSize = true; } SvxBmpItemInfo* pInfo = aGrfBrushItems[ nItemId - MN_GALLERY_ENTRY ]; pGraphic = pInfo->pBrushItem->GetGraphic(); @@ -303,14 +303,14 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) { nSymbolType=SVX_SYMBOLTYPE_NONE; pGraphic=NULL; - bEnable=sal_False; + bEnable = false; } break; default: { SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_STR_EDIT_GRAPHIC)); - aGrfDlg.EnableLink(sal_False); - aGrfDlg.AsLink(sal_False); + aGrfDlg.EnableLink(false); + aGrfDlg.AsLink(false); if( !aGrfDlg.Execute() ) { // ausgewaehlten Filter merken @@ -319,7 +319,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) { nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM; pGraphic = &aGraphic; - bResetSize = sal_True; + bResetSize = true; } } if( !pGraphic ) @@ -352,7 +352,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) { aSymbolGraphic=Graphic(); aCtlPreview.SetSymbol(NULL,aSymbolSize); - bEnable=sal_False; + bEnable = false; } aSymbolLastSize=aSymbolSize; SetMetricValue(aSymbolWidthMF, aSymbolSize.Width(), ePoolUnit); commit 4361ab3b47dfb31cd118a05f91afaa73ee4022c5 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Mon Mar 26 14:44:54 2012 -0400 Move the fat handler code into a real method. To allow my editor to do static analysis correctly. Those IMPL_LINK macros screw it up. diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 82df291..0bc07ff 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -197,6 +197,7 @@ private: sal_Bool FillXLSet_Impl(); #endif + void SymbolSelected(MenuButton* pButton); void FillListboxes(); public: diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 1c13358..e2676b0 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -265,6 +265,106 @@ void SvxLineTabPage::Construct() FillListboxes(); } +void SvxLineTabPage::SymbolSelected(MenuButton* pButton) +{ + sal_uInt16 nItemId = pButton->GetCurItemId(); + const Graphic* pGraphic = 0; + Graphic aGraphic; + String aGrfName; + sal_Bool bResetSize = sal_False; + sal_Bool bEnable=sal_True; + long nPreviousSymbolType = nSymbolType; + + if(nItemId >= MN_GALLERY_ENTRY) + { + if( (nItemId-MN_GALLERY_ENTRY) >= nNumMenuGalleryItems) + { + nSymbolType=nItemId-MN_GALLERY_ENTRY-nNumMenuGalleryItems; //Index der Liste + } + else + { + nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM; + bResetSize = sal_True; + } + SvxBmpItemInfo* pInfo = aGrfBrushItems[ nItemId - MN_GALLERY_ENTRY ]; + pGraphic = pInfo->pBrushItem->GetGraphic(); + } + else switch(nItemId) + { + case MN_SYMBOLS_AUTO: + { + pGraphic=&aAutoSymbolGraphic; + aAutoSymbolGraphic.SetPrefSize( Size(253,253) ); + nSymbolType=SVX_SYMBOLTYPE_AUTO; + } + break; + + case MN_SYMBOLS_NONE: + { + nSymbolType=SVX_SYMBOLTYPE_NONE; + pGraphic=NULL; + bEnable=sal_False; + } + break; + default: + { + SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_STR_EDIT_GRAPHIC)); + aGrfDlg.EnableLink(sal_False); + aGrfDlg.AsLink(sal_False); + if( !aGrfDlg.Execute() ) + { + // ausgewaehlten Filter merken + aGrfName = aGrfDlg.GetPath(); + if( !aGrfDlg.GetGraphic(aGraphic) ) + { + nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM; + pGraphic = &aGraphic; + bResetSize = sal_True; + } + } + if( !pGraphic ) + return; + } + break; + } + + if(pGraphic) + { + Size aSize = SvxNumberFormat::GetGraphicSizeMM100(pGraphic); + aSize = OutputDevice::LogicToLogic(aSize, MAP_100TH_MM, (MapUnit)ePoolUnit); + aSymbolGraphic=*pGraphic; + if( bResetSize ) + { + aSymbolSize=aSize; + } + else if( nPreviousSymbolType == SVX_SYMBOLTYPE_BRUSHITEM ) + { //#i31097# Data Point Symbol size changes when a different symbol is choosen(maoyg) + if( aSymbolSize.Width() != aSymbolSize.Height() ) + { + aSize.setWidth( (long)( aSymbolSize.Width() + aSymbolSize.Height() )/2 ); + aSize.setHeight( (long)( aSymbolSize.Width() + aSymbolSize.Height() )/2 ); + aSymbolSize = aSize; + } + } + aCtlPreview.SetSymbol(&aSymbolGraphic,aSymbolSize); + } + else + { + aSymbolGraphic=Graphic(); + aCtlPreview.SetSymbol(NULL,aSymbolSize); + bEnable=sal_False; + } + aSymbolLastSize=aSymbolSize; + SetMetricValue(aSymbolWidthMF, aSymbolSize.Width(), ePoolUnit); + SetMetricValue(aSymbolHeightMF, aSymbolSize.Height(), ePoolUnit); + aSymbolRatioCB.Enable(bEnable); + aSymbolHeightFT.Enable(bEnable); + aSymbolWidthFT.Enable(bEnable); + aSymbolWidthMF.Enable(bEnable); + aSymbolHeightMF.Enable(bEnable); + aCtlPreview.Invalidate(); +} + void SvxLineTabPage::FillListboxes() { // Line styles @@ -1647,103 +1747,7 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem) //Handler f�r Menuebutton IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton ) { - sal_uInt16 nItemId = pButton->GetCurItemId(); - const Graphic* pGraphic = 0; - Graphic aGraphic; - String aGrfName; - sal_Bool bResetSize = sal_False; - sal_Bool bEnable=sal_True; - long nPreviousSymbolType = nSymbolType; - - if(nItemId >= MN_GALLERY_ENTRY) - { - if( (nItemId-MN_GALLERY_ENTRY) >= nNumMenuGalleryItems) - { - nSymbolType=nItemId-MN_GALLERY_ENTRY-nNumMenuGalleryItems; //Index der Liste - } - else - { - nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM; - bResetSize = sal_True; - } - SvxBmpItemInfo* pInfo = aGrfBrushItems[ nItemId - MN_GALLERY_ENTRY ]; - pGraphic = pInfo->pBrushItem->GetGraphic(); - } - else switch(nItemId) - { - case MN_SYMBOLS_AUTO: - { - pGraphic=&aAutoSymbolGraphic; - aAutoSymbolGraphic.SetPrefSize( Size(253,253) ); - nSymbolType=SVX_SYMBOLTYPE_AUTO; - } - break; - - case MN_SYMBOLS_NONE: - { - nSymbolType=SVX_SYMBOLTYPE_NONE; - pGraphic=NULL; - bEnable=sal_False; - } - break; - default: - { - SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_STR_EDIT_GRAPHIC)); - aGrfDlg.EnableLink(sal_False); - aGrfDlg.AsLink(sal_False); - if( !aGrfDlg.Execute() ) - { - // ausgewaehlten Filter merken - aGrfName = aGrfDlg.GetPath(); - if( !aGrfDlg.GetGraphic(aGraphic) ) - { - nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM; - pGraphic = &aGraphic; - bResetSize = sal_True; - } - } - if( !pGraphic ) - return 0; - } - break; - } - - if(pGraphic) - { - Size aSize = SvxNumberFormat::GetGraphicSizeMM100(pGraphic); - aSize = OutputDevice::LogicToLogic(aSize, MAP_100TH_MM, (MapUnit)ePoolUnit); - aSymbolGraphic=*pGraphic; - if( bResetSize ) - { - aSymbolSize=aSize; - } - else if( nPreviousSymbolType == SVX_SYMBOLTYPE_BRUSHITEM ) - { //#i31097# Data Point Symbol size changes when a different symbol is choosen(maoyg) - if( aSymbolSize.Width() != aSymbolSize.Height() ) - { - aSize.setWidth( (long)( aSymbolSize.Width() + aSymbolSize.Height() )/2 ); - aSize.setHeight( (long)( aSymbolSize.Width() + aSymbolSize.Height() )/2 ); - aSymbolSize = aSize; - } - } - aCtlPreview.SetSymbol(&aSymbolGraphic,aSymbolSize); - } - else - { - aSymbolGraphic=Graphic(); - aCtlPreview.SetSymbol(NULL,aSymbolSize); - bEnable=sal_False; - } - aSymbolLastSize=aSymbolSize; - SetMetricValue(aSymbolWidthMF, aSymbolSize.Width(), ePoolUnit); - SetMetricValue(aSymbolHeightMF, aSymbolSize.Height(), ePoolUnit); - aSymbolRatioCB.Enable(bEnable); - aSymbolHeightFT.Enable(bEnable); - aSymbolWidthFT.Enable(bEnable); - aSymbolWidthMF.Enable(bEnable); - aSymbolHeightMF.Enable(bEnable); - aCtlPreview.Invalidate(); - + SymbolSelected(pButton); return 0; } IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField) commit 1b7bfb7b36964116138d2abd4e2b6aa07b6ef1e2 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Mon Mar 26 14:30:29 2012 -0400 UniString to rtl::OUString. diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 7d0793a..82df291 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -140,9 +140,8 @@ private: FixedText aSymbolHeightFT; MetricField aSymbolHeightMF; CheckBox aSymbolRatioCB; - std::vector<String> aGrfNames; + std::vector<rtl::OUString> aGrfNames; SvxBmpItemInfoList aGrfBrushItems; - String sNumCharFmtName; sal_Bool bLastWidthModified; Size aSymbolLastSize; Graphic aSymbolGraphic; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index bbedaa8..1c13358 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1462,19 +1462,17 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); PopupMenu* pPopup = new PopupMenu; - String aEmptyStr; - const String *pUIName = NULL; + rtl::OUString aEmptyStr; + const rtl::OUString *pUIName = NULL; sal_uInt32 i = 0; - for(std::vector<String>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) + for(std::vector<rtl::OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) { pUIName = &(*it); // convert URL encodings to UI characters (eg %20 for spaces) - String aPhysicalName; - rtl::OUString sTmp; - if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( *it, sTmp )) + rtl::OUString aPhysicalName; + if (utl::LocalFileHelper::ConvertURLToPhysicalName(*it, aPhysicalName)) { - aPhysicalName = sTmp; pUIName = &aPhysicalName; } @@ -1536,7 +1534,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) pView->ShowSdrPage(pPage); PopupMenu* pPopup = new PopupMenu; - String aEmptyStr; + rtl::OUString aEmptyStr; // Generate invisible square to give all symbols a // bitmap size, which is indepedent from specific glyph diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx index c8ca021..ada3a75 100644 --- a/svx/inc/svx/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -231,6 +231,7 @@ public: // FillObjList is filling rObjList with Strings of the internal Gallery Object URL static sal_Bool FillObjList( const String& rThemeName, std::vector<String> &rObjList ); static sal_Bool FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList ); + static bool FillObjList( const sal_uInt32 nThemeId, std::vector<rtl::OUString> &rObjList ); // FillObjTitleList is filling the rList with the title for each gallery object static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList ); diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 45dccd6..45b7b5a 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -153,6 +153,23 @@ sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<St return FillObjList( pGal->GetThemeName( nThemeId ), rObjList ); } +bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<rtl::OUString> &rObjList ) +{ + std::vector<String> aObjList; + if (!FillObjList(nThemeId, aObjList)) + return false; + + // Convert UniString to rtl::OUString. + std::vector<rtl::OUString> aList; + aList.reserve(aObjList.size()); + std::vector<String>::const_iterator it = aObjList.begin(), itEnd = aObjList.end(); + for (; it != itEnd; ++it) + aList.push_back(*it); + + rObjList.swap(aList); + return true; +} + // ------------------------------------------------------------------------ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList ) commit 98add982f5fe7e30855b5ecf5495ecfa31533852 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Mon Mar 26 14:11:02 2012 -0400 Attempt to translate some German comments, but not all. diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index e974684..bbedaa8 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -158,10 +158,10 @@ SvxLineTabPage::SvxLineTabPage aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE))); - // diese Page braucht ExchangeSupport + // This Page requires ExchangeSupport SetExchangeSupport(); - // Metrik einstellen + // Metric set FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs ); switch ( eFUnit ) @@ -214,7 +214,7 @@ SvxLineTabPage::SvxLineTabPage Link aEdgeStyle = LINK( this, SvxLineTabPage, ChangeEdgeStyleHdl_Impl ); maLBEdgeStyle.SetSelectHdl( aEdgeStyle ); - //#58425# Symbole auf einer Linie (z.B. StarChart) , MB-Handler setzen + // Symbols on a line (eg star charts), MB-handler set aSymbolMB.SetSelectHdl(LINK(this, SvxLineTabPage, GraphicHdl_Impl)); aSymbolMB.SetActivateHdl(LINK(this, SvxLineTabPage, MenuCreateHdl_Impl)); aSymbolWidthMF.SetModifyHdl(LINK(this, SvxLineTabPage, SizeHdl_Impl)); @@ -224,13 +224,13 @@ SvxLineTabPage::SvxLineTabPage aSymbolRatioCB.Check(sal_True); ShowSymbolControls(sal_False); - // #63083# nActLineWidth = -1; } -//#58425# Symbole auf einer Linie (z.B. StarChart) , Symbol-Controls aktivieren void SvxLineTabPage::ShowSymbolControls(sal_Bool bOn) { + // Symbols on a line (eg star charts), symbol-enable controls + bSymbols=bOn; aSymbolWidthFT.Show(bOn); aSymbolWidthMF.Show(bOn); @@ -241,10 +241,11 @@ void SvxLineTabPage::ShowSymbolControls(sal_Bool bOn) aSymbolMB.Show(bOn); aCtlPreview.ShowSymbol(bOn); } -// ----------------------------------------------------------------------- -//#58425# Symbole auf einer Linie (z.B. StarChart) , dtor neu! + SvxLineTabPage::~SvxLineTabPage() { + //Symbols on a line (eg star charts), dtor new! + delete aSymbolMB.GetPopupMenu()->GetPopupMenu( MN_GALLERY ); if(pSymbolList) @@ -259,20 +260,20 @@ SvxLineTabPage::~SvxLineTabPage() } void SvxLineTabPage::Construct() { - // Farbtabelle + // Color chart aLbColor.Fill( pColorList ); FillListboxes(); } void SvxLineTabPage::FillListboxes() { - // Linienstile + // Line styles sal_uInt16 nOldSelect = aLbLineStyle.GetSelectEntryPos(); aLbLineStyle.FillStyles(); aLbLineStyle.Fill( pDashList ); aLbLineStyle.SelectEntryPos( nOldSelect ); - // LinienEndenStile + // Line end style String sNone( SVX_RES( RID_SVXSTR_NONE ) ); nOldSelect = aLbStartStyle.GetSelectEntryPos(); aLbStartStyle.Clear(); @@ -298,7 +299,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) sal_uInt16 nPos; sal_uInt16 nCount; - // Dashliste + // Dash list if( ( *pnDashListState & CT_MODIFIED ) || ( *pnDashListState & CT_CHANGED ) ) { @@ -307,7 +308,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) GetNewDashList(); *pnDashListState = CT_NONE; - // Styleliste + // Style list nPos = aLbLineStyle.GetSelectEntryPos(); aLbLineStyle.Clear(); commit 34ab87b37d1a7437d0a5a6c670847ef327d00d86 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Mon Mar 26 14:06:56 2012 -0400 Removed use of UniString. diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index ecd2435..7bce2ca 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -381,81 +381,81 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, switch (eObjectType) { case OBJECTTYPE_TITLE: - AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_BORDER))); - AddTabPage(RID_SVXPAGE_AREA, String(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, String(SchResId(STR_PAGE_TRANSPARENCY))); - AddTabPage(RID_SVXPAGE_CHAR_NAME, String(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, String(SchResId(STR_PAGE_FONT_EFFECTS))); - AddTabPage(TP_ALIGNMENT, String(SchResId(STR_PAGE_ALIGNMENT)), SchAlignmentTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER))); + AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); + AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); + AddTabPage(TP_ALIGNMENT, ResId::toString(SchResId(STR_PAGE_ALIGNMENT)), SchAlignmentTabPage::Create, NULL); if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage(RID_SVXPAGE_PARA_ASIAN, String(SchResId(STR_PAGE_ASIAN))); + AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN))); break; case OBJECTTYPE_LEGEND: - AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_BORDER))); - AddTabPage(RID_SVXPAGE_AREA, String(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, String(SchResId(STR_PAGE_TRANSPARENCY))); - AddTabPage(RID_SVXPAGE_CHAR_NAME, String(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, String(SchResId(STR_PAGE_FONT_EFFECTS))); - AddTabPage(TP_LEGEND_POS, String(SchResId(STR_PAGE_POSITION)), SchLegendPosTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER))); + AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); + AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); + AddTabPage(TP_LEGEND_POS, ResId::toString(SchResId(STR_PAGE_POSITION)), SchLegendPosTabPage::Create, NULL); if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage(RID_SVXPAGE_PARA_ASIAN, String(SchResId(STR_PAGE_ASIAN))); + AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN))); break; case OBJECTTYPE_DATA_SERIES: case OBJECTTYPE_DATA_POINT: if( m_pParameter->ProvidesSecondaryYAxis() || m_pParameter->ProvidesOverlapAndGapWidth() || m_pParameter->ProvidesMissingValueTreatments() ) - AddTabPage(TP_OPTIONS, String(SchResId(STR_PAGE_OPTIONS)),SchOptionTabPage::Create, NULL); + AddTabPage(TP_OPTIONS, ResId::toString(SchResId(STR_PAGE_OPTIONS)),SchOptionTabPage::Create, NULL); if( m_pParameter->ProvidesStartingAngle()) - AddTabPage(TP_POLAROPTIONS, String(SchResId(STR_PAGE_OPTIONS)),PolarOptionsTabPage::Create, NULL); + AddTabPage(TP_POLAROPTIONS, ResId::toString(SchResId(STR_PAGE_OPTIONS)),PolarOptionsTabPage::Create, NULL); if( m_pParameter->HasGeometryProperties() ) - AddTabPage(TP_LAYOUT, String(SchResId(STR_PAGE_LAYOUT)),SchLayoutTabPage::Create, NULL); + AddTabPage(TP_LAYOUT, ResId::toString(SchResId(STR_PAGE_LAYOUT)),SchLayoutTabPage::Create, NULL); if(m_pParameter->HasAreaProperties()) { - AddTabPage(RID_SVXPAGE_AREA, String(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, String(SchResId(STR_PAGE_TRANSPARENCY))); + AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); } - AddTabPage(RID_SVXPAGE_LINE, String(SchResId( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE ))); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE ))); break; case OBJECTTYPE_DATA_LABEL: case OBJECTTYPE_DATA_LABELS: - AddTabPage(TP_DATA_DESCR, String(SchResId(STR_OBJECT_DATALABELS)), DataLabelsTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_CHAR_NAME, String(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, String(SchResId(STR_PAGE_FONT_EFFECTS))); + AddTabPage(TP_DATA_DESCR, ResId::toString(SchResId(STR_OBJECT_DATALABELS)), DataLabelsTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage(RID_SVXPAGE_PARA_ASIAN, String(SchResId(STR_PAGE_ASIAN))); + AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN))); break; case OBJECTTYPE_AXIS: { if( m_pParameter->HasScaleProperties() ) - AddTabPage(TP_SCALE, String(SchResId(STR_PAGE_SCALE)), ScaleTabPage::Create, NULL); + AddTabPage(TP_SCALE, ResId::toString(SchResId(STR_PAGE_SCALE)), ScaleTabPage::Create, NULL); if( m_pParameter->HasScaleProperties() )//no positioning page for z axes so far as the tickmarks are not shown so far - AddTabPage(TP_AXIS_POSITIONS, String(SchResId(STR_PAGE_POSITIONING)), AxisPositionsTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_LINE))); - AddTabPage(TP_AXIS_LABEL, String(SchResId(STR_OBJECT_LABEL)), SchAxisLabelTabPage::Create, NULL); + AddTabPage(TP_AXIS_POSITIONS, ResId::toString(SchResId(STR_PAGE_POSITIONING)), AxisPositionsTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); + AddTabPage(TP_AXIS_LABEL, ResId::toString(SchResId(STR_OBJECT_LABEL)), SchAxisLabelTabPage::Create, NULL); if( m_pParameter->HasNumberProperties() ) - AddTabPage(RID_SVXPAGE_NUMBERFORMAT, String(SchResId(STR_PAGE_NUMBERS))); - AddTabPage(RID_SVXPAGE_CHAR_NAME, String(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, String(SchResId(STR_PAGE_FONT_EFFECTS))); + AddTabPage(RID_SVXPAGE_NUMBERFORMAT, ResId::toString(SchResId(STR_PAGE_NUMBERS))); + AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage(RID_SVXPAGE_PARA_ASIAN, String(SchResId(STR_PAGE_ASIAN))); + AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN))); break; } case OBJECTTYPE_DATA_ERRORS_X: - AddTabPage(TP_XERRORBAR, String(SchResId(STR_PAGE_XERROR_BARS)), ErrorBarsTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_LINE))); + AddTabPage(TP_XERRORBAR, ResId::toString(SchResId(STR_PAGE_XERROR_BARS)), ErrorBarsTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); break; case OBJECTTYPE_DATA_ERRORS_Y: - AddTabPage(TP_YERRORBAR, String(SchResId(STR_PAGE_YERROR_BARS)), ErrorBarsTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_LINE))); + AddTabPage(TP_YERRORBAR, ResId::toString(SchResId(STR_PAGE_YERROR_BARS)), ErrorBarsTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); break; case OBJECTTYPE_DATA_ERRORS_Z: @@ -465,12 +465,12 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, case OBJECTTYPE_SUBGRID: case OBJECTTYPE_DATA_AVERAGE_LINE: case OBJECTTYPE_DATA_STOCK_RANGE: - AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_LINE))); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); break; case OBJECTTYPE_DATA_CURVE: - AddTabPage(TP_TRENDLINE, String(SchResId(STR_PAGE_TRENDLINE_TYPE)), TrendlineTabPage::Create, NULL); - AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_LINE))); + AddTabPage(TP_TRENDLINE, ResId::toString(SchResId(STR_PAGE_TRENDLINE_TYPE)), TrendlineTabPage::Create, NULL); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE))); break; case OBJECTTYPE_DATA_STOCK_LOSS: @@ -479,9 +479,9 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, case OBJECTTYPE_DIAGRAM_FLOOR: case OBJECTTYPE_DIAGRAM_WALL: case OBJECTTYPE_DIAGRAM: - AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_BORDER))); - AddTabPage(RID_SVXPAGE_AREA, String(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, String(SchResId(STR_PAGE_TRANSPARENCY))); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER))); + AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); break; case OBJECTTYPE_LEGEND_ENTRY: @@ -490,17 +490,17 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, // nothing break; case OBJECTTYPE_DATA_CURVE_EQUATION: - AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_BORDER))); - AddTabPage(RID_SVXPAGE_AREA, String(SchResId(STR_PAGE_AREA))); - AddTabPage(RID_SVXPAGE_TRANSPARENCE, String(SchResId(STR_PAGE_TRANSPARENCY))); - AddTabPage(RID_SVXPAGE_CHAR_NAME, String(SchResId(STR_PAGE_FONT))); - AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, String(SchResId(STR_PAGE_FONT_EFFECTS))); - AddTabPage(RID_SVXPAGE_NUMBERFORMAT, String(SchResId(STR_PAGE_NUMBERS))); + AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER))); + AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA))); + AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY))); + AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT))); + AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS))); + AddTabPage(RID_SVXPAGE_NUMBERFORMAT, ResId::toString(SchResId(STR_PAGE_NUMBERS))); if( SvtLanguageOptions().IsCTLFontEnabled() ) /* When rotation is supported for equation text boxes, use SchAlignmentTabPage::Create here. The special SchAlignmentTabPage::CreateWithoutRotation can be deleted. */ - AddTabPage(TP_ALIGNMENT, String(SchResId(STR_PAGE_ALIGNMENT)), SchAlignmentTabPage::CreateWithoutRotation, NULL); + AddTabPage(TP_ALIGNMENT, ResId::toString(SchResId(STR_PAGE_ALIGNMENT)), SchAlignmentTabPage::CreateWithoutRotation, NULL); break; default: break;
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits