diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-03-04 09:22:56 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-04 11:23:59 +0000 |
commit | ecda52f6b3919950870f3ddb195d34d3baf71168 (patch) | |
tree | a893e22f5ad130e669ad03dc1ca44872f86377d7 | |
parent | bef4b0dd6e638c1288c8855b514418e10ae19545 (diff) |
callcatcher: unused code
Change-Id: I7dcaa6f57815321e108cd7ce284fe145dc0506f2
-rw-r--r-- | sc/source/ui/dbgui/csvcontrol.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/inc/csvcontrol.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/tabdlg.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 9 | ||||
-rw-r--r-- | svtools/inc/svtools/ctrlbox.hxx | 1 | ||||
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 10 | ||||
-rw-r--r-- | unotools/inc/unotools/moduleoptions.hxx | 1 | ||||
-rw-r--r-- | unotools/source/config/moduleoptions.cxx | 7 | ||||
-rw-r--r-- | vcl/inc/vcl/edit.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/fixed.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/svapp.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/window.h | 2 | ||||
-rw-r--r-- | vcl/source/app/brand.cxx | 37 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 7 | ||||
-rw-r--r-- | vcl/source/control/edit.cxx | 19 | ||||
-rw-r--r-- | vcl/source/control/fixed.cxx | 19 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 8 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 1 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 6 |
19 files changed, 0 insertions, 140 deletions
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index fd725d66845d..343788198772 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -69,14 +69,6 @@ ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : { } -ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, const ResId& rResId ) : - Control( pParent, rResId ), - mrData( rData ), - mpAccessible( NULL ), - mbValidGfx( false ) -{ -} - ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ) : Control( pParent, nBits ), mrData( rData ), diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index afdfed5a04b0..06eebeaaa46e 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -267,7 +267,6 @@ private: // ------------------------------------------------------------------------ public: explicit ScCsvControl( ScCsvControl& rParent ); - explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, const ResId& rResId ); explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); virtual ~ScCsvControl(); diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index d25a72cf39be..e63718735667 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -252,7 +252,6 @@ private: protected: SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet ); SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet); - SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 4ec5a76e035b..3d579fb5b8ef 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -239,15 +239,6 @@ SfxTabPage::SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUSt } // ----------------------------------------------------------------------- -SfxTabPage:: SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ) : - TabPage(pParent, nStyle), - pSet ( &rAttrSet ), - bHasExchangeSupport ( sal_False ), - pTabDlg ( NULL ), - pImpl ( new TabPageImpl ) -{ -} -// ----------------------------------------------------------------------- SfxTabPage::~SfxTabPage() diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx index 0a8e566413f2..81f0cff47255 100644 --- a/svtools/inc/svtools/ctrlbox.hxx +++ b/svtools/inc/svtools/ctrlbox.hxx @@ -435,7 +435,6 @@ protected: public: FontNameBox( Window* pParent, WinBits nWinStyle = WB_SORT ); - FontNameBox( Window* pParent, const ResId& rResId ); virtual ~FontNameBox(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index bb35ebc189b5..c46932e81b6e 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1048,16 +1048,6 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : InitFontMRUEntriesFile(); } -// ------------------------------------------------------------------- - -FontNameBox::FontNameBox( Window* pParent, const ResId& rResId ) : - ComboBox( pParent, rResId ) -{ - mpFontList = NULL; - mbWYSIWYG = sal_False; - InitFontMRUEntriesFile(); -} - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = extractDropdown(rMap); diff --git a/unotools/inc/unotools/moduleoptions.hxx b/unotools/inc/unotools/moduleoptions.hxx index 3fd629763bc4..ba77ba008302 100644 --- a/unotools/inc/unotools/moduleoptions.hxx +++ b/unotools/inc/unotools/moduleoptions.hxx @@ -106,7 +106,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: sal_Bool IsModuleInstalled ( EModule eModule ) const; ::rtl::OUString GetModuleName ( EModule eModule ) const; ::rtl::OUString GetFactoryName ( EFactory eFactory ) const; - ::rtl::OUString GetFactoryShortName ( EFactory eFactory ) const; ::rtl::OUString GetFactoryStandardTemplate( EFactory eFactory ) const; ::rtl::OUString GetFactoryEmptyDocumentURL( EFactory eFactory ) const; ::rtl::OUString GetFactoryDefaultFilter ( EFactory eFactory ) const; diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 9dbd2df8a12d..2ff96249ca06 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -1049,13 +1049,6 @@ sal_Bool SvtModuleOptions::IsModuleInstalled( EModule eModule ) const } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions::GetFactoryShortName( EFactory eFactory ) const -{ - ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pDataContainer->GetFactoryShortName( eFactory ); -} - -//***************************************************************************************************************** ::rtl::OUString SvtModuleOptions::GetFactoryStandardTemplate( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx index 178e3d8ceff9..434e4281e44b 100644 --- a/vcl/inc/vcl/edit.hxx +++ b/vcl/inc/vcl/edit.hxx @@ -149,7 +149,6 @@ public: Edit( Window* pParent, WinBits nStyle = WB_BORDER ); Edit( Window* pParent, const ResId& rResId ); - Edit( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabeledByRelation ); virtual ~Edit(); virtual void MouseButtonDown( const MouseEvent& rMEvt ); diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index efa5f92f7701..c45762f867d7 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -61,7 +61,6 @@ protected: public: FixedText( Window* pParent, WinBits nStyle = 0 ); FixedText( Window* pParent, const ResId& rResId ); - FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation ); ~FixedText(); virtual void Paint( const Rectangle& rRect ); diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index e3e0779810b3..ef929853dabc 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -261,7 +261,6 @@ public: static void SetAppName( const String& rUniqueName ); static String GetAppName(); static bool LoadBrandBitmap (const char* pName, BitmapEx &rBitmap); - static bool LoadBrandSVG( const char *pName, BitmapEx &rBitmap ); // default name of the application for message dialogs and printing static void SetDisplayName( const OUString& rDisplayName ); diff --git a/vcl/inc/window.h b/vcl/inc/window.h index e6b669d63b0f..493863d9a1be 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -391,8 +391,6 @@ public: mbIsInTaskPaneList:1, mbToolbarFloatingWindow:1, mbCallHandlersDuringInputDisabled:1, - mbDisableAccessibleLabelForRelation:1, - mbDisableAccessibleLabeledByRelation:1, mbHelpTextDynamic:1, mbFakeFocusSet:1, mbHexpand:1, diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index 50b606e68266..007496a604ed 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -45,19 +45,6 @@ namespace { loadPng( rBaseDir + "/program/edition" + rName, rBitmap) || loadPng( rBaseDir + "/program" + rName, rBitmap); } - static bool loadSvg( const OUString & rPath, BitmapEx &rBitmap) - { - INetURLObject aObj( rPath ); - SvgData aSvgData(aObj.PathToFileName()); - rBitmap = aSvgData.getReplacement(); - return !rBitmap.IsEmpty(); - } - static bool tryLoadSvg( const OUString& rBaseDir, const OUString& rName, BitmapEx& rBitmap ) - { - return - loadSvg( rBaseDir + "/program/edition" + rName, rBitmap) || - loadSvg( rBaseDir + "/program" + rName, rBitmap); - } } bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap) @@ -86,28 +73,4 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap) return false; } -bool Application::LoadBrandSVG (const char *pName, BitmapEx &rBitmap) -{ - OUString aBaseDir( "$BRAND_BASE_DIR"); - rtl::Bootstrap::expandMacros( aBaseDir ); - rtl::OUString aBaseName( "/" + rtl::OUString::createFromAscii( pName ) ); - rtl::OUString aSvg( ".svg" ); - - rtl_Locale *pLoc = NULL; - osl_getProcessLocale (&pLoc); - LanguageTag aLanguageTag( *pLoc); - - ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings()); - for (size_t i=0; i < aFallbacks.size(); ++i) - { - if (tryLoadSvg( aBaseDir, aBaseName + "-" + aFallbacks[i] + aSvg, rBitmap)) - return true; - } - - if (tryLoadSvg( aBaseDir, aBaseName + aSvg, rBitmap)) - return true; - - return false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 90166eb390e8..f884d568ab42 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1647,13 +1647,6 @@ void Application::SetFilterHdl( const Link& rLink ) // ----------------------------------------------------------------------- -const Link& Application::GetFilterHdl() -{ - return ImplGetSVData()->maGDIData.mpGrfConverter->GetFilterHdl(); -} - -// ----------------------------------------------------------------------- - sal_Bool ImplCallHotKey( const KeyCode& rKeyCode ) { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 8f19c3c75370..f1cbc95776e9 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -253,25 +253,6 @@ bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue) // ----------------------------------------------------------------------- -Edit::Edit( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabeledByRelation ) : - Control( WINDOW_EDIT ) -{ - ImplInitEditData(); - rResId.SetRT( RSC_EDIT ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - if ( bDisableAccessibleLabeledByRelation ) - ImplGetWindowImpl()->mbDisableAccessibleLabeledByRelation = sal_True; - - // Derived MultiLineEdit takes care to call Show only after MultiLineEdit - // ctor has already started: - if ( !(nStyle & WB_HIDE) && rResId.GetRT() != RSC_MULTILINEEDIT ) - Show(); -} - -// ----------------------------------------------------------------------- - Edit::~Edit() { delete mpDDInfo; diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index f1d19571e0c3..b6a4d1068701 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -175,25 +175,6 @@ FixedText::FixedText( Window* pParent, const ResId& rResId ) // ----------------------------------------------------------------------- -FixedText::FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation ) - : Control( WINDOW_FIXEDTEXT ) - , m_nMaxWidthChars(-1) - , m_nMinWidthChars(-1) - , m_pMnemonicWindow(NULL) -{ - rResId.SetRT( RSC_TEXT ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - if ( bDisableAccessibleLabelForRelation ) - ImplGetWindowImpl()->mbDisableAccessibleLabelForRelation = sal_True; - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -// ----------------------------------------------------------------------- - sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle ) { sal_uInt16 nTextStyle = TEXT_DRAW_MNEMONIC | TEXT_DRAW_ENDELLIPSIS; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 31d3a4808be9..47437ddb9765 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -711,8 +711,6 @@ void Window::ImplInitWindowData( WindowType nType ) mpWindowImpl->mbIsInTaskPaneList = sal_False; // sal_True: window was added to the taskpanelist in the topmost system window mpWindowImpl->mnNativeBackground = 0; // initialize later, depends on type mpWindowImpl->mbCallHandlersDuringInputDisabled = sal_False; // sal_True: call event handlers even if input is disabled - mpWindowImpl->mbDisableAccessibleLabelForRelation = sal_False; // sal_True: do not set LabelFor relation on accessible objects - mpWindowImpl->mbDisableAccessibleLabeledByRelation = sal_False; // sal_True: do not set LabeledBy relation on accessible objects mpWindowImpl->mbHelpTextDynamic = sal_False; // sal_True: append help id in HELP_DEBUG case mpWindowImpl->mbFakeFocusSet = sal_False; // sal_True: pretend as if the window has focus. mpWindowImpl->mbHexpand = false; @@ -9011,9 +9009,6 @@ Window* Window::GetAccessibleRelationMemberOf() const Window* Window::getAccessibleRelationLabelFor() const { - if (mpWindowImpl->mbDisableAccessibleLabelForRelation) - return NULL; - if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pLabelForWindow) return mpWindowImpl->mpAccessibleInfos->pLabelForWindow; @@ -9035,9 +9030,6 @@ Window* Window::GetAccessibleRelationLabelFor() const Window* Window::GetAccessibleRelationLabeledBy() const { - if (mpWindowImpl->mbDisableAccessibleLabeledByRelation) - return NULL; - if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pLabeledByWindow) return mpWindowImpl->mpAccessibleInfos->pLabeledByWindow; diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 42cc9a741cbb..8dc691ec84c5 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -92,7 +92,6 @@ protected: public: MacroSecurityTP(Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, MacroSecurity* _pDlg); - MacroSecurityTP(Window* _pParent, const ResId& _rResId, MacroSecurity* _pDlg); void SetTabDlg(MacroSecurity* pTabDlg) { diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 3b3d92445dca..fe77313acbd7 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -99,12 +99,6 @@ MacroSecurityTP::MacroSecurityTP(Window* _pParent, const OString& rID, { } -MacroSecurityTP::MacroSecurityTP( Window* _pParent, const ResId& _rResId, MacroSecurity* _pDlg ) - :TabPage ( _pParent, _rResId ) - ,mpDlg ( _pDlg ) -{ -} - MacroSecurityLevelTP::MacroSecurityLevelTP(Window* _pParent, MacroSecurity* _pDlg) : MacroSecurityTP(_pParent, "SecurityLevelPage", "xmlsec/ui/securitylevelpage.ui", _pDlg) { |