[PATCH] remove thesaurus / vendor image functionality & legacy fallback images
Michael Meeks
michael.meeks at suse.com
Tue Apr 17 05:31:17 PDT 2012
---
cui/source/dialogs/thesdlg.cxx | 134 ------------------------------
cui/source/dialogs/thesdlg.src | 12 ---
cui/source/dialogs/thesdlg_impl.hxx | 4 -
icon-themes/galaxy/svx/res/vendor01.png | Bin 2948 -> 0 bytes
icon-themes/galaxy/svx/res/vendor01h.png | Bin 2949 -> 0 bytes
unotools/inc/unotools/lingucfg.hxx | 1 -
unotools/source/config/lingucfg.cxx | 44 ----------
7 files changed, 0 insertions(+), 195 deletions(-)
delete mode 100644 icon-themes/galaxy/svx/res/vendor01.png
delete mode 100644 icon-themes/galaxy/svx/res/vendor01h.png
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 17db923..c7aafb0 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -47,7 +47,6 @@
#include <editeng/unolingu.hxx>
#include <svx/langbox.hxx>
#include <svtools/langtab.hxx>
-#include <unotools/lingucfg.hxx>
#include <i18npool/mslangid.hxx>
#include <comphelper/processfactory.hxx>
#include <osl/file.hxx>
@@ -256,7 +255,6 @@ void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect )
SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) :
m_pDialog ( pDialog ),
- aVendorImageFI ( pDialog, CUI_RES( IMG_VENDOR ) ),
aLeftBtn ( pDialog, CUI_RES( BTN_LEFT ) ),
aWordText ( pDialog, CUI_RES( FT_WORD ) ),
aWordCB ( pDialog, CUI_RES( CB_WORD ), *this ),
@@ -270,7 +268,6 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog )
aReplaceBtn ( pDialog, CUI_RES( BTN_THES_OK ) ),
aCancelBtn ( pDialog, CUI_RES( BTN_THES_CANCEL ) ),
aErrStr ( CUI_RES( STR_ERR_TEXTNOTFOUND ) ),
- aVendorDefaultImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
xThesaurus ( NULL ),
aLookUpText (),
nLookUpLanguage ( LANGUAGE_NONE ),
@@ -285,8 +282,6 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog )
aLangMBtn.SetSelectHdl( LINK( this, SvxThesaurusDialog_Impl, LanguageHdl_Impl ) );
m_pAlternativesCT->SetSelectHdl( LINK( this, SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl ));
m_pAlternativesCT->SetDoubleClickHdl( LINK( this, SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl ));
-
- Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog_Impl, VendorImageInitHdl ) );
}
SvxThesaurusDialog_Impl::~SvxThesaurusDialog_Impl()
@@ -385,7 +380,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn )
if (xThesaurus->hasLocale( SvxCreateLocale( nLang ) ))
nLookUpLanguage = nLang;
m_pDialog->SetWindowTitle( nLang );
- UpdateVendorImage();
LookUp_Impl();
}
return 0;
@@ -473,134 +467,6 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox
return 0;
}
-////////////////////////////////////////////////////////////
-
-static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
-{
- Image aRes;
-
- OUString aTmp;
- osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
-
- Graphic aGraphic;
- const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
- if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic, NULL, NULL ) )
- {
- aRes = Image( aGraphic.GetBitmapEx() );
- }
- return aRes;
-}
-
-static String lcl_GetThesImplName( const lang::Locale &rLocale )
-{
- String aRes;
-
- uno::Reference< linguistic2::XLinguServiceManager > xLngMgr;
- try
- {
- uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
- xLngMgr = uno::Reference< linguistic2::XLinguServiceManager >( xMSF->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.linguistic2.LinguServiceManager" ))), uno::UNO_QUERY_THROW );
-
- DBG_ASSERT( xLngMgr.is(), "LinguServiceManager missing" );
- if (xLngMgr.is())
- {
- uno::Sequence< OUString > aServiceNames = xLngMgr->getConfiguredServices(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.Thesaurus")), rLocale );
- // there should be at most one thesaurus configured for each language
- DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
- if (aServiceNames.getLength() == 1)
- aRes = aServiceNames[0];
- }
- }
- catch (uno::Exception &e)
- {
- (void) e;
- DBG_ASSERT( 0, "failed to get thesaurus" );
- }
-
- return aRes;
-}
-
-void SvxThesaurusDialog_Impl::UpdateVendorImage()
-{
- m_pDialog->SetUpdateMode( sal_False );
-
- SvtLinguConfig aCfg;
- if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
- {
- Image aImage;
- String sThesImplName( lcl_GetThesImplName( SvxCreateLocale( nLookUpLanguage ) ) );
- OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName ) );
- if (sThesImplName.Len() > 0 && !aThesDialogImageUrl.isEmpty())
- aImage = Image( lcl_GetImageFromPngUrl( aThesDialogImageUrl ) );
- else
- aImage = aVendorDefaultImage;
- aVendorImageFI.SetImage( aImage );
- }
-
- m_pDialog->SetUpdateMode( sal_True );
-}
-
-IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl *, EMPTYARG )
-{
- pThis->m_pDialog->SetUpdateMode( sal_False );
-
- SvtLinguConfig aCfg;
- if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
- {
- Image aImage( pThis->aVendorDefaultImage );
- pThis->aVendorImageFI.SetImage( aImage );
- pThis->aVendorImageFI.Show();
-
- // move down visible controls according to the vendor images height
- Size aVendorSize = pThis->aVendorImageFI.GetSizePixel();
- Size aImageSize = pThis->aVendorImageFI.GetImage().GetSizePixel();
- if (aImageSize.Height())
- {
- aVendorSize.Height() = aImageSize.Height();
- if(aVendorSize.Width() < aImageSize.Width())
- aVendorSize.Width() = aImageSize.Width();
- pThis->aVendorImageFI.SetSizePixel( aVendorSize );
- }
- const sal_Int32 nDiff = aVendorSize.Height();
- pThis->aVendorImageFI.SetSizePixel( aVendorSize );
- Control* aControls[] = {
- &pThis->aLeftBtn,
- &pThis->aWordText,
- &pThis->aWordCB,
- &pThis->m_aAlternativesText,
- pThis->m_pAlternativesCT.get(),
- &pThis->aReplaceText,
- &pThis->aReplaceEdit,
- &pThis->aFL,
- &pThis->aHelpBtn,
- &pThis->aLangMBtn,
- &pThis->aReplaceBtn,
- &pThis->aCancelBtn,
- 0
- };
- sal_Int32 nControl = 0;
- while (aControls[nControl])
- {
- Point aPos = aControls[nControl]->GetPosPixel();
- aPos.Y() += nDiff;
- aControls[nControl]->SetPosPixel(aPos);
- ++nControl;
- }
- Size aDlgSize = pThis->m_pDialog->GetSizePixel();
- aDlgSize.Height() += nDiff;
- pThis->m_pDialog->SetSizePixel( aDlgSize );
- pThis->m_pDialog->Invalidate();
- }
-
- pThis->UpdateVendorImage();
- pThis->m_pDialog->SetUpdateMode( sal_True );
-
- return 0;
-};
-
// class SvxThesaurusDialog ----------------------------------------------
SvxThesaurusDialog::SvxThesaurusDialog(
diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src
index 67fdced..847b4b6 100644
--- a/cui/source/dialogs/thesdlg.src
+++ b/cui/source/dialogs/thesdlg.src
@@ -41,13 +41,6 @@ ModalDialog RID_SVXDLG_THESAURUS
SvLook = TRUE ;
Moveable = TRUE ;
- FixedImage IMG_VENDOR
- {
- Pos = MAP_APPFONT ( 0, 0 ) ;
- Size = MAP_APPFONT ( 235, 0 ) ; // correct size will be applied at runtime
- Hide = TRUE;
- };
-
ImageButton BTN_LEFT
{
HelpID = "cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT";
@@ -137,10 +130,5 @@ ModalDialog RID_SVXDLG_THESAURUS
{
Text [ en-US ] = "No alternatives found." ;
};
-
- Image IMG_DEFAULT_VENDOR
- {
- ImageBitmap = Bitmap { File = "vendor01.png"; };
- };
};
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index 678b125..ece1b53 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -37,7 +37,6 @@
#include <vcl/combobox.hxx>
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
-#include <vcl/image.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/menubtn.hxx>
#include <vcl/msgbox.hxx>
@@ -172,7 +171,6 @@ struct SvxThesaurusDialog_Impl
{
SvxThesaurusDialog * m_pDialog;
- FixedImage aVendorImageFI;
ImageButton aLeftBtn;
FixedText aWordText;
LookUpComboBox_Impl aWordCB;
@@ -187,7 +185,6 @@ struct SvxThesaurusDialog_Impl
CancelButton aCancelBtn;
String aErrStr;
- Image aVendorDefaultImage;
uno::Reference< linguistic2::XThesaurus > xThesaurus;
OUString aLookUpText;
@@ -215,7 +212,6 @@ struct SvxThesaurusDialog_Impl
queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException);
bool UpdateAlternativesBox_Impl();
- void UpdateVendorImage();
void LookUp( const String &rText );
void LookUp_Impl();
};
diff --git a/icon-themes/galaxy/svx/res/vendor01.png b/icon-themes/galaxy/svx/res/vendor01.png
deleted file mode 100644
index 9a71e335da24bbca52f84f534f23cbb9c18fe837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2948
zcmZWrc{r478=o(#DQk7IFCC<mCE3E%NXQT}GR$ZOS;vxfnrx#FS)zn#s%db-a4f^I
zjD0zljHM`Lgc-%eU~D;-kntJL`L6G}zJK2Ld4JD+|9<y#-Oqd9chXJk>q1ARjsgGx
zA&9vN6ae6x-d!6459~g at V)e=Z00B#g$<<r;QFBams?2rSLre9WBQKkp)<%3IT?~U1
zXh*K{C&qPr7d9OiSbF#4cw|hX1L1(isWv5r@@tWPb4~2&nT4X#*dpTCTLeeK&`f5G
zJ%rTJsl2Qekgc}81zy2Mzj(UizpDoTEFI;??k)a)83i8x-_QS|*uHmS%veR6Yun?t
zQU$e7lD(pr=PvG>t}kW{Q80ZrbQxhczx$e}v^2xC%v3zMq9jeRLoC<)m2R6Si&e}m
zrs{eE=d9Z=XgQvrC?i{snozZ1Y&}G|>qN=BWl__kfw{5Nmlh}*uH9tU`9d^CAWccZ
zDx(WLP6{%<=B`JV-8lSbh}>)Z!SR1%gR<j~Ip_SM{|{N#h at 1Nm!s4_v+#X~0u5NH{
ziyi*FzpqSnYP&AZcHmk6+p!x`<OK4_NSXXRJyrPI!e at MXVh79kf){dhR#(s}@x&)`
z%+WsJuOm=5N)Y2%&n5Aggt_dvq==NDR=4m}zP;17G6m|Qh$Ec(>=C_|p$OJQTOCy{
z?AYT^hOtvz*v7{8_gLnpOI~6~a#V9UF&n8yCnP^a5xo?Sr5w+x@~2YBl7#u+eb(cB
z0`3qA=I_$AAuJV8w9YI0Pb5{I!h^54$cCm>Ji{?306DiBd?oAmZQESL<t+0;L9$68
zT_fG(j|~*U{Z6SlOg#Aw4i|Zi;aC%Lli6I^D-reA@@(OxaiCdNw}FG+luJpqFp+Y#
zLFaw at 2-P~T(0srhVHJ{7Gxjf at QY#a|q84E&=b&~D!O at O-MLLvwcmrRgARRZUFrlib
zJMM?GE>X?%vRTy#P(_Y7qGr8FTFZ=lY?Blx4K_MsMWF;Gxje2I<)dm1q$YSONxp77
z-ZOFXj2MsJg~rrEaOiffM{NxPKZzK($*3<^mMaqmC2VXoU_~AsC2CU+x?<6xZmi{v
zNmN>TfF`l)yNPVd?ELnui_&2-QQHhXBt?^~i9=g1gOJ4jh%ln~kza2c<{y#PiPOa8
z#2WH+e(Pio|0&_tAbgQ<$pZa at lU7`BTHE8pPS900iz4Iw-0g-)FMPi^ZB9l!4`{}%
zd568duh6m?9?0glGT)86FbD$@w28}wZK<V&DPL8a%~U31XdXA+WBz(NQ_d3RNlc$}
z%M_PS1ZOKZ%P4YHIj_uVOX|{PcV{7Q62sOvXGEg8ox{|P`R#5>3+U&H{8mFQ3{IFt
zOEu7dt&-v&*B0 at ZvmT$4dly=>E7^FGJCF3i*DFqO`Z+5z-BIB;GMeS-CL?xGxz6?a
z(r at I|jbd at w0!ZeHTveUJH^}Vil%PJ9$5Eq4RwtfgQe}@T{v7XE60q8%k#`CA%#U7k
zX5w`^vkkbRc6oSbA2-?85QPd=%Su&<Y2qAH+2C|SY}|*}aeXjXe)IW#d2R^>%T5qF
zFYWyL`n`#l+2|KJfti)a$QtFPe&B0OvVi&}cFe;wpI)6_X48>^drr`or9a+;(7mN4
z{7bZOp~eq9gHl0<f+oCnBrr)J!u!w@^P$no+LwY<WO(+XjLZ;?O7vyl6K;GgGzGyd
zf~gEvBYdxws9(%FLP&&nKf;()oA}(3Ihh2+zEW0rg4U3rM at g^JAU&M at C~=KMvNYk+
zoy<(CZ%S{eBMEbi2&Kzv3kHWKBWaCt(K_}p`)Pr83KA(=mYMAg9&|!=ZJMSl|MU*H
z?v|-ro#uJ7D7HNO4<wk8HehR<q1s=e3V~|Qub6iwp%3o;)xd?my1Q5W+Px<(m`Q^<
z_ocn>yAr<gNeOpKl2xlwzkp;wf}Lj-$Cp2Mm6y)?K)dsY9j(7KHvU+nQY(F<mKCak
zM5>jsy0rD`$*~SN at mm<dvru&I<j$ZH?+`|Ti_76I+ZUA0R_Pt3YU3%PJ-5N^5XpWh
z at hI$vX&WU(Q~e`CYS^F<dD>qM;^v(mKOrW^s-pYb!&t$Qn5O$XQ=6k at nGk+O4KI$-
zSk$d(YH@;);tgP{bGL%zz62N*RXPegUzq2Rpkl-5^ugi$7uq%(%RFaJLb4udyOP3I
zx>FT85fuO28)~b4ztyeZpXh%VRfvaKOfe#VR9Y at FFFhy6Gy>f+>9Fc>?0dn^ijvTe
z20aq4B at XU!6_m756_v at dJNpfSA3Ib||Lho9`l|l!Y-j&plEaQ_cTrAtI5fG7pPdqU
zhEm-SyO|3f+xl6Y`2`oq8hL2H94R%tAT-Ooy6RoPV5rFZ*_csv2<0ZgtiZnAe8JO|
zhHs~B9?k-CA06ClN=AX;#->n2<lQQQmD-t%`qCb|%iQ)Mhp{G{C#LYn`dUn6)-9yY
z{1kmUd20(RFRY7I-g3)yN8=MsfN6o6Z{Q_4Uar6v_YcJxqx&T<iZH^O&$lS*&O1k&
zH1_$@Qoh!=N}b#wfgsfU!SbPcOoa|UUEAGbwqV9nFHE0ae>gRvX3_6Ub3={8Y*OfV
z!pEn>rVNxgQd>mJqt)+f`@}QOfg`*W02ge{=P9-p);+<Xa{;K??acylm{`d1$I8JG
z0Ttk)^+T(4lz!<g<}^&&jge;?S9=rOZXDTfhYP1-xo;;n3%MJsWCcr96>d8KTMcgB
zUS*3|pwU_4 at Wi=t*9K8i^5>HH_zzT4ik%)RE!&AVF#vw+t7DChmK&Q5L4|08wRkk~
zc3mJsx`ArQxO`S5-b0ZJ?LqWPOp=cF)jB`SP3CqwMpsh^+*=f|KFc&K69KOc4%+^?
z>9baLyfI{fLy5I%`7C2Y+(1=VU8s5A&wiw8=_c8b=sf+V>&iPelHHv+5Fl1ruv5TO
z2TW%--=cBcQ#292D)w-gbTM3mEmC8)E-zA?Pko{s(<u~?MZSYDUBG;JX$@|LbAG-b
zkt%*B*xH14NA?yKsgxHGrp6k=W*!%_#n=MN+J|#z>Dh~4m@>-f>e~05^+zC^45djD
z##wyh;1O$2?Y;4Yf8AWge$b)@M}SK9C4E)+R6?7-drY}+qeOSo at gr8;&^#Ve`2LyM
zIeYt6_W}H*JJkNXz(#5SirXzx`psscIeK~hdd-zEZy9GKe0rVzNMhKuaR at JG4Be;4
z9_On;J88`yK$j?Xy!k^e03g&nyp&J#wI#ixlJ!#-&8|bMq481cLHd%9dn!u$GZ&(l
zl55IPAlZg%#MCR?<;sXy@|%rGGOo-aFUU9BwCnF`b|oaVlA#Yaw2=K3uNhut^iWRW
zOPj1K1^l=G!w7#~RLZGcM2TEK8ML6+63)rwNVn`vS4KFkzWms0ncP&TaN?u?TESY}
z-eool%<iKjg8476H0n&!&U at vw&#AvM)3LI%w}N+{XFH75-<zU4*9?H1;j><Fb$%8J
z>&(wf+Jmp$m8z(>y&lu>V^5qr=EiI-EC;1nm&8LtOas(4+E9jIn8aRTd~omSj*9vz
zIy~1(+S)&K4m<;7gL;i25k#QHj&GVQj}6e;q(uqW!#RQvh*`2#a!KFOK096w_x$((
zK)$PUl{*H*B1&gpC$y<wY**O??S|gA9oe*)L5B988Qg8JZQIRx(HV09z$wP=-Z&50
z<rQ7njgwbvcmQy>92nK|?E`VUUH>0o&y)xJpRW-H%RK}D+!*#1^ap7P?T*y|0L0YV
Jq}13Y=0AQ$g1i6#
diff --git a/icon-themes/galaxy/svx/res/vendor01h.png b/icon-themes/galaxy/svx/res/vendor01h.png
deleted file mode 100644
index 397d20c1cecf90a96dc9f121c1c02eff8c60584c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2949
zcmZWrdpOf=ANRa at a;oUWB8f`xa;gZ0rsa?!ndUI3GFfwuJkHkZkkq6(mSbIvj1ig%
zOTy-mQ<%&gCyQk=InMNMdfxYXuj~EicmM9s_5I$T at BKaANjI*W at 0FC76cG{GYjMp4
zDk8G$o8aF-{2ziZGET2jL`2HU!sN=$Ft_hxsFb7Tio1W*Z_;0o$*Xks`iH-!O`aZ%
z6_=4nVk$oVC^wn2bZT96f2I1LZpQHzCLW3FU%o{4_79A~T*Y8R1{gvJM)AbcG1jo_
z&;>H?1*tc4+tnJ)<4J5x>=y8eh)|E$?GmnkFCwu9!rgzi|3w>u{dM&l^||VUO2_sZ
zB}eOpZR_<G|M6QCz1HYY2!3DVMaNW4c^P|oaJ?|l&Mjqqgt`vps?FTM#L*_k=H<W|
zhSIDpND*~Rs3ya3*C8gp<$$jb6a1YCMK>X&PU#S<A2CpU@#ynpJIZsJSSjpD73;Ki
z^knWm at KsMen$eQ<1C}8eDD^Qxi4rXjZ!`r48UD5bWI&|0R}j-7y4Co3Om=YD$Xd^e
zW<j32(<ffAL}3iqx4Ti{0z}%9NOT9$2}+9XV^zRY`;({%w|eSphy3o+du0c4v64OF
z%5*4#aF4OSv##LN)m0lX)re9zd5%oo at z;Y%P6A^bw_49BStSfd1h~2AlV~Tj3b7H$
zKE}kEraDl}8)qfVp?m&Sy?XY`HDzt|psGI0Wvi31w&3(yLM>6JrCJfTFn(jf+G^lH
zsZ**d$}oY2tU;M}TkHfvoMWCf>TJ`Id}?#G%}tBNOrk4Yzz;E#(mQWJM3H<I3(=fK
zoT=*UW6zK($L}n2xz^+m1F at k6g9c1LNwYE^t|^L~c~>4Bg4jp#X1^Sff9t%<sN9up
zlKuFkb-j1?LGsUiLZ69qX!4aXf)5OvU7yNpskbGdh=qerY>zjqC*<}ck5ow at mxDd-
zC>urM(cy@>&lD~c#LUIY(TrBS%gy0_4T*4P=7DDUJ0vl0WRa3|_qFrjgj4BlM^4KM
zkH6J6rVVG)>|ROPUJ4x41A~=RH^v<gc6nn;8ag0E%yVMfRwrdzI>6WEauY)h%GEGC
zcrpKVoGqE`u85g=c{7dj&jmPBpP6~q&mzCXayeYfW?4l!-iNAlyYS&zip~8%F(J=j
zoq+-X at qKFF`AmHX%4)U7DKYMBmp3a%SJf;Um+tFnH=O(2r&5DI&F|8i(C2xEe+pA+
z+V%=$Z8wi~Pu*f<eg;sdwM##eTCDGgBA1Tg(xr|iUcqiiC=Vdo6onLT$}k~rjWX!V
zmW_%hw$<4=*Qh@<6)OGbE!rN1FK*7I#H`Ma5H}Y19Rv_)>-!?Fq0rtb^D9a|G-ZFR
zwr2gp1kk_)Sa at u?SPtED*)Aw`r*2|-zA~GSJ|j=BalWO#4;c8)0Rl^w$Q5egsOata
zgbV}e#1t_<&f)OX2nj at PFogMjAwFV?>NWhRRUEVc81EAm+7|Z5K(ID{`Pcj<8UQ`N
zK3{wd2pXhZ0;idHI%Rq}rAkuPe`;8!TPZC0bxyoU21`Ao at 31%X!z~wk^c2i=$6wi$
zw`xxe^qJnyuSr}Q%l?4o+94ovE`dFNN-4e8vz*cLy>vv#C4xKey7Yuq-miO>?ud*s
zF!5NDT*?BpCN1(WJXhsb#22%_DbKcncAwTv*vaMChF}g%mVg{>{qi9UUS?0i!yrTg
zjV at F61cQt{<zZj#p@`MMW&_MkRXz?BCp{vJN<D0Ia(&m8)X5eSKA4Pon~n3y)c45C
z^BV>vCbmtNKk0j4)e`s6EZ at ar_*^BGRNRS|l+FzDagb|evslA6E17cDG1wvrbWngf
zB2Tv#>vaPkR~7Nb6~w at PwgsoD_g1T0K>HVdUTe1)k=&_j83xjl=~=(GFsU2h7gfnb
zyquz_H;d^U#b`sE7!kHV0)O-Y3Ni6>_fAmj at nsgLa=Z{1quJbPgJD`v#Y#t4AI0cP
zHe=-I#As&ZK_n`b<&=#Bzd>x%P6}^f99WQ1-D>D>g_$QLHPpsye+CBgb9?U?TB6Q4
zPKim7dO}u!M4jpoXaj@}Po?yo+}oyMNI?-s@#U1S>+=yy&D|@ZZlE-AGq-NqzZ!Y3
zw<8>+70d)3QmIR2Cp5-^Ab51esJ&Wgkwc=U4TItx6XVDExY=0gHFww||FO>P-0+`s
zl`0fC!LQItW2NWiyS1?C-tOqqbbH7wBkJdX<>G{X7B04N4<e6dUmFqHw}(<)et+On
zC*XFugJ*m-0Xqr=ex;uKJuYG!*sb&|$Eb>&djEOK+VYVRM-6{B=XWtET)QX>6Lp$U
z+Yq<O1TlEi?7WGnFeW_##`TaN;q09syRve(guwtR`P!HfFJxAki023Pn5L>arJfvd
z!EQ>~h=RPDcj``tQIeANR~yUBXJjzwd?_1mIK%{nA-<B?Nc*hE=tZ|@TB-Q5;xUGN
zbU6AKr=@we#}i$irk;ENE3SM%^HOfxnF!hJA6I1+3mAX5yqdvdN_sG;wJPkQrW};l
zoJ<U at tkmdb&7klX2u~vk&ZnKP0xhoE7r$rAHguF#(Tu_j8>5lD)iE*|YE$$iCHLVc
z%>zB*R`XZB0j0cl$?vB6%U$~&<P at -XKr%E4n#r^cUxqF^fZn~Sex7z$2Rj;>#<wNw
zy(X=8-owqCk>~)XYO+de!sZd#>BxNUKpA-%DJw|a-b$^*PTcAhHkw?+?^p<UA9e#`
zx!l+e_DoTzm1=(XC}*hei{l=a>o5_)tv at AX6`9X9sBctM^SrMy6zGy{`J%WZL#l*W
z<=oIR7RSBis0&rYl at l?xJ*ATvo~{1A!lrYy0>3gG2*$Pn;o58L)TA6VD+=7*ySHJn
zp*_(xAwNd4a+ns{6J43Iv$C5TF4#LLb%flK7#T3q5EWCm?0E?ESKJ)+m-7z&&lLC4
z!jSVzuxoG#EOUtBP3zidA at uX9EqD~6FzMyJ<{V_{H+(yJ?o8;~-X1tBhemTGc#3nZ
zPq5+kFzX~EqR!fOw`G8v5lP?u8S)|kM%upri!*!HqNXjut;t~~Jo_Y&<+~aDFQsRb
zo at T*9R^z~wbSR8)pB)Lzn93E`1b0WcaAaRGb9=q*p89TbruU`3vV)NP)H3k+i1VmU
zLGIu)61L3sw0^Dg9JnP86CnO*p>x4you`!*>OXnGrkL+4mwg~5&jx?@#=O=KestRX
z24i`4Ks|uQ-1V{<B-c3C4?o26lCHbXZ0N_P6Vh*wMY~)#E38&$2bb`awzu-i<ZP&8
z%H7n0sFe+J^XKU;F0^S_?Q`ARUX_`U--Z`NL{u>@P8dM)3OWGM)y4_eu>n*0w+Nu*
zk`R}OEPMsKj^ie6o>8#Lc7M<3tRzoFZ*7nXo1f;s;@ZYtuu1+e_%9+q?)d(AT_~Bj
zT3TwS1-FZN8>E`;6*{7WM`h!^J0Wfto4Bh)ZPIpi#_UEX6x0=@3}8iVUfod?=k!{Q
znm589<{zF~ztYaJgP=;`h@&hI|B7$jUril-Smu(59mzL}Gw8=sk3wj72OiofD6SRU
zj}Okj^Qy?mS`_z-+`dy(4<^Uw at Z-q=G|~fGI(a5tTkt$WzYR^)6?t&>(4Sq~>@B|W
z&Er^8hQuDJMjdN-p&)>D6aA4Oe!t#z^D;rD$MYi7VpK=|5a5Eb at ll8fUZKYsf?!Mu
zD1?9vM=%V8178S;hyD*B6cqyhr~4qIXj{<TkB<24 at tZ7y(1aJVFuiV40lpRcZyIT#
Au>b%7
diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx
index 6ae88f0..9d5b164 100644
--- a/unotools/inc/unotools/lingucfg.hxx
+++ b/unotools/inc/unotools/lingucfg.hxx
@@ -228,7 +228,6 @@ public:
::rtl::OUString GetThesaurusDialogImage( const ::rtl::OUString &rServiceImplName ) const;
::rtl::OUString GetSynonymsContextImage( const ::rtl::OUString &rServiceImplName ) const;
- bool HasVendorImages( const char *pImageName ) const;
bool HasGrammarChecker() const;
};
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 5e60a3d..85c9215 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -1257,48 +1257,6 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
return aRes;
}
-
-bool SvtLinguConfig::HasVendorImages( const char *pImageName ) const
-{
- bool bRes = false;
- if (pImageName)
- {
- try
- {
- uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW );
- xNA.set( xNA->getByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Images")) ), uno::UNO_QUERY_THROW );
- xNA.set( xNA->getByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VendorImages")) ), uno::UNO_QUERY_THROW );
-
- uno::Sequence< rtl::OUString > aElementNames( xNA->getElementNames() );
- sal_Int32 nVendors = aElementNames.getLength();
- const rtl::OUString *pVendor = aElementNames.getConstArray();
- for (sal_Int32 i = 0; i < nVendors; ++i)
- {
- uno::Reference< container::XNameAccess > xNA2( xNA->getByName( pVendor[i] ), uno::UNO_QUERY_THROW );
- uno::Sequence< rtl::OUString > aPropNames( xNA2->getElementNames() );
- sal_Int32 nProps = aPropNames.getLength();
- const rtl::OUString *pPropNames = aPropNames.getConstArray();
- for (sal_Int32 k = 0; k < nProps; ++k)
- {
- // for a quicker check we ignore the HC image names here
- const OUString &rName = pPropNames[k];
- if (rName.equalsAscii( pImageName ))
- {
- bRes = true;
- break;
- }
- }
- }
- }
- catch (uno::Exception &)
- {
- DBG_ASSERT( 0, "exception caught. HasVendorImages failed" );
- }
- }
- return bRes;
-}
-
-
bool SvtLinguConfig::HasGrammarChecker() const
{
bool bRes = false;
@@ -1319,6 +1277,4 @@ bool SvtLinguConfig::HasGrammarChecker() const
return bRes;
}
-//////////////////////////////////////////////////////////////////////
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
1.7.7
--=-An9YCbELUvsoDNUSJksV--
More information about the Libreoffice-ux-advise
mailing list