From 7eaabb2db296e2bdb67d633dd68209f23167243e Mon Sep 17 00:00:00 2001 From: Rafael Dominguez Date: Sun, 5 Aug 2012 07:59:38 -0430 Subject: [PATCH] Remove create template menu and associated icons. Change-Id: Ifb2c2a640de7961ef215c9359f53218cee9c9c0e --- icon-themes/galaxy/sfx2/res/create_draw.png | Bin 1178 -> 0 bytes .../galaxy/sfx2/res/create_present.png | Bin 1055 -> 0 bytes icon-themes/galaxy/sfx2/res/create_sheet.png | Bin 1069 -> 0 bytes icon-themes/galaxy/sfx2/res/create_text.png | Bin 973 -> 0 bytes sfx2/inc/templatedlg.hxx | 1 - sfx2/source/doc/templatedlg.cxx | 65 ------------------ sfx2/source/doc/templatedlg.hrc | 11 --- sfx2/source/doc/templatedlg.src | 63 ----------------- 8 files changed, 140 deletions(-) delete mode 100644 icon-themes/galaxy/sfx2/res/create_draw.png delete mode 100644 icon-themes/galaxy/sfx2/res/create_present.png delete mode 100644 icon-themes/galaxy/sfx2/res/create_sheet.png delete mode 100644 icon-themes/galaxy/sfx2/res/create_text.png diff --git a/icon-themes/galaxy/sfx2/res/create_draw.png b/icon-themes/galaxy/sfx2/res/create_draw.png deleted file mode 100644 index f99e50310d0b47afadd94dc4b50ddb5ec44daa7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1178 zcmV;L1ZDe)P)K-5_qJW{y_?Vv4m{^M=lnkB`~98gJVHtdz^Ps0u**p`(}Zbq`JW&yPpp;;; z<)k)oUMRwm#c#-^vA#X_;83Y9TXB6l4tj8~aNuOk$46U5){=VJ9M(ANnw?c!GVgKh z>MQ^ZLucUp{wbS|gDeX)O(QQaFD)pjsuWj!h1tDq%i$eDEL|fTkG2Z8=x3P#wGQ#eq=PHlF-4au>9b<1K0Ya+}!v)LPka^{>bWgM$M%Sr@O-WJR%)m`<6dX?Q#y zOtT#0zP%VdFTZ!FMTq6=P&Si7N{RgZTY^ zOw*)aZ^d=yxq6@_X^j#OgS1S(+we3_Me^VaZ<1Y5%J|hk`T6iZf>$oGaP6mrLZP^_ zKp?=JIdkai>jRkb<)^Jt-+>QNF{pg;Ex6Ll@X=k!;oqoweKYs2+JdHO^k3-Yn?1F0 z7(_Rm_#I7AB!rlvXsG)T_doj@W50A0=>IV~rn*q>szTRI&UJmnnd41_LLr<^C*g1y zh~`Oq1u07Gp0cnki@@*zS-xUImwExns$7Y;ZY#l1gl{_<_~}$LHH(}8*lf0VZ52gH zt!OeRrpT3B#Q4Y%8UFb=?ykbMU>RfAM>(&XrlZEVMIW^rxg50161AVXZFx>CiiI2q-UTFK$pq{)7gX%z*+baj2U@R3`hq=`_3 sDF6Tf diff --git a/icon-themes/galaxy/sfx2/res/create_present.png b/icon-themes/galaxy/sfx2/res/create_present.png deleted file mode 100644 index f3e7e2671a8197ad40e252d178aa3a56052824be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1055 zcmV+)1mOFLP)z!XI|E=P0$?QqpgjYJGXrKP0%<4$ zYbgS5DFSdR0&^<@bu0pSEdqKj0(~z6e=q`qF#?1#1BWvMi8KR@H3N<|1CcialsE&F zNgkFt1D8u5nK}cSOdp#&1Ds7Co;(AeP9UH?1ENnLqdfzoJ_Dsb1Eok2rBNZLK?SE# zAgDkCszU~_K*y1Ki&yS=@=zO}EuzP`V|zreu2!bk$b!otM5w8X^3#>U3Sy|>87$jM3q%F4>i zO99JE0?TbO%gf8nOaabb7S6-H&#IKq&(G4wz|(a;)MFgfWF6FZLDbaL*rtfs&Boe! zLE75d+|bG1w4C3zp5Nc!;nmLK;^O1EoaDZy<>lq(!>#7p)92^s=;-L_zoY5FsOjnH z>gww2!l>)Yx9jWc?8&n1?CkCB?eEUH@9*#Mo^SBWv+(fn@zule@$vG|y7Kb!^W@v} z^YirA#q{Rh^z`)g=ic?_-}UwN_SC@k-_Z8x-}d(Q_vzsG_xJegDGlkD{`+yuaq^DN)oq00046Nkl)6gH2~n!#y+hdP8X zzMIqA(Q(}J7s_apk$lfu>ZzKuW)w~a2pP3W0PqLet8)H&rKbIylr4!K(JShzaU)|n zX~de0s%5!;i+<>ku{|S`$&%c@|MX^*CTL4&HKS(b;q%2(s~~938zYY&mQ?2;(2_-y zNThO7PmOLbqqH?pmE@(CQHOE}v^KiXay2=0upxu5_tj>ZUqy30uz1$6MzB~f&vtU0u+Y>6o~^B zivtyo0~L@17Lo%Nlmix*0~cNk7nuVWn*$e}0~nwK7@`9ic?ub!1R8A(8lwanr34#h z5FUIFAG`=4ZWJJd5Fx?|A;SqF#0Vk92qbnFC4d(tr4c5N7ASrkDv}y4h9E7L9xa<3 zE|?!LlOQjfA1|CAFp45Dpdc}#ATg#OGNmCirXe$`AvUNbH=!swvL`>dEkM03L&Gps z&q7$xMp@NHm(Guy+L4{$ldQR_vA?ghw6wLgwYJ2xx3{;sxw*Q!y1K}>ySux+y}iD^ zzQ4b}z`(%3&b`9I!o$+Q#KgqL#>U9V$jR8o%F4>i%gfB%$%+;=;-L_ z>FMg~>g((4?Ck9A?d|XH@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T68$;_*O{31NCQ&;TB1w$);9ipo*nau0To05T>VB|+c-U#9rGnw3dyeAjE~=(9o(-a zGNEL;daHQ!_Q&B2Db*Dg%uIi zP+V&E)4#CIy7#Hkx=*CW@qhxN?p&xrs7c+<^w;ahRbkhA0uaoI^vf?h)O+Audk)%j z(w1-~d1Rk1d-i}m`)9(Bq>6>i?assQyyC}^REEMOGwI3zRYqy00000NkvXXu0mjfAa(hG diff --git a/icon-themes/galaxy/sfx2/res/create_text.png b/icon-themes/galaxy/sfx2/res/create_text.png deleted file mode 100644 index 35bc877ef401006bc21670955ec41018bd3b4a09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 973 zcmV;;12X)HP)tgacWO16z#)U62D_lLK0d17w;5WSas$U;;j1181KDSBC+D%K?JS z0zzg2Lumpwi33`U16+;+U6BJ{lLKIu17es1WSawJodai}18AZHX`%yar2}iH1XF(nWt#JP3t*8BRelb2un&O15Ltr}Z>17$q7`$g7KX(blGhrH&K#NG9%+;xYnLBwnjdbP zAaI``a-kq~rXh8uA$Y1fIyyT%JU*S%L7&t?qS{1AN=QypNl8h0j+ua*tAe1gg`~Ba z!`Z3Y^{LzTslq)=jZ6?=;`U{>gww2>+9_7?CtIC@9*#M@bK~R@$&NW^Yioc^z`-h_4fAm_xJbs z`1twx`TF|$`}_O;{{H{}|A)G~eEDGlkD{`+ zyuaq^DN)oq0003*Nkl^mdVxUF zD53{w6J(n}XyL;C*hnDF_1@EB?u;Xz<^Ayc-E%UqRl&{hV@|mW@HU1F?489leYyUd zZ4^DkMkKoEC|kGP->3Q{V3&yI7y#5-v8K9TgSrIb$hwf&bz42@eGh69lOWDy)9$x# zC$E(iLL_hI$M-+a`J^ze1Y0n=`7r%-WRet!E{SP8299)!Fj5wK(9`kqw(I+fqdP#1 zITu?VMHC{Z0K&G;c?@SeAEi-Jc;owuCPuWUFobS-?IE2grL~eAf~VaY3hDd4qCo&M zMNsj{9?}AkLw5jPih5a3xp%8O3-YloQe&42`)ZMrHkk#{W@(Z_1y=M7|~d*k_G+&a-FWr?fMM600000NkvXXu0mjf>7UQC diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx index e22fe8c8164e..ffbfc31f3eb2 100644 --- a/sfx2/inc/templatedlg.hxx +++ b/sfx2/inc/templatedlg.hxx @@ -120,7 +120,6 @@ private: TemplateAbstractView *mpCurView; TemplateLocalView *maView; TemplateOnlineView *mpOnlineView; - PopupMenu *mpCreateMenu; PopupMenu *mpActionMenu; PopupMenu *mpRepositoryMenu; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 0b851a23c712..5c1b6665c760 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -109,13 +109,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) maButtonSelMode.SetStyle(maButtonSelMode.GetStyle() | WB_TOGGLE); // Create popup menus - mpCreateMenu = new PopupMenu; - mpCreateMenu->InsertItem(MNI_CREATE_TEXT,SfxResId(STR_CREATE_TEXT).toString(),SfxResId(IMG_CREATE_TEXT)); - mpCreateMenu->InsertItem(MNI_CREATE_SHEET,SfxResId(STR_CREATE_SHEET).toString(),SfxResId(IMG_CREATE_SHEET)); - mpCreateMenu->InsertItem(MNI_CREATE_PRESENT,SfxResId(STR_CREATE_PRESENT).toString(),SfxResId(IMG_CREATE_PRESENT)); - mpCreateMenu->InsertItem(MNI_CREATE_DRAW,SfxResId(STR_CREATE_DRAW).toString(),SfxResId(IMG_CREATE_DRAW)); - mpCreateMenu->SetSelectHdl(LINK(this, SfxTemplateManagerDlg, MenuSelectHdl)); - mpActionMenu = new PopupMenu; mpActionMenu->InsertItem(MNI_ACTION_SORT_NAME,SfxResId(STR_ACTION_SORT_NAME).toString(),SfxResId(IMG_ACTION_SORT)); mpActionMenu->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl)); @@ -154,7 +147,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) // Set toolbox button bits mpViewBar->EnableItem(TBI_TEMPLATE_IMPORT,false); - mpViewBar->SetItemBits(TBI_TEMPLATE_CREATE, TIB_DROPDOWNONLY); mpViewBar->SetItemBits(TBI_TEMPLATE_REPOSITORY, TIB_DROPDOWNONLY); mpActionBar->SetItemBits(TBI_TEMPLATE_ACTION, TIB_DROPDOWNONLY); mpTemplateBar->SetItemBits(TBI_TEMPLATE_MOVE,TIB_DROPDOWNONLY); @@ -268,7 +260,6 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg () delete mpSearchView; delete maView; delete mpOnlineView; - delete mpCreateMenu; delete mpActionMenu; delete mpRepositoryMenu; } @@ -398,16 +389,6 @@ IMPL_LINK(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox) switch(nCurItemId) { - case TBI_TEMPLATE_CREATE: - pBox->SetItemDown( nCurItemId, true ); - - mpCreateMenu->Execute(pBox,pBox->GetItemRect(TBI_TEMPLATE_CREATE), - POPUPMENU_EXECUTE_DOWN); - - pBox->SetItemDown( nCurItemId, false ); - pBox->EndSelection(); - pBox->Invalidate(); - break; case TBI_TEMPLATE_ACTION: pBox->SetItemDown( nCurItemId, true ); @@ -527,22 +508,6 @@ IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu) switch(nMenuId) { - case MNI_CREATE_TEXT: - lcl_createTemplate(mxDesktop,FILTER_APP_WRITER); - Close( ); - break; - case MNI_CREATE_SHEET: - lcl_createTemplate(mxDesktop,FILTER_APP_CALC); - Close( ); - break; - case MNI_CREATE_PRESENT: - lcl_createTemplate(mxDesktop,FILTER_APP_IMPRESS); - Close( ); - break; - case MNI_CREATE_DRAW: - lcl_createTemplate(mxDesktop,FILTER_APP_DRAW); - Close( ); - break; case MNI_ACTION_SORT_NAME: if (maView->isOverlayVisible()) maView->sortOverlayItems(SortView_Name()); @@ -1087,34 +1052,4 @@ void SfxTemplateManagerDlg::localSearchMoveTo(sal_uInt16 nMenuId) SearchUpdateHdl(mpSearchEdit); } -void lcl_createTemplate(uno::Reference< com::sun::star::frame::XComponentLoader > xDesktop, - const FILTER_APPLICATION eApp) -{ - rtl::OUString aURL; - - switch(eApp) - { - case FILTER_APP_WRITER: - aURL = "private:factory/swriter"; - break; - case FILTER_APP_CALC: - aURL = "private:factory/scalc"; - break; - case FILTER_APP_IMPRESS: - aURL = "private:factory/simpress"; - break; - case FILTER_APP_DRAW: - aURL = "private:factory/sdraw"; - break; - default: - break; - } - - if (!aURL.isEmpty()) - { - uno::Sequence aArgs; - xDesktop->loadComponentFromURL(aURL,rtl::OUString("_default"), 0, aArgs ); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc index c489a309b859..810d03d0dcbe 100644 --- a/sfx2/source/doc/templatedlg.hrc +++ b/sfx2/source/doc/templatedlg.hrc @@ -16,7 +16,6 @@ #define TEMPLATE_VIEW 7 #define TBX_ACTION_VIEW 8 -#define TBI_TEMPLATE_CREATE 9 #define TBI_TEMPLATE_IMPORT 10 #define TBX_ACTION_ACTION 11 @@ -29,11 +28,6 @@ #define TBI_TEMPLATE_MOVE 17 #define TBI_TEMPLATE_DELETE 18 -#define MNI_CREATE_TEXT 19 -#define MNI_CREATE_SHEET 20 -#define MNI_CREATE_PRESENT 21 -#define MNI_CREATE_DRAW 22 - #define MNI_ACTION_SORT_NAME 23 #define BTN_TEMPLATE_CLOSE 24 @@ -41,11 +35,6 @@ #define TBI_TEMPLATE_FOLDER_DEL 25 #define TBI_TEMPLATE_REPOSITORY 26 -#define STR_CREATE_TEXT 260 -#define STR_CREATE_SHEET 261 -#define STR_CREATE_PRESENT 262 -#define STR_CREATE_DRAW 263 - #define STR_ACTION_SORT_NAME 264 #define MNI_MOVE_NEW 265 diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src index f396bac45bcb..d973e46adb1b 100644 --- a/sfx2/source/doc/templatedlg.src +++ b/sfx2/source/doc/templatedlg.src @@ -10,26 +10,6 @@ #include "templatedlg.hrc" #include "helpid.hrc" -String STR_CREATE_TEXT -{ - Text [ en-US ] = "Text Document Template"; -}; - -String STR_CREATE_SHEET -{ - Text [ en-US ] = "Spreedsheet Template"; -}; - -String STR_CREATE_PRESENT -{ - Text [ en-US ] = "Presentation Template"; -}; - -String STR_CREATE_DRAW -{ - Text [ en-US ] = "Drawing Template"; -}; - String STR_ACTION_SORT_NAME { Text [ en-US ] = "Sort by name"; @@ -135,38 +115,6 @@ ModelessDialog DLG_TEMPLATE_MANAGER TabStop = TRUE; }; - Image IMG_CREATE_TEXT - { - ImageBitmap = Bitmap - { - File = "create_text.png"; - }; - }; - - Image IMG_CREATE_SHEET - { - ImageBitmap = Bitmap - { - File = "create_sheet.png"; - }; - }; - - Image IMG_CREATE_PRESENT - { - ImageBitmap = Bitmap - { - File = "create_present.png"; - }; - }; - - Image IMG_CREATE_DRAW - { - ImageBitmap = Bitmap - { - File = "create_draw.png"; - }; - }; - Image IMG_ACTION_SORT { ImageBitmap = Bitmap @@ -184,17 +132,6 @@ ModelessDialog DLG_TEMPLATE_MANAGER ItemList = { - ToolBoxItem - { - Identifier = TBI_TEMPLATE_CREATE; - Text [ en-US ] = "Create" ; - - ItemImage = Image - { - ImageBitmap = Bitmap { File = "create_text.png" ; }; - }; - }; - ToolBoxItem { Identifier = TBI_TEMPLATE_REPOSITORY;