|
Lines 171-176
Link Here
|
| 171 |
#include <svtools/menuoptions.hxx> |
171 |
#include <svtools/menuoptions.hxx> |
| 172 |
#endif |
172 |
#endif |
| 173 |
#include <svtools/cmdoptions.hxx> |
173 |
#include <svtools/cmdoptions.hxx> |
|
|
174 |
#ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ |
| 175 |
#include <classes/addonsoptions.hxx> |
| 176 |
#endif |
| 174 |
|
177 |
|
| 175 |
//_________________________________________________________________________________________________________________ |
178 |
//_________________________________________________________________________________________________________________ |
| 176 |
// namespaces |
179 |
// namespaces |
|
Lines 457-466
Link Here
|
| 457 |
if ( nId > 0 ) |
460 |
if ( nId > 0 ) |
| 458 |
{ |
461 |
{ |
| 459 |
OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); |
462 |
OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); |
| 460 |
m_pToolBar->SetItemImage( nId, GetImageFromURL( m_xFrame, |
463 |
Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages, m_bIsHiContrast ); |
| 461 |
aCommandURL, |
464 |
if ( !aImage ) |
| 462 |
bBigImages, |
465 |
aImage = QueryAddonsImage( aCommandURL, bBigImages, m_bIsHiContrast ); |
| 463 |
m_bIsHiContrast ) ); |
466 |
m_pToolBar->SetItemImage( nId, aImage ); |
| 464 |
} |
467 |
} |
| 465 |
} |
468 |
} |
| 466 |
|
469 |
|
|
Lines 1397-1402
Link Here
|
| 1397 |
++pIter; |
1400 |
++pIter; |
| 1398 |
} |
1401 |
} |
| 1399 |
|
1402 |
|
|
|
1403 |
sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); |
| 1400 |
m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetFaceColor().IsDark(); |
1404 |
m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetFaceColor().IsDark(); |
| 1401 |
sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast ); |
1405 |
sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast ); |
| 1402 |
|
1406 |
|
|
Lines 1413-1419
Link Here
|
| 1413 |
aImage = Image( aDocGraphicSeq[i] ); |
1417 |
aImage = Image( aDocGraphicSeq[i] ); |
| 1414 |
if ( !aImage ) |
1418 |
if ( !aImage ) |
| 1415 |
{ |
1419 |
{ |
| 1416 |
aImage = Image( aModGraphicSeq[i] ); |
1420 |
aImage = Image( aModGraphicSeq[i] ); |
|
|
1421 |
if ( !aImage ) |
| 1422 |
aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages, m_bIsHiContrast ); |
| 1417 |
m_pToolBar->SetItemImage( pIter->second.nId, aImage ); |
1423 |
m_pToolBar->SetItemImage( pIter->second.nId, aImage ); |
| 1418 |
if ( pIter->second.aIds.size() > 0 ) |
1424 |
if ( pIter->second.aIds.size() > 0 ) |
| 1419 |
{ |
1425 |
{ |
|
Lines 2035-2038
Link Here
|
| 2035 |
return 0; |
2041 |
return 0; |
| 2036 |
} |
2042 |
} |
| 2037 |
|
2043 |
|
|
|
2044 |
Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast ) |
| 2045 |
{ |
| 2046 |
Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages, bHiContrast ); |
| 2047 |
return aImage; |
| 2048 |
} |
| 2049 |
|
| 2038 |
} |
2050 |
} |