diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-12-22 09:00:02 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-22 11:07:03 +0000 |
commit | 6c415f735bbf9201a18288e2ea16eacad4d635cd (patch) | |
tree | 8e4f15bb62d7082537e04b85e0f57268ec0cd428 | |
parent | 29c38bab7a69127c69f17c9a62b35faf68deb843 (diff) |
callcatcher: update unused code
Change-Id: I62e49fbf27364bd244099a9bb247452d5a691119
-rwxr-xr-x | bin/findunusedcode | 11 | ||||
-rw-r--r-- | include/svl/zforlist.hxx | 27 | ||||
-rw-r--r-- | include/svtools/accessibilityoptions.hxx | 2 | ||||
-rw-r--r-- | include/svx/SvxColorValueSet.hxx | 3 | ||||
-rw-r--r-- | include/vcl/button.hxx | 1 | ||||
-rw-r--r-- | include/vcl/window.hxx | 15 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarController.hxx | 3 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 8 | ||||
-rw-r--r-- | svtools/source/config/accessibilityoptions.cxx | 54 | ||||
-rw-r--r-- | svx/source/tbxctrls/SvxColorValueSet.cxx | 6 | ||||
-rw-r--r-- | unusedcode.easy | 7 | ||||
-rw-r--r-- | uui/source/authfallbackdlg.cxx | 24 | ||||
-rw-r--r-- | uui/source/authfallbackdlg.hxx | 14 | ||||
-rw-r--r-- | vcl/inc/impbmp.hxx | 6 | ||||
-rw-r--r-- | vcl/source/control/button.cxx | 12 | ||||
-rw-r--r-- | vcl/source/gdi/impbmp.cxx | 15 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 41 |
18 files changed, 37 insertions, 220 deletions
diff --git a/bin/findunusedcode b/bin/findunusedcode index 61ba6543303a..74dc46699a0d 100755 --- a/bin/findunusedcode +++ b/bin/findunusedcode @@ -88,4 +88,15 @@ grep ::.*\( unusedcode.all \ | grep -v ^MathML:: \ | grep -v ^GeneratedSaxParser:: \ | grep -v ^GLTF:: \ + | grep -v ^OneDrive \ + | grep -v ^SharePoint \ + | grep -v ^VersioningService:: \ + | grep -v ^WSSession:: \ + | grep -v ^NavigationService:: \ + | grep -v ^ObjectService:: \ + | grep -v ^RepositoryService:: \ + | grep -v ^GDriveDocument:: \ + | grep -v ^GDriveFolder:: \ + | grep -v ^GDriveProperty:: \ + | grep -v ^GDriveSession:: \ > ../unusedcode.easy diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index e2df52d5b4a4..ee6dbf57a619 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -245,15 +245,15 @@ private: public: - NfCurrencyEntry( const LocaleDataWrapper& rLocaleData, - LanguageType eLang ); - NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr, - const LocaleDataWrapper& rLocaleData, - LanguageType eLang ); - NfCurrencyEntry( const OUString& rSymbol, const OUString& rBankSymbol, LanguageType eLang, - sal_uInt16 nPositiveFmt, sal_uInt16 nNegativeFmt, sal_uInt16 nDig, - sal_Unicode cZero ); - ~NfCurrencyEntry() {} + NfCurrencyEntry( const LocaleDataWrapper& rLocaleData, + LanguageType eLang ); + NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr, + const LocaleDataWrapper& rLocaleData, + LanguageType eLang ); + inline NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankSymbol, + LanguageType eLang, sal_uInt16 nPositiveFmt, + sal_uInt16 nNegativeFmt, sal_uInt16 nDig, sal_Unicode cZero); + ~NfCurrencyEntry() {} inline NfCurrencyEntry* Clone() const; @@ -308,6 +308,15 @@ public: * Necessary for ptr_vector on Windows. Please don't remove these, or at * least check it on Windows before attempting to remove them. */ +NfCurrencyEntry::NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankSymbol, + LanguageType eLang, sal_uInt16 nPositiveFmt, + sal_uInt16 nNegativeFmt, sal_uInt16 nDig, sal_Unicode cZero) + : aSymbol(rSymbol), aBankSymbol(rBankSymbol), eLanguage(eLang) + , nPositiveFormat(nPositiveFmt), nNegativeFormat(nNegativeFmt) + , nDigits(nDig), cZeroChar(cZero) +{ +} + NfCurrencyEntry* NfCurrencyEntry::Clone() const { return new NfCurrencyEntry( diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index 5600008f9e1f..2254854050b6 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -43,7 +43,6 @@ public: bool GetIsAllowAnimatedGraphics() const; bool GetIsAllowAnimatedText() const; bool GetIsAutomaticFontColor() const; - bool GetIsSystemFont() const; sal_Int16 GetHelpTipSeconds() const; bool IsSelectionInReadonly() const; bool GetAutoDetectSystemHC() const; @@ -53,7 +52,6 @@ public: void SetIsAllowAnimatedGraphics(bool bSet); void SetIsAllowAnimatedText(bool bSet); void SetIsAutomaticFontColor(bool bSet); - void SetIsSystemFont(bool bSet); void SetHelpTipSeconds(sal_Int16 nSet); void SetSelectionInReadonly(bool bSet); void SetAutoDetectSystemHC(bool bSet); diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index 55a2ddbca98a..351116a01bae 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -26,11 +26,8 @@ class XColorList; class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet { -private: -protected: public: SvxColorValueSet(vcl::Window* pParent, WinBits nWinStyle = WB_ITEMBORDER); - SvxColorValueSet(vcl::Window* pParent, const ResId& rResId); virtual void Resize() SAL_OVERRIDE; diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 9f5142aebf3a..5fb4e13270f8 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -271,7 +271,6 @@ private: public: explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 ); - explicit HelpButton( vcl::Window* pParent, const ResId& ); virtual void Click() SAL_OVERRIDE; }; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index b6874997ed22..3b0c0e93864c 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -606,21 +606,6 @@ private: SAL_DLLPRIVATE bool ImplUpdatePos(); SAL_DLLPRIVATE void ImplUpdateSysObjPos(); - /** check whether a font is suitable for UI - - The font to be tested will be checked whether it could display a - localized test string. If this is not the case, then the font - is deemed unsuitable as UI font. - - @param rFont - the font to be tested - - @returns - True if the font can be used as UI font - False if the font is unsuitable as UI font - */ - SAL_DLLPRIVATE bool ImplCheckUIFont( const vcl::Font& rFont ); - SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl = true ); SAL_DLLPRIVATE void ImplAlignChildren(); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 7f950a244413..22223c32a52f 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -483,14 +483,6 @@ void SidebarController::UpdateConfigurations (void) } } -void SidebarController::RequestSwitchToDeck ( - const ::rtl::OUString& rsDeckId) -{ - maContextChangeUpdate.CancelRequest(); - maAsynchronousDeckSwitch.RequestCall( - ::boost::bind(&SidebarController::OpenThenSwitchToDeck, this, rsDeckId)); -} - void SidebarController::OpenThenSwitchToDeck ( const ::rtl::OUString& rsDeckId) { diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index 46511a553122..797e4073c9a9 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -122,9 +122,6 @@ public: const static sal_Int32 SwitchFlag_ForceNewDeck = 0x02; const static sal_Int32 SwitchFlag_ForceNewPanels = 0x02; - - void RequestSwitchToDeck ( - const ::rtl::OUString& rsDeckId); void OpenThenSwitchToDeck ( const ::rtl::OUString& rsDeckId); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 0a3de627d58d..2a3ed223a032 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3829,14 +3829,6 @@ NfCurrencyEntry::NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr cZeroChar = rLocaleData.getCurrZeroChar(); } -NfCurrencyEntry::NfCurrencyEntry( - const OUString& rSymbol, const OUString& rBankSymbol, LanguageType eLang, - sal_uInt16 nPositiveFmt, sal_uInt16 nNegativeFmt, sal_uInt16 nDig, - sal_Unicode cZero ) : - aSymbol(rSymbol), aBankSymbol(rBankSymbol), eLanguage(eLang), - nPositiveFormat(nPositiveFmt), nNegativeFormat(nNegativeFmt), - nDigits(nDig), cZeroChar(cZero) {} - bool NfCurrencyEntry::operator==( const NfCurrencyEntry& r ) const { return aSymbol == r.aSymbol diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 1ef43d1c05e4..89116db79f6f 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -81,7 +81,6 @@ public: bool GetIsAllowAnimatedGraphics() const; bool GetIsAllowAnimatedText() const; bool GetIsAutomaticFontColor() const; - bool GetIsSystemFont() const; sal_Int16 GetHelpTipSeconds() const; bool IsSelectionInReadonly() const; sal_Int16 GetEdgeBlending() const; @@ -95,7 +94,6 @@ public: void SetIsAllowAnimatedGraphics(bool bSet); void SetIsAllowAnimatedText(bool bSet); void SetIsAutomaticFontColor(bool bSet); - void SetIsSystemFont(bool bSet); void SetHelpTipSeconds(sal_Int16 nSet); void SetSelectionInReadonly(bool bSet); @@ -248,24 +246,6 @@ bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const return bRet; } -bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const -{ - css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - bool bRet = true; - - try - { - if(xNode.is()) - xNode->getPropertyValue(s_sIsSystemFont) >>= bRet; - } - catch(const css::uno::Exception& ex) - { - SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message); - } - - return bRet; -} - sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -494,26 +474,6 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(bool bSet) } } -void SvtAccessibilityOptions_Impl::SetIsSystemFont(bool bSet) -{ - css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - - try - { - if(xNode.is() && xNode->getPropertyValue(s_sIsSystemFont)!=bSet) - { - xNode->setPropertyValue(s_sIsSystemFont, css::uno::makeAny(bSet)); - ::comphelper::ConfigurationHelper::flush(m_xCfg); - - bIsModified = true; - } - } - catch(const css::uno::Exception& ex) - { - SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message); - } -} - void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -564,12 +524,6 @@ void SvtAccessibilityOptions_Impl::SetVCLSettings() aHelpSettings.SetTipTimeout( GetIsHelpTipsDisappear() ? GetHelpTipSeconds() * 1000 : HELP_TIP_TIMEOUT); aAllSettings.SetHelpSettings(aHelpSettings); - if(aStyleSettings.GetUseSystemUIFonts() != GetIsSystemFont()) - { - aStyleSettings.SetUseSystemUIFonts(GetIsSystemFont()); - StyleSettingsChanged = true; - } - const sal_Int16 nEdgeBlendingCountA(GetEdgeBlending()); OSL_ENSURE(nEdgeBlendingCountA >= 0, "OOps, negative values for EdgeBlending are not allowed (!)"); const sal_uInt16 nEdgeBlendingCountB(static_cast< sal_uInt16 >(nEdgeBlendingCountA >= 0 ? nEdgeBlendingCountA : 0)); @@ -697,10 +651,6 @@ bool SvtAccessibilityOptions::GetIsAutomaticFontColor() const { return sm_pSingleImplConfig->GetIsAutomaticFontColor(); } -bool SvtAccessibilityOptions::GetIsSystemFont() const -{ - return sm_pSingleImplConfig->GetIsSystemFont(); -} sal_Int16 SvtAccessibilityOptions::GetHelpTipSeconds() const { return sm_pSingleImplConfig->GetHelpTipSeconds(); @@ -735,10 +685,6 @@ void SvtAccessibilityOptions::SetIsAutomaticFontColor(bool bSet) { sm_pSingleImplConfig->SetIsAutomaticFontColor(bSet); } -void SvtAccessibilityOptions::SetIsSystemFont(bool bSet) -{ - sm_pSingleImplConfig->SetIsSystemFont(bSet); -} void SvtAccessibilityOptions::SetHelpTipSeconds(sal_Int16 nSet) { sm_pSingleImplConfig->SetHelpTipSeconds(nSet); diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index 11e90edc133e..29b805675e97 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -40,12 +40,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxColorValueSet(vcl:: return new SvxColorValueSet(pParent, nWinBits); } -SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, const ResId& rResId) -: ValueSet(_pParent, rResId) -{ - SetEdgeBlending(true); -} - sal_uInt32 SvxColorValueSet::getMaxRowCount() const { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); diff --git a/unusedcode.easy b/unusedcode.easy index 0c3074abb44e..68004b9246ba 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,13 +1,6 @@ BigInt::BigInt(unsigned int) CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&) FontCharMap::GetDefaultMap(bool) -GDriveDocument::GDriveDocument(GDriveSession*) -GDriveFolder::GDriveFolder(GDriveSession*) -GDriveProperty::GDriveProperty() -GDriveSession::GDriveSession() -ImpBitmap::ImplCrop(Rectangle const&) -ImpBitmap::ImplErase(Color const&) -ImpBitmap::ImplSetSalBitmap(SalBitmap*) OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int) OpenGLContext::renderToFile() OpenGLContext::requestSingleBufferedRendering() diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx index 5f1548d2a17a..eac0d301b300 100644 --- a/uui/source/authfallbackdlg.cxx +++ b/uui/source/authfallbackdlg.cxx @@ -14,23 +14,9 @@ using namespace boost; -AuthFallbackDlg::AuthFallbackDlg( Window* pParent ) : - ModalDialog( pParent, "AuthFallbackDlg", "uui/ui/authfallback.ui" ) -{ - get( m_pTVInstructions, "instructions" ); - get( m_pEDUrl, "url" ); - get( m_pEDCode, "code" ); - get( m_pBTOk, "ok" ); - get( m_pBTCancel, "cancel" ); - - m_pBTOk->SetClickHdl( LINK( this, AuthFallbackDlg, OKHdl) ); - m_pBTOk->Enable( false ); -} - -AuthFallbackDlg::AuthFallbackDlg( Window* pParent, - const OUString& instructions, - const OUString& url ) : - ModalDialog( pParent, "AuthFallbackDlg", "uui/ui/authfallback.ui" ) +AuthFallbackDlg::AuthFallbackDlg(Window* pParent, const OUString& instructions, + const OUString& url) + : ModalDialog(pParent, "AuthFallbackDlg", "uui/ui/authfallback.ui") { get( m_pTVInstructions, "instructions" ); get( m_pEDUrl, "url" ); @@ -46,10 +32,6 @@ AuthFallbackDlg::AuthFallbackDlg( Window* pParent, m_pEDUrl->SetText( url ); } -AuthFallbackDlg::~AuthFallbackDlg( ) -{ -} - IMPL_LINK ( AuthFallbackDlg, OKHdl, Button *, EMPTYARG ) { EndDialog( RET_OK ); diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx index d068f48fd964..d73eebf70f4f 100644 --- a/uui/source/authfallbackdlg.hxx +++ b/uui/source/authfallbackdlg.hxx @@ -18,22 +18,18 @@ class AuthFallbackDlg : public ModalDialog { -private : - +private: VclMultiLineEdit* m_pTVInstructions; Edit* m_pEDUrl; Edit* m_pEDCode; PushButton* m_pBTOk; PushButton* m_pBTCancel; -public : - - AuthFallbackDlg( Window* pParent); - AuthFallbackDlg(Window* pParent, const OUString& instructions, - const OUString& url ); - virtual ~AuthFallbackDlg(); +public: + AuthFallbackDlg(Window* pParent, const OUString& instructions, + const OUString& url); - OUString GetCode() { return m_pEDCode->GetText(); } + OUString GetCode() const { return m_pEDCode->GetText(); } private: diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index 5e4586d97113..aebc89f00338 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -41,14 +41,10 @@ public: ImpBitmap(); /** * takes ownership - * same as Sequence: - * pBmp = new ImpBitmap; - * pBmp->ImplSetSalBitmap(pBitmap); */ ImpBitmap(SalBitmap* pBitmap); ~ImpBitmap(); - void ImplSetSalBitmap( SalBitmap* pSalBitmap ); SalBitmap* ImplGetSalBitmap() const { return mpSalBitmap; } bool ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); @@ -69,8 +65,6 @@ public: inline void ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum = nChecksum; } inline sal_uLong ImplGetChecksum() const { return mnChecksum; } - bool ImplCrop( const Rectangle& rRectPixel ); - bool ImplErase( const Color& rFillColor ); bool ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ); bool ImplReplace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ); }; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index afef44381368..f8f3da8cb48f 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1794,18 +1794,6 @@ HelpButton::HelpButton( vcl::Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -HelpButton::HelpButton( vcl::Window* pParent, const ResId& rResId ) : - PushButton( WINDOW_HELPBUTTON ) -{ - rResId.SetRT( RSC_HELPBUTTON ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - void HelpButton::Click() { // trigger help if no link set diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 4f4684d98e57..696ede09345c 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -43,11 +43,6 @@ ImpBitmap::~ImpBitmap() delete mpSalBitmap; } -void ImpBitmap::ImplSetSalBitmap( SalBitmap* pBitmap ) -{ - delete mpSalBitmap, mpSalBitmap = pBitmap; -} - bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { return mpSalBitmap->Create( rSize, nBitCount, rPal ); @@ -93,16 +88,6 @@ void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode mnChecksum = 0; } -bool ImpBitmap::ImplCrop( const Rectangle& rRectPixel ) -{ - return mpSalBitmap->Crop( rRectPixel ); -} - -bool ImpBitmap::ImplErase( const ::Color& rFillColor ) -{ - return mpSalBitmap->Erase( rFillColor ); -} - bool ImpBitmap::ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) { return mpSalBitmap->Scale( rScaleX, rScaleY, nScaleFlag ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 3f66965e7849..53291b557040 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1294,47 +1294,6 @@ void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags ) OutputDevice::CopyDeviceArea(aPosAry, nFlags); } -bool Window::ImplCheckUIFont( const vcl::Font& rFont ) -{ - if( ImplGetSVData()->maGDIData.mbNativeFontConfig ) - return true; - - // create a text string using the localized text of important buttons - OUString aTestText; - static const StandardButtonType aTestButtons[] = - { - BUTTON_OK, BUTTON_CANCEL, BUTTON_CLOSE, BUTTON_ABORT, - BUTTON_YES, BUTTON_NO, BUTTON_MORE, BUTTON_IGNORE, - BUTTON_RETRY, BUTTON_HELP - }; - - const int nTestButtonCount = SAL_N_ELEMENTS(aTestButtons); - for( int n = 0; n < nTestButtonCount; ++n ) - { - OUString aButtonStr = Button::GetStandardText( aTestButtons[n] ); - // #i115432# ignore mnemonic+accelerator part of each string - // TODO: use a string filtering method when it becomes available - const sal_Int32 nLen = aButtonStr.getLength(); - bool bInside = false; - for( int i = 0; i < nLen; ++i ) { - const sal_Unicode c = aButtonStr[ i ]; - if( (c == '(')) - bInside = true; - if( (c == ')')) - bInside = false; - if( (c == '~') - || (c == '(') || (c == ')') - || ((c >= 'A') && (c <= 'Z') && bInside) ) - aButtonStr = aButtonStr.replaceAt( i, 1, " " ); - } - // append sanitized button text to test string - aTestText += aButtonStr; - } - - const bool bUIFontOk = ( HasGlyphs( rFont, aTestText ) == -1 ); - return bUIFontOk; -} - SalGraphics* Window::ImplGetFrameGraphics() const { if ( mpWindowImpl->mpFrameWindow->mpGraphics ) |